[td-183]

packaging/cfg/taos.cfg

@@ -5,29 +5,16 @@
 #                                                      #
 ########################################################
 
-# master IP for TDengine system
-# masterIp              127.0.0.1
+# first full-qualified domain name (FQDN) for TDengine system
+# first                 127.0.0.1
 
-# second IP for TDengine system, for cluster version only 
-# secondIp              127.0.0.1
-
-# IP address of the server
-# privateIp             127.0.0.1
-
-# public IP of server, on which the tdengine are deployed
-# this IP is assigned by cloud service provider, for cluster version only 
-# publicIp              127.0.0.1   
-
-# network is bound to 0.0.0.0
-# anyIp                 1
+# second full-qualified domain name (FQDN) for TDengine system, for cluster edition only
+# second              127.0.0.1
 
 # set socket type ("udp" and "tcp")
 # the server and client should have the same socket type. Otherwise, connect will fail
 # sockettype            udp
 
-# client local IP
-# localIp               127.0.0.1
-
 # for the cluster version, data file's directory is configured this way 
 # option                mount_path           tier_level
 # dataDir               /mnt/disk1/taos      0
@@ -46,23 +33,8 @@
 # http service port, default tcp[6020]
 # httpPort              6020
 
-# port for MNode connect to Client, default udp[6030-6034] tcp[6030]
-# mgmtShellPort         6030
-
-# port for DNode connect to Client, default udp[6035-6039] tcp[6035]
-# vnodeShellPort        6035
-
-# port for MNode connect to VNode, default udp[6040-6044] tcp[6040], for cluster version only 
-# mgmtVnodePort         6040
-
-# port for DNode connect to DNode, default tcp[6045], for cluster version only 
-# vnodeVnodePort        6045
-
-# port for MNode connect to MNode, default udp[6050], for cluster version only 
-# mgmtMgmtPort          6050
-
-# port sync file MNode and MNode, default tcp[6050], for cluster version only 
-# mgmtSyncPort          6050
+# port for MNode connect to Client, default udp[6030-6055] tcp[6030]
+# serverPort            6030
 
 # number of threads per CPU core
 # numOfThreadsPerCore   1
@@ -73,20 +45,18 @@
 # number of total vnodes in DNode
 # numOfTotalVnodes      0
 
-# max number of sessions per vnode
-# tables                1024
+# max number of tables per vnode
+# maxtablesPerVnode     1000
 
 # cache block size
 # cache                 16384
 
-# row in file block
-# rows                  4096
+# row of records in file block
+# minRows                100
+# maxRows                4096
 
-# average cache blocks per meter
-# ablocks               4
-
-# max number of cache blocks per Meter
-# tblocks               512
+# number of cache blocks per vnode
+# blocks             2
 
 # interval of system monitor 
 # monitorInterval       60
@@ -118,11 +88,8 @@
 # interval of MNode send HB to MNode, unit is Second, for cluster version only 
 # mgmtPeerHBTimer       1
 
-# time to keep MeterMeta in Cache, seconds
-# meterMetaKeepTimer    7200
-
-# time to keep MetricMeta in Cache, seconds
-# metricMetaKeepTimer   600 
+# duration of to keep tableMeta kept in Cache, seconds
+# tableMetaKeepTimer    7200
 
 # max number of users
 # maxUsers              1000
@@ -148,8 +115,8 @@
 # system time zone
 # timezone              Asia/Shanghai (CST, +0800)
 
-# enable/disable commit log
-# clog                  1
+# set write ahead log (WAL) level
+# walLevel              1
 
 # enable/disable async log
 # asyncLog              1
@@ -268,6 +235,9 @@
 # debug flag for TDengine client 
 # cDebugFlag            131
 
+# debug flag for query
+# qDebugflag            131
+
 # debug flag for http server
 # httpDebugFlag         131
 

src/client/src/tscSQLParser.c

@@ -4743,7 +4743,7 @@ static int32_t setKeepOption(SSqlCmd* pCmd, SCMCreateDbMsg* pMsg, SCreateDBInfo*
   return TSDB_CODE_SUCCESS;
 }
 
