You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by gr...@apache.org on 2014/06/12 21:36:37 UTC
git commit: PHOENIX-1037 ResultSetSqlType for date/time types
Repository: phoenix
Updated Branches:
refs/heads/3.0 6afce315e -> d29254079
PHOENIX-1037 ResultSetSqlType for date/time types
Add implementations of getResultSetSqlType for unsigned
date/time/timestamp types
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/d2925407
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/d2925407
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/d2925407
Branch: refs/heads/3.0
Commit: d292540797595749132f1d9d88a75488d7517105
Parents: 6afce31
Author: Gabriel Reid <ga...@ngdata.com>
Authored: Tue Jun 10 23:37:11 2014 +0200
Committer: Gabriel Reid <ga...@ngdata.com>
Committed: Thu Jun 12 21:33:13 2014 +0200
----------------------------------------------------------------------
.../java/org/apache/phoenix/schema/PDataType.java | 15 +++++++++++++++
.../org/apache/phoenix/schema/PDataTypeTest.java | 6 ++++++
2 files changed, 21 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/d2925407/phoenix-core/src/main/java/org/apache/phoenix/schema/PDataType.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/schema/PDataType.java b/phoenix-core/src/main/java/org/apache/phoenix/schema/PDataType.java
index d886c39..c7697bf 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/schema/PDataType.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/schema/PDataType.java
@@ -2143,6 +2143,11 @@ public enum PDataType {
long millis = PDataType.UNSIGNED_LONG.getCodec().decodeLong(ptr.get(),ptr.getOffset(), sortOrder);
return millis;
}
+
+ @Override
+ public int getResultSetSqlType() {
+ return Types.TIMESTAMP;
+ }
},
UNSIGNED_TIME("UNSIGNED_TIME", 18, Time.class, new UnsignedDateCodec()) {
@@ -2214,6 +2219,11 @@ public enum PDataType {
public String toStringLiteral(byte[] b, int offset, int length, Format formatter) {
return UNSIGNED_DATE.toStringLiteral(b, offset, length, formatter);
}
+
+ @Override
+ public int getResultSetSqlType() {
+ return Types.TIME;
+ }
},
UNSIGNED_DATE("UNSIGNED_DATE", 19, Date.class, new UnsignedDateCodec()) { // After TIMESTAMP and DATE to ensure toLiteral finds those first
@@ -2312,6 +2322,11 @@ public enum PDataType {
}
super.coerceBytes(ptr, object, actualType, maxLength, scale, actualModifier, desiredMaxLength, desiredScale, expectedModifier);
}
+
+ @Override
+ public int getResultSetSqlType() {
+ return Types.DATE;
+ }
},
/**
* Unsigned long type that restricts values to be from 0 to {@link java.lang.Long#MAX_VALUE} inclusive. May be used to map to existing HTable values created through {@link org.apache.hadoop.hbase.util.Bytes#toBytes(long)}
http://git-wip-us.apache.org/repos/asf/phoenix/blob/d2925407/phoenix-core/src/test/java/org/apache/phoenix/schema/PDataTypeTest.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/test/java/org/apache/phoenix/schema/PDataTypeTest.java b/phoenix-core/src/test/java/org/apache/phoenix/schema/PDataTypeTest.java
index f3a7349..d6709b6 100644
--- a/phoenix-core/src/test/java/org/apache/phoenix/schema/PDataTypeTest.java
+++ b/phoenix-core/src/test/java/org/apache/phoenix/schema/PDataTypeTest.java
@@ -1574,6 +1574,12 @@ public class PDataTypeTest {
assertEquals(Types.FLOAT, PDataType.UNSIGNED_FLOAT.getResultSetSqlType());
assertEquals(Types.DOUBLE, PDataType.DOUBLE.getResultSetSqlType());
assertEquals(Types.DOUBLE, PDataType.UNSIGNED_DOUBLE.getResultSetSqlType());
+ assertEquals(Types.DATE, PDataType.DATE.getResultSetSqlType());
+ assertEquals(Types.DATE, PDataType.UNSIGNED_DATE.getResultSetSqlType());
+ assertEquals(Types.TIME, PDataType.TIME.getResultSetSqlType());
+ assertEquals(Types.TIME, PDataType.UNSIGNED_TIME.getResultSetSqlType());
+ assertEquals(Types.TIMESTAMP, PDataType.TIMESTAMP.getResultSetSqlType());
+ assertEquals(Types.TIMESTAMP, PDataType.UNSIGNED_TIMESTAMP.getResultSetSqlType());
// Check that all array types are defined as java.sql.Types.ARRAY
for (PDataType dataType : PDataType.values()) {