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 2016/11/07 02:37:38 UTC
[1/2] incubator-carbondata git commit: Pass block size to model
during compaction.
Repository: incubator-carbondata
Updated Branches:
refs/heads/master b681a3809 -> 2cbbe8ac7
Pass block size to model during compaction.
Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/45766528
Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/45766528
Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/45766528
Branch: refs/heads/master
Commit: 4576652849e46d21b3fbadc71000f29b6ef64a02
Parents: b681a38
Author: Ashok <as...@gmail.com>
Authored: Thu Nov 3 07:35:37 2016 +0530
Committer: ravipesala <ra...@gmail.com>
Committed: Mon Nov 7 08:06:37 2016 +0530
----------------------------------------------------------------------
.../carbondata/integration/spark/merger/RowResultMerger.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/45766528/integration/spark/src/main/java/org/apache/carbondata/integration/spark/merger/RowResultMerger.java
----------------------------------------------------------------------
diff --git a/integration/spark/src/main/java/org/apache/carbondata/integration/spark/merger/RowResultMerger.java b/integration/spark/src/main/java/org/apache/carbondata/integration/spark/merger/RowResultMerger.java
index be2a81d..7c3d2a7 100644
--- a/integration/spark/src/main/java/org/apache/carbondata/integration/spark/merger/RowResultMerger.java
+++ b/integration/spark/src/main/java/org/apache/carbondata/integration/spark/merger/RowResultMerger.java
@@ -102,7 +102,8 @@ public class RowResultMerger {
this.tableName = tableName;
this.measureCount = segprop.getMeasures().size();
-
+ CarbonTable carbonTable = CarbonMetadata.getInstance()
+ .getCarbonTable(databaseName + CarbonCommonConstants.UNDERSCORE + tableName);
CarbonFactDataHandlerModel carbonFactDataHandlerModel =
getCarbonFactDataHandlerModel(loadModel);
carbonFactDataHandlerModel.setPrimitiveDimLens(segprop.getDimColumnsCardinality());
@@ -117,7 +118,7 @@ public class RowResultMerger {
carbonFactDataHandlerModel.setMdKeyIndex(measureCount);
}
carbonFactDataHandlerModel.setColCardinality(colCardinality);
-
+ carbonFactDataHandlerModel.setBlockSizeInMB(carbonTable.getBlockSizeInMB());
dataHandler = new CarbonFactDataHandlerColumnar(carbonFactDataHandlerModel);
tupleConvertor = new TupleConversionAdapter(segProp);
[2/2] incubator-carbondata git commit: [CARBONDATA-365]Pass block
size to model during compaction This closes #283
Posted by ra...@apache.org.
[CARBONDATA-365]Pass block size to model during compaction This closes #283
Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/2cbbe8ac
Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/2cbbe8ac
Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/2cbbe8ac
Branch: refs/heads/master
Commit: 2cbbe8ac73118962d290211dc379c55da8f74dad
Parents: b681a38 4576652
Author: ravipesala <ra...@gmail.com>
Authored: Mon Nov 7 08:07:17 2016 +0530
Committer: ravipesala <ra...@gmail.com>
Committed: Mon Nov 7 08:07:17 2016 +0530
----------------------------------------------------------------------
.../carbondata/integration/spark/merger/RowResultMerger.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------