diff --git a/tests/army/tools/benchmark/basic/csv-export.py b/tests/army/tools/benchmark/basic/csv-export.py index 6b71d2c238..702490d6ed 100644 --- a/tests/army/tools/benchmark/basic/csv-export.py +++ b/tests/army/tools/benchmark/basic/csv-export.py @@ -122,7 +122,7 @@ class TDTestCase(TBase): if batch != interlace_rows: tdLog.exit(f"interlace_rows invalid. tbName={name} actual={batch} expected={interlace_rows} i={count} csv_file_name={csv_file_name}") batch = 1 - name = row[tbname_idx] + name = row[tbname_idx] # count ++ count += 1 # batch @@ -136,9 +136,9 @@ class TDTestCase(TBase): tdLog.info(f"Check generate csv file successfully. csv_file_name={csv_file_name} count={count} interlace_rows={batch}") - # check correct + # check correct def check_stb_correct(self, data, db, stb): - filepath = data["output_path"] + filepath = data["output_dir"] stbName = stb["name"] child_count = stb["childtable_to"] - stb["childtable_from"] insert_rows = stb["insert_rows"] diff --git a/tools/taos-tools/src/benchCsv.c b/tools/taos-tools/src/benchCsv.c index b498214468..0bb47b0888 100644 --- a/tools/taos-tools/src/benchCsv.c +++ b/tools/taos-tools/src/benchCsv.c @@ -371,7 +371,7 @@ int csvGenCreateDbSql(SDataBase* db, char* buf, int size) { static int csvExportCreateDbSql(CsvWriteMeta* write_meta, FILE* fp) { - char buf[LARGE_BUFF_LEN] = {}; + char buf[LARGE_BUFF_LEN] = {0}; int ret = 0; int length = 0; @@ -547,7 +547,7 @@ int csvGenCreateStbSql(SDataBase* db, SSuperTable* stb, char* buf, int size) { static int csvExportCreateStbSql(CsvWriteMeta* write_meta, FILE* fp) { - char buf[4096] = {}; + char buf[4096] = {0}; int ret = 0; int length = 0; @@ -572,7 +572,7 @@ static int csvExportCreateStbSql(CsvWriteMeta* write_meta, FILE* fp) { static int csvExportCreateSql(CsvWriteMeta* write_meta) { - char fullname[MAX_PATH_LEN] = {}; + char fullname[MAX_PATH_LEN] = {0}; int ret = 0; int length = 0; FILE* fp = NULL; @@ -1078,7 +1078,7 @@ static void* csvGenStbThread(void* arg) { uint64_t ctb_idx = 0; int ret = 0; CsvFileHandle* fhdl = NULL; - char fullname[MAX_PATH_LEN] = {}; + char fullname[MAX_PATH_LEN] = {0}; uint64_t total_rows = 0; uint64_t pre_total_rows = 0; diff --git a/tools/taos-tools/src/benchJsonOpt.c b/tools/taos-tools/src/benchJsonOpt.c index 83edc5c6ef..49b5a6529d 100644 --- a/tools/taos-tools/src/benchJsonOpt.c +++ b/tools/taos-tools/src/benchJsonOpt.c @@ -1646,7 +1646,7 @@ static int getMetaFromCommonJsonFile(tools_cJSON *json) { } // output dir - tools_cJSON* opp = tools_cJSON_GetObjectItem(json, "output_path"); + tools_cJSON* opp = tools_cJSON_GetObjectItem(json, "output_dir"); if (opp && opp->type == tools_cJSON_String && opp->valuestring != NULL) { g_arguments->output_path = opp->valuestring; } else {