fix remaining tests

sql/core/src/main/java/org/apache/spark/sql/execution/vectorized/ColumnVectorUtils.java

@@ -165,7 +165,8 @@ private static void appendValue(WritableColumnVector dst, DataType t, Object o)
         CalendarInterval c = (CalendarInterval)o;
         dst.appendStruct(false);
         dst.getChild(0).appendInt(c.months);
-        dst.getChild(1).appendLong(c.microseconds);
+        dst.getChild(1).appendInt(c.days);
+        dst.getChild(2).appendLong(c.microseconds);
       } else if (t instanceof DateType) {
         dst.appendInt(DateTimeUtils.fromJavaDate((Date)o));
       } else {

sql/core/src/main/java/org/apache/spark/sql/execution/vectorized/WritableColumnVector.java

@@ -736,10 +736,11 @@ protected WritableColumnVector(int capacity, DataType type) {
       this.childColumns[0] = reserveNewColumn(capacity, mapType.keyType());
       this.childColumns[1] = reserveNewColumn(capacity, mapType.valueType());
     } else if (type instanceof CalendarIntervalType) {
-      // Two columns. Months as int. Microseconds as Long.
-      this.childColumns = new WritableColumnVector[2];
+      // Three columns. Months as int. Days as Int. Microseconds as Long.
+      this.childColumns = new WritableColumnVector[3];
       this.childColumns[0] = reserveNewColumn(capacity, DataTypes.IntegerType);
-      this.childColumns[1] = reserveNewColumn(capacity, DataTypes.LongType);
+      this.childColumns[1] = reserveNewColumn(capacity, DataTypes.IntegerType);
+      this.childColumns[2] = reserveNewColumn(capacity, DataTypes.LongType);
     } else {
       this.childColumns = null;
     }

sql/core/src/test/scala/org/apache/spark/sql/execution/vectorized/ColumnarBatchSuite.scala

@@ -636,30 +636,40 @@ class ColumnarBatchSuite extends SparkFunSuite {
       assert(column.arrayData().elementsAppended == 0)
   }
 
-  testVector("CalendarInterval APIs", 4, CalendarIntervalType) {
+  testVector("CalendarInterval APIs", 5, CalendarIntervalType) {
     column =>
       val reference = mutable.ArrayBuffer.empty[CalendarInterval]
 
       val months = column.getChild(0)
-      val microseconds = column.getChild(1)
+      val days = column.getChild(1)
+      val microseconds = column.getChild(2)
       assert(months.dataType() == IntegerType)
+      assert(days.dataType() == IntegerType)
       assert(microseconds.dataType() == LongType)
 
       months.putInt(0, 1)
+      days.putInt(0, 10)
       microseconds.putLong(0, 100)
-      reference += new CalendarInterval(1, 100)
+      reference += new CalendarInterval(1, 10, 100)
 
       months.putInt(1, 0)
+      days.putInt(1, 0)
       microseconds.putLong(1, 2000)
-      reference += new CalendarInterval(0, 2000)
+      reference += new CalendarInterval(0, 0, 2000)
 
       column.putNull(2)
       assert(column.getInterval(2) == null)
       reference += null
 
       months.putInt(3, 20)
+      days.putInt(3, 0)
       microseconds.putLong(3, 0)
-      reference += new CalendarInterval(20, 0)
+      reference += new CalendarInterval(20, 0, 0)
+
+      months.putInt(4, 0)
+      days.putInt(4, 200)
+      microseconds.putLong(4, 0)
+      reference += new CalendarInterval(0, 200, 0)
 
       reference.zipWithIndex.foreach { case (v, i) =>
         val errMsg = "VectorType=" + column.getClass.getSimpleName