update format

Author: julienledem

java/vector/src/main/codegen/data/ArrowTypes.tdd

@@ -30,15 +30,15 @@
     },
     {
       name: "Union",
-      fields: [{name: "mode", type: int}]
+      fields: [{name: "mode", type: short}]
     },
     {
       name: "Int",
       fields: [{name: "bitWidth", type: int}, {name: "isSigned", type: boolean}]
     },
     {
       name: "FloatingPoint",
-      fields: [{name: precision, type: int}]
+      fields: [{name: precision, type: short}]
     },
     {
       name: "Utf8",

java/vector/src/main/codegen/templates/ArrowType.java

@@ -87,6 +87,14 @@ public int getType(FlatBufferBuilder builder) {
       return ${field.name};
     }
     </#list>
+    
+    public String toString() {
+      return "${name}{"
+      <#list fields as field>
+      + ", " + ${field.name}
+      </#list>
+      + "}";
+    }
 
     @Override
     public int hashCode() {

java/vector/src/main/codegen/templates/NullableValueVectors.java

@@ -29,6 +29,9 @@
 
 package org.apache.arrow.vector;
 
+import org.apache.arrow.vector.schema.ArrowFieldNode;
+import java.util.Collections;
+
 <#include "/@includes/vv_imports.ftl" />
 
 /**
@@ -39,7 +42,7 @@
  * NB: this class is automatically generated from ${.template_name} and ValueVectorTypes.tdd using FreeMarker.
  */
 @SuppressWarnings("unused")
-public final class ${className} extends BaseDataValueVector implements <#if type.major == "VarLen">VariableWidth<#else>FixedWidth</#if>Vector, NullableVector{
+public final class ${className} extends BaseDataValueVector implements <#if type.major == "VarLen">VariableWidth<#else>FixedWidth</#if>Vector, NullableVector, FieldVector{
   private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(${className}.class);
 
   private final FieldReader reader = new ${minor.class}ReaderImpl(Nullable${minor.class}Vector.this);
@@ -88,9 +91,9 @@ public final class ${className} extends BaseDataValueVector implements <#if type
   <#elseif minor.class == "Time">
     field = new Field(name, true, new org.apache.arrow.vector.types.pojo.ArrowType.Time(), null);
   <#elseif minor.class == "Float4">
-    field = new Field(name, true, new FloatingPoint(0), null);
+    field = new Field(name, true, new FloatingPoint(org.apache.arrow.flatbuf.Precision.SINGLE), null);
   <#elseif minor.class == "Float8">
-    field = new Field(name, true, new FloatingPoint(1), null);
+    field = new Field(name, true, new FloatingPoint(org.apache.arrow.flatbuf.Precision.DOUBLE), null);
   <#elseif minor.class == "TimeStamp">
     field = new Field(name, true, new org.apache.arrow.vector.types.pojo.ArrowType.Timestamp(""), null);
   <#elseif minor.class == "IntervalDay">
@@ -107,6 +110,29 @@ public final class ${className} extends BaseDataValueVector implements <#if type
   }
   </#if>
 
+    /**
+   * Initializes the child vectors
+   * to be later loaded with loadBuffers
+   * @param children
+   */
+  public void initializeChildrenFromFields(List<Field> children) {
+    throw new UnsupportedOperationException();
+  }
+
+  public List<FieldVector> getChildrenFromFields() {
+    return Collections.emptyList();
+  }
+
+  public void loadFieldBuffers(ArrowFieldNode fieldNode, List<ArrowBuf> ownBuffers) {
+    throw new UnsupportedOperationException();
+  }
+
+  public List<ArrowBuf> getFieldBuffers() {
+    bits.getBuffer().readerIndex(0);
+    values.getBuffer().readerIndex(0);
+    return Arrays.asList(bits.getBuffer(), values.getBuffer());
+  }
+  
   @Override
   public Field getField() {
     return field;

java/vector/src/main/java/org/apache/arrow/schema/ArrowVectorType.java

@@ -0,0 +1,28 @@
+package org.apache.arrow.vector;
+
+import java.util.List;
+
+import org.apache.arrow.vector.schema.ArrowFieldNode;
+import org.apache.arrow.vector.types.pojo.Field;
+
+import io.netty.buffer.ArrowBuf;
+
+public interface FieldVector extends ValueVector {
+
+  /**
+   * Initializes the child vectors
+   * to be later loaded with loadBuffers
+   * @param children
+   */
+  void initializeChildrenFromFields(List<Field> children);
+
+  List<FieldVector> getChildrenFromFields();
+
+  void loadFieldBuffers(ArrowFieldNode fieldNode, List<ArrowBuf> ownBuffers);
+
+  /**
+   * Returns the own buffers for this vector
+   * @return the
+   */
+  List<ArrowBuf> getFieldBuffers();
+}

java/vector/src/main/java/org/apache/arrow/vector/FieldVector.java

@@ -19,14 +19,14 @@
 
 import java.io.Closeable;
 
-import io.netty.buffer.ArrowBuf;
-
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.OutOfMemoryException;
 import org.apache.arrow.vector.complex.reader.FieldReader;
 import org.apache.arrow.vector.types.Types.MinorType;
-import org.apache.arrow.vector.util.TransferPair;
 import org.apache.arrow.vector.types.pojo.Field;
+import org.apache.arrow.vector.util.TransferPair;
+
+import io.netty.buffer.ArrowBuf;
 
 /**
  * An abstraction that is used to store a sequence of values in an individual column.
@@ -137,6 +137,8 @@ public interface ValueVector extends Closeable, Iterable<ValueVector> {
    */
 //  SerializedField getMetadata();
 
+//  TypeLayout getTypeLayout();
+
   /**
    * Returns the number of bytes that is used by this vector instance.
    */
@@ -221,4 +223,5 @@ interface Mutator {
     @Deprecated
     void generateTestData(int values);
   }
+
 }

java/vector/src/main/java/org/apache/arrow/vector/ValueVector.java

@@ -21,11 +21,11 @@
 import java.util.List;
 
 import org.apache.arrow.flatbuf.Precision;
-import org.apache.arrow.schema.ArrowFieldNode;
 import org.apache.arrow.vector.complex.ComplexVectorLoader;
 import org.apache.arrow.vector.complex.ListVector;
 import org.apache.arrow.vector.complex.MapVector;
 import org.apache.arrow.vector.complex.NestedVector;
+import org.apache.arrow.vector.schema.ArrowFieldNode;
 import org.apache.arrow.vector.types.Types;
 import org.apache.arrow.vector.types.Types.MinorType;
 import org.apache.arrow.vector.types.pojo.ArrowType;

java/vector/src/main/java/org/apache/arrow/vector/VectorLoader.java

@@ -19,8 +19,8 @@
 
 import java.util.Iterator;
 
-import org.apache.arrow.schema.ArrowFieldNode;
 import org.apache.arrow.vector.VectorLoader;
+import org.apache.arrow.vector.schema.ArrowFieldNode;
 
 import io.netty.buffer.ArrowBuf;
 

java/vector/src/main/java/org/apache/arrow/vector/complex/ComplexVectorLoader.java

@@ -27,10 +27,12 @@
 
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.vector.BaseValueVector;
+import org.apache.arrow.vector.FieldVector;
 import org.apache.arrow.vector.ValueVector;
 import org.apache.arrow.vector.complex.impl.SingleMapReaderImpl;
 import org.apache.arrow.vector.complex.reader.FieldReader;
 import org.apache.arrow.vector.holders.ComplexHolder;
+import org.apache.arrow.vector.types.Types;
 import org.apache.arrow.vector.types.Types.MinorType;
 import org.apache.arrow.vector.types.pojo.ArrowType.Tuple;
 import org.apache.arrow.vector.types.pojo.Field;
@@ -323,4 +325,25 @@ public void close() {
 
     super.close();
  }
+
+  private List<FieldVector> fieldChildren;
+
+  public void initializeChildren(List<Field> children) {
+    if (fieldChildren != null) {
+      throw new IllegalArgumentException(children.toString()); //TODO
+    }
+    for (Field field : children) {
+      MinorType minorType = Types.getMinorTypeForArrowType(field.getType());
+      FieldVector vector = (FieldVector)this.add(field.getName(), minorType);
+      fieldChildren.add(vector);
+      // TODO: clean this up
+      vector.initializeChildrenFromFields(field.getChildren());
+    }
+  }
+
+  public List<FieldVector> getFieldVectors() {
+    // TODO: clean this up
+    return (List<FieldVector>)(List<?>)getChildren();
+  }
+
 }

java/vector/src/main/java/org/apache/arrow/vector/complex/MapVector.java

@@ -15,10 +15,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.arrow.file;
+package org.apache.arrow.vector.file;
 
 import org.apache.arrow.flatbuf.Block;
-import org.apache.arrow.schema.FBSerializable;
+import org.apache.arrow.vector.schema.FBSerializable;
 
 import com.google.flatbuffers.FlatBufferBuilder;