Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improve/flink keywords #195

Merged
merged 2 commits into from
Oct 30, 2023
Merged

Improve/flink keywords #195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d85aa94
refactor: improve flinksql keywords rule
HaydenOrz Oct 26, 2023
590b1e5
test: correct flink sql unit test
HaydenOrz Oct 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
902 changes: 521 additions & 381 deletions src/grammar/flinksql/FlinkSqlLexer.g4
View file
Open in desktop

Large diffs are not rendered by default.

486 changes: 110 additions & 376 deletions src/grammar/flinksql/FlinkSqlParser.g4
View file
Open in desktop

Large diffs are not rendered by default.

1,405 changes: 899 additions & 506 deletions src/lib/flinksql/FlinkSqlLexer.interp
View file
Open in desktop

Large diffs are not rendered by default.

1,882 changes: 1,072 additions & 810 deletions src/lib/flinksql/FlinkSqlLexer.tokens
View file
Open in desktop

Large diffs are not rendered by default.

5,847 changes: 3,478 additions & 2,369 deletions src/lib/flinksql/FlinkSqlLexer.ts
View file
Open in desktop

Large diffs are not rendered by default.

966 changes: 613 additions & 353 deletions src/lib/flinksql/FlinkSqlParser.interp
View file
Open in desktop

Large diffs are not rendered by default.

1,882 changes: 1,072 additions & 810 deletions src/lib/flinksql/FlinkSqlParser.tokens
View file
Open in desktop

Large diffs are not rendered by default.

8,013 changes: 3,828 additions & 4,185 deletions src/lib/flinksql/FlinkSqlParser.ts
View file
Open in desktop

Large diffs are not rendered by default.

38 changes: 14 additions & 24 deletions src/lib/flinksql/FlinkSqlParserListener.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import { SubscriptContext } from "./FlinkSqlParser";
import { ColumnReferenceContext } from "./FlinkSqlParser";
import { DereferenceContext } from "./FlinkSqlParser";
import { ParenthesizedExpressionContext } from "./FlinkSqlParser";
import { DateFunctionExpressionContext } from "./FlinkSqlParser";
import { ErrorIdentContext } from "./FlinkSqlParser";
import { RealIdentContext } from "./FlinkSqlParser";
import { IdentityTransformContext } from "./FlinkSqlParser";
Expand Down Expand Up @@ -181,7 +182,6 @@ import { MultiUnitsIntervalContext } from "./FlinkSqlParser";
import { ErrorCapturingUnitToUnitIntervalContext } from "./FlinkSqlParser";
import { UnitToUnitIntervalContext } from "./FlinkSqlParser";
import { IntervalValueContext } from "./FlinkSqlParser";
import { ColumnAliasContext } from "./FlinkSqlParser";
import { TableAliasContext } from "./FlinkSqlParser";
import { ErrorCapturingIdentifierContext } from "./FlinkSqlParser";
import { ErrorCapturingIdentifierExtraContext } from "./FlinkSqlParser";
Expand Down Expand Up @@ -222,7 +222,6 @@ import { TimePointUnitContext } from "./FlinkSqlParser";
import { TimeIntervalUnitContext } from "./FlinkSqlParser";
import { ReservedKeywordsUsedAsFuncParamContext } from "./FlinkSqlParser";
import { ReservedKeywordsUsedAsFuncNameContext } from "./FlinkSqlParser";
import { ReservedKeywordsContext } from "./FlinkSqlParser";
import { NonReservedKeywordsContext } from "./FlinkSqlParser";


