You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@carbondata.apache.org by ra...@apache.org on 2017/05/15 05:06:31 UTC
[18/19] carbondata git commit: fix rebase issue
fix rebase issue
Project: http://git-wip-us.apache.org/repos/asf/carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/carbondata/commit/fa08ab43
Tree: http://git-wip-us.apache.org/repos/asf/carbondata/tree/fa08ab43
Diff: http://git-wip-us.apache.org/repos/asf/carbondata/diff/fa08ab43
Branch: refs/heads/master
Commit: fa08ab43af1fb11712962e46817bbfec834a2b52
Parents: b6b93f0
Author: QiangCai <qi...@qq.com>
Authored: Sun May 14 19:13:53 2017 +0800
Committer: jackylk <ja...@huawei.com>
Committed: Sun May 14 20:40:14 2017 +0800
----------------------------------------------------------------------
.../spark/testsuite/dataload/TestLoadDataFrame.scala | 4 ++--
.../processing/newflow/sort/unsafe/UnsafeSortDataRows.java | 6 ++++--
2 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/carbondata/blob/fa08ab43/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/dataload/TestLoadDataFrame.scala
----------------------------------------------------------------------
diff --git a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/dataload/TestLoadDataFrame.scala b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/dataload/TestLoadDataFrame.scala
index 9179c08..994acf6 100644
--- a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/dataload/TestLoadDataFrame.scala
+++ b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/dataload/TestLoadDataFrame.scala
@@ -171,7 +171,7 @@ class TestLoadDataFrame extends QueryTest with BeforeAndAfterAll {
test("test load dataframe with single pass enabled") {
// save dataframe to carbon file
- df.write
+ df2.write
.format("carbondata")
.option("tableName", "carbon8")
.option("tempCSV", "false")
@@ -186,7 +186,7 @@ class TestLoadDataFrame extends QueryTest with BeforeAndAfterAll {
test("test load dataframe with single pass disabled") {
// save dataframe to carbon file
- df.write
+ df2.write
.format("carbondata")
.option("tableName", "carbon9")
.option("tempCSV", "true")
http://git-wip-us.apache.org/repos/asf/carbondata/blob/fa08ab43/processing/src/main/java/org/apache/carbondata/processing/newflow/sort/unsafe/UnsafeSortDataRows.java
----------------------------------------------------------------------
diff --git a/processing/src/main/java/org/apache/carbondata/processing/newflow/sort/unsafe/UnsafeSortDataRows.java b/processing/src/main/java/org/apache/carbondata/processing/newflow/sort/unsafe/UnsafeSortDataRows.java
index 0acc6a1..94a2d07 100644
--- a/processing/src/main/java/org/apache/carbondata/processing/newflow/sort/unsafe/UnsafeSortDataRows.java
+++ b/processing/src/main/java/org/apache/carbondata/processing/newflow/sort/unsafe/UnsafeSortDataRows.java
@@ -216,9 +216,11 @@ public class UnsafeSortDataRows {
dataSorterAndWriterExecutorService.submit(new DataSorterAndWriter(rowPage));
MemoryBlock memoryBlock = getMemoryBlock(inMemoryChunkSize);
boolean saveToDisk = !UnsafeMemoryManager.INSTANCE.isMemoryAvailable();
- rowPage = new UnsafeCarbonRowPage(parameters.getNoDictionaryDimnesionColumn(),
+ rowPage = new UnsafeCarbonRowPage(
+ parameters.getNoDictionaryDimnesionColumn(),
+ parameters.getNoDictionarySortColumn(),
parameters.getDimColCount(), parameters.getMeasureColCount(),
- parameters.getAggType(), memoryBlock,
+ parameters.getMeasureDataType(), memoryBlock,
saveToDisk);
rowPage.addRow(row);
} catch (Exception e) {