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

fix bench_dbms build #8194

Merged
merged 8 commits into from
Oct 16, 2023
Merged

fix bench_dbms build #8194

merged 8 commits into from
Oct 16, 2023

Conversation

guo-shaoge
Copy link
Contributor

@guo-shaoge guo-shaoge commented Oct 13, 2023 •
edited
Loading

What problem does this PR solve?

Issue Number: close #7924

Problem Summary:

What is changed and how it works?

  1. remove bench_exchange bench_window: they are for fine grained shuffle benchmark. The code has changed too much. So delete them.
  2. merge bench_collation and bench_function_ilike.cpp into one file. Because they both include FunctionsStringSearch.cpp, will got multiple definition complation error.

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

@guo-shaoge
fix bench_dbms build
2548a7e 
Signed-off-by: guo-shaoge <shaoge1994@163.com>
@ti-chi-bot ti-chi-bot bot added do-not-merge/needs-linked-issue release-note-none Denotes a PR that doesn't merit a release note. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed do-not-merge/needs-linked-issue labels Oct 13, 2023
@guo-shaoge
Merge branch 'master' of github.com:pingcap/tiflash into fix_bench_db…
c3749a5 
…ms_ci

Signed-off-by: guo-shaoge <shaoge1994@163.com>
@ti-chi-bot ti-chi-bot bot added needs-1-more-lgtm Indicates a PR needs 1 more LGTM. approved labels Oct 15, 2023
@ti-chi-bot ti-chi-bot bot added the lgtm label Oct 16, 2023
@ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Oct 16, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Lloyd-Pottiger, SeaRise

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

The pull request process is described here

Needs approval from an approver in each of these files:
  • OWNERS [Lloyd-Pottiger,SeaRise]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@ti-chi-bot ti-chi-bot bot removed the needs-1-more-lgtm Indicates a PR needs 1 more LGTM. label Oct 16, 2023
@ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Oct 16, 2023

[LGTM Timeline notifier]

Timeline:

  • 2023-10-15 15:27:54.529609313 +0000 UTC m=+1584472.116719445: ☑️ agreed by SeaRise.
  • 2023-10-16 01:33:13.943206079 +0000 UTC m=+1620791.530316222: ☑️ agreed by Lloyd-Pottiger.

@guo-shaoge
Copy link
Contributor Author

/merge

@JaySon-Huang
Copy link
Contributor

/run-all-tests

@guo-shaoge
Copy link
Contributor Author

/run-unit-test
/run-integration-test

@guo-shaoge guo-shaoge mentioned this pull request Oct 16, 2023
Merged
@guo-shaoge
try fix ci
fc288a7 
Signed-off-by: guo-shaoge <shaoge1994@163.com>
@guo-shaoge
Copy link
Contributor Author

/run-unit-test
/run-integration-test

@guo-shaoge
Copy link
Contributor Author

/run-integration-test

1 similar comment
@guo-shaoge
Copy link
Contributor Author

/run-integration-test

@guo-shaoge
fix failpoint
173c712 
Signed-off-by: guo-shaoge <shaoge1994@163.com>
@guo-shaoge
Copy link
Contributor Author

/run-integration-test

@JaySon-Huang
Copy link
Contributor

/run-unit-test

@ti-chi-bot ti-chi-bot bot merged commit 903525a into pingcap:master Oct 16, 2023
6 checks passed
@JaySon-Huang JaySon-Huang deleted the fix_bench_dbms_ci branch November 3, 2023 03:39
@JaySon-Huang
Copy link
Contributor

/cherry-pick release-6.1

@ti-chi-bot
Copy link
Member

@JaySon-Huang: new pull request created to branch release-6.1: #8306.

In response to this:

/cherry-pick release-6.1

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 pushed a commit to ti-chi-bot/tiflash that referenced this pull request Nov 3, 2023
@guo-shaoge @ti-chi-bot
This is an automated cherry-pick of pingcap#8194
6324d0b 
Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@ti-chi-bot ti-chi-bot mentioned this pull request Nov 3, 2023
Closed
12 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

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

@SeaRise SeaRise SeaRise approved these changes

@xzhangxian1008 xzhangxian1008 Awaiting requested review from xzhangxian1008

Assignees
No one assigned
Labels
approved lgtm release-note-none Denotes a PR that doesn't merit a release note. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

bench_dbms compile failed
5 participants
@guo-shaoge @JaySon-Huang @ti-chi-bot @SeaRise @Lloyd-Pottiger