Repository: phoenix Updated Branches: refs/heads/4.x-HBase-1.0 c7662b204 -> 6948e48f6
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/185fb78f Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/185fb78f Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/185fb78f Branch: refs/heads/4.x-HBase-1.0 Commit: 185fb78fa6b619b1afbb1bd4b7b1ce02403f2a90 Parents: c7662b2 Author: Thomas <tdsi...@salesforce.com> Authored: Tue Apr 28 13:07:04 2015 -0700 Committer: James Taylor <jtay...@salesforce.com> Committed: Wed Apr 29 23:48:32 2015 -0700 ---------------------------------------------------------------------- .../java/org/apache/phoenix/expression/ExpressionType.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/185fb78f/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 e77a8dd..71f0521 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,6 @@ public enum ExpressionType { SumAggregateFunction(SumAggregateFunction.class), MinAggregateFunction(MinAggregateFunction.class), MaxAggregateFunction(MaxAggregateFunction.class), - LikeExpression(LikeExpression.class), StringBasedLikeExpression(StringBasedLikeExpression.class), NotExpression(NotExpression.class), CaseExpression(CaseExpression.class), @@ -160,10 +159,8 @@ 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), @@ -209,7 +206,6 @@ public enum ExpressionType { SQLIndexTypeFunction(SQLIndexTypeFunction.class), ModulusExpression(ModulusExpression.class), DistinctValueAggregateFunction(DistinctValueAggregateFunction.class), - RegexpSplitFunction(RegexpSplitFunction.class), StringBasedRegexpSplitFunction(StringBasedRegexpSplitFunction.class), RandomFunction(RandomFunction.class), ToTimeFunction(ToTimeFunction.class), @@ -218,6 +214,10 @@ public enum ExpressionType { ByteBasedRegexpReplaceFunction(ByteBasedRegexpReplaceFunction.class), ByteBasedRegexpSubstrFunction(ByteBasedRegexpSubstrFunction.class), ByteBasedRegexpSplitFunction(ByteBasedRegexpSplitFunction.class), + LikeExpression(LikeExpression.class), + RegexpReplaceFunction(RegexpReplaceFunction.class), + RegexpSubstrFunction(RegexpSubstrFunction.class), + RegexpSplitFunction(RegexpSplitFunction.class), SignFunction(SignFunction.class), YearFunction(YearFunction.class), MonthFunction(MonthFunction.class),
