From 67be6a24e5d9a22fe02c6a8a96860942cdc4c9b9 Mon Sep 17 00:00:00 2001 From: Indhumathi27 Date: Tue, 20 Nov 2018 14:32:00 +0530 Subject: [PATCH] Fix Describe Formatted Testcases --- .../core/scan/executor/impl/AbstractQueryExecutor.java | 4 ++-- .../CreateTableWithLocalDictionaryTestCase.scala | 8 ++++---- .../cluster/sdv/generated/PreAggregateTestCase.scala | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/core/src/main/java/org/apache/carbondata/core/scan/executor/impl/AbstractQueryExecutor.java b/core/src/main/java/org/apache/carbondata/core/scan/executor/impl/AbstractQueryExecutor.java index 710fbe3f0fb..1debe58f203 100644 --- a/core/src/main/java/org/apache/carbondata/core/scan/executor/impl/AbstractQueryExecutor.java +++ b/core/src/main/java/org/apache/carbondata/core/scan/executor/impl/AbstractQueryExecutor.java @@ -230,9 +230,9 @@ private List getDataBlocks(QueryModel queryModel) throws IOExcept updateColumns(queryModel, fileFooter.getColumnInTable(), blockInfo.getFilePath()); filePathToSegmentPropertiesMap.put(blockInfo.getFilePath(), segmentProperties); } - LOGGER.warn("Skipping Direct Vector Filling as it is not Supported " - + "for Legacy store prior to V3 store"); if (blockletDetailInfo.isLegacyStore()) { + LOGGER.warn("Skipping Direct Vector Filling as it is not Supported " + + "for Legacy store prior to V3 store"); queryModel.setDirectVectorFill(false); } readAndFillBlockletInfo(tableBlockInfos, blockInfo, diff --git a/integration/spark-common-cluster-test/src/test/scala/org/apache/carbondata/cluster/sdv/generated/CreateTableWithLocalDictionaryTestCase.scala b/integration/spark-common-cluster-test/src/test/scala/org/apache/carbondata/cluster/sdv/generated/CreateTableWithLocalDictionaryTestCase.scala index 43d595686a3..7246feffd19 100644 --- a/integration/spark-common-cluster-test/src/test/scala/org/apache/carbondata/cluster/sdv/generated/CreateTableWithLocalDictionaryTestCase.scala +++ b/integration/spark-common-cluster-test/src/test/scala/org/apache/carbondata/cluster/sdv/generated/CreateTableWithLocalDictionaryTestCase.scala @@ -1480,7 +1480,7 @@ class CreateTableWithLocalDictionaryTestCase extends QueryTest with BeforeAndAft descLoc.find(_.get(0).toString.contains("Local Dictionary Enabled")) match { case Some(row) => assert(row.get(1).toString.contains("false")) } - descLoc.find(_.get(0).toString.contains("SORT_SCOPE")) match { + descLoc.find(_.get(0).toString.contains("Sort Scope")) match { case Some(row) => assert(row.get(1).toString.contains("global_sort")) } } @@ -1500,7 +1500,7 @@ class CreateTableWithLocalDictionaryTestCase extends QueryTest with BeforeAndAft descLoc.find(_.get(0).toString.contains("Local Dictionary Enabled")) match { case Some(row) => assert(row.get(1).toString.contains("false")) } - descLoc.find(_.get(0).toString.contains("SORT_SCOPE")) match { + descLoc.find(_.get(0).toString.contains("Sort Scope")) match { case Some(row) => assert(row.get(1).toString.contains("batch_sort")) } } @@ -1519,7 +1519,7 @@ class CreateTableWithLocalDictionaryTestCase extends QueryTest with BeforeAndAft descLoc.find(_.get(0).toString.contains("Local Dictionary Enabled")) match { case Some(row) => assert(row.get(1).toString.contains("false")) } - descLoc.find(_.get(0).toString.contains("SORT_SCOPE")) match { + descLoc.find(_.get(0).toString.contains("Sort Scope")) match { case Some(row) => assert(row.get(1).toString.contains("no_sort")) } } @@ -1538,7 +1538,7 @@ class CreateTableWithLocalDictionaryTestCase extends QueryTest with BeforeAndAft descLoc.find(_.get(0).toString.contains("Local Dictionary Enabled")) match { case Some(row) => assert(row.get(1).toString.contains("false")) } - descLoc.find(_.get(0).toString.contains("SORT_SCOPE")) match { + descLoc.find(_.get(0).toString.contains("Sort Scope")) match { case Some(row) => assert(row.get(1).toString.contains("local_sort")) } } diff --git a/integration/spark-common-cluster-test/src/test/scala/org/apache/carbondata/cluster/sdv/generated/PreAggregateTestCase.scala b/integration/spark-common-cluster-test/src/test/scala/org/apache/carbondata/cluster/sdv/generated/PreAggregateTestCase.scala index d1b13104918..c949be63bb3 100644 --- a/integration/spark-common-cluster-test/src/test/scala/org/apache/carbondata/cluster/sdv/generated/PreAggregateTestCase.scala +++ b/integration/spark-common-cluster-test/src/test/scala/org/apache/carbondata/cluster/sdv/generated/PreAggregateTestCase.scala @@ -56,7 +56,7 @@ class PreAggregateTestCase extends QueryTest with BeforeAndAfterEach { //test to check existence of datamap test("PreAggregateTestCase_TC001", Include) { Assert.assertEquals(sql("show datamap on table PreAggMain").count(), 5) - checkExistence(sql("Describe formatted PreAggMain_PreAggSum"), true, "DICTIONARY") + checkExistence(sql("Describe formatted PreAggMain_PreAggSum"), true, "Dictionary") } //check for load data should reflects in all preaggregate tables