Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.1 1bfcef641 -> 8b24575e1


PHOENIX-4418 - add locale-awareness to UPPER() and LOWER() functions (addendum)


Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/8b24575e
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/8b24575e
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/8b24575e

Branch: refs/heads/4.x-HBase-1.1
Commit: 8b24575e152800eab13e32128a9f9403e04e96cb
Parents: 1bfcef6
Author: Thomas D'Silva <tdsi...@apache.org>
Authored: Mon Mar 12 12:01:28 2018 -0700
Committer: Thomas D'Silva <tdsi...@apache.org>
Committed: Mon Mar 12 12:11:28 2018 -0700

----------------------------------------------------------------------
 .../phoenix/expression/function/CollationKeyFunction.java      | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/phoenix/blob/8b24575e/phoenix-core/src/main/java/org/apache/phoenix/expression/function/CollationKeyFunction.java
----------------------------------------------------------------------
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/expression/function/CollationKeyFunction.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/expression/function/CollationKeyFunction.java
index cd1ef24..9d48feb 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/expression/function/CollationKeyFunction.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/expression/function/CollationKeyFunction.java
@@ -29,7 +29,6 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.hbase.io.ImmutableBytesWritable;
 import org.apache.phoenix.expression.Expression;
-import org.apache.phoenix.expression.LiteralExpression;
 import org.apache.phoenix.parse.FunctionParseNode;
 import org.apache.phoenix.schema.tuple.Tuple;
 import org.apache.phoenix.schema.types.PBoolean;
@@ -190,4 +189,9 @@ public class CollationKeyFunction extends ScalarFunction {
                // TODO: Look into calling freeze() on them to be able return 
true here.
                return false;
        }
+       
+    @Override
+    public boolean isNullable() {
+        return getChildren().get(0).isNullable();
+    }
 }

Reply via email to