prepare version 0.48.6-public

Author: dingxin-tech

odps-sdk-impl/odps-common-local/src/main/java/com/aliyun/odps/local/common/AnyTypeInfo.java

@@ -4,6 +4,7 @@
 import com.aliyun.odps.type.TypeInfo;
 
 public class AnyTypeInfo implements TypeInfo {
+  private static final long serialVersionUID = 1L;
 
   @Override
   public String getTypeName() {

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

@@ -19,8 +19,10 @@
 
 package com.aliyun.odps;
 
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 import com.aliyun.odps.type.ArrayTypeInfo;
 import com.aliyun.odps.type.MapTypeInfo;
@@ -30,8 +32,8 @@
 /**
  * Column表示ODPS中表的列定义
  */
-public final class Column {
-
+public final class Column implements Serializable {
+  private static final long serialVersionUID = 1L;
   private String name;
   private OdpsType type;
   private TypeInfo typeInfo;
@@ -41,7 +43,6 @@ public final class Column {
   private String defaultValue = null;
   private boolean isNullable = true;
   private boolean hasDefaultValue = false;
-  private boolean primaryKey = false;
 
   private List<OdpsType> genericOdpsTypeList;
   private List<String> extendedLabels;
@@ -114,7 +115,6 @@ public Column(ColumnBuilder columnBuilder) {
     this(columnBuilder.name, columnBuilder.typeInfo, columnBuilder.comment, columnBuilder.label,
          columnBuilder.extendedLabels);
     this.isNullable = !columnBuilder.notNull;
-    this.primaryKey = columnBuilder.primaryKey;
   }
 
   /**
@@ -380,8 +380,30 @@ public boolean hasDefaultValue()
     return hasDefaultValue;
   }
 
-  public boolean isPrimaryKey() {
-    return primaryKey;
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Column column = (Column) o;
+    return isNullable == column.isNullable && hasDefaultValue == column.hasDefaultValue
+           && Objects.equals(name, column.name)
+           && type == column.type && Objects.equals(typeInfo, column.typeInfo)
+           && Objects.equals(comment, column.comment) && Objects.equals(label,
+                                                                        column.label)
+           && Objects.equals(defaultValue, column.defaultValue) && Objects.equals(
+        genericOdpsTypeList, column.genericOdpsTypeList) && Objects.equals(extendedLabels,
+                                                                           column.extendedLabels);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(name, type, typeInfo, comment, label, defaultValue, isNullable,
+                        hasDefaultValue, genericOdpsTypeList, extendedLabels);
   }
 
   public static class ColumnBuilder {
@@ -392,7 +414,6 @@ public static class ColumnBuilder {
     private String label;
     private List<String> extendedLabels;
     private boolean notNull = false;
-    private boolean primaryKey = false;
 
     private ColumnBuilder(String name, TypeInfo typeInfo) {
       this.name = name;
@@ -419,12 +440,6 @@ public ColumnBuilder notNull() {
       return this;
     }
 
-    public ColumnBuilder primaryKey() {
-      this.primaryKey = true;
-      this.notNull = true;
-      return this;
-    }
-
     public Column build() {
       return new Column(this);
     }

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

@@ -19,12 +19,13 @@
 
 package com.aliyun.odps;
 
+import java.io.Serializable;
 import java.util.List;
 
 /**
  * ODPS表支持的字段类型
  */
-public enum OdpsType {
+public enum OdpsType implements Serializable {
   /**
    * 8字节有符号整型
    */

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

@@ -19,17 +19,19 @@
 
 package com.aliyun.odps;
 
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Objects;
 
 import com.aliyun.odps.type.TypeInfoFactory;
 
 /**
  * TableSchema表示ODPS中表的定义
  */
-public class TableSchema {
-
+public class TableSchema implements Serializable {
+  private static final long serialVersionUID = 1L;
   private ArrayList<Column> columns = new ArrayList<Column>();
   private ArrayList<Column> partitionColumns = new ArrayList<Column>();
 
@@ -271,6 +273,25 @@ public boolean basicallyEquals(Object o) {
     return true;
   }
 
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    TableSchema that = (TableSchema) o;
+    return Objects.equals(columns, that.columns) && Objects.equals(
+        partitionColumns, that.partitionColumns) && Objects.equals(nameMap, that.nameMap)
+           && Objects.equals(partitionNameMap, that.partitionNameMap);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(columns, partitionColumns, nameMap, partitionNameMap);
+  }
+
   public static class Builder {
 
     private final TableSchema schema;

odps-sdk/odps-sdk-commons/src/main/java/com/aliyun/odps/data/AbstractChar.java

@@ -1,6 +1,8 @@
 package com.aliyun.odps.data;
 
-public abstract class  AbstractChar<T extends AbstractChar> {
+import java.io.Serializable;
+
+public abstract class  AbstractChar<T extends AbstractChar> implements Serializable {
   protected String value;
 
   AbstractChar(String value) {

odps-sdk/odps-sdk-commons/src/main/java/com/aliyun/odps/data/ArrayRecord.java

@@ -22,6 +22,7 @@
 import static com.aliyun.odps.data.OdpsTypeTransformer.getCompatibleType;
 import static com.aliyun.odps.data.OdpsTypeTransformer.transformAndValidate;
 
+import java.io.Serializable;
 import java.io.UnsupportedEncodingException;
 import java.math.BigDecimal;
 import java.sql.Timestamp;
@@ -47,7 +48,8 @@
  *
  * @see Record
  */
-public class ArrayRecord implements Record {
+public class ArrayRecord implements Record, Serializable {
+  private static final long serialVersionUID = 1L;
   private static final Long DEFAULT_FIELD_MAX_SIZE = 8 * 1024 * 1024L;
   private static final String DEFAULT_CHARSET = "utf-8";
 
@@ -58,7 +60,7 @@ public class ArrayRecord implements Record {
       .build();
 
   private Column[] columns;
-  private final Object[] values;
+  private final Serializable[] values;
   private HashMap<String, Integer> nameMap = new HashMap<>();
 
   /**
@@ -90,7 +92,7 @@ public ArrayRecord(Column[] columns, boolean strictTypeValidation, Long fieldMax
       this.fieldMaxSize = fieldMaxSize;
     }
 
-    values = new Object[columns.length];
+    values = new Serializable[columns.length];
 
     for (int i = 0; i < columns.length; i++) {
       nameMap.put(columns[i].getName(), i);
@@ -1139,7 +1141,7 @@ protected <T> T getInternal(int idx) {
    * set record column value directly without type validation
    * unsafe: caller must ensure correct type and do validation check externally when necessary
    */
-  public void setWithoutValidation(int idx, Object o){
+  public void setWithoutValidation(int idx, Serializable o){
     this.values[idx] = o;
   }
 

odps-sdk/odps-sdk-commons/src/main/java/com/aliyun/odps/data/Binary.java

@@ -1,5 +1,6 @@
 package com.aliyun.odps.data;
 
+import java.io.Serializable;
 import java.util.Arrays;
 
 import com.aliyun.odps.utils.StringUtils;
@@ -9,7 +10,7 @@
  *
  * Created by zhenhong.gzh on 16/12/12.
  */
-public class Binary implements Comparable<Binary> {
+public class Binary implements Comparable<Binary>, Serializable {
   protected byte[] data;
 
   public Binary(byte[] data) {

odps-sdk/odps-sdk-commons/src/main/java/com/aliyun/odps/data/IntervalDayTime.java

@@ -1,5 +1,6 @@
 package com.aliyun.odps.data;
 
+import java.io.Serializable;
 import java.util.concurrent.TimeUnit;
 
 
@@ -8,7 +9,7 @@
  *
  * Created by zhenhong.gzh on 16/12/12.
  */
-public class IntervalDayTime implements Comparable<IntervalDayTime> {
+public class IntervalDayTime implements Comparable<IntervalDayTime>, Serializable {
   private final static int NANOS_PER_SECOND = 1000000000;
 
   protected long totalSeconds;

odps-sdk/odps-sdk-commons/src/main/java/com/aliyun/odps/data/IntervalYearMonth.java

@@ -1,12 +1,14 @@
 package com.aliyun.odps.data;
 
+import java.io.Serializable;
+
 /**
  * Interval Year Month 类型对应的数据类
  *
  * Created by zhenhong.gzh on 16/12/12.
  */
 
-public class IntervalYearMonth implements Comparable<IntervalYearMonth> {
+public class IntervalYearMonth implements Comparable<IntervalYearMonth>, Serializable {
   private final static int MONTHS_PER_YEAR = 12;
   private final static int MAX_YEARS = 9999;
 

odps-sdk/odps-sdk-commons/src/main/java/com/aliyun/odps/data/OdpsTypeTransformer.java

@@ -103,6 +103,14 @@ private static void validateString(String value, long limit) {
     }
   }
 
+  private static void validateJson(Object value) {
+    // maybe we should validate string type here
+    if (value instanceof JsonValue) {
+      // trigger lazy load
+      ((JsonValue) value).isJsonObject();
+    }
+  }
+
   private static void validateChar(Char value, CharTypeInfo typeInfo) {
     if (value.length() > typeInfo.getLength()) {
       throw new IllegalArgumentException(String.format(
@@ -235,6 +243,7 @@ static <T> T transform(Object value,
         if (setData) {
           if (strict) {
             validateString(transformedResult.toString(), fieldMaxSize);
+            validateJson(transformedResult);
           }
           return (T) transformedResult;
         }