Repository: incubator-carbondata Updated Branches: refs/heads/master cd058ad73 -> 94ffcdd20
SpellingMistakes Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/813e958b Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/813e958b Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/813e958b Branch: refs/heads/master Commit: 813e958b163fcc7416de9fc142a0bc5e96d9079f Parents: cd058ad Author: lion-x <xlion....@gmail.com> Authored: Wed Nov 2 11:20:56 2016 +0800 Committer: jackylk <jacky.li...@huawei.com> Committed: Wed Nov 2 18:42:52 2016 +0800 ---------------------------------------------------------------------- .../carbon/metadata/datatype/ConvertedType.java | 122 ------------------- .../core/carbon/metadata/datatype/DataType.java | 8 +- .../executor/impl/AbstractQueryExecutor.java | 2 +- .../scan/expression/ExpressionResult.java | 3 - .../expression/arithmetic/AddExpression.java | 4 +- .../expression/arithmetic/DivideExpression.java | 4 +- .../arithmetic/MultiplyExpression.java | 4 +- .../arithmetic/SubstractExpression.java | 4 +- .../conditional/EqualToExpression.java | 2 +- .../GreaterThanEqualToExpression.java | 2 +- .../conditional/GreaterThanExpression.java | 4 +- .../expression/conditional/InExpression.java | 4 +- .../conditional/LessThanEqualToExpression.java | 2 +- .../conditional/LessThanExpression.java | 2 +- .../conditional/NotEqualsExpression.java | 2 +- .../expression/conditional/NotInExpression.java | 4 +- .../carbondata/scan/model/CarbonQueryPlan.java | 2 +- .../carbondata/scan/model/QueryDimension.java | 4 +- .../carbondata/scan/model/QueryMeasure.java | 4 +- .../carbondata/scan/model/QueryModel.java | 20 +-- .../carbondata/scan/model/QuerySchemaInfo.java | 86 ------------- 21 files changed, 39 insertions(+), 250 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/813e958b/core/src/main/java/org/apache/carbondata/core/carbon/metadata/datatype/ConvertedType.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/carbon/metadata/datatype/ConvertedType.java b/core/src/main/java/org/apache/carbondata/core/carbon/metadata/datatype/ConvertedType.java deleted file mode 100644 index 7b99ec2..0000000 --- a/core/src/main/java/org/apache/carbondata/core/carbon/metadata/datatype/ConvertedType.java +++ /dev/null @@ -1,122 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.carbondata.core.carbon.metadata.datatype; - -public enum ConvertedType { - - /** - * a BYTE_ARRAY actually contains UTF8 encoded chars - */ - UTF8, - /** - * a map is converted as an optional field containing a repeated key/value pair - */ - MAP, - /** - * a key/value pair is converted into a group of two fields - */ - MAP_KEY_VALUE, - /** - * a list is converted into an optional field containing a repeated field for its - * values - */ - LIST, - /** - * an enum is converted into a binary field - */ - ENUM, - /** - * A decimal value. - * This may be used to annotate binary or fixed primitive types. The - * underlying byte array stores the unscaled value encoded as two's - * complement using big-endian byte order (the most significant byte is the - * zeroth element). The value of the decimal is the value * 10^{-scale}. - * This must be accompanied by a (maximum) precision and a scale in the - * SchemaElement. The precision specifies the number of digits in the decimal - * and the scale stores the location of the decimal point. For example 1.23 - * would have precision 3 (3 total digits) and scale 2 (the decimal point is - * 2 digits over). - */ - DECIMAL, - /** - * A Date - * Stored as days since Unix epoch, encoded as the INT32 physical type. - */ - DATE, - /** - * A time - * The total number of milliseconds since midnight. The value is stored - * as an INT32 physical type. - */ - TIME_MILLIS, - /** - * A date/time combination - * Date and time recorded as milliseconds since the Unix epoch. Recorded as - * a physical type of INT64. - */ - TIMESTAMP_MILLIS, - - RESERVED, - /** - * An unsigned integer value. - * The number describes the maximum number of meainful data bits in - * the stored value. 8, 16 and 32 bit values are stored using the - * INT32 physical type. 64 bit values are stored using the INT64 - * physical type. - */ - UINT_8, - UINT_16, - UINT_32, - UINT_64, - /** - * A signed integer value. - * The number describes the maximum number of meainful data bits in - * the stored value. 8, 16 and 32 bit values are stored using the - * INT32 physical type. 64 bit values are stored using the INT64 - * physical type. - */ - INT_8, - INT_16, - INT_32, - INT_64, - /** - * An embedded JSON document - * A JSON document embedded within a single UTF8 column. - */ - JSON, - - /** - * An embedded BSON document - * A BSON document embedded within a single BINARY column. - */ - BSON, - - /** - * An interval of time - * This type annotates data stored as a FIXED_LEN_BYTE_ARRAY of length 12 - * This data is composed of three separate little endian unsigned - * integers. Each stores a component of a duration of time. The first - * integer identifies the number of months associated with the duration, - * the second identifies the number of days associated with the duration - * and the third identifies the number of milliseconds associated with - * the provided duration. This duration of time is independent of any - * particular timezone or date. - */ - INTERVAL; -} http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/813e958b/core/src/main/java/org/apache/carbondata/core/carbon/metadata/datatype/DataType.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/carbon/metadata/datatype/DataType.java b/core/src/main/java/org/apache/carbondata/core/carbon/metadata/datatype/DataType.java index 28bce74..c69dfa1 100644 --- a/core/src/main/java/org/apache/carbondata/core/carbon/metadata/datatype/DataType.java +++ b/core/src/main/java/org/apache/carbondata/core/carbon/metadata/datatype/DataType.java @@ -36,16 +36,16 @@ public enum DataType { STRUCT(10, "STRUCT"), MAP(11, "MAP"); - private int presedenceOrder; + private int precedenceOrder; private String name ; DataType(int value ,String name) { - this.presedenceOrder = value; + this.precedenceOrder = value; this.name = name; } - public int getPresedenceOrder() { - return presedenceOrder; + public int getPrecedenceOrder() { + return precedenceOrder; } public String getName() { http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/813e958b/core/src/main/java/org/apache/carbondata/scan/executor/impl/AbstractQueryExecutor.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/scan/executor/impl/AbstractQueryExecutor.java b/core/src/main/java/org/apache/carbondata/scan/executor/impl/AbstractQueryExecutor.java index a99df99..85e979a 100644 --- a/core/src/main/java/org/apache/carbondata/scan/executor/impl/AbstractQueryExecutor.java +++ b/core/src/main/java/org/apache/carbondata/scan/executor/impl/AbstractQueryExecutor.java @@ -162,7 +162,7 @@ public abstract class AbstractQueryExecutor<E> implements QueryExecutor<E> { } /** - * Below method will be used to get the key structure info for the uqery + * Below method will be used to get the key structure info for the query * * @param queryModel query model * @param keyGenerator http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/813e958b/core/src/main/java/org/apache/carbondata/scan/expression/ExpressionResult.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/scan/expression/ExpressionResult.java b/core/src/main/java/org/apache/carbondata/scan/expression/ExpressionResult.java index 267f685..0da0cb2 100644 --- a/core/src/main/java/org/apache/carbondata/scan/expression/ExpressionResult.java +++ b/core/src/main/java/org/apache/carbondata/scan/expression/ExpressionResult.java @@ -34,7 +34,6 @@ import org.apache.carbondata.scan.expression.exception.FilterIllegalMemberExcept public class ExpressionResult implements Comparable<ExpressionResult> { - private static final long serialVersionUID = 1L; protected DataType dataType; protected Object value; @@ -60,7 +59,6 @@ public class ExpressionResult implements Comparable<ExpressionResult> { return dataType; } - //CHECKSTYLE:OFF Approval No:Approval-V1R2C10_009 public Integer getInt() throws FilterIllegalMemberException { if (value == null) { return null; @@ -200,7 +198,6 @@ public class ExpressionResult implements Comparable<ExpressionResult> { "Cannot convert" + this.getDataType().name() + " to Double type value"); } } - //CHECKSTYLE:ON public Long getLong() throws FilterIllegalMemberException { if (value == null) { http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/813e958b/core/src/main/java/org/apache/carbondata/scan/expression/arithmetic/AddExpression.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/scan/expression/arithmetic/AddExpression.java b/core/src/main/java/org/apache/carbondata/scan/expression/arithmetic/AddExpression.java index 5c5b2cd..e5dcc21 100644 --- a/core/src/main/java/org/apache/carbondata/scan/expression/arithmetic/AddExpression.java +++ b/core/src/main/java/org/apache/carbondata/scan/expression/arithmetic/AddExpression.java @@ -46,8 +46,8 @@ public class AddExpression extends BinaryArithmeticExpression { } if (addExprLeftRes.getDataType() != addExprRightRes.getDataType()) { - if (addExprLeftRes.getDataType().getPresedenceOrder() < addExprRightRes.getDataType() - .getPresedenceOrder()) { + if (addExprLeftRes.getDataType().getPrecedenceOrder() < addExprRightRes.getDataType() + .getPrecedenceOrder()) { val2 = addExprLeftRes; val1 = addExprRightRes; } http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/813e958b/core/src/main/java/org/apache/carbondata/scan/expression/arithmetic/DivideExpression.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/scan/expression/arithmetic/DivideExpression.java b/core/src/main/java/org/apache/carbondata/scan/expression/arithmetic/DivideExpression.java index a6b1085..4525681 100644 --- a/core/src/main/java/org/apache/carbondata/scan/expression/arithmetic/DivideExpression.java +++ b/core/src/main/java/org/apache/carbondata/scan/expression/arithmetic/DivideExpression.java @@ -45,8 +45,8 @@ public class DivideExpression extends BinaryArithmeticExpression { return divideExprLeftRes; } if (divideExprLeftRes.getDataType() != divideExprRightRes.getDataType()) { - if (divideExprLeftRes.getDataType().getPresedenceOrder() < divideExprRightRes.getDataType() - .getPresedenceOrder()) { + if (divideExprLeftRes.getDataType().getPrecedenceOrder() < divideExprRightRes.getDataType() + .getPrecedenceOrder()) { val2 = divideExprLeftRes; val1 = divideExprRightRes; } http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/813e958b/core/src/main/java/org/apache/carbondata/scan/expression/arithmetic/MultiplyExpression.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/scan/expression/arithmetic/MultiplyExpression.java b/core/src/main/java/org/apache/carbondata/scan/expression/arithmetic/MultiplyExpression.java index 4aaf40c..d110acd 100644 --- a/core/src/main/java/org/apache/carbondata/scan/expression/arithmetic/MultiplyExpression.java +++ b/core/src/main/java/org/apache/carbondata/scan/expression/arithmetic/MultiplyExpression.java @@ -46,8 +46,8 @@ public class MultiplyExpression extends BinaryArithmeticExpression { } if (multiplyExprLeftRes.getDataType() != multiplyExprRightRes.getDataType()) { - if (multiplyExprLeftRes.getDataType().getPresedenceOrder() < multiplyExprRightRes - .getDataType().getPresedenceOrder()) { + if (multiplyExprLeftRes.getDataType().getPrecedenceOrder() < multiplyExprRightRes + .getDataType().getPrecedenceOrder()) { val2 = multiplyExprLeftRes; val1 = multiplyExprRightRes; } http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/813e958b/core/src/main/java/org/apache/carbondata/scan/expression/arithmetic/SubstractExpression.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/scan/expression/arithmetic/SubstractExpression.java b/core/src/main/java/org/apache/carbondata/scan/expression/arithmetic/SubstractExpression.java index ca16484..5410f50 100644 --- a/core/src/main/java/org/apache/carbondata/scan/expression/arithmetic/SubstractExpression.java +++ b/core/src/main/java/org/apache/carbondata/scan/expression/arithmetic/SubstractExpression.java @@ -46,8 +46,8 @@ public class SubstractExpression extends BinaryArithmeticExpression { return subtractExprLeftRes; } if (subtractExprLeftRes.getDataType() != subtractExprRightRes.getDataType()) { - if (subtractExprLeftRes.getDataType().getPresedenceOrder() < subtractExprRightRes - .getDataType().getPresedenceOrder()) { + if (subtractExprLeftRes.getDataType().getPrecedenceOrder() < subtractExprRightRes + .getDataType().getPrecedenceOrder()) { val2 = subtractExprLeftRes; val1 = subtractExprRightRes; } http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/813e958b/core/src/main/java/org/apache/carbondata/scan/expression/conditional/EqualToExpression.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/scan/expression/conditional/EqualToExpression.java b/core/src/main/java/org/apache/carbondata/scan/expression/conditional/EqualToExpression.java index ddb0456..011b29f 100644 --- a/core/src/main/java/org/apache/carbondata/scan/expression/conditional/EqualToExpression.java +++ b/core/src/main/java/org/apache/carbondata/scan/expression/conditional/EqualToExpression.java @@ -61,7 +61,7 @@ public class EqualToExpression extends BinaryConditionalExpression { } //default implementation if the data types are different for the resultsets if (elRes.getDataType() != erRes.getDataType()) { - if (elRes.getDataType().getPresedenceOrder() < erRes.getDataType().getPresedenceOrder()) { + if (elRes.getDataType().getPrecedenceOrder() < erRes.getDataType().getPrecedenceOrder()) { val2 = elRes; val1 = erRes; } http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/813e958b/core/src/main/java/org/apache/carbondata/scan/expression/conditional/GreaterThanEqualToExpression.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/scan/expression/conditional/GreaterThanEqualToExpression.java b/core/src/main/java/org/apache/carbondata/scan/expression/conditional/GreaterThanEqualToExpression.java index 4b9b8ff..98c438a 100644 --- a/core/src/main/java/org/apache/carbondata/scan/expression/conditional/GreaterThanEqualToExpression.java +++ b/core/src/main/java/org/apache/carbondata/scan/expression/conditional/GreaterThanEqualToExpression.java @@ -44,7 +44,7 @@ public class GreaterThanEqualToExpression extends BinaryConditionalExpression { return elRes; } if (elRes.getDataType() != erRes.getDataType()) { - if (elRes.getDataType().getPresedenceOrder() < erRes.getDataType().getPresedenceOrder()) { + if (elRes.getDataType().getPrecedenceOrder() < erRes.getDataType().getPrecedenceOrder()) { exprResVal1 = erRes; } http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/813e958b/core/src/main/java/org/apache/carbondata/scan/expression/conditional/GreaterThanExpression.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/scan/expression/conditional/GreaterThanExpression.java b/core/src/main/java/org/apache/carbondata/scan/expression/conditional/GreaterThanExpression.java index d4e8ad8..a477d7b 100644 --- a/core/src/main/java/org/apache/carbondata/scan/expression/conditional/GreaterThanExpression.java +++ b/core/src/main/java/org/apache/carbondata/scan/expression/conditional/GreaterThanExpression.java @@ -45,8 +45,8 @@ public class GreaterThanExpression extends BinaryConditionalExpression { return exprLeftRes; } if (exprLeftRes.getDataType() != exprRightRes.getDataType()) { - if (exprLeftRes.getDataType().getPresedenceOrder() < exprRightRes.getDataType() - .getPresedenceOrder()) { + if (exprLeftRes.getDataType().getPrecedenceOrder() < exprRightRes.getDataType() + .getPrecedenceOrder()) { val1 = exprRightRes; } http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/813e958b/core/src/main/java/org/apache/carbondata/scan/expression/conditional/InExpression.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/scan/expression/conditional/InExpression.java b/core/src/main/java/org/apache/carbondata/scan/expression/conditional/InExpression.java index 33888c9..1e0d3b9 100644 --- a/core/src/main/java/org/apache/carbondata/scan/expression/conditional/InExpression.java +++ b/core/src/main/java/org/apache/carbondata/scan/expression/conditional/InExpression.java @@ -48,8 +48,8 @@ public class InExpression extends BinaryConditionalExpression { ExpressionResult val = null; setOfExprResult = new HashSet<ExpressionResult>(10); for (ExpressionResult expressionResVal : rightRsult.getList()) { - if (expressionResVal.getDataType().getPresedenceOrder() < leftRsult.getDataType() - .getPresedenceOrder()) { + if (expressionResVal.getDataType().getPrecedenceOrder() < leftRsult.getDataType() + .getPrecedenceOrder()) { val = leftRsult; } else { val = expressionResVal; http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/813e958b/core/src/main/java/org/apache/carbondata/scan/expression/conditional/LessThanEqualToExpression.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/scan/expression/conditional/LessThanEqualToExpression.java b/core/src/main/java/org/apache/carbondata/scan/expression/conditional/LessThanEqualToExpression.java index 0e18db9..e78a112 100644 --- a/core/src/main/java/org/apache/carbondata/scan/expression/conditional/LessThanEqualToExpression.java +++ b/core/src/main/java/org/apache/carbondata/scan/expression/conditional/LessThanEqualToExpression.java @@ -44,7 +44,7 @@ public class LessThanEqualToExpression extends BinaryConditionalExpression { return elRes; } if (elRes.getDataType() != erRes.getDataType()) { - if (elRes.getDataType().getPresedenceOrder() < erRes.getDataType().getPresedenceOrder()) { + if (elRes.getDataType().getPrecedenceOrder() < erRes.getDataType().getPrecedenceOrder()) { exprResValue1 = erRes; } http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/813e958b/core/src/main/java/org/apache/carbondata/scan/expression/conditional/LessThanExpression.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/scan/expression/conditional/LessThanExpression.java b/core/src/main/java/org/apache/carbondata/scan/expression/conditional/LessThanExpression.java index 8873d72..5b19afe 100644 --- a/core/src/main/java/org/apache/carbondata/scan/expression/conditional/LessThanExpression.java +++ b/core/src/main/java/org/apache/carbondata/scan/expression/conditional/LessThanExpression.java @@ -49,7 +49,7 @@ public class LessThanExpression extends BinaryConditionalExpression { return elRes; } if (elRes.getDataType() != erRes.getDataType()) { - if (elRes.getDataType().getPresedenceOrder() < erRes.getDataType().getPresedenceOrder()) { + if (elRes.getDataType().getPrecedenceOrder() < erRes.getDataType().getPrecedenceOrder()) { val1 = erRes; } http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/813e958b/core/src/main/java/org/apache/carbondata/scan/expression/conditional/NotEqualsExpression.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/scan/expression/conditional/NotEqualsExpression.java b/core/src/main/java/org/apache/carbondata/scan/expression/conditional/NotEqualsExpression.java index 40f761b..9181946 100644 --- a/core/src/main/java/org/apache/carbondata/scan/expression/conditional/NotEqualsExpression.java +++ b/core/src/main/java/org/apache/carbondata/scan/expression/conditional/NotEqualsExpression.java @@ -59,7 +59,7 @@ public class NotEqualsExpression extends BinaryConditionalExpression { //default implementation if the data types are different for the resultsets if (elRes.getDataType() != erRes.getDataType()) { // result = elRes.getString().equals(erRes.getString()); - if (elRes.getDataType().getPresedenceOrder() < erRes.getDataType().getPresedenceOrder()) { + if (elRes.getDataType().getPrecedenceOrder() < erRes.getDataType().getPrecedenceOrder()) { val1 = erRes; val2 = elRes; } http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/813e958b/core/src/main/java/org/apache/carbondata/scan/expression/conditional/NotInExpression.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/scan/expression/conditional/NotInExpression.java b/core/src/main/java/org/apache/carbondata/scan/expression/conditional/NotInExpression.java index 89a4b3c..2ed0797 100644 --- a/core/src/main/java/org/apache/carbondata/scan/expression/conditional/NotInExpression.java +++ b/core/src/main/java/org/apache/carbondata/scan/expression/conditional/NotInExpression.java @@ -46,8 +46,8 @@ public class NotInExpression extends BinaryConditionalExpression { ExpressionResult rightRsult = right.evaluate(value); setOfExprResult = new HashSet<ExpressionResult>(10); for (ExpressionResult exprResVal : rightRsult.getList()) { - if (exprResVal.getDataType().getPresedenceOrder() < leftRsult.getDataType() - .getPresedenceOrder()) { + if (exprResVal.getDataType().getPrecedenceOrder() < leftRsult.getDataType() + .getPrecedenceOrder()) { val = leftRsult; } else { val = exprResVal; http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/813e958b/core/src/main/java/org/apache/carbondata/scan/model/CarbonQueryPlan.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/scan/model/CarbonQueryPlan.java b/core/src/main/java/org/apache/carbondata/scan/model/CarbonQueryPlan.java index 18945d6..8ce732d 100644 --- a/core/src/main/java/org/apache/carbondata/scan/model/CarbonQueryPlan.java +++ b/core/src/main/java/org/apache/carbondata/scan/model/CarbonQueryPlan.java @@ -100,7 +100,7 @@ public class CarbonQueryPlan implements Serializable { private List<QueryDimension> sortedDimensions; /** - * If it is raw detail query, no need to aggregate in backend. And it reurns with dictionary data + * If it is raw detail query, no need to aggregate in backend. And it returns with dictionary data * with out decoding. */ private boolean rawDetailQuery; http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/813e958b/core/src/main/java/org/apache/carbondata/scan/model/QueryDimension.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/scan/model/QueryDimension.java b/core/src/main/java/org/apache/carbondata/scan/model/QueryDimension.java index 1f1f2cb..3694bb9 100644 --- a/core/src/main/java/org/apache/carbondata/scan/model/QueryDimension.java +++ b/core/src/main/java/org/apache/carbondata/scan/model/QueryDimension.java @@ -38,8 +38,8 @@ public class QueryDimension extends QueryColumn implements Serializable { */ private transient CarbonDimension dimension; - public QueryDimension(String columName) { - super(columName); + public QueryDimension(String columnName) { + super(columnName); } /** http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/813e958b/core/src/main/java/org/apache/carbondata/scan/model/QueryMeasure.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/scan/model/QueryMeasure.java b/core/src/main/java/org/apache/carbondata/scan/model/QueryMeasure.java index 0ea84c7..ef4b668 100644 --- a/core/src/main/java/org/apache/carbondata/scan/model/QueryMeasure.java +++ b/core/src/main/java/org/apache/carbondata/scan/model/QueryMeasure.java @@ -40,8 +40,8 @@ public class QueryMeasure extends QueryColumn implements Serializable { */ private transient CarbonMeasure measure; - public QueryMeasure(String columName) { - super(columName); + public QueryMeasure(String columnName) { + super(columnName); } /** http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/813e958b/core/src/main/java/org/apache/carbondata/scan/model/QueryModel.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/scan/model/QueryModel.java b/core/src/main/java/org/apache/carbondata/scan/model/QueryModel.java index 10cbd25..b21a082 100644 --- a/core/src/main/java/org/apache/carbondata/scan/model/QueryModel.java +++ b/core/src/main/java/org/apache/carbondata/scan/model/QueryModel.java @@ -84,7 +84,7 @@ public class QueryModel implements Serializable { */ private FilterResolverIntf filterExpressionResolverTree; /** - * in case of lime query we need to know how many + * in case of limit query we need to know how many * records will passed from executor */ private int limit; @@ -120,9 +120,9 @@ public class QueryModel implements Serializable { */ private boolean forcedDetailRawQuery; /** - * paritition column list + * partition column list */ - private List<String> paritionColumns; + private List<String> partitionColumns; /** * table on which query will be executed * TODO need to remove this ad pass only the path @@ -145,7 +145,7 @@ public class QueryModel implements Serializable { queryMeasures = new ArrayList<QueryMeasure>(); sortDimension = new ArrayList<QueryDimension>(); sortOrder = new byte[0]; - paritionColumns = new ArrayList<String>(); + partitionColumns = new ArrayList<String>(); invalidSegmentIds = new ArrayList<>(); } @@ -448,17 +448,17 @@ public class QueryModel implements Serializable { } /** - * @return the paritionColumns + * @return the partitionColumns */ - public List<String> getParitionColumns() { - return paritionColumns; + public List<String> getPartitionColumns() { + return partitionColumns; } /** - * @param paritionColumns the paritionColumns to set + * @param partitionColumns the partitionColumns to set */ - public void setParitionColumns(List<String> paritionColumns) { - this.paritionColumns = paritionColumns; + public void setPartitionColumns(List<String> partitionColumns) { + this.partitionColumns = partitionColumns; } /** http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/813e958b/core/src/main/java/org/apache/carbondata/scan/model/QuerySchemaInfo.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/scan/model/QuerySchemaInfo.java b/core/src/main/java/org/apache/carbondata/scan/model/QuerySchemaInfo.java deleted file mode 100644 index 185609f..0000000 --- a/core/src/main/java/org/apache/carbondata/scan/model/QuerySchemaInfo.java +++ /dev/null @@ -1,86 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.carbondata.scan.model; - -import java.io.Serializable; - -import org.apache.carbondata.core.keygenerator.KeyGenerator; - -public class QuerySchemaInfo implements Serializable { - - private int[] maskedByteIndexes; - - private KeyGenerator keyGenerator; - - private QueryDimension[] queryDimensions; - - private QueryMeasure[] queryMeasures; - - private int[] queryOrder; - - private int[] queryReverseOrder; - - public int[] getMaskedByteIndexes() { - return maskedByteIndexes; - } - - public void setMaskedByteIndexes(int[] maskedByteIndexes) { - this.maskedByteIndexes = maskedByteIndexes; - } - - public KeyGenerator getKeyGenerator() { - return keyGenerator; - } - - public void setKeyGenerator(KeyGenerator keyGenerator) { - this.keyGenerator = keyGenerator; - } - - public QueryDimension[] getQueryDimensions() { - return queryDimensions; - } - - public void setQueryDimensions(QueryDimension[] queryDimensions) { - this.queryDimensions = queryDimensions; - } - - public QueryMeasure[] getQueryMeasures() { - return queryMeasures; - } - - public void setQueryMeasures(QueryMeasure[] queryMeasures) { - this.queryMeasures = queryMeasures; - } - - public int[] getQueryOrder() { - return queryOrder; - } - - public void setQueryOrder(int[] queryOrder) { - this.queryOrder = queryOrder; - } - - public int[] getQueryReverseOrder() { - return queryReverseOrder; - } - - public void setQueryReverseOrder(int[] queryReverseOrder) { - this.queryReverseOrder = queryReverseOrder; - } -}
