From 324e8607ccdab536fa29f426ee4fa14d7444dc7c Mon Sep 17 00:00:00 2001
From: wangmm0220 <wangmm0220@gmail.com>
Date: Sat, 11 Jun 2022 20:26:11 +0800
Subject: [PATCH] fix:disable schemaless database parameters

---
 source/client/src/clientEnv.c          | 2 +-
 source/client/src/clientSml.c          | 3 ++-
 source/common/src/systable.c           | 2 +-
 source/dnode/mnode/impl/src/mndDb.c    | 4 ++--
 source/libs/parser/src/parAstCreater.c | 3 ++-
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/source/client/src/clientEnv.c b/source/client/src/clientEnv.c
index 171f06c257..bb60624145 100644
--- a/source/client/src/clientEnv.c
+++ b/source/client/src/clientEnv.c
@@ -167,7 +167,7 @@ void *createTscObj(const char *user, const char *auth, const char *db, int32_t c
 
   taosThreadMutexInit(&pObj->mutex, NULL);
   pObj->id = taosAddRef(clientConnRefPool, pObj);
-  pObj->schemalessType = 0;
+  pObj->schemalessType = 1;
 
   tscDebug("connObj created, 0x%" PRIx64, pObj->id);
   return pObj;
diff --git a/source/client/src/clientSml.c b/source/client/src/clientSml.c
index 6205fc29cc..bbf9eba363 100644
--- a/source/client/src/clientSml.c
+++ b/source/client/src/clientSml.c
@@ -2484,7 +2484,8 @@ TAOS_RES* taos_schemaless_insert(TAOS* taos, char* lines[], int numLines, int pr
 end:
   taosThreadSpinDestroy(&params.lock);
   tsem_destroy(&params.sem);
-  ((STscObj *)taos)->schemalessType = 0;
+//  ((STscObj *)taos)->schemalessType = 0;
+  ((STscObj *)taos)->schemalessType = 1;
   uDebug("resultend:%s", request->msgBuf);
   return (TAOS_RES*)request;
 }
diff --git a/source/common/src/systable.c b/source/common/src/systable.c
index 2b59354d60..2546cb3d7d 100644
--- a/source/common/src/systable.c
+++ b/source/common/src/systable.c
@@ -91,7 +91,7 @@ static const SSysDbTableSchema userDBSchema[] = {
     {.name = "precision", .bytes = 2 + VARSTR_HEADER_SIZE, .type = TSDB_DATA_TYPE_VARCHAR},
     {.name = "single_stable_model", .bytes = 1, .type = TSDB_DATA_TYPE_BOOL},
     {.name = "status", .bytes = 10 + VARSTR_HEADER_SIZE, .type = TSDB_DATA_TYPE_VARCHAR},
-    {.name = "schemaless", .bytes = 1, .type = TSDB_DATA_TYPE_BOOL},
+//    {.name = "schemaless", .bytes = 1, .type = TSDB_DATA_TYPE_BOOL},
     {.name = "retension", .bytes = 60 + VARSTR_HEADER_SIZE, .type = TSDB_DATA_TYPE_VARCHAR},
 
     // {.name = "update", .bytes = 1, .type = TSDB_DATA_TYPE_TINYINT},  // disable update
diff --git a/source/dnode/mnode/impl/src/mndDb.c b/source/dnode/mnode/impl/src/mndDb.c
index 61d6e7be6c..9839f0fbf2 100644
--- a/source/dnode/mnode/impl/src/mndDb.c
+++ b/source/dnode/mnode/impl/src/mndDb.c
@@ -1554,8 +1554,8 @@ static void dumpDbInfoData(SSDataBlock *pBlock, SDbObj *pDb, SShowObj *pShow, in
     pColInfo = taosArrayGet(pBlock->pDataBlock, cols++);
     colDataAppend(pColInfo, rows, (const char *)statusB, false);
 
-    pColInfo = taosArrayGet(pBlock->pDataBlock, cols++);
-    colDataAppend(pColInfo, rows, (const char *)&pDb->cfg.schemaless, false);
+//    pColInfo = taosArrayGet(pBlock->pDataBlock, cols++);
+//    colDataAppend(pColInfo, rows, (const char *)&pDb->cfg.schemaless, false);
 
     char *p = buildRetension(pDb->cfg.pRetensions);
 
diff --git a/source/libs/parser/src/parAstCreater.c b/source/libs/parser/src/parAstCreater.c
index 613a2d867d..1d8c4ff1ca 100644
--- a/source/libs/parser/src/parAstCreater.c
+++ b/source/libs/parser/src/parAstCreater.c
@@ -796,7 +796,8 @@ SNode* setDatabaseOption(SAstCreateContext* pCxt, SNode* pOptions, EDatabaseOpti
       ((SDatabaseOptions*)pOptions)->pRetentions = pVal;
       break;
     case DB_OPTION_SCHEMALESS:
-      ((SDatabaseOptions*)pOptions)->schemaless = taosStr2Int8(((SToken*)pVal)->z, NULL, 10);
+//      ((SDatabaseOptions*)pOptions)->schemaless = taosStr2Int8(((SToken*)pVal)->z, NULL, 10);
+      ((SDatabaseOptions*)pOptions)->schemaless = 1;
       break;
     default:
       break;
-- 
GitLab