support modify tag column length

src/client/src/tscSQLParser.c

@@ -5079,8 +5079,10 @@ int32_t setAlterTableInfo(SSqlObj* pSql, struct SSqlInfo* pInfo) {
   const char* msg18 = "primary timestamp column cannot be dropped";
   const char* msg19 = "invalid new tag name";
   const char* msg20 = "table is not super table";
-  const char* msg21 = "only binary/nchar column length could be altered";
-  const char* msg22 = "invalid column length";
+  const char* msg21 = "only binary/nchar column length could be modified";
+  const char* msg22 = "new column length should be bigger than old one";
+  const char* msg23 = "only column length coulbe be modified";
+  const char* msg24 = "invalid binary/nchar column length";
 
   int32_t code = TSDB_CODE_SUCCESS;
 
@@ -5111,8 +5113,8 @@ int32_t setAlterTableInfo(SSqlObj* pSql, struct SSqlInfo* pInfo) {
   }
 
   if (pAlterSQL->type == TSDB_ALTER_TABLE_ADD_TAG_COLUMN || pAlterSQL->type == TSDB_ALTER_TABLE_DROP_TAG_COLUMN ||
-      pAlterSQL->type == TSDB_ALTER_TABLE_CHANGE_TAG_COLUMN) {
-    if (UTIL_TABLE_IS_NORMAL_TABLE(pTableMetaInfo)) {
+      pAlterSQL->type == TSDB_ALTER_TABLE_CHANGE_TAG_COLUMN || pAlterSQL->type == TSDB_ALTER_TABLE_MODIFY_TAG_COLUMN) {
+    if (!UTIL_TABLE_IS_SUPER_TABLE(pTableMetaInfo)) {
       return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg3);
     }
   } else if ((pAlterSQL->type == TSDB_ALTER_TABLE_UPDATE_TAG_VAL) && (UTIL_TABLE_IS_SUPER_TABLE(pTableMetaInfo))) {
@@ -5334,14 +5336,18 @@ int32_t setAlterTableInfo(SSqlObj* pSql, struct SSqlInfo* pInfo) {
     TAOS_FIELD f = tscCreateField(TSDB_DATA_TYPE_INT, name1, tDataTypes[TSDB_DATA_TYPE_INT].bytes);
     tscFieldInfoAppend(&pQueryInfo->fieldsInfo, &f);
   } else if (pAlterSQL->type == TSDB_ALTER_TABLE_CHANGE_COLUMN) {
-    if (taosArrayGetSize(pAlterSQL->pAddColumns) != 2) {
-      return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), NULL);
+    if (taosArrayGetSize(pAlterSQL->pAddColumns) >= 2) {
+      return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg16);
     }
 
-    tVariantListItem* pItem = taosArrayGet(pAlterSQL->pAddColumns, 0);
+
+    TAOS_FIELD* pItem = taosArrayGet(pAlterSQL->pAddColumns, 0);
+    if (pItem->type != TSDB_DATA_TYPE_BINARY && pItem->type != TSDB_DATA_TYPE_NCHAR) {
+      return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg21);
+    }
     
     SColumnIndex columnIndex = COLUMN_INDEX_INITIALIZER;
-    SStrToken    name = {.type = TK_STRING, .z = pItem->pVar.pz, .n = pItem->pVar.nLen};
+    SStrToken    name = {.type = TK_STRING, .z = pItem->name, .n = strlen(pItem->name)};
     if (getColumnIndexByName(pCmd, &name, pQueryInfo, &columnIndex) != TSDB_CODE_SUCCESS) {
       return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg17);
     }
@@ -5352,14 +5358,61 @@ int32_t setAlterTableInfo(SSqlObj* pSql, struct SSqlInfo* pInfo) {
       return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg21);
     }
 
-    pItem = taosArrayGet(pAlterSQL->pAddColumns, 1);
-    int16_t nlen = 0;
+    if (pItem->type != pColSchema->type) {
+      return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg23);
+    }
 
