xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

retry afer batch execute reconfigure table

This commit is contained in:
Shenglian Zhou 2021-07-13 14:19:56 +08:00
parent ddb783f407
commit bcba45e38b
2 changed files with 36 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
src/client/src/tscParseLineProtocol.c
View File

@ -324,7 +324,7 @@ static int32_t applySchemaAction(TAOS* taos, SSchemaAction* action) {
return code;
}
static int32_t destorySmlSTableSchema(SSmlSTableSchema* schema) {
static int32_t destroySmlSTableSchema(SSmlSTableSchema* schema) {
taosHashCleanup(schema->tagHash);
taosHashCleanup(schema->fieldHash);
taosArrayDestroy(schema->tags);
@ -435,7 +435,7 @@ static int32_t reconcileDBSchemas(TAOS* taos, SArray* stableSchemas) {
pointSchema->precision = dbSchema.precision;
destorySmlSTableSchema(&dbSchema);
destroySmlSTableSchema(&dbSchema);
} else if (code == TSDB_CODE_SUCCESS) {
size_t pointTagSize = taosArrayGetSize(pointSchema->tags);
size_t pointFieldSize = taosArrayGetSize(pointSchema->fields);
@ -469,7 +469,7 @@ static int32_t reconcileDBSchemas(TAOS* taos, SArray* stableSchemas) {
pointSchema->precision = dbSchema.precision;
destorySmlSTableSchema(&dbSchema);
destroySmlSTableSchema(&dbSchema);
} else {
return code;
}
@ -565,42 +565,47 @@ static int32_t insertChildTableBatch(TAOS* taos, char* cTableName, SArray* cols
}
snprintf(sql + strlen(sql)-1, freeBytes-strlen(sql)+1, ")");
TAOS_STMT* stmt = taos_stmt_init(taos);
int32_t code;
code = taos_stmt_prepare(stmt, sql, strlen(sql));
if (code != 0) {
printf("%s", taos_stmt_errstr(stmt));
return code;
}
int32_t code = 0;
int32_t try = 0;
do {
TAOS_STMT* stmt = taos_stmt_init(taos);
code = taos_stmt_set_tbname(stmt, cTableName);
if (code != 0) {
printf("%s", taos_stmt_errstr(stmt));
return code;
}
size_t rows = taosArrayGetSize(rowsBind);
for (int32_t i = 0; i < rows; ++i) {
TAOS_BIND* colsBinds = taosArrayGetP(rowsBind, i);
code = taos_stmt_bind_param(stmt, colsBinds);
code = taos_stmt_prepare(stmt, sql, strlen(sql));
if (code != 0) {
printf("%s", taos_stmt_errstr(stmt));
return code;
}
code = taos_stmt_add_batch(stmt);
code = taos_stmt_set_tbname(stmt, cTableName);
if (code != 0) {
printf("%s", taos_stmt_errstr(stmt));
return code;
}
}
code = taos_stmt_execute(stmt);
if (code != 0) {
printf("%s", taos_stmt_errstr(stmt));
return code;
}
size_t rows = taosArrayGetSize(rowsBind);
for (int32_t i = 0; i < rows; ++i) {
TAOS_BIND* colsBinds = taosArrayGetP(rowsBind, i);
code = taos_stmt_bind_param(stmt, colsBinds);
if (code != 0) {
printf("%s", taos_stmt_errstr(stmt));
return code;
}
code = taos_stmt_add_batch(stmt);
if (code != 0) {
printf("%s", taos_stmt_errstr(stmt));
return code;
}
}
code = taos_stmt_execute(stmt);
if (code != 0) {
printf("%s", taos_stmt_errstr(stmt));
taos_stmt_close(stmt);
} else {
taos_stmt_close(stmt);
}
} while (code == TSDB_CODE_TDB_TABLE_RECONFIGURE && try++ < TSDB_MAX_REPLICA);
taos_stmt_close(stmt);
return code;
}

8
tests/examples/c/apitest.c
View File

@ -6,7 +6,6 @@
#include <string.h>
#include <taos.h>
#include <unistd.h>
#include <tconfig.h>
static void prepare_data(TAOS* taos) {
TAOS_RES *result;
@ -972,9 +971,9 @@ int32_t verify_schema_less(TAOS* taos) {
"ste,t2=5,t3=L\"ste2\" c3=\"iamszhou\",c4=false 1626056811843316532"
};
int code = taos_insert_by_lines(taos, lines , 5);
//int code = taos_insert_by_lines(taos, &lines[0], 1);
//code = taos_insert_by_lines(taos, &lines[1], 1);
// int code = taos_insert_by_lines(taos, lines , 5);
int code = taos_insert_by_lines(taos, &lines[0], 1);
code = taos_insert_by_lines(taos, &lines[1], 1);
return code;
}
@ -985,7 +984,6 @@ int main(int argc, char *argv[]) {
const char* passwd = "taosdata";
taos_options(TSDB_OPTION_TIMEZONE, "GMT-8");
taosDumpGlobalCfg();
TAOS* taos = taos_connect(host, user, passwd, "", 0);
if (taos == NULL) {
printf("\033[31mfailed to connect to db, reason:%s\033[0m\n", taos_errstr(taos));