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 2017/08/03 14:31:04 UTC
carbondata git commit: [CARBONDATA-1354]Remove the useless
restriction of 'single_pass' can not be true when 'SORT_SCOPE'='GLOBAL_SORT'
Repository: carbondata
Updated Branches:
refs/heads/master 6d37b0572 -> 68d8e5703
[CARBONDATA-1354]Remove the useless restriction of 'single_pass' can not be true when 'SORT_SCOPE'='GLOBAL_SORT'
Now when 'SORT_SCOPE'='GLOBAL_SORT', 'single_pass' can be 'true', so remove the useless restriction
This closes #1224
Project: http://git-wip-us.apache.org/repos/asf/carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/carbondata/commit/68d8e570
Tree: http://git-wip-us.apache.org/repos/asf/carbondata/tree/68d8e570
Diff: http://git-wip-us.apache.org/repos/asf/carbondata/diff/68d8e570
Branch: refs/heads/master
Commit: 68d8e570398dac9b0556c9f86a7ea99daedd1599
Parents: 6d37b05
Author: Zhang Zhichao <44...@qq.com>
Authored: Wed Aug 2 13:54:49 2017 +0800
Committer: Jacky Li <ja...@qq.com>
Committed: Thu Aug 3 22:30:44 2017 +0800
----------------------------------------------------------------------
.../spark/testsuite/dataload/TestGlobalSortDataLoad.scala | 2 +-
.../apache/spark/sql/execution/command/carbonTableSchema.scala | 4 ----
2 files changed, 1 insertion(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/carbondata/blob/68d8e570/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/dataload/TestGlobalSortDataLoad.scala
----------------------------------------------------------------------
diff --git a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/dataload/TestGlobalSortDataLoad.scala b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/dataload/TestGlobalSortDataLoad.scala
index 64ea6dd..798ed45 100644
--- a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/dataload/TestGlobalSortDataLoad.scala
+++ b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/dataload/TestGlobalSortDataLoad.scala
@@ -98,7 +98,7 @@ class TestGlobalSortDataLoad extends QueryTest with BeforeAndAfterEach with Befo
// ----------------------------------- Single Pass -----------------------------------
// Waiting for merge [CARBONDATA-1145]
- ignore("Test GLOBAL_SORT with SINGLE_PASS") {
+ test("Test GLOBAL_SORT with SINGLE_PASS") {
sql(s"LOAD DATA LOCAL INPATH '$filePath' INTO TABLE carbon_globalsort " +
"OPTIONS('SORT_SCOPE'='GLOBAL_SORT', 'SINGLE_PASS'='TRUE')")
http://git-wip-us.apache.org/repos/asf/carbondata/blob/68d8e570/integration/spark2/src/main/scala/org/apache/spark/sql/execution/command/carbonTableSchema.scala
----------------------------------------------------------------------
diff --git a/integration/spark2/src/main/scala/org/apache/spark/sql/execution/command/carbonTableSchema.scala b/integration/spark2/src/main/scala/org/apache/spark/sql/execution/command/carbonTableSchema.scala
index 80b1436..1c0189c 100644
--- a/integration/spark2/src/main/scala/org/apache/spark/sql/execution/command/carbonTableSchema.scala
+++ b/integration/spark2/src/main/scala/org/apache/spark/sql/execution/command/carbonTableSchema.scala
@@ -537,10 +537,6 @@ case class LoadTable(
val complex_delimeter_level2 = optionsFinal("complex_delimiter_level_2")
val all_dictionary_path = optionsFinal("all_dictionary_path")
val column_dict = optionsFinal("columndict")
- if (sort_scope.equals("GLOBAL_SORT") &&
- single_pass.equals("TRUE")) {
- sys.error("Global_Sort can't be used with single_pass flow")
- }
ValidateUtil.validateDateFormat(dateFormat, table, tableName)
ValidateUtil.validateSortScope(table, sort_scope)