Skip to content

Commit fe4ec9c

Browse files
Merge pull request #134 from stackql/feature/superset-grammar-shims
support-for-pg-internal-subquery
2 parents ce58a3b + 6eb40a7 commit fe4ec9c

15 files changed

Lines changed: 317 additions & 101 deletions

File tree

‎.vscode/launch.json‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,8 @@
4646
"describe aws.pseudo_s3.s3_bucket_listing;",
4747
"select role_name from pgi.information_schema.applicable_roles where role_name = 'pg_database_owner';",
4848
"select r1.role_name from pgi.information_schema.applicable_roles r1 inner join pgi.information_schema.applicable_roles r2 on r1.role_name = r2.role_name order by r1.role_name desc;",
49-
"select rtg.table_catalog, rtg.table_schema, rtg.table_name, rtg.privilege_type, rtg.is_grantable, ar.is_grantable as role_is_grantable from pgi.information_schema.role_table_grants rtg inner join pgi.information_schema.applicable_roles ar on rtg.grantee = ar.grantee where rtg.table_name = 'pg_statistic' order by privilege_type desc;"
49+
"select rtg.table_catalog, rtg.table_schema, rtg.table_name, rtg.privilege_type, rtg.is_grantable, ar.is_grantable as role_is_grantable from pgi.information_schema.role_table_grants rtg inner join pgi.information_schema.applicable_roles ar on rtg.grantee = ar.grantee where rtg.table_name = 'pg_statistic' order by privilege_type desc;",
50+
"SELECT zone AS zone, count(kind) AS \"COUNT(kind)\" FROM (SELECT * from stackql_intel.\"google.compute.acceleratorTypes\" limit 3) AS virtual_table GROUP BY zone ORDER BY \"COUNT(kind)\" DESC LIMIT 1000;"
5051
],
5152
"default": "show providers;"
5253
},
@@ -139,7 +140,7 @@
139140
"default": "{}",
140141
"options": [
141142
"{}",
142-
"{ \"tableRegex\": \"(?i)^(?:public\\\\.)?(?:pg_.*|current_schema|information_schema)\" }"
143+
"{ \"tableRegex\": \"(?i)^(?:public\\\\.)?(?:pg_.*|current_schema|information_schema|stackql_intel)\" }"
143144
]
144145
}
145146
],

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ env CGO_ENABLED=1 go build \
6868
-X github.com/stackql/stackql/internal/stackql/cmd.BuildShortCommitSHA=$BUILDSHORTCOMMITSHA \
6969
-X \"github.com/stackql/stackql/internal/stackql/cmd.BuildDate=$BUILDDATE\" \
7070
-X \"stackql/internal/stackql/planbuilder.PlanCacheEnabled=$PLANCACHEENABLED\" \
71-
-X github.com/stackql/stackql/internal/stackql/cmd.BuildPlatform=$BUILDPLATFORM" -o ./build ./...
71+
-X github.com/stackql/stackql/internal/stackql/cmd.BuildPlatform=$BUILDPLATFORM" -o ./build ./stackql
7272

7373