Expand Down Expand Up @@ -517,6 +516,19 @@ export interface FlinkSqlParserListener extends ParseTreeListener {
*/
exitParenthesizedExpression?: (ctx: ParenthesizedExpressionContext) => void;

/**
* Enter a parse tree produced by the `dateFunctionExpression`
* labeled alternative in `FlinkSqlParser.primaryExpression`.
* @param ctx the parse tree
*/
enterDateFunctionExpression?: (ctx: DateFunctionExpressionContext) => void;
/**
* Exit a parse tree produced by the `dateFunctionExpression`
* labeled alternative in `FlinkSqlParser.primaryExpression`.
* @param ctx the parse tree
*/
exitDateFunctionExpression?: (ctx: DateFunctionExpressionContext) => void;

/**
* Enter a parse tree produced by the `errorIdent`
* labeled alternative in `FlinkSqlParser.errorCapturingIdentifierExtra`.
Expand Down Expand Up @@ -2251,17 +2263,6 @@ export interface FlinkSqlParserListener extends ParseTreeListener {
*/
exitIntervalValue?: (ctx: IntervalValueContext) => void;

/**
* Enter a parse tree produced by `FlinkSqlParser.columnAlias`.
* @param ctx the parse tree
*/
enterColumnAlias?: (ctx: ColumnAliasContext) => void;
/**
* Exit a parse tree produced by `FlinkSqlParser.columnAlias`.
* @param ctx the parse tree
*/
exitColumnAlias?: (ctx: ColumnAliasContext) => void;

/**
* Enter a parse tree produced by `FlinkSqlParser.tableAlias`.
* @param ctx the parse tree
Expand Down Expand Up @@ -2702,17 +2703,6 @@ export interface FlinkSqlParserListener extends ParseTreeListener {
*/
exitReservedKeywordsUsedAsFuncName?: (ctx: ReservedKeywordsUsedAsFuncNameContext) => void;

/**
* Enter a parse tree produced by `FlinkSqlParser.reservedKeywords`.
* @param ctx the parse tree
*/
enterReservedKeywords?: (ctx: ReservedKeywordsContext) => void;
/**
* Exit a parse tree produced by `FlinkSqlParser.reservedKeywords`.
* @param ctx the parse tree
*/
exitReservedKeywords?: (ctx: ReservedKeywordsContext) => void;

/**
* Enter a parse tree produced by `FlinkSqlParser.nonReservedKeywords`.
* @param ctx the parse tree
Expand Down
25 changes: 9 additions & 16 deletions src/lib/flinksql/FlinkSqlParserVisitor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import { SubscriptContext } from "./FlinkSqlParser";
import { ColumnReferenceContext } from "./FlinkSqlParser";
import { DereferenceContext } from "./FlinkSqlParser";
import { ParenthesizedExpressionContext } from "./FlinkSqlParser";
import { DateFunctionExpressionContext } from "./FlinkSqlParser";
import { ErrorIdentContext } from "./FlinkSqlParser";
import { RealIdentContext } from "./FlinkSqlParser";
import { IdentityTransformContext } from "./FlinkSqlParser";
Expand Down Expand Up @@ -181,7 +182,6 @@ import { MultiUnitsIntervalContext } from "./FlinkSqlParser";
import { ErrorCapturingUnitToUnitIntervalContext } from "./FlinkSqlParser";
import { UnitToUnitIntervalContext } from "./FlinkSqlParser";
import { IntervalValueContext } from "./FlinkSqlParser";
import { ColumnAliasContext } from "./FlinkSqlParser";
import { TableAliasContext } from "./FlinkSqlParser";
import { ErrorCapturingIdentifierContext } from "./FlinkSqlParser";
import { ErrorCapturingIdentifierExtraContext } from "./FlinkSqlParser";
Expand Down Expand Up @@ -222,7 +222,6 @@ import { TimePointUnitContext } from "./FlinkSqlParser";
import { TimeIntervalUnitContext } from "./FlinkSqlParser";
import { ReservedKeywordsUsedAsFuncParamContext } from "./FlinkSqlParser";
import { ReservedKeywordsUsedAsFuncNameContext } from "./FlinkSqlParser";
import { ReservedKeywordsContext } from "./FlinkSqlParser";
import { NonReservedKeywordsContext } from "./FlinkSqlParser";


Expand Down Expand Up @@ -410,6 +409,14 @@ export interface FlinkSqlParserVisitor<Result> extends ParseTreeVisitor<Result>
*/
visitParenthesizedExpression?: (ctx: ParenthesizedExpressionContext) => Result;

/**
* Visit a parse tree produced by the `dateFunctionExpression`
* labeled alternative in `FlinkSqlParser.primaryExpression`.
* @param ctx the parse tree
* @return the visitor result
*/
visitDateFunctionExpression?: (ctx: DateFunctionExpressionContext) => Result;

/**
* Visit a parse tree produced by the `errorIdent`
* labeled alternative in `FlinkSqlParser.errorCapturingIdentifierExtra`.
Expand Down Expand Up @@ -1511,13 +1518,6 @@ export interface FlinkSqlParserVisitor<Result> extends ParseTreeVisitor<Result>
*/
visitIntervalValue?: (ctx: IntervalValueContext) => Result;

/**
* Visit a parse tree produced by `FlinkSqlParser.columnAlias`.
* @param ctx the parse tree
* @return the visitor result
*/
visitColumnAlias?: (ctx: ColumnAliasContext) => Result;

/**
* Visit a parse tree produced by `FlinkSqlParser.tableAlias`.
* @param ctx the parse tree
Expand Down Expand Up @@ -1798,13 +1798,6 @@ export interface FlinkSqlParserVisitor<Result> extends ParseTreeVisitor<Result>
*/
visitReservedKeywordsUsedAsFuncName?: (ctx: ReservedKeywordsUsedAsFuncNameContext) => Result;

/**
* Visit a parse tree produced by `FlinkSqlParser.reservedKeywords`.
* @param ctx the parse tree
* @return the visitor result
*/
visitReservedKeywords?: (ctx: ReservedKeywordsContext) => Result;

/**
* Visit a parse tree produced by `FlinkSqlParser.nonReservedKeywords`.
* @param ctx the parse tree
Expand Down
2 changes: 1 addition & 1 deletion test/parser/flinksql/suggestion/tokenSuggestion.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ describe('Flink SQL Token Suggestion', () => {
'CURRENT',
'CATALOGS',
'DATABASES',
'JARS',
'VIEWS',
'JARS',
]);
});
});
2 changes: 1 addition & 1 deletion test/parser/flinksql/syntax/fixtures/createTable.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ CREATE TABLE catalog1.db1.table1 (
attr17 MAP<INT, BIGINT>,
name1 VARCHAR(64),
message ROW<data ROW<UPO_TIMESTAMP VARCHAR(20)>>,
raw RAW('class', 'snapshot')
`raw` RAW('class', 'snapshot')
) WITH ('connector' = 'kafka');

CREATE TABLE IF NOT EXISTS tbl1 (
Expand Down
Loading