fix: the issue that query processes get stuck when both dbname and tbname are set to ? in query statements executed via stmt2 (#33864)

Pengrongkun · web-flow · commit 65156bc25cd7 · 2025-12-10T09:06:31.000+08:00
* fix stmt2 query block

* fix review
diff --git a/source/client/src/clientStmt2.c b/source/client/src/clientStmt2.c
@@ -795,7 +795,7 @@ static void* stmtBindThreadFunc(void* param) {
   setThreadName("stmt2Bind");
 
   STscStmt2* pStmt = (STscStmt2*)param;
-  STMT2_ILOG_E("stmt2 bind thread started");
+  STMT2_DLOG_E("stmt2 bind thread started");
 
   while (true) {
     SStmtQNode* asyncParam = NULL;
@@ -811,7 +811,7 @@ static void* stmtBindThreadFunc(void* param) {
     stmtAsyncOutput(pStmt, asyncParam);
   }
 
-  STMT2_ILOG_E("stmt2 bind thread stopped");
+  STMT2_DLOG_E("stmt2 bind thread stopped");
   return NULL;
 }
 
@@ -2335,12 +2335,12 @@ int stmtClose2(TAOS_STMT2* stmt) {
     }
   }
 
-  STMT2_DLOG("stmt %p closed, stbInterlaceMode:%d, statInfo: ctgGetTbMetaNum=>%" PRId64 ", getCacheTbInfo=>%" PRId64
+  STMT2_DLOG("stbInterlaceMode:%d, statInfo: ctgGetTbMetaNum=>%" PRId64 ", getCacheTbInfo=>%" PRId64
              ", parseSqlNum=>%" PRId64 ", pStmt->stat.bindDataNum=>%" PRId64
              ", settbnameAPI:%u, bindAPI:%u, addbatchAPI:%u, execAPI:%u"
              ", setTbNameUs:%" PRId64 ", bindDataUs:%" PRId64 ",%" PRId64 ",%" PRId64 ",%" PRId64 " addBatchUs:%" PRId64
              ", execWaitUs:%" PRId64 ", execUseUs:%" PRId64,
-             pStmt, pStmt->sql.stbInterlaceMode, pStmt->stat.ctgGetTbMetaNum, pStmt->stat.getCacheTbInfo,
+             pStmt->sql.stbInterlaceMode, pStmt->stat.ctgGetTbMetaNum, pStmt->stat.getCacheTbInfo,
              pStmt->stat.parseSqlNum, pStmt->stat.bindDataNum, pStmt->seqIds[STMT_SETTBNAME], pStmt->seqIds[STMT_BIND],
              pStmt->seqIds[STMT_ADD_BATCH], pStmt->seqIds[STMT_EXECUTE], pStmt->stat.setTbNameUs,
              pStmt->stat.bindDataUs1, pStmt->stat.bindDataUs2, pStmt->stat.bindDataUs3, pStmt->stat.bindDataUs4,
@@ -2476,7 +2476,7 @@ int stmtGetParamNum2(TAOS_STMT2* stmt, int* nums) {
     STMT_ERRI_JRET(stmtFetchColFields2(stmt, nums, NULL));
   }
 
-  STMT2_TLOG("get param num success, nums:%d", *nums);
+  STMT2_DLOG("get param num success, nums:%d", *nums);
 
 _return:
 
diff --git a/source/client/test/stmt2Test.cpp b/source/client/test/stmt2Test.cpp
@@ -1842,7 +1842,7 @@ void asyncExec(void* param, TAOS_RES* res, int code) {
   return;
 }
 
-TEST(stmt2Case, stmt2_query) {
+TEST(stmt2Case, query) {
   TAOS* taos = taos_connect("localhost", "root", "taosdata", "", 0);
   ASSERT_NE(taos, nullptr);
   do_query(taos, "drop database if exists stmt2_testdb_7");
@@ -1931,6 +1931,8 @@ TEST(stmt2Case, stmt2_query) {
     AsyncArgs* aa = (AsyncArgs*)taosMemoryMalloc(sizeof(AsyncArgs));
     aa->async_affected_rows = 0;
     ASSERT_EQ(tsem_init(&aa->sem, 0, 0), TSDB_CODE_SUCCESS);
+    // int code = taos_stmt2_prepare(stmt, "select tbname,t2,b from stmt2_testdb_7.stb where ts = ? and tbname = ?", 0);
+    // checkError(stmt, code);
 
     TAOS_STMT2_OPTION option = {0, true, true, asyncExec, (void*)aa};
     TAOS_STMT2*       stmt = taos_stmt2_init(taos, &option);
@@ -1964,6 +1966,53 @@ TEST(stmt2Case, stmt2_query) {
     tsem_destroy(&aa->sem);
     taosMemoryFree(aa);
   }
+  {
+    AsyncArgs* aa = (AsyncArgs*)taosMemoryMalloc(sizeof(AsyncArgs));
+    aa->async_affected_rows = 0;
+    ASSERT_EQ(tsem_init(&aa->sem, 0, 0), TSDB_CODE_SUCCESS);
+
+    TAOS_STMT2_OPTION option = {0, true, true, stmtAsyncQueryCb, (void*)aa};
+
+    TAOS_STMT2* stmt = taos_stmt2_init(taos, &option);
+    ASSERT_NE(stmt, nullptr);
+
+    const char* sql =
+        "select table_name, db_name, stable_name from information_schema.ins_tables where 1 = 1 and table_name = ? and "
+        "db_name = ?";
+    int code = taos_stmt2_prepare(stmt, sql, 0);
+    checkError(stmt, code);
+
+    int             fieldNum = 0;
+    TAOS_FIELD_ALL* pFields = NULL;
+    code = taos_stmt2_get_fields(stmt, &fieldNum, &pFields);
+    checkError(stmt, code);
+    ASSERT_EQ(fieldNum, 2);
+
+    int              b_len = 3;
+    int              b_len2 = 14;
+    TAOS_STMT2_BIND  params[2] = {{TSDB_DATA_TYPE_BINARY, (void*)"tb1", &b_len, NULL, 1},
+                                  {TSDB_DATA_TYPE_BINARY, (void*)"stmt2_testdb_7", &b_len2, NULL, 1}};
+    TAOS_STMT2_BIND* paramv = &params[0];
+    TAOS_STMT2_BINDV bindv = {1, NULL, NULL, &paramv};
+    code = taos_stmt2_bind_param(stmt, &bindv, -1);
+    checkError(stmt, code);
+
+    taos_stmt2_exec(stmt, NULL);
+    checkError(stmt, code);
+
+    tsem_wait(&aa->sem);
+    tsem_destroy(&aa->sem);
+    taosMemoryFree(aa);
+
+    TAOS_RES* pRes = taos_stmt2_result(stmt);
+    ASSERT_NE(pRes, nullptr);
+    TAOS_ROW row = taos_fetch_row(pRes);
+    ASSERT_NE(row, nullptr);
+    ASSERT_EQ(strncmp((char*)row[0], "tb1", 3), 0);
+    ASSERT_EQ(strncmp((char*)row[1], "stmt2_testdb_7", 14), 0);
+    ASSERT_EQ(strncmp((char*)row[2], "stb", 3), 0);
+    taos_stmt2_close(stmt);
+  }
 
   do_query(taos, "drop database if exists stmt2_testdb_7");
   taos_close(taos);
diff --git a/source/libs/parser/src/parUtil.c b/source/libs/parser/src/parUtil.c
@@ -564,17 +564,65 @@ static int32_t getInsTagsTableTargetNameFromOp(int32_t acctId, SOperatorNode* pO
   } else if (QUERY_NODE_VALUE == nodeType(pOper->pRight)) {
     pVal = (SValueNode*)pOper->pRight;
   }
-  if (NULL == pCol || NULL == pVal || NULL == pVal->literal || 0 == strcmp(pVal->literal, "")) {
+  if (NULL == pCol || NULL == pVal) {
     return TSDB_CODE_SUCCESS;
   }
 
+  const char* valueStr = NULL;
+  int32_t     valueLen = 0;
+
+  if (pVal->placeholderNo != 0) {
+    if (NULL == pVal->datum.p) {
+      qError("getInsTagsTableTargetNameFromOp: placeholderNo=%d but datum.p is NULL, colName=%s, literal=%s",
+             pVal->placeholderNo, pCol->colName, pVal->literal ? pVal->literal : "NULL");
+      return TSDB_CODE_SUCCESS;
+    }
+
+    if (TSDB_DATA_TYPE_NCHAR == pVal->node.resType.type) {
+      int32_t ucs4Len = varDataLen(pVal->datum.p);
+      char*   tmp = taosMemoryCalloc(1, ucs4Len * TSDB_NCHAR_SIZE + 1);
+      if (NULL == tmp) {
+        return terrno;
+      }
+      int32_t output = taosUcs4ToMbs((TdUcs4*)varDataVal(pVal->datum.p), ucs4Len, tmp, NULL);
+      if (output < 0) {
+        taosMemoryFree(tmp);
+        return terrno;
+      }
+      valueStr = tmp;
+      valueLen = output;
+    } else if (IS_VAR_DATA_TYPE(pVal->node.resType.type)) {
+      valueStr = varDataVal(pVal->datum.p);
+      valueLen = varDataLen(pVal->datum.p);
+      qDebug("getInsTagsTableTargetNameFromOp: extracted VARCHAR value, len=%d, value=%.*s", valueLen, valueLen,
+             valueStr);
+    } else {
+      qError("getInsTagsTableTargetNameFromOp: unsupported data type %d for placeholder", pVal->node.resType.type);
+      return TSDB_CODE_INVALID_PARA;
+      ;
+    }
+  } else {
+    if (NULL == pVal->literal || 0 == strcmp(pVal->literal, "")) {
+      return TSDB_CODE_SUCCESS;
+    }
+    valueStr = pVal->literal;
+    valueLen = strlen(pVal->literal);
+  }
+
+  int32_t code = TSDB_CODE_SUCCESS;
+  bool    needFree = (pVal->placeholderNo != 0 && TSDB_DATA_TYPE_NCHAR == pVal->node.resType.type);
+
   if (0 == strcmp(pCol->colName, "db_name")) {
-    return tNameSetDbName(pName, acctId, pVal->literal, strlen(pVal->literal));
+    code = tNameSetDbName(pName, acctId, valueStr, valueLen);
   } else if (0 == strcmp(pCol->colName, "table_name")) {
-    return tNameAddTbName(pName, pVal->literal, strlen(pVal->literal));
+    code = tNameAddTbName(pName, valueStr, valueLen);
   }
 
-  return TSDB_CODE_SUCCESS;
+  if (needFree) {
+    taosMemoryFree((char*)valueStr);
+  }
+
+  return code;
 }
 
 static int32_t getInsTagsTableTargetObjName(int32_t acctId, SNode* pNode, SName* pName) {
