From c77f5a072b74768c6d8aa11298827ae05e2ca5cb Mon Sep 17 00:00:00 2001
From: Julien Le Dem <julien@apache.org>
Date: Thu, 13 Apr 2017 16:47:04 -0700
Subject: [PATCH] ARROW-777: restore getObject behavior on Date and Time

---
 .../src/main/codegen/data/ValueVectorTypes.tdd |  4 ++--
 .../codegen/templates/FixedValueVectors.java   | 18 ++++++++++++++++--
 .../apache/arrow/vector/file/BaseFileTest.java |  6 ++++--
 3 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/java/vector/src/main/codegen/data/ValueVectorTypes.tdd b/java/vector/src/main/codegen/data/ValueVectorTypes.tdd
index b08c100edca..d472b559347 100644
--- a/java/vector/src/main/codegen/data/ValueVectorTypes.tdd
+++ b/java/vector/src/main/codegen/data/ValueVectorTypes.tdd
@@ -59,7 +59,7 @@
         { class: "DateDay" },
         { class: "IntervalYear", javaType: "int", friendlyType: "Period" },
         { class: "TimeSec" },
-        { class: "TimeMilli" }
+        { class: "TimeMilli", javaType: "int", friendlyType: "DateTime" }
       ]
     },
     {
@@ -72,7 +72,7 @@
         { class: "BigInt"},
         { class: "UInt8" },
         { class: "Float8", javaType: "double" , boxedType: "Double", fields: [{name: "value", type: "double"}], },
-        { class: "DateMilli" },
+        { class: "DateMilli", javaType: "long", friendlyType: "DateTime" },
         { class: "TimeStampSec", javaType: "long", boxedType: "Long", friendlyType: "DateTime" },
         { class: "TimeStampMilli", javaType: "long", boxedType: "Long", friendlyType: "DateTime" },
         { class: "TimeStampMicro", javaType: "long", boxedType: "Long", friendlyType: "DateTime" },
diff --git a/java/vector/src/main/codegen/templates/FixedValueVectors.java b/java/vector/src/main/codegen/templates/FixedValueVectors.java
index 947c82c74a4..5c09e30c714 100644
--- a/java/vector/src/main/codegen/templates/FixedValueVectors.java
+++ b/java/vector/src/main/codegen/templates/FixedValueVectors.java
@@ -484,9 +484,7 @@ public long getTwoAsLong(int index) {
     </#if>
 
     <#if minor.class == "DateDay" ||
-         minor.class == "DateMilli" ||
          minor.class == "TimeSec" ||
-         minor.class == "TimeMilli" ||
          minor.class == "TimeMicro" ||
          minor.class == "TimeNano">
     @Override
@@ -494,6 +492,22 @@ public long getTwoAsLong(int index) {
       return get(index);
     }
 
+    <#elseif minor.class == "DateMilli">
+    @Override
+    public ${friendlyType} getObject(int index) {
+      org.joda.time.DateTime date = new org.joda.time.DateTime(get(index), org.joda.time.DateTimeZone.UTC);
+      date = date.withZoneRetainFields(org.joda.time.DateTimeZone.getDefault());
+      return date;
+    }
+
+    <#elseif minor.class == "TimeMilli">
+    @Override
+    public ${friendlyType} getObject(int index) {
+      org.joda.time.DateTime time = new org.joda.time.DateTime(get(index), org.joda.time.DateTimeZone.UTC);
+      time = time.withZoneRetainFields(org.joda.time.DateTimeZone.getDefault());
+      return time;
+    }
+
     <#elseif minor.class == "TimeStampSec">
     @Override
     public ${friendlyType} getObject(int index) {
diff --git a/java/vector/src/test/java/org/apache/arrow/vector/file/BaseFileTest.java b/java/vector/src/test/java/org/apache/arrow/vector/file/BaseFileTest.java
index 5c68a1904be..5ca083aa2df 100644
--- a/java/vector/src/test/java/org/apache/arrow/vector/file/BaseFileTest.java
+++ b/java/vector/src/test/java/org/apache/arrow/vector/file/BaseFileTest.java
@@ -22,6 +22,8 @@
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
 import org.apache.arrow.vector.FieldVector;
+import org.apache.arrow.vector.NullableDateMilliVector;
+import org.apache.arrow.vector.NullableTimeMilliVector;
 import org.apache.arrow.vector.ValueVector.Accessor;
 import org.apache.arrow.vector.VectorSchemaRoot;
 import org.apache.arrow.vector.complex.MapVector;
@@ -173,11 +175,11 @@ protected void validateDateTimeContent(int count, VectorSchemaRoot root) {
     Assert.assertEquals(count, root.getRowCount());
     printVectors(root.getFieldVectors());
     for (int i = 0; i < count; i++) {
-      Object dateVal = root.getVector("date").getAccessor().getObject(i);
+      long dateVal = ((NullableDateMilliVector)root.getVector("date")).getAccessor().get(i);
       DateTime dt = makeDateTimeFromCount(i);
       DateTime dateExpected = dt.minusMillis(dt.getMillisOfDay());
       Assert.assertEquals(dateExpected.getMillis(), dateVal);
-      Object timeVal = root.getVector("time").getAccessor().getObject(i);
+      long timeVal = ((NullableTimeMilliVector)root.getVector("time")).getAccessor().get(i);
       Assert.assertEquals(dt.getMillisOfDay(), timeVal);
       Object timestampMilliVal = root.getVector("timestamp-milli").getAccessor().getObject(i);
       Assert.assertTrue(dt.withZoneRetainFields(DateTimeZone.getDefault()).equals(timestampMilliVal));