From 3d8faa690d6f7f6b13cfa26316c8562b0edb3a02 Mon Sep 17 00:00:00 2001 From: wangmm0220 Date: Fri, 21 Apr 2023 11:39:02 +0800 Subject: [PATCH] fix:[TS-3250] change strtegy in schemaless if modifyDBSchema error --- source/client/inc/clientSml.h | 2 +- source/client/src/clientSml.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/source/client/inc/clientSml.h b/source/client/inc/clientSml.h index 92896e6f23..43a7e8ba45 100644 --- a/source/client/inc/clientSml.h +++ b/source/client/inc/clientSml.h @@ -70,7 +70,7 @@ extern "C" { #define VALUE_LEN 6 #define OTD_JSON_FIELDS_NUM 4 -#define MAX_RETRY_TIMES 100 +#define MAX_RETRY_TIMES 10 typedef TSDB_SML_PROTOCOL_TYPE SMLProtocolType; typedef enum { diff --git a/source/client/src/clientSml.c b/source/client/src/clientSml.c index 17150286e1..763d4b6915 100644 --- a/source/client/src/clientSml.c +++ b/source/client/src/clientSml.c @@ -535,7 +535,7 @@ static int32_t smlGenerateSchemaAction(SSchema *colField, SHashObj *colHash, SSm if (index) { if (colField[*index].type != kv->type) { uError("SML:0x%" PRIx64 " point type and db type mismatch. point type: %d, db type: %d, key: %s", info->id, colField[*index].type, kv->type, kv->key); - return TSDB_CODE_TSC_INVALID_VALUE; + return TSDB_CODE_SML_INVALID_DATA; } if ((colField[*index].type == TSDB_DATA_TYPE_VARCHAR && @@ -1494,8 +1494,8 @@ static int smlProcess(SSmlHandle *info, char *lines[], char *rawLine, char *rawL do { code = smlModifyDBSchemas(info); - if (code == 0) break; - taosMsleep(500); + if (code == 0 || code == TSDB_CODE_SML_INVALID_DATA) break; + taosMsleep(100); uInfo("SML:0x%" PRIx64 " smlModifyDBSchemas retry code:%s, times:%d", info->id, tstrerror(code), retryNum); } while (retryNum++ < taosHashGetSize(info->superTables) * MAX_RETRY_TIMES); -- GitLab