-    if (tVariantDump(&pItem->pVar, (char *)&nlen, TSDB_DATA_TYPE_SMALLINT, false) < 0 || nlen <= 0) {
+    if ((pItem->type == TSDB_DATA_TYPE_BINARY && (pItem->bytes <= 0 || pItem->bytes > TSDB_MAX_BINARY_LEN)) ||
+        (pItem->type == TSDB_DATA_TYPE_NCHAR && (pItem->bytes <= 0 || pItem->bytes > TSDB_MAX_NCHAR_LEN))) {
+      return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg24);
+    }
+        
+    if (pItem->bytes <= pColSchema->bytes) {
+      return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg22);
+    }
+    
+    TAOS_FIELD f = tscCreateField(pColSchema->type, name.z, pItem->bytes);
+    tscFieldInfoAppend(&pQueryInfo->fieldsInfo, &f);
+  }else if (pAlterSQL->type == TSDB_ALTER_TABLE_MODIFY_TAG_COLUMN) {
+    if (taosArrayGetSize(pAlterSQL->pAddColumns) >= 2) {
+      return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg16);
+    }
+
+    TAOS_FIELD* pItem = taosArrayGet(pAlterSQL->pAddColumns, 0);
+    if (pItem->type != TSDB_DATA_TYPE_BINARY && pItem->type != TSDB_DATA_TYPE_NCHAR) {
+      return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg21);
+    }
+    
+    SColumnIndex columnIndex = COLUMN_INDEX_INITIALIZER;
+    SStrToken    name = {.type = TK_STRING, .z = pItem->name, .n = strlen(pItem->name)};
+    if (getColumnIndexByName(pCmd, &name, pQueryInfo, &columnIndex) != TSDB_CODE_SUCCESS) {
+      return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg17);
+    }
+
+    SSchema* pColSchema = tscGetTableColumnSchema(pTableMetaInfo->pTableMeta, columnIndex.columnIndex);
+
+    if (columnIndex.columnIndex < tscGetNumOfColumns(pTableMetaInfo->pTableMeta)) {
+      return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg10);
+    }
+
+    if (pColSchema->type != TSDB_DATA_TYPE_BINARY && pColSchema->type != TSDB_DATA_TYPE_NCHAR) {
+      return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg21);
+    }
+
+    if (pItem->type != pColSchema->type) {
+      return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg23);
+    }
+
+    if ((pItem->type == TSDB_DATA_TYPE_BINARY && (pItem->bytes <= 0 || pItem->bytes > TSDB_MAX_BINARY_LEN)) ||
+        (pItem->type == TSDB_DATA_TYPE_NCHAR && (pItem->bytes <= 0 || pItem->bytes > TSDB_MAX_NCHAR_LEN))) {
+      return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg24);
+    }
+        
+    if (pItem->bytes <= pColSchema->bytes) {
       return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg22);
     }
     
-    TAOS_FIELD f = tscCreateField(pColSchema->type, name.z, nlen);
+    TAOS_FIELD f = tscCreateField(pColSchema->type, name.z, pItem->bytes);
     tscFieldInfoAppend(&pQueryInfo->fieldsInfo, &f);
   }
 

src/inc/taosmsg.h

@@ -161,6 +161,7 @@ enum _mgmt_table {
 #define TSDB_ALTER_TABLE_ADD_COLUMN        5
 #define TSDB_ALTER_TABLE_DROP_COLUMN       6
 #define TSDB_ALTER_TABLE_CHANGE_COLUMN     7
+#define TSDB_ALTER_TABLE_MODIFY_TAG_COLUMN 8
 
 #define TSDB_FILL_NONE             0
 #define TSDB_FILL_NULL             1

src/inc/ttokendef.h

@@ -155,7 +155,7 @@
 #define TK_SYNCDB                         136
 #define TK_ADD                            137
 #define TK_COLUMN                         138
-#define TK_LENGTH                         139
+#define TK_MODIFY                         139
 #define TK_TAG                            140
 #define TK_CHANGE                         141
 #define TK_SET                            142
@@ -211,6 +211,9 @@
 
 
 
+
+
+
 #define TK_SPACE                          300
 #define TK_COMMENT                        301
 #define TK_ILLEGAL                        302

src/mnode/src/mnodeTable.c

@@ -3218,6 +3218,11 @@ static int32_t mnodeProcessAlterTableMsg(SMnodeMsg *pMsg) {
       (void)mnodeChangeSuperTableColumn;
       mError("change table[%s] column[%s] length to [%d] is not processed", pAlter->tableFname, pAlter->schema[0].name, pAlter->schema[0].bytes);
       code = TSDB_CODE_SUCCESS;
+    } else if (pAlter->type == TSDB_ALTER_TABLE_MODIFY_TAG_COLUMN) {
+      //code = mnodeChangeSuperTableColumn(pMsg, pAlter->schema[0].name, pAlter->schema[1].name);
+      (void)mnodeChangeSuperTableColumn;
+      mError("change table[%s] tag[%s] length to [%d] is not processed", pAlter->tableFname, pAlter->schema[0].name, pAlter->schema[0].bytes);
+      code = TSDB_CODE_SUCCESS;
     } else {
     }
   } else {

src/query/inc/sql.y

@@ -754,15 +754,9 @@ cmd ::= ALTER TABLE ids(X) cpxName(F) DROP COLUMN ids(A).     {
     setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
 }
 
-cmd ::= ALTER TABLE ids(X) cpxName(F) ALTER COLUMN LENGTH ids(A) INTEGER(Z).     {
+cmd ::= ALTER TABLE ids(X) cpxName(F) MODIFY COLUMN columnlist(A).     {
     X.n += F.n;
-
-    toTSDBType(A.type);
-    SArray* K = tVariantListAppendToken(NULL, &A, -1);
-    toTSDBType(Z.type);
-    K = tVariantListAppendToken(K, &Z, -1);
-
-    SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&X, K, NULL, TSDB_ALTER_TABLE_CHANGE_COLUMN, -1);
+    SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&X, A, NULL, TSDB_ALTER_TABLE_CHANGE_COLUMN, -1);
     setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
 }
 
