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

Enhance executor join tests #5305

Merged
merged 14 commits into from
Jul 18, 2022
Merged

Enhance executor join tests #5305

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
a4d2ca8
feat: add basic join tests
Willendless Jul 6, 2022
3fd336c
chore: extract join related tests from gtest_executor.cpp file
Willendless Jul 6, 2022
16eb687
feat: add cast test
Willendless Jul 8, 2022
8f90d8d
feat: add joinAgg tests
Willendless Jul 10, 2022
b4230dd
format
Willendless Jul 10, 2022
4bf22d2
chore: use ASSERT_COLUMNS_EQ_UR to do concurrency test
Willendless Jul 10, 2022
87da827
Merge branch 'master' into enhance-join-tests
SeaRise Jul 11, 2022
9ec9a17
chore: fix min expr
Willendless Jul 12, 2022
ceea922
chore: update in-class const variable decl with static
Willendless Jul 14, 2022
9658165
chore: enhance simple tests with full/partial null case
Willendless Jul 14, 2022
2881259
chore: format
Willendless Jul 14, 2022
f09309e
chore: allow max_concurrency_level
Willendless Jul 14, 2022
ce971be
Merge branch 'pingcap:master' into enhance-join-tests
Willendless Jul 16, 2022
52e1eac
Merge branch 'master' into enhance-join-tests
ti-chi-bot Jul 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
158 changes: 0 additions & 158 deletions dbms/src/Flash/tests/gtest_executor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,31 +33,6 @@ class ExecutorTestRunner : public DB::tests::ExecutorTest
{{"s1", TiDB::TP::TypeString}, {"s2", TiDB::TP::TypeString}},
{toNullableVec<String>("s1", {"banana", {}, "banana"}),
toNullableVec<String>("s2", {"apple", {}, "banana"})});

context.addExchangeReceiver("exchange_r_table",
{{"s1", TiDB::TP::TypeString}, {"join_c", TiDB::TP::TypeString}},
{toNullableVec<String>("s", {"banana", "banana"}),
toNullableVec<String>("join_c", {"apple", "banana"})});

context.addExchangeReceiver("exchange_l_table",
{{"s1", TiDB::TP::TypeString}, {"join_c", TiDB::TP::TypeString}},
{toNullableVec<String>("s", {"banana", "banana"}),
toNullableVec<String>("join_c", {"apple", "banana"})});

context.addMockTable({"test_db", "r_table"},
{{"s", TiDB::TP::TypeString}, {"join_c", TiDB::TP::TypeString}},
{toVec<String>("s", {"banana", "banana"}),
toVec<String>("join_c", {"apple", "banana"})});

context.addMockTable({"test_db", "r_table_2"},
{{"s", TiDB::TP::TypeString}, {"join_c", TiDB::TP::TypeString}},
{toVec<String>("s", {"banana", "banana", "banana"}),
toVec<String>("join_c", {"apple", "apple", "apple"})});

context.addMockTable({"test_db", "l_table"},
{{"s", TiDB::TP::TypeString}, {"join_c", TiDB::TP::TypeString}},
{toVec<String>("s", {"banana", "banana"}),
toVec<String>("join_c", {"apple", "banana"})});
}
};

Expand Down Expand Up @@ -85,138 +60,5 @@ try
}
CATCH

