ARROW-278: [Format] Rename Tuple to Struct_ in flatbuffers IDL

"Struct" is a reserved keyword in generated bindings for C++. We had used "Tuple" to sidestep this but we discussed and decided to mangle "Struct" instead in the Flatbuffers.

Author: Wes McKinney <[email protected]>

Closes apache#130 from wesm/ARROW-278 and squashes the following commits:

841a721 [Wes McKinney] Rename Tuple to Struct_ in flatbuffers IDL

Author: wesm

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

@@ -21,7 +21,7 @@
       fields: []
     },
     {
-      name: "Tuple",
+      name: "Struct_",
       fields: []
     },
     {

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

@@ -34,7 +34,7 @@
 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.ArrowType.Struct_;
 import org.apache.arrow.vector.types.pojo.Field;
 import org.apache.arrow.vector.util.CallBack;
 import org.apache.arrow.vector.util.JsonStringHashMap;
@@ -290,7 +290,7 @@ public Field getField() {
     for (ValueVector child : getChildren()) {
       children.add(child.getField());
     }
-    return new Field(name, false, Tuple.INSTANCE, children);
+    return new Field(name, false, Struct_.INSTANCE, children);
   }
 
   @Override

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

@@ -45,7 +45,7 @@
 import org.apache.arrow.vector.types.pojo.ArrowType.Null;
 import org.apache.arrow.vector.types.pojo.ArrowType.Time;
 import org.apache.arrow.vector.types.pojo.ArrowType.Timestamp;
-import org.apache.arrow.vector.types.pojo.ArrowType.Tuple;
+import org.apache.arrow.vector.types.pojo.ArrowType.Struct_;
 import org.apache.arrow.vector.types.pojo.ArrowType.Union;
 import org.apache.arrow.vector.types.pojo.ArrowType.Utf8;
 
@@ -54,7 +54,7 @@
 /**
  * The layout of vectors for a given type
  * It defines its own vectors followed by the vectors for the children
- * if it is a nested type (Tuple, List, Union)
+ * if it is a nested type (Struct_, List, Union)
  */
 public class TypeLayout {
 
@@ -88,7 +88,7 @@ public static TypeLayout getTypeLayout(final ArrowType arrowType) {
         return new TypeLayout(vectors);
       }
 
-      @Override public TypeLayout visit(Tuple type) {
+      @Override public TypeLayout visit(Struct_ type) {
         List<VectorLayout> vectors = asList(
             validityVector()
             );

vector/src/main/java/org/apache/arrow/vector/types/Types.java

@@ -84,7 +84,7 @@
 import org.apache.arrow.vector.types.pojo.ArrowType.Null;
 import org.apache.arrow.vector.types.pojo.ArrowType.Time;
 import org.apache.arrow.vector.types.pojo.ArrowType.Timestamp;
-import org.apache.arrow.vector.types.pojo.ArrowType.Tuple;
+import org.apache.arrow.vector.types.pojo.ArrowType.Struct_;
 import org.apache.arrow.vector.types.pojo.ArrowType.Union;
 import org.apache.arrow.vector.types.pojo.ArrowType.Utf8;
 import org.apache.arrow.vector.types.pojo.Field;
@@ -131,7 +131,7 @@ public FieldWriter getNewFieldWriter(ValueVector vector) {
         return null;
       }
     },
-    MAP(Tuple.INSTANCE) {
+    MAP(Struct_.INSTANCE) {
       @Override
       public Field getField() {
         throw new UnsupportedOperationException("Cannot get simple field for Map type");

vector/src/test/java/org/apache/arrow/vector/pojo/TestConvert.java

@@ -26,7 +26,7 @@
 import org.apache.arrow.vector.types.pojo.ArrowType.Int;
 import org.apache.arrow.vector.types.pojo.ArrowType.List;
 import org.apache.arrow.vector.types.pojo.ArrowType.Timestamp;
-import org.apache.arrow.vector.types.pojo.ArrowType.Tuple;
+import org.apache.arrow.vector.types.pojo.ArrowType.Struct_;
 import org.apache.arrow.vector.types.pojo.ArrowType.Union;
 import org.apache.arrow.vector.types.pojo.ArrowType.Utf8;
 import org.apache.arrow.vector.types.pojo.Field;
@@ -53,7 +53,7 @@ public void complex() {
     childrenBuilder.add(new Field("child1", true, Utf8.INSTANCE, null));
     childrenBuilder.add(new Field("child2", true, new FloatingPoint(SINGLE), ImmutableList.<Field>of()));
 
-    Field initialField = new Field("a", true, Tuple.INSTANCE, childrenBuilder.build());
+    Field initialField = new Field("a", true, Struct_.INSTANCE, childrenBuilder.build());
     run(initialField);
   }
 
@@ -71,7 +71,7 @@ public void nestedSchema() {
     ImmutableList.Builder<Field> childrenBuilder = ImmutableList.builder();
     childrenBuilder.add(new Field("child1", true, Utf8.INSTANCE, null));
     childrenBuilder.add(new Field("child2", true, new FloatingPoint(SINGLE), ImmutableList.<Field>of()));
-    childrenBuilder.add(new Field("child3", true, new Tuple(), ImmutableList.<Field>of(
+    childrenBuilder.add(new Field("child3", true, new Struct_(), ImmutableList.<Field>of(
         new Field("child3.1", true, Utf8.INSTANCE, null),
         new Field("child3.2", true, new FloatingPoint(DOUBLE), ImmutableList.<Field>of())
         )));