Repository: incubator-carbondata Updated Branches: refs/heads/master 8d3e1412a -> 5a97fc795
InvertedIndexSpellingMistakes Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/e85bb694 Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/e85bb694 Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/e85bb694 Branch: refs/heads/master Commit: e85bb694a0d00fc307d4571ec86e3f8b4e18f88a Parents: 8d3e141 Author: lion-x <xlion....@gmail.com> Authored: Wed Oct 26 09:21:51 2016 +0800 Committer: jackylk <jacky.li...@huawei.com> Committed: Wed Oct 26 18:32:36 2016 +0800 ---------------------------------------------------------------------- .../metadata/schema/table/column/CarbonColumn.java | 2 +- .../integration/spark/merger/RowResultMerger.java | 2 +- .../spark/sql/execution/command/carbonTableSchema.scala | 12 ++++++------ .../processing/graphgenerator/GraphGenerator.java | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/e85bb694/core/src/main/java/org/apache/carbondata/core/carbon/metadata/schema/table/column/CarbonColumn.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/carbon/metadata/schema/table/column/CarbonColumn.java b/core/src/main/java/org/apache/carbondata/core/carbon/metadata/schema/table/column/CarbonColumn.java index 88119d0..2cef374 100644 --- a/core/src/main/java/org/apache/carbondata/core/carbon/metadata/schema/table/column/CarbonColumn.java +++ b/core/src/main/java/org/apache/carbondata/core/carbon/metadata/schema/table/column/CarbonColumn.java @@ -151,7 +151,7 @@ public class CarbonColumn implements Serializable { /** * @return if column use inverted index return true, else false. */ - public Boolean isUseInvertedIndnex() { + public Boolean isUseInvertedIndex() { return columnSchema.isUseInvertedIndex(); } public ColumnSchema getColumnSchema() { http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/e85bb694/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 3e805fa..be2a81d 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 @@ -256,7 +256,7 @@ public class RowResultMerger { boolean[] isUseInvertedIndexes = new boolean[dimensionByTableName.size()]; int index = 0; for (CarbonDimension dimension : dimensionByTableName) { - isUseInvertedIndexes[index++] = dimension.isUseInvertedIndnex(); + isUseInvertedIndexes[index++] = dimension.isUseInvertedIndex(); } carbonFactDataHandlerModel.setIsUseInvertedIndex(isUseInvertedIndexes); return carbonFactDataHandlerModel; http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/e85bb694/integration/spark/src/main/scala/org/apache/spark/sql/execution/command/carbonTableSchema.scala ---------------------------------------------------------------------- diff --git a/integration/spark/src/main/scala/org/apache/spark/sql/execution/command/carbonTableSchema.scala b/integration/spark/src/main/scala/org/apache/spark/sql/execution/command/carbonTableSchema.scala index 19e23f7..5599ae0 100644 --- a/integration/spark/src/main/scala/org/apache/spark/sql/execution/command/carbonTableSchema.scala +++ b/integration/spark/src/main/scala/org/apache/spark/sql/execution/command/carbonTableSchema.scala @@ -274,7 +274,7 @@ class TableNewProcessor(cm: tableModel, sqlContext: SQLContext) { cm.msrCols.foreach(field => { val encoders = new java.util.ArrayList[Encoding]() - val coloumnSchema: ColumnSchema = getColumnSchema( + val columnSchema: ColumnSchema = getColumnSchema( DataTypeConverterUtil.convertToCarbonType(field.dataType.getOrElse("")), field.name.getOrElse(field.column), index, @@ -284,7 +284,7 @@ class TableNewProcessor(cm: tableModel, sqlContext: SQLContext) { -1, field.precision, field.scale) - val measureCol = coloumnSchema + val measureCol = columnSchema allColumns ++= Seq(measureCol) index = index + 1 @@ -327,7 +327,7 @@ class TableNewProcessor(cm: tableModel, sqlContext: SQLContext) { } - // Setting the boolen value of useInvertedIndex in column shcehma + // Setting the boolean value of useInvertedIndex in column schema val noInvertedIndexCols = cm.noInvertedIdxCols.getOrElse(Seq()) for (column <- allColumns) { // When the column is measure or the specified no inverted index column in DDL, @@ -343,15 +343,15 @@ class TableNewProcessor(cm: tableModel, sqlContext: SQLContext) { // Adding dummy measure if no measure is provided if (measures.size < 1) { val encoders = new java.util.ArrayList[Encoding]() - val coloumnSchema: ColumnSchema = getColumnSchema(DataType.DOUBLE, + val columnSchema: ColumnSchema = getColumnSchema(DataType.DOUBLE, CarbonCommonConstants.DEFAULT_INVISIBLE_DUMMY_MEASURE, index, true, encoders, false, -1, 0, 0) - coloumnSchema.setInvisible(true) - val measureColumn = coloumnSchema + columnSchema.setInvisible(true) + val measureColumn = columnSchema measures += measureColumn allColumns = allColumns ++ measures } http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/e85bb694/processing/src/main/java/org/apache/carbondata/processing/graphgenerator/GraphGenerator.java ---------------------------------------------------------------------- diff --git a/processing/src/main/java/org/apache/carbondata/processing/graphgenerator/GraphGenerator.java b/processing/src/main/java/org/apache/carbondata/processing/graphgenerator/GraphGenerator.java index 1b5b68f..bc02d1a 100644 --- a/processing/src/main/java/org/apache/carbondata/processing/graphgenerator/GraphGenerator.java +++ b/processing/src/main/java/org/apache/carbondata/processing/graphgenerator/GraphGenerator.java @@ -986,7 +986,7 @@ public class GraphGenerator { GraphConfigurationInfo graphConfig) { List<Boolean> isUseInvertedIndexList = new ArrayList<Boolean>(); for (CarbonDimension dimension : dims) { - if (dimension.isUseInvertedIndnex()) { + if (dimension.isUseInvertedIndex()) { isUseInvertedIndexList.add(true); } else { isUseInvertedIndexList.add(false);
