enh: shielding database option 'strict'

include/common/ttokendef.h

@@ -94,242 +94,242 @@
 #define TK_TSDB_PAGESIZE        76
 #define TK_PRECISION            77
 #define TK_REPLICA              78
-#define TK_STRICT               79
-#define TK_VGROUPS              80
-#define TK_SINGLE_STABLE        81
-#define TK_RETENTIONS           82
-#define TK_SCHEMALESS           83
-#define TK_WAL_LEVEL            84
-#define TK_WAL_FSYNC_PERIOD     85
-#define TK_WAL_RETENTION_PERIOD 86
-#define TK_WAL_RETENTION_SIZE   87
-#define TK_WAL_ROLL_PERIOD      88
-#define TK_WAL_SEGMENT_SIZE     89
-#define TK_STT_TRIGGER          90
-#define TK_TABLE_PREFIX         91
-#define TK_TABLE_SUFFIX         92
-#define TK_NK_COLON             93
-#define TK_MAX_SPEED            94
-#define TK_TABLE                95
-#define TK_NK_LP                96
-#define TK_NK_RP                97
-#define TK_STABLE               98
-#define TK_ADD                  99
-#define TK_COLUMN               100
-#define TK_MODIFY               101
-#define TK_RENAME               102
-#define TK_TAG                  103
-#define TK_SET                  104
-#define TK_NK_EQ                105
-#define TK_USING                106
-#define TK_TAGS                 107
-#define TK_COMMENT              108
-#define TK_BOOL                 109
-#define TK_TINYINT              110
-#define TK_SMALLINT             111
-#define TK_INT                  112
-#define TK_INTEGER              113
-#define TK_BIGINT               114
-#define TK_FLOAT                115
-#define TK_DOUBLE               116
-#define TK_BINARY               117
-#define TK_TIMESTAMP            118
-#define TK_NCHAR                119
-#define TK_UNSIGNED             120
-#define TK_JSON                 121
-#define TK_VARCHAR              122
-#define TK_MEDIUMBLOB           123
-#define TK_BLOB                 124
-#define TK_VARBINARY            125
-#define TK_DECIMAL              126
-#define TK_MAX_DELAY            127
-#define TK_WATERMARK            128
-#define TK_ROLLUP               129
-#define TK_TTL                  130
-#define TK_SMA                  131
-#define TK_DELETE_MARK          132
-#define TK_FIRST                133
-#define TK_LAST                 134
-#define TK_SHOW                 135
-#define TK_PRIVILEGES           136
-#define TK_DATABASES            137
-#define TK_TABLES               138
-#define TK_STABLES              139
-#define TK_MNODES               140
-#define TK_QNODES               141
-#define TK_FUNCTIONS            142
-#define TK_INDEXES              143
-#define TK_ACCOUNTS             144
-#define TK_APPS                 145
-#define TK_CONNECTIONS          146
-#define TK_LICENCES             147
-#define TK_GRANTS               148
-#define TK_QUERIES              149
-#define TK_SCORES               150
-#define TK_TOPICS               151
-#define TK_VARIABLES            152
-#define TK_CLUSTER              153
-#define TK_BNODES               154
-#define TK_SNODES               155
-#define TK_TRANSACTIONS         156
-#define TK_DISTRIBUTED          157
-#define TK_CONSUMERS            158
-#define TK_SUBSCRIPTIONS        159
-#define TK_VNODES               160
-#define TK_LIKE                 161
-#define TK_TBNAME               162
-#define TK_QTAGS                163
-#define TK_AS                   164
-#define TK_INDEX                165
-#define TK_FUNCTION             166
-#define TK_INTERVAL             167
-#define TK_TOPIC                168
-#define TK_WITH                 169
-#define TK_META                 170
-#define TK_CONSUMER             171
-#define TK_GROUP                172
-#define TK_DESC                 173
-#define TK_DESCRIBE             174
-#define TK_RESET                175
-#define TK_QUERY                176
-#define TK_CACHE                177
-#define TK_EXPLAIN              178
-#define TK_ANALYZE              179
-#define TK_VERBOSE              180
-#define TK_NK_BOOL              181
-#define TK_RATIO                182
-#define TK_NK_FLOAT             183
-#define TK_OUTPUTTYPE           184
-#define TK_AGGREGATE            185
-#define TK_BUFSIZE              186
-#define TK_STREAM               187
-#define TK_INTO                 188
-#define TK_TRIGGER              189
-#define TK_AT_ONCE              190
-#define TK_WINDOW_CLOSE         191
-#define TK_IGNORE               192
-#define TK_EXPIRED              193
-#define TK_FILL_HISTORY         194
-#define TK_SUBTABLE             195
-#define TK_KILL                 196
-#define TK_CONNECTION           197
-#define TK_TRANSACTION          198
-#define TK_BALANCE              199
-#define TK_VGROUP               200
-#define TK_MERGE                201
-#define TK_REDISTRIBUTE         202
-#define TK_SPLIT                203
-#define TK_DELETE               204
-#define TK_INSERT               205
-#define TK_NULL                 206
-#define TK_NK_QUESTION          207
-#define TK_NK_ARROW             208
-#define TK_ROWTS                209
-#define TK_QSTART               210
-#define TK_QEND                 211
-#define TK_QDURATION            212
-#define TK_WSTART               213
-#define TK_WEND                 214
-#define TK_WDURATION            215
-#define TK_IROWTS               216
-#define TK_CAST                 217
-#define TK_NOW                  218
-#define TK_TODAY                219
-#define TK_TIMEZONE             220
-#define TK_CLIENT_VERSION       221
-#define TK_SERVER_VERSION       222
-#define TK_SERVER_STATUS        223
-#define TK_CURRENT_USER         224
-#define TK_COUNT                225
-#define TK_LAST_ROW             226
-#define TK_CASE                 227
-#define TK_END                  228
-#define TK_WHEN                 229
-#define TK_THEN                 230
-#define TK_ELSE                 231
-#define TK_BETWEEN              232
-#define TK_IS                   233
-#define TK_NK_LT                234
-#define TK_NK_GT                235
-#define TK_NK_LE                236
-#define TK_NK_GE                237
-#define TK_NK_NE                238
-#define TK_MATCH                239
-#define TK_NMATCH               240
-#define TK_CONTAINS             241
-#define TK_IN                   242
-#define TK_JOIN                 243
-#define TK_INNER                244
-#define TK_SELECT               245
-#define TK_DISTINCT             246
-#define TK_WHERE                247
-#define TK_PARTITION            248
-#define TK_BY                   249
-#define TK_SESSION              250
-#define TK_STATE_WINDOW         251
-#define TK_SLIDING              252
-#define TK_FILL                 253
-#define TK_VALUE                254
-#define TK_NONE                 255
-#define TK_PREV                 256
-#define TK_LINEAR               257
-#define TK_NEXT                 258
-#define TK_HAVING               259
-#define TK_RANGE                260
-#define TK_EVERY                261
-#define TK_ORDER                262
-#define TK_SLIMIT               263
-#define TK_SOFFSET              264
-#define TK_LIMIT                265
-#define TK_OFFSET               266
-#define TK_ASC                  267
-#define TK_NULLS                268
-#define TK_ABORT                269
-#define TK_AFTER                270
-#define TK_ATTACH               271
-#define TK_BEFORE               272
-#define TK_BEGIN                273
-#define TK_BITAND               274
-#define TK_BITNOT               275
-#define TK_BITOR                276
-#define TK_BLOCKS               277
-#define TK_CHANGE               278
-#define TK_COMMA                279
-#define TK_COMPACT              280
-#define TK_CONCAT               281
-#define TK_CONFLICT             282
-#define TK_COPY                 283
-#define TK_DEFERRED             284
-#define TK_DELIMITERS           285
-#define TK_DETACH               286
-#define TK_DIVIDE               287
-#define TK_DOT                  288
-#define TK_EACH                 289
-#define TK_FAIL                 290
-#define TK_FILE                 291
-#define TK_FOR                  292
-#define TK_GLOB                 293
-#define TK_ID                   294
-#define TK_IMMEDIATE            295
-#define TK_IMPORT               296
-#define TK_INITIALLY            297
-#define TK_INSTEAD              298
-#define TK_ISNULL               299
-#define TK_KEY                  300
-#define TK_MODULES              301
-#define TK_NK_BITNOT            302
-#define TK_NK_SEMI              303
-#define TK_NOTNULL              304
-#define TK_OF                   305
-#define TK_PLUS                 306
-#define TK_PRIVILEGE            307
-#define TK_RAISE                308
-#define TK_REPLACE              309
-#define TK_RESTRICT             310
-#define TK_ROW                  311
-#define TK_SEMI                 312
-#define TK_STAR                 313
-#define TK_STATEMENT            314
+#define TK_VGROUPS              79
+#define TK_SINGLE_STABLE        80
+#define TK_RETENTIONS           81
+#define TK_SCHEMALESS           82
+#define TK_WAL_LEVEL            83
+#define TK_WAL_FSYNC_PERIOD     84
+#define TK_WAL_RETENTION_PERIOD 85
+#define TK_WAL_RETENTION_SIZE   86
+#define TK_WAL_ROLL_PERIOD      87
+#define TK_WAL_SEGMENT_SIZE     88
+#define TK_STT_TRIGGER          89
+#define TK_TABLE_PREFIX         90
+#define TK_TABLE_SUFFIX         91
+#define TK_NK_COLON             92
+#define TK_MAX_SPEED            93
+#define TK_TABLE                94
+#define TK_NK_LP                95
+#define TK_NK_RP                96
+#define TK_STABLE               97
+#define TK_ADD                  98
+#define TK_COLUMN               99
+#define TK_MODIFY               100
+#define TK_RENAME               101
+#define TK_TAG                  102
+#define TK_SET                  103
+#define TK_NK_EQ                104
+#define TK_USING                105
+#define TK_TAGS                 106
+#define TK_COMMENT              107
+#define TK_BOOL                 108
+#define TK_TINYINT              109
+#define TK_SMALLINT             110
+#define TK_INT                  111
+#define TK_INTEGER              112
+#define TK_BIGINT               113
+#define TK_FLOAT                114
+#define TK_DOUBLE               115
+#define TK_BINARY               116
+#define TK_TIMESTAMP            117
+#define TK_NCHAR                118
+#define TK_UNSIGNED             119
+#define TK_JSON                 120
+#define TK_VARCHAR              121
+#define TK_MEDIUMBLOB           122
+#define TK_BLOB                 123
+#define TK_VARBINARY            124
+#define TK_DECIMAL              125
+#define TK_MAX_DELAY            126
+#define TK_WATERMARK            127
+#define TK_ROLLUP               128
+#define TK_TTL                  129
+#define TK_SMA                  130
+#define TK_DELETE_MARK          131
+#define TK_FIRST                132
+#define TK_LAST                 133
+#define TK_SHOW                 134
+#define TK_PRIVILEGES           135
+#define TK_DATABASES            136
+#define TK_TABLES               137
+#define TK_STABLES              138
+#define TK_MNODES               139
+#define TK_QNODES               140
+#define TK_FUNCTIONS            141
+#define TK_INDEXES              142
+#define TK_ACCOUNTS             143
+#define TK_APPS                 144
+#define TK_CONNECTIONS          145
+#define TK_LICENCES             146
+#define TK_GRANTS               147
+#define TK_QUERIES              148
+#define TK_SCORES               149
+#define TK_TOPICS               150
+#define TK_VARIABLES            151
+#define TK_CLUSTER              152
+#define TK_BNODES               153
+#define TK_SNODES               154
+#define TK_TRANSACTIONS         155
+#define TK_DISTRIBUTED          156
+#define TK_CONSUMERS            157
+#define TK_SUBSCRIPTIONS        158
+#define TK_VNODES               159
+#define TK_LIKE                 160
+#define TK_TBNAME               161
+#define TK_QTAGS                162
+#define TK_AS                   163
+#define TK_INDEX                164
+#define TK_FUNCTION             165
+#define TK_INTERVAL             166
+#define TK_TOPIC                167
+#define TK_WITH                 168
+#define TK_META                 169
+#define TK_CONSUMER             170
+#define TK_GROUP                171
+#define TK_DESC                 172
+#define TK_DESCRIBE             173
+#define TK_RESET                174
+#define TK_QUERY                175
+#define TK_CACHE                176
+#define TK_EXPLAIN              177
+#define TK_ANALYZE              178
+#define TK_VERBOSE              179
+#define TK_NK_BOOL              180
+#define TK_RATIO                181
+#define TK_NK_FLOAT             182
+#define TK_OUTPUTTYPE           183
+#define TK_AGGREGATE            184
+#define TK_BUFSIZE              185
+#define TK_STREAM               186
+#define TK_INTO                 187
+#define TK_TRIGGER              188
+#define TK_AT_ONCE              189
+#define TK_WINDOW_CLOSE         190
+#define TK_IGNORE               191
+#define TK_EXPIRED              192
+#define TK_FILL_HISTORY         193
+#define TK_SUBTABLE             194
+#define TK_KILL                 195
+#define TK_CONNECTION           196
+#define TK_TRANSACTION          197
+#define TK_BALANCE              198
+#define TK_VGROUP               199
+#define TK_MERGE                200
+#define TK_REDISTRIBUTE         201
+#define TK_SPLIT                202
+#define TK_DELETE               203
+#define TK_INSERT               204
+#define TK_NULL                 205
+#define TK_NK_QUESTION          206
+#define TK_NK_ARROW             207
+#define TK_ROWTS                208
+#define TK_QSTART               209
+#define TK_QEND                 210
+#define TK_QDURATION            211
+#define TK_WSTART               212
+#define TK_WEND                 213
+#define TK_WDURATION            214
+#define TK_IROWTS               215
+#define TK_CAST                 216
+#define TK_NOW                  217
+#define TK_TODAY                218
+#define TK_TIMEZONE             219
+#define TK_CLIENT_VERSION       220
+#define TK_SERVER_VERSION       221
+#define TK_SERVER_STATUS        222
+#define TK_CURRENT_USER         223
+#define TK_COUNT                224
+#define TK_LAST_ROW             225
+#define TK_CASE                 226
+#define TK_END                  227
+#define TK_WHEN                 228
+#define TK_THEN                 229
+#define TK_ELSE                 230
+#define TK_BETWEEN              231
+#define TK_IS                   232
+#define TK_NK_LT                233
+#define TK_NK_GT                234
+#define TK_NK_LE                235
+#define TK_NK_GE                236
+#define TK_NK_NE                237
+#define TK_MATCH                238
+#define TK_NMATCH               239
+#define TK_CONTAINS             240
+#define TK_IN                   241
+#define TK_JOIN                 242
+#define TK_INNER                243
+#define TK_SELECT               244
+#define TK_DISTINCT             245
+#define TK_WHERE                246
+#define TK_PARTITION            247
+#define TK_BY                   248
+#define TK_SESSION              249
+#define TK_STATE_WINDOW         250
+#define TK_SLIDING              251
+#define TK_FILL                 252
+#define TK_VALUE                253
+#define TK_NONE                 254
+#define TK_PREV                 255
+#define TK_LINEAR               256
+#define TK_NEXT                 257
+#define TK_HAVING               258
+#define TK_RANGE                259
+#define TK_EVERY                260
+#define TK_ORDER                261
+#define TK_SLIMIT               262
+#define TK_SOFFSET              263
+#define TK_LIMIT                264
+#define TK_OFFSET               265
+#define TK_ASC                  266
+#define TK_NULLS                267
+#define TK_ABORT                268
+#define TK_AFTER                269
+#define TK_ATTACH               270
+#define TK_BEFORE               271
+#define TK_BEGIN                272
+#define TK_BITAND               273
+#define TK_BITNOT               274
+#define TK_BITOR                275
+#define TK_BLOCKS               276
+#define TK_CHANGE               277
+#define TK_COMMA                278
+#define TK_COMPACT              279
+#define TK_CONCAT               280
+#define TK_CONFLICT             281
+#define TK_COPY                 282
+#define TK_DEFERRED             283
+#define TK_DELIMITERS           284
+#define TK_DETACH               285
+#define TK_DIVIDE               286
+#define TK_DOT                  287
+#define TK_EACH                 288
+#define TK_FAIL                 289
+#define TK_FILE                 290
+#define TK_FOR                  291
+#define TK_GLOB                 292
+#define TK_ID                   293
+#define TK_IMMEDIATE            294
+#define TK_IMPORT               295
+#define TK_INITIALLY            296
+#define TK_INSTEAD              297
+#define TK_ISNULL               298
+#define TK_KEY                  299
+#define TK_MODULES              300
+#define TK_NK_BITNOT            301
+#define TK_NK_SEMI              302
+#define TK_NOTNULL              303
+#define TK_OF                   304
+#define TK_PLUS                 305
+#define TK_PRIVILEGE            306
+#define TK_RAISE                307
+#define TK_REPLACE              308
+#define TK_RESTRICT             309
+#define TK_ROW                  310
+#define TK_SEMI                 311
+#define TK_STAR                 312
+#define TK_STATEMENT            313
+#define TK_STRICT               314
 #define TK_STRING               315
 #define TK_TIMES                316
 #define TK_UPDATE               317

