Merge pull request #35 from aliyun/v5.13.12

update version to 5.13.12

Author: whybert

pom.xml

@@ -190,6 +190,20 @@ public Future<DeleteTimeseriesMetaResponse> deleteTimeseriesMeta(DeleteTimeserie
         return internalClient.deleteTimeseriesMeta(request, callback);
     }
 
+    @Override
+    public Future<SplitTimeseriesScanTaskResponse> splitTimeseriesScanTask(SplitTimeseriesScanTaskRequest request,
+                                                                           TableStoreCallback<SplitTimeseriesScanTaskRequest, SplitTimeseriesScanTaskResponse> callback)
+            throws TableStoreException, ClientException {
+        return internalClient.splitTimeseriesScanTask(request, callback);
+    }
+
+    @Override
+    public Future<ScanTimeseriesDataResponse> scanTimeseriesData(ScanTimeseriesDataRequest request,
+                                                                 TableStoreCallback<ScanTimeseriesDataRequest, ScanTimeseriesDataResponse> callback)
+            throws TableStoreException, ClientException {
+        return internalClient.scanTimeseriesData(request, callback);
+    }
+
     public void shutdown() {
         this.internalClient.shutdown();
     }

src/main/java/com/alicloud/openservices/tablestore/AsyncTimeseriesClient.java

@@ -39,4 +39,12 @@ Future<UpdateTimeseriesMetaResponse> updateTimeseriesMeta(UpdateTimeseriesMetaRe
     Future<DeleteTimeseriesMetaResponse> deleteTimeseriesMeta(DeleteTimeseriesMetaRequest request,
                                                               TableStoreCallback<DeleteTimeseriesMetaRequest, DeleteTimeseriesMetaResponse> callback)
             throws TableStoreException, ClientException;
+
+    Future<SplitTimeseriesScanTaskResponse> splitTimeseriesScanTask(SplitTimeseriesScanTaskRequest request,
+                                                                    TableStoreCallback<SplitTimeseriesScanTaskRequest, SplitTimeseriesScanTaskResponse> callback)
+            throws TableStoreException, ClientException;
+
+    Future<ScanTimeseriesDataResponse> scanTimeseriesData(ScanTimeseriesDataRequest request,
+                                                          TableStoreCallback<ScanTimeseriesDataRequest, ScanTimeseriesDataResponse> callback)
+            throws TableStoreException, ClientException;
 }

src/main/java/com/alicloud/openservices/tablestore/AsyncTimeseriesClientInterface.java

