prepare for 0.51.6-public

Author: dingxin-tech

odps-sdk/odps-sdk-commons/src/main/java/com/aliyun/odps/TableSchema.java

@@ -171,6 +171,11 @@ public List<Column> getColumns() {
     return (List<Column>) columns.clone();
   }
 
+  @Deprecated
+  public void setPartitionColumns(ArrayList<Column> partitionColumns) {
+    setPartitionColumns((List<Column>)partitionColumns);
+  }
+
   public void setPartitionColumns(List<Column> partitionColumns) {
     this.partitionNameMap.clear();
     this.partitionColumns.clear();

odps-sdk/odps-sdk-commons/src/main/java/com/aliyun/odps/type/ArrayTypeInfo.java

@@ -7,6 +7,6 @@
  *
  * Created by zhenhong.gzh on 16/7/8.
  */
-public interface ArrayTypeInfo extends TypeInfo {
+public interface ArrayTypeInfo extends NestedTypeInfo {
   TypeInfo getElementTypeInfo();
 }

odps-sdk/odps-sdk-commons/src/main/java/com/aliyun/odps/type/MapTypeInfo.java

@@ -7,7 +7,7 @@
  *
  * Created by zhenhong.gzh on 16/7/8.
  */
- public interface MapTypeInfo extends TypeInfo {
+ public interface MapTypeInfo extends NestedTypeInfo {
   TypeInfo getKeyTypeInfo();
   TypeInfo getValueTypeInfo();
 }

odps-sdk/odps-sdk-commons/src/main/java/com/aliyun/odps/type/NestedTypeInfo.java

@@ -0,0 +1,14 @@
+package com.aliyun.odps.type;
+
+import com.aliyun.odps.OdpsType;
+
+/**
+ * @author dingxin (zhangdingxin.zdx@alibaba-inc.com)
+ */
+public interface NestedTypeInfo extends TypeInfo {
+  /**
+   * 此方法会将struct类型中，列字段进行转义。适用于拼装 SQL 场景
+   * 当 quote = false 时，此方法与 getTypeName() 相同
+   */
+  String getTypeName(boolean quote);
+}

odps-sdk/odps-sdk-commons/src/main/java/com/aliyun/odps/type/SimpleArrayTypeInfo.java

@@ -28,11 +28,6 @@ class SimpleArrayTypeInfo implements ArrayTypeInfo {
     valueType = typeInfo;
   }
 
-  @Override
-  public String getTypeName() {
-    return getOdpsType().name() + "<" + valueType.getTypeName() + ">";
-  }
-
   /**
    * 获取 Array 里元素类型信息
    *
@@ -69,4 +64,16 @@ public boolean equals(Object o) {
   public int hashCode() {
     return Objects.hash(valueType);
   }
+
+  @Override
+  public String getTypeName() {
+    return getTypeName(false);
+  }
+  @Override
+  public String getTypeName(boolean quote) {
+    if (quote && valueType instanceof SimpleStructTypeInfo) {
+      return getOdpsType().name() + "<" + ((SimpleStructTypeInfo) valueType).getTypeName(true) + ">";
+    }
+    return getOdpsType().name() + "<" + valueType.getTypeName() + ">";
+  }
 }

odps-sdk/odps-sdk-commons/src/main/java/com/aliyun/odps/type/SimpleMapTypeInfo.java

@@ -32,11 +32,6 @@ class SimpleMapTypeInfo implements MapTypeInfo {
     this.valueType = valueType;
   }
 
-  @Override
-  public String getTypeName() {
-    return getOdpsType().name() + "<" + keyType.getTypeName() + "," + valueType.getTypeName() + ">";
-  }
-
   /**
    * 获取键的类型
    *
@@ -83,4 +78,36 @@ public boolean equals(Object o) {
   public int hashCode() {
     return Objects.hash(keyType, valueType);
   }
+
+  @Override
+  public String getTypeName() {
+    return getTypeName(false);
+  }
+
+  @Override
+  public String getTypeName(boolean quote) {
+    String baseType = getOdpsType().name();
+
+    if (!quote) {
+      return String.format("%s<%s,%s>",
+                           baseType,
+                           keyType.getTypeName(),
+                           valueType.getTypeName()
+      );
+    }
+
+    StringBuilder sb = new StringBuilder(baseType).append("<");
+    appendNestedType(sb, keyType);
+    sb.append(",");
+    appendNestedType(sb, valueType);
+    return sb.append(">").toString();
+  }
+
+  private void appendNestedType(StringBuilder sb, TypeInfo type) {
+    if (type instanceof NestedTypeInfo) {
+      sb.append(((NestedTypeInfo) type).getTypeName(true));
+    } else {
+      sb.append(type.getTypeName());
+    }
+  }
 }

odps-sdk/odps-sdk-commons/src/main/java/com/aliyun/odps/type/StructTypeInfo.java

@@ -9,14 +9,8 @@
  *
  * Created by zhenhong.gzh on 16/7/8.
  */
-public interface StructTypeInfo extends TypeInfo {
+public interface StructTypeInfo extends NestedTypeInfo {
   List<String> getFieldNames();
   List<TypeInfo> getFieldTypeInfos();
   int getFieldCount();
-
-  /**
-   * 此方法会将struct类型中，列字段进行转义。适用于拼装 SQL 场景
-   * 当 quote = false 时，此方法与 getTypeName() 相同
-   */
-  String getTypeName(boolean quote);
 }

odps-sdk/odps-sdk-commons/src/test/java/com/aliyun/odps/type/NestedTypeQuoteTest.java

@@ -0,0 +1,69 @@
+package com.aliyun.odps.type;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+/**
+ * @author dingxin (zhangdingxin.zdx@alibaba-inc.com)
+ */
+public class NestedTypeQuoteTest {
+
+  private static StructTypeInfo nestedTypeInfo;
+
+  static {
+    List<String> names = new ArrayList<>();
+    names.add("end");
+    names.add("start");
+    List<TypeInfo> typeInfos = new ArrayList<>();
+    typeInfos.add(TypeInfoFactory.STRING);
+    typeInfos.add(TypeInfoFactory.BIGINT);
+
+    nestedTypeInfo = TypeInfoFactory.getStructTypeInfo(names, typeInfos);
+  }
+
+  @Test
+  public void testBasic() {
+    String typeWithNoQuote = nestedTypeInfo.getTypeName();
+    Assert.assertEquals("STRUCT<end:STRING,start:BIGINT>", typeWithNoQuote);
+    String typeWithQuote = nestedTypeInfo.getTypeName(true);
+    Assert.assertEquals("STRUCT<`end`:STRING,`start`:BIGINT>", typeWithQuote);
+  }
+
+  @Test
+  public void testArray() {
+    ArrayTypeInfo arrayTypeInfo = TypeInfoFactory.getArrayTypeInfo(nestedTypeInfo);
+    String typeName = arrayTypeInfo.getTypeName();
+    Assert.assertEquals("ARRAY<STRUCT<end:STRING,start:BIGINT>>", typeName);
+    String typeNameWithQuote = arrayTypeInfo.getTypeName(true);
+    Assert.assertEquals("ARRAY<STRUCT<`end`:STRING,`start`:BIGINT>>", typeNameWithQuote);
+  }
+
+  @Test
+  public void testMap() {
+    MapTypeInfo mapTypeInfo = TypeInfoFactory.getMapTypeInfo(nestedTypeInfo, nestedTypeInfo);
+    String typeName = mapTypeInfo.getTypeName();
+    Assert.assertEquals("MAP<STRUCT<end:STRING,start:BIGINT>,STRUCT<end:STRING,start:BIGINT>>", typeName);
+    String typeNameWithQuote = mapTypeInfo.getTypeName(true);
+    Assert.assertEquals("MAP<STRUCT<`end`:STRING,`start`:BIGINT>,STRUCT<`end`:STRING,`start`:BIGINT>>", typeNameWithQuote);
+  }
+
+  @Test
+  public void testStruct() {
+    List<String> names = new ArrayList<>();
+    names.add("end");
+    names.add("start");
+    List<TypeInfo> typeInfos = new ArrayList<>();
+    typeInfos.add(nestedTypeInfo);
+    typeInfos.add(nestedTypeInfo);
+    StructTypeInfo structTypeInfo = TypeInfoFactory.getStructTypeInfo(names, typeInfos);
+    String typeName = structTypeInfo.getTypeName();
+    Assert.assertEquals("STRUCT<end:STRUCT<end:STRING,start:BIGINT>,start:STRUCT<end:STRING,start:BIGINT>>", typeName);
+
+    String typeNameWithQuote = structTypeInfo.getTypeName(true);
+    Assert.assertEquals("STRUCT<`end`:STRUCT<`end`:STRING,`start`:BIGINT>,`start`:STRUCT<`end`:STRING,`start`:BIGINT>>", typeNameWithQuote);
+  }
+
+}

odps-sdk/odps-sdk-core/src/main/java/com/aliyun/odps/Tables.java

@@ -39,6 +39,7 @@
 import com.aliyun.odps.simpleframework.xml.convert.Convert;
 import com.aliyun.odps.table.utils.Preconditions;
 import com.aliyun.odps.task.SQLTask;
+import com.aliyun.odps.type.NestedTypeInfo;
 import com.aliyun.odps.type.StructTypeInfo;
 import com.aliyun.odps.type.TypeInfo;
 import com.aliyun.odps.type.TypeInfoFactory;
@@ -1413,8 +1414,8 @@ private String generateCreateTableSql() {
     }
 
     private String getTypeName(TypeInfo typeInfo) {
-      if (typeInfo instanceof StructTypeInfo) {
-        return ((StructTypeInfo) typeInfo).getTypeName(true);
+      if (typeInfo instanceof NestedTypeInfo) {
+        return ((NestedTypeInfo) typeInfo).getTypeName(true);
       }
       return typeInfo.getTypeName();
     }