Support delete timeseries analytical store; Add KeepDefaultRetryStrat…

…egyWhileUsingCustomizedRetryFunc for retry.

tablestore/api.go

@@ -122,6 +122,7 @@ func NewClientWithConfig(endPoint, instanceName, accessKeyId, accessKeySecret st
 	tableStoreClient.accessKeyId = accessKeyId
 	tableStoreClient.accessKeySecret = accessKeySecret
 	tableStoreClient.securityToken = securityToken
+	tableStoreClient.KeepDefaultRetryStrategyWhileUsingCustomizedRetryFunc = true
 	provider := &common.DefaultCredentialsProvider{AccessKeyID: accessKeyId, AccessKeySecret: accessKeySecret, SecurityToken: securityToken}
 	tableStoreClient.credentialsProvider = provider
 	for _, option := range options {
@@ -177,6 +178,7 @@ func NewTimeseriesClientWithConfig(endPoint, instanceName, accessKeyId, accessKe
 	timeseriesClient.accessKeyId = accessKeyId
 	timeseriesClient.accessKeySecret = accessKeySecret
 	timeseriesClient.securityToken = securityToken
+	timeseriesClient.KeepDefaultRetryStrategyWhileUsingCustomizedRetryFunc = true
 	provider := &common.DefaultCredentialsProvider{AccessKeyID: accessKeyId, AccessKeySecret: accessKeySecret, SecurityToken: securityToken}
 	timeseriesClient.credentialsProvider = provider
 	for _, option := range options {
@@ -226,6 +228,8 @@ func NewClientWithExternalHeader(endPoint, instanceName, accessKeyId, accessKeyS
 	return tableStoreClient
 }
 
+type RetryNotify func(requestId string, err error, action string, backoffDuration time.Duration)
+
 // 请求服务端
 func (internalClient *internalClient) doRequestWithRetry(uri string, req, resp proto.Message, responseInfo *ResponseInfo) error {
 	end := time.Now().Add(internalClient.config.MaxRetryTime)
@@ -260,6 +264,10 @@ func (internalClient *internalClient) doRequestWithRetry(uri string, req, resp p
 				return err
 			}
 
+			if internalClient.RetryNotify != nil {
+				internalClient.RetryNotify(requestId, err, uri, time.Duration(value)*time.Millisecond)
+			}
+
 			time.Sleep(time.Duration(value) * time.Millisecond)
 		}
 	}
@@ -301,6 +309,10 @@ func (internalClient *internalClient) doBatchRequestWithRetry(uri string, req, r
 				return err
 			}
 
+			if internalClient.RetryNotify != nil {
+				internalClient.RetryNotify(requestId, err, uri, time.Duration(value)*time.Millisecond)
+			}
+
 			time.Sleep(time.Duration(value) * time.Millisecond)
 		} else {
 			if len(respBody) == 0 {
@@ -319,6 +331,11 @@ func (internalClient *internalClient) doBatchRequestWithRetry(uri string, req, r
 			if value <= 0 {
 				return nil
 			}
+
+			if internalClient.RetryNotify != nil {
+				internalClient.RetryNotify(requestId, err, uri, time.Duration(value)*time.Millisecond)
+			}
+
 			time.Sleep(time.Duration(value) * time.Millisecond)
 		}
 	}
@@ -578,6 +595,8 @@ func (internalClient *internalClient) shouldRetry(errorCode string, errorMsg str
 	if internalClient.CustomizedRetryFunc != nil {
 		if internalClient.CustomizedRetryFunc(errorCode, errorMsg, action, statusCode) == true {
 			return true
+		} else if !internalClient.KeepDefaultRetryStrategyWhileUsingCustomizedRetryFunc {
+			return false
 		}
 	}
 	return shouldRetryViaErrorAndAction(errorCode, errorMsg, action)
@@ -670,6 +689,20 @@ func (tableStoreClient *TableStoreClient) GetExternalHeader() map[string]string
 	return tableStoreClient.externalHeader
 }
 
+func (tableStoreClient *TableStoreClient) GetRetryNotify() RetryNotify {
+	if tableStoreClient.internalClient == nil {
+		return nil
+	}
+	return tableStoreClient.RetryNotify
+}
+
+func (tableStoreClient *TableStoreClient) SetRetryNotify(retryNotify RetryNotify) {
+	if tableStoreClient.internalClient == nil {
+		return
+	}
+	tableStoreClient.RetryNotify = retryNotify
+}
+
 // table API
 // Create a table with the CreateTableRequest, in which the table name and
 // primary keys are required.
@@ -1277,6 +1310,7 @@ func (timeseriesClient *TimeseriesClient) DeleteTimeseriesAnalyticalStore(reques
 	req := new(otsprotocol.DeleteTimeseriesAnalyticalStoreRequest)
 	req.TableName = proto.String(request.timeseriesTableName)
 	req.StoreName = proto.String(request.analyticalStoreName)
+	req.DropMappingTable = proto.Bool(request.dropMappingTable)
 
 	resp := new(otsprotocol.DeleteTimeseriesAnalyticalStoreResponse)
 	response := new(DeleteTimeseriesAnalyticalStoreResponse)

tablestore/model.go

@@ -29,11 +29,14 @@ type internalClient struct {
 	random     *rand.Rand
 	mu         *sync.Mutex
 
-	externalHeader      map[string]string
-	CustomizedRetryFunc CustomizedRetryNotMatterActions
+	externalHeader                                        map[string]string
+	CustomizedRetryFunc                                   CustomizedRetryNotMatterActions
+	KeepDefaultRetryStrategyWhileUsingCustomizedRetryFunc bool
 
 	timeseriesConfiguration *TimeseriesConfiguration
 	credentialsProvider     common.CredentialsProvider
+
+	RetryNotify RetryNotify
 }
 
 const initMapLen int = 8
@@ -929,6 +932,7 @@ type IndexMeta struct {
 	Primarykey     []string
 	DefinedColumns []string
 	IndexType      IndexType
+	IndexSyncPhase *SyncPhase
 }
 
 type DefinedColumnSchema struct {
@@ -2327,6 +2331,7 @@ type CreateTimeseriesAnalyticalStoreResponse struct {
 type DeleteTimeseriesAnalyticalStoreRequest struct {
 	timeseriesTableName string
 	analyticalStoreName string
+	dropMappingTable    bool
 }
 
 func NewDeleteTimeseriesAnalyticalStoreRequest(timeseriesTableName string, analyticalStoreName string) *DeleteTimeseriesAnalyticalStoreRequest {
@@ -2336,6 +2341,10 @@ func NewDeleteTimeseriesAnalyticalStoreRequest(timeseriesTableName string, analy
 	}
 }
 
+func (deleteTimeseriesAnalyticalStoreRequest *DeleteTimeseriesAnalyticalStoreRequest) SetDropMappingTable(dropMappingTable bool) {
+	deleteTimeseriesAnalyticalStoreRequest.dropMappingTable = dropMappingTable
+}
+
 type DeleteTimeseriesAnalyticalStoreResponse struct {
 	ResponseInfo
 }