Merge branch 'feat/TS-1883-2.6' of github.com:taosdata/TDengine into feat/TS-1883-2.6

src/common/inc/tdataformat.h

@@ -121,7 +121,7 @@ typedef struct {
 int       tdInitTSchemaBuilder(STSchemaBuilder *pBuilder, int32_t version);
 void      tdDestroyTSchemaBuilder(STSchemaBuilder *pBuilder);
 void      tdResetTSchemaBuilder(STSchemaBuilder *pBuilder, int32_t version);
-int       tdAddColToSchema(STSchemaBuilder *pBuilder, int8_t type, int16_t colId, int16_t bytes);
+int       tdAddColToSchema(STSchemaBuilder *pBuilder, int8_t type, int16_t colId, uint16_t bytes);
 STSchema *tdGetSchemaFromBuilder(STSchemaBuilder *pBuilder);
 
 // ----------------- Semantic timestamp key definition
@@ -262,9 +262,9 @@ static FORCE_INLINE bool tdIsColOfRowNullBySchema(SDataRow row, STSchema *pSchem
 }
 
 static FORCE_INLINE void tdSetColOfRowNullBySchema(SDataRow row, STSchema *pSchema, int idx) {
-  int16_t offset = TD_DATA_ROW_HEAD_SIZE + pSchema->columns[idx].offset;
-  int8_t type = pSchema->columns[idx].type;
-  int16_t bytes = pSchema->columns[idx].bytes;
+  uint16_t offset = TD_DATA_ROW_HEAD_SIZE + pSchema->columns[idx].offset;
+  int8_t   type = pSchema->columns[idx].type;
+  uint16_t bytes = pSchema->columns[idx].bytes;
 
   setNull(tdGetRowDataOfCol(row, type, offset), type, bytes);
 }

src/common/src/tdataformat.c

@@ -91,12 +91,12 @@ void *tdDecodeSchema(void *buf, STSchema **pRSchema) {
   if (tdInitTSchemaBuilder(&schemaBuilder, version) < 0) return NULL;
 
   for (int i = 0; i < numOfCols; i++) {
-    int8_t  type = 0;
-    int16_t colId = 0;
-    int16_t bytes = 0;
+    int8_t   type = 0;
+    int16_t  colId = 0;
+    uint16_t bytes = 0;
     buf = taosDecodeFixedI8(buf, &type);
     buf = taosDecodeFixedI16(buf, &colId);
-    buf = taosDecodeFixedI16(buf, &bytes);
+    buf = taosDecodeFixedU16(buf, &bytes);
     if (tdAddColToSchema(&schemaBuilder, type, colId, bytes) < 0) {
       tdDestroyTSchemaBuilder(&schemaBuilder);
       return NULL;
@@ -133,7 +133,7 @@ void tdResetTSchemaBuilder(STSchemaBuilder *pBuilder, int32_t version) {
   pBuilder->version = version;
 }
 
-int tdAddColToSchema(STSchemaBuilder *pBuilder, int8_t type, int16_t colId, int16_t bytes) {
+int tdAddColToSchema(STSchemaBuilder *pBuilder, int8_t type, int16_t colId, uint16_t bytes) {
   if (!isValidDataType(type)) return -1;
 
   if (pBuilder->nCols >= pBuilder->tCols) {

src/common/src/texpr.c

@@ -384,7 +384,7 @@ static uint8_t UNUSED_FUNC isQueryOnPrimaryKey(const char *primaryColumnName, co
   }
 }
 
-static void reverseCopy(char* dest, const char* src, int16_t type, int32_t numOfRows, int16_t colSize) {
+static void reverseCopy(char* dest, const char* src, int16_t type, int32_t numOfRows, uint16_t colSize) {
   switch(type) {
     case TSDB_DATA_TYPE_TINYINT:
     case TSDB_DATA_TYPE_UTINYINT:{
@@ -2054,7 +2054,7 @@ void vectorLength(int16_t functionId, tExprOperandInfo *pInputs, int32_t numInpu
   }
 }
 
-void castConvert(int16_t inputType, int16_t inputBytes, char *input, int16_t OutputType, int16_t outputBytes, char *output) {
+void castConvert(int16_t inputType, uint16_t inputBytes, char *input, int16_t OutputType, uint16_t outputBytes, char *output) {
   switch (OutputType) {
     case TSDB_DATA_TYPE_BIGINT:
       if (inputType == TSDB_DATA_TYPE_BINARY) {

src/common/src/tname.c

@@ -39,7 +39,7 @@ SSchema tGetUserSpecifiedColumnSchema(tVariant* pVal, SStrToken* exprStr, const
 
   s.type  = pVal->nType;
   if (s.type == TSDB_DATA_TYPE_BINARY || s.type == TSDB_DATA_TYPE_NCHAR) {
-    s.bytes = (int16_t)(pVal->nLen + VARSTR_HEADER_SIZE);
+    s.bytes = (uint16_t)(pVal->nLen + VARSTR_HEADER_SIZE);
   } else {
     s.bytes = tDataTypes[pVal->nType].bytes;
   }

src/inc/taosmsg.h

@@ -335,18 +335,18 @@ typedef struct {
 } SAlterTableMsg;
 
 typedef struct {
-  SMsgHead  head;
-  int8_t    extend;
-  int64_t   uid;
-  int32_t   tid;
-  int16_t   tversion;
-  int16_t   colId;
-  int8_t    type;
-  int16_t   bytes;
-  int32_t   tagValLen;
-  int16_t   numOfTags;
-  int32_t   schemaLen;
-  char      data[];
+  SMsgHead head;
+  int8_t   extend;
+  int64_t  uid;
+  int32_t  tid;
+  int16_t  tversion;
+  int16_t  colId;
+  int8_t   type;
+  uint16_t bytes;
+  int32_t  tagValLen;
+  int16_t  numOfTags;
+  int32_t  schemaLen;
+  char     data[];
 } SUpdateTableTagValMsg;
 
 typedef struct {

src/kit/shell/src/shellEngine.c

@@ -872,7 +872,7 @@ static int calcColWidth(TAOS_FIELD* field, int precision) {
 
     case TSDB_DATA_TYPE_NCHAR:
     case TSDB_DATA_TYPE_JSON:{
-      int16_t bytes = field->bytes * TSDB_NCHAR_SIZE;
+      int32_t bytes = field->bytes * TSDB_NCHAR_SIZE;
       if (bytes > tsMaxBinaryDisplayWidth) {
         return MAX(tsMaxBinaryDisplayWidth, width);
       } else {
@@ -1453,7 +1453,7 @@ TAOS_FIELD *wsclient_print_header(cJSON *query, int *pcols, int *pprecison) {
       for (int i = 0; i < (int)fields_count->valueint; i++) {
         strncpy(fields[i].name, cJSON_GetArrayItem(fields_names, i)->valuestring, 65);
         fields[i].type = (uint8_t)cJSON_GetArrayItem(fields_types, i)->valueint;
-        fields[i].bytes = (int16_t)cJSON_GetArrayItem(fields_lengths, i)->valueint;
+        fields[i].bytes = (uint16_t)cJSON_GetArrayItem(fields_lengths, i)->valueint;
       }
       cJSON *precision = cJSON_GetObjectItem(query, "precision");
       if (cJSON_IsNumber(precision)) {
@@ -1610,7 +1610,7 @@ void wsclient_query(char *command) {
                       cJSON *lengths = cJSON_GetObjectItem(fetch, "lengths");
                       if (cJSON_IsArray(lengths)) {
                         for (int i = 0; i < cols; i++) {
-                          fields[i].bytes = (int16_t)(cJSON_GetArrayItem(lengths, i)->valueint);
+                          fields[i].bytes = (uint16_t)(cJSON_GetArrayItem(lengths, i)->valueint);
                         }
                         if (showed_rows < DEFAULT_RES_SHOW_NUM) {
                           if (wsclient_send_sql(NULL, WS_FETCH_BLOCK, (int)id->valueint) == 0) {