You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by td...@apache.org on 2018/03/12 19:08:19 UTC

phoenix git commit: PHOENIX-4418 - add locale-awareness to UPPER() and LOWER() functions (addendum)

Repository: phoenix
Updated Branches:
  refs/heads/master 35a90e4e6 -> cc494a1ba


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/cc494a1b
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/cc494a1b
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/cc494a1b

Branch: refs/heads/master
Commit: cc494a1ba5f65a2dd87d3e8083cf60efbf8d707a
Parents: 35a90e4
Author: Thomas D'Silva <td...@apache.org>
Authored: Mon Mar 12 12:01:28 2018 -0700
Committer: Thomas D'Silva <td...@apache.org>
Committed: Mon Mar 12 12:07:38 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/cc494a1b/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();
+    }
 }