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

Pushdown simplest sorting for aggregate command #2530

Merged
merged 26 commits into from
May 3, 2023
Merged

Pushdown simplest sorting for aggregate command #2530

Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
e13337b
wip
noisersup Apr 24, 2023
12d2d3d
wip
noisersup Apr 25, 2023
a31ebe7
wip
noisersup Apr 25, 2023
787b05a
wip
noisersup Apr 26, 2023
00d97d9
wip
noisersup Apr 26, 2023
78605d0
wip
noisersup Apr 27, 2023
5b97891
wip
noisersup Apr 27, 2023
281bed0
wip
noisersup Apr 28, 2023
8770a28
Merge remote-tracking branch 'upstream/main' into pushdown-sort-2438
noisersup Apr 28, 2023
e3a2333
wip
noisersup Apr 28, 2023
256ee3b
wip
noisersup Apr 28, 2023
47baa37
wip
noisersup Apr 28, 2023
773fb94
Merge branch 'main' into pushdown-sort-2438
noisersup Apr 28, 2023
0883777
Merge branch 'main' into pushdown-sort-2438
mergify[bot] Apr 28, 2023
d34e056
wip
noisersup Apr 28, 2023
e5ffaea
wip
noisersup Apr 28, 2023
5c93458
wip
noisersup Apr 28, 2023
ae05028
wip
noisersup Apr 28, 2023
50497e1
wip
rumyantseva May 2, 2023
ccfbe61
wip
rumyantseva May 2, 2023
79c9dd1
wip
rumyantseva May 2, 2023
40c99dd
wip
rumyantseva May 2, 2023
ebbe58f
wip
rumyantseva May 2, 2023
2013ab4
wip
rumyantseva May 3, 2023
329306e
wip
rumyantseva May 3, 2023
a81592e
Merge branch 'main' into pushdown-aggregation-sort-2438
May 3, 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
Prev Previous commit
Next Next commit
wip
  • Loading branch information
@noisersup
noisersup committed Apr 25, 2023
commit 12d2d3d2a6ed2ff141c7f03caeaa2cd52eff84da
17 changes: 9 additions & 8 deletions internal/handlers/pg/pgdb/query.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,9 @@ func buildIterator(ctx context.Context, tx pgx.Tx, p *iteratorParams) (types.Doc

query += ` FROM ` + pgx.Identifier{p.schema, p.table}.Sanitize()

where, args, err := prepareWhereClause(p.filter)
var placeholder Placeholder

where, args, err := prepareWhereClause(&placeholder, p.filter)
if err != nil {
return nil, lazyerrors.Error(err)
}
Expand All @@ -176,7 +178,7 @@ func buildIterator(ctx context.Context, tx pgx.Tx, p *iteratorParams) (types.Doc
}

if p.nativeSort {
sort, arg, err := prepareSortClause(p.filter, asc)
sort, arg, err := prepareSortClause(&placeholder, p.filter, asc)
if err != nil {
return nil, lazyerrors.Error(err)
}
Expand All @@ -202,7 +204,7 @@ const (
asc order = 1
)

func prepareSortClause(sqlFilters *types.Document, o order) (string, any, error) {
func prepareSortClause(p *Placeholder, sqlFilters *types.Document, o order) (string, any, error) {
iter := sqlFilters.Iterator()
defer iter.Close()

Expand Down Expand Up @@ -242,14 +244,13 @@ func prepareSortClause(sqlFilters *types.Document, o order) (string, any, error)
panic(fmt.Sprint("forbidden order:", o))
}

return " ORDER BY $1" + sqlOrder, key, nil
return fmt.Sprintf(" ORDER BY %s %s", p.Next(), sqlOrder), key, nil
}

// prepareWhereClause adds WHERE clause with given filters to the query and returns the query and arguments.
func prepareWhereClause(sqlFilters *types.Document) (string, []any, error) {
func prepareWhereClause(p *Placeholder, sqlFilters *types.Document) (string, []any, error) {
var filters []string
var args []any
var p Placeholder

iter := sqlFilters.Iterator()
defer iter.Close()
Expand Down Expand Up @@ -307,7 +308,7 @@ func prepareWhereClause(sqlFilters *types.Document) (string, []any, error) {

switch k {
case "$eq":
if f, a := filterEqual(&p, rootKey, v); f != "" {
if f, a := filterEqual(p, rootKey, v); f != "" {
filters = append(filters, f)
args = append(args, a...)
}
Expand Down Expand Up @@ -349,7 +350,7 @@ func prepareWhereClause(sqlFilters *types.Document) (string, []any, error) {
// type not supported for pushdown

case float64, string, types.ObjectID, bool, time.Time, int32, int64:
if f, a := filterEqual(&p, rootKey, v); f != "" {
if f, a := filterEqual(p, rootKey, v); f != "" {
filters = append(filters, f)
args = append(args, a...)
}
Expand Down