cleanup benchmark #4233

guo-shaoge · 2022-03-11T12:46:39Z

Signed-off-by: guo-shaoge [email protected]

What problem does this PR solve?

Issue Number: close #4232

Problem Summary:

bench_function_least.cpp use some duplicated code(executeFunction), I didn't notice that in expression: support least/greatest for int/real. #3801.
Also there are two main functions for benchmark, one is in bench_function_cast.cpp another one is in bench_function_least.cpp, which cause compilation error:

CMakeFiles/bench_dbms.dir/src/Functions/tests/bench_function_least.cpp.o: In function `main':
bench_function_least.cpp:(.text.startup+0x0): multiple definition of `main'
CMakeFiles/bench_dbms.dir/src/Functions/tests/bench_function_cast.cpp.o:bench_function_cast.cpp:(.text.startup+0x0): first defined here
collect2: error: ld returned 1 exit status

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

Release note

None

Signed-off-by: guo-shaoge <[email protected]>

ti-chi-bot · 2022-03-11T12:46:40Z

[REVIEW NOTIFICATION]

This pull request has been approved by:

JaySon-Huang
fuzhe1989

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.

Signed-off-by: guo-shaoge <[email protected]>

guo-shaoge · 2022-03-11T12:48:23Z

dbms/src/Storages/Page/V3/PageDirectoryFactory.cpp

