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.

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

Some code refine in join #6680

Merged
merged 9 commits into from
Jan 30, 2023
Merged

Conversation

gengliqi
Copy link
Contributor

Signed-off-by: gengliqi [email protected]

What problem does this PR solve?

Issue Number: ref #5900

Problem Summary:

  1. Use SavedHash for serialized to speed up the keyEquals
std::unique_ptr<ConcurrentHashMapWithSavedHash<StringRef, Mapped>> serialized;
  1. fix the example
///   `select * from t1 where col1 not in (select col2 from t2 where t1.col2 > t2.col3)`
///   - other_filter is `t1.col2 > t2.col3`
///.  - other_eq_filter_from_in_column is `t1.col1 = t2.col2`
  1. remove some useless code

What is changed and how it works?

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

Signed-off-by: gengliqi <[email protected]>
Signed-off-by: gengliqi <[email protected]>
@ti-chi-bot
Copy link
Member

ti-chi-bot commented Jan 28, 2023

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • Lloyd-Pottiger
  • windtalker

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 release-note-none Denotes a PR that doesn't merit a release note. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jan 28, 2023
@@ -326,8 +326,6 @@ class Join
BlocksList blocks;
/// mutex to protect concurrent insert to blocks
std::mutex blocks_lock;
/// keep original block for concurrent build
Blocks original_blocks;
Copy link
Contributor

Choose a reason for hiding this comment

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

It will soonly be used when join support spill, I think we can keep it.

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 BlocksList blocks?

Copy link
Contributor

Choose a reason for hiding this comment

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

Because the block in blocks is changed during insertFromBlock, the key columns are removed or moved to the start of the block.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Got it. Maybe we can change this behavior in the future. If so, we can also delete the copy of the right join key columns.

dbms/src/Interpreters/Join.cpp Outdated Show resolved Hide resolved
Signed-off-by: gengliqi <[email protected]>
@gengliqi
Copy link
Contributor Author

/run-all-tests

dbms/src/Interpreters/Join.cpp Outdated Show resolved Hide resolved
dbms/src/Interpreters/Join.cpp Outdated Show resolved Hide resolved
@gengliqi
Copy link
Contributor Author

/run-all-tests

Copy link
Contributor

@windtalker windtalker left a comment

Choose a reason for hiding this comment

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

LGTM

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Jan 29, 2023
@gengliqi
Copy link
Contributor Author

/run-all-tests

@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 29, 2023
@SeaRise
Copy link
Contributor

SeaRise commented Jan 29, 2023

Can you fix a build fail issue in this pr?
https://cd.pingcap.net/blue/organizations/jenkins/build-common/detail/build-common/182910/pipeline

void cut(Block & block, size_t rows, size_t limit, size_t pos)

void cut(Block & block, size_t rows, size_t limit, size_t pos) ==> void cut(Block & block, size_t rows [[maybe_unused]], size_t limit, size_t pos)
:)

@gengliqi
Copy link
Contributor Author

/merge

@ti-chi-bot
Copy link
Member

@gengliqi: 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: 7d59600

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

SeaRise commented Jan 30, 2023

/run-integration-test

@ti-chi-bot ti-chi-bot merged commit 0b1ffce into pingcap:master Jan 30, 2023
solotzg added a commit to solotzg/tiflash that referenced this pull request Feb 1, 2023
ywqzzy pushed a commit to ywqzzy/tiflash_1 that referenced this pull request Feb 13, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
release-note-none Denotes a PR that doesn't merit a release note. size/M Denotes a PR that changes 30-99 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
Development

Successfully merging this pull request may close these issues.

6 participants