From 8223aa416f3af774cf1f93a6bc231680d1fc5178 Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Mon, 10 May 2021 11:15:52 +0800
Subject: [PATCH] [td-4038]<feature>: support column data batch bind.

---
 src/client/inc/tsclient.h   |  3 +--
 src/client/src/tscPrepare.c | 52 +++++++++----------------------------
 2 files changed, 13 insertions(+), 42 deletions(-)

diff --git a/src/client/inc/tsclient.h b/src/client/inc/tsclient.h
index 73b0172e85..ce44d4ab83 100644
--- a/src/client/inc/tsclient.h
+++ b/src/client/inc/tsclient.h
@@ -154,13 +154,12 @@ typedef struct STagCond {
 
 typedef struct SParamInfo {
   int32_t  idx;
-  char     type;
+  uint8_t  type;
   uint8_t  timePrec;
   int16_t  bytes;
   uint32_t offset;
 } SParamInfo;
 
-
 typedef struct SBoundColumn {
   bool    hasVal;  // denote if current column has bound or not
   int32_t offset;  // all column offset value
diff --git a/src/client/src/tscPrepare.c b/src/client/src/tscPrepare.c
index 90023f9ded..23dcff276d 100644
--- a/src/client/src/tscPrepare.c
+++ b/src/client/src/tscPrepare.c
@@ -717,45 +717,14 @@ static int doBindParam(STableDataBlocks* pBlock, char* data, SParamInfo* param,
 
 
 static int doBindBatchParam(STableDataBlocks* pBlock, SParamInfo* param, TAOS_MULTI_BIND* bind, int32_t rowNum) {
-  if (bind->buffer_type != param->type) {
+  if (bind->buffer_type != param->type || !isValidDataType(param->type)) {
     return TSDB_CODE_TSC_INVALID_VALUE;
   }
 
-  short size = 0;
-  switch(param->type) {
-    case TSDB_DATA_TYPE_BOOL:
-    case TSDB_DATA_TYPE_TINYINT:
-      size = 1;
-      break;
-  
-    case TSDB_DATA_TYPE_SMALLINT:
-      size = 2;
-      break;
-  
-    case TSDB_DATA_TYPE_INT:
-    case TSDB_DATA_TYPE_FLOAT:
-      size = 4;
-      break;
-  
-    case TSDB_DATA_TYPE_BIGINT:
-    case TSDB_DATA_TYPE_DOUBLE:
-    case TSDB_DATA_TYPE_TIMESTAMP:
-      size = 8;
-      break;
-  
-    case TSDB_DATA_TYPE_BINARY:
-    case TSDB_DATA_TYPE_NCHAR: 
-      if (bind->length == NULL) {
-        tscError("BINARY/NCHAR no length");
-        return TSDB_CODE_TSC_INVALID_VALUE;
-      }
-      break;
-      
-    default:
-      assert(false);
-      return TSDB_CODE_TSC_INVALID_VALUE;
+  if (IS_VAR_DATA_TYPE(param->type) && bind->length == NULL) {
+    tscError("BINARY/NCHAR no length");
+    return TSDB_CODE_TSC_INVALID_VALUE;
   }
-  
 
   for (int i = 0; i < bind->num; ++i) {
     char* data = pBlock->pData + sizeof(SSubmitBlk) + pBlock->rowSize * (rowNum + i);
@@ -765,8 +734,8 @@ static int doBindBatchParam(STableDataBlocks* pBlock, SParamInfo* param, TAOS_MU
       continue;
     }
 
-    if (size > 0) {
-      memcpy(data + param->offset, bind->buffer + bind->buffer_length * i, size);
+    if (!IS_VAR_DATA_TYPE(param->type)) {
+      memcpy(data + param->offset, bind->buffer + bind->buffer_length * i, tDataTypes[param->type].bytes);
       
       if (param->offset == 0) {
         if (tsCheckTimestamp(pBlock, data + param->offset) != TSDB_CODE_SUCCESS) {
@@ -776,12 +745,17 @@ static int doBindBatchParam(STableDataBlocks* pBlock, SParamInfo* param, TAOS_MU
       }
     } else if (param->type == TSDB_DATA_TYPE_BINARY) {
       if (bind->length[i] > (uintptr_t)param->bytes) {
-        tscError("binary length too long, ignore it, expect:%d, actual:%d", param->bytes, (int32_t)bind->length[i]);
+        tscError("binary length too long, ignore it, max:%d, actual:%d", param->bytes, (int32_t)bind->length[i]);
         return TSDB_CODE_TSC_INVALID_VALUE;
       }
       int16_t bsize = (short)bind->length[i];
       STR_WITH_SIZE_TO_VARSTR(data + param->offset, bind->buffer + bind->buffer_length * i, bsize);
     } else if (param->type == TSDB_DATA_TYPE_NCHAR) {
+      if (bind->length[i] > (uintptr_t)param->bytes) {
+        tscError("nchar string length too long, ignore it, max:%d, actual:%d", param->bytes, (int32_t)bind->length[i]);
+        return TSDB_CODE_TSC_INVALID_VALUE;
+      }
+
       int32_t output = 0;
       if (!taosMbsToUcs4(bind->buffer + bind->buffer_length * i, bind->length[i], varDataVal(data + param->offset), param->bytes - VARSTR_HEADER_SIZE, &output)) {
         tscError("convert nchar string to UCS4_LE failed:%s", (char*)(bind->buffer + bind->buffer_length * i));
@@ -795,8 +769,6 @@ static int doBindBatchParam(STableDataBlocks* pBlock, SParamInfo* param, TAOS_MU
   return TSDB_CODE_SUCCESS;
 }
 
-
-
 static int insertStmtBindParam(STscStmt* stmt, TAOS_BIND* bind) {
   SSqlCmd* pCmd = &stmt->pSql->cmd;
   STscStmt* pStmt = (STscStmt*)stmt;
-- 
GitLab