Resolved compilations after merging from master.
Project: http://git-wip-us.apache.org/repos/asf/carbondata/repo Commit: http://git-wip-us.apache.org/repos/asf/carbondata/commit/6a63c06d Tree: http://git-wip-us.apache.org/repos/asf/carbondata/tree/6a63c06d Diff: http://git-wip-us.apache.org/repos/asf/carbondata/diff/6a63c06d Branch: refs/heads/branch-1.1 Commit: 6a63c06d196b1a82d91027bfa9722bfaf5f14505 Parents: b4e74eb Author: ravipesala <ravi.pes...@gmail.com> Authored: Sat Jun 24 12:08:38 2017 +0530 Committer: ravipesala <ravi.pes...@gmail.com> Committed: Sat Jun 24 12:08:38 2017 +0530 ---------------------------------------------------------------------- .../UnsafeSingleThreadFinalSortFilesMerger.java | 26 ++++++++++++++++++++ 1 file changed, 26 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/carbondata/blob/6a63c06d/processing/src/main/java/org/apache/carbondata/processing/newflow/sort/unsafe/merger/UnsafeSingleThreadFinalSortFilesMerger.java ---------------------------------------------------------------------- diff --git a/processing/src/main/java/org/apache/carbondata/processing/newflow/sort/unsafe/merger/UnsafeSingleThreadFinalSortFilesMerger.java b/processing/src/main/java/org/apache/carbondata/processing/newflow/sort/unsafe/merger/UnsafeSingleThreadFinalSortFilesMerger.java index 44f29d1..cd6b321 100644 --- a/processing/src/main/java/org/apache/carbondata/processing/newflow/sort/unsafe/merger/UnsafeSingleThreadFinalSortFilesMerger.java +++ b/processing/src/main/java/org/apache/carbondata/processing/newflow/sort/unsafe/merger/UnsafeSingleThreadFinalSortFilesMerger.java @@ -55,6 +55,25 @@ public class UnsafeSingleThreadFinalSortFilesMerger extends CarbonIterator<Objec private SortParameters parameters; /** + * number of measures + */ + private int measureCount; + + /** + * number of dimensionCount + */ + private int dimensionCount; + + /** + * number of complexDimensionCount + */ + private int noDictionaryCount; + + private int complexDimensionCount; + + private boolean[] isNoDictionaryDimensionColumn; + + /** * tempFileLocation */ private String tempFileLocation; @@ -66,6 +85,13 @@ public class UnsafeSingleThreadFinalSortFilesMerger extends CarbonIterator<Objec public UnsafeSingleThreadFinalSortFilesMerger(SortParameters parameters, String tempFileLocation) { this.parameters = parameters; + // set measure and dimension count + this.measureCount = parameters.getMeasureColCount(); + this.dimensionCount = parameters.getDimColCount(); + this.complexDimensionCount = parameters.getComplexDimColCount(); + + this.noDictionaryCount = parameters.getNoDictionaryCount(); + this.isNoDictionaryDimensionColumn = parameters.getNoDictionaryDimnesionColumn(); this.tempFileLocation = tempFileLocation; this.tableName = parameters.getTableName(); }