phoenix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tdsi...@apache.org
Subject phoenix git commit: PHOENIX-628 Support native JSON data type (Aakash Pradeep)
Date Fri, 26 Jun 2015 04:42:16 GMT
Repository: phoenix
Updated Branches:
  refs/heads/json 67e3e3bfa -> 6ee28a5e2


PHOENIX-628 Support native JSON data type (Aakash Pradeep)


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

Branch: refs/heads/json
Commit: 6ee28a5e25154556140c751c3040d9144cd86f67
Parents: 67e3e3b
Author: Thomas D'Silva <tdsilva@salesforce.com>
Authored: Thu Jun 25 21:41:20 2015 -0700
Committer: Thomas D'Silva <tdsilva@salesforce.com>
Committed: Thu Jun 25 21:41:49 2015 -0700

----------------------------------------------------------------------
 .../main/java/org/apache/phoenix/expression/ExpressionType.java  | 4 +---
 .../src/main/java/org/apache/phoenix/schema/types/PVarchar.java  | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/phoenix/blob/6ee28a5e/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 e815817..51f4089 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
@@ -247,9 +247,7 @@ public enum ExpressionType {
     LogFunction(LogFunction.class),
     ExpFunction(ExpFunction.class),
     PowerFunction(PowerFunction.class),
-    ArrayConcatFunction(ArrayConcatFunction.class),
-    JsonExtractPathFunction(JsonExtractPathFunction.class),
-    JsonExtractPathTextFunction(JsonExtractPathTextFunction.class)
+    ArrayConcatFunction(ArrayConcatFunction.class)
     ;
 
     ExpressionType(Class<? extends Expression> clazz) {

http://git-wip-us.apache.org/repos/asf/phoenix/blob/6ee28a5e/phoenix-core/src/main/java/org/apache/phoenix/schema/types/PVarchar.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/schema/types/PVarchar.java b/phoenix-core/src/main/java/org/apache/phoenix/schema/types/PVarchar.java
index 509e090..1996c17 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/schema/types/PVarchar.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/schema/types/PVarchar.java
@@ -83,7 +83,7 @@ public class PVarchar extends PDataType<String> {
 
   @Override
   public boolean isCoercibleTo(PDataType targetType) {
-    return equalsAny(targetType, this, PChar.INSTANCE, PVarbinary.INSTANCE, PBinary.INSTANCE,
PJsonDataType.INSTANCE);
+    return equalsAny(targetType, this, PChar.INSTANCE, PVarbinary.INSTANCE, PBinary.INSTANCE,
PJson.INSTANCE);
   }
 
   @Override


Mime
View raw message