add/drop dynamic idx

source/dnode/vnode/src/meta/metaTable.c

@@ -635,10 +635,16 @@ static int metaDropTableByUid(SMeta *pMeta, tb_uid_t uid, int *type) {
 
         tDecoderInit(&tdc, tData, tLen);
         metaDecodeEntry(&tdc, &stbEntry);
-        const SSchema *pTagColumn = &stbEntry.stbEntry.schemaTag.pSchema[0];
-        if (pTagColumn->type == TSDB_DATA_TYPE_JSON) {
+
+        SSchema        *pTagColumn = NULL;
+        SSchemaWrapper *pTagSchema = &stbEntry.stbEntry.schemaTag;
+        if (pTagSchema->nCols == 1 && pTagSchema->pSchema[0].type == TSDB_DATA_TYPE_JSON) {
+          pTagColumn = &stbEntry.stbEntry.schemaTag.pSchema[0];
           metaDelJsonVarFromIdx(pMeta, &e, pTagColumn);
         } else {
+          for (int i = 0; i < pTagSchema->nCols; i++) {
+            pTagColumn = &stbEntry.stbEntry.schemaTag.pSchema[i];
+            if (!IS_INDX_ON(pTagColumn)) continue;
             STagIdxKey *pTagIdxKey = NULL;
             int32_t     nTagIdxKey;
 
@@ -661,6 +667,7 @@ static int metaDropTableByUid(SMeta *pMeta, tb_uid_t uid, int *type) {
             }
             metaDestroyTagIdxKey(pTagIdxKey);
           }
+        }
         tDecoderClear(&tdc);
       }
       tdbFree(tData);
@@ -1379,6 +1386,12 @@ static int metaDropTagIndex(SMeta *pMeta, int64_t version, SVAlterTbReq *pAlterT
     terrno = TSDB_CODE_VND_COL_NOT_EXISTS;
     goto _err;
   }
+
+  if (IS_INDX_ON(pCol)) {
+    terrno = TSDB_CODE_VND_COL_ALREADY_EXISTS;
+    goto _err;
+  }
+
   SArray *tagIdxList = taosArrayInit(512, sizeof(SMetaPair));
 
   TBC *pTagIdxc = NULL;
@@ -1408,7 +1421,7 @@ static int metaDropTagIndex(SMeta *pMeta, int64_t version, SVAlterTbReq *pAlterT
 
   taosArrayDestroy(tagIdxList);
 
-  // drop index
+  // set pCol->flags; INDEX_ON
   return 0;
 _err:
   return -1;
@@ -1590,10 +1603,21 @@ static int metaUpdateTagIdx(SMeta *pMeta, const SMetaEntry *pCtbEntry) {
     goto end;
   }
 
+  SSchemaWrapper *pTagSchema = &stbEntry.stbEntry.schemaTag;
+  if (pTagSchema->nCols == 1 && pTagSchema->pSchema[0].type == TSDB_DATA_TYPE_JSON) {
+    STagVal tagVal = {.cid = pTagColumn->colId};
     pTagColumn = &stbEntry.stbEntry.schemaTag.pSchema[0];
 
+    pTagData = pCtbEntry->ctbEntry.pTags;
+    nTagData = ((const STag *)pCtbEntry->ctbEntry.pTags)->len;
+    ret = metaSaveJsonVarToIdx(pMeta, pCtbEntry, pTagColumn);
+    goto end;
+  } else {
+    for (int i = 0; i < pTagSchema->nCols; i++) {
+      pTagColumn = &pTagSchema->pSchema[i];
+      if (!IS_INDX_ON(pTagColumn)) continue;
+
       STagVal tagVal = {.cid = pTagColumn->colId};
-  if (pTagColumn->type != TSDB_DATA_TYPE_JSON) {
       tTagGet((const STag *)pCtbEntry->ctbEntry.pTags, &tagVal);
       if (IS_VAR_DATA_TYPE(pTagColumn->type)) {
         pTagData = tagVal.pData;
@@ -1602,14 +1626,7 @@ static int metaUpdateTagIdx(SMeta *pMeta, const SMetaEntry *pCtbEntry) {
         pTagData = &(tagVal.i64);
         nTagData = tDataTypes[pTagColumn->type].bytes;
       }
-  } else {
-    // pTagData = pCtbEntry->ctbEntry.pTags;
-    // nTagData = ((const STag *)pCtbEntry->ctbEntry.pTags)->len;
-    pTagData = pCtbEntry->ctbEntry.pTags;
-    nTagData = ((const STag *)pCtbEntry->ctbEntry.pTags)->len;
-    ret = metaSaveJsonVarToIdx(pMeta, pCtbEntry, pTagColumn);
-    goto end;
-  }
+
       if (pTagData != NULL) {
         if (metaCreateTagIdxKey(pCtbEntry->ctbEntry.suid, pTagColumn->colId, pTagData, nTagData, pTagColumn->type,
                                 pCtbEntry->uid, &pTagIdxKey, &nTagIdxKey) < 0) {
@@ -1618,8 +1635,11 @@ static int metaUpdateTagIdx(SMeta *pMeta, const SMetaEntry *pCtbEntry) {
         }
         tdbTbUpsert(pMeta->pTagIdx, pTagIdxKey, nTagIdxKey, NULL, 0, pMeta->txn);
       }
-end:
       metaDestroyTagIdxKey(pTagIdxKey);
+    }
+  }
+end:
+  // metaDestroyTagIdxKey(pTagIdxKey);
   tDecoderClear(&dc);
   tdbFree(pData);
   return ret;