sort plan bugfix

include/common/ttokendef.h

@@ -173,50 +173,50 @@
 #define TK_SPLIT                          155
 #define TK_SYNCDB                         156
 #define TK_NULL                           157
-#define TK_NOW                            158
-#define TK_ROWTS                          159
-#define TK_TBNAME                         160
-#define TK_QSTARTTS                       161
-#define TK_QENDTS                         162
-#define TK_WSTARTTS                       163
-#define TK_WENDTS                         164
-#define TK_WDURATION                      165
-#define TK_BETWEEN                        166
-#define TK_IS                             167
-#define TK_NK_LT                          168
-#define TK_NK_GT                          169
-#define TK_NK_LE                          170
-#define TK_NK_GE                          171
-#define TK_NK_NE                          172
-#define TK_MATCH                          173
-#define TK_NMATCH                         174
-#define TK_JOIN                           175
-#define TK_INNER                          176
-#define TK_SELECT                         177
-#define TK_DISTINCT                       178
-#define TK_WHERE                          179
-#define TK_PARTITION                      180
-#define TK_BY                             181
-#define TK_SESSION                        182
-#define TK_STATE_WINDOW                   183
-#define TK_SLIDING                        184
-#define TK_FILL                           185
-#define TK_VALUE                          186
-#define TK_NONE                           187
-#define TK_PREV                           188
-#define TK_LINEAR                         189
-#define TK_NEXT                           190
-#define TK_GROUP                          191
-#define TK_HAVING                         192
-#define TK_ORDER                          193
-#define TK_SLIMIT                         194
-#define TK_SOFFSET                        195
-#define TK_LIMIT                          196
-#define TK_OFFSET                         197
-#define TK_ASC                            198
-#define TK_NULLS                          199
-#define TK_FIRST                          200
-#define TK_LAST                           201
+#define TK_FIRST                          158
+#define TK_LAST                           159
+#define TK_NOW                            160
+#define TK_ROWTS                          161
+#define TK_TBNAME                         162
+#define TK_QSTARTTS                       163
+#define TK_QENDTS                         164
+#define TK_WSTARTTS                       165
+#define TK_WENDTS                         166
+#define TK_WDURATION                      167
+#define TK_BETWEEN                        168
+#define TK_IS                             169
+#define TK_NK_LT                          170
+#define TK_NK_GT                          171
+#define TK_NK_LE                          172
+#define TK_NK_GE                          173
+#define TK_NK_NE                          174
+#define TK_MATCH                          175
+#define TK_NMATCH                         176
+#define TK_JOIN                           177
+#define TK_INNER                          178
+#define TK_SELECT                         179
+#define TK_DISTINCT                       180
+#define TK_WHERE                          181
+#define TK_PARTITION                      182
+#define TK_BY                             183
+#define TK_SESSION                        184
+#define TK_STATE_WINDOW                   185
+#define TK_SLIDING                        186
+#define TK_FILL                           187
+#define TK_VALUE                          188
+#define TK_NONE                           189
+#define TK_PREV                           190
+#define TK_LINEAR                         191
+#define TK_NEXT                           192
+#define TK_GROUP                          193
+#define TK_HAVING                         194
+#define TK_ORDER                          195
+#define TK_SLIMIT                         196
+#define TK_SOFFSET                        197
+#define TK_LIMIT                          198
+#define TK_OFFSET                         199
+#define TK_ASC                            200
+#define TK_NULLS                          201
 
 #define TK_NK_SPACE                       300
 #define TK_NK_COMMENT                     301

source/libs/parser/inc/sql.y

@@ -486,6 +486,8 @@ column_name(A) ::= NK_ID(B).
 %type function_name                                                               { SToken }
 %destructor function_name                                                         { }
 function_name(A) ::= NK_ID(B).                                                    { A = B; }
+function_name(A) ::= FIRST(B).                                                    { A = B; }
+function_name(A) ::= LAST(B).                                                     { A = B; }
 
 %type table_alias                                                                 { SToken }
 %destructor table_alias                                                           { }