remove concat keyword from sql.y

src/common/src/texpr.c

@@ -936,8 +936,7 @@ void vectorLog(int16_t functionId, tExprOperandInfo* pInputs, uint8_t numInputs,
 }
 
 void vectorConcat(int16_t functionId, tExprOperandInfo* pInputs, uint8_t numInputs, tExprOperandInfo* pOutput, int32_t order) {
-  assert(functionId == TSDB_FUNC_SCALAR_CONCAT);
-  assert(numInputs == 2);
+  assert(functionId == TSDB_FUNC_SCALAR_CONCAT && numInputs == 2 && order == TSDB_ORDER_ASC);
   assert(pInputs[0].numOfRows >= 1 && pInputs[1].numOfRows >= 1);
   assert(pOutput->numOfRows >= MAX(pInputs[0].numOfRows, pInputs[1].numOfRows));
   char* data0 = NULL;
@@ -989,7 +988,7 @@ tScalarFunctionInfo aScalarFunctions[] = {
     },
     {
         TSDB_FUNC_SCALAR_CONCAT,
-        "strconcat",
+        "concat",
         vectorConcat
     },
 };

src/inc/ttokendef.h

@@ -16,6 +16,7 @@
 #ifndef TDENGINE_TTOKENDEF_H
 #define TDENGINE_TTOKENDEF_H
 
+
 #define TK_ID                               1
 #define TK_BOOL                             2
 #define TK_TINYINT                          3
@@ -57,163 +58,161 @@
 #define TK_STAR                            39
 #define TK_SLASH                           40
 #define TK_REM                             41
