cleanup

Author: julienledem

format/File.fbs

@@ -7,9 +7,9 @@ namespace org.apache.arrow.flatbuf;
 ///
 
 table Footer {
-  
+
   schema: org.apache.arrow.flatbuf.Schema;
-  
+
   dictionaries: [ Block ];
 
   recordBatches: [ Block ];
@@ -20,7 +20,7 @@ struct Block {
   offset: long;
 
   metaDataLength: int;
-  
+
   bodyLength: long;
 
 }

format/Message.fbs

@@ -91,10 +91,6 @@ union Type {
   JSONScalar
 }
 
-/// ----------------------------------------------------------------------
-/// Data structures for describing a table row batch (a collection of
-/// equal-length Arrow arrays)
-
 enum VectorType: short {
   /// used in List type Dense Union and variable length primitive types (String, Binary)
   OFFSET,
@@ -148,6 +144,10 @@ table Schema {
   fields: [Field];
 }
 
+/// ----------------------------------------------------------------------
+/// Data structures for describing a table row batch (a collection of
+/// equal-length Arrow arrays)
+
 /// A Buffer represents a single contiguous memory segment
 struct Buffer {
   /// The shared memory page id where this buffer is located. Currently this is

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

@@ -41,7 +41,7 @@ public abstract class ArrowType {
 
   public static interface ArrowTypeVisitor<T> {
   <#list arrowTypes.types as type>
-    T visit(${type.name} type); 
+    T visit(${type.name} type);
   </#list>
   }
 

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

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

@@ -36,7 +36,7 @@
 /*
  * Base class for MapVectors. Currently used by RepeatedMapVector and MapVector
  */
-public abstract class AbstractMapVector extends AbstractContainerVector implements NestedVector {
+public abstract class AbstractMapVector extends AbstractContainerVector {
   private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(AbstractContainerVector.class);
 
   // Maintains a map with key as field name and value is the vector itself
@@ -160,8 +160,7 @@ public <T extends ValueVector> T getChild(String name, Class<T> clazz) {
     return typeify(v, clazz);
   }
 
-  @Override
-  public ValueVector add(String name, MinorType minorType, int... precisionScale) {
+  protected ValueVector add(String name, MinorType minorType, int... precisionScale) {
     final ValueVector existing = getChild(name);
     if (existing != null) {
       throw new IllegalStateException(String.format("Vector already exists: Existing[%s], Requested[%s] ", existing.getClass().getSimpleName(), minorType));

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

@@ -24,8 +24,6 @@
 import java.util.Collections;
 
 import org.apache.arrow.flatbuf.Footer;
-import org.apache.arrow.vector.file.ArrowBlock;
-import org.apache.arrow.vector.file.ArrowFooter;
 import org.apache.arrow.vector.types.pojo.ArrowType;
 import org.apache.arrow.vector.types.pojo.Field;
 import org.apache.arrow.vector.types.pojo.Schema;
@@ -51,9 +49,7 @@ private ArrowFooter roundTrip(ArrowFooter footer) {
     int i = footer.writeTo(builder);
     builder.finish(i);
     ByteBuffer dataBuffer = builder.dataBuffer();
-    System.out.println(dataBuffer);
     ArrowFooter newFooter = new ArrowFooter(Footer.getRootAsFooter(dataBuffer));
-    System.out.println(dataBuffer);
     return newFooter;
   }