Repository: phoenix Updated Branches: refs/heads/master a9af6fe65 -> d5358be34
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/d5358be3 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/d5358be3 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/d5358be3 Branch: refs/heads/master Commit: d5358be3417e8a1c11642250a68e5435c2135fa1 Parents: a9af6fe Author: James Taylor <jtay...@salesforce.com> Authored: Mon Apr 27 17:58:43 2015 -0700 Committer: James Taylor <jtay...@salesforce.com> Committed: Mon Apr 27 18:48:53 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/d5358be3/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 69a2049..e77a8dd 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 @@ -144,7 +144,6 @@ public enum ExpressionType { MinAggregateFunction(MinAggregateFunction.class), MaxAggregateFunction(MaxAggregateFunction.class), LikeExpression(LikeExpression.class), - ByteBasedLikeExpression(ByteBasedLikeExpression.class), StringBasedLikeExpression(StringBasedLikeExpression.class), NotExpression(NotExpression.class), CaseExpression(CaseExpression.class), @@ -162,11 +161,9 @@ public enum ExpressionType { DecimalDivideExpression(DecimalDivideExpression.class), CoalesceFunction(CoalesceFunction.class), RegexpReplaceFunction(RegexpReplaceFunction.class), - ByteBasedRegexpReplaceFunction(ByteBasedRegexpReplaceFunction.class), StringBasedRegexpReplaceFunction(StringBasedRegexpReplaceFunction.class), SQLTypeNameFunction(SqlTypeNameFunction.class), RegexpSubstrFunction(RegexpSubstrFunction.class), - ByteBasedRegexpSubstrFunction(ByteBasedRegexpSubstrFunction.class), StringBasedRegexpSubstrFunction(StringBasedRegexpSubstrFunction.class), StringConcatExpression(StringConcatExpression.class), LengthFunction(LengthFunction.class), @@ -213,11 +210,14 @@ public enum ExpressionType { ModulusExpression(ModulusExpression.class), DistinctValueAggregateFunction(DistinctValueAggregateFunction.class), RegexpSplitFunction(RegexpSplitFunction.class), - ByteBasedRegexpSplitFunction(ByteBasedRegexpSplitFunction.class), StringBasedRegexpSplitFunction(StringBasedRegexpSplitFunction.class), RandomFunction(RandomFunction.class), ToTimeFunction(ToTimeFunction.class), ToTimestampFunction(ToTimestampFunction.class), + ByteBasedLikeExpression(ByteBasedLikeExpression.class), + ByteBasedRegexpReplaceFunction(ByteBasedRegexpReplaceFunction.class), + ByteBasedRegexpSubstrFunction(ByteBasedRegexpSubstrFunction.class), + ByteBasedRegexpSplitFunction(ByteBasedRegexpSplitFunction.class), SignFunction(SignFunction.class), YearFunction(YearFunction.class), MonthFunction(MonthFunction.class),