Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 3 additions & 2 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,8 @@
"describe aws.pseudo_s3.s3_bucket_listing;",
"select role_name from pgi.information_schema.applicable_roles where role_name = 'pg_database_owner';",
"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;",
"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;"
"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;",
"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;"
],
"default": "show providers;"
},
Expand Down Expand Up @@ -139,7 +140,7 @@
"default": "{}",
"options": [
"{}",
"{ \"tableRegex\": \"(?i)^(?:public\\\\.)?(?:pg_.*|current_schema|information_schema)\" }"
"{ \"tableRegex\": \"(?i)^(?:public\\\\.)?(?:pg_.*|current_schema|information_schema|stackql_intel)\" }"
]
}
],
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ env CGO_ENABLED=1 go build \
-X github.com/stackql/stackql/internal/stackql/cmd.BuildShortCommitSHA=$BUILDSHORTCOMMITSHA \
-X \"github.com/stackql/stackql/internal/stackql/cmd.BuildDate=$BUILDDATE\" \
-X \"stackql/internal/stackql/planbuilder.PlanCacheEnabled=$PLANCACHEENABLED\" \
-X github.com/stackql/stackql/internal/stackql/cmd.BuildPlatform=$BUILDPLATFORM" -o ./build ./...
-X github.com/stackql/stackql/internal/stackql/cmd.BuildPlatform=$BUILDPLATFORM" -o ./build ./stackql


