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 E0EA51793D for ; Tue, 20 Jan 2015 19:29:35 +0000 (UTC) Received: (qmail 20689 invoked by uid 500); 20 Jan 2015 19:29:35 -0000 Delivered-To: apmail-phoenix-commits-archive@phoenix.apache.org Received: (qmail 20658 invoked by uid 500); 20 Jan 2015 19:29:35 -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 20647 invoked by uid 99); 20 Jan 2015 19:29:35 -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; Tue, 20 Jan 2015 19:29:35 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A3061E0396; Tue, 20 Jan 2015 19:29:35 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jamestaylor@apache.org To: commits@phoenix.apache.org Message-Id: <37fe5c4dcfb446c1ad67ef359d293218@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: phoenix git commit: PHOENIX-1575 Identical sql type values for UNSIGNED_TIMESTAMP and UNSIGNED_DATE Date: Tue, 20 Jan 2015 19:29:35 +0000 (UTC) Repository: phoenix Updated Branches: refs/heads/master 405cb0f76 -> 34b4ad27d PHOENIX-1575 Identical sql type values for UNSIGNED_TIMESTAMP and UNSIGNED_DATE Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/34b4ad27 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/34b4ad27 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/34b4ad27 Branch: refs/heads/master Commit: 34b4ad27dfd7345a91db7414942d11f0a3108022 Parents: 405cb0f Author: James Taylor Authored: Tue Jan 20 11:29:30 2015 -0800 Committer: James Taylor Committed: Tue Jan 20 11:29:30 2015 -0800 ---------------------------------------------------------------------- .../apache/phoenix/schema/types/PUnsignedTimestamp.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/34b4ad27/phoenix-core/src/main/java/org/apache/phoenix/schema/types/PUnsignedTimestamp.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/schema/types/PUnsignedTimestamp.java b/phoenix-core/src/main/java/org/apache/phoenix/schema/types/PUnsignedTimestamp.java index 21e6c50..c13de56 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/schema/types/PUnsignedTimestamp.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/schema/types/PUnsignedTimestamp.java @@ -17,21 +17,21 @@ */ package org.apache.phoenix.schema.types; +import java.sql.Timestamp; +import java.sql.Types; +import java.text.Format; + import org.apache.hadoop.hbase.io.ImmutableBytesWritable; import org.apache.hadoop.hbase.util.Bytes; import org.apache.phoenix.schema.SortOrder; import org.apache.phoenix.util.DateUtil; -import java.sql.Timestamp; -import java.sql.Types; -import java.text.Format; - public class PUnsignedTimestamp extends PDataType { public static final PUnsignedTimestamp INSTANCE = new PUnsignedTimestamp(); private PUnsignedTimestamp() { - super("UNSIGNED_TIMESTAMP", 19, java.sql.Timestamp.class, null, 12); + super("UNSIGNED_TIMESTAMP", 20, java.sql.Timestamp.class, null, 12); } @Override