7474
```

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,6 @@ replace github.com/chzyer/readline => github.com/stackql/readline v0.0.2-alpha05
130130

131131
replace github.com/fatih/color => github.com/stackql/color v0.0.1-rc01
132132

133-
replace vitess.io/vitess => github.com/stackql/vitess v0.0.12-alpha06
133+
replace vitess.io/vitess => github.com/stackql/vitess v0.0.12-alpha07
134134

135135
replace github.com/jeroenrinzema/psql-wire => github.com/stackql/psql-wire v0.0.2-stackqlbeta14

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -794,8 +794,8 @@ github.com/stackql/readline v0.0.2-alpha05 h1:ID4QzGdplFBsrSnTuz8pvKzWw96JbrJg8f
794794
github.com/stackql/readline v0.0.2-alpha05/go.mod h1:OFAYOdXk/X4+5GYiDXFfaGrk+bCN6Qv0SYY5HNzD2E0=
795795
github.com/stackql/stackql-provider-registry v0.0.1-rc01 h1:3XorfaYEhGpuvEeQK04EmpZUCr42hZ/a4Nh3wE25LF0=
796796
github.com/stackql/stackql-provider-registry v0.0.1-rc01/go.mod h1:D0WFWa7HOXS+PQAmvN0Nm1E6dMdUkUFtAzRH8cXxg88=
797-
github.com/stackql/vitess v0.0.12-alpha06 h1:05rpWs895wB46X6DzapzvhLoQ/b5Y08m1sLele80bqo=
798-
github.com/stackql/vitess v0.0.12-alpha06/go.mod h1:6aOZHbgHclTasEGZvrdoWfca6Y4XJfemKMqwnDL/klI=
797+
github.com/stackql/vitess v0.0.12-alpha07 h1:efZeRn3VOctkUMoTsATmY1bcyqijej8vcqIjmf6Vhao=
798+
github.com/stackql/vitess v0.0.12-alpha07/go.mod h1:6aOZHbgHclTasEGZvrdoWfca6Y4XJfemKMqwnDL/klI=
799799
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
800800
github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
801801
github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=

‎internal/stackql/astanalysis/earlyanalysis/ast_expand.go‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ type AstExpandVisitor interface {
2828
sqlparser.SQLAstVisitor
2929
GetAnnotatedAST() annotatedast.AnnotatedAst
3030
Analyze() error
31+
ContainsAnalyticsCacheMaterial() bool
3132
}
3233

3334
type indirectExpandAstVisitor struct {
@@ -72,6 +73,10 @@ func newIndirectExpandAstVisitor(
7273
return rv, nil
7374
}
7475

76+
func (v *indirectExpandAstVisitor) ContainsAnalyticsCacheMaterial() bool {
77+
return v.containsAnalyticsCacheMaterial
78+
}
79+
7580
func (v *indirectExpandAstVisitor) GetAnnotatedAST() annotatedast.AnnotatedAst {
7681
return v.annotatedAST
7782
}
@@ -649,6 +654,11 @@ func (v *indirectExpandAstVisitor) Visit(node sqlparser.SQLNode) error {
649654
if node.IsEmpty() {
650655
return nil
651656
}
657+
containsBackendMaterial := v.handlerCtx.GetDBMSInternalRouter().ExprIsRoutable(node)
658+
if containsBackendMaterial {
659+
v.containsNativeBackendMaterial = true
660+
return nil
661+
}
652662
str := node.GetRawVal()
653663
if v.namespaceCollection.GetAnalyticsCacheTableNamespaceConfigurator().IsAllowed(str) {
654664
v.containsAnalyticsCacheMaterial = true
@@ -863,6 +873,53 @@ func (v *indirectExpandAstVisitor) Visit(node sqlparser.SQLNode) error {
863873
buf.AstPrintf(node, "(%v)", sqlparser.Exprs(node))
864874

865875
case *sqlparser.Subquery:
876+
indirect, err := astindirect.NewSubqueryIndirect(node)
877+
if err != nil {
878+
return nil
879+
}
880+
err = indirect.Parse()
881+
if err != nil {
882+
return nil
883+
}
884+
childAnalyzer, err := NewEarlyScreenerAnalyzer(v.primitiveGenerator, v.annotatedAST, v.whereParams.Clone())
885+
if err != nil {
886+
return err
887+
}
888+
childAnalyzer.SetIndirectionDepth(v.indirectionDepth + 1)
889+
err = childAnalyzer.Analyze(indirect.GetSelectAST(), v.handlerCtx, v.tcc)
890+
if err != nil {
891+
return err
892+
}
893+
// Persist indirect for later retrieval
894+
v.annotatedAST.SetIndirect(node, indirect)
895+
indirectPrimitiveGenerator := v.primitiveGenerator.CreateIndirectPrimitiveGenerator(indirect.GetSelectAST(), v.handlerCtx)
896+
err = indirectPrimitiveGenerator.AnalyzeSelectStatement(childAnalyzer.GetPlanBuilderInput())
897+
if err != nil {
898+
return err
899+
}
900+
maxIndirectCount := childAnalyzer.GetIndirectionDepth()
901+
if maxIndirectCount > constants.LimitsIndirectMaxChainLength {
902+
return fmt.Errorf("query error: indirection chain length %d > %d and is therefore disallowed; please do not cite views from within views", maxIndirectCount, constants.LimitsIndirectMaxChainLength)
903+
}
904+
indirectPrimitiveGenerator.GetPrimitiveComposer().GetAst()
905+
selCtx := indirectPrimitiveGenerator.GetPrimitiveComposer().GetIndirectSelectPreparedStatementCtx()
906+
underlyingSymTab := indirectPrimitiveGenerator.GetPrimitiveComposer().GetSymTab()
907+
colz := selCtx.GetNonControlColumns()
908+
for _, col := range colz {
909+
colId := col.GetIdentifier()
910+
colEntry := symtab.NewSymTabEntry(
911+
indirectPrimitiveGenerator.GetPrimitiveComposer().GetDRMConfig().GetRelationalType(col.GetType()),
912+
"",
913+
"",
914+
)
915+
underlyingSymTab.SetSymbol(colId, colEntry)
916+
}
917+
indirect.SetUnderlyingSymTab(underlyingSymTab)
918+
indirect.SetSelectContext(indirectPrimitiveGenerator.GetPrimitiveComposer().GetIndirectSelectPreparedStatementCtx())
919+
assignedParams, ok := indirectPrimitiveGenerator.GetPrimitiveComposer().GetAssignedParameters()
920+
if ok {
921+
indirect.SetAssignedParameters(assignedParams)
922+
}
866923
buf.AstPrintf(node, "(%v)", node.Select)
867924

868925
case sqlparser.ListArg:

‎internal/stackql/astindirect/indirect.go‎

Lines changed: 12 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import (
55

66
"github.com/stackql/go-openapistackql/openapistackql"
77
"github.com/stackql/stackql/internal/stackql/drm"
8-
"github.com/stackql/stackql/internal/stackql/parse"
98
"github.com/stackql/stackql/internal/stackql/symtab"
109

1110
"github.com/stackql/stackql/internal/stackql/internal_data_transfer/internaldto"
@@ -32,6 +31,18 @@ func NewViewIndirect(viewDTO internaldto.ViewDTO) (Indirect, error) {
3231
return rv, nil
3332
}
3433

34+
func NewSubqueryIndirect(subQuery *sqlparser.Subquery) (Indirect, error) {
35+
if subQuery == nil {
36+
return nil, fmt.Errorf("cannot accomodate nil subquery")
37+
}
38+
rv := &subquery{
39+
subQuery: subQuery,
40+
selectStmt: subQuery.Select,
41+
underlyingSymbolTable: symtab.NewHashMapTreeSymTab(),
42+
}
43+
return rv, nil
44+
}
45+
3546
type Indirect interface {
3647
Parse() error
3748
GetAssignedParameters() (internaldto.TableParameterCollection, bool)
@@ -48,94 +59,3 @@ type Indirect interface {
4859
SetSelectContext(drm.PreparedStatementCtx)
4960
SetUnderlyingSymTab(symtab.SymTab)
5061
}
51-
52-
type view struct {
53-
viewDTO internaldto.ViewDTO
54-
selectStmt sqlparser.SelectStatement
55-
selCtx drm.PreparedStatementCtx
56-
paramCollection internaldto.TableParameterCollection
57-
underlyingSymbolTable symtab.SymTab
58-
}
59-
60-
func (v *view) GetType() IndirectType {
61-
return ViewType
62-
}
63-
64-
func (v *view) GetAssignedParameters() (internaldto.TableParameterCollection, bool) {
65-
return v.paramCollection, v.paramCollection != nil
66-
}
67-
68-
func (v *view) SetAssignedParameters(paramCollection internaldto.TableParameterCollection) {
69-
v.paramCollection = paramCollection
70-
}
71-
72-
func (v *view) GetUnderlyingSymTab() symtab.SymTab {
73-
return v.underlyingSymbolTable
74-
}
75-
76-
func (v *view) SetUnderlyingSymTab(symbolTable symtab.SymTab) {
77-
v.underlyingSymbolTable = symbolTable
78-
}
79-
80-
func (v *view) GetName() string {
81-
return v.viewDTO.GetName()
82-
}
83-
84-
func (v *view) GetColumns() []internaldto.ColumnMetadata {
85-
return v.selCtx.GetNonControlColumns()
86-
}
87-
88-
func (v *view) GetOptionalParameters() map[string]openapistackql.Addressable {
89-
return nil
90-
}
91-
92-
func (v *view) GetRequiredParameters() map[string]openapistackql.Addressable {
93-
return nil
94-
}
95-
96-
func (v *view) GetColumnByName(name string) (internaldto.ColumnMetadata, bool) {
97-
for _, col := range v.selCtx.GetNonControlColumns() {
98-
if col.GetIdentifier() == name {
99-
return col, true
100-
}
101-
}
102-
return nil, false
103-
}
104-
105-
func (v *view) SetSelectContext(selCtx drm.PreparedStatementCtx) {
106-
v.selCtx = selCtx
107-
}
108-
109-
func (v *view) GetSelectContext() drm.PreparedStatementCtx {
110-
return v.selCtx
111-
}
112-
113-
func (v *view) GetTables() sqlparser.TableExprs {
114-
return nil
115-
}
116-
117-
func (v *view) getAST() (sqlparser.Statement, error) {
118-
return parse.ParseQuery(v.viewDTO.GetRawQuery())
119-
}
120-
121-
func (v *view) GetSelectAST() sqlparser.SelectStatement {
122-
return v.selectStmt
123-
}
124-
125-
func (v *view) GetSelectionCtx() (drm.PreparedStatementCtx, error) {
126-
return v.selCtx, nil
127-
}
128-
129-
func (v *view) Parse() error {
130-
parseResult, err := v.getAST()
131-
if err != nil {
132-
return err
133-
}
134-
switch pr := parseResult.(type) {
135-
case sqlparser.SelectStatement:
136-
v.selectStmt = pr
137-
return nil
138-
default:
139-
return fmt.Errorf("view of type '%T' not yet supported", pr)
140-
}
141-
}
Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,92 @@
1+
package astindirect
2+
3+
import (
4+
"github.com/stackql/go-openapistackql/openapistackql"
5+
"github.com/stackql/stackql/internal/stackql/drm"
6+
"github.com/stackql/stackql/internal/stackql/internal_data_transfer/internaldto"
7+
"github.com/stackql/stackql/internal/stackql/parse"
8+
"github.com/stackql/stackql/internal/stackql/symtab"
9+
"vitess.io/vitess/go/vt/sqlparser"
10+
)
11+
12+
type subquery struct {
13+
viewDTO internaldto.ViewDTO
14+
subQuery *sqlparser.Subquery
15+
selectStmt sqlparser.SelectStatement
16+
selCtx drm.PreparedStatementCtx
17+
paramCollection internaldto.TableParameterCollection
18+
underlyingSymbolTable symtab.SymTab
19+
}
20+
21+
func (v *subquery) GetType() IndirectType {
22+
return SubqueryType
23+
}
24+
25+
func (v *subquery) GetAssignedParameters() (internaldto.TableParameterCollection, bool) {
26+
return v.paramCollection, v.paramCollection != nil
27+
}
28+
29+
func (v *subquery) SetAssignedParameters(paramCollection internaldto.TableParameterCollection) {
30+
v.paramCollection = paramCollection
31+
}
32+
33+
func (v *subquery) GetUnderlyingSymTab() symtab.SymTab {
34+
return v.underlyingSymbolTable
35+
}
36+
37+
func (v *subquery) SetUnderlyingSymTab(symbolTable symtab.SymTab) {
38+
v.underlyingSymbolTable = symbolTable
39+
}
40+
41+
func (v *subquery) GetName() string {
42+
return v.viewDTO.GetName()
43+
}
44+
45+
func (v *subquery) GetColumns() []internaldto.ColumnMetadata {
46+
return v.selCtx.GetNonControlColumns()
47+
}
48+
49+
func (v *subquery) GetOptionalParameters() map[string]openapistackql.Addressable {
50+
return nil
51+
}
52+
53+
func (v *subquery) GetRequiredParameters() map[string]openapistackql.Addressable {
54+
return nil
55+
}
56+
57+
func (v *subquery) GetColumnByName(name string) (internaldto.ColumnMetadata, bool) {
58+
for _, col := range v.selCtx.GetNonControlColumns() {
59+
if col.GetIdentifier() == name {
60+
return col, true
61+
}
62+
}
63+
return nil, false
64+
}
65+
66+
func (v *subquery) SetSelectContext(selCtx drm.PreparedStatementCtx) {
67+
v.selCtx = selCtx
68+
}
69+
70+
func (v *subquery) GetSelectContext() drm.PreparedStatementCtx {
71+
return v.selCtx
72+
}
73+
74+
func (v *subquery) GetTables() sqlparser.TableExprs {
75+
return nil
76+
}
77+
78+
func (v *subquery) getAST() (sqlparser.Statement, error) {
79+
return parse.ParseQuery(v.viewDTO.GetRawQuery())
80+
}
81+
82+
func (v *subquery) GetSelectAST() sqlparser.SelectStatement {
83+
return v.selectStmt
84+
}
85+
86+
func (v *subquery) GetSelectionCtx() (drm.PreparedStatementCtx, error) {
87+
return v.selCtx, nil
88+
}
89+
90+
func (v *subquery) Parse() error {
91+
return nil
92+
}

0 commit comments

Comments
 (0)