TEST_F(ExecutorTestRunner, JoinWithTableScan)
try
{
auto request = context
.scan("test_db", "l_table")
.join(context.scan("test_db", "r_table"), {col("join_c")}, ASTTableJoin::Kind::Left)
.topN("join_c", false, 2)
.build(context);
{
String expected = "topn_3 | order_by: {(<1, String>, desc: false)}, limit: 2\n"
" Join_2 | LeftOuterJoin, HashJoin. left_join_keys: {<0, String>}, right_join_keys: {<0, String>}\n"
" table_scan_0 | {<0, String>, <1, String>}\n"
" table_scan_1 | {<0, String>, <1, String>}\n";
ASSERT_DAGREQUEST_EQAUL(expected, request);
ASSERT_COLUMNS_EQ_R(executeStreams(request, 2),
createColumns({toNullableVec<String>({"banana", "banana"}),
toNullableVec<String>({"apple", "banana"}),
toNullableVec<String>({"banana", "banana"}),
toNullableVec<String>({"apple", "banana"})}));

ASSERT_COLUMNS_EQ_R(executeStreams(request, 5),
createColumns({toNullableVec<String>({"banana", "banana"}),
toNullableVec<String>({"apple", "banana"}),
toNullableVec<String>({"banana", "banana"}),
toNullableVec<String>({"apple", "banana"})}));

ASSERT_COLUMNS_EQ_R(executeStreams(request),
createColumns({toNullableVec<String>({"banana", "banana"}),
toNullableVec<String>({"apple", "banana"}),
toNullableVec<String>({"banana", "banana"}),
toNullableVec<String>({"apple", "banana"})}));
}
request = context
.scan("test_db", "l_table")
.join(context.scan("test_db", "r_table"), {col("join_c")}, ASTTableJoin::Kind::Left)
.project({"s", "join_c"})
.topN("join_c", false, 2)
.build(context);
{
String expected = "topn_4 | order_by: {(<1, String>, desc: false)}, limit: 2\n"
" project_3 | {<0, String>, <1, String>}\n"
" Join_2 | LeftOuterJoin, HashJoin. left_join_keys: {<0, String>}, right_join_keys: {<0, String>}\n"
" table_scan_0 | {<0, String>, <1, String>}\n"
" table_scan_1 | {<0, String>, <1, String>}\n";
ASSERT_DAGREQUEST_EQAUL(expected, request);
ASSERT_COLUMNS_EQ_R(executeStreams(request, 2),
createColumns({toNullableVec<String>({"banana", "banana"}),
toNullableVec<String>({"apple", "banana"})}));
}

request = context
.scan("test_db", "l_table")
.join(context.scan("test_db", "r_table_2"), {col("join_c")}, ASTTableJoin::Kind::Left)
.topN("join_c", false, 4)
.build(context);
{
String expected = "topn_3 | order_by: {(<1, String>, desc: false)}, limit: 4\n"
" Join_2 | LeftOuterJoin, HashJoin. left_join_keys: {<0, String>}, right_join_keys: {<0, String>}\n"
" table_scan_0 | {<0, String>, <1, String>}\n"
" table_scan_1 | {<0, String>, <1, String>}\n";
ASSERT_DAGREQUEST_EQAUL(expected, request);
ASSERT_COLUMNS_EQ_R(executeStreams(request, 2),
createColumns({toNullableVec<String>({"banana", "banana", "banana", "banana"}),
toNullableVec<String>({"apple", "apple", "apple", "banana"}),
toNullableVec<String>({"banana", "banana", "banana", {}}),
toNullableVec<String>({"apple", "apple", "apple", {}})}));
ASSERT_COLUMNS_EQ_R(executeStreams(request, 3),
createColumns({toNullableVec<String>({"banana", "banana", "banana", "banana"}),
toNullableVec<String>({"apple", "apple", "apple", "banana"}),
toNullableVec<String>({"banana", "banana", "banana", {}}),
toNullableVec<String>({"apple", "apple", "apple", {}})}));
}
}
CATCH

TEST_F(ExecutorTestRunner, JoinWithExchangeReceiver)
try
{
auto request = context
.receive("exchange_l_table")
.join(context.receive("exchange_r_table"), {col("join_c")}, ASTTableJoin::Kind::Left)
.topN("join_c", false, 2)
.build(context);
{
String expected = "topn_3 | order_by: {(<1, String>, desc: false)}, limit: 2\n"
" Join_2 | LeftOuterJoin, HashJoin. left_join_keys: {<0, String>}, right_join_keys: {<0, String>}\n"
" exchange_receiver_0 | type:PassThrough, {<0, String>, <1, String>}\n"
" exchange_receiver_1 | type:PassThrough, {<0, String>, <1, String>}\n";
ASSERT_DAGREQUEST_EQAUL(expected, request);
ASSERT_COLUMNS_EQ_R(executeStreams(request, 2),
createColumns({toNullableVec<String>({"banana", "banana"}),
toNullableVec<String>({"apple", "banana"}),
toNullableVec<String>({"banana", "banana"}),
toNullableVec<String>({"apple", "banana"})}));

ASSERT_COLUMNS_EQ_R(executeStreams(request, 5),
createColumns({toNullableVec<String>({"banana", "banana"}),
toNullableVec<String>({"apple", "banana"}),
toNullableVec<String>({"banana", "banana"}),
toNullableVec<String>({"apple", "banana"})}));

ASSERT_COLUMNS_EQ_R(executeStreams(request),
createColumns({toNullableVec<String>({"banana", "banana"}),
toNullableVec<String>({"apple", "banana"}),
toNullableVec<String>({"banana", "banana"}),
toNullableVec<String>({"apple", "banana"})}));
}
}
CATCH

TEST_F(ExecutorTestRunner, JoinWithTableScanAndReceiver)
try
{
auto request = context
.scan("test_db", "l_table")
.join(context.receive("exchange_r_table"), {col("join_c")}, ASTTableJoin::Kind::Left)
.topN("join_c", false, 2)
.build(context);
{
String expected = "topn_3 | order_by: {(<1, String>, desc: false)}, limit: 2\n"
" Join_2 | LeftOuterJoin, HashJoin. left_join_keys: {<0, String>}, right_join_keys: {<0, String>}\n"
" table_scan_0 | {<0, String>, <1, String>}\n"
" exchange_receiver_1 | type:PassThrough, {<0, String>, <1, String>}\n";
ASSERT_DAGREQUEST_EQAUL(expected, request);
ASSERT_COLUMNS_EQ_R(executeStreams(request, 2),
createColumns({toNullableVec<String>({"banana", "banana"}),
toNullableVec<String>({"apple", "banana"}),
toNullableVec<String>({"banana", "banana"}),
toNullableVec<String>({"apple", "banana"})}));
}
}
CATCH

} // namespace tests
} // namespace DB
Loading