update version to 0.48.0-public

dingxin-tech · web-flow · commit a45c4d0a2824 · 2024-04-19T17:50:59.000+08:00
diff --git a/odps-sdk-impl/odps-common-local/pom.xml b/odps-sdk-impl/odps-common-local/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.aliyun.odps</groupId>
         <artifactId>odps-sdk-impl</artifactId>
-        <version>0.47.0-public</version>
+        <version>0.48.0-public</version>
     </parent>
     <artifactId>odps-common-local</artifactId>
     <packaging>jar</packaging>
diff --git a/odps-sdk-impl/odps-graph-local/pom.xml b/odps-sdk-impl/odps-graph-local/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.aliyun.odps</groupId>
         <artifactId>odps-sdk-impl</artifactId>
-        <version>0.47.0-public</version>
+        <version>0.48.0-public</version>
     </parent>
 
     <artifactId>odps-graph-local</artifactId>
diff --git a/odps-sdk-impl/odps-mapred-bridge/pom.xml b/odps-sdk-impl/odps-mapred-bridge/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.aliyun.odps</groupId>
         <artifactId>odps-sdk-impl</artifactId>
-        <version>0.47.0-public</version>
+        <version>0.48.0-public</version>
     </parent>
 
     <artifactId>odps-mapred-bridge</artifactId>
diff --git a/odps-sdk-impl/odps-mapred-local/pom.xml b/odps-sdk-impl/odps-mapred-local/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.aliyun.odps</groupId>
         <artifactId>odps-sdk-impl</artifactId>
-        <version>0.47.0-public</version>
+        <version>0.48.0-public</version>
     </parent>
 
     <artifactId>odps-mapred-local</artifactId>
diff --git a/odps-sdk-impl/odps-udf-example/pom.xml b/odps-sdk-impl/odps-udf-example/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.aliyun.odps</groupId>
         <artifactId>odps-sdk-impl</artifactId>
-        <version>0.47.0-public</version>
+        <version>0.48.0-public</version>
     </parent>
 
     <artifactId>odps-udf-example</artifactId>
diff --git a/odps-sdk-impl/odps-udf-local/pom.xml b/odps-sdk-impl/odps-udf-local/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.aliyun.odps</groupId>
         <artifactId>odps-sdk-impl</artifactId>
-        <version>0.47.0-public</version>
+        <version>0.48.0-public</version>
     </parent>
     <artifactId>odps-udf-local</artifactId>
     <packaging>jar</packaging>
@@ -31,7 +31,7 @@
         <dependency>
             <groupId>com.aliyun.odps</groupId>
             <artifactId>odps-udf-example</artifactId>
-            <version>0.47.0-public</version>
+            <version>0.48.0-public</version>
         </dependency>
     </dependencies>
 
diff --git a/odps-sdk-impl/pom.xml b/odps-sdk-impl/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.aliyun.odps</groupId>
         <artifactId>odps</artifactId>
-        <version>0.47.0-public</version>
+        <version>0.48.0-public</version>
     </parent>
 
     <artifactId>odps-sdk-impl</artifactId>
diff --git a/odps-sdk/odps-lot-proto/pom.xml b/odps-sdk/odps-lot-proto/pom.xml
@@ -6,12 +6,12 @@
     <parent>
         <groupId>com.aliyun.odps</groupId>
         <artifactId>odps-sdk</artifactId>
-        <version>0.47.0-public</version>
+        <version>0.48.0-public</version>
     </parent>
 
     <groupId>com.aliyun.odps</groupId>
     <artifactId>odps-lot-proto</artifactId>
-    <version>0.47.0-public</version>
+    <version>0.48.0-public</version>
     <packaging>jar</packaging>
 
     <name>odps-lot-proto</name>
diff --git a/odps-sdk/odps-sdk-commons/pom.xml b/odps-sdk/odps-sdk-commons/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>com.aliyun.odps</groupId>
         <artifactId>odps-sdk</artifactId>
-        <version>0.47.0-public</version>
+        <version>0.48.0-public</version>
     </parent>
     <name>ODPS SDK Commons for Mapreduce/Graph</name>
     <artifactId>odps-sdk-commons</artifactId>