-static int32_t setTimePrecisionOption(SSqlCmd* pCmd, SCMCreateDbMsg* pMsg, SCreateDBInfo* pCreateDbInfo) {
+static int32_t setTimePrecision(SSqlCmd* pCmd, SCMCreateDbMsg* pMsg, SCreateDBInfo* pCreateDbInfo) {
   const char* msg = "invalid time precision";
 
   pMsg->precision = TSDB_TIME_PRECISION_MILLI;  // millisecond by default
@@ -4768,15 +4768,15 @@ static int32_t setTimePrecisionOption(SSqlCmd* pCmd, SCMCreateDbMsg* pMsg, SCrea
 }
 
 static void setCreateDBOption(SCMCreateDbMsg* pMsg, SCreateDBInfo* pCreateDb) {
-  pMsg->maxSessions = htonl(pCreateDb->tablesPerVnode);
-  pMsg->cacheBlockSize = htonl(-1);
-  pMsg->totalBlocks = htonl(-1);
+  pMsg->maxTables = htonl(pCreateDb->maxTablesPerVnode);
+  pMsg->cacheBlockSize = htonl(pCreateDb->cacheBlockSize);
+  pMsg->numOfBlocks = htonl(pCreateDb->numOfBlocks);
   pMsg->daysPerFile = htonl(pCreateDb->daysPerFile);
   pMsg->commitTime = htonl(pCreateDb->commitTime);
-  pMsg->minRowsPerFileBlock = htonl(-1);
-  pMsg->maxRowsPerFileBlock = htonl(-1);
+  pMsg->minRowsPerFileBlock = htonl(pCreateDb->minRowsPerBlock);
+  pMsg->maxRowsPerFileBlock = htonl(pCreateDb->maxRowsPerBlock);
   pMsg->compression = pCreateDb->compressionLevel;
-  pMsg->commitLog = (char)pCreateDb->commitLog;
+  pMsg->walLevel = (char)pCreateDb->walLevel;
   pMsg->replications = pCreateDb->replica;
   pMsg->ignoreExist = pCreateDb->ignoreExists;
 }
@@ -4789,7 +4789,7 @@ int32_t parseCreateDBOptions(SSqlCmd* pCmd, SCreateDBInfo* pCreateDbSql) {
     return TSDB_CODE_INVALID_SQL;
   }
 
-  if (setTimePrecisionOption(pCmd, pMsg, pCreateDbSql) != TSDB_CODE_SUCCESS) {
+  if (setTimePrecision(pCmd, pMsg, pCreateDbSql) != TSDB_CODE_SUCCESS) {
     return TSDB_CODE_INVALID_SQL;
   }
 
@@ -5309,8 +5309,8 @@ int32_t doLocalQueryProcess(SQueryInfo* pQueryInfo, SQuerySQL* pQuerySql) {
 int32_t tscCheckCreateDbParams(SSqlCmd* pCmd, SCMCreateDbMsg* pCreate) {
   char msg[512] = {0};
 
-  if (pCreate->commitLog != -1 && (pCreate->commitLog < TSDB_MIN_CLOG_LEVEL || pCreate->commitLog > TSDB_MAX_CLOG_LEVEL)) {
-    snprintf(msg, tListLen(msg), "invalid db option commitLog: %d, only 0-2 allowed", pCreate->commitLog);
+  if (pCreate->walLevel != -1 && (pCreate->walLevel < TSDB_MIN_WAL_LEVEL || pCreate->walLevel > TSDB_MAX_WAL_LEVEL)) {
+    snprintf(msg, tListLen(msg), "invalid db option walLevel: %d, only 0-2 allowed", pCreate->walLevel);
     return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg);
   }
 
@@ -5335,7 +5335,7 @@ int32_t tscCheckCreateDbParams(SSqlCmd* pCmd, SCMCreateDbMsg* pCreate) {
     return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg);
   }
 
-  val = htonl(pCreate->maxSessions);
+  val = htonl(pCreate->maxTables);
   if (val != -1 && (val < TSDB_MIN_TABLES || val > TSDB_MAX_TABLES)) {
     snprintf(msg, tListLen(msg), "invalid db option maxSessions: %d valid range: [%d, %d]", val,
              TSDB_MIN_TABLES, TSDB_MAX_TABLES);

src/client/src/tscServer.c

@@ -1907,7 +1907,7 @@ int tscProcessTableMetaRsp(SSqlObj *pSql) {
   assert(pTableMetaInfo->pTableMeta == NULL);
 
   pTableMetaInfo->pTableMeta =
-      (STableMeta *) taosCachePut(tscCacheHandle, pTableMetaInfo->name, pTableMeta, size, tsMeterMetaKeepTimer);
+      (STableMeta *) taosCachePut(tscCacheHandle, pTableMetaInfo->name, pTableMeta, size, tsTableMetaKeepTimer);
   
   // todo handle out of memory case
   if (pTableMetaInfo->pTableMeta == NULL) {
@@ -2016,7 +2016,7 @@ int tscProcessMultiMeterMetaRsp(SSqlObj *pSql) {
     //    int32_t size = (int32_t)(rsp - ((char *)pMeta));  // Consistent with STableMeta in cache
     //
     //    pMeta->index = 0;
-    //    (void)taosCachePut(tscCacheHandle, pMeta->tableId, (char *)pMeta, size, tsMeterMetaKeepTimer);
+    //    (void)taosCachePut(tscCacheHandle, pMeta->tableId, (char *)pMeta, size, tsTableMetaKeepTimer);
     //  }
   }
   
@@ -2215,7 +2215,7 @@ int tscProcessShowRsp(SSqlObj *pSql) {
   size_t size = 0;
   STableMeta* pTableMeta = tscCreateTableMetaFromMsg(pMetaMsg, &size);
   
-  pTableMetaInfo->pTableMeta = taosCachePut(tscCacheHandle, key, (char *)pTableMeta, size, tsMeterMetaKeepTimer);
+  pTableMetaInfo->pTableMeta = taosCachePut(tscCacheHandle, key, (char *)pTableMeta, size, tsTableMetaKeepTimer);
   SSchema *pTableSchema = tscGetTableSchema(pTableMetaInfo->pTableMeta);
 
   if (pQueryInfo->colList == NULL) {

src/client/src/tscSystem.c

@@ -165,7 +165,7 @@ void taos_init_imp() {
     taosTmrReset(tscCheckDiskUsage, 10, NULL, tscTmr, &tscCheckDiskUsageTmr);      
   }
   
-  int64_t refreshTime = tsMetricMetaKeepTimer < tsMeterMetaKeepTimer ? tsMetricMetaKeepTimer : tsMeterMetaKeepTimer;
+  int64_t refreshTime = tsTableMetaKeepTimer;
   refreshTime = refreshTime > 2 ? 2 : refreshTime;
   refreshTime = refreshTime < 1 ? 1 : refreshTime;
 

src/common/inc/tglobal.h

@@ -65,8 +65,7 @@ extern int32_t tsStatusInterval;
 extern int32_t tsShellActivityTimer;
 extern int32_t tsVnodePeerHBTimer;
 extern int32_t tsMgmtPeerHBTimer;
-extern int32_t tsMeterMetaKeepTimer;
-extern int32_t tsMetricMetaKeepTimer;
+extern int32_t tsTableMetaKeepTimer;
 
 extern float    tsNumOfThreadsPerCore;
 extern float    tsRatioOfQueryThreads;
@@ -77,8 +76,8 @@ extern int16_t  tsNumOfTotalVnodes;
 extern uint32_t tsPublicIpInt;
 
 extern int32_t tsCacheBlockSize;
-extern int32_t tsTotalBlocks;
-extern int32_t tsTablesPerVnode;
+extern int32_t tsBlocksPerVnode;
+extern int32_t tsMaxTablePerVnode;
 extern int16_t tsDaysPerFile;
 extern int32_t tsDaysToKeep;
 extern int32_t tsMinRowsInFileBlock;
@@ -86,7 +85,7 @@ extern int32_t tsMaxRowsInFileBlock;
 extern int16_t tsCommitTime;  // seconds
 extern int32_t tsTimePrecision;
 extern int16_t tsCompression;
-extern int16_t tsCommitLog;
+extern int16_t tsWAL;
 extern int32_t tsReplications;
 
 extern int16_t tsAffectedRowsMod;
@@ -94,7 +93,6 @@ extern int32_t tsNumOfMPeers;
 extern int32_t tsMaxShellConns;
 extern int32_t tsMaxTables;
 
-extern char tsLocalIp[];
 extern char tsDefaultDB[];
 extern char tsDefaultUser[];
 extern char tsDefaultPass[];
@@ -136,7 +134,6 @@ extern int32_t  tsHttpEnableRecordSql;
 extern int32_t  tsTelegrafUseFieldNum;
 
 extern int32_t  tsTscEnableRecordSql;
-extern int32_t  tsAnyIp;
 
 extern char     tsMonitorDbName[];
 extern char     tsInternalPass[];

src/common/src/tglobal.c

@@ -74,8 +74,7 @@ uint16_t tsSyncPort = 6050;
 
 int32_t tsStatusInterval = 1;         // second
 int32_t tsShellActivityTimer = 3;     // second
-int32_t tsMeterMetaKeepTimer = 7200;  // second
-int32_t tsMetricMetaKeepTimer = 600;  // second
+int32_t tsTableMetaKeepTimer = 7200;  // second
 int32_t tsRpcTimer = 300;
 int32_t tsRpcMaxTime = 600;      // seconds;
 
@@ -85,22 +84,22 @@ int16_t tsNumOfVnodesPerCore = 8;
 int16_t tsNumOfTotalVnodes = TSDB_INVALID_VNODE_NUM;
 
 #ifdef _TD_ARM_32_
-int32_t tsTablesPerVnode = 100;
+int32_t tsMaxTablePerVnode = 100;
 #else
-int32_t tsTablesPerVnode = TSDB_DEFAULT_TABLES;
+int32_t tsMaxTablePerVnode = TSDB_DEFAULT_TABLES;
 #endif
 
 int32_t tsCacheBlockSize = TSDB_DEFAULT_CACHE_BLOCK_SIZE;
-int32_t tsTotalBlocks = TSDB_DEFAULT_TOTAL_BLOCKS;
-int16_t tsDaysPerFile = TSDB_DEFAULT_DAYS_PER_FILE;
-int32_t tsDaysToKeep = TSDB_DEFAULT_KEEP;
+int32_t tsBlocksPerVnode = TSDB_DEFAULT_TOTAL_BLOCKS;
+int16_t tsDaysPerFile    = TSDB_DEFAULT_DAYS_PER_FILE;
+int32_t tsDaysToKeep     = TSDB_DEFAULT_KEEP;
 int32_t tsMinRowsInFileBlock = TSDB_DEFAULT_MIN_ROW_FBLOCK;
 int32_t tsMaxRowsInFileBlock = TSDB_DEFAULT_MAX_ROW_FBLOCK;
-int16_t tsCommitTime = TSDB_DEFAULT_COMMIT_TIME;  // seconds
+int16_t tsCommitTime    = TSDB_DEFAULT_COMMIT_TIME;  // seconds
 int32_t tsTimePrecision = TSDB_DEFAULT_PRECISION;
-int16_t tsCompression = TSDB_DEFAULT_COMP_LEVEL;
-int16_t tsCommitLog = TSDB_DEFAULT_CLOG_LEVEL;
-int32_t tsReplications = TSDB_DEFAULT_REPLICA_NUM;
+int16_t tsCompression   = TSDB_DEFAULT_COMP_LEVEL;
+int16_t tsWAL           = TSDB_DEFAULT_WAL_LEVEL;
+int32_t tsReplications  = TSDB_DEFAULT_REPLICA_NUM;
 
 /**
  * Change the meaning of affected rows:
@@ -506,18 +505,8 @@ static void doInitGlobalConfig() {
   cfg.unitType = TAOS_CFG_UTYPE_SECOND;
   taosInitConfigOption(cfg);
 
-  cfg.option = "meterMetaKeepTimer";
-  cfg.ptr = &tsMeterMetaKeepTimer;
-  cfg.valType = TAOS_CFG_VTYPE_INT32;
-  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_CLIENT;
-  cfg.minValue = 1;
-  cfg.maxValue = 8640000;
-  cfg.ptrLength = 0;
-  cfg.unitType = TAOS_CFG_UTYPE_SECOND;
-  taosInitConfigOption(cfg);
-
-  cfg.option = "metricMetaKeepTimer";
-  cfg.ptr = &tsMetricMetaKeepTimer;
+  cfg.option = "tableMetaKeepTimer";
+  cfg.ptr = &tsTableMetaKeepTimer;
   cfg.valType = TAOS_CFG_VTYPE_INT32;
   cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_CLIENT;
   cfg.minValue = 1;
@@ -587,8 +576,8 @@ static void doInitGlobalConfig() {
   taosInitConfigOption(cfg);
 
   // database configs
-  cfg.option = "tables";
-  cfg.ptr = &tsTablesPerVnode;
+  cfg.option = "maxtablesPerVnode";
+  cfg.ptr = &tsMaxTablePerVnode;
   cfg.valType = TAOS_CFG_VTYPE_INT32;
   cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW;
   cfg.minValue = TSDB_MIN_TABLES;
@@ -608,7 +597,7 @@ static void doInitGlobalConfig() {
   taosInitConfigOption(cfg);
 
   cfg.option = "blocks";
-  cfg.ptr = &tsTotalBlocks;
+  cfg.ptr = &tsBlocksPerVnode;
   cfg.valType = TAOS_CFG_VTYPE_INT32;
   cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW;
   cfg.minValue = TSDB_MIN_TOTAL_BLOCKS;
@@ -677,12 +666,12 @@ static void doInitGlobalConfig() {
   cfg.unitType = TAOS_CFG_UTYPE_NONE;
   taosInitConfigOption(cfg);
 
-  cfg.option = "clog";
-  cfg.ptr = &tsCommitLog;
+  cfg.option = "wallevel";
+  cfg.ptr = &tsWAL;
   cfg.valType = TAOS_CFG_VTYPE_INT16;
   cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW;
-  cfg.minValue = TSDB_MIN_CLOG_LEVEL;
-  cfg.maxValue = TSDB_MAX_CLOG_LEVEL;
+  cfg.minValue = TSDB_MIN_WAL_LEVEL;
+  cfg.maxValue = TSDB_MAX_WAL_LEVEL;
   cfg.ptrLength = 0;
   cfg.unitType = TAOS_CFG_UTYPE_NONE;
   taosInitConfigOption(cfg);

src/dnode/src/dnodeWrite.c

@@ -228,7 +228,7 @@ static void dnodeHandleIdleWorker(SWriteWorker *pWorker) {
   int32_t num = taosGetQueueNumber(pWorker->qset);
 
   if (num > 0) {
-     usleep(30);
+     usleep(30000);
      sched_yield(); 
   } else {
      taosFreeQall(pWorker->qall);

src/inc/taosdef.h

@@ -279,9 +279,9 @@ void tsDataSwap(void *pLeft, void *pRight, int32_t type, int32_t size);
 #define TSDB_MAX_COMP_LEVEL             2
 #define TSDB_DEFAULT_COMP_LEVEL         2
 
-#define TSDB_MIN_CLOG_LEVEL             0
-#define TSDB_MAX_CLOG_LEVEL             2
-#define TSDB_DEFAULT_CLOG_LEVEL         2
+#define TSDB_MIN_WAL_LEVEL             0
+#define TSDB_MAX_WAL_LEVEL             2
+#define TSDB_DEFAULT_WAL_LEVEL         2
 
 #define TSDB_MIN_REPLICA_NUM            1
 #define TSDB_MAX_REPLICA_NUM            3

src/inc/taosmsg.h

@@ -502,9 +502,9 @@ typedef struct {
 typedef struct {
   char     acct[TSDB_USER_LEN + 1];
   char     db[TSDB_DB_NAME_LEN + 1];
-  int32_t  maxSessions;
+  int32_t  maxTables;
   int32_t  cacheBlockSize; //MB
-  int32_t  totalBlocks;
+  int32_t  numOfBlocks;
   int32_t  daysPerFile;
   int32_t  daysToKeep1;
   int32_t  daysToKeep2;
@@ -513,7 +513,7 @@ typedef struct {
   int32_t  minRowsPerFileBlock;
   int32_t  maxRowsPerFileBlock;
   int8_t   compression;
-  int8_t   commitLog;
+  int8_t   walLevel;
   int8_t   replications;
   uint8_t  precision;   // time resolution
   int8_t   ignoreExist;
@@ -592,7 +592,7 @@ typedef struct {
   int32_t  commitTime;
   int8_t   precision;
   int8_t   compression;
-  int8_t   commitLog;
+  int8_t   walLevel;
   int8_t   replications;
   int8_t   wals;
   int8_t   quorum;

src/inc/ttokendef.h

@@ -13,8 +13,8 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef TDENGINE_TSQLDEF_H
-#define TDENGINE_TSQLDEF_H
+#ifndef TDENGINE_TTOKENDEF_H
+#define TDENGINE_TTOKENDEF_H
 
 #define TK_ID                               1
 #define TK_BOOL                             2
@@ -101,123 +101,124 @@
 #define TK_CONNS                           83
 #define TK_STATE                           84
 #define TK_KEEP                            85
-#define TK_CACHE                           86
-#define TK_REPLICA                         87
-#define TK_DAYS                            88
-#define TK_ROWS                            89
-#define TK_ABLOCKS                         90
-#define TK_TBLOCKS                         91
-#define TK_CTIME                           92
-#define TK_CLOG                            93
-#define TK_COMP                            94
-#define TK_PRECISION                       95
-#define TK_LP                              96
-#define TK_RP                              97
-#define TK_TAGS                            98
-#define TK_USING                           99
-#define TK_AS                             100
-#define TK_COMMA                          101
-#define TK_NULL                           102
-#define TK_SELECT                         103
-#define TK_UNION                          104
-#define TK_ALL                            105
-#define TK_FROM                           106
-#define TK_VARIABLE                       107
-#define TK_INTERVAL                       108
-#define TK_FILL                           109
-#define TK_SLIDING                        110
-#define TK_ORDER                          111
-#define TK_BY                             112
-#define TK_ASC                            113
-#define TK_DESC                           114
-#define TK_GROUP                          115
-#define TK_HAVING                         116
-#define TK_LIMIT                          117
-#define TK_OFFSET                         118
-#define TK_SLIMIT                         119
-#define TK_SOFFSET                        120
-#define TK_WHERE                          121
-#define TK_NOW                            122
-#define TK_RESET                          123
-#define TK_QUERY                          124
-#define TK_ADD                            125
-#define TK_COLUMN                         126
-#define TK_TAG                            127
-#define TK_CHANGE                         128
-#define TK_SET                            129
-#define TK_KILL                           130
-#define TK_CONNECTION                     131
-#define TK_COLON                          132
-#define TK_STREAM                         133
-#define TK_ABORT                          134
-#define TK_AFTER                          135
-#define TK_ATTACH                         136
-#define TK_BEFORE                         137
-#define TK_BEGIN                          138
-#define TK_CASCADE                        139
-#define TK_CLUSTER                        140
-#define TK_CONFLICT                       141
-#define TK_COPY                           142
-#define TK_DEFERRED                       143
-#define TK_DELIMITERS                     144
-#define TK_DETACH                         145
-#define TK_EACH                           146
-#define TK_END                            147
-#define TK_EXPLAIN                        148
-#define TK_FAIL                           149
-#define TK_FOR                            150
-#define TK_IGNORE                         151
-#define TK_IMMEDIATE                      152
-#define TK_INITIALLY                      153
-#define TK_INSTEAD                        154
-#define TK_MATCH                          155
-#define TK_KEY                            156
-#define TK_OF                             157
-#define TK_RAISE                          158
-#define TK_REPLACE                        159
-#define TK_RESTRICT                       160
-#define TK_ROW                            161
-#define TK_STATEMENT                      162
-#define TK_TRIGGER                        163
-#define TK_VIEW                           164
-#define TK_COUNT                          165
-#define TK_SUM                            166
-#define TK_AVG                            167
-#define TK_MIN                            168
-#define TK_MAX                            169
-#define TK_FIRST                          170
-#define TK_LAST                           171
-#define TK_TOP                            172
-#define TK_BOTTOM                         173
-#define TK_STDDEV                         174
-#define TK_PERCENTILE                     175
-#define TK_APERCENTILE                    176
-#define TK_LEASTSQUARES                   177
-#define TK_HISTOGRAM                      178
-#define TK_DIFF                           179
-#define TK_SPREAD                         180
-#define TK_TWA                            181
-#define TK_INTERP                         182
-#define TK_LAST_ROW                       183
-#define TK_RATE                           184
-#define TK_IRATE                          185
-#define TK_SUM_RATE                       186
-#define TK_SUM_IRATE                      187
-#define TK_AVG_RATE                       188
-#define TK_AVG_IRATE                      189
-#define TK_SEMI                           190
-#define TK_NONE                           191
-#define TK_PREV                           192
-#define TK_LINEAR                         193
-#define TK_IMPORT                         194
-#define TK_METRIC                         195
-#define TK_TBNAME                         196
-#define TK_JOIN                           197
-#define TK_METRICS                        198
-#define TK_STABLE                         199
-#define TK_INSERT                         200
-#define TK_INTO                           201
-#define TK_VALUES                         202
+#define TK_MAXTABLES                       86
+#define TK_CACHE                           87
+#define TK_REPLICA                         88
+#define TK_DAYS                            89
+#define TK_MINROWS                         90
+#define TK_MAXROWS                         91
+#define TK_BLOCKS                          92
+#define TK_CTIME                           93
+#define TK_WAL                             94
+#define TK_COMP                            95
+#define TK_PRECISION                       96
+#define TK_LP                              97
+#define TK_RP                              98
+#define TK_TAGS                            99
+#define TK_USING                          100
+#define TK_AS                             101
+#define TK_COMMA                          102
+#define TK_NULL                           103
+#define TK_SELECT                         104
+#define TK_UNION                          105
+#define TK_ALL                            106
+#define TK_FROM                           107
+#define TK_VARIABLE                       108
+#define TK_INTERVAL                       109
+#define TK_FILL                           110
+#define TK_SLIDING                        111
+#define TK_ORDER                          112
+#define TK_BY                             113
+#define TK_ASC                            114
+#define TK_DESC                           115
+#define TK_GROUP                          116
+#define TK_HAVING                         117
+#define TK_LIMIT                          118
+#define TK_OFFSET                         119
+#define TK_SLIMIT                         120
+#define TK_SOFFSET                        121
+#define TK_WHERE                          122
+#define TK_NOW                            123
+#define TK_RESET                          124
+#define TK_QUERY                          125
+#define TK_ADD                            126
+#define TK_COLUMN                         127
+#define TK_TAG                            128
+#define TK_CHANGE                         129
+#define TK_SET                            130
+#define TK_KILL                           131
+#define TK_CONNECTION                     132
+#define TK_COLON                          133
+#define TK_STREAM                         134
+#define TK_ABORT                          135
+#define TK_AFTER                          136
+#define TK_ATTACH                         137
+#define TK_BEFORE                         138
+#define TK_BEGIN                          139
+#define TK_CASCADE                        140
+#define TK_CLUSTER                        141
+#define TK_CONFLICT                       142
+#define TK_COPY                           143
+#define TK_DEFERRED                       144
+#define TK_DELIMITERS                     145
+#define TK_DETACH                         146
+#define TK_EACH                           147
+#define TK_END                            148
+#define TK_EXPLAIN                        149
+#define TK_FAIL                           150
+#define TK_FOR                            151
+#define TK_IGNORE                         152
+#define TK_IMMEDIATE                      153
+#define TK_INITIALLY                      154
+#define TK_INSTEAD                        155
+#define TK_MATCH                          156
+#define TK_KEY                            157
+#define TK_OF                             158
+#define TK_RAISE                          159
+#define TK_REPLACE                        160
+#define TK_RESTRICT                       161
+#define TK_ROW                            162
+#define TK_STATEMENT                      163
+#define TK_TRIGGER                        164
+#define TK_VIEW                           165
+#define TK_COUNT                          166
+#define TK_SUM                            167
+#define TK_AVG                            168
+#define TK_MIN                            169
+#define TK_MAX                            170
+#define TK_FIRST                          171
+#define TK_LAST                           172
+#define TK_TOP                            173
+#define TK_BOTTOM                         174
+#define TK_STDDEV                         175
+#define TK_PERCENTILE                     176
+#define TK_APERCENTILE                    177
+#define TK_LEASTSQUARES                   178
+#define TK_HISTOGRAM                      179
+#define TK_DIFF                           180
+#define TK_SPREAD                         181
+#define TK_TWA                            182
+#define TK_INTERP                         183
+#define TK_LAST_ROW                       184
+#define TK_RATE                           185
+#define TK_IRATE                          186
+#define TK_SUM_RATE                       187
+#define TK_SUM_IRATE                      188
+#define TK_AVG_RATE                       189
+#define TK_AVG_IRATE                      190
+#define TK_SEMI                           191
+#define TK_NONE                           192
+#define TK_PREV                           193
+#define TK_LINEAR                         194
+#define TK_IMPORT                         195
+#define TK_METRIC                         196
+#define TK_TBNAME                         197
+#define TK_JOIN                           198
+#define TK_METRICS                        199
+#define TK_STABLE                         200
+#define TK_INSERT                         201
+#define TK_INTO                           202
+#define TK_VALUES                         203
 
 #endif
 

src/inc/twal.h

@@ -34,7 +34,7 @@ typedef struct {
 } SWalHead;
 
 typedef struct {
-  int8_t    commitLog; // commitLog
+  int8_t    walLevel;  // wal level
   int8_t    wals;      // number of WAL files;
   int8_t    keep;      // keep the wal file when closed
 } SWalCfg;

src/kit/shell/src/shellEngine.c

@@ -60,12 +60,10 @@ TAOS *shellInit(struct arguments *args) {
 
   taos_init();
   /*
-   * set tsMetricMetaKeepTimer = 3000ms
-   * set tsMeterMetaKeepTimer = 3000ms
+   * set tsTableMetaKeepTimer = 3000ms
    * means not save cache in shell
    */
-  tsMetricMetaKeepTimer = 3;
-  tsMeterMetaKeepTimer = 3000;
+  tsTableMetaKeepTimer = 3000;
 
   // Connect to the database.
   TAOS *con = taos_connect(args->host, args->user, args->password, args->database, tsMnodeShellPort);

src/mnode/inc/mgmtDef.h

@@ -151,7 +151,7 @@ typedef struct {
   int32_t commitTime;
   int8_t  precision;
   int8_t  compression;
-  int8_t  commitLog;
+  int8_t  walLevel;
   int8_t  replications;
   int8_t  reserved[16];
 } SDbCfg;

src/mnode/src/mgmtDb.c

@@ -251,8 +251,8 @@ static int32_t mgmtCheckDbCfg(SDbCfg *pCfg) {
     return TSDB_CODE_INVALID_OPTION;
   }
 
-  if (pCfg->commitLog < TSDB_MIN_CLOG_LEVEL || pCfg->commitLog > TSDB_MAX_CLOG_LEVEL) {
-    mError("invalid db option commitLog:%d, only 0-2 allowed", pCfg->commitLog);
+  if (pCfg->walLevel < TSDB_MIN_WAL_LEVEL || pCfg->walLevel > TSDB_MAX_WAL_LEVEL) {
+    mError("invalid db option walLevel:%d, only 0-2 allowed", pCfg->walLevel);
     return TSDB_CODE_INVALID_OPTION;
   }
 
@@ -274,8 +274,8 @@ static int32_t mgmtCheckDbCfg(SDbCfg *pCfg) {
 
 static void mgmtSetDefaultDbCfg(SDbCfg *pCfg) {
   if (pCfg->cacheBlockSize < 0) pCfg->cacheBlockSize = tsCacheBlockSize;
-  if (pCfg->totalBlocks < 0) pCfg->totalBlocks = tsTotalBlocks;
-  if (pCfg->maxTables < 0) pCfg->maxTables = tsTablesPerVnode;
+  if (pCfg->totalBlocks < 0) pCfg->totalBlocks = tsBlocksPerVnode;
+  if (pCfg->maxTables < 0) pCfg->maxTables = tsMaxTablePerVnode;
   if (pCfg->daysPerFile < 0) pCfg->daysPerFile = tsDaysPerFile;
   if (pCfg->daysToKeep < 0) pCfg->daysToKeep = tsDaysToKeep;
   if (pCfg->daysToKeep1 < 0) pCfg->daysToKeep1 = pCfg->daysToKeep;
@@ -285,7 +285,7 @@ static void mgmtSetDefaultDbCfg(SDbCfg *pCfg) {
   if (pCfg->commitTime < 0) pCfg->commitTime = tsCommitTime;
   if (pCfg->precision < 0) pCfg->precision = tsTimePrecision;
   if (pCfg->compression < 0) pCfg->compression = tsCompression;
-  if (pCfg->commitLog < 0) pCfg->commitLog = tsCommitLog;
+  if (pCfg->walLevel < 0) pCfg->walLevel = tsWAL;
   if (pCfg->replications < 0) pCfg->replications = tsReplications;
 }
 
@@ -312,8 +312,8 @@ static int32_t mgmtCreateDb(SAcctObj *pAcct, SCMCreateDbMsg *pCreate) {
   pDb->createdTime = taosGetTimestampMs(); 
   pDb->cfg = (SDbCfg) {
     .cacheBlockSize      = pCreate->cacheBlockSize,
-    .totalBlocks         = pCreate->totalBlocks,
-    .maxTables           = pCreate->maxSessions,
+    .totalBlocks         = pCreate->numOfBlocks,
+    .maxTables           = pCreate->maxTables,
     .daysPerFile         = pCreate->daysPerFile,
     .daysToKeep          = pCreate->daysToKeep,
     .daysToKeep1         = pCreate->daysToKeep1,
@@ -323,7 +323,7 @@ static int32_t mgmtCreateDb(SAcctObj *pAcct, SCMCreateDbMsg *pCreate) {
     .commitTime          = pCreate->commitTime,
     .precision           = pCreate->precision,
     .compression         = pCreate->compression,
-    .commitLog           = pCreate->commitLog,
+    .walLevel            = pCreate->walLevel,
     .replications        = pCreate->replications
   };
 
@@ -491,7 +491,7 @@ static int32_t mgmtGetDbMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pConn)
 #endif
     pShow->bytes[cols] = 4;
     pSchema[cols].type = TSDB_DATA_TYPE_INT;
-    strcpy(pSchema[cols].name, "tables");
+    strcpy(pSchema[cols].name, "maxtables");
     pSchema[cols].bytes = htons(pShow->bytes[cols]);
     cols++;
 
@@ -521,13 +521,13 @@ static int32_t mgmtGetDbMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pConn)
 
     pShow->bytes[cols] = 4;
     pSchema[cols].type = TSDB_DATA_TYPE_INT;
-    strcpy(pSchema[cols].name, "ctime(s)");
+    strcpy(pSchema[cols].name, "ctime(Sec.)");
     pSchema[cols].bytes = htons(pShow->bytes[cols]);
     cols++;
 
     pShow->bytes[cols] = 1;
     pSchema[cols].type = TSDB_DATA_TYPE_TINYINT;
-    strcpy(pSchema[cols].name, "clog");
+    strcpy(pSchema[cols].name, "wallevel");
     pSchema[cols].bytes = htons(pShow->bytes[cols]);
     cols++;
 
@@ -659,7 +659,7 @@ static int32_t mgmtRetrieveDbs(SShowObj *pShow, char *data, int32_t rows, void *
       cols++;
 
       pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
-      *(int8_t *)pWrite = pDb->cfg.commitLog;
+      *(int8_t *)pWrite = pDb->cfg.walLevel;
       cols++;
 
       pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
@@ -728,9 +728,10 @@ static int32_t mgmtSetDbDropping(SDbObj *pDb) {
 
 static void mgmtProcessCreateDbMsg(SQueuedMsg *pMsg) {
   SCMCreateDbMsg *pCreate = pMsg->pCont;
-  pCreate->maxSessions     = htonl(pCreate->maxSessions);
+  
+  pCreate->maxTables       = htonl(pCreate->maxTables);
   pCreate->cacheBlockSize  = htonl(pCreate->cacheBlockSize);
-  pCreate->totalBlocks     = htonl(pCreate->totalBlocks);
+  pCreate->numOfBlocks     = htonl(pCreate->numOfBlocks);
   pCreate->daysPerFile     = htonl(pCreate->daysPerFile);
   pCreate->daysToKeep      = htonl(pCreate->daysToKeep);
   pCreate->daysToKeep1     = htonl(pCreate->daysToKeep1);
@@ -757,14 +758,15 @@ static void mgmtProcessCreateDbMsg(SQueuedMsg *pMsg) {
 static SDbCfg mgmtGetAlterDbOption(SDbObj *pDb, SCMAlterDbMsg *pAlter) {
   SDbCfg  newCfg = pDb->cfg;
   int32_t cacheBlockSize = htonl(pAlter->daysToKeep);
-  int32_t totalBlocks = htonl(pAlter->totalBlocks);
-  int32_t maxTables = htonl(pAlter->maxSessions);
-  int32_t daysToKeep = htonl(pAlter->daysToKeep);
+  int32_t totalBlocks = htonl(pAlter->numOfBlocks);
+  int32_t maxTables   = htonl(pAlter->maxTables);
+  int32_t daysToKeep  = htonl(pAlter->daysToKeep);
   int32_t daysToKeep1 = htonl(pAlter->daysToKeep1);
   int32_t daysToKeep2 = htonl(pAlter->daysToKeep2);
   int8_t  compression = pAlter->compression;
   int8_t  replications = pAlter->replications;
-
+  int8_t  walLevel   = pAlter->walLevel;
+  
   terrno = TSDB_CODE_SUCCESS;
 
   if (cacheBlockSize > 0 && cacheBlockSize != pDb->cfg.cacheBlockSize) {
@@ -820,6 +822,11 @@ static SDbCfg mgmtGetAlterDbOption(SDbObj *pDb, SCMAlterDbMsg *pAlter) {
     mError("db:%s, replica number can't change from 3 to 1", pDb->name, replications);
     terrno = TSDB_CODE_INVALID_OPTION;
   }
+  
+  if (walLevel < TSDB_MIN_WAL_LEVEL || walLevel > TSDB_MAX_WAL_LEVEL) {
+    mError("db:%s, wal level should be between 0-2", pDb->name);
+    terrno = TSDB_CODE_INVALID_OPTION;
+  }
 
   return newCfg;
 }

src/mnode/src/mgmtSdb.c

@@ -142,7 +142,7 @@ static void *sdbGetTableFromId(int32_t tableId) {
 }
 
 static int32_t sdbInitWal() {
-  SWalCfg walCfg = {.commitLog = 2, .wals = 2, .keep = 1};
+  SWalCfg walCfg = {.walLevel = 2, .wals = 2, .keep = 1};
   tsSdbObj.wal = walOpen(tsMnodeDir, &walCfg);
   if (tsSdbObj.wal == NULL) {
     sdbError("failed to open sdb wal in %s", tsMnodeDir);

src/mnode/src/mgmtVgroup.c

@@ -563,7 +563,7 @@ SMDCreateVnodeMsg *mgmtBuildCreateVnodeMsg(SVgObj *pVgroup) {
   pCfg->commitTime          = htonl(pDb->cfg.commitTime);
   pCfg->precision           = pDb->cfg.precision;
   pCfg->compression         = pDb->cfg.compression;
-  pCfg->commitLog           = pDb->cfg.commitLog;
+  pCfg->walLevel            = pDb->cfg.walLevel;
   pCfg->replications        = (int8_t) pVgroup->numOfVnodes;
   pCfg->wals                = 3;
   pCfg->quorum              = 1;

src/query/inc/qsqlparser.h

@@ -111,13 +111,13 @@ typedef struct SCreateDBInfo {
   SSQLToken dbname;
   int32_t   replica;
   int32_t   cacheBlockSize;
-  int32_t   tablesPerVnode;
+  int32_t   maxTablesPerVnode;
+  int32_t   numOfBlocks;
   int32_t   daysPerFile;
-  int32_t   rowPerFileBlock;
-  float     numOfAvgCacheBlocks;
-  int32_t   numOfBlocksPerTable;
+  int32_t   minRowsPerBlock;
+  int32_t   maxRowsPerBlock;
   int64_t   commitTime;
-  int32_t   commitLog;
+  int32_t   walLevel;
   int32_t   compressionLevel;
   SSQLToken precision;
   bool      ignoreExists;

src/query/inc/sql.y

@@ -212,31 +212,30 @@ acct_optr(Y) ::= pps(C) tseries(D) storage(P) streams(F) qtime(Q) dbs(E) users(K
 %destructor keep {tVariantListDestroy($$);}
 keep(Y)    ::= KEEP tagitemlist(X).           { Y = X; }
 
-tables(Y)  ::= TABLES INTEGER(X).             { Y = X; }
+tables(Y)  ::= MAXTABLES INTEGER(X).          { Y = X; }
 cache(Y)   ::= CACHE INTEGER(X).              { Y = X; }
 replica(Y) ::= REPLICA INTEGER(X).            { Y = X; }
 days(Y)    ::= DAYS INTEGER(X).               { Y = X; }
-rows(Y)    ::= ROWS INTEGER(X).               { Y = X; }
-
-ablocks(Y) ::= ABLOCKS ID(X).                 { Y = X; }
-tblocks(Y) ::= TBLOCKS INTEGER(X).            { Y = X; }
+minrows(Y) ::= MINROWS INTEGER(X).            { Y = X; }
+maxrows(Y) ::= MAXROWS INTEGER(X).            { Y = X; }
+blocks(Y)  ::= BLOCKS INTEGER(X).             { Y = X; }
 ctime(Y)   ::= CTIME INTEGER(X).              { Y = X; }
-clog(Y)    ::= CLOG INTEGER(X).               { Y = X; }
+wal(Y)     ::= WAL INTEGER(X).                { Y = X; }
 comp(Y)    ::= COMP INTEGER(X).               { Y = X; }
 prec(Y)    ::= PRECISION STRING(X).           { Y = X; }
 
 %type db_optr {SCreateDBInfo}
 db_optr(Y) ::= . {setDefaultCreateDbOption(&Y);}
 
-db_optr(Y) ::= db_optr(Z) tables(X).         { Y = Z; Y.tablesPerVnode = strtol(X.z, NULL, 10); }
+db_optr(Y) ::= db_optr(Z) tables(X).         { Y = Z; Y.maxTablesPerVnode = strtol(X.z, NULL, 10); }
 db_optr(Y) ::= db_optr(Z) cache(X).          { Y = Z; Y.cacheBlockSize = strtol(X.z, NULL, 10); }
 db_optr(Y) ::= db_optr(Z) replica(X).        { Y = Z; Y.replica = strtol(X.z, NULL, 10); }
 db_optr(Y) ::= db_optr(Z) days(X).           { Y = Z; Y.daysPerFile = strtol(X.z, NULL, 10); }
-db_optr(Y) ::= db_optr(Z) rows(X).           { Y = Z; Y.rowPerFileBlock = strtol(X.z, NULL, 10); }
-db_optr(Y) ::= db_optr(Z) ablocks(X).        { Y = Z; Y.numOfAvgCacheBlocks = strtod(X.z, NULL); }
-db_optr(Y) ::= db_optr(Z) tblocks(X).        { Y = Z; Y.numOfBlocksPerTable = strtol(X.z, NULL, 10); }
+db_optr(Y) ::= db_optr(Z) minrows(X).        { Y = Z; Y.minRowsPerBlock = strtod(X.z, NULL); }
+db_optr(Y) ::= db_optr(Z) maxrows(X).        { Y = Z; Y.maxRowsPerBlock = strtod(X.z, NULL); }
+db_optr(Y) ::= db_optr(Z) blocks(X).         { Y = Z; Y.numOfBlocks = strtol(X.z, NULL, 10); }
 db_optr(Y) ::= db_optr(Z) ctime(X).          { Y = Z; Y.commitTime = strtol(X.z, NULL, 10); }
-db_optr(Y) ::= db_optr(Z) clog(X).           { Y = Z; Y.commitLog = strtol(X.z, NULL, 10); }
+db_optr(Y) ::= db_optr(Z) wal(X).            { Y = Z; Y.walLevel = strtol(X.z, NULL, 10); }
 db_optr(Y) ::= db_optr(Z) comp(X).           { Y = Z; Y.compressionLevel = strtol(X.z, NULL, 10); }
 db_optr(Y) ::= db_optr(Z) prec(X).           { Y = Z; Y.precision = X; }
 db_optr(Y) ::= db_optr(Z) keep(X).           { Y = Z; Y.keep = X; }
@@ -245,7 +244,11 @@ db_optr(Y) ::= db_optr(Z) keep(X).           { Y = Z; Y.keep = X; }
 alter_db_optr(Y) ::= . { setDefaultCreateDbOption(&Y);}
 
 alter_db_optr(Y) ::= alter_db_optr(Z) replica(X).     { Y = Z; Y.replica = strtol(X.z, NULL, 10); }
-alter_db_optr(Y) ::= alter_db_optr(Z) tables(X).      { Y = Z; Y.tablesPerVnode = strtol(X.z, NULL, 10); }
+alter_db_optr(Y) ::= alter_db_optr(Z) tables(X).      { Y = Z; Y.maxTablesPerVnode = strtol(X.z, NULL, 10); }
+alter_db_optr(Y) ::= alter_db_optr(Z) keep(X).        { Y = Z; Y.keep = X; }
+alter_db_optr(Y) ::= alter_db_optr(Z) blocks(X).      { Y = Z; Y.numOfBlocks = strtol(X.z, NULL, 10); }
+alter_db_optr(Y) ::= alter_db_optr(Z) comp(X).        { Y = Z; Y.compressionLevel = strtol(X.z, NULL, 10); }
+alter_db_optr(Y) ::= alter_db_optr(Z) wal(X).         { Y = Z; Y.walLevel = strtol(X.z, NULL, 10); }
 
 %type typename {TAOS_FIELD}
 typename(A) ::= ids(X).              { tSQLSetColumnType (&A, &X); }

src/query/src/qparserImpl.c

@@ -886,16 +886,16 @@ void setKillSQL(SSqlInfo *pInfo, int32_t type, SSQLToken *ip) {
 }
 
 void setDefaultCreateDbOption(SCreateDBInfo *pDBInfo) {
-  pDBInfo->numOfBlocksPerTable = 50;
   pDBInfo->compressionLevel = -1;
 
-  pDBInfo->commitLog = -1;
+  pDBInfo->walLevel = -1;
   pDBInfo->commitTime = -1;
-  pDBInfo->tablesPerVnode = -1;
-  pDBInfo->numOfAvgCacheBlocks = -1;
+  pDBInfo->maxTablesPerVnode = -1;
 
   pDBInfo->cacheBlockSize = -1;
-  pDBInfo->rowPerFileBlock = -1;
+  pDBInfo->numOfBlocks = -1;
+  pDBInfo->maxRowsPerBlock = -1;
+  pDBInfo->minRowsPerBlock = -1;
   pDBInfo->daysPerFile = -1;
 
   pDBInfo->replica = -1;

src/query/src/qtokenizer.c

@@ -117,12 +117,13 @@ static SKeyword keywordTable[] = {
     {"KEEP",         TK_KEEP},
     {"REPLICA",      TK_REPLICA},
     {"DAYS",         TK_DAYS},
-    {"ROWS",         TK_ROWS},
+    {"MINROWS",      TK_MINROWS},
+    {"MAXROWS",      TK_MAXROWS},
+    {"BLOCKS",       TK_BLOCKS},
+    {"MAXTABLES",    TK_MAXTABLES},
     {"CACHE",        TK_CACHE},
-    {"ABLOCKS",      TK_ABLOCKS},
-    {"TBLOCKS",      TK_TBLOCKS},
     {"CTIME",        TK_CTIME},
-    {"CLOG",         TK_CLOG},
+    {"WAL",          TK_WAL},
     {"COMP",         TK_COMP},
     {"PRECISION",    TK_PRECISION},
     {"LP",           TK_LP},

src/vnode/src/vnodeMain.c

@@ -117,7 +117,7 @@ int32_t vnodeCreate(SMDCreateVnodeMsg *pVnodeCfg) {
     return TSDB_CODE_VG_INIT_FAILED;
   }
 
-  dPrint("vgId:%d, vnode is created, clog:%d", pVnodeCfg->cfg.vgId, pVnodeCfg->cfg.commitLog);
+  dPrint("vgId:%d, vnode is created, clog:%d", pVnodeCfg->cfg.vgId, pVnodeCfg->cfg.walLevel);
   code = vnodeOpen(pVnodeCfg->cfg.vgId, rootDir);
 
   return code;
@@ -433,7 +433,7 @@ static int32_t vnodeSaveCfg(SMDCreateVnodeMsg *pVnodeCfg) {
   len += snprintf(content + len, maxLen - len, "  \"commitTime\": %d,\n", pVnodeCfg->cfg.commitTime);  
   len += snprintf(content + len, maxLen - len, "  \"precision\": %d,\n", pVnodeCfg->cfg.precision);
   len += snprintf(content + len, maxLen - len, "  \"compression\": %d,\n", pVnodeCfg->cfg.compression);
-  len += snprintf(content + len, maxLen - len, "  \"commitLog\": %d,\n", pVnodeCfg->cfg.commitLog);
+  len += snprintf(content + len, maxLen - len, "  \"walLevel\": %d,\n", pVnodeCfg->cfg.walLevel);
   len += snprintf(content + len, maxLen - len, "  \"replica\": %d,\n", pVnodeCfg->cfg.replications);
   len += snprintf(content + len, maxLen - len, "  \"wals\": %d,\n", pVnodeCfg->cfg.wals);
   len += snprintf(content + len, maxLen - len, "  \"quorum\": %d,\n", pVnodeCfg->cfg.quorum);
@@ -578,12 +578,12 @@ static int32_t vnodeReadCfg(SVnodeObj *pVnode) {
   }
   pVnode->tsdbCfg.compression = (int8_t)compression->valueint;
 
-  cJSON *commitLog = cJSON_GetObjectItem(root, "commitLog");
-  if (!commitLog || commitLog->type != cJSON_Number) {
-    dError("pVnode:%p vgId:%d, failed to read vnode cfg, commitLog not found", pVnode, pVnode->vgId);
+  cJSON *walLevel = cJSON_GetObjectItem(root, "walLevel");
+  if (!walLevel || walLevel->type != cJSON_Number) {
+    dError("pVnode:%p vgId:%d, failed to read vnode cfg, walLevel not found", pVnode, pVnode->vgId);
     goto PARSE_OVER;
   }
-  pVnode->walCfg.commitLog = (int8_t)commitLog->valueint;
+  pVnode->walCfg.walLevel = (int8_t) walLevel->valueint;
 
   cJSON *wals = cJSON_GetObjectItem(root, "wals");
   if (!wals || wals->type != cJSON_Number) {

src/wal/src/walMain.c

@@ -62,7 +62,7 @@ void *walOpen(const char *path, const SWalCfg *pCfg) {
   pWal->max = pCfg->wals;
   pWal->id = 0;
   pWal->num = 0;
-  pWal->level = pCfg->commitLog;
+  pWal->level = pCfg->walLevel;
   pWal->keep = pCfg->keep;
   strcpy(pWal->path, path);
   pthread_mutex_init(&pWal->mutex, NULL);

src/wal/test/waltest.c

@@ -80,7 +80,7 @@ int main(int argc, char *argv[]) {
   taosInitLog("wal.log", 100000, 10);
 
   SWalCfg walCfg;
-  walCfg.commitLog = level;
+  walCfg.walLevel = level;
   walCfg.wals = max;
   walCfg.keep = keep;
 

tests/examples/c/demo.c

@@ -74,8 +74,9 @@ int main(int argc, char *argv[]) {
   printf("success to connect to server\n");
   
   doQuery(taos, "create database if not exists test");
-  doQuery(taos, "use test");
-  doQuery(taos, "select * from t1 order by ts desc");
+  doQuery(taos, "create database if not exists test");
+//  doQuery(taos, "use test");
+//  doQuery(taos, "select sum(k)*max(k), sum(k), max(k) from tm99");
   
 //  doQuery(taos, "create table t1(ts timestamp, k binary(12), f nchar(2))");
 //  for(int32_t i = 0; i< 100000; ++i) {

tests/pytest/insert/date.py

@@ -18,7 +18,7 @@ class TDTestCase:
         # TSIM:
         # TSIM: system sh/ip.sh -i 1 -s up
         # TSIM: system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
-        # TSIM: system sh/cfg.sh -n dnode1 -c commitLog -v 0
+        # TSIM: system sh/cfg.sh -n dnode1 -c walLevel -v 0
         # TSIM: system sh/exec.sh -n dnode1 -s start
         # TSIM:
         # TSIM: sleep 3000

tests/pytest/table/column_name.py

@@ -18,7 +18,7 @@ class TDTestCase:
         # TSIM:
         # TSIM: system sh/ip.sh -i 1 -s up
         # TSIM: system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
-        # TSIM: system sh/cfg.sh -n dnode1 -c commitLog -v 0
+        # TSIM: system sh/cfg.sh -n dnode1 -c walLevel -v 0
         # TSIM: system sh/exec.sh -n dnode1 -s start
         # TSIM:
         # TSIM: sleep 3000

tests/pytest/table/column_num.py

@@ -18,7 +18,7 @@ class TDTestCase:
         # TSIM:
         # TSIM: system sh/ip.sh -i 1 -s up
         # TSIM: system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
-        # TSIM: system sh/cfg.sh -n dnode1 -c commitLog -v 0
+        # TSIM: system sh/cfg.sh -n dnode1 -c walLevel -v 0
         # TSIM: system sh/exec.sh -n dnode1 -s start
         # TSIM:
         # TSIM: sleep 3000

tests/script/general/agg/fill.sim

 system sh/stop_dnodes.sh
 
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c commitLog -v 0
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
 sleep 3000

tests/script/general/alter/metrics.sim

@@ -2,7 +2,7 @@ system sh/stop_dnodes.sh
 
 
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c commitLog -v 0
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
 sleep 3000

tests/script/general/alter/table.sim

@@ -2,7 +2,7 @@ system sh/stop_dnodes.sh
 
 
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c commitLog -v 0
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
 sleep 3000

tests/script/general/cache/cache_balance.sim

@@ -4,8 +4,8 @@ system sh/stop_dnodes.sh
 system sh/deploy.sh -n dnode1 -i 1
 system sh/deploy.sh -n dnode2 -i 2
 
-system sh/cfg.sh -n dnode1 -c commitLog           -v 0
-system sh/cfg.sh -n dnode2 -c commitLog           -v 0
+system sh/cfg.sh -n dnode1 -c walLevel           -v 0
+system sh/cfg.sh -n dnode2 -c walLevel           -v 0
 system sh/cfg.sh -n dnode1 -c httpMaxThreads      -v 2
 system sh/cfg.sh -n dnode2 -c httpMaxThreads      -v 2
 system sh/cfg.sh -n dnode1 -c monitor             -v 1

tests/script/general/cache/new_metrics.sim

@@ -2,7 +2,7 @@ system sh/stop_dnodes.sh
 
 
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c commitLog -v 0
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/cfg.sh -n dnode1 -c meterMetaKeepTimer -v 10
 system sh/cfg.sh -n dnode1 -c metricMetaKeepTimer -v 10
 system sh/exec.sh -n dnode1 -s start

tests/script/general/cache/new_stream.sim

@@ -2,7 +2,7 @@ system sh/stop_dnodes.sh
 
 
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c commitLog -v 0
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/cfg.sh -n dnode1 -c meterMetaKeepTimer -v 10
 system sh/cfg.sh -n dnode1 -c metricMetaKeepTimer -v 10
 system sh/exec.sh -n dnode1 -s start

tests/script/general/cache/restart_metrics.sim

@@ -2,7 +2,7 @@ system sh/stop_dnodes.sh
 
 
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c commitLog -v 0
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/cfg.sh -n dnode1 -c meterMetaKeepTimer -v 10
 system sh/cfg.sh -n dnode1 -c metricMetaKeepTimer -v 10
 system sh/exec.sh -n dnode1 -s start
@@ -48,7 +48,7 @@ endi
 print =============== step2
 system sh/exec.sh -n dnode1 -s stop
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c commitLog -v 0
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/cfg.sh -n dnode1 -c meterMetaKeepTimer -v 10
 system sh/cfg.sh -n dnode1 -c metricMetaKeepTimer -v 10
 system sh/exec.sh -n dnode1 -s start

tests/script/general/cache/restart_stream.sim

@@ -2,7 +2,7 @@ system sh/stop_dnodes.sh
 
 
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c commitLog -v 0
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/cfg.sh -n dnode1 -c meterMetaKeepTimer -v 1
 system sh/cfg.sh -n dnode1 -c metricMetaKeepTimer -v 1
 system sh/exec.sh -n dnode1 -s start
@@ -98,7 +98,7 @@ endi
 print =============== step4
 system sh/exec.sh -n dnode1 -s stop
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c commitLog -v 0
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/cfg.sh -n dnode1 -c meterMetaKeepTimer -v 1
 system sh/cfg.sh -n dnode1 -c metricMetaKeepTimer -v 1
 system sh/exec.sh -n dnode1 -s start

tests/script/general/cache/restart_table.sim

@@ -2,7 +2,7 @@ system sh/stop_dnodes.sh
 
 
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c commitLog -v 0
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/cfg.sh -n dnode1 -c meterMetaKeepTimer -v 10
 system sh/cfg.sh -n dnode1 -c metricMetaKeepTimer -v 10
 system sh/exec.sh -n dnode1 -s start
@@ -36,7 +36,7 @@ endi
 print =============== step2
 system sh/exec.sh -n dnode1 -s stop
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c commitLog -v 0
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/cfg.sh -n dnode1 -c meterMetaKeepTimer -v 10
 system sh/cfg.sh -n dnode1 -c metricMetaKeepTimer -v 10
 system sh/exec.sh -n dnode1 -s start

tests/script/general/column/commit.sim

@@ -2,7 +2,7 @@ system sh/stop_dnodes.sh
 
 
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c commitLog -v 0
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
 sleep 3000

tests/script/general/column/metrics.sim

@@ -2,7 +2,7 @@ system sh/stop_dnodes.sh
 
 
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c commitLog -v 0
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
 sleep 3000

tests/script/general/column/table.sim

@@ -2,7 +2,7 @@ system sh/stop_dnodes.sh
 
 
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c commitLog -v 0
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
 sleep 3000

tests/script/general/compress/commitlog.sim

@@ -2,7 +2,7 @@ system sh/stop_dnodes.sh
 
 
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c commitLog -v 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 1
 system sh/cfg.sh -n dnode1 -c cacheBlockSize -v 1024
 system sh/cfg.sh -n dnode1 -c compression -v 1
 system sh/exec.sh -n dnode1 -s start

tests/script/general/compress/compress.sim

@@ -2,7 +2,7 @@ system sh/stop_dnodes.sh
 
 
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c commitLog -v 0
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/cfg.sh -n dnode1 -c cacheBlockSize -v 1024
 system sh/cfg.sh -n dnode1 -c compression -v 1
 system sh/exec.sh -n dnode1 -s start

tests/script/general/compress/compress2.sim

@@ -2,7 +2,7 @@ system sh/stop_dnodes.sh
 
 
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c commitLog -v 0
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/cfg.sh -n dnode1 -c cacheBlockSize -v 1024
 system sh/cfg.sh -n dnode1 -c compression -v 2
 system sh/exec.sh -n dnode1 -s start

tests/script/general/compress/uncompress.sim

@@ -2,7 +2,7 @@ system sh/stop_dnodes.sh
 
 
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c commitLog -v 0
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/cfg.sh -n dnode1 -c cacheBlockSize -v 1024
 system sh/cfg.sh -n dnode1 -c compression -v 1
 system sh/exec.sh -n dnode1 -s start

tests/script/general/compute/avg.sim

 system sh/stop_dnodes.sh
 
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c commitLog -v 0
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 sleep 3000
 sql connect

tests/script/general/compute/bottom.sim

 system sh/stop_dnodes.sh
 
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c commitLog -v 0
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 sleep 3000
 sql connect

tests/script/general/compute/count.sim

 system sh/stop_dnodes.sh
 
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c commitLog -v 0
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 sleep 3000
 sql connect

tests/script/general/compute/diff.sim

 system sh/stop_dnodes.sh
 
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c commitLog -v 0
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 sleep 3000
 sql connect

tests/script/general/compute/diff2.sim

 system sh/stop_dnodes.sh
 
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c commitLog -v 0
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 sleep 3000
 sql connect

tests/script/general/compute/first.sim

 system sh/stop_dnodes.sh
 
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c commitLog -v 0
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 sleep 3000
 sql connect

tests/script/general/compute/interval.sim

 system sh/stop_dnodes.sh
 
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c commitLog -v 0
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 sleep 3000
 sql connect

tests/script/general/compute/last.sim

 system sh/stop_dnodes.sh
 
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c commitLog -v 0
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 sleep 3000
 sql connect

tests/script/general/compute/leastsquare.sim

 system sh/stop_dnodes.sh
 
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c commitLog -v 0
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 sleep 3000
 sql connect

tests/script/general/compute/max.sim

 system sh/stop_dnodes.sh
 
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c commitLog -v 0
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 sleep 3000
 sql connect

tests/script/general/compute/min.sim

 system sh/stop_dnodes.sh
 
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c commitLog -v 0
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
 sleep 3000

tests/script/general/compute/null.sim

 system sh/stop_dnodes.sh
 
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c commitLog -v 0
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 sleep 3000
 sql connect

tests/script/general/compute/percentile.sim

 system sh/stop_dnodes.sh
 
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c commitLog -v 0
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 sleep 3000
 sql connect

tests/script/general/compute/stddev.sim

 system sh/stop_dnodes.sh
 
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c commitLog -v 0
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 sleep 3000
 sql connect

tests/script/general/compute/sum.sim

 system sh/stop_dnodes.sh
 
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c commitLog -v 0
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 sleep 3000
 sql connect

tests/script/general/compute/top.sim

 system sh/stop_dnodes.sh
 
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c commitLog -v 0
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 sleep 3000
 sql connect

tests/script/general/db/backup/keep.sim

@@ -6,9 +6,9 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/deploy.sh -n dnode2 -i 2
 system sh/deploy.sh -n dnode3 -i 3
 
-system sh/cfg.sh -n dnode1 -c commitLog -v 0
-system sh/cfg.sh -n dnode2 -c commitLog -v 0
-system sh/cfg.sh -n dnode3 -c commitLog -v 0
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/cfg.sh -n dnode2 -c walLevel -v 0
+system sh/cfg.sh -n dnode3 -c walLevel -v 0
 system sh/cfg.sh -n dnode1 -c numOfMPeers -v 1
 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 1
 system sh/cfg.sh -n dnode3 -c numOfMPeers -v 1

tests/script/general/db/delete_reuse1.sim

@@ -9,10 +9,10 @@ system sh/deploy.sh -n dnode2 -i 2
 system sh/deploy.sh -n dnode3 -i 3
 system sh/deploy.sh -n dnode4 -i 4
 
-system sh/cfg.sh -n dnode1 -c commitLog -v 0
-system sh/cfg.sh -n dnode2 -c commitLog -v 0
-system sh/cfg.sh -n dnode3 -c commitLog -v 0
-system sh/cfg.sh -n dnode4 -c commitLog -v 0
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/cfg.sh -n dnode2 -c walLevel -v 0
+system sh/cfg.sh -n dnode3 -c walLevel -v 0
+system sh/cfg.sh -n dnode4 -c walLevel -v 0
 
 system sh/cfg.sh -n dnode1 -c numOfMPeers -v 1
 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 1

tests/script/general/db/delete_reuse2.sim

@@ -9,10 +9,10 @@ system sh/deploy.sh -n dnode2 -i 2
 system sh/deploy.sh -n dnode3 -i 3
 system sh/deploy.sh -n dnode4 -i 4
 
-system sh/cfg.sh -n dnode1 -c commitLog -v 0
-system sh/cfg.sh -n dnode2 -c commitLog -v 0
-system sh/cfg.sh -n dnode3 -c commitLog -v 0
-system sh/cfg.sh -n dnode4 -c commitLog -v 0
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/cfg.sh -n dnode2 -c walLevel -v 0
+system sh/cfg.sh -n dnode3 -c walLevel -v 0
+system sh/cfg.sh -n dnode4 -c walLevel -v 0
 
 system sh/cfg.sh -n dnode1 -c numOfMPeers -v 1
 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 1

tests/script/general/db/delete_writing1.sim

@@ -9,10 +9,10 @@ system sh/deploy.sh -n dnode2 -i 2
 system sh/deploy.sh -n dnode3 -i 3
 system sh/deploy.sh -n dnode4 -i 4
 
-system sh/cfg.sh -n dnode1 -c commitLog -v 0
-system sh/cfg.sh -n dnode2 -c commitLog -v 0
-system sh/cfg.sh -n dnode3 -c commitLog -v 0
-system sh/cfg.sh -n dnode4 -c commitLog -v 0
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/cfg.sh -n dnode2 -c walLevel -v 0
+system sh/cfg.sh -n dnode3 -c walLevel -v 0
+system sh/cfg.sh -n dnode4 -c walLevel -v 0
 
 system sh/cfg.sh -n dnode1 -c numOfMPeers -v 1
 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 1

tests/script/general/db/len.sim

@@ -2,7 +2,7 @@ system sh/stop_dnodes.sh
 
 
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c commitLog -v 0
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 2000
 

tests/script/general/db/tables.sim

@@ -2,7 +2,7 @@ system sh/stop_dnodes.sh
 
 
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c commitLog -v 0
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 2000
 

tests/script/general/field/2.sim

@@ -2,7 +2,7 @@ system sh/stop_dnodes.sh
 
 
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c commitLog -v 0
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
 sleep 3000

tests/script/general/field/3.sim

@@ -2,7 +2,7 @@ system sh/stop_dnodes.sh
 
 
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c commitLog -v 0
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
 sleep 3000

tests/script/general/field/4.sim

@@ -2,7 +2,7 @@ system sh/stop_dnodes.sh
 
 
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c commitLog -v 0
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
 sleep 3000

tests/script/general/field/5.sim

@@ -2,7 +2,7 @@ system sh/stop_dnodes.sh
 
 
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c commitLog -v 0
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
 sleep 3000

tests/script/general/field/6.sim

@@ -2,7 +2,7 @@ system sh/stop_dnodes.sh
 
 
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c commitLog -v 0
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
 sleep 3000

tests/script/general/field/bigint.sim

@@ -2,7 +2,7 @@ system sh/stop_dnodes.sh
 
 
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c commitLog -v 0
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
 sleep 3000

tests/script/general/field/binary.sim

@@ -2,7 +2,7 @@ system sh/stop_dnodes.sh
 
 
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c commitLog -v 0
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
 sleep 3000

tests/script/general/field/bool.sim

@@ -2,7 +2,7 @@ system sh/stop_dnodes.sh
 
 
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c commitLog -v 0
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
 sleep 3000

tests/script/general/field/double.sim

@@ -2,7 +2,7 @@ system sh/stop_dnodes.sh
 
 
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c commitLog -v 0
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
 sleep 3000

tests/script/general/field/float.sim

@@ -2,7 +2,7 @@ system sh/stop_dnodes.sh
 
 
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c commitLog -v 0
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
 sleep 3000

tests/script/general/field/int.sim

@@ -2,7 +2,7 @@ system sh/stop_dnodes.sh
 
 
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c commitLog -v 0
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
 sleep 3000

tests/script/general/field/single.sim

@@ -2,7 +2,7 @@ system sh/stop_dnodes.sh
 
 
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c commitLog -v 0
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
 sleep 3000

tests/script/general/field/smallint.sim

@@ -2,7 +2,7 @@ system sh/stop_dnodes.sh
 
 
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c commitLog -v 0
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
 sleep 3000

tests/script/general/field/tinyint.sim

@@ -2,7 +2,7 @@ system sh/stop_dnodes.sh
 
 
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c commitLog -v 0
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
 sleep 3000

tests/script/general/http/grafana.sim

@@ -4,7 +4,7 @@ sleep 5000
 
 
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c commitLog -v 0
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
 #system sh/cfg.sh -n dnode1 -c adminRowLimit -v 10
 system sh/cfg.sh -n dnode1 -c httpDebugFlag -v 135
 system sh/exec.sh -n dnode1 -s start

tests/script/general/http/grafana_bug.sim

@@ -4,7 +4,7 @@ sleep 2000
 
 
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c commitLog -v 0
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
 #system sh/cfg.sh -n dnode1 -c adminRowLimit -v 10
 system sh/cfg.sh -n dnode1 -c httpDebugFlag -v 135
 system sh/exec.sh -n dnode1 -s start

tests/script/general/http/prepare.sim

@@ -4,7 +4,7 @@ sleep 5000
 
 
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c commitLog -v 0
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
 sleep 3000

tests/script/general/http/restful_insert.sim

@@ -4,7 +4,7 @@ sleep 5000
 
 
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c commitLog -v 0
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/cfg.sh -n dnode1 -c httpEnableRecordSql -v 1
 system sh/exec.sh -n dnode1 -s start
 

tests/script/general/http/restful_limit.sim

@@ -2,7 +2,7 @@ system sh/stop_dnodes.sh
 
 
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c commitLog -v 0
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
 sleep 3000

tests/script/general/http/telegraf.sim

@@ -4,7 +4,7 @@ sleep 5000
 
 
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c commitLog -v 0
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/cfg.sh -n dnode1 -c httpEnableRecordSql -v 1
 system sh/cfg.sh -n dnode1 -c telegrafUseFieldNum -v 0
 system sh/exec.sh -n dnode1 -s start

tests/script/general/insert/basic.sim

@@ -2,7 +2,7 @@ system sh/stop_dnodes.sh
 
 
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c commitLog -v 0
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
 sleep 3000

tests/script/general/insert/insert_drop.sim

 system sh/stop_dnodes.sh
 
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c commitLog -v 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 1
 system sh/exec.sh -n dnode1 -s start
 
 sleep 3000

tests/script/general/insert/query_block1_file.sim

@@ -2,7 +2,7 @@ system sh/stop_dnodes.sh
 
 
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c commitLog -v 0
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
 sleep 3000

tests/script/general/insert/query_block1_memory.sim

@@ -2,7 +2,7 @@ system sh/stop_dnodes.sh
 
 
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c commitLog -v 0
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
 sleep 3000

tests/script/general/insert/query_block2_file.sim

@@ -2,7 +2,7 @@ system sh/stop_dnodes.sh
 
 
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c commitLog -v 0
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
 sleep 3000

tests/script/general/insert/query_block2_memory.sim

@@ -2,7 +2,7 @@ system sh/stop_dnodes.sh
 
 
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c commitLog -v 0
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
 sleep 3000

tests/script/general/insert/query_file_memory.sim

@@ -2,7 +2,7 @@ system sh/stop_dnodes.sh
 
 
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c commitLog -v 0
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
 sleep 3000

tests/script/general/insert/query_multi_file.sim

@@ -2,7 +2,7 @@ system sh/stop_dnodes.sh
 
 
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c commitLog -v 0
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
 sleep 3000

tests/script/general/insert/tcp.sim

@@ -2,7 +2,7 @@ system sh/stop_dnodes.sh
 
 
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c commitLog -v 0
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
 sleep 3000

tests/script/general/metrics/disk.sim

@@ -2,7 +2,7 @@ system sh/stop_dnodes.sh
 
 
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c commitLog -v 0
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 4
 system sh/exec.sh -n dnode1 -s start

tests/script/general/metrics/metrics.sim

@@ -2,7 +2,7 @@ system sh/stop_dnodes.sh
 
 
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c commitLog -v 0
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 4
 system sh/exec.sh -n dnode1 -s start

tests/script/general/metrics/values.sim

@@ -2,7 +2,7 @@ system sh/stop_dnodes.sh
 
 
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c commitLog -v 0
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 4
 system sh/exec.sh -n dnode1 -s start

tests/script/general/metrics/vnode3.sim

@@ -2,7 +2,7 @@ system sh/stop_dnodes.sh
 
 
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c commitLog -v 0
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 4
 system sh/exec.sh -n dnode1 -s start

tests/script/general/parser/alter.sim

 system sh/stop_dnodes.sh
 
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c commitLog -v 0
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/cfg.sh -n dnode1 -c meterMetaKeepTimer -v 3
 system sh/cfg.sh -n dnode1 -c metricMetaKeepTimer -v 3
 system sh/exec.sh -n dnode1 -s start