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

Add gtest for Limit, TopN, Projection (#5187) #5188

Merged
merged 15 commits into from
Jun 28, 2022
Merged

Add gtest for Limit, TopN, Projection (#5187) #5188

merged 15 commits into from
Jun 28, 2022

Conversation

xzhangxian1008
Copy link
Contributor

What problem does this PR solve?

Issue Number: close #5187

Problem Summary:

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

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Jun 22, 2022

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • SeaRise
  • ywqzzy

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 Jun 22, 2022
@xzhangxian1008
Copy link
Contributor Author

/cc @ywqzzy /cc @SeaRise

@ti-chi-bot ti-chi-bot requested a review from ywqzzy June 22, 2022 06:06
@ti-chi-bot
Copy link
Member

@xzhangxian1008: GitHub didn't allow me to request PR reviews from the following users: /cc.

Note that only pingcap members and repo collaborators can review this PR, and authors cannot review their own PRs.

In response to this:

/cc @ywqzzy /cc @SeaRise

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 kubernetes/test-infra repository.

@ti-chi-bot ti-chi-bot requested a review from SeaRise June 22, 2022 06:06
Copy link
Contributor

@ywqzzy ywqzzy left a comment

Choose a reason for hiding this comment

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

Maybe it's better to add new files like gtest_limit_executor.cpp, gtest_projection_executor.cpp and gtest_topn_executor.cpp.

dbms/src/Flash/tests/gtest_executor.cpp Outdated Show resolved Hide resolved
dbms/src/Flash/tests/gtest_executor.cpp Outdated Show resolved Hide resolved
dbms/src/Flash/tests/gtest_executor.cpp Outdated Show resolved Hide resolved
dbms/src/Flash/tests/gtest_executor.cpp Outdated Show resolved Hide resolved
@xzhangxian1008
Copy link
Contributor Author

/rebuild

@xzhangxian1008
Copy link
Contributor Author

/run-all-tests

@xzhangxian1008
Copy link
Contributor Author

/run-all-tests

@sre-bot
Copy link
Collaborator

sre-bot commented Jun 23, 2022

Coverage for changed files

Filename                                      Regions    Missed Regions     Cover   Functions  Missed Functions  Executed       Lines      Missed Lines     Cover    Branches   Missed Branches     Cover
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
Flash/tests/gtest_executor.cpp                    101                76    24.75%           5                 0   100.00%         182                 0   100.00%          16                16     0.00%
Flash/tests/gtest_limit_executor.cpp               33                19    42.42%           3                 0   100.00%          27                 0   100.00%          10                 4    60.00%
Flash/tests/gtest_projection_executor.cpp          24                19    20.83%           3                 0   100.00%          30                 0   100.00%           4                 4     0.00%
Flash/tests/gtest_topn_executor.cpp                38                20    47.37%           3                 0   100.00%          34                 2    94.12%          14                 5    64.29%
TestUtils/FunctionTestUtils.cpp                   145                29    80.00%          14                 0   100.00%         157                19    87.90%          62                21    66.13%
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
TOTAL                                             341               163    52.20%          28                 0   100.00%         430                21    95.12%         106                50    52.83%

Coverage summary

Functions  MissedFunctions  Executed  Lines   MissedLines  Cover
18392      9657             47.49%    206781  96661        53.25%

full coverage report (for internal network access only)

@xzhangxian1008
Copy link
Contributor Author

/build

@ywqzzy ywqzzy requested review from ywqzzy and SeaRise June 23, 2022 02:36
dbms/src/Flash/tests/gtest_limit_executor.cpp Show resolved Hide resolved
dbms/src/Flash/tests/gtest_projection_executor.cpp Outdated Show resolved Hide resolved
dbms/src/Flash/tests/gtest_projection_executor.cpp Outdated Show resolved Hide resolved
dbms/src/Flash/tests/gtest_topn_executor.cpp Outdated Show resolved Hide resolved
dbms/src/Flash/tests/gtest_topn_executor.cpp Outdated Show resolved Hide resolved
dbms/src/Flash/tests/gtest_topn_executor.cpp Outdated Show resolved Hide resolved
Comment on lines 113 to 114
ASSERT_TRUE(expected_columns == columns)
<< fmt::format("Expected: {}, Actual: {}", expected_columns, columns);
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
ASSERT_TRUE(expected_columns == columns)
<< fmt::format("Expected: {}, Actual: {}", expected_columns, columns);
ASSERT_EQ(expected_columns, columns);

Use ASSERT_EQ and it will show the actual number when they don't match. And we don't need to manually write the message to show the value.

Copy link
Contributor

@Willendless Willendless Jun 24, 2022

Choose a reason for hiding this comment

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

Maybe we can use something like

::testing::AssertionResult blockEqual(
    const Block & expected,
    const Block & actual)
{
    size_t columns = actual.columns();

    ASSERT_EQUAL(expected.columns(), columns, "Block size mismatch");

    for (size_t i = 0; i < columns; ++i)
    {
        const auto & expected_col = expected.getByPosition(i);
        const auto & actual_col = actual.getByPosition(i);
        auto ret = columnEqual(expected_col, actual_col);
        if (!ret)
            return ret;
    }

    return ::testing::AssertionSuccess();
}

Copy link
Contributor

Choose a reason for hiding this comment

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

Maybe we can use something like

::testing::AssertionResult blockEqual(
    const Block & expected,
    const Block & actual)
{
    size_t columns = actual.columns();

    ASSERT_EQUAL(expected.columns(), columns, "Block size mismatch");

    for (size_t i = 0; i < columns; ++i)
    {
        const auto & expected_col = expected.getByPosition(i);
        const auto & actual_col = actual.getByPosition(i);
        auto ret = columnEqual(expected_col, actual_col);
        if (!ret)
            return ret;
    }

    return ::testing::AssertionSuccess();
}

it seems to same as

void blockEqual(
const Block & expected,
const Block & actual)
{
size_t columns = actual.columns();
ASSERT_TRUE(expected.columns() == columns);
for (size_t i = 0; i < columns; ++i)
{
const auto & expected_col = expected.getByPosition(i);
const auto & actual_col = actual.getByPosition(i);
ASSERT_TRUE(actual_col.type->getName() == expected_col.type->getName());
ASSERT_COLUMN_EQ(expected_col.column, actual_col.column);
}
}

Copy link
Contributor

@Willendless Willendless Jun 25, 2022

Choose a reason for hiding this comment

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

Oh yeah, it is just a little refactoring. The advantage might lie in we can have better output error message when column size is not expected.

@xzhangxian1008
Copy link
Contributor Author

/run-all-tests

@sre-bot
Copy link
Collaborator

sre-bot commented Jun 27, 2022

Coverage for changed files

Filename                                      Regions    Missed Regions     Cover   Functions  Missed Functions  Executed       Lines      Missed Lines     Cover    Branches   Missed Branches     Cover
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
Debug/astToExecutor.cpp                           576               215    62.67%          53                 9    83.02%        1516               553    63.52%         568               254    55.28%
Flash/tests/gtest_executor.cpp                    101                76    24.75%           5                 0   100.00%         182                 0   100.00%          16                16     0.00%
Flash/tests/gtest_limit_executor.cpp               35                19    45.71%           3                 0   100.00%          29                 0   100.00%          12                 4    66.67%
Flash/tests/gtest_projection_executor.cpp          68                38    44.12%           5                 0   100.00%         107                 0   100.00%          12                 8    33.33%
Flash/tests/gtest_topn_executor.cpp                71                39    45.07%           5                 0   100.00%         138                 2    98.55%          20                 9    55.00%
TestUtils/FunctionTestUtils.cpp                   144                23    84.03%          14                 0   100.00%         156                19    87.82%          62                21    66.13%
TestUtils/mockExecutor.cpp                         80                15    81.25%          50                12    76.00%         310                63    79.68%          36                 3    91.67%
TestUtils/mockExecutor.h                            6                 1    83.33%           6                 1    83.33%          15                 3    80.00%           0                 0         -
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
TOTAL                                            1081               426    60.59%         141                22    84.40%        2453               640    73.91%         726               315    56.61%

Coverage summary

Functions  MissedFunctions  Executed  Lines   MissedLines  Cover
18401      9634             47.64%    207012  96453        53.41%

full coverage report (for internal network access only)

dbms/src/Flash/tests/gtest_limit_executor.cpp Outdated Show resolved Hide resolved
dbms/src/Flash/tests/gtest_topn_executor.cpp Outdated Show resolved Hide resolved
dbms/src/Flash/tests/gtest_topn_executor.cpp Outdated Show resolved Hide resolved
dbms/src/Flash/tests/gtest_topn_executor.cpp Outdated Show resolved Hide resolved
try
{
std::shared_ptr<tipb::DAGRequest> request;
std::vector<ColumnsWithTypeAndName> expect_cols;
Copy link
Contributor

Choose a reason for hiding this comment

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

Maybe not a vector?

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 not a vector?

Considering for the future tests, I think we may need vector in the future to contain more expected cols.

@ywqzzy ywqzzy self-requested a review June 28, 2022 02:16
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Jun 28, 2022
Copy link
Contributor

@ywqzzy ywqzzy 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 status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Jun 28, 2022
@xzhangxian1008
Copy link
Contributor Author

/run-all-tests

@sre-bot
Copy link
Collaborator

sre-bot commented Jun 28, 2022

Coverage for changed files

Filename                                      Regions    Missed Regions     Cover   Functions  Missed Functions  Executed       Lines      Missed Lines     Cover    Branches   Missed Branches     Cover
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
Debug/astToExecutor.cpp                           576               215    62.67%          53                 9    83.02%        1516               553    63.52%         568               254    55.28%
Flash/tests/gtest_executor.cpp                    101                76    24.75%           5                 0   100.00%         182                 0   100.00%          16                16     0.00%
Flash/tests/gtest_limit_executor.cpp               35                19    45.71%           3                 0   100.00%          29                 0   100.00%          12                 4    66.67%
Flash/tests/gtest_projection_executor.cpp          80                38    52.50%           5                 0   100.00%         114                 0   100.00%          12                 8    33.33%
Flash/tests/gtest_topn_executor.cpp                74                39    47.30%           5                 0   100.00%         132                 2    98.48%          22                 9    59.09%
TestUtils/FunctionTestUtils.cpp                   144                23    84.03%          14                 0   100.00%         156                19    87.82%          62                21    66.13%
TestUtils/mockExecutor.cpp                         80                15    81.25%          50                12    76.00%         310                63    79.68%          36                 3    91.67%
TestUtils/mockExecutor.h                            6                 1    83.33%           6                 1    83.33%          15                 3    80.00%           0                 0         -
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
TOTAL                                            1096               426    61.13%         141                22    84.40%        2454               640    73.92%         728               315    56.73%

Coverage summary

Functions  MissedFunctions  Executed  Lines   MissedLines  Cover
18401      9634             47.64%    207013  96390        53.44%

full coverage report (for internal network access only)

@xzhangxian1008
Copy link
Contributor Author

/merge

@ti-chi-bot
Copy link
Member

@xzhangxian1008: 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

@xzhangxian1008: /merge is only allowed for the committers, you can assign this pull request to the committer in list by filling /assign @committer in the comment to help merge this pull request.

In response to this:

/merge

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.

@xzhangxian1008
Copy link
Contributor Author

/assign @ywqzzy

@SeaRise
Copy link
Contributor

SeaRise commented Jun 28, 2022

/merge

@ti-chi-bot
Copy link
Member

@SeaRise: 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: ef6d9fe

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Jun 28, 2022
@sre-bot
Copy link
Collaborator

sre-bot commented Jun 28, 2022

Coverage for changed files

Filename                                      Regions    Missed Regions     Cover   Functions  Missed Functions  Executed       Lines      Missed Lines     Cover    Branches   Missed Branches     Cover
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
Debug/astToExecutor.cpp                           576               215    62.67%          53                 9    83.02%        1516               553    63.52%         568               254    55.28%
Flash/tests/gtest_executor.cpp                    101                76    24.75%           5                 0   100.00%         182                 0   100.00%          16                16     0.00%
Flash/tests/gtest_limit_executor.cpp               35                19    45.71%           3                 0   100.00%          29                 0   100.00%          12                 4    66.67%
Flash/tests/gtest_projection_executor.cpp          80                38    52.50%           5                 0   100.00%         114                 0   100.00%          12                 8    33.33%
Flash/tests/gtest_topn_executor.cpp                74                39    47.30%           5                 0   100.00%         132                 2    98.48%          22                 9    59.09%
TestUtils/FunctionTestUtils.cpp                   144                23    84.03%          14                 0   100.00%         156                19    87.82%          62                21    66.13%
TestUtils/mockExecutor.cpp                         80                15    81.25%          50                12    76.00%         310                63    79.68%          36                 3    91.67%
TestUtils/mockExecutor.h                            6                 1    83.33%           6                 1    83.33%          15                 3    80.00%           0                 0         -
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
TOTAL                                            1096               426    61.13%         141                22    84.40%        2454               640    73.92%         728               315    56.73%

Coverage summary

Functions  MissedFunctions  Executed  Lines   MissedLines  Cover
18401      9634             47.64%    207013  96361        53.45%

full coverage report (for internal network access only)

@ti-chi-bot ti-chi-bot merged commit f84d7e3 into pingcap:master Jun 28, 2022
Lloyd-Pottiger pushed a commit to Lloyd-Pottiger/tiflash that referenced this pull request Jul 12, 2022
…s in README (pingcap#5182)

close pingcap#5172, ref pingcap#5178

Enhancement: add a integrated test on DDL module (pingcap#5130)

ref pingcap#5129

Revert "Revise default background threads size" (pingcap#5176)

close pingcap#5177

chore: remove extra dyn cast (pingcap#5186)

close pingcap#5185

Add MPPReceiverSet, which includes ExchangeReceiver and CoprocessorReader (pingcap#5175)

ref pingcap#5095

DDL: Use Column Name Instead of Offset to Find the common handle cluster index (pingcap#5166)

close pingcap#5154

Add random failpoint in critical paths (pingcap#4876)

close pingcap#4807

Segment test framework (pingcap#5150)

close pingcap#5151

optimize ps v3 restore (pingcap#5163)

ref pingcap#4914

Fix build failed (pingcap#5196)

close pingcap#5195

feat: delta tree dispatching (pingcap#5199)

close pingcap#5200

feat: introduce specialized API to write fixed length data rapidly (pingcap#5181)

close pingcap#5183

Add gtest for Limit, TopN, Projection (pingcap#5187) (pingcap#5188)

close pingcap#5187

add `MPPTask::handleError()` (pingcap#5202)

ref pingcap#5095

Check result of starting grpc server (pingcap#5257)

close pingcap#5255

feat: add optimized routines for aarch64 (pingcap#5231)

close pingcap#5240

fix: aarch64-quick-fix (pingcap#5259)

close pingcap#5260

Update client-c to support ipv6 (pingcap#5270)

close pingcap#5247

upgrade prometheus-cpp to v1.0.1 (pingcap#5279)

ref pingcap#2103, close pingcap#5278

Fix README type error (pingcap#5273)

ref pingcap#5178

fix(cmake): make sure libc++ is utilized by tiflash-proxy (pingcap#5281)

close pingcap#5282

fix the wrong order of execution summary for list based executors (pingcap#5242)

close pingcap#5241

Schema: allow loading empty schema diff when the version grows up. (pingcap#5245)

close pingcap#5244

Optimize apply speed under heavy write pressure (pingcap#4883)

ref pingcap#4728

update proxy to raftstore-proxy-6.2 (pingcap#5287)

ref pingcap#4982

Flush segment cache when doing the compaction (pingcap#5284)

close pingcap#5179

metrics: Fix incorrect metrics for delta_merge tasks (pingcap#5061)

close pingcap#5055

dep: upgrade jemalloc (pingcap#5197)

close pingcap#5258

*: TiFlash pagectl/dttool use only-decryption mode (pingcap#5271)

close pingcap#5122

suppresion false positive report from tsan (pingcap#5303)

close pingcap#5088

Refine test framework code and tests (pingcap#5261)

close pingcap#5262

feat: add logical cpu cores and memory into grafana (pingcap#5124)

close pingcap#3821

Implement TimeToSec function push down (pingcap#5235)

close pingcap#5116

feat: implement shiftRight function push down (pingcap#5156)

close pingcap#5100

schema : make update to partition tables when 'set tiflash replica' (pingcap#5267)

close pingcap#5266

Replace initializer_list with vector for planner test framework (pingcap#5307)

close pingcap#5295

KVStore: decouple flush region and CompactLog with a new FFI fn_try_flush_data (pingcap#5283)

ref pingcap#5170

refine error message in mpptask (pingcap#5304)

ref pingcap#5095

Implement ReverseUTF8/Reverse function push down (pingcap#5233)

close pingcap#5111

Optimize comparision for collation `UTF8_BIN` and `UTF8MB4_BIN` (pingcap#5299)

ref pingcap#5294

feat : support set tiflash mode ddl action (pingcap#5256)

ref pingcap#5252

Add non-blocking functions for MPMCQueue (pingcap#5311)

close pingcap#5310

add random segment test for CI weekly (pingcap#5300)

close pingcap#5301

*: tidy FunctionString.cpp (pingcap#5312)

close pingcap#5313

ci: fix check-license github action (pingcap#5318)

close pingcap#5317

update proxy to raftstore-proxy-6.2 (pingcap#5316)

ref pingcap#4982

Change one `additional_input_at_end` to many streams in `ParallelInputsProcessor`  (pingcap#5274)

close pingcap#4856, close pingcap#5263

support fine grained shuffle for window function (pingcap#5048)

close pingcap#5142

feat: pushdown get_format into TiFlash (pingcap#5269)

close pingcap#5115

fix: format throw data truncated error (pingcap#5272)

close pingcap#4891

Print content of columns for gtest (pingcap#5243)

close pingcap#5203

*: also enable O3 for aarch64 (pingcap#5338)

close pingcap#5342

Add debug image build target for CentOS7 (pingcap#5344)

close pingcap#5343

*: mini refactor (pingcap#5326)

close pingcap#4739

Refactor initialize of background pool (pingcap#5190)

close pingcap#5189

delete copy/move ctor of MPMCQueue explicitly (pingcap#5328)

close pingcap#5329

Introduce proxy_server and new-mock-engine-store (pingcap#5319)

ref pingcap#5170

fix: incorrect uptime in grafana panel

Signed-off-by: Lloyd-Pottiger <yan1579196623@gmail.com>
Lloyd-Pottiger pushed a commit to Lloyd-Pottiger/tiflash that referenced this pull request Jul 19, 2022
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/XXL Denotes a PR that changes 1000+ 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.

Add gtest for Limit, TopN and Projection executors
7 participants