xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge pull request #19817 from taosdata/feat/TS-2502 

feat: support force fill in interval clause
This commit is contained in:
dapan1121 2023-02-07 17:00:01 +08:00 committed by GitHub
parent 64aff02f15 ded47e1312
commit 19508d118f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 3779 additions and 2677 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/common/tmsg.h
View File

@ -144,12 +144,14 @@ typedef enum _mgmt_table {
#define TSDB_ALTER_TABLE_UPDATE_OPTIONS 9 #define TSDB_ALTER_TABLE_UPDATE_OPTIONS 9
#define TSDB_ALTER_TABLE_UPDATE_COLUMN_NAME 10 #define TSDB_ALTER_TABLE_UPDATE_COLUMN_NAME 10
#define TSDB_FILL_NONE 0 #define TSDB_FILL_NONE 0
#define TSDB_FILL_NULL 1 #define TSDB_FILL_NULL 1
#define TSDB_FILL_SET_VALUE 2 #define TSDB_FILL_NULL_F 2
#define TSDB_FILL_LINEAR 3 #define TSDB_FILL_SET_VALUE 3
#define TSDB_FILL_PREV 4 #define TSDB_FILL_SET_VALUE_F 4
#define TSDB_FILL_NEXT 5 #define TSDB_FILL_LINEAR 5
#define TSDB_FILL_PREV 6
#define TSDB_FILL_NEXT 7
#define TSDB_ALTER_USER_PASSWD 0x1 #define TSDB_ALTER_USER_PASSWD 0x1
#define TSDB_ALTER_USER_SUPERUSER 0x2 #define TSDB_ALTER_USER_SUPERUSER 0x2

645
include/common/ttokendef.h
View File

@ -16,327 +16,330 @@
#ifndef _TD_COMMON_TOKEN_H_ #ifndef _TD_COMMON_TOKEN_H_
#define _TD_COMMON_TOKEN_H_ #define _TD_COMMON_TOKEN_H_
#define TK_OR 1 #define TK_OR 1
#define TK_AND 2 #define TK_AND 2
#define TK_UNION 3 #define TK_UNION 3
#define TK_ALL 4 #define TK_ALL 4
#define TK_MINUS 5 #define TK_MINUS 5
#define TK_EXCEPT 6 #define TK_EXCEPT 6
#define TK_INTERSECT 7 #define TK_INTERSECT 7
#define TK_NK_BITAND 8 #define TK_NK_BITAND 8
#define TK_NK_BITOR 9 #define TK_NK_BITOR 9
#define TK_NK_LSHIFT 10 #define TK_NK_LSHIFT 10
#define TK_NK_RSHIFT 11 #define TK_NK_RSHIFT 11
#define TK_NK_PLUS 12 #define TK_NK_PLUS 12
#define TK_NK_MINUS 13 #define TK_NK_MINUS 13
#define TK_NK_STAR 14 #define TK_NK_STAR 14
#define TK_NK_SLASH 15 #define TK_NK_SLASH 15
#define TK_NK_REM 16 #define TK_NK_REM 16
#define TK_NK_CONCAT 17 #define TK_NK_CONCAT 17
#define TK_CREATE 18 #define TK_CREATE 18
#define TK_ACCOUNT 19 #define TK_ACCOUNT 19
#define TK_NK_ID 20 #define TK_NK_ID 20
#define TK_PASS 21 #define TK_PASS 21
#define TK_NK_STRING 22 #define TK_NK_STRING 22
#define TK_ALTER 23 #define TK_ALTER 23
#define TK_PPS 24 #define TK_PPS 24
#define TK_TSERIES 25 #define TK_TSERIES 25
#define TK_STORAGE 26 #define TK_STORAGE 26
#define TK_STREAMS 27 #define TK_STREAMS 27
#define TK_QTIME 28 #define TK_QTIME 28
#define TK_DBS 29 #define TK_DBS 29
#define TK_USERS 30 #define TK_USERS 30
#define TK_CONNS 31 #define TK_CONNS 31
#define TK_STATE 32 #define TK_STATE 32
#define TK_USER 33 #define TK_USER 33
#define TK_ENABLE 34 #define TK_ENABLE 34
#define TK_NK_INTEGER 35 #define TK_NK_INTEGER 35
#define TK_SYSINFO 36 #define TK_SYSINFO 36
#define TK_DROP 37 #define TK_DROP 37
#define TK_GRANT 38 #define TK_GRANT 38
#define TK_ON 39 #define TK_ON 39
#define TK_TO 40 #define TK_TO 40
#define TK_REVOKE 41 #define TK_REVOKE 41
#define TK_FROM 42 #define TK_FROM 42
#define TK_SUBSCRIBE 43 #define TK_SUBSCRIBE 43
#define TK_NK_COMMA 44 #define TK_NK_COMMA 44
#define TK_READ 45 #define TK_READ 45
#define TK_WRITE 46 #define TK_WRITE 46
#define TK_NK_DOT 47 #define TK_NK_DOT 47
#define TK_DNODE 48 #define TK_DNODE 48
#define TK_PORT 49 #define TK_PORT 49
#define TK_DNODES 50 #define TK_DNODES 50
#define TK_NK_IPTOKEN 51 #define TK_NK_IPTOKEN 51
#define TK_FORCE 52 #define TK_FORCE 52
#define TK_LOCAL 53 #define TK_LOCAL 53
#define TK_QNODE 54 #define TK_QNODE 54
#define TK_BNODE 55 #define TK_BNODE 55
#define TK_SNODE 56 #define TK_SNODE 56
#define TK_MNODE 57 #define TK_MNODE 57
#define TK_DATABASE 58 #define TK_DATABASE 58
#define TK_USE 59 #define TK_USE 59
#define TK_FLUSH 60 #define TK_FLUSH 60
#define TK_TRIM 61 #define TK_TRIM 61
#define TK_IF 62 #define TK_IF 62
#define TK_NOT 63 #define TK_NOT 63
#define TK_EXISTS 64 #define TK_EXISTS 64
#define TK_BUFFER 65 #define TK_BUFFER 65
#define TK_CACHEMODEL 66 #define TK_CACHEMODEL 66
#define TK_CACHESIZE 67 #define TK_CACHESIZE 67
#define TK_COMP 68 #define TK_COMP 68
#define TK_DURATION 69 #define TK_DURATION 69
#define TK_NK_VARIABLE 70 #define TK_NK_VARIABLE 70
#define TK_MAXROWS 71 #define TK_MAXROWS 71
#define TK_MINROWS 72 #define TK_MINROWS 72
#define TK_KEEP 73 #define TK_KEEP 73
#define TK_PAGES 74 #define TK_PAGES 74
#define TK_PAGESIZE 75 #define TK_PAGESIZE 75
#define TK_TSDB_PAGESIZE 76 #define TK_TSDB_PAGESIZE 76
#define TK_PRECISION 77 #define TK_PRECISION 77
#define TK_REPLICA 78 #define TK_REPLICA 78
#define TK_VGROUPS 79 #define TK_VGROUPS 79
#define TK_SINGLE_STABLE 80 #define TK_SINGLE_STABLE 80
#define TK_RETENTIONS 81 #define TK_RETENTIONS 81
#define TK_SCHEMALESS 82 #define TK_SCHEMALESS 82
#define TK_WAL_LEVEL 83 #define TK_WAL_LEVEL 83
#define TK_WAL_FSYNC_PERIOD 84 #define TK_WAL_FSYNC_PERIOD 84
#define TK_WAL_RETENTION_PERIOD 85 #define TK_WAL_RETENTION_PERIOD 85
#define TK_WAL_RETENTION_SIZE 86 #define TK_WAL_RETENTION_SIZE 86
#define TK_WAL_ROLL_PERIOD 87 #define TK_WAL_ROLL_PERIOD 87
#define TK_WAL_SEGMENT_SIZE 88 #define TK_WAL_SEGMENT_SIZE 88
#define TK_STT_TRIGGER 89 #define TK_STT_TRIGGER 89
#define TK_TABLE_PREFIX 90 #define TK_TABLE_PREFIX 90
#define TK_TABLE_SUFFIX 91 #define TK_TABLE_SUFFIX 91
#define TK_NK_COLON 92 #define TK_NK_COLON 92
#define TK_MAX_SPEED 93 #define TK_MAX_SPEED 93
#define TK_TABLE 94 #define TK_TABLE 94
#define TK_NK_LP 95 #define TK_NK_LP 95
#define TK_NK_RP 96 #define TK_NK_RP 96
#define TK_STABLE 97 #define TK_STABLE 97
#define TK_ADD 98 #define TK_ADD 98
#define TK_COLUMN 99 #define TK_COLUMN 99
#define TK_MODIFY 100 #define TK_MODIFY 100
#define TK_RENAME 101 #define TK_RENAME 101
#define TK_TAG 102 #define TK_TAG 102
#define TK_SET 103 #define TK_SET 103
#define TK_NK_EQ 104 #define TK_NK_EQ 104
#define TK_USING 105 #define TK_USING 105
#define TK_TAGS 106 #define TK_TAGS 106
#define TK_COMMENT 107 #define TK_COMMENT 107
#define TK_BOOL 108 #define TK_BOOL 108
#define TK_TINYINT 109 #define TK_TINYINT 109
#define TK_SMALLINT 110 #define TK_SMALLINT 110
#define TK_INT 111 #define TK_INT 111
#define TK_INTEGER 112 #define TK_INTEGER 112
#define TK_BIGINT 113 #define TK_BIGINT 113
#define TK_FLOAT 114 #define TK_FLOAT 114
#define TK_DOUBLE 115 #define TK_DOUBLE 115
#define TK_BINARY 116 #define TK_BINARY 116
#define TK_TIMESTAMP 117 #define TK_TIMESTAMP 117
#define TK_NCHAR 118 #define TK_NCHAR 118
#define TK_UNSIGNED 119 #define TK_UNSIGNED 119
#define TK_JSON 120 #define TK_JSON 120
#define TK_VARCHAR 121 #define TK_VARCHAR 121
#define TK_MEDIUMBLOB 122 #define TK_MEDIUMBLOB 122
#define TK_BLOB 123 #define TK_BLOB 123
#define TK_VARBINARY 124 #define TK_VARBINARY 124
#define TK_DECIMAL 125 #define TK_DECIMAL 125
#define TK_MAX_DELAY 126 #define TK_MAX_DELAY 126
#define TK_WATERMARK 127 #define TK_WATERMARK 127
#define TK_ROLLUP 128 #define TK_ROLLUP 128
#define TK_TTL 129 #define TK_TTL 129
#define TK_SMA 130 #define TK_SMA 130
#define TK_DELETE_MARK 131 #define TK_DELETE_MARK 131
#define TK_FIRST 132 #define TK_FIRST 132
#define TK_LAST 133 #define TK_LAST 133
#define TK_SHOW 134 #define TK_SHOW 134
#define TK_PRIVILEGES 135 #define TK_PRIVILEGES 135
#define TK_DATABASES 136 #define TK_DATABASES 136
#define TK_TABLES 137 #define TK_TABLES 137
#define TK_STABLES 138 #define TK_STABLES 138
#define TK_MNODES 139 #define TK_MNODES 139
#define TK_QNODES 140 #define TK_QNODES 140
#define TK_FUNCTIONS 141 #define TK_FUNCTIONS 141
#define TK_INDEXES 142 #define TK_INDEXES 142
#define TK_ACCOUNTS 143 #define TK_ACCOUNTS 143
#define TK_APPS 144 #define TK_APPS 144
#define TK_CONNECTIONS 145 #define TK_CONNECTIONS 145
#define TK_LICENCES 146 #define TK_LICENCES 146
#define TK_GRANTS 147 #define TK_GRANTS 147
#define TK_QUERIES 148 #define TK_QUERIES 148
#define TK_SCORES 149 #define TK_SCORES 149
#define TK_TOPICS 150 #define TK_TOPICS 150
#define TK_VARIABLES 151 #define TK_VARIABLES 151
#define TK_CLUSTER 152 #define TK_CLUSTER 152
#define TK_BNODES 153 #define TK_BNODES 153
#define TK_SNODES 154 #define TK_SNODES 154
#define TK_TRANSACTIONS 155 #define TK_TRANSACTIONS 155
#define TK_DISTRIBUTED 156 #define TK_DISTRIBUTED 156
#define TK_CONSUMERS 157 #define TK_CONSUMERS 157
#define TK_SUBSCRIPTIONS 158 #define TK_SUBSCRIPTIONS 158
#define TK_VNODES 159 #define TK_VNODES 159
#define TK_LIKE 160 #define TK_LIKE 160
#define TK_TBNAME 161 #define TK_TBNAME 161
#define TK_QTAGS 162 #define TK_QTAGS 162
#define TK_AS 163 #define TK_AS 163
#define TK_INDEX 164 #define TK_INDEX 164
#define TK_FUNCTION 165 #define TK_FUNCTION 165
#define TK_INTERVAL 166 #define TK_INTERVAL 166
#define TK_TOPIC 167 #define TK_TOPIC 167
#define TK_WITH 168 #define TK_WITH 168
#define TK_META 169 #define TK_META 169
#define TK_CONSUMER 170 #define TK_CONSUMER 170
#define TK_GROUP 171 #define TK_GROUP 171
#define TK_DESC 172 #define TK_DESC 172
#define TK_DESCRIBE 173 #define TK_DESCRIBE 173
#define TK_RESET 174 #define TK_RESET 174
#define TK_QUERY 175 #define TK_QUERY 175
#define TK_CACHE 176 #define TK_CACHE 176
#define TK_EXPLAIN 177 #define TK_EXPLAIN 177
#define TK_ANALYZE 178 #define TK_ANALYZE 178
#define TK_VERBOSE 179 #define TK_VERBOSE 179
#define TK_NK_BOOL 180 #define TK_NK_BOOL 180
#define TK_RATIO 181 #define TK_RATIO 181
#define TK_NK_FLOAT 182 #define TK_NK_FLOAT 182
#define TK_OUTPUTTYPE 183 #define TK_OUTPUTTYPE 183
#define TK_AGGREGATE 184 #define TK_AGGREGATE 184
#define TK_BUFSIZE 185 #define TK_BUFSIZE 185
#define TK_STREAM 186 #define TK_STREAM 186
#define TK_INTO 187 #define TK_INTO 187
#define TK_TRIGGER 188 #define TK_TRIGGER 188
#define TK_AT_ONCE 189 #define TK_AT_ONCE 189
#define TK_WINDOW_CLOSE 190 #define TK_WINDOW_CLOSE 190
#define TK_IGNORE 191 #define TK_IGNORE 191
#define TK_EXPIRED 192 #define TK_EXPIRED 192
#define TK_FILL_HISTORY 193 #define TK_FILL_HISTORY 193
#define TK_SUBTABLE 194 #define TK_SUBTABLE 194
#define TK_KILL 195 #define TK_KILL 195
#define TK_CONNECTION 196 #define TK_CONNECTION 196
#define TK_TRANSACTION 197 #define TK_TRANSACTION 197
#define TK_BALANCE 198 #define TK_BALANCE 198
#define TK_VGROUP 199 #define TK_VGROUP 199
#define TK_MERGE 200 #define TK_MERGE 200
#define TK_REDISTRIBUTE 201 #define TK_REDISTRIBUTE 201
#define TK_SPLIT 202 #define TK_SPLIT 202
#define TK_DELETE 203 #define TK_DELETE 203
#define TK_INSERT 204 #define TK_INSERT 204
#define TK_NULL 205 #define TK_NULL 205
#define TK_NK_QUESTION 206 #define TK_NK_QUESTION 206
#define TK_NK_ARROW 207 #define TK_NK_ARROW 207
#define TK_ROWTS 208 #define TK_ROWTS 208
#define TK_QSTART 209 #define TK_QSTART 209
#define TK_QEND 210 #define TK_QEND 210
#define TK_QDURATION 211 #define TK_QDURATION 211
#define TK_WSTART 212 #define TK_WSTART 212
#define TK_WEND 213 #define TK_WEND 213
#define TK_WDURATION 214 #define TK_WDURATION 214
#define TK_IROWTS 215 #define TK_IROWTS 215
#define TK_CAST 216 #define TK_CAST 216
#define TK_NOW 217 #define TK_NOW 217
#define TK_TODAY 218 #define TK_TODAY 218
#define TK_TIMEZONE 219 #define TK_TIMEZONE 219
#define TK_CLIENT_VERSION 220 #define TK_CLIENT_VERSION 220
#define TK_SERVER_VERSION 221 #define TK_SERVER_VERSION 221
#define TK_SERVER_STATUS 222 #define TK_SERVER_STATUS 222
#define TK_CURRENT_USER 223 #define TK_CURRENT_USER 223
#define TK_COUNT 224 #define TK_COUNT 224
#define TK_LAST_ROW 225 #define TK_LAST_ROW 225
#define TK_CASE 226 #define TK_CASE 226
#define TK_END 227 #define TK_END 227
#define TK_WHEN 228 #define TK_WHEN 228
#define TK_THEN 229 #define TK_THEN 229
#define TK_ELSE 230 #define TK_ELSE 230
#define TK_BETWEEN 231 #define TK_BETWEEN 231
#define TK_IS 232 #define TK_IS 232
#define TK_NK_LT 233 #define TK_NK_LT 233
#define TK_NK_GT 234 #define TK_NK_GT 234
#define TK_NK_LE 235 #define TK_NK_LE 235
#define TK_NK_GE 236 #define TK_NK_GE 236
#define TK_NK_NE 237 #define TK_NK_NE 237
#define TK_MATCH 238 #define TK_MATCH 238
#define TK_NMATCH 239 #define TK_NMATCH 239
#define TK_CONTAINS 240 #define TK_CONTAINS 240
#define TK_IN 241 #define TK_IN 241
#define TK_JOIN 242 #define TK_JOIN 242
#define TK_INNER 243 #define TK_INNER 243
#define TK_SELECT 244 #define TK_SELECT 244
#define TK_DISTINCT 245 #define TK_DISTINCT 245
#define TK_WHERE 246 #define TK_WHERE 246
#define TK_PARTITION 247 #define TK_PARTITION 247
#define TK_BY 248 #define TK_BY 248
#define TK_SESSION 249 #define TK_SESSION 249
#define TK_STATE_WINDOW 250 #define TK_STATE_WINDOW 250
#define TK_SLIDING 251 #define TK_SLIDING 251
#define TK_FILL 252 #define TK_FILL 252
#define TK_VALUE 253 #define TK_VALUE 253
#define TK_NONE 254 #define TK_VALUE_F 254
#define TK_PREV 255 #define TK_NONE 255
#define TK_LINEAR 256 #define TK_PREV 256
#define TK_NEXT 257 #define TK_NULL_F 257
#define TK_HAVING 258 #define TK_LINEAR 258
#define TK_RANGE 259 #define TK_NEXT 259
#define TK_EVERY 260 #define TK_HAVING 260
#define TK_ORDER 261 #define TK_RANGE 261
#define TK_SLIMIT 262 #define TK_EVERY 262
#define TK_SOFFSET 263 #define TK_ORDER 263
#define TK_LIMIT 264 #define TK_SLIMIT 264
#define TK_OFFSET 265 #define TK_SOFFSET 265
#define TK_ASC 266 #define TK_LIMIT 266
#define TK_NULLS 267 #define TK_OFFSET 267
#define TK_ABORT 268 #define TK_ASC 268
#define TK_AFTER 269 #define TK_NULLS 269
#define TK_ATTACH 270 #define TK_ABORT 270
#define TK_BEFORE 271 #define TK_AFTER 271
#define TK_BEGIN 272 #define TK_ATTACH 272
#define TK_BITAND 273 #define TK_BEFORE 273
#define TK_BITNOT 274 #define TK_BEGIN 274
#define TK_BITOR 275 #define TK_BITAND 275
#define TK_BLOCKS 276 #define TK_BITNOT 276
#define TK_CHANGE 277 #define TK_BITOR 277
#define TK_COMMA 278 #define TK_BLOCKS 278
#define TK_COMPACT 279 #define TK_CHANGE 279
#define TK_CONCAT 280 #define TK_COMMA 280
#define TK_CONFLICT 281 #define TK_COMPACT 281
#define TK_COPY 282 #define TK_CONCAT 282
#define TK_DEFERRED 283 #define TK_CONFLICT 283
#define TK_DELIMITERS 284 #define TK_COPY 284
#define TK_DETACH 285 #define TK_DEFERRED 285
#define TK_DIVIDE 286 #define TK_DELIMITERS 286
#define TK_DOT 287 #define TK_DETACH 287
#define TK_EACH 288 #define TK_DIVIDE 288
#define TK_FAIL 289 #define TK_DOT 289
#define TK_FILE 290 #define TK_EACH 290
#define TK_FOR 291 #define TK_FAIL 291
#define TK_GLOB 292 #define TK_FILE 292
#define TK_ID 293 #define TK_FOR 293
#define TK_IMMEDIATE 294 #define TK_GLOB 294
#define TK_IMPORT 295 #define TK_ID 295
#define TK_INITIALLY 296 #define TK_IMMEDIATE 296
#define TK_INSTEAD 297 #define TK_IMPORT 297
#define TK_ISNULL 298 #define TK_INITIALLY 298
#define TK_KEY 299 #define TK_INSTEAD 299
#define TK_MODULES 300 #define TK_ISNULL 300
#define TK_NK_BITNOT 301 #define TK_KEY 301
#define TK_NK_SEMI 302 #define TK_MODULES 302
#define TK_NOTNULL 303 #define TK_NK_BITNOT 303
#define TK_OF 304 #define TK_NK_SEMI 304
#define TK_PLUS 305 #define TK_NOTNULL 305
#define TK_PRIVILEGE 306 #define TK_OF 306
#define TK_RAISE 307 #define TK_PLUS 307
#define TK_REPLACE 308 #define TK_PRIVILEGE 308
#define TK_RESTRICT 309 #define TK_RAISE 309
#define TK_ROW 310 #define TK_REPLACE 310
#define TK_SEMI 311 #define TK_RESTRICT 311
#define TK_STAR 312 #define TK_ROW 312
#define TK_STATEMENT 313 #define TK_SEMI 313
#define TK_STRICT 314 #define TK_STAR 314
#define TK_STRING 315 #define TK_STATEMENT 315
#define TK_TIMES 316 #define TK_STRICT 316
#define TK_UPDATE 317 #define TK_STRING 317
#define TK_VALUES 318 #define TK_TIMES 318
#define TK_VARIABLE 319 #define TK_UPDATE 319
#define TK_VIEW 320 #define TK_VALUES 320
#define TK_WAL 321 #define TK_VARIABLE 321
#define TK_VIEW 322
#define TK_WAL 323
#define TK_NK_SPACE 600 #define TK_NK_SPACE 600
#define TK_NK_COMMENT 601 #define TK_NK_COMMENT 601

2
include/libs/nodes/querynodes.h
View File

@ -226,8 +226,10 @@ typedef struct SIntervalWindowNode {
typedef enum EFillMode { typedef enum EFillMode {
FILL_MODE_NONE = 1, FILL_MODE_NONE = 1,
FILL_MODE_VALUE, FILL_MODE_VALUE,
FILL_MODE_VALUE_F,
FILL_MODE_PREV, FILL_MODE_PREV,
FILL_MODE_NULL, FILL_MODE_NULL,
FILL_MODE_NULL_F,
FILL_MODE_LINEAR, FILL_MODE_LINEAR,
FILL_MODE_NEXT FILL_MODE_NEXT
} EFillMode; } EFillMode;

6
source/libs/executor/src/executil.c
View File

@ -1658,12 +1658,18 @@ int32_t convertFillType(int32_t mode) {
case FILL_MODE_NULL: case FILL_MODE_NULL:
type = TSDB_FILL_NULL; type = TSDB_FILL_NULL;
break; break;
case FILL_MODE_NULL_F:
type = TSDB_FILL_NULL_F;
break;
case FILL_MODE_NEXT: case FILL_MODE_NEXT:
type = TSDB_FILL_NEXT; type = TSDB_FILL_NEXT;
break; break;
case FILL_MODE_VALUE: case FILL_MODE_VALUE:
type = TSDB_FILL_SET_VALUE; type = TSDB_FILL_SET_VALUE;
break; break;
case FILL_MODE_VALUE_F:
type = TSDB_FILL_SET_VALUE_F;
break;
case FILL_MODE_LINEAR: case FILL_MODE_LINEAR:
type = TSDB_FILL_LINEAR; type = TSDB_FILL_LINEAR;
break; break;

18
source/libs/executor/src/filloperator.c
View File

@ -140,7 +140,7 @@ static SSDataBlock* doFillImpl(SOperatorInfo* pOperator) {
while (1) { while (1) {
SSDataBlock* pBlock = pDownstream->fpSet.getNextFn(pDownstream); SSDataBlock* pBlock = pDownstream->fpSet.getNextFn(pDownstream);
if (pBlock == NULL) { if (pBlock == NULL) {
if (pInfo->totalInputRows == 0) { if (pInfo->totalInputRows == 0 && (pInfo->pFillInfo->type != TSDB_FILL_NULL_F && pInfo->pFillInfo->type != TSDB_FILL_SET_VALUE_F)) {
setOperatorCompleted(pOperator); setOperatorCompleted(pOperator);
return NULL; return NULL;
} }
@ -456,7 +456,8 @@ void* destroyStreamFillLinearInfo(SStreamFillLinearInfo* pFillLinear) {
return NULL; return NULL;
} }
void* destroyStreamFillInfo(SStreamFillInfo* pFillInfo) { void* destroyStreamFillInfo(SStreamFillInfo* pFillInfo) {
if (pFillInfo->type == TSDB_FILL_SET_VALUE || pFillInfo->type == TSDB_FILL_NULL) { if (pFillInfo->type == TSDB_FILL_SET_VALUE || pFillInfo->type == TSDB_FILL_SET_VALUE_F ||
pFillInfo->type == TSDB_FILL_NULL || pFillInfo->type == TSDB_FILL_NULL_F) {
taosMemoryFreeClear(pFillInfo->pResRow->pRowVal); taosMemoryFreeClear(pFillInfo->pResRow->pRowVal);
taosMemoryFreeClear(pFillInfo->pResRow); taosMemoryFreeClear(pFillInfo->pResRow);
} }
@ -661,7 +662,9 @@ void setDeleteFillValueInfo(TSKEY start, TSKEY end, SStreamFillSupporter* pFillS
pFillInfo->pos = FILL_POS_INVALID; pFillInfo->pos = FILL_POS_INVALID;
switch (pFillInfo->type) { switch (pFillInfo->type) {
case TSDB_FILL_NULL: case TSDB_FILL_NULL:
case TSDB_FILL_NULL_F:
case TSDB_FILL_SET_VALUE: case TSDB_FILL_SET_VALUE:
case TSDB_FILL_SET_VALUE_F:
break; break;
case TSDB_FILL_PREV: case TSDB_FILL_PREV:
pFillInfo->pResRow = &pFillSup->prev; pFillInfo->pResRow = &pFillSup->prev;
@ -720,7 +723,9 @@ void setFillValueInfo(SSDataBlock* pBlock, TSKEY ts, int32_t rowId, SStreamFillS
pFillInfo->pos = FILL_POS_INVALID; pFillInfo->pos = FILL_POS_INVALID;
switch (pFillInfo->type) { switch (pFillInfo->type) {
case TSDB_FILL_NULL: case TSDB_FILL_NULL:
case TSDB_FILL_SET_VALUE: { case TSDB_FILL_NULL_F:
case TSDB_FILL_SET_VALUE:
case TSDB_FILL_SET_VALUE_F: {
if (pFillSup->prev.key == pFillInfo->preRowKey) { if (pFillSup->prev.key == pFillInfo->preRowKey) {
resetFillWindow(&pFillSup->prev); resetFillWindow(&pFillSup->prev);
} }
@ -1360,7 +1365,8 @@ SStreamFillInfo* initStreamFillInfo(SStreamFillSupporter* pFillSup, SSDataBlock*
pFillInfo->pLinearInfo->winIndex = 0; pFillInfo->pLinearInfo->winIndex = 0;
pFillInfo->pResRow = NULL; pFillInfo->pResRow = NULL;
if (pFillSup->type == TSDB_FILL_SET_VALUE || pFillSup->type == TSDB_FILL_NULL) { if (pFillSup->type == TSDB_FILL_SET_VALUE || pFillSup->type == TSDB_FILL_SET_VALUE_F
|| pFillSup->type == TSDB_FILL_NULL || pFillSup->type == TSDB_FILL_NULL_F) {
pFillInfo->pResRow = taosMemoryCalloc(1, sizeof(SResultRowData)); pFillInfo->pResRow = taosMemoryCalloc(1, sizeof(SResultRowData));
pFillInfo->pResRow->key = INT64_MIN; pFillInfo->pResRow->key = INT64_MIN;
pFillInfo->pResRow->pRowVal = taosMemoryCalloc(1, pFillSup->rowSize); pFillInfo->pResRow->pRowVal = taosMemoryCalloc(1, pFillSup->rowSize);
@ -1405,7 +1411,7 @@ SOperatorInfo* createStreamFillOperatorInfo(SOperatorInfo* downstream, SStreamFi
goto _error; goto _error;
} }
if (pInfo->pFillInfo->type == TSDB_FILL_SET_VALUE) { if (pInfo->pFillInfo->type == TSDB_FILL_SET_VALUE || pInfo->pFillInfo->type == TSDB_FILL_SET_VALUE_F) {
for (int32_t i = 0; i < pInfo->pFillSup->numOfAllCols; ++i) { for (int32_t i = 0; i < pInfo->pFillSup->numOfAllCols; ++i) {
SFillColInfo* pFillCol = pInfo->pFillSup->pAllColInfo + i; SFillColInfo* pFillCol = pInfo->pFillSup->pAllColInfo + i;
int32_t slotId = GET_DEST_SLOT_ID(pFillCol); int32_t slotId = GET_DEST_SLOT_ID(pFillCol);
@ -1427,7 +1433,7 @@ SOperatorInfo* createStreamFillOperatorInfo(SOperatorInfo* downstream, SStreamFi
pCell->isNull = true; pCell->isNull = true;
} }
} }
} else if (pInfo->pFillInfo->type == TSDB_FILL_NULL) { } else if (pInfo->pFillInfo->type == TSDB_FILL_NULL || pInfo->pFillInfo->type == TSDB_FILL_NULL_F) {
for (int32_t i = 0; i < pInfo->pFillSup->numOfAllCols; ++i) { for (int32_t i = 0; i < pInfo->pFillSup->numOfAllCols; ++i) {
SFillColInfo* pFillCol = pInfo->pFillSup->pAllColInfo + i; SFillColInfo* pFillCol = pInfo->pFillSup->pAllColInfo + i;
int32_t slotId = GET_DEST_SLOT_ID(pFillCol); int32_t slotId = GET_DEST_SLOT_ID(pFillCol);

9
source/libs/executor/src/tfill.c
View File

@ -186,7 +186,7 @@ static void doFillOneRow(SFillInfo* pFillInfo, SSDataBlock* pBlock, SSDataBlock*
} }
} }
} }
} else if (pFillInfo->type == TSDB_FILL_NULL) { // fill with NULL } else if (pFillInfo->type == TSDB_FILL_NULL || pFillInfo->type == TSDB_FILL_NULL_F) { // fill with NULL
setNullRow(pBlock, pFillInfo, index); setNullRow(pBlock, pFillInfo, index);
} else { // fill with user specified value for each column } else { // fill with user specified value for each column
for (int32_t i = 0; i < pFillInfo->numOfCols; ++i) { for (int32_t i = 0; i < pFillInfo->numOfCols; ++i) {
@ -349,7 +349,7 @@ static int32_t fillResultImpl(SFillInfo* pFillInfo, SSDataBlock* pBlock, int32_t
bool isNull = colDataIsNull_s(pSrc, pFillInfo->index); bool isNull = colDataIsNull_s(pSrc, pFillInfo->index);
colDataAppend(pDst, index, src, isNull); colDataAppend(pDst, index, src, isNull);
saveColData(pFillInfo->prev.pRowVal, i, src, isNull); // todo: saveColData(pFillInfo->prev.pRowVal, i, src, isNull); // todo:
} else if (pFillInfo->type == TSDB_FILL_NULL) { } else if (pFillInfo->type == TSDB_FILL_NULL || pFillInfo->type == TSDB_FILL_NULL_F) {
colDataAppendNULL(pDst, index); colDataAppendNULL(pDst, index);
} else if (pFillInfo->type == TSDB_FILL_NEXT) { } else if (pFillInfo->type == TSDB_FILL_NEXT) {
SArray* p = FILL_IS_ASC_FILL(pFillInfo) ? pFillInfo->next.pRowVal : pFillInfo->prev.pRowVal; SArray* p = FILL_IS_ASC_FILL(pFillInfo) ? pFillInfo->next.pRowVal : pFillInfo->prev.pRowVal;
@ -546,15 +546,14 @@ bool taosFillHasMoreResults(SFillInfo* pFillInfo) {
} }
int64_t getNumOfResultsAfterFillGap(SFillInfo* pFillInfo, TSKEY ekey, int32_t maxNumOfRows) { int64_t getNumOfResultsAfterFillGap(SFillInfo* pFillInfo, TSKEY ekey, int32_t maxNumOfRows) {
SColumnInfoData* pCol = taosArrayGet(pFillInfo->pSrcBlock->pDataBlock, pFillInfo->srcTsSlotId);
int64_t* tsList = (int64_t*)pCol->pData;
int32_t numOfRows = taosNumOfRemainRows(pFillInfo); int32_t numOfRows = taosNumOfRemainRows(pFillInfo);
TSKEY ekey1 = ekey; TSKEY ekey1 = ekey;
int64_t numOfRes = -1; int64_t numOfRes = -1;
if (numOfRows > 0) { // still fill gap within current data block, not generating data after the result set. if (numOfRows > 0) { // still fill gap within current data block, not generating data after the result set.
SColumnInfoData* pCol = taosArrayGet(pFillInfo->pSrcBlock->pDataBlock, pFillInfo->srcTsSlotId);
int64_t* tsList = (int64_t*)pCol->pData;
TSKEY lastKey = tsList[pFillInfo->numOfRows - 1]; TSKEY lastKey = tsList[pFillInfo->numOfRows - 1];
numOfRes = taosTimeCountInterval(lastKey, pFillInfo->currentKey, pFillInfo->interval.sliding, numOfRes = taosTimeCountInterval(lastKey, pFillInfo->currentKey, pFillInfo->interval.sliding,
pFillInfo->interval.slidingUnit, pFillInfo->interval.precision); pFillInfo->interval.slidingUnit, pFillInfo->interval.precision);

6
source/libs/executor/src/timesliceoperator.c
View File

@ -181,12 +181,14 @@ static bool genInterpolationResult(STimeSliceOperatorInfo* pSliceInfo, SExprSupp
int32_t srcSlot = pExprInfo->base.pParam[0].pCol->slotId; int32_t srcSlot = pExprInfo->base.pParam[0].pCol->slotId;
switch (pSliceInfo->fillType) { switch (pSliceInfo->fillType) {
case TSDB_FILL_NULL: { case TSDB_FILL_NULL:
case TSDB_FILL_NULL_F: {
colDataAppendNULL(pDst, rows); colDataAppendNULL(pDst, rows);
break; break;
} }
case TSDB_FILL_SET_VALUE: { case TSDB_FILL_SET_VALUE:
case TSDB_FILL_SET_VALUE_F: {
SVariant* pVar = &pSliceInfo->pFillColInfo[j].fillVal; SVariant* pVar = &pSliceInfo->pFillColInfo[j].fillVal;
if (pDst->info.type == TSDB_DATA_TYPE_FLOAT) { if (pDst->info.type == TSDB_DATA_TYPE_FLOAT) {

4
source/libs/nodes/src/nodesUtilFuncs.c
View File

@ -1990,10 +1990,14 @@ char* nodesGetFillModeString(EFillMode mode) {
return "none"; return "none";
case FILL_MODE_VALUE: case FILL_MODE_VALUE:
return "value"; return "value";
case FILL_MODE_VALUE_F:
return "value_f";
case FILL_MODE_PREV: case FILL_MODE_PREV:
return "prev"; return "prev";
case FILL_MODE_NULL: case FILL_MODE_NULL:
return "null"; return "null";
case FILL_MODE_NULL_F:
return "null_f";
case FILL_MODE_LINEAR: case FILL_MODE_LINEAR:
return "linear"; return "linear";
case FILL_MODE_NEXT: case FILL_MODE_NEXT:

2
source/libs/parser/inc/sql.y
View File

@ -978,12 +978,14 @@ sliding_opt(A) ::= SLIDING NK_LP duration_literal(B) NK_RP.
fill_opt(A) ::= . { A = NULL; } fill_opt(A) ::= . { A = NULL; }
fill_opt(A) ::= FILL NK_LP fill_mode(B) NK_RP. { A = createFillNode(pCxt, B, NULL); } fill_opt(A) ::= FILL NK_LP fill_mode(B) NK_RP. { A = createFillNode(pCxt, B, NULL); }
fill_opt(A) ::= FILL NK_LP VALUE NK_COMMA literal_list(B) NK_RP. { A = createFillNode(pCxt, FILL_MODE_VALUE, createNodeListNode(pCxt, B)); } fill_opt(A) ::= FILL NK_LP VALUE NK_COMMA literal_list(B) NK_RP. { A = createFillNode(pCxt, FILL_MODE_VALUE, createNodeListNode(pCxt, B)); }
fill_opt(A) ::= FILL NK_LP VALUE_F NK_COMMA literal_list(B) NK_RP. { A = createFillNode(pCxt, FILL_MODE_VALUE_F, createNodeListNode(pCxt, B)); }
%type fill_mode { EFillMode } %type fill_mode { EFillMode }
%destructor fill_mode { } %destructor fill_mode { }
fill_mode(A) ::= NONE. { A = FILL_MODE_NONE; } fill_mode(A) ::= NONE. { A = FILL_MODE_NONE; }
fill_mode(A) ::= PREV. { A = FILL_MODE_PREV; } fill_mode(A) ::= PREV. { A = FILL_MODE_PREV; }
fill_mode(A) ::= NULL. { A = FILL_MODE_NULL; } fill_mode(A) ::= NULL. { A = FILL_MODE_NULL; }
fill_mode(A) ::= NULL_F. { A = FILL_MODE_NULL_F; }
fill_mode(A) ::= LINEAR. { A = FILL_MODE_LINEAR; } fill_mode(A) ::= LINEAR. { A = FILL_MODE_LINEAR; }
fill_mode(A) ::= NEXT. { A = FILL_MODE_NEXT; } fill_mode(A) ::= NEXT. { A = FILL_MODE_NEXT; }

2
source/libs/parser/src/parTokenizer.c
View File

@ -148,6 +148,7 @@ static SKeyword keywordTable[] = {
{"NOT", TK_NOT}, {"NOT", TK_NOT},
{"NOW", TK_NOW}, {"NOW", TK_NOW},
{"NULL", TK_NULL}, {"NULL", TK_NULL},
{"NULL_F", TK_NULL_F},
{"NULLS", TK_NULLS}, {"NULLS", TK_NULLS},
{"OFFSET", TK_OFFSET}, {"OFFSET", TK_OFFSET},
{"ON", TK_ON}, {"ON", TK_ON},
@ -237,6 +238,7 @@ static SKeyword keywordTable[] = {
{"USERS", TK_USERS}, {"USERS", TK_USERS},
{"USING", TK_USING}, {"USING", TK_USING},
{"VALUE", TK_VALUE}, {"VALUE", TK_VALUE},
{"VALUE_F", TK_VALUE_F},
{"VALUES", TK_VALUES}, {"VALUES", TK_VALUES},
{"VARCHAR", TK_VARCHAR}, {"VARCHAR", TK_VARCHAR},
{"VARIABLES", TK_VARIABLES}, {"VARIABLES", TK_VARIABLES},

2
source/libs/parser/src/parTranslater.c
View File

@ -2817,7 +2817,7 @@ static int32_t convertFillValue(STranslateContext* pCxt, SDataType dt, SNodeList
} }
static int32_t checkFillValues(STranslateContext* pCxt, SFillNode* pFill, SNodeList* pProjectionList) { static int32_t checkFillValues(STranslateContext* pCxt, SFillNode* pFill, SNodeList* pProjectionList) {
if (FILL_MODE_VALUE != pFill->mode) { if (FILL_MODE_VALUE != pFill->mode && FILL_MODE_VALUE_F != pFill->mode) {
return TSDB_CODE_SUCCESS; return TSDB_CODE_SUCCESS;
} }

5225
source/libs/parser/src/sql.c
View File

File diff suppressed because it is too large Load Diff

1
tests/parallel_test/cases.task
View File

@ -178,6 +178,7 @@
,,y,script,./test.sh -f tsim/query/udf_with_const.sim ,,y,script,./test.sh -f tsim/query/udf_with_const.sim
,,y,script,./test.sh -f tsim/query/sys_tbname.sim ,,y,script,./test.sh -f tsim/query/sys_tbname.sim
,,y,script,./test.sh -f tsim/query/groupby.sim ,,y,script,./test.sh -f tsim/query/groupby.sim
,,y,script,./test.sh -f tsim/query/forceFill.sim
,,y,script,./test.sh -f tsim/qnode/basic1.sim ,,y,script,./test.sh -f tsim/qnode/basic1.sim
,,y,script,./test.sh -f tsim/snode/basic1.sim ,,y,script,./test.sh -f tsim/snode/basic1.sim
,,y,script,./test.sh -f tsim/mnode/basic1.sim ,,y,script,./test.sh -f tsim/mnode/basic1.sim

367
tests/script/tsim/query/forceFill.sim Normal file
View File

@ -0,0 +1,367 @@
system sh/stop_dnodes.sh
system sh/deploy.sh -n dnode1 -i 1
system sh/exec.sh -n dnode1 -s start
sql connect
sql drop database if exists db1;
sql create database db1 vgroups 10;
sql use db1;
sql create stable sta (ts timestamp, f1 double, f2 binary(200)) tags(t1 int);
sql create table tba1 using sta tags(1);
sql insert into tba1 values ('2022-04-26 15:15:01', 1.0, "a");
sql insert into tba1 values ('2022-04-26 15:15:02', 2.0, "b");
sql insert into tba1 values ('2022-04-26 15:15:04', 4.0, "b");
sql insert into tba1 values ('2022-04-26 15:15:05', 5.0, "b");
sql select avg(f1) from tba1 where ts >= '2022-04-26 15:15:00' and ts <= '2022-04-26 15:15:06' interval(1s) fill(value_f, 8.8);
if $rows != 7 then
return -1
endi
if $data00 != 8.800000000 then
return -1
endi
if $data10 != 1.000000000 then
return -1
endi
if $data20 != 2.000000000 then
return -1
endi
if $data30 != 8.800000000 then
return -1
endi
if $data40 != 4.000000000 then
return -1
endi
if $data50 != 5.000000000 then
return -1
endi
if $data60 != 8.800000000 then
return -1
endi
sql select avg(f1) from tba1 where ts >= '2022-04-26 15:15:00' and ts <= '2022-04-26 15:15:06' interval(1s) fill(value, 8.8);
if $rows != 7 then
return -1
endi
if $data00 != 8.800000000 then
return -1
endi
if $data10 != 1.000000000 then
return -1
endi
if $data20 != 2.000000000 then
return -1
endi
if $data30 != 8.800000000 then
return -1
endi
if $data40 != 4.000000000 then
return -1
endi
if $data50 != 5.000000000 then
return -1
endi
if $data60 != 8.800000000 then
return -1
endi
sql select avg(f1) from tba1 where ts >= '2022-04-26 15:15:00' and ts <= '2022-04-26 15:15:06' interval(1s) fill(null);
if $rows != 7 then
return -1
endi
if $data00 != NULL then
return -1
endi
if $data10 != 1.000000000 then
return -1
endi
if $data20 != 2.000000000 then
return -1
endi
if $data30 != NULL then
return -1
endi
if $data40 != 4.000000000 then
return -1
endi
if $data50 != 5.000000000 then
return -1
endi
if $data60 != NULL then
return -1
endi
sql select avg(f1) from tba1 where ts >= '2022-04-26 15:15:00' and ts <= '2022-04-26 15:15:06' interval(1s) fill(null_f);
if $rows != 7 then
return -1
endi
if $data00 != NULL then
return -1
endi
if $data10 != 1.000000000 then
return -1
endi
if $data20 != 2.000000000 then
return -1
endi
if $data30 != NULL then
return -1
endi
if $data40 != 4.000000000 then
return -1
endi
if $data50 != 5.000000000 then
return -1
endi
if $data60 != NULL then
return -1
endi
sql select avg(f1) from tba1 where ts >= '2022-04-26 15:15:06' and ts <= '2022-04-26 15:15:10' interval(1s) fill(value, 8.8);
if $rows != 0 then
return -1
endi
sql select avg(f1) from tba1 where ts >= '2022-04-26 15:15:06' and ts <= '2022-04-26 15:15:10' interval(1s) fill(value_f, 8.8);
if $rows != 5 then
return -1
endi
if $data00 != 8.800000000 then
return -1
endi
if $data10 != 8.800000000 then
return -1
endi
if $data20 != 8.800000000 then
return -1
endi
if $data30 != 8.800000000 then
return -1
endi
if $data40 != 8.800000000 then
return -1
endi
sql select avg(f1) from tba1 where ts >= '2022-04-26 15:15:06' and ts <= '2022-04-26 15:15:10' interval(1s) fill(null);
if $rows != 0 then
return -1
endi
sql select avg(f1) from tba1 where ts >= '2022-04-26 15:15:06' and ts <= '2022-04-26 15:15:10' interval(1s) fill(null_f);
if $rows != 5 then
return -1
endi
if $data00 != NULL then
return -1
endi
if $data10 != NULL then
return -1
endi
if $data20 != NULL then
return -1
endi
if $data30 != NULL then
return -1
endi
if $data40 != NULL then
return -1
endi
sql select avg(f1) from tba1 where ts >= '2022-04-26 15:16:00' and ts <= '2022-04-26 19:15:59' interval(1s) fill(value_f, 8.8);
if $rows != 14400 then
return -1
endi
if $data00 != 8.800000000 then
return -1
endi
sql select avg(f1) from tba1 where ts >= '2022-04-26 15:16:00' and ts <= '2022-04-26 19:15:59' interval(1s) fill(null_f);
if $rows != 14400 then
return -1
endi
if $data00 != NULL then
return -1
endi
sql select interp(f1) from tba1 range('2022-04-26 15:15:00','2022-04-26 15:15:06') every(1s) fill(value_f, 8.8);
if $rows != 7 then
return -1
endi
if $data00 != 8.800000000 then
return -1
endi
if $data10 != 1.000000000 then
return -1
endi
if $data20 != 2.000000000 then
return -1
endi
if $data30 != 8.800000000 then
return -1
endi
if $data40 != 4.000000000 then
return -1
endi
if $data50 != 5.000000000 then
return -1
endi
if $data60 != 8.800000000 then
return -1
endi
sql select interp(f1) from tba1 range('2022-04-26 15:15:00','2022-04-26 15:15:06') every(1s) fill(value, 8.8);
if $rows != 7 then
return -1
endi
if $data00 != 8.800000000 then
return -1
endi
if $data10 != 1.000000000 then
return -1
endi
if $data20 != 2.000000000 then
return -1
endi
if $data30 != 8.800000000 then
return -1
endi
if $data40 != 4.000000000 then
return -1
endi
if $data50 != 5.000000000 then
return -1
endi
if $data60 != 8.800000000 then
return -1
endi
sql select interp(f1) from tba1 range('2022-04-26 15:15:00','2022-04-26 15:15:06') every(1s) fill(null);
if $rows != 7 then
return -1
endi
if $data00 != NULL then
return -1
endi
if $data10 != 1.000000000 then
return -1
endi
if $data20 != 2.000000000 then
return -1
endi
if $data30 != NULL then
return -1
endi
if $data40 != 4.000000000 then
return -1
endi
if $data50 != 5.000000000 then
return -1
endi
if $data60 != NULL then
return -1
endi
sql select interp(f1) from tba1 range('2022-04-26 15:15:00','2022-04-26 15:15:06') every(1s) fill(null_f);
if $rows != 7 then
return -1
endi
if $data00 != NULL then
return -1
endi
if $data10 != 1.000000000 then
return -1
endi
if $data20 != 2.000000000 then
return -1
endi
if $data30 != NULL then
return -1
endi
if $data40 != 4.000000000 then
return -1
endi
if $data50 != 5.000000000 then
return -1
endi
if $data60 != NULL then
return -1
endi
sql select interp(f1) from tba1 range('2022-04-26 15:15:06','2022-04-26 15:15:10') every(1s) fill(value, 8.8);
if $rows != 5 then
return -1
endi
if $data00 != 8.800000000 then
return -1
endi
if $data10 != 8.800000000 then
return -1
endi
if $data20 != 8.800000000 then
return -1
endi
if $data30 != 8.800000000 then
return -1
endi
if $data40 != 8.800000000 then
return -1
endi
sql select interp(f1) from tba1 range('2022-04-26 15:15:06','2022-04-26 15:15:10') every(1s) fill(value_f, 8.8);
if $rows != 5 then
return -1
endi
if $data00 != 8.800000000 then
return -1
endi
if $data10 != 8.800000000 then
return -1
endi
if $data20 != 8.800000000 then
return -1
endi
if $data30 != 8.800000000 then
return -1
endi
if $data40 != 8.800000000 then
return -1
endi
sql select interp(f1) from tba1 range('2022-04-26 15:15:06','2022-04-26 15:15:10') every(1s) fill(null);
if $rows != 5 then
return -1
endi
if $data00 != NULL then
return -1
endi
if $data10 != NULL then
return -1
endi
if $data20 != NULL then
return -1
endi
if $data30 != NULL then
return -1
endi
if $data40 != NULL then
return -1
endi
sql select interp(f1) from tba1 range('2022-04-26 15:15:06','2022-04-26 15:15:10') every(1s) fill(null_f);
if $rows != 5 then
return -1
endi
if $data00 != NULL then
return -1
endi
if $data10 != NULL then
return -1
endi
if $data20 != NULL then
return -1
endi
if $data30 != NULL then
return -1
endi
if $data40 != NULL then
return -1
endi
sql select interp(f1) from tba1 range('2022-04-26 15:16:00','2022-04-26 19:15:59') every(1s) fill(value_f, 8.8);
if $rows != 14400 then
return -1
endi
if $data00 != 8.800000000 then
return -1
endi
sql select interp(f1) from tba1 range('2022-04-26 15:16:00','2022-04-26 19:15:59') every(1s) fill(null_f);
if $rows != 14400 then
return -1
endi
if $data00 != NULL then
return -1
endi
system sh/exec.sh -n dnode1 -s stop -x SIGINT

153
tests/script/tsim/stream/fillIntervalValue.sim
View File

@ -14,6 +14,7 @@ sql use test;
sql create table t1(ts timestamp, a int, b int , c int, d double, s varchar(20));; sql create table t1(ts timestamp, a int, b int , c int, d double, s varchar(20));;
sql create stream streams1 trigger at_once into streamt as select _wstart ts, count(*) c1 from t1 where ts > 1648791210000 and ts < 1648791413000 interval(10s) fill(value, 100); sql create stream streams1 trigger at_once into streamt as select _wstart ts, count(*) c1 from t1 where ts > 1648791210000 and ts < 1648791413000 interval(10s) fill(value, 100);
sql create stream streams1a trigger at_once into streamta as select _wstart ts, count(*) c1 from t1 where ts > 1648791210000 and ts < 1648791413000 interval(10s) fill(value_f, 100);
sql insert into t1 values(1648791213000,1,2,3,1.0,'aaa'); sql insert into t1 values(1648791213000,1,2,3,1.0,'aaa');
sleep 100 sleep 100
sql insert into t1 values(1648791233000,1,2,3,1.0,'aaa'); sql insert into t1 values(1648791233000,1,2,3,1.0,'aaa');
@ -77,6 +78,69 @@ if $data71 != 1 then
goto loop0 goto loop0
endi endi
print "force fill vaule"
$loop_count = 0
loop0a:
sleep 200
sql select * from streamta order by ts;
$loop_count = $loop_count + 1
if $loop_count == 10 then
return -1
endi
if $rows != 8 then
print =====rows=$rows
goto loop0a
endi
if $data01 != 1 then
print =====data01=$data01
goto loop0a
endi
if $data11 != 1 then
print =====data11=$data11
goto loop0a
endi
if $data21 != 1 then
print =====data21=$data21
goto loop0a
endi
if $data31 != 100 then
print =====data31=$data31
goto loop0a
endi
if $data41 != 1 then
print =====data41=$data41
goto loop0a
endi
if $data51 != 100 then
print =====data01=$data01
goto loop0a
endi
if $data61 != 100 then
print =====data61=$data61
goto loop0a
endi
if $data71 != 1 then
print =====data71=$data71
goto loop0a
endi
sql drop stream if exists streams2; sql drop stream if exists streams2;
sql drop database if exists test2; sql drop database if exists test2;
sql create database test2 vgroups 1; sql create database test2 vgroups 1;
@ -408,6 +472,7 @@ sql create table t1 using st tags(1,1,1);
sql create table t2 using st tags(2,2,2); sql create table t2 using st tags(2,2,2);
sql create stream streams4 trigger at_once into streamt4 as select _wstart ts, count(*) c1, concat(tbname, 'aaa') as pname, timezone() from st where ts > 1648791000000 and ts < 1648793000000 partition by tbname interval(10s) fill(NULL); sql create stream streams4 trigger at_once into streamt4 as select _wstart ts, count(*) c1, concat(tbname, 'aaa') as pname, timezone() from st where ts > 1648791000000 and ts < 1648793000000 partition by tbname interval(10s) fill(NULL);
sql create stream streams4a trigger at_once into streamt4a as select _wstart ts, count(*) c1, concat(tbname, 'aaa') as pname, timezone() from st where ts > 1648791000000 and ts < 1648793000000 partition by tbname interval(10s) fill(NULL_F);
sql insert into t1 values(1648791213000,1,2,3,1.0,'aaa'); sql insert into t1 values(1648791213000,1,2,3,1.0,'aaa');
sql insert into t1 values(1648791233000,1,2,3,1.0,'aaa'); sql insert into t1 values(1648791233000,1,2,3,1.0,'aaa');
sql insert into t1 values(1648791273000,1,2,3,1.0,'aaa'); sql insert into t1 values(1648791273000,1,2,3,1.0,'aaa');
@ -512,32 +577,104 @@ if $data[12][3] == NULL then
goto loop4 goto loop4
endi endi
print "force fill null"
$loop_count = 0
loop4a:
sleep 200
sql select * from streamt4a order by pname, ts;
print ===> $data[0][0] , $data[0][1] , $data[0][2] , $data[0][3]
print ===> $data[1][0] , $data[1][1] , $data[1][2] , $data[1][3]
print ===> $data[2][0] , $data[2][1] , $data[2][2] , $data[2][3]
print ===> $data[3][0] , $data[3][1] , $data[3][2] , $data[3][3]
print ===> $data[4][0] , $data[4][1] , $data[4][2] , $data[4][3]
print ===> $data[5][0] , $data[5][1] , $data[5][2] , $data[5][3]
print ===> $data[6][0] , $data[6][1] , $data[6][2] , $data[6][3]
print ===> $data[7][0] , $data[7][1] , $data[7][2] , $data[7][3]
print ===> $data[8][0] , $data[8][1] , $data[8][2] , $data[8][3]
print ===> $data[9][0] , $data[9][1] , $data[9][2] , $data[9][3]
print ===> $data[10][0] , $data[10][1] , $data[10][2] , $data[10][3]
print ===> $data[11][0] , $data[11][1] , $data[11][2] , $data[11][3]
print ===> $data[12][0] , $data[12][1] , $data[12][2] , $data[12][3]
print ===> $data[13][0] , $data[13][1] , $data[13][2] , $data[13][3]
$loop_count = $loop_count + 1
if $loop_count == 10 then
return -1
endi
if $rows != 14 then
print =====rows=$rows
goto loop4a
endi
if $data11 != NULL then
print =====data11=$data11
goto loop4a
endi
if $data12 != t1aaa then
print =====data12=$data12
goto loop4a
endi
if $data13 == NULL then
print =====data13=$data13
goto loop4a
endi
if $data32 != t1aaa then
print =====data32=$data32
goto loop4a
endi
if $data42 != t1aaa then
print =====data42=$data42
goto loop4a
endi
if $data52 != t1aaa then
print =====data52=$data52
goto loop4a
endi
if $data81 != NULL then
print =====data81=$data81
goto loop4a
endi
if $data82 != t2aaa then
print =====data82=$data82
goto loop4a
endi
if $data83 == NULL then
print =====data83=$data83
goto loop4a
endi
if $data[10][2] != t2aaa then
print =====data[10][2]=$data[10][2]
goto loop4a
endi
if $data[11][2] != t2aaa then
print =====data[11][2]=$data[11][2]
goto loop4a
endi
if $data[12][2] != t2aaa then
print =====data[12][2]=$data[12][2]
goto loop4a
endi
if $data[12][3] == NULL then
print =====data[12][3]=$data[12][3]
goto loop4a
endi
@ -584,4 +721,4 @@ print ============loop_all=$loop_all
system sh/stop_dnodes.sh system sh/stop_dnodes.sh
#goto looptest #goto looptest