Merge pull request #16395 from taosdata/szhou/save-op-state

fix: support window pseduo column _wstart,_wend,_wduration for fill operator
taosdata · Aug 25, 2022 · 689caa1 · 689caa1
2 parents e971af4 + d059ace
commit 689caa1
Show file tree

Hide file tree

Showing 7 changed files with 156 additions and 135 deletions.
diff --git a/include/common/tcommon.h b/include/common/tcommon.h
@@ -205,7 +205,7 @@ typedef struct SColumn {
   int16_t slotId;
 
   char    name[TSDB_COL_NAME_LEN];
-  int8_t  flag;  // column type: normal column, tag, or user-input column (integer/float/string)
+  int16_t colType;  // column type: normal column, tag, or window column
   int16_t type;
   int32_t bytes;
   uint8_t precision;

diff --git a/include/libs/nodes/querynodes.h b/include/libs/nodes/querynodes.h
@@ -57,7 +57,9 @@ typedef enum EColumnType {
   COLUMN_TYPE_COLUMN = 1,
   COLUMN_TYPE_TAG,
   COLUMN_TYPE_TBNAME,
-  COLUMN_TYPE_WINDOW_PC,
+  COLUMN_TYPE_WINDOW_START,
+  COLUMN_TYPE_WINDOW_END,
+  COLUMN_TYPE_WINDOW_DURATION,
   COLUMN_TYPE_GROUP_KEY
 } EColumnType;