You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@carbondata.apache.org by ja...@apache.org on 2018/10/29 06:39:48 UTC
carbondata git commit: [HOTFIX] Enable Local dictionary by default
Repository: carbondata
Updated Branches:
refs/heads/master 9d468f0c7 -> db5da530e
[HOTFIX] Enable Local dictionary by default
Enable Local dictionary by default
This closes #2862
Project: http://git-wip-us.apache.org/repos/asf/carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/carbondata/commit/db5da530
Tree: http://git-wip-us.apache.org/repos/asf/carbondata/tree/db5da530
Diff: http://git-wip-us.apache.org/repos/asf/carbondata/diff/db5da530
Branch: refs/heads/master
Commit: db5da530eca68c347955cf139dc9ab0bb33c5473
Parents: 9d468f0
Author: ravipesala <ra...@gmail.com>
Authored: Fri Oct 26 21:13:26 2018 +0530
Committer: Jacky Li <ja...@qq.com>
Committed: Mon Oct 29 14:39:28 2018 +0800
----------------------------------------------------------------------
.../carbondata/core/constants/CarbonCommonConstants.java | 2 +-
.../createTable/TestNonTransactionalCarbonTable.scala | 10 +++++-----
.../TestNonTransactionalCarbonTableWithComplexType.scala | 4 ++--
.../spark/testsuite/describeTable/TestDescribeTable.scala | 4 ++--
.../LocalDictionarySupportAlterTableTest.scala | 2 +-
.../LocalDictionarySupportCreateTableTest.scala | 8 ++++----
6 files changed, 15 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/carbondata/blob/db5da530/core/src/main/java/org/apache/carbondata/core/constants/CarbonCommonConstants.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/constants/CarbonCommonConstants.java b/core/src/main/java/org/apache/carbondata/core/constants/CarbonCommonConstants.java
index 7df1b7e..37e2aa1 100644
--- a/core/src/main/java/org/apache/carbondata/core/constants/CarbonCommonConstants.java
+++ b/core/src/main/java/org/apache/carbondata/core/constants/CarbonCommonConstants.java
@@ -314,7 +314,7 @@ public final class CarbonCommonConstants {
/**
* default value for local dictionary generation
*/
- public static final String LOCAL_DICTIONARY_ENABLE_DEFAULT = "false";
+ public static final String LOCAL_DICTIONARY_ENABLE_DEFAULT = "true";
/**
* Threshold value for local dictionary
*/
http://git-wip-us.apache.org/repos/asf/carbondata/blob/db5da530/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/createTable/TestNonTransactionalCarbonTable.scala
----------------------------------------------------------------------
diff --git a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/createTable/TestNonTransactionalCarbonTable.scala b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/createTable/TestNonTransactionalCarbonTable.scala
index 2036ed2..e254792 100644
--- a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/createTable/TestNonTransactionalCarbonTable.scala
+++ b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/createTable/TestNonTransactionalCarbonTable.scala
@@ -2407,7 +2407,7 @@ class TestNonTransactionalCarbonTable extends QueryTest with BeforeAndAfterAll {
|'$writerPath' """.stripMargin)
val descLoc = sql("describe formatted sdkTable").collect
descLoc.find(_.get(0).toString.contains("Local Dictionary Enabled")) match {
- case Some(row) => assert(row.get(1).toString.contains("false"))
+ case Some(row) => assert(row.get(1).toString.contains("true"))
case None => assert(false)
}
FileUtils.deleteDirectory(new File(writerPath))
@@ -2432,7 +2432,7 @@ class TestNonTransactionalCarbonTable extends QueryTest with BeforeAndAfterAll {
|'$writerPath' """.stripMargin)
val descLoc = sql("describe formatted sdkTable").collect
descLoc.find(_.get(0).toString.contains("Local Dictionary Enabled")) match {
- case Some(row) => assert(row.get(1).toString.contains("false"))
+ case Some(row) => assert(row.get(1).toString.contains("true"))
case None => assert(false)
}
FileUtils.deleteDirectory(new File(writerPath))
@@ -2453,7 +2453,7 @@ class TestNonTransactionalCarbonTable extends QueryTest with BeforeAndAfterAll {
|'$writerPath' """.stripMargin)
val descLoc = sql("describe formatted sdkTable").collect
descLoc.find(_.get(0).toString.contains("Local Dictionary Enabled")) match {
- case Some(row) => assert(row.get(1).toString.contains("false"))
+ case Some(row) => assert(row.get(1).toString.contains("true"))
case None => assert(false)
}
FileUtils.deleteDirectory(new File(writerPath))
@@ -2475,10 +2475,10 @@ class TestNonTransactionalCarbonTable extends QueryTest with BeforeAndAfterAll {
FileUtils.deleteDirectory(new File(writerPath))
sql("insert into sdkTable select 's1','s2',23 ")
assert(FileFactory.getCarbonFile(writerPath).exists())
- assert(!testUtil.checkForLocalDictionary(testUtil.getDimRawChunk(0,writerPath)))
+ assert(testUtil.checkForLocalDictionary(testUtil.getDimRawChunk(0,writerPath)))
val descLoc = sql("describe formatted sdkTable").collect
descLoc.find(_.get(0).toString.contains("Local Dictionary Enabled")) match {
- case Some(row) => assert(row.get(1).toString.contains("false"))
+ case Some(row) => assert(row.get(1).toString.contains("true"))
case None => assert(false)
}
checkAnswer(sql("select count(*) from sdkTable"), Seq(Row(1)))
http://git-wip-us.apache.org/repos/asf/carbondata/blob/db5da530/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/createTable/TestNonTransactionalCarbonTableWithComplexType.scala
----------------------------------------------------------------------
diff --git a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/createTable/TestNonTransactionalCarbonTableWithComplexType.scala b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/createTable/TestNonTransactionalCarbonTableWithComplexType.scala
index 36cf5f4..dfe635f 100644
--- a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/createTable/TestNonTransactionalCarbonTableWithComplexType.scala
+++ b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/createTable/TestNonTransactionalCarbonTableWithComplexType.scala
@@ -38,7 +38,7 @@ class TestNonTransactionalCarbonTableWithComplexType extends QueryTest with Befo
var writerPath = new File(this.getClass.getResource("/").getPath
+
"../." +
- "./src/test/resources/SparkCarbonFileFormat/WriterOutput/")
+ "./target/SparkCarbonFileFormat/WriterOutput/")
.getCanonicalPath
//getCanonicalPath gives path with \, but the code expects /.
writerPath = writerPath.replace("\\", "/")
@@ -218,7 +218,7 @@ class TestNonTransactionalCarbonTableWithComplexType extends QueryTest with Befo
sql("describe formatted localComplex").show(30, false)
val descLoc = sql("describe formatted localComplex").collect
descLoc.find(_.get(0).toString.contains("Local Dictionary Enabled")) match {
- case Some(row) => assert(row.get(1).toString.contains("false"))
+ case Some(row) => assert(row.get(1).toString.contains("true"))
case None => assert(false)
}
http://git-wip-us.apache.org/repos/asf/carbondata/blob/db5da530/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/describeTable/TestDescribeTable.scala
----------------------------------------------------------------------
diff --git a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/describeTable/TestDescribeTable.scala b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/describeTable/TestDescribeTable.scala
index d0d89aa..764c612 100644
--- a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/describeTable/TestDescribeTable.scala
+++ b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/describeTable/TestDescribeTable.scala
@@ -51,10 +51,10 @@ class TestDescribeTable extends QueryTest with BeforeAndAfterAll {
test("test describe formatted table desc1") {
val resultCol = Seq("", "", "##Detailed Column property", "##Detailed Table Information", "ADAPTIVE", "CARBON Store Path", "Comment", "Database Name", "Last Update Time",
- "SORT_COLUMNS", "SORT_SCOPE", "CACHE_LEVEL", "Streaming", "Table Block Size", "Local Dictionary Enabled","Table Data Size", "Table Index Size", "Table Name", "dec2col1", "dec2col2", "dec2col3", "dec2col4")
+ "SORT_COLUMNS", "SORT_SCOPE", "CACHE_LEVEL", "Streaming", "Table Block Size", "Local Dictionary Enabled","Local Dictionary Include", "Local Dictionary Threshold","Table Data Size", "Table Index Size", "Table Name", "dec2col1", "dec2col2", "dec2col3", "dec2col4")
val resultRow: Seq[Row] = resultCol map(propName => Row(f"$propName%-36s"))
checkAnswer(sql("desc formatted DESC1").select("col_name"), resultRow)
- assert(sql("desc formatted desc1").count() == 22)
+ assert(sql("desc formatted desc1").count() == 24)
}
test("test describe formatted for partition table") {
http://git-wip-us.apache.org/repos/asf/carbondata/blob/db5da530/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/localdictionary/LocalDictionarySupportAlterTableTest.scala
----------------------------------------------------------------------
diff --git a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/localdictionary/LocalDictionarySupportAlterTableTest.scala b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/localdictionary/LocalDictionarySupportAlterTableTest.scala
index 38ecde8..431e3d4 100644
--- a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/localdictionary/LocalDictionarySupportAlterTableTest.scala
+++ b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/localdictionary/LocalDictionarySupportAlterTableTest.scala
@@ -880,7 +880,7 @@ class LocalDictionarySupportAlterTableTest extends QueryTest with BeforeAndAfter
sql("alter table local1 unset tblproperties('local_dictionary_enable')")
val descLoc2 = sql("describe formatted local1").collect
descLoc2.find(_.get(0).toString.contains("Local Dictionary Enable")) match {
- case Some(row) => assert(row.get(1).toString.contains("false"))
+ case Some(row) => assert(row.get(1).toString.contains("true"))
case None => assert(false)
}
}
http://git-wip-us.apache.org/repos/asf/carbondata/blob/db5da530/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/localdictionary/LocalDictionarySupportCreateTableTest.scala
----------------------------------------------------------------------
diff --git a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/localdictionary/LocalDictionarySupportCreateTableTest.scala b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/localdictionary/LocalDictionarySupportCreateTableTest.scala
index 6162cd8..86c6cd6 100644
--- a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/localdictionary/LocalDictionarySupportCreateTableTest.scala
+++ b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/localdictionary/LocalDictionarySupportCreateTableTest.scala
@@ -42,7 +42,7 @@ class LocalDictionarySupportCreateTableTest extends QueryTest with BeforeAndAfte
val descLoc = sql("describe formatted local1").collect
descLoc.find(_.get(0).toString.contains("Local Dictionary Enabled")) match {
- case Some(row) => assert(row.get(1).toString.contains("false"))
+ case Some(row) => assert(row.get(1).toString.contains("true"))
case None => assert(false)
}
}
@@ -1530,7 +1530,7 @@ class LocalDictionarySupportCreateTableTest extends QueryTest with BeforeAndAfte
val descLoc = sql("describe formatted local1").collect
descLoc.find(_.get(0).toString.contains("Local Dictionary Enabled")) match {
- case Some(row) => assert(row.get(1).toString.contains("false"))
+ case Some(row) => assert(row.get(1).toString.contains("true"))
case None => assert(false)
}
descLoc.find(_.get(0).toString.contains("SORT_SCOPE")) match {
@@ -1551,7 +1551,7 @@ class LocalDictionarySupportCreateTableTest extends QueryTest with BeforeAndAfte
val descLoc = sql("describe formatted local1").collect
descLoc.find(_.get(0).toString.contains("Local Dictionary Enabled")) match {
- case Some(row) => assert(row.get(1).toString.contains("false"))
+ case Some(row) => assert(row.get(1).toString.contains("true"))
case None => assert(false)
}
descLoc.find(_.get(0).toString.contains("SORT_SCOPE")) match {
@@ -1572,7 +1572,7 @@ class LocalDictionarySupportCreateTableTest extends QueryTest with BeforeAndAfte
val descLoc = sql("describe formatted local1").collect
descLoc.find(_.get(0).toString.contains("Local Dictionary Enabled")) match {
- case Some(row) => assert(row.get(1).toString.contains("false"))
+ case Some(row) => assert(row.get(1).toString.contains("true"))
case None => assert(false)
}
descLoc.find(_.get(0).toString.contains("SORT_SCOPE")) match {