Return-Path: X-Original-To: apmail-phoenix-commits-archive@minotaur.apache.org Delivered-To: apmail-phoenix-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id ACAB518723 for ; Fri, 26 Jun 2015 04:42:16 +0000 (UTC) Received: (qmail 85619 invoked by uid 500); 26 Jun 2015 04:42:16 -0000 Delivered-To: apmail-phoenix-commits-archive@phoenix.apache.org Received: (qmail 85579 invoked by uid 500); 26 Jun 2015 04:42:16 -0000 Mailing-List: contact commits-help@phoenix.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@phoenix.apache.org Delivered-To: mailing list commits@phoenix.apache.org Received: (qmail 85569 invoked by uid 99); 26 Jun 2015 04:42:16 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 26 Jun 2015 04:42:16 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 252D6E36B0; Fri, 26 Jun 2015 04:42:16 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: tdsilva@apache.org To: commits@phoenix.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: phoenix git commit: PHOENIX-628 Support native JSON data type (Aakash Pradeep) Date: Fri, 26 Jun 2015 04:42:16 +0000 (UTC) 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 Authored: Thu Jun 25 21:41:20 2015 -0700 Committer: Thomas D'Silva 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 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 { @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