Merge pull request #15403 from taosdata/feature/3.0_debug_wxy

feat: add db options of wal

include/common/tmsg.h

@@ -748,6 +748,10 @@ typedef struct {
   int8_t  ignoreExist;
   int32_t numOfRetensions;
   SArray* pRetensions;  // SRetention
+  int32_t walRetentionPeriod;
+  int32_t walRetentionSize;
+  int32_t walRollPeriod;
+  int32_t walSegmentSize;
 } SCreateDbReq;
 
 int32_t tSerializeSCreateDbReq(void* buf, int32_t bufLen, SCreateDbReq* pReq);
@@ -1977,7 +1981,7 @@ typedef struct SVCreateTbReq {
   union {
     struct {
       char*    name;  // super table name
-      uint8_t tagNum;
+      uint8_t  tagNum;
       tb_uid_t suid;
       SArray*  tagName;
       uint8_t* pTag;

include/common/ttokendef.h

@@ -16,261 +16,265 @@
 #ifndef _TD_COMMON_TOKEN_H_
 #define _TD_COMMON_TOKEN_H_
 
-#define TK_OR             1
-#define TK_AND            2
-#define TK_UNION          3
-#define TK_ALL            4
-#define TK_MINUS          5
-#define TK_EXCEPT         6
-#define TK_INTERSECT      7
-#define TK_NK_BITAND      8
-#define TK_NK_BITOR       9
-#define TK_NK_LSHIFT      10
-#define TK_NK_RSHIFT      11
-#define TK_NK_PLUS        12
-#define TK_NK_MINUS       13
-#define TK_NK_STAR        14
-#define TK_NK_SLASH       15
-#define TK_NK_REM         16
-#define TK_NK_CONCAT      17
-#define TK_CREATE         18
-#define TK_ACCOUNT        19
-#define TK_NK_ID          20
-#define TK_PASS           21
-#define TK_NK_STRING      22
-#define TK_ALTER          23
-#define TK_PPS            24
-#define TK_TSERIES        25
-#define TK_STORAGE        26
-#define TK_STREAMS        27
-#define TK_QTIME          28
-#define TK_DBS            29
-#define TK_USERS          30
-#define TK_CONNS          31
-#define TK_STATE          32
-#define TK_USER           33
-#define TK_ENABLE         34
-#define TK_NK_INTEGER     35
-#define TK_SYSINFO        36
-#define TK_DROP           37
-#define TK_GRANT          38
-#define TK_ON             39
-#define TK_TO             40
-#define TK_REVOKE         41
-#define TK_FROM           42
-#define TK_NK_COMMA       43
-#define TK_READ           44
-#define TK_WRITE          45
-#define TK_NK_DOT         46
-#define TK_DNODE          47
-#define TK_PORT           48
-#define TK_DNODES         49
-#define TK_NK_IPTOKEN     50
-#define TK_LOCAL          51
-#define TK_QNODE          52
-#define TK_BNODE          53
-#define TK_SNODE          54
-#define TK_MNODE          55
-#define TK_DATABASE       56
-#define TK_USE            57
-#define TK_FLUSH          58
-#define TK_TRIM           59
-#define TK_IF             60
-#define TK_NOT            61
-#define TK_EXISTS         62
-#define TK_BUFFER         63
-#define TK_CACHEMODEL     64
-#define TK_CACHESIZE      65
-#define TK_COMP           66
-#define TK_DURATION       67
-#define TK_NK_VARIABLE    68
-#define TK_FSYNC          69
-#define TK_MAXROWS        70
-#define TK_MINROWS        71
-#define TK_KEEP           72
-#define TK_PAGES          73
-#define TK_PAGESIZE       74
-#define TK_PRECISION      75
-#define TK_REPLICA        76
-#define TK_STRICT         77
-#define TK_WAL            78
-#define TK_VGROUPS        79
-#define TK_SINGLE_STABLE  80
-#define TK_RETENTIONS     81
-#define TK_SCHEMALESS     82
-#define TK_NK_COLON       83
-#define TK_TABLE          84
-#define TK_NK_LP          85
-#define TK_NK_RP          86
-#define TK_STABLE         87
-#define TK_ADD            88
-#define TK_COLUMN         89
-#define TK_MODIFY         90
-#define TK_RENAME         91
-#define TK_TAG            92
-#define TK_SET            93
-#define TK_NK_EQ          94
-#define TK_USING          95
-#define TK_TAGS           96
-#define TK_COMMENT        97
-#define TK_BOOL           98
-#define TK_TINYINT        99
-#define TK_SMALLINT       100
-#define TK_INT            101
-#define TK_INTEGER        102
-#define TK_BIGINT         103
-#define TK_FLOAT          104
-#define TK_DOUBLE         105
-#define TK_BINARY         106
-#define TK_TIMESTAMP      107
-#define TK_NCHAR          108
-#define TK_UNSIGNED       109
-#define TK_JSON           110
-#define TK_VARCHAR        111
-#define TK_MEDIUMBLOB     112
-#define TK_BLOB           113
-#define TK_VARBINARY      114
-#define TK_DECIMAL        115
-#define TK_MAX_DELAY      116
-#define TK_WATERMARK      117
-#define TK_ROLLUP         118
-#define TK_TTL            119
-#define TK_SMA            120
-#define TK_FIRST          121
-#define TK_LAST           122
-#define TK_SHOW           123
-#define TK_DATABASES      124
-#define TK_TABLES         125
-#define TK_STABLES        126
-#define TK_MNODES         127
-#define TK_MODULES        128
-#define TK_QNODES         129
-#define TK_FUNCTIONS      130
-#define TK_INDEXES        131
-#define TK_ACCOUNTS       132
-#define TK_APPS           133
-#define TK_CONNECTIONS    134
-#define TK_LICENCE        135
-#define TK_GRANTS         136
-#define TK_QUERIES        137
-#define TK_SCORES         138
-#define TK_TOPICS         139
-#define TK_VARIABLES      140
-#define TK_BNODES         141
-#define TK_SNODES         142
-#define TK_CLUSTER        143
-#define TK_TRANSACTIONS   144
-#define TK_DISTRIBUTED    145
-#define TK_CONSUMERS      146
-#define TK_SUBSCRIPTIONS  147
-#define TK_LIKE           148
-#define TK_INDEX          149
-#define TK_FUNCTION       150
-#define TK_INTERVAL       151
-#define TK_TOPIC          152
-#define TK_AS             153
-#define TK_WITH           154
-#define TK_META           155
-#define TK_CONSUMER       156
-#define TK_GROUP          157
-#define TK_DESC           158
-#define TK_DESCRIBE       159
-#define TK_RESET          160
-#define TK_QUERY          161
-#define TK_CACHE          162
-#define TK_EXPLAIN        163
-#define TK_ANALYZE        164
-#define TK_VERBOSE        165
-#define TK_NK_BOOL        166
-#define TK_RATIO          167
-#define TK_NK_FLOAT       168
-#define TK_COMPACT        169
-#define TK_VNODES         170
-#define TK_IN             171
-#define TK_OUTPUTTYPE     172
-#define TK_AGGREGATE      173
-#define TK_BUFSIZE        174
-#define TK_STREAM         175
-#define TK_INTO           176
-#define TK_TRIGGER        177
-#define TK_AT_ONCE        178
-#define TK_WINDOW_CLOSE   179
-#define TK_IGNORE         180
-#define TK_EXPIRED        181
-#define TK_KILL           182
-#define TK_CONNECTION     183
-#define TK_TRANSACTION    184
-#define TK_BALANCE        185
-#define TK_VGROUP         186
-#define TK_MERGE          187
-#define TK_REDISTRIBUTE   188
-#define TK_SPLIT          189
-#define TK_SYNCDB         190
-#define TK_DELETE         191
-#define TK_INSERT         192
-#define TK_NULL           193
-#define TK_NK_QUESTION    194
-#define TK_NK_ARROW       195
-#define TK_ROWTS          196
-#define TK_TBNAME         197
-#define TK_QSTART         198
-#define TK_QEND           199
-#define TK_QDURATION      200
-#define TK_WSTART         201
-#define TK_WEND           202
-#define TK_WDURATION      203
-#define TK_CAST           204
-#define TK_NOW            205
-#define TK_TODAY          206
-#define TK_TIMEZONE       207
-#define TK_CLIENT_VERSION 208
-#define TK_SERVER_VERSION 209
-#define TK_SERVER_STATUS  210
-#define TK_CURRENT_USER   211
-#define TK_COUNT          212
-#define TK_LAST_ROW       213
-#define TK_BETWEEN        214
-#define TK_IS             215
-#define TK_NK_LT          216
-#define TK_NK_GT          217
-#define TK_NK_LE          218
-#define TK_NK_GE          219
-#define TK_NK_NE          220
-#define TK_MATCH          221
-#define TK_NMATCH         222
-#define TK_CONTAINS       223
-#define TK_JOIN           224
-#define TK_INNER          225
-#define TK_SELECT         226
-#define TK_DISTINCT       227
-#define TK_WHERE          228
-#define TK_PARTITION      229
-#define TK_BY             230
-#define TK_SESSION        231
-#define TK_STATE_WINDOW   232
-#define TK_SLIDING        233
-#define TK_FILL           234
-#define TK_VALUE          235
-#define TK_NONE           236
-#define TK_PREV           237
-#define TK_LINEAR         238
-#define TK_NEXT           239
-#define TK_HAVING         240
-#define TK_RANGE          241
-#define TK_EVERY          242
-#define TK_ORDER          243
-#define TK_SLIMIT         244
-#define TK_SOFFSET        245
-#define TK_LIMIT          246
-#define TK_OFFSET         247
-#define TK_ASC            248
-#define TK_NULLS          249
-#define TK_ID             250
-#define TK_NK_BITNOT      251
-#define TK_VALUES         252
-#define TK_IMPORT         253
-#define TK_NK_SEMI        254
-#define TK_FILE           255
+#define TK_OR                   1
+#define TK_AND                  2
+#define TK_UNION                3
+#define TK_ALL                  4
+#define TK_MINUS                5
+#define TK_EXCEPT               6
+#define TK_INTERSECT            7
+#define TK_NK_BITAND            8
+#define TK_NK_BITOR             9
+#define TK_NK_LSHIFT            10
+#define TK_NK_RSHIFT            11
+#define TK_NK_PLUS              12
+#define TK_NK_MINUS             13
+#define TK_NK_STAR              14
+#define TK_NK_SLASH             15
+#define TK_NK_REM               16
+#define TK_NK_CONCAT            17
+#define TK_CREATE               18
+#define TK_ACCOUNT              19
+#define TK_NK_ID                20
+#define TK_PASS                 21
+#define TK_NK_STRING            22
+#define TK_ALTER                23
+#define TK_PPS                  24
+#define TK_TSERIES              25
+#define TK_STORAGE              26
+#define TK_STREAMS              27
+#define TK_QTIME                28
+#define TK_DBS                  29
+#define TK_USERS                30
+#define TK_CONNS                31
+#define TK_STATE                32
+#define TK_USER                 33
+#define TK_ENABLE               34
+#define TK_NK_INTEGER           35
+#define TK_SYSINFO              36
+#define TK_DROP                 37
+#define TK_GRANT                38
+#define TK_ON                   39
+#define TK_TO                   40
+#define TK_REVOKE               41
+#define TK_FROM                 42
+#define TK_NK_COMMA             43
+#define TK_READ                 44
+#define TK_WRITE                45
+#define TK_NK_DOT               46
+#define TK_DNODE                47
+#define TK_PORT                 48
+#define TK_DNODES               49
+#define TK_NK_IPTOKEN           50
+#define TK_LOCAL                51
+#define TK_QNODE                52
+#define TK_BNODE                53
+#define TK_SNODE                54
+#define TK_MNODE                55
+#define TK_DATABASE             56
+#define TK_USE                  57
+#define TK_FLUSH                58
+#define TK_TRIM                 59
+#define TK_IF                   60
+#define TK_NOT                  61
+#define TK_EXISTS               62
+#define TK_BUFFER               63
+#define TK_CACHEMODEL           64
+#define TK_CACHESIZE            65
+#define TK_COMP                 66
+#define TK_DURATION             67
+#define TK_NK_VARIABLE          68
+#define TK_FSYNC                69
+#define TK_MAXROWS              70
+#define TK_MINROWS              71
+#define TK_KEEP                 72
+#define TK_PAGES                73
+#define TK_PAGESIZE             74
+#define TK_PRECISION            75
+#define TK_REPLICA              76
+#define TK_STRICT               77
+#define TK_WAL                  78
+#define TK_VGROUPS              79
+#define TK_SINGLE_STABLE        80
+#define TK_RETENTIONS           81
+#define TK_SCHEMALESS           82
+#define TK_WAL_RETENTION_PERIOD 83
+#define TK_WAL_RETENTION_SIZE   84
+#define TK_WAL_ROLL_PERIOD      85
+#define TK_WAL_SEGMENT_SIZE     86
+#define TK_NK_COLON             87
+#define TK_TABLE                88
+#define TK_NK_LP                89
+#define TK_NK_RP                90
+#define TK_STABLE               91
+#define TK_ADD                  92
+#define TK_COLUMN               93
+#define TK_MODIFY               94
+#define TK_RENAME               95
+#define TK_TAG                  96
+#define TK_SET                  97
+#define TK_NK_EQ                98
+#define TK_USING                99
+#define TK_TAGS                 100
+#define TK_COMMENT              101
+#define TK_BOOL                 102
+#define TK_TINYINT              103
+#define TK_SMALLINT             104
+#define TK_INT                  105
+#define TK_INTEGER              106
+#define TK_BIGINT               107
+#define TK_FLOAT                108
+#define TK_DOUBLE               109
+#define TK_BINARY               110
+#define TK_TIMESTAMP            111
+#define TK_NCHAR                112
+#define TK_UNSIGNED             113
+#define TK_JSON                 114
+#define TK_VARCHAR              115
+#define TK_MEDIUMBLOB           116
+#define TK_BLOB                 117
+#define TK_VARBINARY            118
+#define TK_DECIMAL              119
+#define TK_MAX_DELAY            120
+#define TK_WATERMARK            121
+#define TK_ROLLUP               122
+#define TK_TTL                  123
+#define TK_SMA                  124
+#define TK_FIRST                125
+#define TK_LAST                 126
+#define TK_SHOW                 127
+#define TK_DATABASES            128
+#define TK_TABLES               129
+#define TK_STABLES              130
+#define TK_MNODES               131
+#define TK_MODULES              132
+#define TK_QNODES               133
+#define TK_FUNCTIONS            134
+#define TK_INDEXES              135
+#define TK_ACCOUNTS             136
+#define TK_APPS                 137
+#define TK_CONNECTIONS          138
+#define TK_LICENCE              139
+#define TK_GRANTS               140
+#define TK_QUERIES              141
+#define TK_SCORES               142
+#define TK_TOPICS               143
+#define TK_VARIABLES            144
+#define TK_BNODES               145
+#define TK_SNODES               146
+#define TK_CLUSTER              147
+#define TK_TRANSACTIONS         148
+#define TK_DISTRIBUTED          149
+#define TK_CONSUMERS            150
+#define TK_SUBSCRIPTIONS        151
+#define TK_LIKE                 152
+#define TK_INDEX                153
+#define TK_FUNCTION             154
+#define TK_INTERVAL             155
+#define TK_TOPIC                156
+#define TK_AS                   157
+#define TK_WITH                 158
+#define TK_META                 159
+#define TK_CONSUMER             160
+#define TK_GROUP                161
+#define TK_DESC                 162
+#define TK_DESCRIBE             163
+#define TK_RESET                164
+#define TK_QUERY                165
+#define TK_CACHE                166
+#define TK_EXPLAIN              167
+#define TK_ANALYZE              168
+#define TK_VERBOSE              169
+#define TK_NK_BOOL              170
+#define TK_RATIO                171
+#define TK_NK_FLOAT             172
+#define TK_COMPACT              173
+#define TK_VNODES               174
+#define TK_IN                   175
+#define TK_OUTPUTTYPE           176
+#define TK_AGGREGATE            177
+#define TK_BUFSIZE              178
+#define TK_STREAM               179
+#define TK_INTO                 180
+#define TK_TRIGGER              181
+#define TK_AT_ONCE              182
+#define TK_WINDOW_CLOSE         183
+#define TK_IGNORE               184
+#define TK_EXPIRED              185
+#define TK_KILL                 186
+#define TK_CONNECTION           187
+#define TK_TRANSACTION          188
+#define TK_BALANCE              189
+#define TK_VGROUP               190
+#define TK_MERGE                191
+#define TK_REDISTRIBUTE         192
+#define TK_SPLIT                193
+#define TK_SYNCDB               194
+#define TK_DELETE               195
+#define TK_INSERT               196
+#define TK_NULL                 197
+#define TK_NK_QUESTION          198
+#define TK_NK_ARROW             199
+#define TK_ROWTS                200
+#define TK_TBNAME               201
+#define TK_QSTART               202
+#define TK_QEND                 203
+#define TK_QDURATION            204
+#define TK_WSTART               205
+#define TK_WEND                 206
+#define TK_WDURATION            207
+#define TK_CAST                 208
+#define TK_NOW                  209
+#define TK_TODAY                210
+#define TK_TIMEZONE             211
+#define TK_CLIENT_VERSION       212
+#define TK_SERVER_VERSION       213
+#define TK_SERVER_STATUS        214
+#define TK_CURRENT_USER         215
+#define TK_COUNT                216
+#define TK_LAST_ROW             217
+#define TK_BETWEEN              218
+#define TK_IS                   219
+#define TK_NK_LT                220
+#define TK_NK_GT                221
+#define TK_NK_LE                222
+#define TK_NK_GE                223
+#define TK_NK_NE                224
+#define TK_MATCH                225
+#define TK_NMATCH               226
+#define TK_CONTAINS             227
+#define TK_JOIN                 228
+#define TK_INNER                229
+#define TK_SELECT               230
+#define TK_DISTINCT             231
+#define TK_WHERE                232
+#define TK_PARTITION            233
+#define TK_BY                   234
+#define TK_SESSION              235
+#define TK_STATE_WINDOW         236
+#define TK_SLIDING              237
+#define TK_FILL                 238
+#define TK_VALUE                239
+#define TK_NONE                 240
+#define TK_PREV                 241
+#define TK_LINEAR               242
+#define TK_NEXT                 243
+#define TK_HAVING               244
+#define TK_RANGE                245
+#define TK_EVERY                246
+#define TK_ORDER                247
+#define TK_SLIMIT               248
+#define TK_SOFFSET              249
+#define TK_LIMIT                250
+#define TK_OFFSET               251
+#define TK_ASC                  252
+#define TK_NULLS                253
+#define TK_ID                   254
+#define TK_NK_BITNOT            255
+#define TK_VALUES               256
+#define TK_IMPORT               257
+#define TK_NK_SEMI              258
+#define TK_FILE                 259
 
 #define TK_NK_SPACE   300
 #define TK_NK_COMMENT 301

include/libs/nodes/cmdnodes.h

@@ -74,6 +74,10 @@ typedef struct SDatabaseOptions {
   int8_t      singleStable;
   SNodeList*  pRetentions;
   int8_t      schemaless;
+  int32_t     walRetentionPeriod;
+  int32_t     walRetentionSize;
+  int32_t     walRollPeriod;
+  int32_t     walSegmentSize;
 } SDatabaseOptions;
 
 typedef struct SCreateDatabaseStmt {

include/util/tdef.h

@@ -358,6 +358,15 @@ typedef enum ELogicConditionType {
 #define TSDB_DB_SCHEMALESS_OFF          0
 #define TSDB_DEFAULT_DB_SCHEMALESS      TSDB_DB_SCHEMALESS_OFF
 
+#define TSDB_DB_MIN_WAL_RETENTION_PERIOD     -1
+#define TSDB_DEFAULT_DB_WAL_RETENTION_PERIOD 0
+#define TSDB_DB_MIN_WAL_RETENTION_SIZE       -1
+#define TSDB_DEFAULT_DB_WAL_RETENTION_SIZE   0
+#define TSDB_DB_MIN_WAL_ROLL_PERIOD          0
+#define TSDB_DEFAULT_DB_WAL_ROLL_PERIOD      0
+#define TSDB_DB_MIN_WAL_SEGMENT_SIZE         0
+#define TSDB_DEFAULT_DB_WAL_SEGMENT_SIZE     0
+
 #define TSDB_MIN_ROLLUP_MAX_DELAY     1  // unit millisecond
 #define TSDB_MAX_ROLLUP_MAX_DELAY     (15 * 60 * 1000)
 #define TSDB_MIN_ROLLUP_WATERMARK     0  // unit millisecond

source/common/src/tmsg.c

@@ -2018,6 +2018,10 @@ int32_t tSerializeSCreateDbReq(void *buf, int32_t bufLen, SCreateDbReq *pReq) {
   if (tEncodeI8(&encoder, pReq->strict) < 0) return -1;
   if (tEncodeI8(&encoder, pReq->cacheLast) < 0) return -1;
   if (tEncodeI8(&encoder, pReq->schemaless) < 0) return -1;
+  if (tEncodeI32(&encoder, pReq->walRetentionPeriod) < 0) return -1;
+  if (tEncodeI32(&encoder, pReq->walRetentionSize) < 0) return -1;
+  if (tEncodeI32(&encoder, pReq->walRollPeriod) < 0) return -1;
+  if (tEncodeI32(&encoder, pReq->walSegmentSize) < 0) return -1;
   if (tEncodeI8(&encoder, pReq->ignoreExist) < 0) return -1;
   if (tEncodeI32(&encoder, pReq->numOfRetensions) < 0) return -1;
   for (int32_t i = 0; i < pReq->numOfRetensions; ++i) {
@@ -2060,6 +2064,10 @@ int32_t tDeserializeSCreateDbReq(void *buf, int32_t bufLen, SCreateDbReq *pReq)
   if (tDecodeI8(&decoder, &pReq->strict) < 0) return -1;
   if (tDecodeI8(&decoder, &pReq->cacheLast) < 0) return -1;
   if (tDecodeI8(&decoder, &pReq->schemaless) < 0) return -1;
+  if (tDecodeI32(&decoder, &pReq->walRetentionPeriod) < 0) return -1;
+  if (tDecodeI32(&decoder, &pReq->walRetentionSize) < 0) return -1;
+  if (tDecodeI32(&decoder, &pReq->walRollPeriod) < 0) return -1;
+  if (tDecodeI32(&decoder, &pReq->walSegmentSize) < 0) return -1;
   if (tDecodeI8(&decoder, &pReq->ignoreExist) < 0) return -1;
   if (tDecodeI32(&decoder, &pReq->numOfRetensions) < 0) return -1;
   pReq->pRetensions = taosArrayInit(pReq->numOfRetensions, sizeof(SRetention));

source/libs/parser/inc/parAst.h

@@ -55,7 +55,11 @@ typedef enum EDatabaseOptionType {
   DB_OPTION_VGROUPS,
   DB_OPTION_SINGLE_STABLE,
   DB_OPTION_RETENTIONS,
-  DB_OPTION_SCHEMALESS
+  DB_OPTION_SCHEMALESS,
+  DB_OPTION_WAL_RETENTION_PERIOD,
+  DB_OPTION_WAL_RETENTION_SIZE,
+  DB_OPTION_WAL_ROLL_PERIOD,
+  DB_OPTION_WAL_SEGMENT_SIZE
 } EDatabaseOptionType;
 
 typedef enum ETableOptionType {

source/libs/parser/inc/sql.y

@@ -191,6 +191,20 @@ db_options(A) ::= db_options(B) VGROUPS NK_INTEGER(C).
 db_options(A) ::= db_options(B) SINGLE_STABLE NK_INTEGER(C).                      { A = setDatabaseOption(pCxt, B, DB_OPTION_SINGLE_STABLE, &C); }
 db_options(A) ::= db_options(B) RETENTIONS retention_list(C).                     { A = setDatabaseOption(pCxt, B, DB_OPTION_RETENTIONS, C); }
 db_options(A) ::= db_options(B) SCHEMALESS NK_INTEGER(C).                         { A = setDatabaseOption(pCxt, B, DB_OPTION_SCHEMALESS, &C); }
+db_options(A) ::= db_options(B) WAL_RETENTION_PERIOD NK_INTEGER(C).               { A = setDatabaseOption(pCxt, B, DB_OPTION_WAL_RETENTION_PERIOD, &C); }
+db_options(A) ::= db_options(B) WAL_RETENTION_PERIOD NK_MINUS(D) NK_INTEGER(C).   { 
+                                                                                    SToken t = D;
+                                                                                    t.n = (C.z + C.n) - D.z;
+                                                                                    A = setDatabaseOption(pCxt, B, DB_OPTION_WAL_RETENTION_PERIOD, &t);
+                                                                                  }
+db_options(A) ::= db_options(B) WAL_RETENTION_SIZE NK_INTEGER(C).                 { A = setDatabaseOption(pCxt, B, DB_OPTION_WAL_RETENTION_SIZE, &C); }
+db_options(A) ::= db_options(B) WAL_RETENTION_SIZE NK_MINUS(D) NK_INTEGER(C).     { 
+                                                                                    SToken t = D;
+                                                                                    t.n = (C.z + C.n) - D.z;
+                                                                                    A = setDatabaseOption(pCxt, B, DB_OPTION_WAL_RETENTION_SIZE, &t);
+                                                                                  }
+db_options(A) ::= db_options(B) WAL_ROLL_PERIOD NK_INTEGER(C).                    { A = setDatabaseOption(pCxt, B, DB_OPTION_WAL_ROLL_PERIOD, &C); }
+db_options(A) ::= db_options(B) WAL_SEGMENT_SIZE NK_INTEGER(C).                   { A = setDatabaseOption(pCxt, B, DB_OPTION_WAL_SEGMENT_SIZE, &C); }
 
 alter_db_options(A) ::= alter_db_option(B).                                       { A = createAlterDatabaseOptions(pCxt); A = setAlterDatabaseOption(pCxt, A, &B); }
 alter_db_options(A) ::= alter_db_options(B) alter_db_option(C).                   { A = setAlterDatabaseOption(pCxt, B, &C); }

source/libs/parser/src/parAstCreater.c

@@ -894,6 +894,18 @@ SNode* setDatabaseOption(SAstCreateContext* pCxt, SNode* pOptions, EDatabaseOpti
     case DB_OPTION_RETENTIONS:
       ((SDatabaseOptions*)pOptions)->pRetentions = pVal;
       break;
+    case DB_OPTION_WAL_RETENTION_PERIOD:
+      ((SDatabaseOptions*)pOptions)->walRetentionPeriod = taosStr2Int32(((SToken*)pVal)->z, NULL, 10);
+      break;
+    case DB_OPTION_WAL_RETENTION_SIZE:
+      ((SDatabaseOptions*)pOptions)->walRetentionSize = taosStr2Int32(((SToken*)pVal)->z, NULL, 10);
+      break;
+    case DB_OPTION_WAL_ROLL_PERIOD:
+      ((SDatabaseOptions*)pOptions)->walRollPeriod = taosStr2Int32(((SToken*)pVal)->z, NULL, 10);
+      break;
+    case DB_OPTION_WAL_SEGMENT_SIZE:
+      ((SDatabaseOptions*)pOptions)->walSegmentSize = taosStr2Int32(((SToken*)pVal)->z, NULL, 10);
+      break;
     default:
       break;
   }

source/libs/parser/src/parTokenizer.c

@@ -234,6 +234,10 @@ static SKeyword keywordTable[] = {
     {"VGROUPS",        TK_VGROUPS},
     {"VNODES",         TK_VNODES},
     {"WAL",            TK_WAL},
+    {"WAL_RETENTION_PERIOD", TK_WAL_RETENTION_PERIOD},
+    {"WAL_RETENTION_SIZE",   TK_WAL_RETENTION_SIZE},
+    {"WAL_ROLL_PERIOD",      TK_WAL_ROLL_PERIOD},
+    {"WAL_SEGMENT_SIZE",     TK_WAL_SEGMENT_SIZE},
     {"WATERMARK",      TK_WATERMARK},
     {"WHERE",          TK_WHERE},
     {"WINDOW_CLOSE",   TK_WINDOW_CLOSE},

source/libs/parser/src/parTranslater.c

@@ -2984,6 +2984,10 @@ static int32_t buildCreateDbReq(STranslateContext* pCxt, SCreateDatabaseStmt* pS
   pReq->cacheLast = pStmt->pOptions->cacheModel;
   pReq->cacheLastSize = pStmt->pOptions->cacheLastSize;
   pReq->schemaless = pStmt->pOptions->schemaless;
+  pReq->walRetentionPeriod = pStmt->pOptions->walRetentionPeriod;
+  pReq->walRetentionSize = pStmt->pOptions->walRetentionSize;
+  pReq->walRollPeriod = pStmt->pOptions->walRollPeriod;
+  pReq->walSegmentSize = pStmt->pOptions->walSegmentSize;
   pReq->ignoreExist = pStmt->ignoreExists;
   return buildCreateDbRetentions(pStmt->pOptions->pRetentions, pReq);
 }
@@ -3252,6 +3256,21 @@ static int32_t checkDatabaseOptions(STranslateContext* pCxt, const char* pDbName
   if (TSDB_CODE_SUCCESS == code) {
     code = checkDbEnumOption(pCxt, "schemaless", pOptions->schemaless, TSDB_DB_SCHEMALESS_ON, TSDB_DB_SCHEMALESS_OFF);
   }
+  if (TSDB_CODE_SUCCESS == code) {
+    code = checkDbRangeOption(pCxt, "walRetentionPeriod", pOptions->walRetentionPeriod,
+                              TSDB_DB_MIN_WAL_RETENTION_PERIOD, INT32_MAX);
+  }
+  if (TSDB_CODE_SUCCESS == code) {
+    code = checkDbRangeOption(pCxt, "walRetentionSize", pOptions->walRetentionSize, TSDB_DB_MIN_WAL_RETENTION_SIZE,
+                              INT32_MAX);
+  }
+  if (TSDB_CODE_SUCCESS == code) {
+    code = checkDbRangeOption(pCxt, "walRollPeriod", pOptions->walRollPeriod, TSDB_DB_MIN_WAL_ROLL_PERIOD, INT32_MAX);
+  }
+  if (TSDB_CODE_SUCCESS == code) {
+    code =
+        checkDbRangeOption(pCxt, "walSegmentSize", pOptions->walSegmentSize, TSDB_DB_MIN_WAL_SEGMENT_SIZE, INT32_MAX);
+  }
   if (TSDB_CODE_SUCCESS == code) {
     code = checkOptionsDependency(pCxt, pDbName, pOptions);
   }

source/libs/parser/test/parInitialCTest.cpp

@@ -77,6 +77,10 @@ TEST_F(ParserInitialCTest, createBnode) {
  *   | WAL value
  *   | VGROUPS value
  *   | SINGLE_STABLE {0 | 1}
+ *   | WAL_RETENTION_PERIOD value
+ *   | WAL_ROLL_PERIOD value
+ *   | WAL_RETENTION_SIZE value
+ *   | WAL_SEGMENT_SIZE value
  * }
  */
 TEST_F(ParserInitialCTest, createDatabase) {
@@ -149,6 +153,10 @@ TEST_F(ParserInitialCTest, createDatabase) {
     ++expect.numOfRetensions;
   };
   auto setDbSchemalessFunc = [&](int8_t schemaless) { expect.schemaless = schemaless; };
+  auto setDbWalRetentionPeriod = [&](int32_t walRetentionPeriod) { expect.walRetentionPeriod = walRetentionPeriod; };
+  auto setDbWalRetentionSize = [&](int32_t walRetentionSize) { expect.walRetentionSize = walRetentionSize; };
+  auto setDbWalRollPeriod = [&](int32_t walRollPeriod) { expect.walRollPeriod = walRollPeriod; };
+  auto setDbWalSegmentSize = [&](int32_t walSegmentSize) { expect.walSegmentSize = walSegmentSize; };
 
   setCheckDdlFunc([&](const SQuery* pQuery, ParserStage stage) {
     ASSERT_EQ(nodeType(pQuery->pRoot), QUERY_NODE_CREATE_DATABASE_STMT);
@@ -175,6 +183,10 @@ TEST_F(ParserInitialCTest, createDatabase) {
     ASSERT_EQ(req.strict, expect.strict);
     ASSERT_EQ(req.cacheLast, expect.cacheLast);
     ASSERT_EQ(req.cacheLastSize, expect.cacheLastSize);
+    ASSERT_EQ(req.walRetentionPeriod, expect.walRetentionPeriod);
+    ASSERT_EQ(req.walRetentionSize, expect.walRetentionSize);
+    ASSERT_EQ(req.walRollPeriod, expect.walRollPeriod);
+    ASSERT_EQ(req.walSegmentSize, expect.walSegmentSize);
     // ASSERT_EQ(req.schemaless, expect.schemaless);
     ASSERT_EQ(req.ignoreExist, expect.ignoreExist);
     ASSERT_EQ(req.numOfRetensions, expect.numOfRetensions);
@@ -219,6 +231,10 @@ TEST_F(ParserInitialCTest, createDatabase) {
   setDbVgroupsFunc(100);
   setDbSingleStableFunc(1);
   setDbSchemalessFunc(1);
+  setDbWalRetentionPeriod(-1);
+  setDbWalRetentionSize(-1);
+  setDbWalRollPeriod(10);
+  setDbWalSegmentSize(20);
   run("CREATE DATABASE IF NOT EXISTS wxy_db "
       "BUFFER 64 "
       "CACHEMODEL 'last_value' "
@@ -238,7 +254,11 @@ TEST_F(ParserInitialCTest, createDatabase) {
       "WAL 2 "
       "VGROUPS 100 "
       "SINGLE_STABLE 1 "
-      "SCHEMALESS 1");
+      "SCHEMALESS 1 "
+      "WAL_RETENTION_PERIOD -1 "
+      "WAL_RETENTION_SIZE -1 "
+      "WAL_ROLL_PERIOD 10 "
+      "WAL_SEGMENT_SIZE 20");
   clearCreateDbReq();
 
   setCreateDbReqFunc("wxy_db", 1);