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

statistics: introduce bernoulli sampling method #28999

Merged
merged 19 commits into from
Oct 28, 2021
Merged

statistics: introduce bernoulli sampling method #28999

merged 19 commits into from
Oct 28, 2021

Conversation

winoros
Copy link
Member

@winoros winoros commented Oct 21, 2021

What problem does this PR solve?

Issue Number: #28960

Problem Summary:

Refactor the codes and introduce the Bernoulli sampling for analyze.

What is changed and how it works?

Add an interface RowSampleCollector. The reservoir and bernoulli will implement this interface. Also extract the common part of them to the struct baseCollector.

Check List

Tests

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

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 Oct 21, 2021 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • time-and-fate
  • xuyifangreeneyes

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/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Oct 21, 2021
@winoros winoros added the sig/planner SIG: Planner label Oct 25, 2021
@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 Oct 25, 2021
@ti-chi-bot ti-chi-bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 26, 2021
@ti-chi-bot ti-chi-bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 26, 2021
time-and-fate
time-and-fate reviewed Oct 26, 2021
View reviewed changes
statistics/row_sampler.go Outdated
}

// FromProto constructs the collector from the proto struct.
func (s *BernoulliRowSampleCollector) FromProto(pbCollector *tipb.RowSampleCollector) {
Copy link
Member

Choose a reason for hiding this comment

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

I think this method is the same as (s *ReservoirRowSampleCollector) FromProto, we can define it on *baseCollector.

statistics/row_sampler.go Outdated
}

// ToProto converts the collector to proto struct.
func (s *BernoulliRowSampleCollector) ToProto() *tipb.RowSampleCollector {
Copy link
Member

Choose a reason for hiding this comment

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

ditto.

@time-and-fate
Copy link
Member

/run-check_dev_2

@ti-chi-bot ti-chi-bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 27, 2021
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Oct 27, 2021
xuyifangreeneyes
xuyifangreeneyes reviewed Oct 27, 2021
View reviewed changes
planner/core/physical_plan_test.go Outdated
@@ -17,6 +17,9 @@ package core_test
import (
"context"
"fmt"
"math"

"github.com/pingcap/tidb/parser/ast"
Copy link
Contributor

Choose a reason for hiding this comment

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

the order of import need to be adjusted

xuyifangreeneyes
xuyifangreeneyes reviewed Oct 27, 2021
View reviewed changes
executor/analyze.go Outdated
@@ -842,9 +842,9 @@ func (e *AnalyzeColumnsExec) buildSamplingStats(
}()

l := len(e.analyzePB.ColReq.ColumnsInfo) + len(e.analyzePB.ColReq.ColumnGroups)
rootRowCollector := statistics.NewReservoirRowSampleCollector(int(e.analyzePB.ColReq.SampleSize), l)
rootRowCollector := statistics.NewRowSampleCollector(int(e.analyzePB.ColReq.SampleSize), *e.analyzePB.ColReq.SampleRate, l)
Copy link
Contributor

Choose a reason for hiding this comment

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

maybe use GetSampleRate() to keep consistent with others?

@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 Oct 27, 2021
@winoros
Copy link
Member Author

winoros commented Oct 27, 2021

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: b072288

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Oct 27, 2021
@ti-chi-bot ti-chi-bot removed the status/can-merge Indicates a PR has been approved by a committer. label Oct 27, 2021
@winoros
Copy link
Member Author

winoros commented Oct 27, 2021

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: e0c4fcb

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Oct 27, 2021
@winoros winoros mentioned this pull request Oct 28, 2021
Closed
5 tasks
@winoros
Copy link
Member Author

winoros commented Oct 28, 2021

/run-check_dev_2

3 similar comments
@winoros
Copy link
Member Author

winoros commented Oct 28, 2021

/run-check_dev_2

@winoros
Copy link
Member Author

winoros commented Oct 28, 2021

/run-check_dev_2

@winoros
Copy link
Member Author

winoros commented Oct 28, 2021

/run-check_dev_2

@winoros
Copy link
Member Author

winoros commented Oct 28, 2021

/run-check_dev_2

@ti-chi-bot
Copy link
Member

@winoros: Your PR was out of date, I have automatically updated it for you.

At the same time I will also trigger all tests for you:

/run-all-tests

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.

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 ti-chi-bot merged commit 2ba75e4 into pingcap:master Oct 28, 2021
@winoros winoros deleted the refactor-and-bernoulli branch October 28, 2021 05:49
@longfangsong longfangsong mentioned this pull request Oct 28, 2021
Closed
@jingshanglu jingshanglu mentioned this pull request Oct 29, 2021
Closed
@bufferflies bufferflies mentioned this pull request Nov 4, 2021
Closed
@winoros winoros mentioned this pull request Nov 23, 2021
Closed
@chrysan chrysan mentioned this pull request Feb 21, 2022
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@xuyifangreeneyes xuyifangreeneyes xuyifangreeneyes approved these changes

@time-and-fate time-and-fate time-and-fate approved these changes

@qw4990 qw4990 qw4990 approved these changes

Assignees
No one assigned
Labels
release-note-none Denotes a PR that doesn't merit a release note. sig/planner SIG: Planner 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.
5 participants
@winoros @ti-chi-bot @time-and-fate @qw4990 @xuyifangreeneyes