From 074c3e7eb283e1453e212901c947642728acbda0 Mon Sep 17 00:00:00 2001 From: Haolin Wang Date: Fri, 13 Dec 2024 17:23:21 +0800 Subject: [PATCH 01/14] fix: enable client dedup for stmt/stmt2 inserts in interlace mode --- include/common/tdataformat.h | 4 +- source/common/src/tdataformat.c | 44 ++++- source/libs/parser/src/parInsertStmt.c | 10 +- tests/script/api/makefile | 4 + tests/script/api/stmt-insert-dupkeys.c | 234 ++++++++++++++++++++++++ tests/script/api/stmt2-insert-dupkeys.c | 212 +++++++++++++++++++++ 6 files changed, 502 insertions(+), 6 deletions(-) create mode 100644 tests/script/api/stmt-insert-dupkeys.c create mode 100644 tests/script/api/stmt2-insert-dupkeys.c diff --git a/include/common/tdataformat.h b/include/common/tdataformat.h index cb05f98f45..0cc30edf82 100644 --- a/include/common/tdataformat.h +++ b/include/common/tdataformat.h @@ -378,7 +378,7 @@ typedef struct { TAOS_MULTI_BIND *bind; } SBindInfo; int32_t tRowBuildFromBind(SBindInfo *infos, int32_t numOfInfos, bool infoSorted, const STSchema *pTSchema, - SArray *rowArray); + SArray *rowArray, bool *orderedDup); // stmt2 binding int32_t tColDataAddValueByBind2(SColData *pColData, TAOS_STMT2_BIND *pBind, int32_t buffMaxLen, initGeosFn igeos, @@ -392,7 +392,7 @@ typedef struct { } SBindInfo2; int32_t tRowBuildFromBind2(SBindInfo2 *infos, int32_t numOfInfos, bool infoSorted, const STSchema *pTSchema, - SArray *rowArray); + SArray *rowArray, bool *orderedDup); #endif diff --git a/source/common/src/tdataformat.c b/source/common/src/tdataformat.c index c1ab7ccff0..0db88f4b2a 100644 --- a/source/common/src/tdataformat.c +++ b/source/common/src/tdataformat.c @@ -449,9 +449,10 @@ static int32_t tBindInfoCompare(const void *p1, const void *p2, const void *para * `infoSorted` is whether the bind information is sorted by column id * `pTSchema` is the schema of the table * `rowArray` is the array to store the rows + * `orderedDup` is an array to store ordered and duplicateTs */ int32_t tRowBuildFromBind(SBindInfo *infos, int32_t numOfInfos, bool infoSorted, const STSchema *pTSchema, - SArray *rowArray) { + SArray *rowArray, bool *orderedDup) { if (infos == NULL || numOfInfos <= 0 || numOfInfos > pTSchema->numOfCols || pTSchema == NULL || rowArray == NULL) { return TSDB_CODE_INVALID_PARA; } @@ -469,6 +470,7 @@ int32_t tRowBuildFromBind(SBindInfo *infos, int32_t numOfInfos, bool infoSorted, return terrno; } + SRowKey rowKey, lastRowKey; for (int32_t iRow = 0; iRow < numOfRows; iRow++) { taosArrayClear(colValArray); @@ -507,6 +509,24 @@ int32_t tRowBuildFromBind(SBindInfo *infos, int32_t numOfInfos, bool infoSorted, code = terrno; goto _exit; } + + if (orderedDup) { + tRowGetKey(row, &rowKey); + if (iRow == 0) { + // init to ordered by default + orderedDup[0] = true; + // init to non-duplicate by default + orderedDup[1] = false; + } else { + // no more compare if we already get disordered or duplicate rows + if (orderedDup[0] && !orderedDup[1]) { + int32_t code = tRowKeyCompare(&rowKey, &lastRowKey); + orderedDup[0] = (code >= 0); + orderedDup[1] = (code == 0); + } + } + lastRowKey = rowKey; + } } _exit: @@ -3235,9 +3255,10 @@ _exit: * `infoSorted` is whether the bind information is sorted by column id * `pTSchema` is the schema of the table * `rowArray` is the array to store the rows + * `orderedDup` is an array to store ordered and duplicateTs */ int32_t tRowBuildFromBind2(SBindInfo2 *infos, int32_t numOfInfos, bool infoSorted, const STSchema *pTSchema, - SArray *rowArray) { + SArray *rowArray, bool *orderedDup) { if (infos == NULL || numOfInfos <= 0 || numOfInfos > pTSchema->numOfCols || pTSchema == NULL || rowArray == NULL) { return TSDB_CODE_INVALID_PARA; } @@ -3266,6 +3287,7 @@ int32_t tRowBuildFromBind2(SBindInfo2 *infos, int32_t numOfInfos, bool infoSorte } } + SRowKey rowKey, lastRowKey; for (int32_t iRow = 0; iRow < numOfRows; iRow++) { taosArrayClear(colValArray); @@ -3317,6 +3339,24 @@ int32_t tRowBuildFromBind2(SBindInfo2 *infos, int32_t numOfInfos, bool infoSorte code = terrno; goto _exit; } + + if (orderedDup) { + tRowGetKey(row, &rowKey); + if (iRow == 0) { + // init to ordered by default + orderedDup[0] = true; + // init to non-duplicate by default + orderedDup[1] = false; + } else { + // no more compare if we already get disordered or duplicate rows + if (orderedDup[0] && !orderedDup[1]) { + int32_t code = tRowKeyCompare(&rowKey, &lastRowKey); + orderedDup[0] = (code >= 0); + orderedDup[1] = (code == 0); + } + } + lastRowKey = rowKey; + } } _exit: diff --git a/source/libs/parser/src/parInsertStmt.c b/source/libs/parser/src/parInsertStmt.c index 4ecc18d189..cdc9416d36 100644 --- a/source/libs/parser/src/parInsertStmt.c +++ b/source/libs/parser/src/parInsertStmt.c @@ -323,6 +323,7 @@ int32_t qBindStmtStbColsValue(void* pBlock, SArray* pCols, TAOS_MULTI_BIND* bind int32_t code = 0; int16_t lastColId = -1; bool colInOrder = true; + bool orderedDup[2]; if (NULL == *pTSchema) { *pTSchema = tBuildTSchema(pSchema, pDataBlock->pMeta->tableInfo.numOfColumns, pDataBlock->pMeta->sversion); @@ -368,7 +369,9 @@ int32_t qBindStmtStbColsValue(void* pBlock, SArray* pCols, TAOS_MULTI_BIND* bind // } } - code = tRowBuildFromBind(pBindInfos, boundInfo->numOfBound, colInOrder, *pTSchema, pCols); + code = tRowBuildFromBind(pBindInfos, boundInfo->numOfBound, colInOrder, *pTSchema, pCols, orderedDup); + pDataBlock->ordered = orderedDup[0]; + pDataBlock->duplicateTs = orderedDup[1]; qDebug("stmt all %d columns bind %d rows data", boundInfo->numOfBound, rowNum); @@ -689,6 +692,7 @@ int32_t qBindStmtStbColsValue2(void* pBlock, SArray* pCols, TAOS_STMT2_BIND* bin int16_t lastColId = -1; bool colInOrder = true; int ncharColNums = 0; + bool orderedDup[2]; if (NULL == *pTSchema) { *pTSchema = tBuildTSchema(pSchema, pDataBlock->pMeta->tableInfo.numOfColumns, pDataBlock->pMeta->sversion); @@ -745,7 +749,9 @@ int32_t qBindStmtStbColsValue2(void* pBlock, SArray* pCols, TAOS_STMT2_BIND* bin pBindInfos[c].bytes = pColSchema->bytes; } - code = tRowBuildFromBind2(pBindInfos, boundInfo->numOfBound, colInOrder, *pTSchema, pCols); + code = tRowBuildFromBind2(pBindInfos, boundInfo->numOfBound, colInOrder, *pTSchema, pCols, orderedDup); + pDataBlock->ordered = orderedDup[0]; + pDataBlock->duplicateTs = orderedDup[1]; qDebug("stmt all %d columns bind %d rows data", boundInfo->numOfBound, rowNum); diff --git a/tests/script/api/makefile b/tests/script/api/makefile index b871c5f3ff..a270a6c0ed 100644 --- a/tests/script/api/makefile +++ b/tests/script/api/makefile @@ -29,6 +29,8 @@ exe: # gcc $(CFLAGS) ./stmt2-get-fields.c -o $(ROOT)stmt2-get-fields $(LFLAGS) # gcc $(CFLAGS) ./stmt2-nohole.c -o $(ROOT)stmt2-nohole $(LFLAGS) gcc $(CFLAGS) ./stmt-crash.c -o $(ROOT)stmt-crash $(LFLAGS) + gcc $(CFLAGS) ./stmt-insert-dupkeys.c -o $(ROOT)stmt-insert-dupkeys $(LFLAGS) + gcc $(CFLAGS) ./stmt2-insert-dupkeys.c -o $(ROOT)stmt2-insert-dupkeys $(LFLAGS) clean: rm $(ROOT)batchprepare @@ -47,3 +49,5 @@ clean: rm $(ROOT)stmt2-get-fields rm $(ROOT)stmt2-nohole rm $(ROOT)stmt-crash + rm $(ROOT)stmt-insert-dupkeys + rm $(ROOT)stmt2-insert-dupkeys diff --git a/tests/script/api/stmt-insert-dupkeys.c b/tests/script/api/stmt-insert-dupkeys.c new file mode 100644 index 0000000000..b564fbb21d --- /dev/null +++ b/tests/script/api/stmt-insert-dupkeys.c @@ -0,0 +1,234 @@ +// compile with +// gcc -o stmt-insert-dupkeys stmt-insert-dupkeys.c -ltaos +#include +#include +#include +#include "taos.h" + +#define NUMROWS 3 + +/** + * @brief execute sql only and ignore result set + * + * @param taos + * @param sql + */ +void executeSQL(TAOS *taos, const char *sql) { + TAOS_RES *res = taos_query(taos, sql); + int code = taos_errno(res); + if (code != 0) { + printf("%s\n", taos_errstr(res)); + taos_free_result(res); + taos_close(taos); + exit(EXIT_FAILURE); + } + taos_free_result(res); +} + +/** + * @brief exit program when error occur. + * + * @param stmt + * @param code + * @param msg + */ +void checkErrorCode(TAOS_STMT *stmt, int code, const char *msg) { + if (code != 0) { + printf("%s. error: %s\n", msg, taos_stmt_errstr(stmt)); + exit(EXIT_FAILURE); + } +} + +void prepareBindTags(TAOS_MULTI_BIND *tags) { + // bind table name and tags + char *location = "California.SanFrancisco"; + int groupId = 2; + tags[0].buffer_type = TSDB_DATA_TYPE_BINARY; + tags[0].buffer_length = strlen(location); + tags[0].length = (int32_t *)&tags[0].buffer_length; + tags[0].buffer = location; + tags[0].is_null = NULL; + + tags[1].buffer_type = TSDB_DATA_TYPE_INT; + tags[1].buffer_length = sizeof(int); + tags[1].length = (int32_t *)&tags[1].buffer_length; + tags[1].buffer = &groupId; + tags[1].is_null = NULL; +} + +void prepareBindParams(TAOS_MULTI_BIND *params, int64_t *ts, float *current, int *voltage, float *phase) { + // is_null array + char is_null[NUMROWS] = {0}; + // length array + int32_t int64Len[NUMROWS] = {sizeof(int64_t)}; + int32_t floatLen[NUMROWS] = {sizeof(float)}; + int32_t intLen[NUMROWS] = {sizeof(int)}; + + params[0].buffer_type = TSDB_DATA_TYPE_TIMESTAMP; + params[0].buffer_length = sizeof(int64_t); + params[0].buffer = ts; + params[0].length = int64Len; + params[0].is_null = is_null; + params[0].num = NUMROWS; + + params[1].buffer_type = TSDB_DATA_TYPE_FLOAT; + params[1].buffer_length = sizeof(float); + params[1].buffer = current; + params[1].length = floatLen; + params[1].is_null = is_null; + params[1].num = NUMROWS; + + params[2].buffer_type = TSDB_DATA_TYPE_INT; + params[2].buffer_length = sizeof(int); + params[2].buffer = voltage; + params[2].length = intLen; + params[2].is_null = is_null; + params[2].num = NUMROWS; + + params[3].buffer_type = TSDB_DATA_TYPE_FLOAT; + params[3].buffer_length = sizeof(float); + params[3].buffer = phase; + params[3].length = floatLen; + params[3].is_null = is_null; + params[3].num = NUMROWS; +} + +/** + * @brief insert data using stmt API + * + * @param taos + */ +void insertData(TAOS *taos, int64_t *ts, float *current, int *voltage, float *phase) { + // init + TAOS_STMT *stmt = taos_stmt_init(taos); + + // prepare + const char *sql = "INSERT INTO ? USING meters TAGS(?, ?) values(?, ?, ?, ?)"; + int code = taos_stmt_prepare(stmt, sql, 0); + checkErrorCode(stmt, code, "failed to execute taos_stmt_prepare"); + + // bind table name and tags + TAOS_MULTI_BIND tags[2]; + prepareBindTags(tags); + code = taos_stmt_set_tbname_tags(stmt, "d1001", tags); + checkErrorCode(stmt, code, "failed to execute taos_stmt_set_tbname_tags"); + + TAOS_MULTI_BIND params[4]; + prepareBindParams(params, ts, current, voltage, phase); + + code = taos_stmt_bind_param_batch(stmt, params); // bind batch + checkErrorCode(stmt, code, "failed to execute taos_stmt_bind_param_batch"); + + code = taos_stmt_add_batch(stmt); // add batch + checkErrorCode(stmt, code, "failed to execute taos_stmt_add_batch"); + + // execute + code = taos_stmt_execute(stmt); + checkErrorCode(stmt, code, "failed to execute taos_stmt_execute"); + + int affectedRows = taos_stmt_affected_rows(stmt); + printf("successfully inserted %d rows\n", affectedRows); + + // close + (void)taos_stmt_close(stmt); +} + +void insertDataInterlace(TAOS *taos, int64_t *ts, float *current, int *voltage, float *phase) { + // init with interlace mode + TAOS_STMT_OPTIONS op; + op.reqId = 0; + op.singleStbInsert = true; + op.singleTableBindOnce = true; + TAOS_STMT *stmt = taos_stmt_init_with_options(taos, &op); + + // prepare + const char *sql = "INSERT INTO ? values(?, ?, ?, ?)"; + int code = taos_stmt_prepare(stmt, sql, 0); + checkErrorCode(stmt, code, "failed to execute taos_stmt_prepare"); + + // bind table name and tags + TAOS_MULTI_BIND tags[2]; + prepareBindTags(tags); + code = taos_stmt_set_tbname_tags(stmt, "d1001", tags); + checkErrorCode(stmt, code, "failed to execute taos_stmt_set_tbname_tags"); + + TAOS_MULTI_BIND params[4]; + prepareBindParams(params, ts, current, voltage, phase); + + code = taos_stmt_bind_param_batch(stmt, params); // bind batch + checkErrorCode(stmt, code, "failed to execute taos_stmt_bind_param_batch"); + + code = taos_stmt_add_batch(stmt); // add batch + checkErrorCode(stmt, code, "failed to execute taos_stmt_add_batch"); + + // execute + code = taos_stmt_execute(stmt); + checkErrorCode(stmt, code, "failed to execute taos_stmt_execute"); + + int affectedRows = taos_stmt_affected_rows(stmt); + printf("successfully inserted %d rows\n", affectedRows); + + // close + (void)taos_stmt_close(stmt); +} + +int main() { + TAOS *taos = taos_connect("localhost", "root", "taosdata", NULL, 6030); + if (taos == NULL) { + printf("failed to connect to server\n"); + exit(EXIT_FAILURE); + } + executeSQL(taos, "DROP DATABASE IF EXISTS power"); + executeSQL(taos, "CREATE DATABASE power"); + executeSQL(taos, "USE power"); + executeSQL(taos, + "CREATE STABLE meters (ts TIMESTAMP, current FLOAT, voltage INT, phase FLOAT) TAGS (location BINARY(64), " + "groupId INT)"); + + // initial insert, expect insert 3 rows + int64_t ts0[] = {1648432611234, 1648432611345, 1648432611456}; + float current0[] = {10.1f, 10.2f, 10.3f}; + int voltage0[] = {216, 217, 218}; + float phase0[] = {0.31f, 0.32f, 0.33f}; + insertData(taos, ts0, current0, voltage0, phase0); + + // insert with interlace mode, send non-duplicate ts, expect insert 3 overlapped rows + int64_t ts1[] = {1648432611234, 1648432611345, 1648432611456}; + int voltage1[] = {219, 220, 221}; + insertDataInterlace(taos, ts1, current0, voltage1, phase0); + + // insert with interlace mode, send duplicate ts, expect insert 2 rows with dups merged + int64_t ts2[] = {1648432611678, 1648432611678, 1648432611789}; + int voltage2[] = {222, 223, 224}; + insertDataInterlace(taos, ts2, current0, voltage2, phase0); + + // insert with interlace mode, send disordered rows, expect insert 3 sorted rows + int64_t ts3[] = {1648432611900, 1648432611890, 1648432611910}; + int voltage3[] = {225, 226, 227}; + insertDataInterlace(taos, ts3, current0, voltage3, phase0); + + // insert with interlace mode, send disordered and duplicate rows, expect insert 2 sorted and dup-merged rows + int64_t ts4[] = {1648432611930, 1648432611920, 1648432611930}; + int voltage4[] = {228, 229, 230}; + insertDataInterlace(taos, ts4, current0, voltage4, phase0); + + taos_close(taos); + taos_cleanup(); + + // final results + // taos> select * from d1001; + // ts | current | voltage | phase | + // ====================================================================================== + // 2022-03-28 09:56:51.234 | 10.1000004 | 219 | 0.3100000 | + // 2022-03-28 09:56:51.345 | 10.1999998 | 220 | 0.3200000 | + // 2022-03-28 09:56:51.456 | 10.3000002 | 221 | 0.3300000 | + // 2022-03-28 09:56:51.678 | 10.1999998 | 223 | 0.3200000 | + // 2022-03-28 09:56:51.789 | 10.3000002 | 224 | 0.3300000 | + // 2022-03-28 09:56:51.890 | 10.1999998 | 226 | 0.3200000 | + // 2022-03-28 09:56:51.900 | 10.1000004 | 225 | 0.3100000 | + // 2022-03-28 09:56:51.910 | 10.3000002 | 227 | 0.3300000 | + // 2022-03-28 09:56:51.920 | 10.1999998 | 229 | 0.3200000 | + // 2022-03-28 09:56:51.930 | 10.3000002 | 230 | 0.3300000 | + // Query OK, 10 row(s) in set (0.005083s) +} + diff --git a/tests/script/api/stmt2-insert-dupkeys.c b/tests/script/api/stmt2-insert-dupkeys.c new file mode 100644 index 0000000000..c056e1bcb0 --- /dev/null +++ b/tests/script/api/stmt2-insert-dupkeys.c @@ -0,0 +1,212 @@ +#include +#include +#include +#include +#include +#include "taos.h" + +int CTB_NUMS = 3; +int ROW_NUMS = 3; + +void do_query(TAOS* taos, const char* sql) { + TAOS_RES* result = taos_query(taos, sql); + int code = taos_errno(result); + if (code) { + printf("failed to query: %s, reason:%s\n", sql, taos_errstr(result)); + taos_free_result(result); + return; + } + taos_free_result(result); +} + +void createdb(TAOS* taos) { + do_query(taos, "drop database if exists db"); + do_query(taos, "create database db"); + do_query(taos, "create stable db.stb (ts timestamp, b binary(10)) tags(t1 int, t2 binary(10))"); + do_query(taos, "use db"); +} + +#define INIT(tbs, ts, ts_len, b, b_len, tags, paramv) \ +do { \ + /* tbname */ \ + tbs = (char**)malloc(CTB_NUMS * sizeof(char*)); \ + for (int i = 0; i < CTB_NUMS; i++) { \ + tbs[i] = (char*)malloc(sizeof(char) * 20); \ + sprintf(tbs[i], "ctb_%d", i); \ + } \ + /* col params */ \ + ts = (int64_t**)malloc(CTB_NUMS * sizeof(int64_t*)); \ + b = (char**)malloc(CTB_NUMS * sizeof(char*)); \ + ts_len = (int*)malloc(ROW_NUMS * sizeof(int)); \ + b_len = (int*)malloc(ROW_NUMS * sizeof(int)); \ + for (int i = 0; i < ROW_NUMS; i++) { \ + ts_len[i] = sizeof(int64_t); \ + b_len[i] = 1; \ + } \ + for (int i = 0; i < CTB_NUMS; i++) { \ + ts[i] = (int64_t*)malloc(ROW_NUMS * sizeof(int64_t)); \ + b[i] = (char*)malloc(ROW_NUMS * sizeof(char)); \ + for (int j = 0; j < ROW_NUMS; j++) { \ + ts[i][j] = 1591060628000 + j; \ + b[i][j] = (char)('a' + j); \ + } \ + } \ + /*tag params */ \ + int t1 = 0; \ + int t1len = sizeof(int); \ + int t2len = 3; \ + /* bind params */ \ + paramv = (TAOS_STMT2_BIND**)malloc(CTB_NUMS * sizeof(TAOS_STMT2_BIND*)); \ + tags = (TAOS_STMT2_BIND**)malloc(CTB_NUMS * sizeof(TAOS_STMT2_BIND*)); \ + for (int i = 0; i < CTB_NUMS; i++) { \ + /* create tags */ \ + tags[i] = (TAOS_STMT2_BIND*)malloc(2 * sizeof(TAOS_STMT2_BIND)); \ + tags[i][0] = (TAOS_STMT2_BIND){TSDB_DATA_TYPE_INT, &t1, &t1len, NULL, 0}; \ + tags[i][1] = (TAOS_STMT2_BIND){TSDB_DATA_TYPE_BINARY, "after", &t2len, NULL, 0}; \ + /* create col params */ \ + paramv[i] = (TAOS_STMT2_BIND*)malloc(2 * sizeof(TAOS_STMT2_BIND)); \ + paramv[i][0] = (TAOS_STMT2_BIND){TSDB_DATA_TYPE_TIMESTAMP, &ts[i][0], &ts_len[0], NULL, ROW_NUMS}; \ + paramv[i][1] = (TAOS_STMT2_BIND){TSDB_DATA_TYPE_BINARY, &b[i][0], &b_len[0], NULL, ROW_NUMS}; \ + } \ +} while (0) + +#define UINIT(tbs, ts, ts_len, b, b_len, tags, paramv) \ +do { \ + for (int i = 0; i < CTB_NUMS; i++) { \ + free(tbs[i]); \ + } \ + free(tbs); \ + for (int i = 0; i < CTB_NUMS; i++) { \ + free(ts[i]); \ + free(b[i]); \ + } \ + free(ts); \ + free(b); \ + free(ts_len); \ + free(b_len); \ + for (int i = 0; i < CTB_NUMS; i++) { \ + free(tags[i]); \ + free(paramv[i]); \ + } \ + free(tags); \ + free(paramv); \ +} while (0) + +void insert(TAOS* taos, char **tbs, TAOS_STMT2_BIND **tags, TAOS_STMT2_BIND **paramv, const char* sql) +{ + clock_t start, end; + double cpu_time_used; + + TAOS_STMT2_OPTION option = {0, true, true, NULL, NULL}; + TAOS_STMT2 *stmt = taos_stmt2_init(taos, &option); + int code = taos_stmt2_prepare(stmt, sql, 0); + if (code != 0) { + printf("failed to execute taos_stmt2_prepare. error:%s\n", taos_stmt2_error(stmt)); + taos_stmt2_close(stmt); + exit(EXIT_FAILURE); + } + + // bind + start = clock(); + TAOS_STMT2_BINDV bindv = {CTB_NUMS, tbs, tags, paramv}; + if (taos_stmt2_bind_param(stmt, &bindv, -1)) { + printf("failed to execute taos_stmt2_bind_param statement.error:%s\n", taos_stmt2_error(stmt)); + taos_stmt2_close(stmt); + exit(EXIT_FAILURE); + } + end = clock(); + cpu_time_used = ((double)(end - start)) / CLOCKS_PER_SEC; + printf("stmt2-bind [%s] insert Time used: %f seconds\n", sql, cpu_time_used); + start = clock(); + + // exec + if (taos_stmt2_exec(stmt, NULL)) { + printf("failed to execute taos_stmt2_exec statement.error:%s\n", taos_stmt2_error(stmt)); + taos_stmt2_close(stmt); + exit(EXIT_FAILURE); + } + end = clock(); + cpu_time_used = ((double)(end - start)) / CLOCKS_PER_SEC; + printf("stmt2-exec [%s] insert Time used: %f seconds\n", sql, cpu_time_used); + + taos_stmt2_close(stmt); +} + +void insert_dist(TAOS* taos, const char *sql) { + char **tbs, **b; + int64_t **ts; + int *ts_len, *b_len; + TAOS_STMT2_BIND **paramv, **tags; + + INIT(tbs, ts, ts_len, b, b_len, tags, paramv); + + insert(taos, tbs, tags, paramv, sql); + + UINIT(tbs, ts, ts_len, b, b_len, tags, paramv); +} + +void insert_dup(TAOS* taos, const char *sql) { + char **tbs, **b; + int64_t **ts; + int *ts_len, *b_len; + TAOS_STMT2_BIND **paramv, **tags; + + INIT(tbs, ts, ts_len, b, b_len, tags, paramv); + + // insert duplicate rows + for (int i = 0; i < CTB_NUMS; i++) { + for (int j = 0; j < ROW_NUMS; j++) { + ts[i][j] = 1591060628000; + b[i][j] = (char)('x' + j); + } + } + for (int i = 0; i < CTB_NUMS; i++) { + paramv[i][0] = (TAOS_STMT2_BIND){TSDB_DATA_TYPE_TIMESTAMP, &ts[i][0], &ts_len[0], NULL, ROW_NUMS}; + paramv[i][1] = (TAOS_STMT2_BIND){TSDB_DATA_TYPE_BINARY, &b[i][0], &b_len[0], NULL, ROW_NUMS}; + } + insert(taos, tbs, tags, paramv, sql); + + UINIT(tbs, ts, ts_len, b, b_len, tags, paramv); +} + +int main() { + TAOS* taos = taos_connect("localhost", "root", "taosdata", "", 0); + if (!taos) { + printf("failed to connect to db, reason:%s\n", taos_errstr(taos)); + exit(EXIT_FAILURE); + } + + createdb(taos); + // insert distinct rows + insert_dist(taos, "insert into db.? using db.stb tags(?,?)values(?,?)"); + // insert duplicate rows + insert_dup(taos, "insert into db.? values(?,?)"); + + taos_close(taos); + taos_cleanup(); +} + +// final results +// taos> select * from ctb_0; +// ts | b | +// ========================================= +// 2020-06-02 09:17:08.000 | z | +// 2020-06-02 09:17:08.001 | b | +// 2020-06-02 09:17:08.002 | c | +// Query OK, 3 row(s) in set (0.003975s) +// +// taos> select * from ctb_1; +// ts | b | +// ========================================= +// 2020-06-02 09:17:08.000 | z | +// 2020-06-02 09:17:08.001 | b | +// 2020-06-02 09:17:08.002 | c | +// Query OK, 3 row(s) in set (0.007241s) + +// taos> select * from ctb_2; +// ts | b | +// ========================================= +// 2020-06-02 09:17:08.000 | z | +// 2020-06-02 09:17:08.001 | b | +// 2020-06-02 09:17:08.002 | c | +// Query OK, 3 row(s) in set (0.005443s) From 5972054c2de166aaf3cb03c3efcd1ab38483acd7 Mon Sep 17 00:00:00 2001 From: wangmm0220 Date: Tue, 17 Dec 2024 14:33:44 +0800 Subject: [PATCH 02/14] fix:[TD-33225]remove the limition when creating index or modifing column compression if there is a topic/stream/tsma --- source/dnode/mnode/impl/src/mndIndex.c | 11 ------- source/dnode/mnode/impl/src/mndStb.c | 5 --- tests/parallel_test/cases.task | 1 + tests/system-test/7-tmq/td-33225.py | 44 ++++++++++++++++++++++++++ 4 files changed, 45 insertions(+), 16 deletions(-) create mode 100644 tests/system-test/7-tmq/td-33225.py diff --git a/source/dnode/mnode/impl/src/mndIndex.c b/source/dnode/mnode/impl/src/mndIndex.c index 718c34e85a..f5dac9df65 100644 --- a/source/dnode/mnode/impl/src/mndIndex.c +++ b/source/dnode/mnode/impl/src/mndIndex.c @@ -673,8 +673,6 @@ static int32_t mndSetUpdateIdxStbCommitLogs(SMnode *pMnode, STrans *pTrans, SStb code = TSDB_CODE_MND_TAG_NOT_EXIST; TAOS_RETURN(code); } - col_id_t colId = pOld->pTags[tag].colId; - TAOS_CHECK_RETURN(mndCheckColAndTagModifiable(pMnode, pOld->name, pOld->uid, colId)); TAOS_CHECK_RETURN(mndAllocStbSchemas(pOld, pNew)); SSchema *pTag = pNew->pTags + tag; @@ -806,16 +804,7 @@ static int32_t mndAddIndex(SMnode *pMnode, SRpcMsg *pReq, SCreateTagIndexReq *re TAOS_RETURN(code); } - col_id_t colId = pStb->pTags[tag].colId; - TAOS_CHECK_RETURN(mndCheckColAndTagModifiable(pMnode, pStb->name, pStb->uid, colId)); - - // SSchema *pTag = pStb->pTags + tag; - // if (IS_IDX_ON(pTag)) { - // terrno = TSDB_CODE_MND_TAG_INDEX_ALREADY_EXIST; - // return -1; - // } code = mndAddIndexImpl(pMnode, pReq, pDb, pStb, &idxObj); - TAOS_RETURN(code); } diff --git a/source/dnode/mnode/impl/src/mndStb.c b/source/dnode/mnode/impl/src/mndStb.c index 2db76f6312..d46968a22d 100644 --- a/source/dnode/mnode/impl/src/mndStb.c +++ b/source/dnode/mnode/impl/src/mndStb.c @@ -1805,7 +1805,6 @@ static int32_t mndUpdateSuperTableColumnCompress(SMnode *pMnode, const SStbObj * } SSchema *pTarget = &pOld->pColumns[idx]; col_id_t colId = pTarget->colId; - TAOS_CHECK_RETURN(mndCheckColAndTagModifiable(pMnode, pOld->name, pOld->uid, colId)); TAOS_CHECK_RETURN(mndAllocStbSchemas(pOld, pNew)); code = validColCmprByType(pTarget->type, p->bytes); @@ -3702,10 +3701,6 @@ static int32_t mndAddIndex(SMnode *pMnode, SRpcMsg *pReq, SCreateTagIndexReq *ta terrno = TSDB_CODE_MND_TAG_NOT_EXIST; return -1; } - col_id_t colId = pOld->pTags[tag].colId; - if (mndCheckColAndTagModifiable(pMnode, pOld->name, pOld->uid, colId) != 0) { - return -1; - } if (mndAllocStbSchemas(pOld, pNew) != 0) { return -1; } diff --git a/tests/parallel_test/cases.task b/tests/parallel_test/cases.task index 4aedc0991e..6d091e1b4c 100644 --- a/tests/parallel_test/cases.task +++ b/tests/parallel_test/cases.task @@ -315,6 +315,7 @@ ,,y,system-test,./pytest.sh python3 ./test.py -f 7-tmq/tmq_ts5466.py ,,y,system-test,./pytest.sh python3 ./test.py -f 7-tmq/tmq_ts-5473.py ,,y,system-test,./pytest.sh python3 ./test.py -f 7-tmq/td-32187.py +,,y,system-test,./pytest.sh python3 ./test.py -f 7-tmq/td-33225.py ,,y,system-test,./pytest.sh python3 ./test.py -f 7-tmq/tmq_ts4563.py ,,y,system-test,./pytest.sh python3 ./test.py -f 7-tmq/tmq_td32526.py ,,y,system-test,./pytest.sh python3 ./test.py -f 7-tmq/tmq_replay.py diff --git a/tests/system-test/7-tmq/td-33225.py b/tests/system-test/7-tmq/td-33225.py new file mode 100644 index 0000000000..f39e402b55 --- /dev/null +++ b/tests/system-test/7-tmq/td-33225.py @@ -0,0 +1,44 @@ +import taos +import sys +import time +import socket +import os +import threading + +from util.log import * +from util.sql import * +from util.cases import * +from util.dnodes import * +from util.common import * +from taos.tmq import * +sys.path.append("./7-tmq") +from tmqCommon import * + +class TDTestCase: + updatecfgDict = {'debugFlag': 135, 'asynclog': 0} + def init(self, conn, logSql, replicaVar=1): + self.replicaVar = int(replicaVar) + tdLog.debug(f"start to excute {__file__}") + tdSql.init(conn.cursor()) + #tdSql.init(conn.cursor(), logSql) # output sql.txt file + + def run(self): + tdSql.execute(f'create database if not exists db_33225') + tdSql.execute(f'use db_33225') + tdSql.execute(f'create stable if not exists s33225 (ts timestamp, c1 int, c2 int) tags (t binary(32), t2 int)') + tdSql.execute(f'insert into t1 using s33225 tags("__devicid__", 1) values(1669092069068, 0, 1)') + + tdSql.execute("create topic db_33225_topic as select ts,c1,t2 from s33225") + tdSql.execute(f'create stream s1 into st1 as select _wstart, count(*), avg(c2),t2 from s33225 PARTITION BY tbname INTERVAL(1m)') + + tdSql.execute(f'alter table s33225 modify column c2 COMPRESS "zlib"') + tdSql.execute(f'create index dex1 on s33225(t2)') + + return + + def stop(self): + tdSql.close() + tdLog.success(f"{__file__} successfully executed") + +tdCases.addLinux(__file__, TDTestCase()) +tdCases.addWindows(__file__, TDTestCase()) \ No newline at end of file From 63a6428e341ffd0a3d012332daea125d16976b16 Mon Sep 17 00:00:00 2001 From: 54liuyao <54liuyao@163.com> Date: Tue, 17 Dec 2024 17:59:53 +0800 Subject: [PATCH 03/14] fix(stream):adjust status of ins_streams --- source/dnode/mnode/impl/src/mndStream.c | 11 -- source/dnode/mnode/impl/src/mndStreamUtil.c | 48 +++++- tests/script/tsim/stream/pauseAndResume.sim | 162 ++++++++++++++++++++ 3 files changed, 207 insertions(+), 14 deletions(-) diff --git a/source/dnode/mnode/impl/src/mndStream.c b/source/dnode/mnode/impl/src/mndStream.c index 0a107518df..32446a6fd3 100644 --- a/source/dnode/mnode/impl/src/mndStream.c +++ b/source/dnode/mnode/impl/src/mndStream.c @@ -1680,11 +1680,6 @@ static int32_t mndProcessPauseStreamReq(SRpcMsg *pReq) { mInfo("stream:%s,%" PRId64 " start to pause stream", pauseReq.name, pStream->uid); - if (pStream->status == STREAM_STATUS__PAUSE) { - sdbRelease(pMnode->pSdb, pStream); - return 0; - } - if ((code = mndCheckDbPrivilegeByName(pMnode, pReq->info.conn.user, MND_OPER_WRITE_DB, pStream->targetDb)) != 0) { sdbRelease(pMnode->pSdb, pStream); return code; @@ -1773,7 +1768,6 @@ static int32_t mndProcessPauseStreamReq(SRpcMsg *pReq) { // pause stream taosWLockLatch(&pStream->lock); - pStream->status = STREAM_STATUS__PAUSE; code = mndPersistTransLog(pStream, pTrans, SDB_STATUS_READY); if (code) { taosWUnLockLatch(&pStream->lock); @@ -1824,11 +1818,6 @@ static int32_t mndProcessResumeStreamReq(SRpcMsg *pReq) { } } - if (pStream->status != STREAM_STATUS__PAUSE) { - sdbRelease(pMnode->pSdb, pStream); - return 0; - } - mInfo("stream:%s,%" PRId64 " start to resume stream from pause", resumeReq.name, pStream->uid); if (mndCheckDbPrivilegeByName(pMnode, pReq->info.conn.user, MND_OPER_WRITE_DB, pStream->targetDb) != 0) { sdbRelease(pMnode->pSdb, pStream); diff --git a/source/dnode/mnode/impl/src/mndStreamUtil.c b/source/dnode/mnode/impl/src/mndStreamUtil.c index bb666eb6dd..ef0b3fa9cc 100644 --- a/source/dnode/mnode/impl/src/mndStreamUtil.c +++ b/source/dnode/mnode/impl/src/mndStreamUtil.c @@ -854,8 +854,7 @@ int32_t mndResetChkptReportInfo(SHashObj* pHash, int64_t streamId) { return TSDB_CODE_MND_STREAM_NOT_EXIST; } -static void mndShowStreamStatus(char *dst, SStreamObj *pStream) { - int8_t status = atomic_load_8(&pStream->status); +static void mndShowStreamStatus(char *dst, int8_t status) { if (status == STREAM_STATUS__NORMAL) { strcpy(dst, "ready"); } else if (status == STREAM_STATUS__STOP) { @@ -891,6 +890,41 @@ static void int64ToHexStr(int64_t id, char *pBuf, int32_t bufLen) { varDataSetLen(pBuf, len + 2); } +static int32_t isAllTaskPaused(SStreamObj *pStream, bool *pRes) { + int32_t code = TSDB_CODE_SUCCESS; + int32_t lino = 0; + SStreamTaskIter *pIter = NULL; + bool isPaused = true; + + taosRLockLatch(&pStream->lock); + code = createStreamTaskIter(pStream, &pIter); + TSDB_CHECK_CODE(code, lino, _end); + + while (streamTaskIterNextTask(pIter)) { + SStreamTask *pTask = NULL; + code = streamTaskIterGetCurrent(pIter, &pTask); + TSDB_CHECK_CODE(code, lino, _end); + + STaskId id = {.streamId = pTask->id.streamId, .taskId = pTask->id.taskId}; + STaskStatusEntry *pe = taosHashGet(execInfo.pTaskMap, &id, sizeof(id)); + if (pe == NULL) { + continue; + } + if (pe->status != TASK_STATUS__PAUSE) { + isPaused = false; + } + } + (*pRes) = isPaused; + +_end: + destroyStreamTaskIter(pIter); + taosRUnLockLatch(&pStream->lock); + if (code != TSDB_CODE_SUCCESS) { + mError("error happens when get stream status, lino:%d, code:%s", lino, tstrerror(code)); + } + return code; +} + int32_t setStreamAttrInResBlock(SStreamObj *pStream, SSDataBlock *pBlock, int32_t numOfRows) { int32_t code = 0; int32_t cols = 0; @@ -939,7 +973,15 @@ int32_t setStreamAttrInResBlock(SStreamObj *pStream, SSDataBlock *pBlock, int32_ char status[20 + VARSTR_HEADER_SIZE] = {0}; char status2[20] = {0}; - mndShowStreamStatus(status2, pStream); + bool isPaused = false; + code = isAllTaskPaused(pStream, &isPaused); + TSDB_CHECK_CODE(code, lino, _end); + + int8_t streamStatus = atomic_load_8(&pStream->status); + if (isPaused) { + streamStatus = STREAM_STATUS__PAUSE; + } + mndShowStreamStatus(status2, streamStatus); STR_WITH_MAXSIZE_TO_VARSTR(status, status2, sizeof(status)); pColInfo = taosArrayGet(pBlock->pDataBlock, cols++); TSDB_CHECK_NULL(pColInfo, code, lino, _end, terrno); diff --git a/tests/script/tsim/stream/pauseAndResume.sim b/tests/script/tsim/stream/pauseAndResume.sim index 1f4caf5c03..66d26dad49 100644 --- a/tests/script/tsim/stream/pauseAndResume.sim +++ b/tests/script/tsim/stream/pauseAndResume.sim @@ -398,4 +398,166 @@ endi print ===== step5 over +print ===== step6 +sql drop database if exists test6; +sql create database test7 vgroups 1; +sql use test7; +sql create stable st(ts timestamp, a int, b int , c int, d double) tags(ta int,tb int,tc int); +sql create table ts1 using st tags(1,1,1); + +sql create stream streams8 trigger at_once IGNORE EXPIRED 0 IGNORE UPDATE 0 watermark 1d into streamt8 as select _wstart, count(*) c1 from st interval(10s); +sql create stream streams9 trigger at_once IGNORE EXPIRED 0 IGNORE UPDATE 0 watermark 1d into streamt9 as select _wstart, count(*) c1 from st partition by tbname interval(10s); + +run tsim/stream/checkTaskStatus.sim + +$loop_count = 0 +loop7: + +$loop_count = $loop_count + 1 +if $loop_count == 40 then + return -1 +endi + +sleep 500 + +sql select status, * from information_schema.ins_streams where status != "ready"; + +if $rows != 0 then + print $data00 $data01 $data02 $data03 $data04 + print $data10 $data11 $data12 $data13 $data14 + print $data20 $data21 $data22 $data23 $data24 + print $data30 $data31 $data32 $data33 $data34 + print $data40 $data41 $data42 $data43 $data44 + print $data50 $data51 $data52 $data53 $data54 + goto loop7 +endi + +sql pause stream streams8; + +sql pause stream streams9; + +sql pause stream streams8; + +sql pause stream streams9; + +sleep 1000 + +sql pause stream streams8; + +sql pause stream streams9; + +sleep 1000 + +$loop_count = 0 +loop80: + +$loop_count = $loop_count + 1 +if $loop_count == 40 then + print pause stream failed + goto end_step_6 +endi + +sleep 1000 + +sql select status, * from information_schema.ins_stream_tasks where status != "paused"; + +if $rows != 2 then + print $data00 $data01 $data02 $data03 $data04 + print $data10 $data11 $data12 $data13 $data14 + print $data20 $data21 $data22 $data23 $data24 + print $data30 $data31 $data32 $data33 $data34 + print $data40 $data41 $data42 $data43 $data44 + print $data50 $data51 $data52 $data53 $data54 + goto loop80 +endi + +$loop_count = 0 +loop8: + +$loop_count = $loop_count + 1 +if $loop_count == 40 then + return -1 +endi + +sleep 1000 + +sql select status, * from information_schema.ins_streams where status == "paused"; + +if $rows != 2 then + print $data00 $data01 $data02 $data03 $data04 + print $data10 $data11 $data12 $data13 $data14 + print $data20 $data21 $data22 $data23 $data24 + print $data30 $data31 $data32 $data33 $data34 + print $data40 $data41 $data42 $data43 $data44 + print $data50 $data51 $data52 $data53 $data54 + goto loop8 +endi + + +sql resume stream streams8; + +sql resume stream streams9; + +sql resume stream streams8; + +sql resume stream streams9; + +sleep 1000 + +sql resume stream streams8; + +sql resume stream streams9; + +sleep 1000 + + +$loop_count = 0 +loop90: + +$loop_count = $loop_count + 1 +if $loop_count == 40 then + print pause stream failed + goto end_step_6 +endi + +sleep 1000 + +sql select status, * from information_schema.ins_stream_tasks where status == "paused"; + +if $rows != 0 then + print $data00 $data01 $data02 $data03 $data04 + print $data10 $data11 $data12 $data13 $data14 + print $data20 $data21 $data22 $data23 $data24 + print $data30 $data31 $data32 $data33 $data34 + print $data40 $data41 $data42 $data43 $data44 + print $data50 $data51 $data52 $data53 $data54 + goto loop90 +endi + +$loop_count = 0 +loop9: + +$loop_count = $loop_count + 1 +if $loop_count == 40 then + return -1 +endi + +sleep 1000 + +sql select status, * from information_schema.ins_streams where status != "paused"; + +if $rows != 2 then + print $data00 $data01 $data02 $data03 $data04 + print $data10 $data11 $data12 $data13 $data14 + print $data20 $data21 $data22 $data23 $data24 + print $data30 $data31 $data32 $data33 $data34 + print $data40 $data41 $data42 $data43 $data44 + print $data50 $data51 $data52 $data53 $data54 + goto loop9 +endi + +end_step_6: + +print ===== step6 over + system sh/stop_dnodes.sh From 02bd68be22a9a59e98142bef26a5433410cd9b53 Mon Sep 17 00:00:00 2001 From: Haolin Wang Date: Mon, 16 Dec 2024 15:50:54 +0800 Subject: [PATCH 04/14] morefix: not allow duplicate table names in stmt2 bind with interlace mode --- include/common/tdataformat.h | 4 +-- source/client/src/clientMain.c | 40 +++++++++++++++++++------ source/common/src/tdataformat.c | 38 +++++++++++------------ source/libs/parser/src/parInsertStmt.c | 10 ++----- tests/script/api/stmt2-insert-dupkeys.c | 27 +++++++++++++++-- 5 files changed, 78 insertions(+), 41 deletions(-) diff --git a/include/common/tdataformat.h b/include/common/tdataformat.h index 0cc30edf82..0b34e882c8 100644 --- a/include/common/tdataformat.h +++ b/include/common/tdataformat.h @@ -378,7 +378,7 @@ typedef struct { TAOS_MULTI_BIND *bind; } SBindInfo; int32_t tRowBuildFromBind(SBindInfo *infos, int32_t numOfInfos, bool infoSorted, const STSchema *pTSchema, - SArray *rowArray, bool *orderedDup); + SArray *rowArray, bool *pOrdered, bool *pDupTs); // stmt2 binding int32_t tColDataAddValueByBind2(SColData *pColData, TAOS_STMT2_BIND *pBind, int32_t buffMaxLen, initGeosFn igeos, @@ -392,7 +392,7 @@ typedef struct { } SBindInfo2; int32_t tRowBuildFromBind2(SBindInfo2 *infos, int32_t numOfInfos, bool infoSorted, const STSchema *pTSchema, - SArray *rowArray, bool *orderedDup); + SArray *rowArray, bool *pOrdered, bool *pDupTs); #endif diff --git a/source/client/src/clientMain.c b/source/client/src/clientMain.c index 6eb2f7e9e9..ef2a18d95e 100644 --- a/source/client/src/clientMain.c +++ b/source/client/src/clientMain.c @@ -2166,19 +2166,38 @@ int taos_stmt2_bind_param(TAOS_STMT2 *stmt, TAOS_STMT2_BINDV *bindv, int32_t col pStmt->semWaited = true; } - int32_t code = 0; + SSHashObj *hashTbnames = tSimpleHashInit(100, taosGetDefaultHashFunction(TSDB_DATA_TYPE_VARCHAR)); + if (NULL == hashTbnames) { + tscError("stmt2 bind failed: %s", tstrerror(terrno)); + return terrno; + } + + int32_t code = TSDB_CODE_SUCCESS; for (int i = 0; i < bindv->count; ++i) { if (bindv->tbnames && bindv->tbnames[i]) { + if (pStmt->sql.stbInterlaceMode) { + if (tSimpleHashGet(hashTbnames, bindv->tbnames[i], strlen(bindv->tbnames[i])) != NULL) { + code = terrno = TSDB_CODE_PAR_TBNAME_DUPLICATED; + tscError("stmt2 bind failed: %s %s", tstrerror(terrno), bindv->tbnames[i]); + goto out; + } + + code = tSimpleHashPut(hashTbnames, bindv->tbnames[i], strlen(bindv->tbnames[i]), NULL, 0); + if (code) { + goto out; + } + } + code = stmtSetTbName2(stmt, bindv->tbnames[i]); if (code) { - return code; + goto out; } } if (bindv->tags && bindv->tags[i]) { code = stmtSetTbTags2(stmt, bindv->tags[i]); if (code) { - return code; + goto out; } } @@ -2187,26 +2206,29 @@ int taos_stmt2_bind_param(TAOS_STMT2 *stmt, TAOS_STMT2_BINDV *bindv, int32_t col if (bind->num <= 0 || bind->num > INT16_MAX) { tscError("invalid bind num %d", bind->num); - terrno = TSDB_CODE_TSC_STMT_BIND_NUMBER_ERROR; - return terrno; + code = terrno = TSDB_CODE_TSC_STMT_BIND_NUMBER_ERROR; + goto out; } int32_t insert = 0; (void)stmtIsInsert2(stmt, &insert); if (0 == insert && bind->num > 1) { tscError("only one row data allowed for query"); - terrno = TSDB_CODE_TSC_STMT_BIND_NUMBER_ERROR; - return terrno; + code = terrno = TSDB_CODE_TSC_STMT_BIND_NUMBER_ERROR; + goto out; } code = stmtBindBatch2(stmt, bind, col_idx); if (TSDB_CODE_SUCCESS != code) { - return code; + goto out; } } } - return TSDB_CODE_SUCCESS; +out: + tSimpleHashCleanup(hashTbnames); + + return code; } int taos_stmt2_exec(TAOS_STMT2 *stmt, int *affected_rows) { diff --git a/source/common/src/tdataformat.c b/source/common/src/tdataformat.c index 0db88f4b2a..f1aacfed15 100644 --- a/source/common/src/tdataformat.c +++ b/source/common/src/tdataformat.c @@ -449,10 +449,11 @@ static int32_t tBindInfoCompare(const void *p1, const void *p2, const void *para * `infoSorted` is whether the bind information is sorted by column id * `pTSchema` is the schema of the table * `rowArray` is the array to store the rows - * `orderedDup` is an array to store ordered and duplicateTs + * `pOrdered` is the pointer to store ordered + * `pDupTs` is the pointer to store duplicateTs */ int32_t tRowBuildFromBind(SBindInfo *infos, int32_t numOfInfos, bool infoSorted, const STSchema *pTSchema, - SArray *rowArray, bool *orderedDup) { + SArray *rowArray, bool *pOrdered, bool *pDupTs) { if (infos == NULL || numOfInfos <= 0 || numOfInfos > pTSchema->numOfCols || pTSchema == NULL || rowArray == NULL) { return TSDB_CODE_INVALID_PARA; } @@ -510,19 +511,17 @@ int32_t tRowBuildFromBind(SBindInfo *infos, int32_t numOfInfos, bool infoSorted, goto _exit; } - if (orderedDup) { + if (pOrdered && pDupTs) { tRowGetKey(row, &rowKey); if (iRow == 0) { - // init to ordered by default - orderedDup[0] = true; - // init to non-duplicate by default - orderedDup[1] = false; + *pOrdered = true; + *pDupTs = false; } else { // no more compare if we already get disordered or duplicate rows - if (orderedDup[0] && !orderedDup[1]) { + if (*pOrdered && !*pDupTs) { int32_t code = tRowKeyCompare(&rowKey, &lastRowKey); - orderedDup[0] = (code >= 0); - orderedDup[1] = (code == 0); + *pOrdered = (code >= 0); + *pDupTs = (code == 0); } } lastRowKey = rowKey; @@ -3255,10 +3254,11 @@ _exit: * `infoSorted` is whether the bind information is sorted by column id * `pTSchema` is the schema of the table * `rowArray` is the array to store the rows - * `orderedDup` is an array to store ordered and duplicateTs + * `pOrdered` is the pointer to store ordered + * `pDupTs` is the pointer to store duplicateTs */ int32_t tRowBuildFromBind2(SBindInfo2 *infos, int32_t numOfInfos, bool infoSorted, const STSchema *pTSchema, - SArray *rowArray, bool *orderedDup) { + SArray *rowArray, bool *pOrdered, bool *pDupTs) { if (infos == NULL || numOfInfos <= 0 || numOfInfos > pTSchema->numOfCols || pTSchema == NULL || rowArray == NULL) { return TSDB_CODE_INVALID_PARA; } @@ -3340,19 +3340,17 @@ int32_t tRowBuildFromBind2(SBindInfo2 *infos, int32_t numOfInfos, bool infoSorte goto _exit; } - if (orderedDup) { + if (pOrdered && pDupTs) { tRowGetKey(row, &rowKey); if (iRow == 0) { - // init to ordered by default - orderedDup[0] = true; - // init to non-duplicate by default - orderedDup[1] = false; + *pOrdered = true; + *pDupTs = false; } else { // no more compare if we already get disordered or duplicate rows - if (orderedDup[0] && !orderedDup[1]) { + if (*pOrdered && !*pDupTs) { int32_t code = tRowKeyCompare(&rowKey, &lastRowKey); - orderedDup[0] = (code >= 0); - orderedDup[1] = (code == 0); + *pOrdered = (code >= 0); + *pDupTs = (code == 0); } } lastRowKey = rowKey; diff --git a/source/libs/parser/src/parInsertStmt.c b/source/libs/parser/src/parInsertStmt.c index cdc9416d36..37d7b2f431 100644 --- a/source/libs/parser/src/parInsertStmt.c +++ b/source/libs/parser/src/parInsertStmt.c @@ -323,7 +323,6 @@ int32_t qBindStmtStbColsValue(void* pBlock, SArray* pCols, TAOS_MULTI_BIND* bind int32_t code = 0; int16_t lastColId = -1; bool colInOrder = true; - bool orderedDup[2]; if (NULL == *pTSchema) { *pTSchema = tBuildTSchema(pSchema, pDataBlock->pMeta->tableInfo.numOfColumns, pDataBlock->pMeta->sversion); @@ -369,9 +368,7 @@ int32_t qBindStmtStbColsValue(void* pBlock, SArray* pCols, TAOS_MULTI_BIND* bind // } } - code = tRowBuildFromBind(pBindInfos, boundInfo->numOfBound, colInOrder, *pTSchema, pCols, orderedDup); - pDataBlock->ordered = orderedDup[0]; - pDataBlock->duplicateTs = orderedDup[1]; + code = tRowBuildFromBind(pBindInfos, boundInfo->numOfBound, colInOrder, *pTSchema, pCols, &pDataBlock->ordered, &pDataBlock->duplicateTs); qDebug("stmt all %d columns bind %d rows data", boundInfo->numOfBound, rowNum); @@ -692,7 +689,6 @@ int32_t qBindStmtStbColsValue2(void* pBlock, SArray* pCols, TAOS_STMT2_BIND* bin int16_t lastColId = -1; bool colInOrder = true; int ncharColNums = 0; - bool orderedDup[2]; if (NULL == *pTSchema) { *pTSchema = tBuildTSchema(pSchema, pDataBlock->pMeta->tableInfo.numOfColumns, pDataBlock->pMeta->sversion); @@ -749,9 +745,7 @@ int32_t qBindStmtStbColsValue2(void* pBlock, SArray* pCols, TAOS_STMT2_BIND* bin pBindInfos[c].bytes = pColSchema->bytes; } - code = tRowBuildFromBind2(pBindInfos, boundInfo->numOfBound, colInOrder, *pTSchema, pCols, orderedDup); - pDataBlock->ordered = orderedDup[0]; - pDataBlock->duplicateTs = orderedDup[1]; + code = tRowBuildFromBind2(pBindInfos, boundInfo->numOfBound, colInOrder, *pTSchema, pCols, &pDataBlock->ordered, &pDataBlock->duplicateTs); qDebug("stmt all %d columns bind %d rows data", boundInfo->numOfBound, rowNum); diff --git a/tests/script/api/stmt2-insert-dupkeys.c b/tests/script/api/stmt2-insert-dupkeys.c index c056e1bcb0..adab3ddf39 100644 --- a/tests/script/api/stmt2-insert-dupkeys.c +++ b/tests/script/api/stmt2-insert-dupkeys.c @@ -145,7 +145,7 @@ void insert_dist(TAOS* taos, const char *sql) { UINIT(tbs, ts, ts_len, b, b_len, tags, paramv); } -void insert_dup(TAOS* taos, const char *sql) { +void insert_dup_rows(TAOS* taos, const char *sql) { char **tbs, **b; int64_t **ts; int *ts_len, *b_len; @@ -169,6 +169,27 @@ void insert_dup(TAOS* taos, const char *sql) { UINIT(tbs, ts, ts_len, b, b_len, tags, paramv); } +void insert_dup_tables(TAOS* taos, const char *sql) { + char **tbs, **b; + int64_t **ts; + int *ts_len, *b_len; + TAOS_STMT2_BIND **paramv, **tags; + + INIT(tbs, ts, ts_len, b, b_len, tags, paramv); + + for (int i = 0; i < CTB_NUMS; i++) { + sprintf(tbs[i], "ctb_%d", i % 2); + } + + for (int i = 0; i < CTB_NUMS; i++) { + paramv[i][0] = (TAOS_STMT2_BIND){TSDB_DATA_TYPE_TIMESTAMP, &ts[i][0], &ts_len[0], NULL, ROW_NUMS}; + paramv[i][1] = (TAOS_STMT2_BIND){TSDB_DATA_TYPE_BINARY, &b[i][0], &b_len[0], NULL, ROW_NUMS}; + } + insert(taos, tbs, tags, paramv, sql); + + UINIT(tbs, ts, ts_len, b, b_len, tags, paramv); +} + int main() { TAOS* taos = taos_connect("localhost", "root", "taosdata", "", 0); if (!taos) { @@ -180,7 +201,9 @@ int main() { // insert distinct rows insert_dist(taos, "insert into db.? using db.stb tags(?,?)values(?,?)"); // insert duplicate rows - insert_dup(taos, "insert into db.? values(?,?)"); + insert_dup_rows(taos, "insert into db.? values(?,?)"); + // insert duplicate tables + insert_dup_tables(taos, "insert into db.? values(?,?)"); taos_close(taos); taos_cleanup(); From d56d67f59c00416800c14b21ecac4592f4d17faf Mon Sep 17 00:00:00 2001 From: Shengliang Guan Date: Wed, 18 Dec 2024 00:00:31 +0800 Subject: [PATCH 05/14] merge: set git tags --- cmake/taosadapter_CMakeLists.txt.in | 2 +- cmake/taostools_CMakeLists.txt.in | 2 +- cmake/taosws_CMakeLists.txt.in | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmake/taosadapter_CMakeLists.txt.in b/cmake/taosadapter_CMakeLists.txt.in index ef6ed4af1d..13826a1a74 100644 --- a/cmake/taosadapter_CMakeLists.txt.in +++ b/cmake/taosadapter_CMakeLists.txt.in @@ -2,7 +2,7 @@ # taosadapter ExternalProject_Add(taosadapter GIT_REPOSITORY https://github.com/taosdata/taosadapter.git - GIT_TAG 3.0 + GIT_TAG main SOURCE_DIR "${TD_SOURCE_DIR}/tools/taosadapter" BINARY_DIR "" #BUILD_IN_SOURCE TRUE diff --git a/cmake/taostools_CMakeLists.txt.in b/cmake/taostools_CMakeLists.txt.in index 9a6a5329ae..9bbda8309f 100644 --- a/cmake/taostools_CMakeLists.txt.in +++ b/cmake/taostools_CMakeLists.txt.in @@ -2,7 +2,7 @@ # taos-tools ExternalProject_Add(taos-tools GIT_REPOSITORY https://github.com/taosdata/taos-tools.git - GIT_TAG 3.0 + GIT_TAG main SOURCE_DIR "${TD_SOURCE_DIR}/tools/taos-tools" BINARY_DIR "" #BUILD_IN_SOURCE TRUE diff --git a/cmake/taosws_CMakeLists.txt.in b/cmake/taosws_CMakeLists.txt.in index 17446d184d..b013d45911 100644 --- a/cmake/taosws_CMakeLists.txt.in +++ b/cmake/taosws_CMakeLists.txt.in @@ -2,7 +2,7 @@ # taosws-rs ExternalProject_Add(taosws-rs GIT_REPOSITORY https://github.com/taosdata/taos-connector-rust.git - GIT_TAG 3.0 + GIT_TAG main SOURCE_DIR "${TD_SOURCE_DIR}/tools/taosws-rs" BINARY_DIR "" #BUILD_IN_SOURCE TRUE From 116c703b1ca1a41db7d676500b56394ea678a9a3 Mon Sep 17 00:00:00 2001 From: 54liuyao <54liuyao@163.com> Date: Wed, 18 Dec 2024 09:47:36 +0800 Subject: [PATCH 06/14] add test --- tests/script/tsim/stream/pauseAndResume.sim | 38 +++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/tests/script/tsim/stream/pauseAndResume.sim b/tests/script/tsim/stream/pauseAndResume.sim index 66d26dad49..4cc193dd79 100644 --- a/tests/script/tsim/stream/pauseAndResume.sim +++ b/tests/script/tsim/stream/pauseAndResume.sim @@ -556,6 +556,44 @@ if $rows != 2 then goto loop9 endi +run tsim/stream/checkTaskStatus.sim + +sql insert into ts1 values(1648791213001,1,12,3,1.0); + +$loop_count = 0 +loop11: + +$loop_count = $loop_count + 1 +if $loop_count == 40 then + return -1 +endi + +sleep 1000 + +sql select * from streamt8; + +if $rows != 1 then + print $data00 $data01 $data02 $data03 $data04 + print $data10 $data11 $data12 $data13 $data14 + print $data20 $data21 $data22 $data23 $data24 + print $data30 $data31 $data32 $data33 $data34 + print $data40 $data41 $data42 $data43 $data44 + print $data50 $data51 $data52 $data53 $data54 + goto loop11 +endi + +sql select * from streamt9; + +if $rows != 1 then + print $data00 $data01 $data02 $data03 $data04 + print $data10 $data11 $data12 $data13 $data14 + print $data20 $data21 $data22 $data23 $data24 + print $data30 $data31 $data32 $data33 $data34 + print $data40 $data41 $data42 $data43 $data44 + print $data50 $data51 $data52 $data53 $data54 + goto loop11 +endi + end_step_6: print ===== step6 over From 2950fdc210c00fc0356f5d2fcea742714fd16b4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=94=90=E5=8A=A0=E5=88=A9?= Date: Wed, 18 Dec 2024 10:42:47 +0800 Subject: [PATCH 07/14] =?UTF-8?q?fix:=20=E5=88=A0=E9=99=A4=E5=A4=9A?= =?UTF-8?q?=E4=BD=99=E7=9A=84=E7=BB=93=E5=B0=BE=E5=8D=8A=E6=8B=AC=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/zh/06-advanced/03-stream.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/zh/06-advanced/03-stream.md b/docs/zh/06-advanced/03-stream.md index f5202cddad..333dabd189 100644 --- a/docs/zh/06-advanced/03-stream.md +++ b/docs/zh/06-advanced/03-stream.md @@ -175,7 +175,7 @@ TDengine 对于修改数据提供两种处理方式，由 IGNORE UPDATE 选项 用户可以为每个 partition 对应的子表生成自定义的 TAG 值，如下创建流的语句， ```sql -CREATE STREAM output_tag trigger at_once INTO output_tag_s TAGS(alias_tag varchar(100)) as select _wstart, count(*) from power.meters partition by concat("tag-", tbname) as alias_tag interval(10s)); +CREATE STREAM output_tag trigger at_once INTO output_tag_s TAGS(alias_tag varchar(100)) as select _wstart, count(*) from power.meters partition by concat("tag-", tbname) as alias_tag interval(10s); ``` 在 PARTITION 子句中，为 concat（"tag-"， tbname）定义了一个别名 alias_tag， 对应超级表 output_tag_s 的自定义 TAG 的名字。在上述示例中，流新创建的子表的 TAG 将以前缀 'tag-' 连接原表名作为 TAG 的值。会对 TAG 信息进行如下检查。 From 6d1648012398b88699d1289c7d4d438701aaf1bf Mon Sep 17 00:00:00 2001 From: Yu Chen <74105241+yu285@users.noreply.github.com> Date: Wed, 18 Dec 2024 11:26:45 +0800 Subject: [PATCH 08/14] docs/optimize the description of "SHOW QUERIES".md --- docs/zh/14-reference/03-taos-sql/24-show.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/zh/14-reference/03-taos-sql/24-show.md b/docs/zh/14-reference/03-taos-sql/24-show.md index 110c9cee6e..4596a03281 100644 --- a/docs/zh/14-reference/03-taos-sql/24-show.md +++ b/docs/zh/14-reference/03-taos-sql/24-show.md @@ -155,7 +155,7 @@ SHOW QNODES; SHOW QUERIES; ``` -显示当前系统中正在进行的查询。 +显示当前系统中正在进行的写入（更新）/查询/删除。（由于内部 API 命名原因，所以统称 QUERIES） ## SHOW SCORES From 1513f87dfe8a87c81b4f97f78b4534b359eb09ea Mon Sep 17 00:00:00 2001 From: Linhe Huo Date: Wed, 18 Dec 2024 13:29:50 +0800 Subject: [PATCH 09/14] docs(taosx): add health state in taosx --- .../06-advanced/05-data-in/health-options.png | Bin 0 -> 19699 bytes docs/zh/06-advanced/05-data-in/index.md | 25 +++++++++++++++++- 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 docs/zh/06-advanced/05-data-in/health-options.png diff --git a/docs/zh/06-advanced/05-data-in/health-options.png b/docs/zh/06-advanced/05-data-in/health-options.png new file mode 100644 index 0000000000000000000000000000000000000000..d20a520a95ac07c47657905a276008ac2eacabfd GIT binary patch literal 19699 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 U#n0l_3IG5A07*qoM6N<$g1zwS7XSbN literal 0 HcmV?d00001 diff --git a/docs/zh/06-advanced/05-data-in/index.md b/docs/zh/06-advanced/05-data-in/index.md index 0dfa04db56..8f23fe2a81 100644 --- a/docs/zh/06-advanced/05-data-in/index.md +++ b/docs/zh/06-advanced/05-data-in/index.md @@ -294,9 +294,32 @@ let v3 = data["voltage"].split(","); 在任务列表页面，还可以对任务进行启动、停止、查看、删除、复制等操作，也可以查看各个任务的运行情况，包括写入的记录条数、流量等。 +### 健康状态 + +从 3.3.5.0 开始，在任务管理列表中，增加了一项 ”健康状态“，用于指示当前任务运行过程中的健康状态。 + +在数据源的”高级选项“列表中，增加了多项健康状态监测的配置项，包括： + +![health options](./health-options.png) + +1. 健康监测时段（Health Check Duration）：可选项，表示对最近多长时间的任务状态进行统计。 +2. Busy 状态阈值（Busy State Threshold）：百分比，表示写入队列中入队元素数量与队列长度之比，默认 100%。 +3. 写入队列长度（Max Write Queue Length）：表示对应的写入队列长度最大值。 +4. 写入错误阈值（Write Error Threshold）：数值类型，表示健康监测时段中允许写入错误的数量。超出阈值，则报错。 + +在任务管理列表展示中，有如下状态： + +- Ready：数据源和目标端健康检查通过，可以进行数据读取和写入。 +- Idle：表示监测时段内无数据处理（没有数据进入处理流程）。 +- Busy：表示写入队列已满（超出一定阈值，表示写入繁忙，在一定程度上意味着当前可能存在性能瓶颈，需要调整参数或配置等来进行改善，但并不说明存在错误）。 +- Bounce：数据源和目标端均正常，但在写入过程中存在错误，一定周期内超出阈值，可能意味着存在大量非正常数据或正在发生数据丢失。 +- SourceError: 数据源错误导致无法进行读取。此时工作负载将尝试重连数据源。 +- SinkError：写入端错误导致无法进行写入。此时工作负载将尝试重连数据库，恢复后进入 Ready 状态。 +- Fatal：严重或无法恢复的错误。 + ```mdx-code-block import DocCardList from '@theme/DocCardList'; import {useCurrentSidebarCategory} from '@docusaurus/theme-common'; -``` \ No newline at end of file +``` From e5222818e7d3f064581726331980100a05c1d220 Mon Sep 17 00:00:00 2001 From: haoranchen Date: Wed, 18 Dec 2024 14:08:05 +0800 Subject: [PATCH 10/14] Update 01-index.md --- docs/zh/01-index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/zh/01-index.md b/docs/zh/01-index.md index 1fda72024c..02c6105d43 100644 --- a/docs/zh/01-index.md +++ b/docs/zh/01-index.md @@ -16,7 +16,7 @@ TDengine 采用 SQL 作为查询语言，大大降低学习成本、降低迁移 如果你是系统管理员，关心安装、升级、容错灾备、关心数据导入、导出、配置参数，如何监测 TDengine 是否健康运行，如何提升系统运行的性能，请仔细参考[运维指南](./operation)一章。 -如果你对数据库内核设计感兴趣，或是开源爱好者，建议仔细阅读[技术内幕](./tdinterna)一章。该章从分布式架构到存储引擎、查询引擎、数据订阅，再到流计算引擎都做了详细阐述。建议对照文档，查看TDengine在GitHub的源代码，对TDengine的设计和编码做深入了解，更欢迎加入开源社区，贡献代码。 +如果你对数据库内核设计感兴趣，或是开源爱好者，建议仔细阅读[技术内幕](./tdinternal)一章。该章从分布式架构到存储引擎、查询引擎、数据订阅，再到流计算引擎都做了详细阐述。建议对照文档，查看TDengine在GitHub的源代码，对TDengine的设计和编码做深入了解，更欢迎加入开源社区，贡献代码。 最后，作为一个开源软件，欢迎大家的参与。如果发现文档有任何错误、描述不清晰的地方，请在每个页面的最下方，点击“编辑本文档”直接进行修改。 From 7e2064d5c127bbe7a8124496bb5de936a91b8107 Mon Sep 17 00:00:00 2001 From: haoranchen Date: Wed, 18 Dec 2024 15:39:47 +0800 Subject: [PATCH 11/14] Update index.md --- docs/zh/04-get-started/index.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/zh/04-get-started/index.md b/docs/zh/04-get-started/index.md index 4d9f7ceae5..5a7192f2c6 100644 --- a/docs/zh/04-get-started/index.md +++ b/docs/zh/04-get-started/index.md @@ -10,7 +10,7 @@ import official_account from './official-account.webp' TDengine 完整的软件包包括服务端（taosd）、用于与第三方系统对接并提供 RESTful 接口的 taosAdapter、应用驱动（taosc）、命令行程序 (CLI，taos) 和一些工具软件。TDengine 除了提供多种语言的连接器之外，还通过 [taosAdapter](../reference/components/taosadapter) 提供 [RESTful 接口](../reference/connector/rest-api)。 -本章主要介绍如何利用 Docker 或者安装包快速设置 TDengine 环境并体验其高效写入和查询。 +本章主要介绍如何快速设置 TDengine 环境并体验其高效写入和查询。 ```mdx-code-block import DocCardList from '@theme/DocCardList'; @@ -34,4 +34,4 @@ import {useCurrentSidebarCategory} from '@docusaurus/theme-common'; 关注 TDengine 视频号
收看技术直播与教学视频 关注 TDengine 公众号
阅读技术文章与行业案例 - \ No newline at end of file + From 5fe28f968e40c1f9d352b767f417abd6bc720520 Mon Sep 17 00:00:00 2001 From: haoranchen Date: Wed, 18 Dec 2024 17:22:07 +0800 Subject: [PATCH 12/14] Update 03-package.md --- docs/zh/04-get-started/03-package.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/zh/04-get-started/03-package.md b/docs/zh/04-get-started/03-package.md index 9724c0a1c9..62830b10b8 100644 --- a/docs/zh/04-get-started/03-package.md +++ b/docs/zh/04-get-started/03-package.md @@ -8,7 +8,7 @@ import Tabs from "@theme/Tabs"; import TabItem from "@theme/TabItem"; import PkgListV3 from "/components/PkgListV3"; -您可以[用 Docker 立即体验](../../get-started/docker/) TDengine。如果您希望对 TDengine 贡献代码或对内部实现感兴趣，请参考我们的 [TDengine GitHub 主页](https://github.com/taosdata/TDengine) 下载源码构建和安装. +如果您希望对 TDengine 贡献代码或对内部实现感兴趣，请参考我们的 [TDengine GitHub 主页](https://github.com/taosdata/TDengine) 下载源码构建和安装. TDengine 完整的软件包包括服务端（taosd）、应用驱动（taosc）、用于与第三方系统对接并提供 RESTful 接口的 taosAdapter、命令行程序（CLI，taos）和一些工具软件。目前 TDinsight 仅在 Linux 系统上安装和运行，后续将支持 Windows、macOS 等系统。TDengine 除了提供多种语言的连接器之外，还通过 [taosAdapter](../../reference/components/taosadapter/) 提供 [RESTful 接口](../../reference/connector/rest-api/)。 @@ -319,4 +319,4 @@ SELECT AVG(current), MAX(voltage), MIN(phase) FROM test.meters WHERE groupId = 1 SELECT _wstart, AVG(current), MAX(voltage), MIN(phase) FROM test.d1001 INTERVAL(10s); ``` -在上面的查询中，使用系统提供的伪列 _wstart 来给出每个窗口的开始时间。 \ No newline at end of file +在上面的查询中，使用系统提供的伪列 _wstart 来给出每个窗口的开始时间。 From 23c86774da701aa4ec6350e38f79c3dd0211154d Mon Sep 17 00:00:00 2001 From: haoranchen Date: Wed, 18 Dec 2024 17:23:41 +0800 Subject: [PATCH 13/14] Update 03-package.md --- docs/zh/04-get-started/03-package.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/docs/zh/04-get-started/03-package.md b/docs/zh/04-get-started/03-package.md index 62830b10b8..344b9412df 100644 --- a/docs/zh/04-get-started/03-package.md +++ b/docs/zh/04-get-started/03-package.md @@ -8,8 +8,6 @@ import Tabs from "@theme/Tabs"; import TabItem from "@theme/TabItem"; import PkgListV3 from "/components/PkgListV3"; -如果您希望对 TDengine 贡献代码或对内部实现感兴趣，请参考我们的 [TDengine GitHub 主页](https://github.com/taosdata/TDengine) 下载源码构建和安装. - TDengine 完整的软件包包括服务端（taosd）、应用驱动（taosc）、用于与第三方系统对接并提供 RESTful 接口的 taosAdapter、命令行程序（CLI，taos）和一些工具软件。目前 TDinsight 仅在 Linux 系统上安装和运行，后续将支持 Windows、macOS 等系统。TDengine 除了提供多种语言的连接器之外，还通过 [taosAdapter](../../reference/components/taosadapter/) 提供 [RESTful 接口](../../reference/connector/rest-api/)。 为方便使用，标准的服务端安装包包含了 taosd、taosAdapter、taosc、taos、taosdump、taosBenchmark、TDinsight 安装脚本和示例代码；如果您只需要用到服务端程序和客户端连接的 C/C++ 语言支持，也可以仅下载 Lite 版本的安装包。 From 23f5374975a464bbe3dda53fd4d10fbed951c8ef Mon Sep 17 00:00:00 2001 From: Shengliang Guan Date: Wed, 18 Dec 2024 21:02:19 +0800 Subject: [PATCH 14/14] merge: set git tags --- cmake/taosadapter_CMakeLists.txt.in | 2 +- cmake/taostools_CMakeLists.txt.in | 2 +- cmake/taosws_CMakeLists.txt.in | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmake/taosadapter_CMakeLists.txt.in b/cmake/taosadapter_CMakeLists.txt.in index 13826a1a74..ef6ed4af1d 100644 --- a/cmake/taosadapter_CMakeLists.txt.in +++ b/cmake/taosadapter_CMakeLists.txt.in @@ -2,7 +2,7 @@ # taosadapter ExternalProject_Add(taosadapter GIT_REPOSITORY https://github.com/taosdata/taosadapter.git - GIT_TAG main + GIT_TAG 3.0 SOURCE_DIR "${TD_SOURCE_DIR}/tools/taosadapter" BINARY_DIR "" #BUILD_IN_SOURCE TRUE diff --git a/cmake/taostools_CMakeLists.txt.in b/cmake/taostools_CMakeLists.txt.in index 9bbda8309f..9a6a5329ae 100644 --- a/cmake/taostools_CMakeLists.txt.in +++ b/cmake/taostools_CMakeLists.txt.in @@ -2,7 +2,7 @@ # taos-tools ExternalProject_Add(taos-tools GIT_REPOSITORY https://github.com/taosdata/taos-tools.git - GIT_TAG main + GIT_TAG 3.0 SOURCE_DIR "${TD_SOURCE_DIR}/tools/taos-tools" BINARY_DIR "" #BUILD_IN_SOURCE TRUE diff --git a/cmake/taosws_CMakeLists.txt.in b/cmake/taosws_CMakeLists.txt.in index b013d45911..17446d184d 100644 --- a/cmake/taosws_CMakeLists.txt.in +++ b/cmake/taosws_CMakeLists.txt.in @@ -2,7 +2,7 @@ # taosws-rs ExternalProject_Add(taosws-rs GIT_REPOSITORY https://github.com/taosdata/taos-connector-rust.git - GIT_TAG main + GIT_TAG 3.0 SOURCE_DIR "${TD_SOURCE_DIR}/tools/taosws-rs" BINARY_DIR "" #BUILD_IN_SOURCE TRUE