Skip to content

Commit 7f3e4d8

Browse files
JackWang032JackWang032
committed
feat: support queryResult and derived table entities collecting
1 parent fb50d1a commit 7f3e4d8

File tree

9 files changed

+6405
-5471
lines changed

9 files changed

+6405
-5471
lines changed

‎src/grammar/hive/HiveSqlParser.g4‎

Lines changed: 30 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1430,7 +1430,7 @@ viewNameCreate
14301430
;
14311431

14321432
subQuerySource
1433-
: LPAREN queryStatementExpression RPAREN KW_AS? id_
1433+
: LPAREN queryStatementExpression RPAREN KW_AS? alias=id_
14341434
;
14351435

14361436
/**
@@ -1451,9 +1451,13 @@ partitionTableFunctionSource
14511451
;
14521452

14531453
partitionedTableFunction
1454+
: atomPartitionedTableFunction alias=id_?
1455+
;
1456+
1457+
atomPartitionedTableFunction
14541458
: n=id_ LPAREN KW_ON ptfsrc=partitionTableFunctionSource spec=partitioningSpec? (
14551459
Identifier LPAREN expression RPAREN (COMMA Identifier LPAREN expression RPAREN)*
1456-
)? RPAREN alias=id_?
1460+
)? RPAREN
14571461
;
14581462

14591463
/**
@@ -1481,23 +1485,24 @@ valuesClause
14811485
)
14821486
;
14831487

1488+
atomValuesClause
1489+
: KW_TABLE LPAREN valuesClause RPAREN
1490+
;
1491+
14841492
/*
14851493
This represents a clause like this:
14861494
TABLE(VALUES(1,2),(2,3)) as VirtTable(col1,col2)
14871495
*/
14881496
virtualTableSource
1489-
: KW_TABLE LPAREN valuesClause RPAREN KW_AS? tableAlias (LPAREN id_ (COMMA id_)*)? RPAREN
1497+
: atomValuesClause KW_AS? alias=tableAlias (LPAREN id_ (COMMA id_)*)? RPAREN
14901498
;
14911499

14921500
/*
14931501
Rules for parsing selectClause
14941502
select a,b,c ...
14951503
*/
14961504
selectClause
1497-
: KW_SELECT QUERY_HINT? (
1498-
(KW_ALL | KW_DISTINCT)? selectItem (COMMA selectItem)*
1499-
| KW_TRANSFORM selectTrfmClause
1500-
)
1505+
: KW_SELECT QUERY_HINT? ((KW_ALL | KW_DISTINCT)? selectList | KW_TRANSFORM selectTrfmClause)
15011506
| trfmClause
15021507
;
15031508

@@ -1507,9 +1512,26 @@ selectTrfmClause
15071512
)? rowFormat recordReader
15081513
;
15091514

1515+
selectList
1516+
: selectItem (COMMA selectItem)*
1517+
;
1518+
15101519
selectItem
15111520
: tableAllColumns
1512-
| ((columnName | expression) (KW_AS? id_ | KW_AS LPAREN id_ (COMMA id_)* RPAREN)?)
1521+
| (
1522+
(selectLiteralColumnName | selectExpressionColumnName) (
1523+
KW_AS? alias=id_
1524+
| KW_AS LPAREN alias=id_ (COMMA alias=id_)* RPAREN
1525+
)?
1526+
)
1527+
;
1528+
1529+
selectLiteralColumnName
1530+
: columnName
1531+
;
1532+
1533+
selectExpressionColumnName
1534+
: expression
15131535
;
15141536

15151537
trfmClause

‎src/lib/hive/HiveSqlParser.interp‎

Lines changed: 6 additions & 1 deletion
Large diffs are not rendered by default.

‎src/lib/hive/HiveSqlParser.ts‎

Lines changed: 5692 additions & 5415 deletions
Large diffs are not rendered by default.