@@ -806,6 +800,11 @@ cmd ::= ALTER TABLE ids(X) cpxName(F) SET TAG ids(Y) EQ tagitem(Z).     {
     setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
 }
 
+cmd ::= ALTER TABLE ids(X) cpxName(F) MODIFY TAG columnlist(A).     {
+    X.n += F.n;
+    SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&X, A, NULL, TSDB_ALTER_TABLE_MODIFY_TAG_COLUMN, -1);
+    setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
+}
 
 ///////////////////////////////////ALTER STABLE statement//////////////////////////////////
 cmd ::= ALTER STABLE ids(X) cpxName(F) ADD COLUMN columnlist(A).     {
@@ -824,15 +823,9 @@ cmd ::= ALTER STABLE ids(X) cpxName(F) DROP COLUMN ids(A).     {
     setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
 }
 
-cmd ::= ALTER STABLE ids(X) cpxName(F) ALTER COLUMN LENGTH ids(A) INTEGER(Z).     {
+cmd ::= ALTER STABLE ids(X) cpxName(F) MODIFY COLUMN columnlist(A).     {
     X.n += F.n;
-
-    toTSDBType(A.type);
-    SArray* K = tVariantListAppendToken(NULL, &A, -1);
-    toTSDBType(Z.type);
-    K = tVariantListAppendToken(K, &Z, -1);
-
-    SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&X, K, NULL, TSDB_ALTER_TABLE_CHANGE_COLUMN, TSDB_SUPER_TABLE);
+    SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&X, A, NULL, TSDB_ALTER_TABLE_CHANGE_COLUMN, TSDB_SUPER_TABLE);
     setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
 }
 
@@ -865,6 +858,23 @@ cmd ::= ALTER STABLE ids(X) cpxName(F) CHANGE TAG ids(Y) ids(Z). {
     setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
 }
 
+cmd ::= ALTER STABLE ids(X) cpxName(F) SET TAG ids(Y) EQ tagitem(Z).     {
+    X.n += F.n;
+
+    toTSDBType(Y.type);
+    SArray* A = tVariantListAppendToken(NULL, &Y, -1);
+    A = tVariantListAppend(A, &Z, -1);
+
+    SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&X, NULL, A, TSDB_ALTER_TABLE_UPDATE_TAG_VAL, TSDB_SUPER_TABLE);
+    setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
+}
+
+cmd ::= ALTER STABLE ids(X) cpxName(F) MODIFY TAG columnlist(A).     {
+    X.n += F.n;
+    SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&X, A, NULL, TSDB_ALTER_TABLE_MODIFY_TAG_COLUMN, TSDB_SUPER_TABLE);
+    setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
+}
+
 ////////////////////////////////////////kill statement///////////////////////////////////////
 cmd ::= KILL CONNECTION INTEGER(Y).   {setKillSql(pInfo, TSDB_SQL_KILL_CONNECTION, &Y);}
 cmd ::= KILL STREAM INTEGER(X) COLON(Z) INTEGER(Y).       {X.n += (Z.n + Y.n); setKillSql(pInfo, TSDB_SQL_KILL_STREAM, &X);}

src/query/src/qSqlParser.c

