Repository: phoenix Updated Branches: refs/heads/calcite f9ddb988c -> 62d6720f7
PHOENIX-1930 [BW COMPAT] Queries hangs with client on Phoenix 4.3.0 and server on 4.x-HBase-0.98 Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/864faba6 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/864faba6 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/864faba6 Branch: refs/heads/calcite Commit: 864faba6d6091136d6776f1d81cd5264d3a0e14e Parents: 064b7af Author: Thomas <tdsi...@salesforce.com> Authored: Wed Apr 29 11:16:41 2015 -0700 Committer: Thomas <tdsi...@salesforce.com> Committed: Wed Apr 29 11:42:09 2015 -0700 ---------------------------------------------------------------------- .../org/apache/phoenix/expression/ExpressionType.java | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/864faba6/phoenix-core/src/main/java/org/apache/phoenix/expression/ExpressionType.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/expression/ExpressionType.java b/phoenix-core/src/main/java/org/apache/phoenix/expression/ExpressionType.java index d5cf745..843a768 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/expression/ExpressionType.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/expression/ExpressionType.java @@ -143,7 +143,7 @@ public enum ExpressionType { SumAggregateFunction(SumAggregateFunction.class), MinAggregateFunction(MinAggregateFunction.class), MaxAggregateFunction(MaxAggregateFunction.class), - LikeExpression(LikeExpression.class), + StringBasedLikeExpression(StringBasedLikeExpression.class), NotExpression(NotExpression.class), CaseExpression(CaseExpression.class), InListExpression(InListExpression.class), @@ -159,9 +159,9 @@ public enum ExpressionType { LongDivideExpression(LongDivideExpression.class), DecimalDivideExpression(DecimalDivideExpression.class), CoalesceFunction(CoalesceFunction.class), - RegexpReplaceFunction(RegexpReplaceFunction.class), + StringBasedRegexpReplaceFunction(StringBasedRegexpReplaceFunction.class), SQLTypeNameFunction(SqlTypeNameFunction.class), - RegexpSubstrFunction(RegexpSubstrFunction.class), + StringBasedRegexpSubstrFunction(StringBasedRegexpSubstrFunction.class), StringConcatExpression(StringConcatExpression.class), LengthFunction(LengthFunction.class), LTrimFunction(LTrimFunction.class), @@ -206,7 +206,7 @@ public enum ExpressionType { SQLIndexTypeFunction(SQLIndexTypeFunction.class), ModulusExpression(ModulusExpression.class), DistinctValueAggregateFunction(DistinctValueAggregateFunction.class), - RegexpSplitFunction(RegexpSplitFunction.class), + StringBasedRegexpSplitFunction(StringBasedRegexpSplitFunction.class), RandomFunction(RandomFunction.class), ToTimeFunction(ToTimeFunction.class), ToTimestampFunction(ToTimestampFunction.class), @@ -214,10 +214,6 @@ public enum ExpressionType { ByteBasedRegexpReplaceFunction(ByteBasedRegexpReplaceFunction.class), ByteBasedRegexpSubstrFunction(ByteBasedRegexpSubstrFunction.class), ByteBasedRegexpSplitFunction(ByteBasedRegexpSplitFunction.class), - StringBasedLikeExpression(StringBasedLikeExpression.class), - StringBasedRegexpReplaceFunction(StringBasedRegexpReplaceFunction.class), - StringBasedRegexpSubstrFunction(StringBasedRegexpSubstrFunction.class), - StringBasedRegexpSplitFunction(StringBasedRegexpSplitFunction.class), SignFunction(SignFunction.class), YearFunction(YearFunction.class), MonthFunction(MonthFunction.class),