‎src/lib/hive/HiveSqlParserListener.ts‎

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -257,12 +257,17 @@ import { SubQuerySourceContext } from "./HiveSqlParser.js";
257257
import { PartitioningSpecContext } from "./HiveSqlParser.js";
258258
import { PartitionTableFunctionSourceContext } from "./HiveSqlParser.js";
259259
import { PartitionedTableFunctionContext } from "./HiveSqlParser.js";
260+
import { AtomPartitionedTableFunctionContext } from "./HiveSqlParser.js";
260261
import { WhereClauseContext } from "./HiveSqlParser.js";
261262
import { ValuesClauseContext } from "./HiveSqlParser.js";
263+
import { AtomValuesClauseContext } from "./HiveSqlParser.js";
262264
import { VirtualTableSourceContext } from "./HiveSqlParser.js";
263265
import { SelectClauseContext } from "./HiveSqlParser.js";
264266
import { SelectTrfmClauseContext } from "./HiveSqlParser.js";
267+
import { SelectListContext } from "./HiveSqlParser.js";
265268
import { SelectItemContext } from "./HiveSqlParser.js";
269+
import { SelectLiteralColumnNameContext } from "./HiveSqlParser.js";
270+
import { SelectExpressionColumnNameContext } from "./HiveSqlParser.js";
266271
import { TrfmClauseContext } from "./HiveSqlParser.js";
267272
import { SelectExpressionContext } from "./HiveSqlParser.js";
268273
import { SelectExpressionListContext } from "./HiveSqlParser.js";
@@ -2861,6 +2866,16 @@ export class HiveSqlParserListener implements ParseTreeListener {
28612866
* @param ctx the parse tree
28622867
*/
28632868
exitPartitionedTableFunction?: (ctx: PartitionedTableFunctionContext) => void;
2869+
/**
2870+
* Enter a parse tree produced by `HiveSqlParser.atomPartitionedTableFunction`.
2871+
* @param ctx the parse tree
2872+
*/
2873+
enterAtomPartitionedTableFunction?: (ctx: AtomPartitionedTableFunctionContext) => void;
2874+
/**
2875+
* Exit a parse tree produced by `HiveSqlParser.atomPartitionedTableFunction`.
2876+
* @param ctx the parse tree
2877+
*/
2878+
exitAtomPartitionedTableFunction?: (ctx: AtomPartitionedTableFunctionContext) => void;
28642879
/**
28652880
* Enter a parse tree produced by `HiveSqlParser.whereClause`.
28662881
* @param ctx the parse tree
@@ -2881,6 +2896,16 @@ export class HiveSqlParserListener implements ParseTreeListener {
28812896
* @param ctx the parse tree
28822897
*/
28832898
exitValuesClause?: (ctx: ValuesClauseContext) => void;
2899+
/**
2900+
* Enter a parse tree produced by `HiveSqlParser.atomValuesClause`.
2901+
* @param ctx the parse tree
2902+
*/
2903+
enterAtomValuesClause?: (ctx: AtomValuesClauseContext) => void;
2904+
/**
2905+
* Exit a parse tree produced by `HiveSqlParser.atomValuesClause`.
2906+
* @param ctx the parse tree
2907+
*/
2908+
exitAtomValuesClause?: (ctx: AtomValuesClauseContext) => void;
28842909
/**
28852910
* Enter a parse tree produced by `HiveSqlParser.virtualTableSource`.
28862911
* @param ctx the parse tree
@@ -2911,6 +2936,16 @@ export class HiveSqlParserListener implements ParseTreeListener {
29112936
* @param ctx the parse tree
29122937
*/
29132938
exitSelectTrfmClause?: (ctx: SelectTrfmClauseContext) => void;
2939+
/**
2940+
* Enter a parse tree produced by `HiveSqlParser.selectList`.
2941+
* @param ctx the parse tree
2942+
*/
2943+
enterSelectList?: (ctx: SelectListContext) => void;
2944+
/**
2945+
* Exit a parse tree produced by `HiveSqlParser.selectList`.
2946+
* @param ctx the parse tree
2947+
*/
2948+
exitSelectList?: (ctx: SelectListContext) => void;
29142949
/**
29152950
* Enter a parse tree produced by `HiveSqlParser.selectItem`.
29162951
* @param ctx the parse tree
@@ -2921,6 +2956,26 @@ export class HiveSqlParserListener implements ParseTreeListener {
29212956
* @param ctx the parse tree
29222957
*/
29232958
exitSelectItem?: (ctx: SelectItemContext) => void;
2959+
/**
2960+
* Enter a parse tree produced by `HiveSqlParser.selectLiteralColumnName`.
2961+
* @param ctx the parse tree
2962+
*/
2963+
enterSelectLiteralColumnName?: (ctx: SelectLiteralColumnNameContext) => void;
2964+
/**
2965+
* Exit a parse tree produced by `HiveSqlParser.selectLiteralColumnName`.
2966+
* @param ctx the parse tree
2967+
*/
2968+
exitSelectLiteralColumnName?: (ctx: SelectLiteralColumnNameContext) => void;
2969+
/**
2970+
* Enter a parse tree produced by `HiveSqlParser.selectExpressionColumnName`.
2971+
* @param ctx the parse tree
2972+
*/
2973+
enterSelectExpressionColumnName?: (ctx: SelectExpressionColumnNameContext) => void;
2974+
/**
2975+
* Exit a parse tree produced by `HiveSqlParser.selectExpressionColumnName`.
2976+
* @param ctx the parse tree
2977+
*/
2978+
exitSelectExpressionColumnName?: (ctx: SelectExpressionColumnNameContext) => void;
29242979
/**
29252980
* Enter a parse tree produced by `HiveSqlParser.trfmClause`.
29262981
* @param ctx the parse tree

‎src/lib/hive/HiveSqlParserVisitor.ts‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -257,12 +257,17 @@ import { SubQuerySourceContext } from "./HiveSqlParser.js";
257257
import { PartitioningSpecContext } from "./HiveSqlParser.js";
258258
import { PartitionTableFunctionSourceContext } from "./HiveSqlParser.js";
259259
import { PartitionedTableFunctionContext } from "./HiveSqlParser.js";
260+
import { AtomPartitionedTableFunctionContext } from "./HiveSqlParser.js";
260261
import { WhereClauseContext } from "./HiveSqlParser.js";
261262
import { ValuesClauseContext } from "./HiveSqlParser.js";
263+
import { AtomValuesClauseContext } from "./HiveSqlParser.js";
262264
import { VirtualTableSourceContext } from "./HiveSqlParser.js";
263265
import { SelectClauseContext } from "./HiveSqlParser.js";
264266
import { SelectTrfmClauseContext } from "./HiveSqlParser.js";
267+
import { SelectListContext } from "./HiveSqlParser.js";
265268
import { SelectItemContext } from "./HiveSqlParser.js";
269+
import { SelectLiteralColumnNameContext } from "./HiveSqlParser.js";
270+
import { SelectExpressionColumnNameContext } from "./HiveSqlParser.js";
266271
import { TrfmClauseContext } from "./HiveSqlParser.js";
267272
import { SelectExpressionContext } from "./HiveSqlParser.js";
268273
import { SelectExpressionListContext } from "./HiveSqlParser.js";
@@ -1864,6 +1869,12 @@ export class HiveSqlParserVisitor<Result> extends AbstractParseTreeVisitor<Resul
18641869
* @return the visitor result
18651870
*/
18661871
visitPartitionedTableFunction?: (ctx: PartitionedTableFunctionContext) => Result;
1872+
/**
1873+
* Visit a parse tree produced by `HiveSqlParser.atomPartitionedTableFunction`.
1874+
* @param ctx the parse tree
1875+
* @return the visitor result
1876+
*/
1877+
visitAtomPartitionedTableFunction?: (ctx: AtomPartitionedTableFunctionContext) => Result;
18671878
/**
18681879
* Visit a parse tree produced by `HiveSqlParser.whereClause`.
18691880
* @param ctx the parse tree
@@ -1876,6 +1887,12 @@ export class HiveSqlParserVisitor<Result> extends AbstractParseTreeVisitor<Resul
18761887
* @return the visitor result
18771888
*/
18781889
visitValuesClause?: (ctx: ValuesClauseContext) => Result;
1890+
/**
1891+
* Visit a parse tree produced by `HiveSqlParser.atomValuesClause`.
1892+
* @param ctx the parse tree
1893+
* @return the visitor result
1894+
*/
1895+
visitAtomValuesClause?: (ctx: AtomValuesClauseContext) => Result;
18791896
/**
18801897
* Visit a parse tree produced by `HiveSqlParser.virtualTableSource`.
18811898
* @param ctx the parse tree
@@ -1894,12 +1911,30 @@ export class HiveSqlParserVisitor<Result> extends AbstractParseTreeVisitor<Resul
18941911
* @return the visitor result
18951912
*/
18961913
visitSelectTrfmClause?: (ctx: SelectTrfmClauseContext) => Result;
1914+
/**
1915+
* Visit a parse tree produced by `HiveSqlParser.selectList`.
1916+
* @param ctx the parse tree
1917+
* @return the visitor result
1918+
*/
1919+
visitSelectList?: (ctx: SelectListContext) => Result;
18971920
/**
18981921
* Visit a parse tree produced by `HiveSqlParser.selectItem`.
18991922
* @param ctx the parse tree
19001923
* @return the visitor result
19011924
*/
19021925
visitSelectItem?: (ctx: SelectItemContext) => Result;
1926+
/**
1927+
* Visit a parse tree produced by `HiveSqlParser.selectLiteralColumnName`.
1928+
* @param ctx the parse tree
1929+
* @return the visitor result
1930+
*/
1931+
visitSelectLiteralColumnName?: (ctx: SelectLiteralColumnNameContext) => Result;
1932+
/**
1933+
* Visit a parse tree produced by `HiveSqlParser.selectExpressionColumnName`.
1934+
* @param ctx the parse tree
1935+
* @return the visitor result
1936+
*/
1937+
visitSelectExpressionColumnName?: (ctx: SelectExpressionColumnNameContext) => Result;
19031938
/**
19041939
* Visit a parse tree produced by `HiveSqlParser.trfmClause`.
19051940
* @param ctx the parse tree

0 commit comments

Comments
 (0)