[ARROW-7301][Java] Sql type DATE should correspond to DateDayVector

Change-Id: I604a6b2db3b0816aec6bc7c117e8172507dbdddd

java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/JdbcToArrowUtils.java

@@ -59,7 +59,7 @@
 import org.apache.arrow.util.Preconditions;
 import org.apache.arrow.vector.BigIntVector;
 import org.apache.arrow.vector.BitVector;
-import org.apache.arrow.vector.DateMilliVector;
+import org.apache.arrow.vector.DateDayVector;
 import org.apache.arrow.vector.DecimalVector;
 import org.apache.arrow.vector.FieldVector;
 import org.apache.arrow.vector.Float4Vector;
@@ -265,7 +265,7 @@ public static ArrowType getArrowTypeForJdbcField(JdbcFieldInfo fieldInfo, Calend
       case Types.CLOB:
         return new ArrowType.Utf8();
       case Types.DATE:
-        return new ArrowType.Date(DateUnit.MILLISECOND);
+        return new ArrowType.Date(DateUnit.DAY);
       case Types.TIME:
         return new ArrowType.Time(TimeUnit.MILLISECOND, 32);
       case Types.TIMESTAMP:
@@ -402,7 +402,7 @@ static JdbcConsumer getConsumer(ResultSet resultSet, int columnIndex, int jdbcCo
       case Types.LONGNVARCHAR:
         return VarCharConsumer.createConsumer((VarCharVector) vector, columnIndex, nullable);
       case Types.DATE:
-        return DateConsumer.createConsumer((DateMilliVector) vector, columnIndex, nullable, calendar);
+        return DateConsumer.createConsumer((DateDayVector) vector, columnIndex, nullable, calendar);
       case Types.TIME:
         return TimeConsumer.createConsumer((TimeMilliVector) vector, columnIndex, nullable, calendar);
       case Types.TIMESTAMP:

java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/DateConsumer.java

@@ -22,6 +22,7 @@
 import java.util.Calendar;
 import java.util.Date;
 
+import org.apache.arrow.vector.DateDayVector;
 import org.apache.arrow.vector.DateMilliVector;
 
 /**
@@ -33,8 +34,8 @@ public class DateConsumer {
   /**
    * Creates a consumer for {@link DateMilliVector}.
    */
-  public static JdbcConsumer<DateMilliVector> createConsumer(
-          DateMilliVector vector, int index, boolean nullable, Calendar calendar) {
+  public static JdbcConsumer<DateDayVector> createConsumer(
+      DateDayVector vector, int index, boolean nullable, Calendar calendar) {
     if (nullable) {
       return new NullableDateConsumer(vector, index, calendar);
     } else {
@@ -45,21 +46,21 @@ public static JdbcConsumer<DateMilliVector> createConsumer(
   /**
    * Nullable consumer for date.
    */
-  static class NullableDateConsumer extends BaseConsumer<DateMilliVector> {
+  static class NullableDateConsumer extends BaseConsumer<DateDayVector> {
 
     protected final Calendar calendar;
 
     /**
      * Instantiate a DateConsumer.
      */
-    public NullableDateConsumer(DateMilliVector vector, int index) {
+    public NullableDateConsumer(DateDayVector vector, int index) {
       this(vector, index, /* calendar */null);
     }
 
     /**
      * Instantiate a DateConsumer.
      */
-    public NullableDateConsumer(DateMilliVector vector, int index, Calendar calendar) {
+    public NullableDateConsumer(DateDayVector vector, int index, Calendar calendar) {
       super(vector, index);
       this.calendar = calendar;
     }
@@ -69,7 +70,7 @@ public void consume(ResultSet resultSet) throws SQLException {
       Date date = calendar == null ? resultSet.getDate(columnIndexInResultSet) :
           resultSet.getDate(columnIndexInResultSet, calendar);
       if (!resultSet.wasNull()) {
-        vector.setSafe(currentIndex, date.getTime());
+        vector.setSafe(currentIndex, (int) (date.getTime() / DateDayVector.MILLIS_PER_DAY));
       }
       currentIndex++;
     }
@@ -78,21 +79,21 @@ public void consume(ResultSet resultSet) throws SQLException {
   /**
    * Non-nullable consumer for date.
    */
-  static class NonNullableDateConsumer extends BaseConsumer<DateMilliVector> {
+  static class NonNullableDateConsumer extends BaseConsumer<DateDayVector> {
 
     protected final Calendar calendar;
 
     /**
      * Instantiate a DateConsumer.
      */
-    public NonNullableDateConsumer(DateMilliVector vector, int index) {
+    public NonNullableDateConsumer(DateDayVector vector, int index) {
       this(vector, index, /* calendar */null);
     }
 
     /**
      * Instantiate a DateConsumer.
      */
-    public NonNullableDateConsumer(DateMilliVector vector, int index, Calendar calendar) {
+    public NonNullableDateConsumer(DateDayVector vector, int index, Calendar calendar) {
       super(vector, index);
       this.calendar = calendar;
     }
@@ -101,7 +102,7 @@ public NonNullableDateConsumer(DateMilliVector vector, int index, Calendar calen
     public void consume(ResultSet resultSet) throws SQLException {
       Date date = calendar == null ? resultSet.getDate(columnIndexInResultSet) :
           resultSet.getDate(columnIndexInResultSet, calendar);
-      vector.setSafe(currentIndex, date.getTime());
+      vector.setSafe(currentIndex, (int) (date.getTime() / DateDayVector.MILLIS_PER_DAY));
       currentIndex++;
     }
   }

java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/JdbcToArrowTestHelper.java

@@ -32,7 +32,7 @@
 import org.apache.arrow.vector.BaseValueVector;
 import org.apache.arrow.vector.BigIntVector;
 import org.apache.arrow.vector.BitVector;
-import org.apache.arrow.vector.DateMilliVector;
+import org.apache.arrow.vector.DateDayVector;
 import org.apache.arrow.vector.DecimalVector;
 import org.apache.arrow.vector.Float4Vector;
 import org.apache.arrow.vector.Float8Vector;
@@ -173,14 +173,14 @@ public static void assertTimeVectorValues(TimeMilliVector timeMilliVector, int r
     }
   }
 
-  public static void assertDateVectorValues(DateMilliVector dateMilliVector, int rowCount, Long[] values) {
-    assertEquals(rowCount, dateMilliVector.getValueCount());
+  public static void assertDateVectorValues(DateDayVector dateDayVector, int rowCount, Integer[] values) {
+    assertEquals(rowCount, dateDayVector.getValueCount());
 
-    for (int j = 0; j < dateMilliVector.getValueCount(); j++) {
+    for (int j = 0; j < dateDayVector.getValueCount(); j++) {
       if (values[j] == null) {
-        assertTrue(dateMilliVector.isNull(j));
+        assertTrue(dateDayVector.isNull(j));
       } else {
-        assertEquals(values[j].longValue(), dateMilliVector.get(j));
+        assertEquals(values[j].longValue(), dateDayVector.get(j));
       }
     }
   }

java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/h2/JdbcToArrowDataTypesTest.java

@@ -50,7 +50,7 @@
 import org.apache.arrow.memory.RootAllocator;
 import org.apache.arrow.vector.BigIntVector;
 import org.apache.arrow.vector.BitVector;
-import org.apache.arrow.vector.DateMilliVector;
+import org.apache.arrow.vector.DateDayVector;
 import org.apache.arrow.vector.DecimalVector;
 import org.apache.arrow.vector.Float4Vector;
 import org.apache.arrow.vector.Float8Vector;
@@ -202,8 +202,8 @@ public void testDataSets(VectorSchemaRoot root) {
             table.getCharValues());
         break;
       case DATE:
-        assertDateVectorValues((DateMilliVector) root.getVector(table.getVector()), table.getValues().length,
-            table.getLongValues());
+        assertDateVectorValues((DateDayVector) root.getVector(table.getVector()), table.getValues().length,
+            table.getIntValues());
         break;
       case TIME:
         assertTimeVectorValues((TimeMilliVector) root.getVector(table.getVector()), table.getValues().length,

java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/h2/JdbcToArrowNullTest.java

@@ -58,7 +58,7 @@
 import org.apache.arrow.memory.RootAllocator;
 import org.apache.arrow.vector.BigIntVector;
 import org.apache.arrow.vector.BitVector;
-import org.apache.arrow.vector.DateMilliVector;
+import org.apache.arrow.vector.DateDayVector;
 import org.apache.arrow.vector.DecimalVector;
 import org.apache.arrow.vector.Float4Vector;
 import org.apache.arrow.vector.Float8Vector;
@@ -206,8 +206,8 @@ private void testAllVectorValues(VectorSchemaRoot root) {
     assertBooleanVectorValues((BitVector) root.getVector(BOOL), table.getRowCount(),
         getBooleanValues(table.getValues(), BOOL));
 
-    assertDateVectorValues((DateMilliVector) root.getVector(DATE), table.getRowCount(),
-        getLongValues(table.getValues(), DATE));
+    assertDateVectorValues((DateDayVector) root.getVector(DATE), table.getRowCount(),
+        getIntValues(table.getValues(), DATE));
 
     assertTimeVectorValues((TimeMilliVector) root.getVector(TIME), table.getRowCount(),
         getLongValues(table.getValues(), TIME));
@@ -242,7 +242,7 @@ public void sqlToArrowTestNullValues(String[] vectors, VectorSchemaRoot root, in
     assertNullValues((Float8Vector) root.getVector(vectors[6]), rowCount);
     assertNullValues((Float4Vector) root.getVector(vectors[7]), rowCount);
     assertNullValues((TimeMilliVector) root.getVector(vectors[8]), rowCount);
-    assertNullValues((DateMilliVector) root.getVector(vectors[9]), rowCount);
+    assertNullValues((DateDayVector) root.getVector(vectors[9]), rowCount);
     assertNullValues((TimeStampVector) root.getVector(vectors[10]), rowCount);
     assertNullValues((VarBinaryVector) root.getVector(vectors[11]), rowCount);
     assertNullValues((VarCharVector) root.getVector(vectors[12]), rowCount);
@@ -265,7 +265,7 @@ public void sqlToArrowTestSelectedNullColumnsValues(String[] vectors, VectorSche
     assertNullValues((Float8Vector) root.getVector(vectors[2]), rowCount);
     assertNullValues((Float4Vector) root.getVector(vectors[3]), rowCount);
     assertNullValues((TimeMilliVector) root.getVector(vectors[4]), rowCount);
-    assertNullValues((DateMilliVector) root.getVector(vectors[5]), rowCount);
+    assertNullValues((DateDayVector) root.getVector(vectors[5]), rowCount);
     assertNullValues((TimeStampVector) root.getVector(vectors[6]), rowCount);
     assertNullValues((VarBinaryVector) root.getVector(vectors[7]), rowCount);
     assertNullValues((VarCharVector) root.getVector(vectors[8]), rowCount);

java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/h2/JdbcToArrowTest.java

@@ -79,7 +79,7 @@
 import org.apache.arrow.memory.RootAllocator;
 import org.apache.arrow.vector.BigIntVector;
 import org.apache.arrow.vector.BitVector;
-import org.apache.arrow.vector.DateMilliVector;
+import org.apache.arrow.vector.DateDayVector;
 import org.apache.arrow.vector.DecimalVector;
 import org.apache.arrow.vector.Float4Vector;
 import org.apache.arrow.vector.Float8Vector;
@@ -202,8 +202,8 @@ public void testDataSets(VectorSchemaRoot root) {
     assertBooleanVectorValues((BitVector) root.getVector(BOOL), table.getRowCount(),
         getBooleanValues(table.getValues(), BOOL));
 
-    assertDateVectorValues((DateMilliVector) root.getVector(DATE), table.getRowCount(),
-        getLongValues(table.getValues(), DATE));
+    assertDateVectorValues((DateDayVector) root.getVector(DATE), table.getRowCount(),
+        getIntValues(table.getValues(), DATE));
 
     assertTimeVectorValues((TimeMilliVector) root.getVector(TIME), table.getRowCount(),
         getLongValues(table.getValues(), TIME));

java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/h2/JdbcToArrowTimeZoneTest.java

@@ -37,7 +37,7 @@
 import org.apache.arrow.adapter.jdbc.JdbcToArrowUtils;
 import org.apache.arrow.adapter.jdbc.Table;
 import org.apache.arrow.memory.RootAllocator;
-import org.apache.arrow.vector.DateMilliVector;
+import org.apache.arrow.vector.DateDayVector;
 import org.apache.arrow.vector.TimeMilliVector;
 import org.apache.arrow.vector.TimeStampVector;
 import org.apache.arrow.vector.VectorSchemaRoot;
@@ -145,8 +145,8 @@ public void testDataSets(VectorSchemaRoot root) {
       case EST_DATE:
       case GMT_DATE:
       case PST_DATE:
-        assertDateVectorValues((DateMilliVector) root.getVector(table.getVector()), table.getValues().length,
-            table.getLongValues());
+        assertDateVectorValues((DateDayVector) root.getVector(table.getVector()), table.getValues().length,
+            table.getIntValues());
         break;
       case EST_TIME:
       case GMT_TIME:

java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/h2/JdbcToArrowVectorIteratorTest.java

@@ -38,7 +38,7 @@
 import org.apache.arrow.memory.RootAllocator;
 import org.apache.arrow.vector.BigIntVector;
 import org.apache.arrow.vector.BitVector;
-import org.apache.arrow.vector.DateMilliVector;
+import org.apache.arrow.vector.DateDayVector;
 import org.apache.arrow.vector.DecimalVector;
 import org.apache.arrow.vector.Float4Vector;
 import org.apache.arrow.vector.Float8Vector;
@@ -51,6 +51,7 @@
 import org.apache.arrow.vector.VarBinaryVector;
 import org.apache.arrow.vector.VarCharVector;
 import org.apache.arrow.vector.VectorSchemaRoot;
+import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
@@ -66,6 +67,7 @@ public JdbcToArrowVectorIteratorTest(Table table) {
     super(table);
   }
 
+  @Test
   @Override
   public void testJdbcToArrowValues() throws SQLException, IOException {
 
@@ -91,7 +93,7 @@ private void validate(ArrowVectorIterator iterator) throws SQLException, IOExcep
     List<VarCharVector> vectorsForChar = new ArrayList<>();
     List<BitVector> vectorsForBit = new ArrayList<>();
     List<BitVector> vectorsForBool = new ArrayList<>();
-    List<DateMilliVector> dateMilliVectors = new ArrayList<>();
+    List<DateDayVector> dateDayVectors = new ArrayList<>();
     List<TimeMilliVector> timeMilliVectors = new ArrayList<>();
     List<TimeStampVector> timeStampVectors = new ArrayList<>();
     List<DecimalVector> decimalVectors = new ArrayList<>();
@@ -115,7 +117,7 @@ private void validate(ArrowVectorIterator iterator) throws SQLException, IOExcep
       vectorsForChar.add((VarCharVector) root.getVector(CHAR));
       vectorsForBit.add((BitVector) root.getVector(BIT));
       vectorsForBool.add((BitVector) root.getVector(BOOL));
-      dateMilliVectors.add((DateMilliVector) root.getVector(DATE));
+      dateDayVectors.add((DateDayVector) root.getVector(DATE));
       timeMilliVectors.add((TimeMilliVector) root.getVector(TIME));
       timeStampVectors.add((TimeStampVector) root.getVector(TIMESTAMP));
       decimalVectors.add((DecimalVector) root.getVector(DECIMAL));
@@ -134,7 +136,7 @@ private void validate(ArrowVectorIterator iterator) throws SQLException, IOExcep
     assertVarCharVectorValues(vectorsForChar, table.getRowCount(), getCharArray(table.getValues(), CHAR));
     assertBitVectorValues(vectorsForBit, table.getRowCount(), getIntValues(table.getValues(), BIT));
     assertBooleanVectorValues(vectorsForBool, table.getRowCount(), getBooleanValues(table.getValues(), BOOL));
-    assertDateMilliVectorValues(dateMilliVectors, table.getRowCount(), getLongValues(table.getValues(), DATE));
+    assertDateDayVectorValues(dateDayVectors, table.getRowCount(), getLongValues(table.getValues(), DATE));
     assertTimeMilliVectorValues(timeMilliVectors, table.getRowCount(), getLongValues(table.getValues(), TIME));
     assertTimeStampVectorValues(timeStampVectors, table.getRowCount(), getLongValues(table.getValues(), TIMESTAMP));
     assertDecimalVectorValues(decimalVectors, table.getRowCount(), getDecimalValues(table.getValues(), DECIMAL));
@@ -205,12 +207,12 @@ private void assertTimeMilliVectorValues(List<TimeMilliVector> vectors, int rowC
     }
   }
 
-  private void assertDateMilliVectorValues(List<DateMilliVector> vectors, int rowCount, Long[] values) {
+  private void assertDateDayVectorValues(List<DateDayVector> vectors, int rowCount, Long[] values) {
     int valueCount = vectors.stream().mapToInt(ValueVector::getValueCount).sum();
     assertEquals(rowCount, valueCount);
 
     int index = 0;
-    for (DateMilliVector vector : vectors) {
+    for (DateDayVector vector : vectors) {
       for (int i = 0; i < vector.getValueCount(); i++) {
         assertEquals(values[index++].longValue(), vector.get(i));
       }

java/adapter/jdbc/src/test/resources/h2/test1_all_datatypes_h2.yml

@@ -85,7 +85,7 @@ values:
  - 'DECIMAL_FIELD6=17345667789.23,17345667789.23,17345667789.23,17345667789.23,17345667789.23,17345667789.23,17345667789.23,17345667789.23,17345667789.23,17345667789.23'
  - 'DOUBLE_FIELD7=56478356785.345,56478356785.345,56478356785.345,56478356785.345,56478356785.345,56478356785.345,56478356785.345,56478356785.345,56478356785.345,56478356785.345'
  - 'TIME_FIELD9=45935000,45935000,45935000,45935000,45935000,45935000,45935000,45935000,45935000,45935000'
- - 'DATE_FIELD10=1518393600000,1518393600000,1518393600000,1518393600000,1518393600000,1518393600000,1518393600000,1518393600000,1518393600000,1518393600000'
+ - 'DATE_FIELD10=17574,17574,17574,17574,17574,17574,17574,17574,17574,17574'
  - 'TIMESTAMP_FIELD11=1518439535000,1518439535000,1518439535000,1518439535000,1518439535000,1518439535000,1518439535000,1518439535000,1518439535000,1518439535000'
  - 'CHAR_FIELD16=some char text,some char text,some char text,some char text,some char text,
  		 some char text,some char text,some char text,some char text,some char text'

java/adapter/jdbc/src/test/resources/h2/test1_all_datatypes_selected_null_rows_h2.yml

@@ -71,7 +71,7 @@ values:
  - 'DECIMAL_FIELD6=null,17345667789.23,null,17345667789.23,null'
  - 'DOUBLE_FIELD7=null,56478356785.345,null,56478356785.345,null'
  - 'TIME_FIELD9=null,45935000,null,45935000,null'
- - 'DATE_FIELD10=null,1518393600000,null,1518393600000,null'
+ - 'DATE_FIELD10=null,17574,null,17574,null'
  - 'TIMESTAMP_FIELD11=null,1518439535000,null,1518439535000,null'
  - 'CHAR_FIELD16=null,some char text,null,some char text,null'
  - 'VARCHAR_FIELD13=null,some text that needs to be converted to varchar,null,

java/adapter/jdbc/src/test/resources/h2/test1_date_h2.yml

@@ -34,13 +34,13 @@ query: 'select date_field10 from table1;'
 drop: 'DROP table table1;'
 
 values:
- - '1518393600000'
- - '1518393600000'
- - '1518393600000'
- - '1518393600000'
- - '1518393600000'
- - '1518393600000'
- - '1518393600000'
- - '1518393600000'
- - '1518393600000'
- - '1518393600000'
+ - '17574'
+ - '17574'
+ - '17574'
+ - '17574'
+ - '17574'
+ - '17574'
+ - '17574'
+ - '17574'
+ - '17574'
+ - '17574'

java/adapter/jdbc/src/test/resources/h2/test1_est_date_h2.yml

@@ -36,13 +36,13 @@ query: 'select date_field10 from table1;'
 drop: 'DROP table table1;'
 
 values:
- - '1518411600000'
- - '1518411600000'
- - '1518411600000'
- - '1518411600000'
- - '1518411600000'
- - '1518411600000'
- - '1518411600000'
- - '1518411600000'
- - '1518411600000'
- - '1518411600000'
+ - '17574'
+ - '17574'
+ - '17574'
+ - '17574'
+ - '17574'
+ - '17574'
+ - '17574'
+ - '17574'
+ - '17574'
+ - '17574'

java/adapter/jdbc/src/test/resources/h2/test1_gmt_date_h2.yml

@@ -36,13 +36,13 @@ query: 'select date_field10 from table1;'
 drop: 'DROP table table1;'
 
 values:
- - '1518393600000'
- - '1518393600000'
- - '1518393600000'
- - '1518393600000'
- - '1518393600000'
- - '1518393600000'
- - '1518393600000'
- - '1518393600000'
- - '1518393600000'
- - '1518393600000'
+ - '17574'
+ - '17574'
+ - '17574'
+ - '17574'
+ - '17574'
+ - '17574'
+ - '17574'
+ - '17574'
+ - '17574'
+ - '17574'