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

Test: support push down filter in ut #6573

Merged
merged 12 commits into from
Jan 5, 2023
Merged

Test: support push down filter in ut #6573

merged 12 commits into from
Jan 5, 2023

Conversation

ywqzzy
Copy link
Contributor

@ywqzzy ywqzzy commented Jan 4, 2023 •
edited
Loading

What problem does this PR solve?

Issue Number: ref #4609

Problem Summary:
We don't push down filter to storage layer in current ut framework.

What is changed and how it works?

In getStreamFromDeltaMerge, mock DAGQueryInfo with PushDownFilter from tipb:Selection

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
  • No code

Side effects

  • Performance regression: Consumes more CPU
  • Performance regression: Consumes more Memory
  • Breaking backward compatibility

Documentation

  • Affects user behaviors
  • Contains syntax changes
  • Contains variable changes
  • Contains experimental features
  • Changes MySQL compatibility

Release note

None

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Jan 4, 2023 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • Lloyd-Pottiger
  • SeaRise

To complete the pull request process, please ask the reviewers in the list to review by filling /cc @reviewer in the comment.
After your PR has acquired the required number of LGTMs, you can assign this pull request to the committer in the list by filling /assign @committer in the comment to help you merge this pull request.

The full list of commands accepted by this bot can be found here.

Reviewer can indicate their review by submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

@ti-chi-bot ti-chi-bot added do-not-merge/needs-linked-issue do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. release-note-none Denotes a PR that doesn't merit a release note. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jan 4, 2023
@ywqzzy ywqzzy mentioned this pull request Jan 4, 2023
Closed
54 tasks
@ywqzzy
Copy link
Contributor Author

ywqzzy commented Jan 4, 2023

/run-all-tests

@ywqzzy ywqzzy changed the title [WIP]Test: support push down filter in ut Test: support push down filter in ut Jan 4, 2023
@ti-chi-bot ti-chi-bot removed do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. do-not-merge/needs-linked-issue labels Jan 4, 2023
@ywqzzy
Copy link
Contributor Author

ywqzzy commented Jan 4, 2023

/run-all-tests

@ywqzzy
Copy link
Contributor Author

ywqzzy commented Jan 4, 2023

/run-all-tests

Lloyd-Pottiger
Lloyd-Pottiger reviewed Jan 4, 2023
View reviewed changes
dbms/src/Debug/MockStorage.cpp
@@ -119,10 +124,11 @@ void MockStorage::addTableDataForDeltaMerge(Context & context, const String & na
}
}

BlockInputStreamPtr MockStorage::getStreamFromDeltaMerge(Context & context, Int64 id)
BlockInputStreamPtr MockStorage::getStreamFromDeltaMerge(Context & context, Int64 table_id, const PushDownFilter * push_down_filter)
Copy link
Contributor

Choose a reason for hiding this comment

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

why not use shared_ptr

Copy link
Contributor Author

Choose a reason for hiding this comment

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

why not use shared_ptr

The filter will be used only once

dbms/src/Debug/MockStorage.cpp
Comment on lines +153 to +154
BlockInputStreamPtr in = ins[0];
in = std::make_shared<FilterBlockInputStream>(in, before_where, filter_column_name, "test");
Copy link
Contributor

Choose a reason for hiding this comment

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

add a assert for the size of ins

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The size will be changed by num_streams, so I didn't check it.
In future, I will pass num_streams into storage->read()

dbms/src/Flash/tests/gtest_filter_executor.cpp
@@ -251,6 +252,38 @@ try
}
CATCH

TEST_F(FilterExecutorTestRunner, PushDownFilter)
Copy link
Contributor

Choose a reason for hiding this comment

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

maybe need more tests

Copy link
Contributor Author

Choose a reason for hiding this comment

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

maybe need more tests

Ok, I will test more filters

@ti-chi-bot ti-chi-bot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jan 4, 2023
@ywqzzy
Copy link
Contributor Author

ywqzzy commented Jan 4, 2023

/run-all-tests

SeaRise
SeaRise reviewed Jan 4, 2023
View reviewed changes
Copy link
Contributor

@SeaRise SeaRise left a comment

Choose a reason for hiding this comment

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

Others LGTM

dbms/src/Flash/tests/gtest_filter_executor.cpp Outdated Show resolved Hide resolved
dbms/src/TestUtils/ExecutorTestUtils.cpp Show resolved Hide resolved
SeaRise
SeaRise approved these changes Jan 5, 2023
View reviewed changes
Copy link
Contributor

@SeaRise SeaRise left a comment

Choose a reason for hiding this comment

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

lgtm

dbms/src/Flash/Planner/PhysicalPlan.cpp Outdated Show resolved Hide resolved
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Jan 5, 2023
@ywqzzy @SeaRise
Update dbms/src/Flash/Planner/PhysicalPlan.cpp
b0021a9 
Co-authored-by: SeaRise <hhssearise@foxmail.com>
@ti-chi-bot ti-chi-bot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Jan 5, 2023
@ywqzzy
Copy link
Contributor Author

ywqzzy commented Jan 5, 2023

/merge

@ti-chi-bot
Copy link
Member

@ywqzzy: It seems you want to merge this PR, I will help you trigger all the tests:

/run-all-tests

You only need to trigger /merge once, and if the CI test fails, you just re-trigger the test that failed and the bot will merge the PR for you after the CI passes.

If you have any questions about the PR merge process, please refer to pr process.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository.

@ti-chi-bot
Copy link
Member

This pull request has been accepted and is ready to merge.

Commit hash: 1db7ea0

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Jan 5, 2023
@ywqzzy
Copy link
Contributor Author

ywqzzy commented Jan 5, 2023

/run-all-tests

@ti-chi-bot ti-chi-bot merged commit 3350580 into pingcap:master Jan 5, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@SeaRise SeaRise SeaRise approved these changes

@Lloyd-Pottiger Lloyd-Pottiger Lloyd-Pottiger approved these changes

Assignees
No one assigned
Labels
release-note-none Denotes a PR that doesn't merit a release note. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@ywqzzy @ti-chi-bot @SeaRise @Lloyd-Pottiger