@@ -36,6 +36,17 @@ public class ClientConfiguration {
 
     private TimeseriesConfiguration timeseriesConfiguration;
 
+    /**
+     * 是否开启链路追踪 默认不开启
+     */
+    private boolean enableRequestTracer = false;
+
+
+    /**
+     * 链路追踪系统接口
+     */
+    private RequestTracer requestTracer;
+
     /**
      * 构造新实例。
      */
@@ -45,15 +56,16 @@ public ClientConfiguration() {
 
     /**
      * 设置是否需要对请求数据进行压缩
-     * @param enableRequestCompression
-     *          是否需要压缩(true/false)
+     *
+     * @param enableRequestCompression 是否需要压缩(true/false)
      */
     public void setEnableRequestCompression(boolean enableRequestCompression) {
         this.enableRequestCompression = enableRequestCompression;
-    }    
+    }
 
     /**
      * 返回是否需要对请求数据进行压缩
+     *
      * @return 是否需要对request进行压缩
      */
     public boolean isEnableRequestCompression() {
@@ -62,36 +74,36 @@ public boolean isEnableRequestCompression() {
 
     /**
      * 是否需要告知TableStore对返回的响应内容进行压缩
-     * @param enableResponseCompression
-     *          是否告知TableStore对返回的响应内容进行压缩
+     *
+     * @param enableResponseCompression 是否告知TableStore对返回的响应内容进行压缩
      */
     public void setEnableResponseCompression(boolean enableResponseCompression) {
         this.enableResponseCompression = enableResponseCompression;
     }
-    
+
     /**
      * 返回是否需要告知TableStore对返回的响应内容进行压缩
-     * @return
-     *      是否需要告知TableStore对返回的响应内容进行压缩
-     */ 
+     *
+     * @return 是否需要告知TableStore对返回的响应内容进行压缩
+     */
     public boolean isEnableResponseCompression() {
         return enableResponseCompression;
     }
-    
+
     /**
      * 返回是否需要对响应进行验证
-     * @return
-     *      是否需要对响应进行验证
+     *
+     * @return 是否需要对响应进行验证
      */
     public boolean isEnableResponseValidation() {
         return enableResponseValidation;
     }
-    
+
     /**
-     * 是否需要对响应进行验证， 如果需要验证， 
+     * 是否需要对响应进行验证， 如果需要验证，
      * Client会验证头信息完整性、结果是否过期、授权信息是否正确
-     * @param enableResponseValidation
-     *          是否需要对响应进行验证
+     *
+     * @param enableResponseValidation 是否需要对响应进行验证
      */
     public void setEnableResponseValidation(boolean enableResponseValidation) {
         this.enableResponseValidation = enableResponseValidation;
@@ -279,7 +291,7 @@ public void setTimeThresholdOfServerTracer(int timeThresholdOfServerTracer) {
 
     /**
      * 返回代理服务器主机地址。
-     * 
+     *
      * @return 代理服务器主机地址。
      */
     public String getProxyHost() {
@@ -288,17 +300,16 @@ public String getProxyHost() {
 
     /**
      * 设置代理服务器主机地址。
-     * 
-     * @param proxyHost
-     *            代理服务器主机地址。
+     *
+     * @param proxyHost 代理服务器主机地址。
      */
     public void setProxyHost(String proxyHost) {
         this.proxyHost = proxyHost;
     }
 
     /**
      * 返回代理服务器端口。
-     * 
+     *
      * @return 代理服务器端口。
      */
     public int getProxyPort() {
@@ -307,17 +318,16 @@ public int getProxyPort() {
 
     /**
      * 设置代理服务器端口。
-     * 
-     * @param proxyPort
-     *            代理服务器端口。
+     *
+     * @param proxyPort 代理服务器端口。
      */
     public void setProxyPort(int proxyPort) {
         this.proxyPort = proxyPort;
     }
 
     /**
      * 返回代理服务器验证的用户名。
-     * 
+     *
      * @return 用户名。
      */
     public String getProxyUsername() {
@@ -326,17 +336,16 @@ public String getProxyUsername() {
 
     /**
      * 设置代理服务器验证的用户名。
-     * 
-     * @param proxyUsername
-     *            用户名。
+     *
+     * @param proxyUsername 用户名。
      */
     public void setProxyUsername(String proxyUsername) {
         this.proxyUsername = proxyUsername;
     }
 
     /**
      * 返回代理服务器验证的密码。
-     * 
+     *
      * @return 密码。
      */
     public String getProxyPassword() {
@@ -345,17 +354,16 @@ public String getProxyPassword() {
 
     /**
      * 设置代理服务器验证的密码。
-     * 
-     * @param proxyPassword
-     *            密码。
+     *
+     * @param proxyPassword 密码。
      */
     public void setProxyPassword(String proxyPassword) {
         this.proxyPassword = proxyPassword;
     }
 
     /**
      * 返回访问NTLM验证的代理服务器的Windows域名（可选）。
-     * 
+     *
      * @return 域名。
      */
     public String getProxyDomain() {
@@ -364,17 +372,16 @@ public String getProxyDomain() {
 
     /**
      * 设置访问NTLM验证的代理服务器的Windows域名（可选）。
-     * 
-     * @param proxyDomain
-     *            域名。
+     *
+     * @param proxyDomain 域名。
      */
     public void setProxyDomain(String proxyDomain) {
         this.proxyDomain = proxyDomain;
     }
 
     /**
      * 返回NTLM代理服务器的Windows工作站名称。
-     * 
+     *
      * @return NTLM代理服务器的Windows工作站名称。
      */
     public String getProxyWorkstation() {
@@ -383,16 +390,16 @@ public String getProxyWorkstation() {
 
     /**
      * 设置NTLM代理服务器的Windows工作站名称。 （可选，如果代理服务器非NTLM，不需要设置该参数）。
-     * 
-     * @param proxyWorkstation
-     *            NTLM代理服务器的Windows工作站名称。
+     *
+     * @param proxyWorkstation NTLM代理服务器的Windows工作站名称。
      */
     public void setProxyWorkstation(String proxyWorkstation) {
         this.proxyWorkstation = proxyWorkstation;
     }
 
     /**
      * 获取同步Client内等待异步调用返回的最大超时时间。
+     *
      * @return
      */
     public long getSyncClientWaitFutureTimeoutInMillis() {
@@ -401,6 +408,7 @@ public long getSyncClientWaitFutureTimeoutInMillis() {
 
     /**
      * 设置同步Client内等待异步调用返回的最大超时时间。
+     *
      * @param syncClientWaitFutureTimeoutInMillis
      */
     public void setSyncClientWaitFutureTimeoutInMillis(long syncClientWaitFutureTimeoutInMillis) {
@@ -409,6 +417,7 @@ public void setSyncClientWaitFutureTimeoutInMillis(long syncClientWaitFutureTime
 
     /**
      * 获取时序Client的配置。
+     *
      * @return
      */
     public TimeseriesConfiguration getTimeseriesConfiguration() {
@@ -417,6 +426,7 @@ public TimeseriesConfiguration getTimeseriesConfiguration() {
 
     /**
      * 设置时序Client的配置。
+     *
      * @param timeseriesConfiguration
      */
     public void setTimeseriesConfiguration(TimeseriesConfiguration timeseriesConfiguration) {
@@ -429,9 +439,45 @@ public int getConnectionRequestTimeoutInMillisecond() {
 
     /**
      * 设置HttpAsyncClient的ConnectionRequestTimeout配置。
+     *
      * @param connectionRequestTimeoutInMillisecond
      */
     public void setConnectionRequestTimeoutInMillisecond(int connectionRequestTimeoutInMillisecond) {
         this.connectionRequestTimeoutInMillisecond = connectionRequestTimeoutInMillisecond;
     }
+
+    /**
+     * 获取链路追踪系统开启状态。
+     */
+    public boolean isEnableRequestTracer() {
+        return enableRequestTracer;
+    }
+
+    /**
+     * 设置链路链路追踪系统是否开启
+     *
+     * @param enableRequestTracer
+     */
+    public void setEnableRequestTracer(boolean enableRequestTracer) {
+        this.enableRequestTracer = enableRequestTracer;
+    }
+
+
+    /**
+     * 设置接入链路追踪系统接口
+     *
+     * @param requestTracer 链路追踪系统接口
+     */
+    public void setRequestTracer(RequestTracer requestTracer) {
+        this.requestTracer = requestTracer;
+    }
+
+    /**
+     * 获取链路追踪系统接口
+     *
+     * @return 链路追踪系统接口实现
+     */
+    public RequestTracer getRequestTracer() {
+        return requestTracer;
+    }
 }

src/main/java/com/alicloud/openservices/tablestore/ClientConfiguration.java

@@ -1745,6 +1745,58 @@ public Future<DeleteTimeseriesMetaResponse> deleteTimeseriesMeta(DeleteTimeserie
         return f;
     }
 
+    public Future<SplitTimeseriesScanTaskResponse> splitTimeseriesScanTask(
+            SplitTimeseriesScanTaskRequest request,
+            TableStoreCallback<SplitTimeseriesScanTaskRequest, SplitTimeseriesScanTaskResponse> callback) {
+        Preconditions.checkNotNull(request);
+
+        TraceLogger tracer = getTraceLogger();
+        RetryStrategy retry = this.retryStrategy.clone();
+        SplitTimeseriesScanTaskLauncher launcher = launcherFactory.splitTimeseriesScanTask(tracer, retry, request);
+
+        AsyncCompletion<SplitTimeseriesScanTaskRequest, SplitTimeseriesScanTaskResponse> completion =
+                new AsyncCompletion<SplitTimeseriesScanTaskRequest, SplitTimeseriesScanTaskResponse>(
+                        launcher, request, tracer, callbackExecutor, retry, retryExecutor);
+        CallbackImpledFuture<SplitTimeseriesScanTaskRequest, SplitTimeseriesScanTaskResponse> f =
+                new CallbackImpledFuture<SplitTimeseriesScanTaskRequest, SplitTimeseriesScanTaskResponse>();
+        completion.watchBy(f);
+        if (callback != null) {
+            // user callback must be triggered after completion of the return
+            // future.
+            f.watchBy(callback);
+        }
+
+        launcher.fire(request, completion);
+
+        return f;
+    }
+
+    public Future<ScanTimeseriesDataResponse> scanTimeseriesData(
+            ScanTimeseriesDataRequest request,
+            TableStoreCallback<ScanTimeseriesDataRequest, ScanTimeseriesDataResponse> callback) {
+        Preconditions.checkNotNull(request);
+
+        TraceLogger tracer = getTraceLogger();
+        RetryStrategy retry = this.retryStrategy.clone();
+        ScanTimeseriesDataLauncher launcher = launcherFactory.scanTimeseriesData(tracer, retry, request);
+
+        AsyncCompletion<ScanTimeseriesDataRequest, ScanTimeseriesDataResponse> completion =
+                new AsyncCompletion<ScanTimeseriesDataRequest, ScanTimeseriesDataResponse>(
+                        launcher, request, tracer, callbackExecutor, retry, retryExecutor);
+        CallbackImpledFuture<ScanTimeseriesDataRequest, ScanTimeseriesDataResponse> f =
+                new CallbackImpledFuture<ScanTimeseriesDataRequest, ScanTimeseriesDataResponse>();
+        completion.watchBy(f);
+        if (callback != null) {
+            // user callback must be triggered after completion of the return
+            // future.
+            f.watchBy(callback);
+        }
+
+        launcher.fire(request, completion);
+
+        return f;
+    }
+
     public void setCredentials(ServiceCredentials credentials) {
         CredentialsProvider newCrdsProvider = CredentialsProviderFactory.newDefaultCredentialProvider(credentials.getAccessKeyId(),
                 credentials.getAccessKeySecret(), credentials.getSecurityToken());