@@ -887,7 +887,7 @@ SAlterTableInfo *tSetAlterTableInfo(SStrToken *pTableName, SArray *pCols, SArray
   pAlterTable->type = type;
   pAlterTable->tableType = tableType;
 
-  if (type == TSDB_ALTER_TABLE_ADD_COLUMN || type == TSDB_ALTER_TABLE_ADD_TAG_COLUMN || type == TSDB_ALTER_TABLE_CHANGE_COLUMN) {
+  if (type == TSDB_ALTER_TABLE_ADD_COLUMN || type == TSDB_ALTER_TABLE_ADD_TAG_COLUMN || type == TSDB_ALTER_TABLE_CHANGE_COLUMN || type == TSDB_ALTER_TABLE_MODIFY_TAG_COLUMN) {
     pAlterTable->pAddColumns = pCols;
     assert(pVals == NULL);
   } else {

src/util/src/ttokenizer.c

@@ -218,7 +218,7 @@ static SKeyword keywordTable[] = {
     {"PARTITIONS",   TK_PARTITIONS},
     {"TOPIC",        TK_TOPIC},
     {"TOPICS",       TK_TOPICS},
-    {"LENGTH",       TK_LENGTH}
+    {"MODIFY",       TK_MODIFY}
 };
 
 static const char isIdChar[] = {

tests/script/general/parser/alter_column.sim

@@ -25,20 +25,49 @@ sql use $db
 ##### alter table test, simeplest case
 sql create table tb (ts timestamp, c1 int, c2 binary(10), c3 nchar(10))
 sql insert into tb values (now, 1, "1", "1")
-sql alter table tb alter column length c2 20;
+sql alter table tb modify column c2 binary(20);
 if $rows != 0 then
   return -1
 endi
-sql alter table tb alter column length c3 20;
+sql alter table tb modify column c3 nchar(20);
 if $rows != 0 then
   return -1
 endi
 
 
-sql create stable stb (ts timestamp, c1 int, c2 binary(10), c3 nchar(10)) tags(id int)
-sql create table tb1 using stb tags(1)
+sql create stable stb (ts timestamp, c1 int, c2 binary(10), c3 nchar(10)) tags(id1 int, id2 binary(10), id3 nchar(10))
+sql create table tb1 using stb tags(1, "a", "b")
 sql insert into tb1 values (now, 1, "1", "1")
-sql alter stable stb alter column length c2 20;
+sql alter stable stb modify column c2 binary(20);
+if $rows != 0 then
+  return -1
+endi
+sql alter table stb modify column c2 binary(30);
+if $rows != 0 then
+  return -1
+endi
+sql alter stable stb modify column c3 nchar(20);
+if $rows != 0 then
+  return -1
+endi
+sql alter table stb modify column c3 nchar(30);
+if $rows != 0 then
+  return -1
+endi
+
+sql alter table stb modify tag id2 binary(11);
+if $rows != 0 then
+  return -1
+endi
+sql alter stable stb modify tag id2 binary(11);
+if $rows != 0 then
+  return -1
+endi
+sql alter table stb modify tag id3 nchar(11);
+if $rows != 0 then
+  return -1
+endi
+sql alter stable stb modify tag id3 nchar(11);
 if $rows != 0 then
   return -1
 endi
@@ -46,10 +75,44 @@ endi
 ##### ILLEGAL OPERATIONS
 
 # try dropping columns that are defined in metric
-sql_error alter table tb alter column length c1 10;
-sql_error alter stable tb alter column length c2 10;
-sql_error alter table tb1 alter column length c2 10;
-sql_error alter stable tb1 alter column length c2 10;
+sql_error alter table tb modify column c1 binary(10);
+sql_error alter table tb modify column c1 double;
+sql_error alter table tb modify column c2 int;
+sql_error alter table tb modify column c2 binary(10);
+sql_error alter table tb modify column c2 binary(9);
+sql_error alter table tb modify column c2 binary(-9);
+sql_error alter table tb modify column c2 binary(0);
+sql_error alter table tb modify column c2 binary(17000);
+sql_error alter table tb modify column c2 nchar(30);
+sql_error alter table tb modify column c3 double;
+sql_error alter table tb modify column c3 nchar(10);
+sql_error alter table tb modify column c3 nchar(0);
+sql_error alter table tb modify column c3 nchar(-1);
+sql_error alter table tb modify column c3 binary(80);
+sql_error alter table tb modify column c3 nchar(17000);
+sql_error alter table tb modify column c3 nchar(100), c2 binary(30);
+sql_error alter table tb modify column c1 nchar(100), c2 binary(30);
+sql_error alter stable tb modify column c2 binary(30);
+sql_error alter table tb modify tag c2 binary(30);
+sql_error alter table stb modify tag id2 binary(10);
+sql_error alter table stb modify tag id2 nchar(30);
+sql_error alter stable stb modify tag id2 binary(10);
+sql_error alter stable stb modify tag id2 nchar(30);
+sql_error alter table stb modify tag id3 nchar(10);
+sql_error alter table stb modify tag id3 binary(30);
+sql_error alter stable stb modify tag id3 nchar(10);
+sql_error alter stable stb modify tag id3 binary(30);
+sql_error alter stable stb modify tag id1 binary(30);
+sql_error alter stable stb modify tag c1 binary(30);
+
+
+sql_error alter table tb1 modify column c2 binary(30);
+sql_error alter table tb1 modify column c3 nchar(30);
+sql_error alter table tb1 modify tag id2 binary(30);
+sql_error alter table tb1 modify tag id3 nchar(30);
+sql_error alter stable tb1 modify tag id2 binary(30);
+sql_error alter stable tb1 modify tag id3 nchar(30);
+sql_error alter stable tb1 modify column c2 binary(30);
 
 
 system sh/exec.sh -n dnode1 -s stop -x SIGINT