```
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,6 @@ replace github.com/chzyer/readline => github.com/stackql/readline v0.0.2-alpha05

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

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

replace github.com/jeroenrinzema/psql-wire => github.com/stackql/psql-wire v0.0.2-stackqlbeta14
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -794,8 +794,8 @@ github.com/stackql/readline v0.0.2-alpha05 h1:ID4QzGdplFBsrSnTuz8pvKzWw96JbrJg8f
github.com/stackql/readline v0.0.2-alpha05/go.mod h1:OFAYOdXk/X4+5GYiDXFfaGrk+bCN6Qv0SYY5HNzD2E0=
github.com/stackql/stackql-provider-registry v0.0.1-rc01 h1:3XorfaYEhGpuvEeQK04EmpZUCr42hZ/a4Nh3wE25LF0=
github.com/stackql/stackql-provider-registry v0.0.1-rc01/go.mod h1:D0WFWa7HOXS+PQAmvN0Nm1E6dMdUkUFtAzRH8cXxg88=
github.com/stackql/vitess v0.0.12-alpha06 h1:05rpWs895wB46X6DzapzvhLoQ/b5Y08m1sLele80bqo=
github.com/stackql/vitess v0.0.12-alpha06/go.mod h1:6aOZHbgHclTasEGZvrdoWfca6Y4XJfemKMqwnDL/klI=
github.com/stackql/vitess v0.0.12-alpha07 h1:efZeRn3VOctkUMoTsATmY1bcyqijej8vcqIjmf6Vhao=
github.com/stackql/vitess v0.0.12-alpha07/go.mod h1:6aOZHbgHclTasEGZvrdoWfca6Y4XJfemKMqwnDL/klI=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
Expand Down
57 changes: 57 additions & 0 deletions internal/stackql/astanalysis/earlyanalysis/ast_expand.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ type AstExpandVisitor interface {
sqlparser.SQLAstVisitor
GetAnnotatedAST() annotatedast.AnnotatedAst
Analyze() error
ContainsAnalyticsCacheMaterial() bool
}

type indirectExpandAstVisitor struct {
Expand Down Expand Up @@ -72,6 +73,10 @@ func newIndirectExpandAstVisitor(
return rv, nil
}

func (v *indirectExpandAstVisitor) ContainsAnalyticsCacheMaterial() bool {
return v.containsAnalyticsCacheMaterial
}

func (v *indirectExpandAstVisitor) GetAnnotatedAST() annotatedast.AnnotatedAst {
return v.annotatedAST
}
Expand Down Expand Up @@ -649,6 +654,11 @@ func (v *indirectExpandAstVisitor) Visit(node sqlparser.SQLNode) error {
if node.IsEmpty() {
return nil
}
containsBackendMaterial := v.handlerCtx.GetDBMSInternalRouter().ExprIsRoutable(node)
if containsBackendMaterial {
v.containsNativeBackendMaterial = true
return nil
}
str := node.GetRawVal()
if v.namespaceCollection.GetAnalyticsCacheTableNamespaceConfigurator().IsAllowed(str) {
v.containsAnalyticsCacheMaterial = true
Expand Down Expand Up @@ -863,6 +873,53 @@ func (v *indirectExpandAstVisitor) Visit(node sqlparser.SQLNode) error {
buf.AstPrintf(node, "(%v)", sqlparser.Exprs(node))

case *sqlparser.Subquery:
indirect, err := astindirect.NewSubqueryIndirect(node)
if err != nil {
return nil
}
err = indirect.Parse()
if err != nil {
return nil
}
childAnalyzer, err := NewEarlyScreenerAnalyzer(v.primitiveGenerator, v.annotatedAST, v.whereParams.Clone())
if err != nil {
return err
}
childAnalyzer.SetIndirectionDepth(v.indirectionDepth + 1)
err = childAnalyzer.Analyze(indirect.GetSelectAST(), v.handlerCtx, v.tcc)
if err != nil {
return err
}
// Persist indirect for later retrieval
v.annotatedAST.SetIndirect(node, indirect)
indirectPrimitiveGenerator := v.primitiveGenerator.CreateIndirectPrimitiveGenerator(indirect.GetSelectAST(), v.handlerCtx)
err = indirectPrimitiveGenerator.AnalyzeSelectStatement(childAnalyzer.GetPlanBuilderInput())
if err != nil {
return err
}
maxIndirectCount := childAnalyzer.GetIndirectionDepth()
if maxIndirectCount > constants.LimitsIndirectMaxChainLength {
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)
}
indirectPrimitiveGenerator.GetPrimitiveComposer().GetAst()
selCtx := indirectPrimitiveGenerator.GetPrimitiveComposer().GetIndirectSelectPreparedStatementCtx()
underlyingSymTab := indirectPrimitiveGenerator.GetPrimitiveComposer().GetSymTab()
colz := selCtx.GetNonControlColumns()
for _, col := range colz {
colId := col.GetIdentifier()
colEntry := symtab.NewSymTabEntry(
indirectPrimitiveGenerator.GetPrimitiveComposer().GetDRMConfig().GetRelationalType(col.GetType()),
"",
"",
)
underlyingSymTab.SetSymbol(colId, colEntry)
}
indirect.SetUnderlyingSymTab(underlyingSymTab)
indirect.SetSelectContext(indirectPrimitiveGenerator.GetPrimitiveComposer().GetIndirectSelectPreparedStatementCtx())
assignedParams, ok := indirectPrimitiveGenerator.GetPrimitiveComposer().GetAssignedParameters()
if ok {
indirect.SetAssignedParameters(assignedParams)
}
buf.AstPrintf(node, "(%v)", node.Select)

case sqlparser.ListArg:
Expand Down
104 changes: 12 additions & 92 deletions internal/stackql/astindirect/indirect.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import (

"github.com/stackql/go-openapistackql/openapistackql"
"github.com/stackql/stackql/internal/stackql/drm"
"github.com/stackql/stackql/internal/stackql/parse"
"github.com/stackql/stackql/internal/stackql/symtab"

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

func NewSubqueryIndirect(subQuery *sqlparser.Subquery) (Indirect, error) {
if subQuery == nil {
return nil, fmt.Errorf("cannot accomodate nil subquery")
}
rv := &subquery{
subQuery: subQuery,
selectStmt: subQuery.Select,
underlyingSymbolTable: symtab.NewHashMapTreeSymTab(),
}
return rv, nil
}

type Indirect interface {
Parse() error
GetAssignedParameters() (internaldto.TableParameterCollection, bool)
Expand All @@ -48,94 +59,3 @@ type Indirect interface {
SetSelectContext(drm.PreparedStatementCtx)
SetUnderlyingSymTab(symtab.SymTab)
}

type view struct {
viewDTO internaldto.ViewDTO
selectStmt sqlparser.SelectStatement
selCtx drm.PreparedStatementCtx
paramCollection internaldto.TableParameterCollection
underlyingSymbolTable symtab.SymTab
}

func (v *view) GetType() IndirectType {
return ViewType
}

func (v *view) GetAssignedParameters() (internaldto.TableParameterCollection, bool) {
return v.paramCollection, v.paramCollection != nil
}

func (v *view) SetAssignedParameters(paramCollection internaldto.TableParameterCollection) {
v.paramCollection = paramCollection
}

func (v *view) GetUnderlyingSymTab() symtab.SymTab {
return v.underlyingSymbolTable
}

func (v *view) SetUnderlyingSymTab(symbolTable symtab.SymTab) {
v.underlyingSymbolTable = symbolTable
}

func (v *view) GetName() string {
return v.viewDTO.GetName()
}

func (v *view) GetColumns() []internaldto.ColumnMetadata {
return v.selCtx.GetNonControlColumns()
}

func (v *view) GetOptionalParameters() map[string]openapistackql.Addressable {
return nil
}

func (v *view) GetRequiredParameters() map[string]openapistackql.Addressable {
return nil
}

func (v *view) GetColumnByName(name string) (internaldto.ColumnMetadata, bool) {
for _, col := range v.selCtx.GetNonControlColumns() {
if col.GetIdentifier() == name {
return col, true
}
}
return nil, false
}

func (v *view) SetSelectContext(selCtx drm.PreparedStatementCtx) {
v.selCtx = selCtx
}

func (v *view) GetSelectContext() drm.PreparedStatementCtx {
return v.selCtx
}

func (v *view) GetTables() sqlparser.TableExprs {
return nil
}

func (v *view) getAST() (sqlparser.Statement, error) {
return parse.ParseQuery(v.viewDTO.GetRawQuery())
}

func (v *view) GetSelectAST() sqlparser.SelectStatement {
return v.selectStmt
}

func (v *view) GetSelectionCtx() (drm.PreparedStatementCtx, error) {
return v.selCtx, nil
}

func (v *view) Parse() error {
parseResult, err := v.getAST()
if err != nil {
return err
}
switch pr := parseResult.(type) {
case sqlparser.SelectStatement:
v.selectStmt = pr
return nil
default:
return fmt.Errorf("view of type '%T' not yet supported", pr)
}
}
92 changes: 92 additions & 0 deletions internal/stackql/astindirect/subquery_indirect.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
package astindirect

import (
"github.com/stackql/go-openapistackql/openapistackql"
"github.com/stackql/stackql/internal/stackql/drm"
"github.com/stackql/stackql/internal/stackql/internal_data_transfer/internaldto"
"github.com/stackql/stackql/internal/stackql/parse"
"github.com/stackql/stackql/internal/stackql/symtab"
"vitess.io/vitess/go/vt/sqlparser"
)

type subquery struct {
viewDTO internaldto.ViewDTO
subQuery *sqlparser.Subquery
selectStmt sqlparser.SelectStatement
selCtx drm.PreparedStatementCtx
paramCollection internaldto.TableParameterCollection
underlyingSymbolTable symtab.SymTab
}

func (v *subquery) GetType() IndirectType {
return SubqueryType
}

func (v *subquery) GetAssignedParameters() (internaldto.TableParameterCollection, bool) {
return v.paramCollection, v.paramCollection != nil
}

func (v *subquery) SetAssignedParameters(paramCollection internaldto.TableParameterCollection) {
v.paramCollection = paramCollection
}

func (v *subquery) GetUnderlyingSymTab() symtab.SymTab {
return v.underlyingSymbolTable
}

func (v *subquery) SetUnderlyingSymTab(symbolTable symtab.SymTab) {
v.underlyingSymbolTable = symbolTable
}

func (v *subquery) GetName() string {
return v.viewDTO.GetName()
}

func (v *subquery) GetColumns() []internaldto.ColumnMetadata {
return v.selCtx.GetNonControlColumns()
}

func (v *subquery) GetOptionalParameters() map[string]openapistackql.Addressable {
return nil
}

func (v *subquery) GetRequiredParameters() map[string]openapistackql.Addressable {
return nil
}

func (v *subquery) GetColumnByName(name string) (internaldto.ColumnMetadata, bool) {
for _, col := range v.selCtx.GetNonControlColumns() {
if col.GetIdentifier() == name {
return col, true
}
}
return nil, false
}

func (v *subquery) SetSelectContext(selCtx drm.PreparedStatementCtx) {
v.selCtx = selCtx
}

func (v *subquery) GetSelectContext() drm.PreparedStatementCtx {
return v.selCtx
}

func (v *subquery) GetTables() sqlparser.TableExprs {
return nil
}

func (v *subquery) getAST() (sqlparser.Statement, error) {
return parse.ParseQuery(v.viewDTO.GetRawQuery())
}

func (v *subquery) GetSelectAST() sqlparser.SelectStatement {
return v.selectStmt
}

func (v *subquery) GetSelectionCtx() (drm.PreparedStatementCtx, error) {
return v.selCtx, nil
}

func (v *subquery) Parse() error {
return nil
}
Loading