diff --git a/odps-sdk/odps-sdk-commons/src/main/java/com/aliyun/odps/data/ArrayRecord.java b/odps-sdk/odps-sdk-commons/src/main/java/com/aliyun/odps/data/ArrayRecord.java
@@ -1173,13 +1173,17 @@ protected static byte[] stringToBytes(String string) {
   public String toString() {
     StringBuilder sb = new StringBuilder();
     for (Object o : values) {
-      if (o instanceof byte[]) {
+      if (o == null) {
+        sb.append("null").append(",");
+      } else if (o instanceof byte[]) {
         sb.append(bytesToString((byte[]) o)).append(",");
       } else {
         sb.append(o.toString()).append(",");
       }
     }
-    sb.setLength(sb.length() - 1);
+    if (sb.length() > 0) {
+      sb.setLength(sb.length() - 1);
+    }
     return sb.toString();
   }
 }
diff --git a/odps-sdk/odps-sdk-core/pom.xml b/odps-sdk/odps-sdk-core/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>com.aliyun.odps</groupId>
         <artifactId>odps-sdk</artifactId>
-        <version>0.47.0-public</version>
+        <version>0.48.0-public</version>
     </parent>
 
     <name>ODPS SDK Core</name>
diff --git a/odps-sdk/odps-sdk-core/src/main/java/com/aliyun/odps/Odps.java b/odps-sdk/odps-sdk-core/src/main/java/com/aliyun/odps/Odps.java
@@ -158,6 +158,9 @@ public Odps(Odps odps) {
     setEndpoint(odps.getEndpoint());
     setLogViewHost(odps.getLogViewHost());
     client.setIgnoreCerts(odps.getRestClient().isIgnoreCerts());
+    if (odps.getRestClient().getProxy() != null) {
+      client.setProxy(odps.getRestClient().getProxy());
+    }
     instances.setDefaultRunningCluster(odps.instances.getDefaultRunningCluster());
   }
 
diff --git a/odps-sdk/odps-sdk-core/src/main/java/com/aliyun/odps/Table.java b/odps-sdk/odps-sdk-core/src/main/java/com/aliyun/odps/Table.java
@@ -64,6 +64,7 @@
 import com.aliyun.odps.utils.TagUtils.SetObjectTagInput;
 import com.aliyun.odps.utils.TagUtils.SimpleTag;
 import com.aliyun.odps.utils.TagUtils.TagRef;
+import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
@@ -170,6 +171,10 @@ static class Schema {
     @Convert(SimpleXmlUtils.EmptyStringConverter.class)
     String cryptoAlgoName;
 
+    @Element(name = "TableMaskInfo", required = false)
+    @Convert(SimpleXmlUtils.EmptyStringConverter.class)
+    String tableMaskInfo;
+
     @Element(name = "CreationTime", required = false)
     @Convert(SimpleXmlUtils.DateConverter.class)
     Date createdTime;
@@ -226,6 +231,27 @@ static class Schema {
     List<String> primaryKey;
     int acidDataRetainHours;
     StorageTierInfo storageTierInfo;
+
+    List<ColumnMaskInfo> columnMaskInfoList;
+  }
+
+  public static class ColumnMaskInfo {
+
+    private final String name;
+    private final List<String> policyNameList;
+
+    public String getName() {
+      return name;
+    }
+
+    public List<String> getPolicyNameList() {
+      return policyNameList;
+    }
+
+    ColumnMaskInfo(String name, List<String> policyNameList) {
+      this.name = name;
+      this.policyNameList = policyNameList;
+    }
   }
 
 
@@ -864,6 +890,36 @@ public String getViewExpandedText() {
     return model.viewExpandedText;
   }
 
+//  {
+//    "columnMaskInfoList": [
+//          {
+//            "name": "s1",
+//            "policyNameList": ["wuyue_mask_ba"]
+//          }
+//          ]
+//  }
+  public List<ColumnMaskInfo> getColumnMaskInfo() {
+    if (model.columnMaskInfoList != null) {
+      return model.columnMaskInfoList;
+    }
+    if (model.tableMaskInfo == null) {
+      lazyLoad();
+    }
+    if (StringUtils.isNullOrEmpty(model.tableMaskInfo)) {
+      return null;
+    }
+    Gson gson = new GsonBuilder().disableHtmlEscaping().create();
+    JsonArray jsonArray = JsonParser.parseString(model.tableMaskInfo)
+            .getAsJsonObject()
+            .getAsJsonArray("columnMaskInfoList");
+
+    model.columnMaskInfoList = new ArrayList<>(jsonArray.size());
+    for (int i = 0; i < jsonArray.size(); i++) {
+      model.columnMaskInfoList.add(gson.fromJson(jsonArray.get(i), ColumnMaskInfo.class));
+    }
+    return model.columnMaskInfoList;
+  }
+
   /**
    * 获取数据最后修改时间
    *
diff --git a/odps-sdk/odps-sdk-core/src/main/java/com/aliyun/odps/Tables.java b/odps-sdk/odps-sdk-core/src/main/java/com/aliyun/odps/Tables.java
@@ -1312,10 +1312,10 @@ private String generateCreateTableSql() {
       }
 
       if (tblProperties != null && !tblProperties.isEmpty()) {
-        sql.append(" TBLPROPERTIES('");
+        sql.append(" TBLPROPERTIES(");
 
         for (Map.Entry<String, String> entry : tblProperties.entrySet()) {
-          sql.append(entry.getKey()).append("'='").append(entry.getValue()).append("',");
+          sql.append("'").append(entry.getKey()).append("'='").append(entry.getValue()).append("',");
         }
 
         sql.deleteCharAt(sql.length() - 1);
diff --git a/odps-sdk/odps-sdk-core/src/main/java/com/aliyun/odps/commons/transport/DefaultConnection.java b/odps-sdk/odps-sdk-core/src/main/java/com/aliyun/odps/commons/transport/DefaultConnection.java
@@ -24,6 +24,7 @@
 import java.io.OutputStream;
 import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
+import java.net.Proxy;
 import java.net.URI;
 import java.util.List;
 import java.util.Map;
@@ -48,6 +49,14 @@ public class DefaultConnection implements Connection {
   private static final Logger log = Logger.getLogger(DefaultConnection.class.getName());
 
   private HttpURLConnection conn;
+  private Proxy proxy;
+
+  public DefaultConnection() {
+  }
+
+  public DefaultConnection(Proxy proxy) {
+    this.proxy = proxy;
+  }
 
   @Override
   public void connect(Request req) throws IOException {
@@ -67,7 +76,11 @@ public void connect(Request req) throws IOException {
     try {
       String scheme = u.getScheme().toLowerCase();
       if (scheme.startsWith("http") || scheme.startsWith("https") || scheme.startsWith("test")) {
-        conn = (HttpURLConnection) u.toURL().openConnection();
+        if (proxy == null) {
+          conn = (HttpURLConnection) u.toURL().openConnection();
+        } else {
+          conn = (HttpURLConnection) u.toURL().openConnection(proxy);
+        }
       } else {
         throw new IOException("Protocol not supported: " + u.getScheme());
       }
diff --git a/odps-sdk/odps-sdk-core/src/main/java/com/aliyun/odps/commons/transport/DefaultTransport.java b/odps-sdk/odps-sdk-core/src/main/java/com/aliyun/odps/commons/transport/DefaultTransport.java
@@ -23,6 +23,7 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.HttpURLConnection;
+import java.net.Proxy;
 
 import com.aliyun.odps.Survey;
 import com.aliyun.odps.commons.transport.Request.Method;
@@ -36,16 +37,23 @@
 @Survey
 public class DefaultTransport implements Transport {
 
+  private Proxy proxy;
+
   public DefaultTransport() {
   }
 
   @Override
   public Connection connect(Request req) throws IOException {
-    DefaultConnection conn = new DefaultConnection();
+    DefaultConnection conn = new DefaultConnection(proxy);
     conn.connect(req);
     return conn;
   }
 
+  @Override
+  public void setProxy(Proxy proxy) {
+    this.proxy = proxy;
+  }
+
   @Override
   public Response request(Request req) throws IOException {
     Connection conn = connect(req);
diff --git a/odps-sdk/odps-sdk-core/src/main/java/com/aliyun/odps/commons/transport/Transport.java b/odps-sdk/odps-sdk-core/src/main/java/com/aliyun/odps/commons/transport/Transport.java
@@ -20,6 +20,7 @@
 package com.aliyun.odps.commons.transport;
 
 import java.io.IOException;
+import java.net.Proxy;
 
 import com.aliyun.odps.Survey;
 
@@ -68,4 +69,6 @@ public interface Transport {
    * @throws IOException
    */
   public Connection connect(Request req) throws IOException;
+
+  public void setProxy(Proxy proxy);
 }
diff --git a/odps-sdk/odps-sdk-core/src/main/java/com/aliyun/odps/data/RecordReader.java b/odps-sdk/odps-sdk-core/src/main/java/com/aliyun/odps/data/RecordReader.java
@@ -24,6 +24,8 @@
 import java.io.UncheckedIOException;
 import java.util.Iterator;
 import java.util.NoSuchElementException;
+import java.util.stream.Stream;
+import java.util.stream.StreamSupport;
 
 /**
  * <code>RecordReader</code>用来读取记录
@@ -83,4 +85,8 @@ public Record next() {
       }
     };
   }
+
+  default Stream<Record> stream() {
+    return StreamSupport.stream(spliterator(), false);
+  }
 }
diff --git a/odps-sdk/odps-sdk-core/src/main/java/com/aliyun/odps/rest/RestClient.java b/odps-sdk/odps-sdk-core/src/main/java/com/aliyun/odps/rest/RestClient.java
@@ -19,13 +19,12 @@
 
 package com.aliyun.odps.rest;
 
-import com.aliyun.odps.account.AppAccount;
-
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.UnsupportedEncodingException;
 import java.net.ConnectException;
+import java.net.Proxy;
 import java.net.SocketException;
 import java.net.SocketTimeoutException;
 import java.net.URI;
@@ -48,6 +47,7 @@
 import com.aliyun.odps.OdpsException;
 import com.aliyun.odps.Survey;
 import com.aliyun.odps.account.Account;
+import com.aliyun.odps.account.AppAccount;
 import com.aliyun.odps.account.AppStsAccount;
 import com.aliyun.odps.commons.transport.Connection;
 import com.aliyun.odps.commons.transport.Headers;
@@ -153,6 +153,7 @@ public static abstract class RetryLogger {
           .getJavaVersion();
 
   private String userAgent;
+  private Proxy proxy;
 
   public RetryLogger getRetryLogger() {
     return logger;
@@ -816,6 +817,18 @@ public void addUserDefinedHeader(String key, String value) {
     this.userDefinedHeaders.put(key, value);
   }
 
+  public void setProxy(Proxy proxy) {
+    if (!Proxy.Type.HTTP.equals(proxy.type())) {
+      throw new IllegalArgumentException("Unsupported proxy type: " + proxy.type() + " support HTTP only");
+    }
+    this.proxy = proxy;
+    this.transport.setProxy(proxy);
+  }
+
+  public Proxy getProxy() {
+    return this.proxy;
+  }
+
   private Map<String, String> userDefinedHeaders = new HashMap<>();
 
 }
diff --git a/odps-sdk/odps-sdk-core/src/main/java/com/aliyun/odps/tunnel/impl/UpsertSessionImpl.java b/odps-sdk/odps-sdk-core/src/main/java/com/aliyun/odps/tunnel/impl/UpsertSessionImpl.java
@@ -380,7 +380,7 @@ protected void initChannel(Channel channel) throws Exception {
                 }
             });
         bootstrap.option(ChannelOption.CONNECT_TIMEOUT_MILLIS,
-                         configuration.getSocketConnectTimeout());
+                         configuration.getSocketConnectTimeout() * 1000);
         return bootstrap;
     }
 
diff --git a/odps-sdk/odps-sdk-core/src/test/java/com/aliyun/odps/TableTest.java b/odps-sdk/odps-sdk-core/src/test/java/com/aliyun/odps/TableTest.java
diff --git a/odps-sdk/odps-sdk-core/src/test/java/com/aliyun/odps/TestBase.java b/odps-sdk/odps-sdk-core/src/test/java/com/aliyun/odps/TestBase.java
diff --git a/odps-sdk/odps-sdk-graph/pom.xml b/odps-sdk/odps-sdk-graph/pom.xml
diff --git a/odps-sdk/odps-sdk-lot/pom.xml b/odps-sdk/odps-sdk-lot/pom.xml
diff --git a/odps-sdk/odps-sdk-mapred/pom.xml b/odps-sdk/odps-sdk-mapred/pom.xml
diff --git a/odps-sdk/odps-sdk-table-api/pom.xml b/odps-sdk/odps-sdk-table-api/pom.xml
diff --git a/odps-sdk/odps-sdk-udf/pom.xml b/odps-sdk/odps-sdk-udf/pom.xml
diff --git a/odps-sdk/odps-sdk-volumefs/pom.xml b/odps-sdk/odps-sdk-volumefs/pom.xml
diff --git a/odps-sdk/pom.xml b/odps-sdk/pom.xml
diff --git a/pom.xml b/pom.xml

Original file line number	Diff line number	Diff line change
`@@ -1173,13 +1173,17 @@ protected static byte[] stringToBytes(String string) {`
`1173`	`1173`	`public String toString() {`
`1174`	`1174`	`StringBuilder sb = new StringBuilder();`
`1175`	`1175`	`for (Object o : values) {`
`1176`		`- if (o instanceof byte[]) {`
	`1176`	`+ if (o == null) {`
	`1177`	`+ sb.append("null").append(",");`
	`1178`	`+ } else if (o instanceof byte[]) {`
`1177`	`1179`	`sb.append(bytesToString((byte[]) o)).append(",");`
`1178`	`1180`	`} else {`
`1179`	`1181`	`sb.append(o.toString()).append(",");`
`1180`	`1182`	`}`
`1181`	`1183`	`}`
`1182`		`- sb.setLength(sb.length() - 1);`
	`1184`	`+ if (sb.length() > 0) {`
	`1185`	`+ sb.setLength(sb.length() - 1);`
	`1186`	`+ }`
`1183`	`1187`	`return sb.toString();`
`1184`	`1188`	`}`
`1185`	`1189`	`}`