@@ -23,6 +23,7 @@ PageDirectoryPtr PageDirectoryFactory::create(FileProviderPtr & file_provider, P
 PageDirectoryPtr PageDirectoryFactory::createFromEdit(FileProviderPtr & file_provider, PSDiskDelegatorPtr & delegator, const PageEntriesEdit & edit)
 {
    auto [wal, reader] = WALStore::create(file_provider, delegator);
+    (void)reader;


To fix compilation error.

guo-shaoge · 2022-03-11T12:48:29Z

dbms/src/Storages/Page/V3/tests/gtest_wal_store.cpp

@@ -223,6 +223,7 @@ TEST_F(WALStoreTest, Empty)
    while (reader->remained())
    {
        auto [ok, edit] = reader->next();
+        (void)edit;


To fix compilation error.

Signed-off-by: guo-shaoge <[email protected]>

JaySon-Huang · 2022-03-12T04:59:15Z

/merge

ti-chi-bot · 2022-03-12T04:59:16Z

@JaySon-Huang: 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 · 2022-03-12T04:59:22Z

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

Commit hash: 59d234e

JaySon-Huang · 2022-03-12T06:08:37Z

/run-unit-test

guo-shaoge · 2022-03-12T12:10:40Z

/run-ntegration-test
/run-unit-test

guo-shaoge · 2022-03-12T14:21:13Z

/rebuild

guo-shaoge · 2022-03-13T05:11:41Z

/rebuild

SchrodingerZhu · 2022-03-14T00:40:05Z

/rebuild
/run-all-tests

SchrodingerZhu · 2022-03-14T00:40:54Z

/run-all-tests

…ler_error

guo-shaoge · 2022-03-14T03:23:32Z

/hold

Still have compilation error. Trying to fix it.

guo-shaoge · 2022-03-15T02:14:49Z

/run-all-tests

JaySon-Huang · 2022-03-15T03:22:06Z

dbms/src/TestUtils/CMakeLists.txt

+target_link_libraries(test_util_bench_main dbms gtest_main)
+target_include_directories(test_util_bench_main BEFORE PUBLIC ${benchmark_SOURCE_DIR}/include)


Suggested change

target_link_libraries(test_util_bench_main dbms gtest_main)

target_include_directories(test_util_bench_main BEFORE PUBLIC ${benchmark_SOURCE_DIR}/include)

target_link_libraries(test_util_bench_main dbms benchmark)

You can try this

Signed-off-by: guo-shaoge <[email protected]>

… into fix_bench_compiler_error

guo-shaoge · 2022-03-15T03:44:48Z

/run-unit-test

Signed-off-by: guo-shaoge <[email protected]>

guo-shaoge · 2022-03-16T08:38:44Z

/run-unit-test

guo-shaoge · 2022-03-16T08:47:39Z

/run-integration-test

sre-bot · 2022-03-16T08:58:50Z

Coverage for changed files

Filename                                       Regions    Missed Regions     Cover   Functions  Missed Functions  Executed       Lines      Missed Lines     Cover    Branches   Missed Branches     Cover
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
Common/TiFlashMetrics.h                             18                 0   100.00%          11                 0   100.00%          47                 1    97.87%           8                 0   100.00%
Flash/Coprocessor/DAGUtils.cpp                     290               233    19.66%          36                24    33.33%         505               404    20.00%         324               230    29.01%
Flash/EstablishCall.h                                2                 2     0.00%           2                 2     0.00%           2                 2     0.00%           0                 0         -
Flash/Mpp/MPPTunnel.cpp                            185               185     0.00%          16                16     0.00%         241               241     0.00%          94                94     0.00%
Flash/Mpp/MPPTunnel.h                                9                 9     0.00%           9                 9     0.00%          18                18     0.00%           0                 0         -
Functions/FunctionsDateTime.cpp                     27                19    29.63%           4                 2    50.00%          99                25    74.75%          16                13    18.75%
Functions/FunctionsDateTime.h                     1073               638    40.54%         322               209    35.09%        2018              1226    39.25%         534               340    36.33%
Functions/tests/gtest_dayofweekyear.cpp            258                74    71.32%           2                 0   100.00%         135                 0   100.00%          80                42    47.50%
Storages/Page/V3/WAL/WALReader.cpp                  72                10    86.11%           9                 0   100.00%         176                15    91.48%          54                14    74.07%
Storages/Page/V3/WALStore.cpp                       74                39    47.30%           8                 1    87.50%         134                42    68.66%          36                19    47.22%
Storages/Page/V3/WALStore.h                          1                 0   100.00%           1                 0   100.00%           3                 0   100.00%           0                 0         -
Storages/Page/V3/tests/gtest_wal_store.cpp        1948               260    86.65%          12                 0   100.00%         465                13    97.20%         646               314    51.39%
Storages/tests/TiFlashStorageTestBasic.h            27                 5    81.48%           6                 0   100.00%          51                12    76.47%          18                 9    50.00%
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
TOTAL                                             3984              1474    63.00%         438               263    39.95%        3894              1999    48.66%        1810              1075    40.61%

Coverage summary

Functions  MissedFunctions  Executed  Lines   MissedLines  Cover
16931      9506             43.85%    190876  96500        49.44%

full coverage report (for internal network access only)

guo-shaoge · 2022-03-16T12:21:00Z

/merge

ti-chi-bot · 2022-03-16T12:21:01Z

@guo-shaoge: 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 · 2022-03-16T12:21:08Z

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

Commit hash: 56acd2a

sre-bot · 2022-03-16T12:38:41Z

Coverage for changed files

Filename                                                Regions    Missed Regions     Cover   Functions  Missed Functions  Executed       Lines      Missed Lines     Cover    Branches   Missed Branches     Cover
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
Common/TiFlashMetrics.h                                      18                 0   100.00%          11                 0   100.00%          47                 1    97.87%           8                 0   100.00%
DataStreams/HashJoinProbeBlockInputStream.cpp                15                15     0.00%           4                 4     0.00%          28                28     0.00%          10                10     0.00%
DataStreams/HashJoinProbeBlockInputStream.h                   1                 1     0.00%           1                 1     0.00%           1                 1     0.00%           0                 0         -
DataStreams/ParallelAggregatingBlockInputStream.cpp          93                93     0.00%          12                12     0.00%         150               150     0.00%          64                64     0.00%
DataStreams/ParallelAggregatingBlockInputStream.h             6                 6     0.00%           6                 6     0.00%          14                14     0.00%           0                 0         -
Flash/Coprocessor/DAGQueryBlockInterpreter.cpp              390               390     0.00%          45                45     0.00%         875               875     0.00%         312               312     0.00%
Flash/Coprocessor/DAGUtils.cpp                              290               233    19.66%          36                24    33.33%         505               404    20.00%         324               230    29.01%
Flash/EstablishCall.h                                         2                 2     0.00%           2                 2     0.00%           2                 2     0.00%           0                 0         -
Flash/Mpp/MPPTunnel.cpp                                     185               185     0.00%          16                16     0.00%         241               241     0.00%          94                94     0.00%
Flash/Mpp/MPPTunnel.h                                         9                 9     0.00%           9                 9     0.00%          18                18     0.00%           0                 0         -
Functions/FunctionsDateTime.cpp                              27                19    29.63%           4                 2    50.00%          99                25    74.75%          16                13    18.75%
Functions/FunctionsDateTime.h                              1073               638    40.54%         322               209    35.09%        2018              1226    39.25%         534               340    36.33%
Functions/tests/gtest_dayofweekyear.cpp                     258                74    71.32%           2                 0   100.00%         135                 0   100.00%          80                42    47.50%
Storages/Page/V3/WAL/WALReader.cpp                           72                10    86.11%           9                 0   100.00%         176                15    91.48%          54                14    74.07%
Storages/Page/V3/WALStore.cpp                                74                39    47.30%           8                 1    87.50%         134                42    68.66%          36                19    47.22%
Storages/Page/V3/WALStore.h                                   1                 0   100.00%           1                 0   100.00%           3                 0   100.00%           0                 0         -
Storages/Page/V3/tests/gtest_wal_store.cpp                 1948               260    86.65%          12                 0   100.00%         465                13    97.20%         646               314    51.39%
Storages/tests/TiFlashStorageTestBasic.h                     27                 5    81.48%           6                 0   100.00%          51                12    76.47%          18                 9    50.00%
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
TOTAL                                                      4489              1979    55.91%         506               331    34.58%        4962              3067    38.19%        2196              1461    33.47%

Coverage summary

Functions  MissedFunctions  Executed  Lines   MissedLines  Cover
16936      9510             43.85%    190908  96529        49.44%

full coverage report (for internal network access only)

sre-bot · 2022-03-16T18:30:01Z

Coverage for changed files

too many lines from llvm-cov, please refer to full report instead

Coverage summary

Functions  MissedFunctions  Executed  Lines   MissedLines  Cover
16936      9510             43.85%    190910  96538        49.43%

full coverage report (for internal network access only)

sre-bot · 2022-03-16T19:09:38Z

Coverage for changed files

too many lines from llvm-cov, please refer to full report instead

Coverage summary

Functions  MissedFunctions  Executed  Lines   MissedLines  Cover
16967      9541             43.77%    191174  96794        49.37%

full coverage report (for internal network access only)

sre-bot · 2022-03-16T19:51:26Z

Coverage for changed files

too many lines from llvm-cov, please refer to full report instead

Coverage summary

Functions  MissedFunctions  Executed  Lines   MissedLines  Cover
16967      9541             43.77%    191116  96788        49.36%

full coverage report (for internal network access only)

close pingcap#4232

fix benchmark compiler error

67df9e6

Signed-off-by: guo-shaoge <[email protected]>

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 Mar 11, 2022

fix

01f33c0

Signed-off-by: guo-shaoge <[email protected]>

guo-shaoge commented Mar 11, 2022

View reviewed changes

guo-shaoge requested a review from fuzhe1989 March 11, 2022 12:49

fix fmt

59d234e

Signed-off-by: guo-shaoge <[email protected]>

fuzhe1989 approved these changes Mar 11, 2022

View reviewed changes

ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Mar 11, 2022

fuzhe1989 requested a review from XuHuaiyu March 11, 2022 15:10

JaySon-Huang approved these changes Mar 12, 2022

View reviewed changes

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 Mar 12, 2022

ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Mar 12, 2022

Merge branch 'master' into fix_bench_compiler_error

cc3a4d9

Merge branch 'master' into fix_bench_compiler_error

40f70a6

guo-shaoge and others added 2 commits March 14, 2022 11:16

Merge branch 'master' of github.com:pingcap/tics into fix_bench_compi…

a660370

…ler_error

Merge branch 'master' into fix_bench_compiler_error

cbb7bc0

Merge branch 'master' into fix_bench_compiler_error

a3f9a7b

Merge branch 'master' into fix_bench_compiler_error

28672f6

JaySon-Huang reviewed Mar 15, 2022

View reviewed changes

guo-shaoge added 2 commits March 15, 2022 11:37

try to fix ci build

fe4f307

Signed-off-by: guo-shaoge <[email protected]>

Merge branch 'fix_bench_compiler_error' of github.com:guo-shaoge/tics…

688ac13

… into fix_bench_compiler_error

ti-chi-bot removed the status/can-merge Indicates a PR has been approved by a committer. label Mar 15, 2022

guo-shaoge added 2 commits March 16, 2022 16:37

try to fix ci build

96a73b5

Signed-off-by: guo-shaoge <[email protected]>

Merge branch 'master' into fix_bench_compiler_error

a012671

Merge branch 'master' into fix_bench_compiler_error

56acd2a

ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Mar 16, 2022

ti-chi-bot added 3 commits March 16, 2022 20:48

Merge branch 'master' into fix_bench_compiler_error

c4c3337

Merge branch 'master' into fix_bench_compiler_error

d503950

Merge branch 'master' into fix_bench_compiler_error

7230ec4

Merge branch 'master' into fix_bench_compiler_error

01fb089

Merge branch 'master' into fix_bench_compiler_error

ba158ac

ti-chi-bot merged commit 0f6f7e2 into pingcap:master Mar 16, 2022

JaySon-Huang deleted the fix_bench_compiler_error branch March 17, 2022 00:32

JaySon-Huang pushed a commit to JaySon-Huang/tiflash that referenced this pull request Mar 17, 2022

cleanup benchmark (pingcap#4233)

18a06e9

close pingcap#4232

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

cleanup benchmark #4233

cleanup benchmark #4233

guo-shaoge commented Mar 11, 2022 •

edited

Loading

ti-chi-bot commented Mar 11, 2022 •

edited

Loading

guo-shaoge Mar 11, 2022

guo-shaoge Mar 11, 2022

JaySon-Huang commented Mar 12, 2022

ti-chi-bot commented Mar 12, 2022

ti-chi-bot commented Mar 12, 2022

JaySon-Huang commented Mar 12, 2022

guo-shaoge commented Mar 12, 2022

guo-shaoge commented Mar 12, 2022

guo-shaoge commented Mar 13, 2022

SchrodingerZhu commented Mar 14, 2022

SchrodingerZhu commented Mar 14, 2022

guo-shaoge commented Mar 14, 2022

guo-shaoge commented Mar 15, 2022

JaySon-Huang Mar 15, 2022 •

edited

Loading

guo-shaoge commented Mar 15, 2022

guo-shaoge commented Mar 16, 2022

guo-shaoge commented Mar 16, 2022

sre-bot commented Mar 16, 2022

guo-shaoge commented Mar 16, 2022

ti-chi-bot commented Mar 16, 2022

ti-chi-bot commented Mar 16, 2022

sre-bot commented Mar 16, 2022

sre-bot commented Mar 16, 2022

sre-bot commented Mar 16, 2022

sre-bot commented Mar 16, 2022

		target_link_libraries(test_util_bench_main dbms gtest_main)
		target_include_directories(test_util_bench_main BEFORE PUBLIC ${benchmark_SOURCE_DIR}/include)

cleanup benchmark #4233

cleanup benchmark #4233

Conversation

guo-shaoge commented Mar 11, 2022 • edited Loading

What problem does this PR solve?

What is changed and how it works?

Check List

Release note

ti-chi-bot commented Mar 11, 2022 • edited Loading

guo-shaoge Mar 11, 2022

Choose a reason for hiding this comment

guo-shaoge Mar 11, 2022

Choose a reason for hiding this comment

JaySon-Huang commented Mar 12, 2022

ti-chi-bot commented Mar 12, 2022

ti-chi-bot commented Mar 12, 2022

JaySon-Huang commented Mar 12, 2022

guo-shaoge commented Mar 12, 2022

guo-shaoge commented Mar 12, 2022

guo-shaoge commented Mar 13, 2022

SchrodingerZhu commented Mar 14, 2022

SchrodingerZhu commented Mar 14, 2022

guo-shaoge commented Mar 14, 2022

guo-shaoge commented Mar 15, 2022

JaySon-Huang Mar 15, 2022 • edited Loading

Choose a reason for hiding this comment

guo-shaoge commented Mar 15, 2022

guo-shaoge commented Mar 16, 2022

guo-shaoge commented Mar 16, 2022

sre-bot commented Mar 16, 2022

Coverage for changed files

Coverage summary

guo-shaoge commented Mar 16, 2022

ti-chi-bot commented Mar 16, 2022

ti-chi-bot commented Mar 16, 2022

sre-bot commented Mar 16, 2022

Coverage for changed files

Coverage summary

sre-bot commented Mar 16, 2022

Coverage for changed files

Coverage summary

sre-bot commented Mar 16, 2022

Coverage for changed files

Coverage summary

sre-bot commented Mar 16, 2022

Coverage for changed files

Coverage summary

guo-shaoge commented Mar 11, 2022 •

edited

Loading

ti-chi-bot commented Mar 11, 2022 •

edited

Loading

JaySon-Huang Mar 15, 2022 •

edited

Loading