Skip to content

Update UnbindFiltersFromProjections helper function #35

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

Open
vijaysharma4 wants to merge 3 commits into
base: dsl
Choose a base branch
from
Open

Update UnbindFiltersFromProjections helper function #35

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
815efa7
update function names to be capitalized
vijaysharma4 Nov 22, 2025
5c99e3b
Rename `UnbindFiltersFromProjections` to `RebuildFiltersWithRemappedC…
vijaysharma4 Nov 22, 2025
a0f4c1a
Remove redefinition of `deriveGroupByRejectNullCols`
vijaysharma4 Nov 22, 2025
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
58 changes: 8 additions & 50 deletions src/main/java/org/qed/Backends/Cockroach/helperfuncs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,19 @@ package norm
import (
"github.com/cockroachdb/cockroach/pkg/sql/opt"
"github.com/cockroachdb/cockroach/pkg/sql/opt/memo"
"github.com/cockroachdb/cockroach/pkg/sql/types"
"github.com/cockroachdb/cockroach/pkg/util/intsets"
"github.com/cockroachdb/cockroach/pkg/sql/types"
"github.com/cockroachdb/errors"
)

func (c *CustomFuncs) HasConstantGroupingCols(
input memo.RelExpr, groupingPrivate *memo.GroupingPrivate,
) bool {
_, _, _, ok := c.extractConstantGroupingColsAndBuildDummy(input, groupingPrivate)
_, _, _, ok := c.ExtractConstantGroupingColsAndBuildDummy(input, groupingPrivate)
return ok
}

func (c *CustomFuncs) extractConstantGroupingColsAndBuildDummy(
func (c *CustomFuncs) ExtractConstantGroupingColsAndBuildDummy(
input memo.RelExpr, groupingPrivate *memo.GroupingPrivate,
) (constantCols opt.ColSet, constantValues memo.ScalarListExpr, dummyCols opt.ColList, ok bool) {
project, ok := input.(*memo.ProjectExpr)
Expand Down Expand Up @@ -51,21 +51,21 @@ func (c *CustomFuncs) extractConstantGroupingColsAndBuildDummy(
func (c *CustomFuncs) GetConstantGroupingCols(
input memo.RelExpr, groupingPrivate *memo.GroupingPrivate,
) opt.ColSet {
constantCols, _, _, _ := c.extractConstantGroupingColsAndBuildDummy(input, groupingPrivate)
constantCols, _, _, _ := c.ExtractConstantGroupingColsAndBuildDummy(input, groupingPrivate)
return constantCols
}

func (c *CustomFuncs) GetConstantValues(
input memo.RelExpr, groupingPrivate *memo.GroupingPrivate,
) memo.ScalarListExpr {
_, constantValues, _, _ := c.extractConstantGroupingColsAndBuildDummy(input, groupingPrivate)
_, constantValues, _, _ := c.ExtractConstantGroupingColsAndBuildDummy(input, groupingPrivate)
return constantValues
}

func (c *CustomFuncs) GetDummyCols(
input memo.RelExpr, groupingPrivate *memo.GroupingPrivate,
) opt.ColList {
_, _, dummyCols, _ := c.extractConstantGroupingColsAndBuildDummy(input, groupingPrivate)
_, _, dummyCols, _ := c.ExtractConstantGroupingColsAndBuildDummy(input, groupingPrivate)
return dummyCols
}

Expand Down Expand Up @@ -150,7 +150,7 @@ func (c *CustomFuncs) ConstructAggregateProjectConstantToDummyJoin(
) memo.RelExpr {
project := input.(*memo.ProjectExpr)

constantCols, constantValues, dummyCols, ok := c.extractConstantGroupingColsAndBuildDummy(project, groupingPrivate)
constantCols, constantValues, dummyCols, ok := c.ExtractConstantGroupingColsAndBuildDummy(project, groupingPrivate)
if !ok {
panic(errors.AssertionFailedf("should have matched"))
}
Expand Down Expand Up @@ -771,7 +771,7 @@ func (c *CustomFuncs) IsSemiJoin(input memo.RelExpr) bool {
}
}

func (c *CustomFuncs) UnbindFiltersFromProjections(
func (c *CustomFuncs) RebuildFiltersWithRemappedCols(
projections memo.ProjectionsExpr, filters memo.FiltersExpr,
) memo.FiltersExpr {
var colMap opt.ColMap
Expand Down Expand Up @@ -809,47 +809,6 @@ func (c *CustomFuncs) BindFiltersToProjections(
}


func deriveGroupByRejectNullCols(
mem *memo.Memo, in memo.RelExpr, disabledRules intsets.Fast,
) opt.ColSet {
input := in.Child(0).(memo.RelExpr)
aggs := *in.Child(1).(*memo.AggregationsExpr)

var rejectNullCols opt.ColSet
var savedInColID opt.ColumnID
for i := range aggs {
agg := memo.ExtractAggFunc(aggs[i].Agg)
aggOp := agg.Op()

if aggOp == opt.ConstAggOp {
continue
}

if !opt.AggregateIgnoresNulls(aggOp) || !opt.AggregateIsNullOnEmpty(aggOp) {
return opt.ColSet{}
}

var inColID opt.ColumnID
if v, ok := agg.Child(0).(*memo.VariableExpr); ok {
inColID = v.Col
} else {
return opt.ColSet{}
}

if savedInColID != 0 && savedInColID != inColID {
return opt.ColSet{}
}
savedInColID = inColID

if !DeriveRejectNullCols(mem, input, disabledRules).Contains(inColID) {
return opt.ColSet{}
}

rejectNullCols.Add(aggs[i].Col)
}
return rejectNullCols
}

func (c *CustomFuncs) AllFiltersCanMapOnSetOp(filters memo.FiltersExpr) bool {
for i := range filters {
if !c.CanMapOnSetOp(&filters[i]) {
Expand Down Expand Up @@ -987,4 +946,3 @@ func (c *CustomFuncs) MakeSetPrivate(
OutCols: outColsCopy,
}
}