[td-225] fix bugs for data bind insert

src/client/src/tscParseInsert.c

@@ -305,10 +305,8 @@ int32_t tsParseOneColumnData(SSchema *pSchema, SSQLToken *pToken, char *payload,
     case TSDB_DATA_TYPE_BINARY:
       // binary data cannot be null-terminated char string, otherwise the last char of the string is lost
       if (pToken->type == TK_NULL) {
-        *(int16_t*) payload = sizeof(int8_t);
+        varDataSetLen(payload, sizeof(int8_t));
-        payload += VARSTR_HEADER_SIZE;
+        *(uint8_t*) varDataVal(payload) = TSDB_DATA_BINARY_NULL;
-        
-        *payload = TSDB_DATA_BINARY_NULL;
       } else { // too long values will return invalid sql, not be truncated automatically
         if (pToken->n + VARSTR_HEADER_SIZE > pSchema->bytes) { //todo refactor
           return tscInvalidSQLErrMsg(msg, "string data overflow", pToken->z);
@@ -321,22 +319,18 @@ int32_t tsParseOneColumnData(SSchema *pSchema, SSQLToken *pToken, char *payload,
 
     case TSDB_DATA_TYPE_NCHAR:
       if (pToken->type == TK_NULL) {
-        *(int16_t*) payload = sizeof(int32_t);
+        varDataSetLen(payload, sizeof(int32_t));
-        payload += VARSTR_HEADER_SIZE;
+        *(uint32_t*) varDataVal(payload) = TSDB_DATA_NCHAR_NULL;
-  
-        *(uint32_t*) payload = TSDB_DATA_NCHAR_NULL;
       } else {
         // if the converted output len is over than pColumnModel->bytes, return error: 'Argument list too long'
-        size_t wcharLength = 0;
+        size_t output = 0;
-        if (!taosMbsToUcs4(pToken->z, pToken->n, payload + VARSTR_HEADER_SIZE, pSchema->bytes - VARSTR_HEADER_SIZE,
+        if (!taosMbsToUcs4(pToken->z, pToken->n, varDataVal(payload), pSchema->bytes - VARSTR_HEADER_SIZE, &output)) {
-            &wcharLength)) {
-          
           char buf[512] = {0};
           snprintf(buf, tListLen(buf), "%s", strerror(errno));
           return tscInvalidSQLErrMsg(msg, buf, pToken->z);
         }
         
-        *(uint16_t*) payload = (uint16_t) (wcharLength);
+        varDataSetLen(payload, output);
       }
       break;
 
@@ -480,8 +474,17 @@ int tsParseOneRowData(char **str, STableDataBlocks *pDataBlocks, SSchema schema[
     char *ptr = payload;
 
     for (int32_t i = 0; i < spd->numOfCols; ++i) {
+      
       if (!spd->hasVal[i]) {  // current column do not have any value to insert, set it to null
-        setNull(ptr, schema[i].type, schema[i].bytes);
+        if (schema[i].type == TSDB_DATA_TYPE_BINARY) {
+          varDataSetLen(ptr, sizeof(int8_t));
+          *(uint8_t*) varDataVal(ptr) = TSDB_DATA_BINARY_NULL;
+        } else if (schema[i].type == TSDB_DATA_TYPE_NCHAR) {
+          varDataSetLen(ptr, sizeof(int32_t));
+          *(uint32_t*) varDataVal(ptr) = TSDB_DATA_NCHAR_NULL;
+        } else {
+          setNull(ptr, schema[i].type, schema[i].bytes);
+        }
       }
       
       ptr += schema[i].bytes;
@@ -1288,6 +1291,7 @@ int tsParseInsertSql(SSqlObj *pSql) {
 
   pCmd->count = 0;
   pCmd->command = TSDB_SQL_INSERT;
+  pSql->res.numOfRows = 0;
 
   SQueryInfo *pQueryInfo = NULL;
   tscGetQueryInfoDetailSafely(pCmd, pCmd->clauseIndex, &pQueryInfo);
@@ -1300,7 +1304,6 @@ int tsParseInsertSql(SSqlObj *pSql) {
     return tscInvalidSQLErrMsg(pCmd->payload, "keyword INTO is expected", sToken.z);
   }
 
-  pSql->res.numOfRows = 0;
   return doParseInsertSql(pSql, pSql->sqlstr + index);
 }
 

src/client/src/tscServer.c

@@ -2419,7 +2419,7 @@ static int32_t getTableMetaFromMgmt(SSqlObj *pSql, STableMetaInfo *pTableMetaInf
 
   strncpy(pNewMeterMetaInfo->name, pTableMetaInfo->name, tListLen(pNewMeterMetaInfo->name));
   memcpy(pNew->cmd.payload, pSql->cmd.payload, TSDB_DEFAULT_PAYLOAD_SIZE);  // tag information if table does not exists.
-  tscTrace("%p new pSqlObj:%p to get tableMeta", pSql, pNew);
+  tscTrace("%p new pSqlObj:%p to get tableMeta, auto create:%d", pSql, pNew, pNew->cmd.autoCreated);
 
   pNew->fp = tscTableMetaCallBack;
   pNew->param = pSql;

src/client/src/tscSubquery.c

@@ -2024,7 +2024,6 @@ void **doSetResultRowData(SSqlObj *pSql, bool finalResult) {
       tExprTreeCalcTraverse(pRes->pArithSup->pArithExpr->pExpr, 1, pRes->buffer[i], pRes->pArithSup,
           TSDB_ORDER_ASC, getArithemicInputSrc);
       pRes->tsrow[i] = pRes->buffer[i];
-//      free(sas); //todo optimization
     }
   }
   

src/client/src/tscUtil.c

@@ -357,6 +357,7 @@ void tscResetSqlCmdObj(SSqlCmd* pCmd) {
   pCmd->curSql    = NULL;
   pCmd->msgType   = 0;
   pCmd->parseFinished = 0;
+  pCmd->autoCreated = 0;
   
   taosHashCleanup(pCmd->pTableList);
   pCmd->pTableList = NULL;

src/common/inc/tdataformat.h

@@ -28,16 +28,16 @@ extern "C" {
 
 #define STR_TO_VARSTR(x, str) do {VarDataLenT __len = strlen(str); \
   *(VarDataLenT*)(x) = __len; \
-  strncpy((char*)(x) + VARSTR_HEADER_SIZE, (str), __len);} while(0);
+  strncpy(varDataVal(x), (str), __len);} while(0);
 
 #define STR_WITH_MAXSIZE_TO_VARSTR(x, str, _maxs) do {\
-  char* _e = stpncpy((char*)(x) + VARSTR_HEADER_SIZE, (str), (_maxs));\
+  char* _e = stpncpy(varDataVal(x), (str), (_maxs));\
-  *(VarDataLenT*)(x) = (_e - (x) - VARSTR_HEADER_SIZE);\
+  varDataSetLen(x, (_e - (x) - VARSTR_HEADER_SIZE));\
 } while(0)
 
 #define STR_WITH_SIZE_TO_VARSTR(x, str, _size) do {\
   *(VarDataLenT*)(x) = (_size); \
-  strncpy((char*)(x) + VARSTR_HEADER_SIZE, (str), (_size));\
+  strncpy(varDataVal(x), (str), (_size));\
 } while(0);
 
 // ----------------- TSDB COLUMN DEFINITION

src/inc/taosdef.h

@@ -40,9 +40,10 @@ typedef int16_t VarDataLenT;
 
 #define varDataLen(v)       ((VarDataLenT *)(v))[0]
 #define varDataTLen(v)      (sizeof(VarDataLenT) + varDataLen(v))
-#define varDataVal(v)       ((void *)((char *)v + sizeof(VarDataLenT)))
+#define varDataVal(v)       ((void *)((char *)v + VARSTR_HEADER_SIZE))
 #define varDataCopy(dst, v) memcpy((dst), (void*) (v), varDataTLen(v))
 #define varDataLenByData(v) (*(VarDataLenT *)(((char*)(v)) - VARSTR_HEADER_SIZE))
+#define varDataSetLen(v, _len) (((VarDataLenT *)(v))[0] = (VarDataLenT) (_len))
 
 // this data type is internally used only in 'in' query to hold the values
 #define TSDB_DATA_TYPE_ARRAY      (TSDB_DATA_TYPE_NCHAR + 1)

src/query/src/qtokenizer.c

@@ -268,11 +268,13 @@ int tSQLKeywordCode(const char* z, int n) {
   pthread_once(&keywordsHashTableInit, doInitKeywordsTable);
   
   char key[512] = {0};
-  assert(tListLen(key) >= n);
+  if (n > tListLen(key)) { // too long token, can not be any other token type
+    return TK_ID;
+  }
   
   for (int32_t j = 0; j < n; ++j) {
     if (z[j] >= 'a' && z[j] <= 'z') {
-      key[j] = (char)(z[j] & 0xDF);  // touppercase and set the null-terminated
+      key[j] = (char)(z[j] & 0xDF);  // to uppercase and set the null-terminated
     } else {
       key[j] = z[j];
     }

tests/script/general/parser/create_mt.sim

@@ -172,8 +172,8 @@ sql create table $tb using $mt tags (-1)
 # -x ng_tag_v
 #  return -1
 #ng_tag_v:
-sql describe $tb
+sql select tg from $tb
-if $data23 != -1 then 
+if $data00 != -1 then
   return -1
 endi
 sql drop table $tb
@@ -182,9 +182,9 @@ sql drop table $tb
 print create_mt.sim unmatched_tag_types
 sql reset query cache
 sql create table $tb using $mt tags ('123')
-sql describe $tb
+sql select tg from  $tb
-#print data23 = $data23
+print data00 = $data00
-if $data23 != 123 then
+if $data00 != 123 then
   return -1
 endi
 sql drop table $tb
@@ -194,14 +194,14 @@ sql_error create table $tb using $mt tags ('abc')
 sql drop table if exists $tb
 sql reset query cache
 sql create table $tb using $mt tags (1e1)
-sql describe $tb
+sql select tg from  $tb
-if $data23 != 10 then
+if $data00 != 10 then
   return -1
 endi
 sql drop table $tb
 sql create table $tb using $mt tags ('1e1')
-sql describe $tb
+sql select tg from  $tb
-if $data23 != 10 then
+if $data00 != 10 then
   return -1
 endi
 sql_error create table $tb using $mt tags (2147483649)
@@ -234,13 +234,13 @@ $mt2 = mt2
 #if $data20 != $mt2 then
 #  return -1
 #endi
-#sql describe $mt1
+#sql select tg from  $mt1
 ##print expected $CN_char
 ##print returned $data10
 #if $data10 != $CN_char then
 #  return -1
 #endi
-#sql describe $mt2
+#sql select tg from  $mt2
 ##print expected: $CN_char
 ##print returned: $data20
 #if $data20 != $CN_char then

tests/script/general/parser/create_tb.sim

@@ -172,7 +172,7 @@ print ========== create_tb.sim case7: table_name_length_exceeds_limit
 $tbname32 = _32_aaaabbbbccccddddaaaabbbbcccc
 $tbname64 = _64_aaaabbbbccccddddaaaabbbbccccddddaaaabbbbccccddddaaaabbbbcccc
 $tbname63 = _63_aaaabbbbccccddddaaaabbbbccccddddaaaabbbbccccddddaaaabbbbccc
-$tbname65 = _65_aaaabbbbccccddddaaaabbbbccccddddaaaabbbbccccddddaaaabbbbcccca
+$tbname65 = _65_aaaabbbbccccddddaaaabbbbccccddddaaaabbbbccccddddaaaabbbbcccca1111111111111111111111111111111111aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 sql create table $tbname32 (ts timestamp, col int)
 sql insert into $tbname32 values (now, 1)
 sql create table $tbname64 (ts timestamp, col int)