Skip to content

Commit f64b24d

Browse files
committed
sql keyword parse
1 parent 257606d commit f64b24d

File tree

1 file changed

+9
-16
lines changed

1 file changed

+9
-16
lines changed

core/src/main/java/com/dtstack/flink/sql/side/SideSqlExec.java

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -365,40 +365,33 @@ private SqlNode replaceSelectFieldName(SqlNode selectNode, HashBasedTable<String
365365
return sqlIdentifier;
366366
}else if(selectNode.getKind() == LITERAL || selectNode.getKind() == LITERAL_CHAIN){//字面含义
367367
return selectNode;
368-
}else if(selectNode.getKind() == OTHER_FUNCTION
368+
}else if( AGGREGATE.contains(selectNode.getKind())
369+
|| AVG_AGG_FUNCTIONS.contains(selectNode.getKind())
370+
|| COMPARISON.contains(selectNode.getKind())
371+
|| selectNode.getKind() == OTHER_FUNCTION
369372
|| selectNode.getKind() == DIVIDE
370373
|| selectNode.getKind() == CAST
371-
|| selectNode.getKind() == SUM
372-
|| selectNode.getKind() == AVG
373-
|| selectNode.getKind() == MAX
374-
|| selectNode.getKind() == MIN
375374
|| selectNode.getKind() == TRIM
376375
|| selectNode.getKind() == TIMES
377376
|| selectNode.getKind() == PLUS
378-
|| selectNode.getKind() == IN
379377
|| selectNode.getKind() == NOT_IN
380378
|| selectNode.getKind() == OR
381379
|| selectNode.getKind() == AND
382-
|| selectNode.getKind() == COUNT
383-
|| selectNode.getKind() == SUM0
384-
|| selectNode.getKind() == LEAD
385-
|| selectNode.getKind() == LAG
386-
|| selectNode.getKind() == EQUALS
387-
|| selectNode.getKind() == NOT_EQUALS
388380
|| selectNode.getKind() == MINUS
389381
|| selectNode.getKind() == TUMBLE
390382
|| selectNode.getKind() == TUMBLE_START
391383
|| selectNode.getKind() == TUMBLE_END
392384
|| selectNode.getKind() == SESSION
393385
|| selectNode.getKind() == SESSION_START
394386
|| selectNode.getKind() == SESSION_END
387+
|| selectNode.getKind() == HOP
388+
|| selectNode.getKind() == HOP_START
389+
|| selectNode.getKind() == HOP_END
395390
|| selectNode.getKind() == BETWEEN
396391
|| selectNode.getKind() == IS_NULL
397392
|| selectNode.getKind() == IS_NOT_NULL
398-
|| selectNode.getKind() == LESS_THAN
399-
|| selectNode.getKind() == GREATER_THAN
400-
|| selectNode.getKind() == LESS_THAN_OR_EQUAL
401-
|| selectNode.getKind() == GREATER_THAN_OR_EQUAL
393+
|| selectNode.getKind() == CONTAINS
394+
402395
){
403396
SqlBasicCall sqlBasicCall = (SqlBasicCall) selectNode;
404397
for(int i=0; i<sqlBasicCall.getOperands().length; i++){

0 commit comments

Comments
 (0)