[HOTFIX]Fix Describe Formatted Testcases This closes #2932
Project: http://git-wip-us.apache.org/repos/asf/carbondata/repo Commit: http://git-wip-us.apache.org/repos/asf/carbondata/commit/c572f502 Tree: http://git-wip-us.apache.org/repos/asf/carbondata/tree/c572f502 Diff: http://git-wip-us.apache.org/repos/asf/carbondata/diff/c572f502 Branch: refs/heads/branch-1.5 Commit: c572f502aaa4ed246352fcab7916249d7ac71477 Parents: b772b18 Author: Indhumathi27 <indhumathi...@gmail.com> Authored: Tue Nov 20 14:32:00 2018 +0530 Committer: ravipesala <ravi.pes...@gmail.com> Committed: Wed Nov 21 22:43:46 2018 +0530 ---------------------------------------------------------------------- .../core/scan/executor/impl/AbstractQueryExecutor.java | 4 ++-- .../generated/CreateTableWithLocalDictionaryTestCase.scala | 8 ++++---- .../cluster/sdv/generated/PreAggregateTestCase.scala | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/carbondata/blob/c572f502/core/src/main/java/org/apache/carbondata/core/scan/executor/impl/AbstractQueryExecutor.java ---------------------------------------------------------------------- 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 40d04e2..7c5287d 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 @@ -231,9 +231,9 @@ public abstract class AbstractQueryExecutor<E> implements QueryExecutor<E> { 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, http://git-wip-us.apache.org/repos/asf/carbondata/blob/c572f502/integration/spark-common-cluster-test/src/test/scala/org/apache/carbondata/cluster/sdv/generated/CreateTableWithLocalDictionaryTestCase.scala ---------------------------------------------------------------------- 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 43d5956..7246fef 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")) } } http://git-wip-us.apache.org/repos/asf/carbondata/blob/c572f502/integration/spark-common-cluster-test/src/test/scala/org/apache/carbondata/cluster/sdv/generated/PreAggregateTestCase.scala ---------------------------------------------------------------------- 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 d1b1310..c949be6 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