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

fix TD-33665

This commit is contained in:
pengrongkun94@qq.com 2025-02-10 19:20:32 +08:00
parent 86c513ebc0
commit baec572537
2 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/client/src/clientStmt2.c
View File

@ -364,6 +364,9 @@ static int32_t stmtCleanExecInfo(STscStmt2* pStmt, bool keepTable, bool deepClea
pStmt->sql.siInfo.pTableColsIdx = 0; pStmt->sql.siInfo.pTableColsIdx = 0;
stmtResetQueueTableBuf(&pStmt->sql.siInfo.tbBuf, &pStmt->queue); stmtResetQueueTableBuf(&pStmt->sql.siInfo.tbBuf, &pStmt->queue);
} }
if (NULL != pStmt->exec.pRequest) {
pStmt->exec.pRequest->body.resInfo.numOfRows = 0;
}
} else { } else {
if (STMT_TYPE_QUERY != pStmt->sql.type || deepClean) { if (STMT_TYPE_QUERY != pStmt->sql.type || deepClean) {
// if (!pStmt->options.asyncExecFn) { // if (!pStmt->options.asyncExecFn) {

27
source/client/test/stmt2Test.cpp
View File

@ -47,8 +47,14 @@ void checkError(TAOS_STMT2* stmt, int code) {
} }
} }
typedef struct AsyncArgs {
int async_affected_rows;
tsem_t sem;
} AsyncArgs;
void stmtAsyncQueryCb(void* param, TAOS_RES* pRes, int code) { void stmtAsyncQueryCb(void* param, TAOS_RES* pRes, int code) {
int affected_rows = taos_affected_rows(pRes); ((AsyncArgs*)param)->async_affected_rows = taos_affected_rows(pRes);
ASSERT_EQ(tsem_post(&((AsyncArgs*)param)->sem), TSDB_CODE_SUCCESS);
return; return;
} }
@ -199,7 +205,14 @@ void do_stmt(TAOS* taos, TAOS_STMT2_OPTION* option, const char* sql, int CTB_NUM
// exec // exec
int affected = 0; int affected = 0;
code = taos_stmt2_exec(stmt, &affected); code = taos_stmt2_exec(stmt, &affected);
if (option->asyncExecFn == NULL) {
total_affected += affected; total_affected += affected;
} else {
AsyncArgs* params = (AsyncArgs*)option->userdata;
code = tsem_wait(&params->sem);
ASSERT_EQ(code, TSDB_CODE_SUCCESS);
total_affected += params->async_affected_rows;
}
checkError(stmt, code); checkError(stmt, code);
for (int i = 0; i < CTB_NUMS; i++) { for (int i = 0; i < CTB_NUMS; i++) {
@ -219,9 +232,7 @@ void do_stmt(TAOS* taos, TAOS_STMT2_OPTION* option, const char* sql, int CTB_NUM
taosMemoryFree(tags); taosMemoryFree(tags);
} }
} }
if (option->asyncExecFn == NULL) {
ASSERT_EQ(total_affected, CYC_NUMS * ROW_NUMS * CTB_NUMS); ASSERT_EQ(total_affected, CYC_NUMS * ROW_NUMS * CTB_NUMS);
}
for (int i = 0; i < CTB_NUMS; i++) { for (int i = 0; i < CTB_NUMS; i++) {
taosMemoryFree(tbs[i]); taosMemoryFree(tbs[i]);
} }
@ -908,7 +919,11 @@ TEST(stmt2Case, stmt2_stb_insert) {
} }
// async // async
option = {0, true, true, stmtAsyncQueryCb, NULL}; AsyncArgs* aa = (AsyncArgs*)taosMemMalloc(sizeof(AsyncArgs));
aa->async_affected_rows = 0;
ASSERT_EQ(tsem_init(&aa->sem, 0, 0), TSDB_CODE_SUCCESS);
void* param = aa;
option = {0, true, true, stmtAsyncQueryCb, param};
{ {
do_stmt(taos, &option, "insert into stmt2_testdb_1.stb (ts,b,tbname,t1,t2) values(?,?,?,?,?)", 3, 3, 3, true, true); do_stmt(taos, &option, "insert into stmt2_testdb_1.stb (ts,b,tbname,t1,t2) values(?,?,?,?,?)", 3, 3, 3, true, true);
} }
@ -926,12 +941,14 @@ TEST(stmt2Case, stmt2_stb_insert) {
{ do_stmt(taos, &option, "insert into ? values(?,?)", 3, 3, 3, false, true); } { do_stmt(taos, &option, "insert into ? values(?,?)", 3, 3, 3, false, true); }
// interlace = 1 // interlace = 1
option = {0, true, true, stmtAsyncQueryCb, NULL}; option = {0, true, true, stmtAsyncQueryCb, param};
{ do_stmt(taos, &option, "insert into ? values(?,?)", 3, 3, 3, false, true); } { do_stmt(taos, &option, "insert into ? values(?,?)", 3, 3, 3, false, true); }
option = {0, true, true, NULL, NULL}; option = {0, true, true, NULL, NULL};
{ do_stmt(taos, &option, "insert into ? values(?,?)", 3, 3, 3, false, true); } { do_stmt(taos, &option, "insert into ? values(?,?)", 3, 3, 3, false, true); }
do_query(taos, "drop database if exists stmt2_testdb_1"); do_query(taos, "drop database if exists stmt2_testdb_1");
(void)tsem_destroy(&aa->sem);
taosMemFree(aa);
taos_close(taos); taos_close(taos);
} }