-#define TK_CONCAT                          42
-#define TK_UMINUS                          43
-#define TK_UPLUS                           44
-#define TK_BITNOT                          45
-#define TK_SHOW                            46
-#define TK_DATABASES                       47
-#define TK_TOPICS                          48
-#define TK_FUNCTIONS                       49
-#define TK_MNODES                          50
-#define TK_DNODES                          51
-#define TK_ACCOUNTS                        52
-#define TK_USERS                           53
-#define TK_MODULES                         54
-#define TK_QUERIES                         55
-#define TK_CONNECTIONS                     56
-#define TK_STREAMS                         57
-#define TK_VARIABLES                       58
-#define TK_SCORES                          59
-#define TK_GRANTS                          60
-#define TK_VNODES                          61
-#define TK_DOT                             62
-#define TK_CREATE                          63
-#define TK_TABLE                           64
-#define TK_STABLE                          65
-#define TK_DATABASE                        66
-#define TK_TABLES                          67
-#define TK_STABLES                         68
-#define TK_VGROUPS                         69
-#define TK_DROP                            70
-#define TK_TOPIC                           71
-#define TK_FUNCTION                        72
-#define TK_DNODE                           73
-#define TK_USER                            74
-#define TK_ACCOUNT                         75
-#define TK_USE                             76
-#define TK_DESCRIBE                        77
-#define TK_DESC                            78
-#define TK_ALTER                           79
-#define TK_PASS                            80
-#define TK_PRIVILEGE                       81
-#define TK_LOCAL                           82
-#define TK_COMPACT                         83
-#define TK_LP                              84
-#define TK_RP                              85
-#define TK_IF                              86
-#define TK_EXISTS                          87
-#define TK_AS                              88
-#define TK_OUTPUTTYPE                      89
-#define TK_AGGREGATE                       90
-#define TK_BUFSIZE                         91
-#define TK_PPS                             92
-#define TK_TSERIES                         93
-#define TK_DBS                             94
-#define TK_STORAGE                         95
-#define TK_QTIME                           96
-#define TK_CONNS                           97
-#define TK_STATE                           98
-#define TK_COMMA                           99
-#define TK_KEEP                           100
-#define TK_CACHE                          101
-#define TK_REPLICA                        102
-#define TK_QUORUM                         103
-#define TK_DAYS                           104
-#define TK_MINROWS                        105
-#define TK_MAXROWS                        106
-#define TK_BLOCKS                         107
-#define TK_CTIME                          108
-#define TK_WAL                            109
-#define TK_FSYNC                          110
-#define TK_COMP                           111
-#define TK_PRECISION                      112
-#define TK_UPDATE                         113
-#define TK_CACHELAST                      114
-#define TK_PARTITIONS                     115
-#define TK_UNSIGNED                       116
-#define TK_TAGS                           117
-#define TK_USING                          118
-#define TK_NULL                           119
-#define TK_NOW                            120
-#define TK_SELECT                         121
-#define TK_UNION                          122
-#define TK_ALL                            123
-#define TK_DISTINCT                       124
-#define TK_FROM                           125
-#define TK_VARIABLE                       126
-#define TK_INTERVAL                       127
-#define TK_EVERY                          128
-#define TK_SESSION                        129
-#define TK_STATE_WINDOW                   130
-#define TK_FILL                           131
-#define TK_SLIDING                        132
-#define TK_ORDER                          133
-#define TK_BY                             134
-#define TK_ASC                            135
-#define TK_GROUP                          136
-#define TK_HAVING                         137
-#define TK_LIMIT                          138
-#define TK_OFFSET                         139
-#define TK_SLIMIT                         140
-#define TK_SOFFSET                        141
-#define TK_WHERE                          142
-#define TK_RESET                          143
-#define TK_QUERY                          144
-#define TK_SYNCDB                         145
-#define TK_ADD                            146
-#define TK_COLUMN                         147
-#define TK_MODIFY                         148
-#define TK_TAG                            149
-#define TK_CHANGE                         150
-#define TK_SET                            151
-#define TK_KILL                           152
-#define TK_CONNECTION                     153
-#define TK_STREAM                         154
-#define TK_COLON                          155
-#define TK_ABORT                          156
-#define TK_AFTER                          157
-#define TK_ATTACH                         158
-#define TK_BEFORE                         159
-#define TK_BEGIN                          160
-#define TK_CASCADE                        161
-#define TK_CLUSTER                        162
-#define TK_CONFLICT                       163
-#define TK_COPY                           164
-#define TK_DEFERRED                       165
-#define TK_DELIMITERS                     166
-#define TK_DETACH                         167
-#define TK_EACH                           168
-#define TK_END                            169
-#define TK_EXPLAIN                        170
-#define TK_FAIL                           171
-#define TK_FOR                            172
-#define TK_IGNORE                         173
-#define TK_IMMEDIATE                      174
-#define TK_INITIALLY                      175
-#define TK_INSTEAD                        176
-#define TK_KEY                            177
-#define TK_OF                             178
-#define TK_RAISE                          179
-#define TK_REPLACE                        180
-#define TK_RESTRICT                       181
-#define TK_ROW                            182
-#define TK_STATEMENT                      183
-#define TK_TRIGGER                        184
-#define TK_VIEW                           185
-#define TK_IPTOKEN                        186
-#define TK_SEMI                           187
-#define TK_NONE                           188
-#define TK_PREV                           189
-#define TK_LINEAR                         190
-#define TK_IMPORT                         191
-#define TK_TBNAME                         192
-#define TK_JOIN                           193
-#define TK_INSERT                         194
-#define TK_INTO                           195
-#define TK_VALUES                         196
-#define TK_FILE                           197
-
+#define TK_UMINUS                          42
+#define TK_UPLUS                           43
+#define TK_BITNOT                          44
+#define TK_SHOW                            45
+#define TK_DATABASES                       46
+#define TK_TOPICS                          47
+#define TK_FUNCTIONS                       48
+#define TK_MNODES                          49
+#define TK_DNODES                          50
+#define TK_ACCOUNTS                        51
+#define TK_USERS                           52
+#define TK_MODULES                         53
+#define TK_QUERIES                         54
+#define TK_CONNECTIONS                     55
+#define TK_STREAMS                         56
+#define TK_VARIABLES                       57
+#define TK_SCORES                          58
+#define TK_GRANTS                          59
+#define TK_VNODES                          60
+#define TK_DOT                             61
+#define TK_CREATE                          62
+#define TK_TABLE                           63
+#define TK_STABLE                          64
+#define TK_DATABASE                        65
+#define TK_TABLES                          66
+#define TK_STABLES                         67
+#define TK_VGROUPS                         68
+#define TK_DROP                            69
+#define TK_TOPIC                           70
+#define TK_FUNCTION                        71
+#define TK_DNODE                           72
+#define TK_USER                            73
+#define TK_ACCOUNT                         74
+#define TK_USE                             75
+#define TK_DESCRIBE                        76
+#define TK_DESC                            77
+#define TK_ALTER                           78
+#define TK_PASS                            79
+#define TK_PRIVILEGE                       80
+#define TK_LOCAL                           81
+#define TK_COMPACT                         82
+#define TK_LP                              83
+#define TK_RP                              84
+#define TK_IF                              85
+#define TK_EXISTS                          86
+#define TK_AS                              87
+#define TK_OUTPUTTYPE                      88
+#define TK_AGGREGATE                       89
+#define TK_BUFSIZE                         90
+#define TK_PPS                             91
+#define TK_TSERIES                         92
+#define TK_DBS                             93
+#define TK_STORAGE                         94
+#define TK_QTIME                           95
+#define TK_CONNS                           96
+#define TK_STATE                           97
+#define TK_COMMA                           98
+#define TK_KEEP                            99
+#define TK_CACHE                          100
+#define TK_REPLICA                        101
+#define TK_QUORUM                         102
+#define TK_DAYS                           103
+#define TK_MINROWS                        104
+#define TK_MAXROWS                        105
+#define TK_BLOCKS                         106
+#define TK_CTIME                          107
+#define TK_WAL                            108
+#define TK_FSYNC                          109
+#define TK_COMP                           110
+#define TK_PRECISION                      111
+#define TK_UPDATE                         112
+#define TK_CACHELAST                      113
+#define TK_PARTITIONS                     114
+#define TK_UNSIGNED                       115
+#define TK_TAGS                           116
+#define TK_USING                          117
+#define TK_NULL                           118
+#define TK_NOW                            119
+#define TK_SELECT                         120
+#define TK_UNION                          121
+#define TK_ALL                            122
+#define TK_DISTINCT                       123
+#define TK_FROM                           124
+#define TK_VARIABLE                       125
+#define TK_INTERVAL                       126
+#define TK_EVERY                          127
+#define TK_SESSION                        128
+#define TK_STATE_WINDOW                   129
+#define TK_FILL                           130
+#define TK_SLIDING                        131
+#define TK_ORDER                          132
+#define TK_BY                             133
+#define TK_ASC                            134
+#define TK_GROUP                          135
+#define TK_HAVING                         136
+#define TK_LIMIT                          137
+#define TK_OFFSET                         138
+#define TK_SLIMIT                         139
+#define TK_SOFFSET                        140
+#define TK_WHERE                          141
+#define TK_RESET                          142
+#define TK_QUERY                          143
+#define TK_SYNCDB                         144
+#define TK_ADD                            145
+#define TK_COLUMN                         146
+#define TK_MODIFY                         147
+#define TK_TAG                            148
+#define TK_CHANGE                         149
+#define TK_SET                            150
+#define TK_KILL                           151
+#define TK_CONNECTION                     152
+#define TK_STREAM                         153
+#define TK_COLON                          154
+#define TK_ABORT                          155
+#define TK_AFTER                          156
+#define TK_ATTACH                         157
+#define TK_BEFORE                         158
+#define TK_BEGIN                          159
+#define TK_CASCADE                        160
+#define TK_CLUSTER                        161
+#define TK_CONFLICT                       162
+#define TK_COPY                           163
+#define TK_DEFERRED                       164
+#define TK_DELIMITERS                     165
+#define TK_DETACH                         166
+#define TK_EACH                           167
+#define TK_END                            168
+#define TK_EXPLAIN                        169
+#define TK_FAIL                           170
+#define TK_FOR                            171
+#define TK_IGNORE                         172
+#define TK_IMMEDIATE                      173
+#define TK_INITIALLY                      174
+#define TK_INSTEAD                        175
+#define TK_KEY                            176
+#define TK_OF                             177
+#define TK_RAISE                          178
+#define TK_REPLACE                        179
+#define TK_RESTRICT                       180
+#define TK_ROW                            181
+#define TK_STATEMENT                      182
+#define TK_TRIGGER                        183
+#define TK_VIEW                           184
+#define TK_IPTOKEN                        185
+#define TK_SEMI                           186
+#define TK_NONE                           187
+#define TK_PREV                           188
+#define TK_LINEAR                         189
+#define TK_IMPORT                         190
+#define TK_TBNAME                         191
+#define TK_JOIN                           192
+#define TK_INSERT                         193
+#define TK_INTO                           194
+#define TK_VALUES                         195
+#define TK_FILE                           196
 
 
 

src/query/inc/sql.y

@@ -17,7 +17,6 @@
 %left PLUS MINUS.
 %left DIVIDE TIMES.
 %left STAR SLASH REM.
-%left CONCAT.
 %right UMINUS UPLUS BITNOT.
 
 %include {

src/util/src/ttokenizer.c

@@ -72,7 +72,6 @@ static SKeyword keywordTable[] = {
     {"STAR",         TK_STAR},
     {"SLASH",        TK_SLASH},
     {"REM ",         TK_REM},
-    {"CONCAT",       TK_CONCAT},
     {"UMINUS",       TK_UMINUS},
     {"UPLUS",        TK_UPLUS},
     {"BITNOT",       TK_BITNOT},
@@ -393,9 +392,6 @@ uint32_t tGetToken(char* z, uint32_t* tokenId) {
       if (z[1] != '|') {
         *tokenId = TK_BITOR;
         return 1;
-      } else {
-        *tokenId = TK_CONCAT;
-        return 2;
       }
     }
     case ',': {