From 996a041cb2ea47fcb96a996ad9fe9294a95ddc1e Mon Sep 17 00:00:00 2001
From: dapan1121 <wpan@taosdata.com>
Date: Sat, 28 May 2022 13:30:35 +0800
Subject: [PATCH] fix stmt bind binary/nchar issue

---
 source/libs/catalog/src/ctgDbg.c | 13 +++++++++++++
 source/libs/parser/src/parser.c  |  3 ++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/source/libs/catalog/src/ctgDbg.c b/source/libs/catalog/src/ctgDbg.c
index 849c66fd12..fdab50db0f 100644
--- a/source/libs/catalog/src/ctgDbg.c
+++ b/source/libs/catalog/src/ctgDbg.c
@@ -71,6 +71,16 @@ void ctgdUserCallback(SMetaData* pResult, void* param, int32_t code) {
     qDebug("empty db vgroup");
   }
 
+  if (pResult->pDbInfo && taosArrayGetSize(pResult->pDbInfo) > 0) {
+    num = taosArrayGetSize(pResult->pDbInfo);
+    for (int32_t i = 0; i < num; ++i) {
+      SDbInfo *pDb = taosArrayGet(pResult->pDbInfo, i);
+      qDebug("db %d dbInfo: vgVer:%d, tbNum:%d, dbId:%" PRIx64, i, pDb->vgVer, pDb->tbNum, pDb->dbId);
+    }
+  } else {
+    qDebug("empty db info");
+  }
+
   if (pResult->pTableHash && taosArrayGetSize(pResult->pTableHash) > 0) {
     num = taosArrayGetSize(pResult->pTableHash);
     for (int32_t i = 0; i < num; ++i) {
@@ -127,6 +137,7 @@ int32_t ctgdLaunchAsyncCall(SCatalog* pCtg, void *pTrans, const SEpSet* pMgmtEps
   SCatalogReq req = {0};
   req.pTableMeta = taosArrayInit(2, sizeof(SName));
   req.pDbVgroup = taosArrayInit(2, TSDB_DB_FNAME_LEN);
+  req.pDbInfo = taosArrayInit(2, TSDB_DB_FNAME_LEN);
   req.pTableHash = taosArrayInit(2, sizeof(SName));
   req.pUdf = taosArrayInit(2, TSDB_FUNC_NAME_LEN);
   req.pDbCfg = taosArrayInit(2, TSDB_DB_FNAME_LEN);
@@ -149,9 +160,11 @@ int32_t ctgdLaunchAsyncCall(SCatalog* pCtg, void *pTrans, const SEpSet* pMgmtEps
   strcpy(dbFName, "1.db1");
   taosArrayPush(req.pDbVgroup, dbFName);
   taosArrayPush(req.pDbCfg, dbFName);
+  taosArrayPush(req.pDbInfo, dbFName);
   strcpy(dbFName, "1.db2");
   taosArrayPush(req.pDbVgroup, dbFName);
   taosArrayPush(req.pDbCfg, dbFName);
+  taosArrayPush(req.pDbInfo, dbFName);
 
   strcpy(funcName, "udf1");
   taosArrayPush(req.pUdf, funcName);
diff --git a/source/libs/parser/src/parser.c b/source/libs/parser/src/parser.c
index a9962b0444..a0d944341a 100644
--- a/source/libs/parser/src/parser.c
+++ b/source/libs/parser/src/parser.c
@@ -98,6 +98,7 @@ static int32_t setValueByBindParam(SValueNode* pVal, TAOS_MULTI_BIND* pParam) {
       }
       varDataSetLen(pVal->datum.p, pVal->node.resType.bytes);
       strncpy(varDataVal(pVal->datum.p), (const char*)pParam->buffer, pVal->node.resType.bytes);
+      pVal->node.resType.bytes += VARSTR_HEADER_SIZE;
       break;
     case TSDB_DATA_TYPE_NCHAR: {
       pVal->node.resType.bytes *= TSDB_NCHAR_SIZE;
@@ -112,7 +113,7 @@ static int32_t setValueByBindParam(SValueNode* pVal, TAOS_MULTI_BIND* pParam) {
         return errno;
       }
       varDataSetLen(pVal->datum.p, output);
-      pVal->node.resType.bytes = output;
+      pVal->node.resType.bytes = output + VARSTR_HEADER_SIZE;
       break;
     }
     case TSDB_DATA_TYPE_TIMESTAMP:
-- 
GitLab