TD-32797:fix array realloc problem

source/libs/parser/src/parInsertStmt.c

@@ -681,11 +681,25 @@ int32_t qBindStmtStbColsValue2(void* pBlock, SArray* pCols, TAOS_STMT2_BIND* bin
   int32_t         code = 0;
   int16_t         lastColId = -1;
   bool            colInOrder = true;
+  int             ncharColNums = 0;
 
   if (NULL == *pTSchema) {
     *pTSchema = tBuildTSchema(pSchema, pDataBlock->pMeta->tableInfo.numOfColumns, pDataBlock->pMeta->sversion);
   }
 
+  for (int c = 0; c < boundInfo->numOfBound; ++c) {
+    if (TSDB_DATA_TYPE_NCHAR == pSchema[boundInfo->pColIndex[c]].type) {
+      ncharColNums++;
+    }
+  }
+  if (ncharColNums > 0) {
+    ncharBinds = taosArrayInit(ncharColNums, sizeof(ncharBind));
+    if (!ncharBinds) {
+      code = terrno;
+      goto _return;
+    }
+  }
+
   for (int c = 0; c < boundInfo->numOfBound; ++c) {
     SSchema* pColSchema = &pSchema[boundInfo->pColIndex[c]];
     if (pColSchema->colId <= lastColId) {
@@ -710,13 +724,6 @@ int32_t qBindStmtStbColsValue2(void* pBlock, SArray* pCols, TAOS_STMT2_BIND* bin
       if (code) {
         goto _return;
       }
-      if (!ncharBinds) {
-        ncharBinds = taosArrayInit(1, sizeof(ncharBind));
-        if (!ncharBinds) {
-          code = terrno;
-          goto _return;
-        }
-      }
       if (!taosArrayPush(ncharBinds, &ncharBind)) {
         code = terrno;
         goto _return;

tests/script/api/stmt2-nchar.c

@@ -0,0 +1,273 @@
+// sample code to verify all TDengine API
+// to compile: gcc -o apitest apitest.c -ltaos
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include "taos.h"
+static int64_t count = 10000;
+
+int64_t genReqid() {
+  count += 100;
+  return count;
+}
+
+void stmtAsyncQueryCb(void* param, TAOS_RES* pRes, int code) {
+  int affected_rows = taos_affected_rows(pRes);
+  return;
+  /*
+  SSP_CB_PARAM* qParam = (SSP_CB_PARAM*)param;
+  if (code == 0 && pRes) {
+    if (qParam->fetch) {
+      taos_fetch_rows_a(pRes, sqAsyncFetchCb, param);
+    } else {
+      if (qParam->free) {
+        taos_free_result(pRes);
+      }
+      *qParam->end = 1;
+    }
+  } else {
+    sqError("select", taos_errstr(pRes));
+    *qParam->end = 1;
+    taos_free_result(pRes);
+  }
+  */
+}
+
+void veriry_stmt(TAOS* taos) {
+  TAOS_RES* result = taos_query(taos, "drop database if exists test;");
+  taos_free_result(result);
+  usleep(100000);
+  result = taos_query(taos, "create database test;");
+
+  int code = taos_errno(result);
+  if (code != 0) {
+    printf("\033[31mfailed to create database, reason:%s\033[0m\n", taos_errstr(result));
+    taos_free_result(result);
+    return;
+  }
+  taos_free_result(result);
+
+  usleep(100000);
+  taos_select_db(taos, "test");
+
+  // create table
+  /*
+  const char* sql =
+      "create table m1 (ts timestamp, b bool, v1 tinyint, v2 smallint, v4 int, v8 bigint, f4 float, f8 double, bin "
+      "binary(40), blob nchar(10))";
+  */
+  const char* sql =
+      "create table m1 (ts timestamp, blob2 nchar(10), blob nchar(10),blob3 nchar(10),blob4 nchar(10),blob5 "
+      "nchar(10))";
+  result = taos_query(taos, sql);
+  code = taos_errno(result);
+  if (code != 0) {
+    printf("\033[31mfailed to create table, reason:%s\033[0m\n", taos_errstr(result));
+    taos_free_result(result);
+    return;
+  }
+  taos_free_result(result);
+
+  // insert 10 records
+  struct {
+    int64_t ts[10];
+    char    blob[10][1];
+    char    blob2[10][1];
+    char    blob3[10][1];
+    char    blob4[10][1];
+    char    blob5[10][1];
+
+  } v;
+
+  int32_t* t64_len = malloc(sizeof(int32_t) * 10);
+  int32_t* blob_len = malloc(sizeof(int32_t) * 10);
+  int32_t* blob_len2 = malloc(sizeof(int32_t) * 10);
+  int32_t* blob_len3 = malloc(sizeof(int32_t) * 10);
+  int32_t* blob_len4 = malloc(sizeof(int32_t) * 10);
+  int32_t* blob_len5 = malloc(sizeof(int32_t) * 10);
+
+#include "time.h"
+  clock_t           start, end;
+  TAOS_STMT2_OPTION option = {0, true, true, stmtAsyncQueryCb, NULL};
+
+  start = clock();
+  TAOS_STMT2* stmt = taos_stmt2_init(taos, &option);
+  end = clock();
+  printf("init time:%f\n", (double)(end - start) / CLOCKS_PER_SEC);
+  // TAOS_MULTI_BIND params[10];
+  TAOS_STMT2_BIND params[10];
+  char            is_null[10] = {0};
+
+  params[0].buffer_type = TSDB_DATA_TYPE_TIMESTAMP;
+  // params[0].buffer_length = sizeof(v.ts[0]);
+  params[0].buffer = v.ts;
+  params[0].length = t64_len;
+  params[0].is_null = is_null;
+  params[0].num = 10;
+
+  params[1].buffer_type = TSDB_DATA_TYPE_NCHAR;
+  // params[8].buffer_length = sizeof(v.blob2[0]);
+  params[1].buffer = v.blob2;
+  params[1].length = blob_len2;
+  params[1].is_null = is_null;
+  params[1].num = 10;
+
+  params[2].buffer_type = TSDB_DATA_TYPE_NCHAR;
+  // params[9].buffer_length = sizeof(v.blob[0]);
+  params[2].buffer = v.blob3;
+  params[2].length = blob_len;
+  params[2].is_null = is_null;
+  params[2].num = 10;
+
+  params[3].buffer_type = TSDB_DATA_TYPE_NCHAR;
+  // params[9].buffer_length = sizeof(v.blob[0]);
+  params[3].buffer = v.blob4;
+  params[3].length = blob_len;
+  params[3].is_null = is_null;
+  params[3].num = 10;
+
+  params[4].buffer_type = TSDB_DATA_TYPE_NCHAR;
+  // params[9].buffer_length = sizeof(v.blob[0]);
+  params[4].buffer = v.blob;
+  params[4].length = blob_len;
+  params[4].is_null = is_null;
+  params[4].num = 10;
+
+  params[5].buffer_type = TSDB_DATA_TYPE_NCHAR;
+  // params[9].buffer_length = sizeof(v.blob[0]);
+  params[5].buffer = v.blob5;
+  params[5].length = blob_len;
+  params[5].is_null = is_null;
+  params[5].num = 10;
+
+  sql = "insert into ? (ts, blob2, blob, blob3, blob4, blob5) values(?,?,?,?,?,?)";
+  start = clock();
+  code = taos_stmt2_prepare(stmt, sql, 0);
+  end = clock();
+  printf("prepare time:%f\n", (double)(end - start) / CLOCKS_PER_SEC);
+  if (code != 0) {
+    printf("\033[31mfailed to execute taos_stmt_prepare. error:%s\033[0m\n", taos_stmt_errstr(stmt));
+    taos_stmt_close(stmt);
+    return;
+  }
+  /*
+  code = taos_stmt_set_tbname(stmt, "m1");
+  if (code != 0) {
+    printf("\033[31mfailed to execute taos_stmt_prepare. error:%s\033[0m\n", taos_stmt_errstr(stmt));
+    taos_stmt_close(stmt);
+    return;
+  }
+  */
+
+  int64_t ts = 1591060628000;
+  for (int i = 0; i < 10; ++i) {
+    is_null[i] = 0;
+
+    v.ts[i] = ts++;
+
+    v.blob[i][0] = 'a' + i;
+    v.blob2[i][0] = 'f' + i;
+    v.blob3[i][0] = 't' + i;
+    v.blob4[i][0] = 'A' + i;
+    v.blob5[i][0] = 'G' + i;
+
+    // v.blob2[i] = malloc(strlen("一二三四五六七十九八"));
+    // v.blob[i] = malloc(strlen("十九八七六五四三二一"));
+
+    // strcpy(v.blob2[i], "一二三四五六七十九八");
+    // strcpy(v.blob[i], "十九八七六五四三二一");
+
+    blob_len[i] = sizeof(char);
+    blob_len2[i] = sizeof(char);
+    blob_len3[i] = sizeof(char);
+    blob_len4[i] = sizeof(char);
+    blob_len5[i] = sizeof(char);
+  }
+
+  char*            tbname = "m1";
+  TAOS_STMT2_BIND* bind_cols[1] = {&params[0]};
+  TAOS_STMT2_BINDV bindv = {1, &tbname, NULL, &bind_cols[0]};
+  start = clock();
+  // taos_stmt2_bind_param(stmt, "m1", NULL, params, -1);
+  taos_stmt2_bind_param(stmt, &bindv, -1);
+  end = clock();
+  printf("bind time:%f\n", (double)(end - start) / CLOCKS_PER_SEC);
+  // taos_stmt_bind_param_batch(stmt, params);
+  // taos_stmt_add_batch(stmt);
+  /*
+  int param_count = -1;
+  code = taos_stmt2_param_count(stmt, &param_count);
+  if (code != 0) {
+    printf("\033[31mfailed to execute taos_stmt_param_count. error:%s\033[0m\n", taos_stmt_errstr(stmt));
+    taos_stmt_close(stmt);
+    return;
+  }
+  printf("param_count: %d\n", param_count);
+  */
+  TAOS_FIELD_E* fields = NULL;
+  int           field_count = -1;
+  start = clock();
+  code = taos_stmt2_get_fields(stmt, TAOS_FIELD_COL, &field_count, NULL);
+  end = clock();
+  printf("get fields time:%f\n", (double)(end - start) / CLOCKS_PER_SEC);
+  if (code != 0) {
+    printf("\033[31mfailed to execute taos_stmt_param_count. error:%s\033[0m\n", taos_stmt_errstr(stmt));
+    taos_stmt_close(stmt);
+    return;
+  }
+  printf("col field_count: %d\n", field_count);
+  start = clock();
+  taos_stmt2_free_fields(stmt, fields);
+  end = clock();
+  printf("free time:%f\n", (double)(end - start) / CLOCKS_PER_SEC);
+  /*
+  code = taos_stmt2_get_fields(stmt, TAOS_FIELD_TAG, &field_count, &fields);
+  if (code != 0) {
+    printf("\033[31mfailed to execute taos_stmt_param_count. error:%s\033[0m\n", taos_stmt_errstr(stmt));
+    taos_stmt_close(stmt);
+    return;
+  }
+  printf("tag field_count: %d\n", field_count);
+  taos_stmt2_free_fields(stmt, fields);
+  */
+  // if (taos_stmt_execute(stmt) != 0) {
+  start = clock();
+  // if (taos_stmt2_exec(stmt, NULL, stmtAsyncQueryCb, NULL) != 0) {
+  if (taos_stmt2_exec(stmt, NULL) != 0) {
+    printf("\033[31mfailed to execute insert statement.error:%s\033[0m\n", taos_stmt_errstr(stmt));
+    taos_stmt2_close(stmt);
+    return;
+  }
+  end = clock();
+  printf("exec time:%f\n", (double)(end - start) / CLOCKS_PER_SEC);
+
+  taos_stmt2_close(stmt);
+
+  free(blob_len);
+  free(blob_len2);
+  free(blob_len5);
+  free(blob_len3);
+  free(blob_len4);
+}
+
+int main(int argc, char* argv[]) {
+  const char* host = "127.0.0.1";
+  const char* user = "root";
+  const char* passwd = "taosdata";
+
+  taos_options(TSDB_OPTION_TIMEZONE, "GMT-8");
+  TAOS* taos = taos_connect(host, user, passwd, "", 0);
+  if (taos == NULL) {
+    printf("\033[31mfailed to connect to db, reason:%s\033[0m\n", taos_errstr(taos));
+    exit(1);
+  }
+
+  printf("*********  verify stmt query  **********\n");
+  veriry_stmt(taos);
+
+  printf("done\n");
+  taos_close(taos);
+  taos_cleanup();
+}

tests/script/api/stmt2.c

@@ -81,8 +81,8 @@ void veriry_stmt(TAOS* taos) {
     float   f4[10];
     double  f8[10];
     char    bin[10][40];
-    char    blob[10][80];
+    char    blob[10][1];
-    char    blob2[10][80];
+    char    blob2[10][1];
   } v;
 
   int32_t* t8_len = malloc(sizeof(int32_t) * 10);
@@ -218,8 +218,14 @@ void veriry_stmt(TAOS* taos) {
     for (int j = 0; j < sizeof(v.bin[0]); ++j) {
       v.bin[i][j] = (char)(i + '0');
     }
-    strcpy(v.blob2[i], "一二三四五六七十九八");
+    v.blob[i][0] = 'a' + i;
-    strcpy(v.blob[i], "一二三四五六七八九十");
+    v.blob2[i][0] = 'A' + i;
+
+    // v.blob2[i] = malloc(strlen("一二三四五六七十九八"));
+    // v.blob[i] = malloc(strlen("十九八七六五四三二一"));
+
+    // strcpy(v.blob2[i], "一二三四五六七十九八");
+    // strcpy(v.blob[i], "十九八七六五四三二一");
 
     t8_len[i] = sizeof(int8_t);
     t16_len[i] = sizeof(int16_t);
@@ -228,10 +234,9 @@ void veriry_stmt(TAOS* taos) {
     float_len[i] = sizeof(float);
     double_len[i] = sizeof(double);
     bin_len[i] = sizeof(v.bin[0]);
-    blob_len[i] = (int32_t)strlen(v.blob[i]);
+    blob_len[i] = sizeof(char);
-    blob_len2[i] = (int32_t)strlen(v.blob2[i]);
+    blob_len2[i] = sizeof(char);
   }
-
   char*            tbname = "m1";
   TAOS_STMT2_BIND* bind_cols[1] = {&params[0]};
   TAOS_STMT2_BINDV bindv = {1, &tbname, NULL, &bind_cols[0]};