include/util/tdef.h

@@ -337,7 +337,7 @@ typedef enum ELogicConditionType {
 #define TSDB_DB_STRICT_ON_STR           "on"
 #define TSDB_DB_STRICT_OFF              0
 #define TSDB_DB_STRICT_ON               1
-#define TSDB_DEFAULT_DB_STRICT          TSDB_DB_STRICT_OFF
+#define TSDB_DEFAULT_DB_STRICT          TSDB_DB_STRICT_ON
 #define TSDB_CACHE_MODEL_STR_LEN        sizeof(TSDB_CACHE_MODEL_LAST_VALUE_STR)
 #define TSDB_CACHE_MODEL_NONE_STR       "none"
 #define TSDB_CACHE_MODEL_LAST_ROW_STR   "last_row"

source/libs/parser/inc/sql.y

@@ -194,7 +194,7 @@ db_options(A) ::= db_options(B) PAGESIZE NK_INTEGER(C).
 db_options(A) ::= db_options(B) TSDB_PAGESIZE NK_INTEGER(C).                      { A = setDatabaseOption(pCxt, B, DB_OPTION_TSDB_PAGESIZE, &C); }
 db_options(A) ::= db_options(B) PRECISION NK_STRING(C).                           { A = setDatabaseOption(pCxt, B, DB_OPTION_PRECISION, &C); }
 db_options(A) ::= db_options(B) REPLICA NK_INTEGER(C).                            { A = setDatabaseOption(pCxt, B, DB_OPTION_REPLICA, &C); }
-db_options(A) ::= db_options(B) STRICT NK_STRING(C).                              { A = setDatabaseOption(pCxt, B, DB_OPTION_STRICT, &C); }
+//db_options(A) ::= db_options(B) STRICT NK_STRING(C).                              { A = setDatabaseOption(pCxt, B, DB_OPTION_STRICT, &C); }
 db_options(A) ::= db_options(B) VGROUPS NK_INTEGER(C).                            { A = setDatabaseOption(pCxt, B, DB_OPTION_VGROUPS, &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); }
@@ -1067,5 +1067,5 @@ null_ordering_opt(A) ::= NULLS FIRST.
 null_ordering_opt(A) ::= NULLS LAST.                                              { A = NULL_ORDER_LAST; }
 
 %fallback ABORT AFTER ATTACH BEFORE BEGIN BITAND BITNOT BITOR BLOCKS CHANGE COMMA COMPACT CONCAT CONFLICT COPY DEFERRED DELIMITERS DETACH DIVIDE DOT EACH END FAIL 
-  FILE FOR GLOB ID IMMEDIATE IMPORT INITIALLY INSTEAD ISNULL KEY MODULES NK_BITNOT NK_SEMI NOTNULL OF PLUS PRIVILEGE RAISE REPLACE RESTRICT ROW SEMI STAR STATEMENT STRING 
-  TIMES UPDATE VALUES VARIABLE VIEW WAL.
+  FILE FOR GLOB ID IMMEDIATE IMPORT INITIALLY INSTEAD ISNULL KEY MODULES NK_BITNOT NK_SEMI NOTNULL OF PLUS PRIVILEGE RAISE REPLACE RESTRICT ROW SEMI STAR STATEMENT
+  STRICT STRING TIMES UPDATE VALUES VARIABLE VIEW WAL.

source/libs/parser/test/parInitialCTest.cpp

@@ -48,7 +48,7 @@ TEST_F(ParserInitialCTest, createAccount) {
  *   | PRECISION {'ms' | 'us' | 'ns'}
  *   | REPLICA value
  *   | RETENTIONS ingestion_duration:keep_duration ...
- *   | STRICT {'off' | 'on'}
+ *   | STRICT {'off' | 'on'}  // not support
  *   | WAL_LEVEL value
  *   | VGROUPS value
  *   | SINGLE_STABLE {0 | 1}
@@ -216,7 +216,7 @@ TEST_F(ParserInitialCTest, createDatabase) {
   addDbRetentionFunc(15 * MILLISECOND_PER_SECOND, 7 * MILLISECOND_PER_DAY, TIME_UNIT_SECOND, TIME_UNIT_DAY);
   addDbRetentionFunc(1 * MILLISECOND_PER_MINUTE, 21 * MILLISECOND_PER_DAY, TIME_UNIT_MINUTE, TIME_UNIT_DAY);
   addDbRetentionFunc(15 * MILLISECOND_PER_MINUTE, 500 * MILLISECOND_PER_DAY, TIME_UNIT_MINUTE, TIME_UNIT_DAY);
-  setDbStrictaFunc(1);
+  // setDbStrictaFunc(1);
   setDbWalLevelFunc(2);
   setDbVgroupsFunc(100);
   setDbSingleStableFunc(1);
@@ -244,7 +244,7 @@ TEST_F(ParserInitialCTest, createDatabase) {
       "PRECISION 'ns' "
       "REPLICA 3 "
       "RETENTIONS 15s:7d,1m:21d,15m:500d "
-      "STRICT 'on' "
+      //      "STRICT 'on' "
       "WAL_LEVEL 2 "
       "VGROUPS 100 "
       "SINGLE_STABLE 1 "