[1/3] phoenix git commit: PHOENIX-1516 Add RAND() built-in function

[jamestaylor]

Repository: phoenix
Updated Branches:
  refs/heads/master f6f71096a -> 7a2944a0d


http://git-wip-us.apache.org/repos/asf/phoenix/blob/7a2944a0/phoenix-core/src/test/java/org/apache/phoenix/parse/BuiltInFunctionInfoTest.java
----------------------------------------------------------------------
diff --git 
a/phoenix-core/src/test/java/org/apache/phoenix/parse/BuiltInFunctionInfoTest.java
 
b/phoenix-core/src/test/java/org/apache/phoenix/parse/BuiltInFunctionInfoTest.java
index 4443c21..5cf5de0 100644
--- 
a/phoenix-core/src/test/java/org/apache/phoenix/parse/BuiltInFunctionInfoTest.java
+++ 
b/phoenix-core/src/test/java/org/apache/phoenix/parse/BuiltInFunctionInfoTest.java
@@ -17,24 +17,24 @@
  */
 package org.apache.phoenix.parse;
 
+import static org.junit.Assert.assertEquals;
+
+import java.util.List;
+
 import org.apache.hadoop.hbase.io.ImmutableBytesWritable;
 import org.apache.phoenix.expression.Expression;
-import org.apache.phoenix.expression.function.FunctionExpression;
+import org.apache.phoenix.expression.function.ScalarFunction;
+import org.apache.phoenix.parse.FunctionParseNode.Argument;
+import org.apache.phoenix.parse.FunctionParseNode.BuiltInFunction;
+import org.apache.phoenix.parse.FunctionParseNode.BuiltInFunctionInfo;
+import org.apache.phoenix.schema.tuple.Tuple;
 import org.apache.phoenix.schema.types.PDataType;
 import org.apache.phoenix.schema.types.PVarchar;
-import org.apache.phoenix.schema.tuple.Tuple;
 import org.junit.Test;
 
-import java.util.List;
-
-import static org.apache.phoenix.parse.FunctionParseNode.BuiltInFunctionInfo;
-import static org.apache.phoenix.parse.FunctionParseNode.BuiltInFunction;
-import static org.apache.phoenix.parse.FunctionParseNode.Argument;
-import static org.junit.Assert.assertEquals;
-
 public class BuiltInFunctionInfoTest {
 
-    private static BuiltInFunctionInfo getBuiltInFunctionInfo(Class<? extends 
FunctionExpression> funcClass) {
+    private static BuiltInFunctionInfo getBuiltInFunctionInfo(Class<? extends 
ScalarFunction> funcClass) {
         return new BuiltInFunctionInfo(funcClass, 
funcClass.getAnnotation(BuiltInFunction.class));
     }
 
@@ -62,7 +62,7 @@ public class BuiltInFunctionInfoTest {
         assertEquals("WITH_MULTIPLE_DEFAULT_ARGS", funcInfo.getName());
     }
 
-    private static class BaseFunctionAdapter extends FunctionExpression {
+    private static class BaseFunctionAdapter extends ScalarFunction {
 
 
         private final String name;

http://git-wip-us.apache.org/repos/asf/phoenix/blob/7a2944a0/phoenix-core/src/test/java/org/apache/phoenix/util/TestUtil.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/test/java/org/apache/phoenix/util/TestUtil.java 
b/phoenix-core/src/test/java/org/apache/phoenix/util/TestUtil.java
index b0d55e7..872c318 100644
--- a/phoenix-core/src/test/java/org/apache/phoenix/util/TestUtil.java
+++ b/phoenix-core/src/test/java/org/apache/phoenix/util/TestUtil.java
@@ -78,12 +78,12 @@ import org.apache.phoenix.parse.LikeParseNode.LikeType;
 import org.apache.phoenix.query.KeyRange;
 import org.apache.phoenix.query.QueryConstants;
 import org.apache.phoenix.schema.PColumn;
-import org.apache.phoenix.schema.types.PDataType;
 import org.apache.phoenix.schema.RowKeyValueAccessor;
 import org.apache.phoenix.schema.TableRef;
 import org.apache.phoenix.schema.stats.GuidePostsInfo;
 import org.apache.phoenix.schema.stats.PTableStats;
 import org.apache.phoenix.schema.tuple.Tuple;
+import org.apache.phoenix.schema.types.PDataType;
 
 import com.google.common.collect.Lists;
 
@@ -249,7 +249,7 @@ public class TestUtil {
     }
 
     public static Expression constantComparison(CompareOp op, PColumn c, 
Object o) {
-        return  new ComparisonExpression(op, Arrays.<Expression>asList(new 
KeyValueColumnExpression(c), LiteralExpression.newConstant(o)));
+        return  new ComparisonExpression(Arrays.<Expression>asList(new 
KeyValueColumnExpression(c), LiteralExpression.newConstant(o)), op);
     }
 
     public static Expression kvColumn(PColumn c) {
@@ -261,15 +261,15 @@ public class TestUtil {
     }
 
     public static Expression constantComparison(CompareOp op, Expression e, 
Object o) {
-        return  new ComparisonExpression(op, Arrays.asList(e, 
LiteralExpression.newConstant(o)));
+        return  new ComparisonExpression(Arrays.asList(e, 
LiteralExpression.newConstant(o)), op);
     }
 
     public static Expression like(Expression e, Object o) {
-        return  new LikeExpression(Arrays.asList(e, 
LiteralExpression.newConstant(o)), LikeType.CASE_SENSITIVE);
+        return LikeExpression.create(Arrays.asList(e, 
LiteralExpression.newConstant(o)), LikeType.CASE_SENSITIVE);
     }
 
     public static Expression ilike(Expression e, Object o) {
-      return  new LikeExpression(Arrays.asList(e, 
LiteralExpression.newConstant(o)), LikeType.CASE_INSENSITIVE);
+      return LikeExpression.create(Arrays.asList(e, 
LiteralExpression.newConstant(o)), LikeType.CASE_INSENSITIVE);
   }
 
     public static Expression substr(Expression e, Object offset, Object 
length) {
@@ -277,7 +277,7 @@ public class TestUtil {
     }
 
     public static Expression columnComparison(CompareOp op, Expression c1, 
Expression c2) {
-        return  new ComparisonExpression(op, Arrays.<Expression>asList(c1, 
c2));
+        return  new ComparisonExpression(Arrays.<Expression>asList(c1, c2), 
op);
     }
 
     public static SingleKeyValueComparisonFilter singleKVFilter(Expression e) {