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

Jump to bottom

Backport v1.6.1 fixes #3107

Merged
merged 6 commits into from
Jul 27, 2023
Merged

Backport v1.6.1 fixes #3107

merged 6 commits into from
Jul 27, 2023

Conversation

AlekSi
Copy link
Member

@AlekSi AlekSi commented Jul 25, 2023 •
edited by chilagrow
Loading

Description

Closes #3113.

Readiness checklist

  • I added/updated unit tests (and they pass).
  • I added/updated integration/compatibility tests (and they pass).
  • I added/updated comments and checked rendering.
  • I made spot refactorings.
  • I updated user documentation.
  • I ran task all, and it passed.
  • I ensured that PR title is good enough for the changelog.
  • (for maintainers only) I set Reviewers (@FerretDB/core), Labels, Project and project's Sprint fields.
  • I marked all done items in this checklist.

@AlekSi AlekSi added trust PRs that can access Actions secrets code/bug-regression Some user-visible feature works incorrectly, but worked before packages PRs that should build packages labels Jul 25, 2023
@AlekSi AlekSi added this to the Next milestone Jul 25, 2023
@AlekSi AlekSi self-assigned this Jul 25, 2023
@codecov
Copy link

codecov bot commented Jul 25, 2023 •
edited
Loading

Codecov Report

Merging #3107 (14ffb07) into main (a398e31) will not change coverage.
The diff coverage is 100.00%.

Additional details and impacted files

Impacted file tree graph

@@           Coverage Diff           @@
##             main    #3107   +/-   ##
=======================================
  Coverage   76.00%   76.00%           
=======================================
  Files         391      391           
  Lines       21596    21596           
=======================================
  Hits        16413    16413           
  Misses       4230     4230           
  Partials      953      953
Files Changed Coverage Δ
internal/handlers/pg/msg_explain.go 80.76% <100.00%> (ø)
internal/handlers/pg/msg_find.go 87.58% <100.00%> (ø)
Flag Coverage Δ
hana ?
integration 72.55% <100.00%> (ø)
mongodb 5.46% <0.00%> (ø)
pg 66.01% <100.00%> (ø)
shard-1 55.62% <100.00%> (ø)
shard-2 53.62% <100.00%> (ø)
shard-3 52.92% <100.00%> (ø)
sqlite 41.57% <0.00%> (ø)
unit 23.97% <0.00%> (+0.04%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

@AlekSi AlekSi changed the title Fix pushdown for find+limit without filter Fix pushdown for find with filter and limit Jul 26, 2023
@AlekSi AlekSi added code/chore Code maintenance improvements and removed trust PRs that can access Actions secrets code/bug-regression Some user-visible feature works incorrectly, but worked before packages PRs that should build packages labels Jul 26, 2023
@AlekSi AlekSi changed the title Fix pushdown for find with filter and limit Backport v1.6.1 fixes Jul 26, 2023
@AlekSi AlekSi added the not ready Issues that are not ready to be worked on; PRs that should skip CI label Jul 26, 2023
@chilagrow
Copy link
Member

Testing combination of -enable-sort-pushdown and -disable-filter-pushdown flags

$ go test -count=1 -run=TestQueryCommandLimitPushDown . -enable-sort-pushdown=true -disable-filter-pushdown=true -target-backend=ferretdb-pg -target-tls -postgresql-url=postgres://username@127.0.0.1:5432/ferretdb?pool_max_conns=50 -compat-url='mongodb://username:password@127.0.0.1:47018/?tls=true&tlsCertificateKeyFile=../build/certs/client.pem&tlsCaFile=../build/certs/rootCA-cert.pem'
ok      github.com/FerretDB/FerretDB/integration        0.280s
$ go test -count=1 -run=TestQueryCommandLimitPushDown . -enable-sort-pushdown=true -disable-filter-pushdown=false -target-backend=ferretdb-pg -target-tls -postgresql-url=postgres://username@127.0.0.1:5432/ferretdb?pool_max_conns=50 -compat-url='mongodb://username:password@127.0.0.1:47018/?tls=true&tlsCertificateKeyFile=../build/certs/client.pem&tlsCaFile=../build/certs/rootCA-cert.pem'
ok      github.com/FerretDB/FerretDB/integration        0.289s
$ go test -count=1 -run=TestQueryCommandLimitPushDown . -enable-sort-pushdown=false -disable-filter-pushdown=false -target-backend=ferretdb-pg -target-tls -postgresql-url=postgres://username@127.0.0.1:5432/ferretdb?pool_max_conns=50 -compat-url='mongodb://username:password@127.0.0.1:47018/?tls=true&tlsCertificateKeyFile=../build/certs/client.pem&tlsCaFile=../build/certs/rootCA-cert.pem'
ok      github.com/FerretDB/FerretDB/integration        0.302s
$ go test -count=1 -run=TestQueryCommandLimitPushDown . -enable-sort-pushdown=false -disable-filter-pushdown=true -target-backend=ferretdb-pg -target-tls -postgresql-url=postgres://username@127.0.0.1:5432/ferretdb?pool_max_conns=50 -compat-url='mongodb://username:password@127.0.0.1:47018/?tls=true&tlsCertificateKeyFile=../build/certs/client.pem&tlsCaFile=../build/certs/rootCA-cert.pem'
ok      github.com/FerretDB/FerretDB/integration        0.302s

@chilagrow chilagrow added do not merge PRs that should not be merged and removed not ready Issues that are not ready to be worked on; PRs that should skip CI labels Jul 27, 2023
@chilagrow chilagrow marked this pull request as ready for review July 27, 2023 07:14
@chilagrow chilagrow requested a review from a team as a code owner July 27, 2023 07:14
@chilagrow chilagrow requested review from rumyantseva, chilagrow, a team and noisersup July 27, 2023 07:14
@chilagrow chilagrow enabled auto-merge (squash) July 27, 2023 07:15
AlekSi
AlekSi commented Jul 27, 2023
View reviewed changes
Copy link
Member Author

@AlekSi AlekSi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@AlekSi AlekSi removed the do not merge PRs that should not be merged label Jul 27, 2023
rumyantseva
rumyantseva approved these changes Jul 27, 2023
View reviewed changes
Copy link
Contributor

@rumyantseva rumyantseva left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@AlekSi AlekSi disabled auto-merge July 27, 2023 10:39
@AlekSi AlekSi merged commit 972aa85 into FerretDB:main Jul 27, 2023
yonarw pushed a commit to yonarw/FerretDB that referenced this pull request Aug 31, 2023
@AlekSi @chilagrow @yonarw
Backport v1.6.1 fixes (FerretDB#3107)
2a77c1b 
Closes FerretDB#3113.

Co-authored-by: Chi Fujii <chi.fujii@ferretdb.io>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@chilagrow chilagrow chilagrow approved these changes

@rumyantseva rumyantseva rumyantseva approved these changes

@noisersup noisersup Awaiting requested review from noisersup noisersup was automatically assigned from FerretDB/core

Assignees

@AlekSi AlekSi

Labels
code/chore Code maintenance improvements
Projects
Current Engineering
Archived in project
Milestone
v1.7.0
Development

Successfully merging this pull request may close these issues.

Invalid results for find with filter and limit
3 participants
@AlekSi @chilagrow @rumyantseva