8000 Some cleanup for new executor test code, which accidentally fixes ASAN failures in ExecutorTestHelper by markuspf · Pull Request #11283 · arangodb/arangodb · GitHub
[go: up one dir, main page]
Skip to content

Some cleanup for new executor test code, which accidentally fixes ASAN failures in ExecutorTestHelper #11283

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

Merged
merged 15 commits into from
Mar 19, 2020
Merged

Some cleanup for new executor test code, which accidentally fixes ASAN failures in ExecutorTestHelper #11283

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
ee2ff0f
Fix memory leak in ExecutorTestHelper
Mar 16, 2020
0191f75
Remove useless SubqueryExecutorTest
Mar 16, 2020
fd81fab
Merge branch 'devel' into bug-fix/test-asan-fixes-cleanup
Mar 17, 2020
723c925
Merge branch 'devel' of github.com:arangodb/arangodb into bug-fix/tes…
jsteemann Mar 17, 2020
53a9b7f
Some cleanup and decrud
Mar 17, 2020
804e5e6
Fix fallout from cleanup and decrud
Mar 17, 2020
f9fb19d
remove unused concatPipelines
Mar 17, 2020
5b64ab4
More cleanups in Executor Tests
Mar 18, 2020
a45f4f5
Merge branch 'bug-fix/test-asan-fixes-cleanup' of github.com:arangodb…
jsteemann Mar 18, 2020
a044b4f
Even more cleanup
Mar 18, 2020
c4ab264
Merge branch 'bug-fix/test-asan-fixes-cleanup' of github.com:arangodb…
jsteemann Mar 18, 2020
ffae94c
Fix the bleepin registers again
Mar 18, 2020
1cc422f
Merge branch 'devel' into bug-fix/test-asan-fixes-cleanup
Mar 18, 2020
048a023
Merge branch 'bug-fix/test-asan-fixes-cleanup' of github.com:arangodb…
jsteemann Mar 18, 2020
de9546c
fix a memleak in ngram tests
jsteemann Mar 18, 2020
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
49 changes: 20 additions & 29 deletions tests/Aql/CountCollectExecutorTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ INSTANTIATE_TEST_CASE_P(CountCollectExecutor, CountCollectExecutorTest,

TEST_P(CountCollectExecutorTest, empty_input) {
ExecutorTestHelper<1, 1>(*fakedQuery)
.setExecBlock& 10000 lt;CountCollectExecutor>(MakeInfos(1), ExecutionNode::COLLECT)
.addConsumer<CountCollectExecutor>(MakeInfos(1), ExecutionNode::COLLECT)
.expectedStats(ExecutionStats{})
.setInputSplitType(GetSplit())
.setInputValue({})
Expand All @@ -142,7 +142,7 @@ TEST_P(CountCollectExecutorTest, empty_input) {

TEST_P(CountCollectExecutorTest, count_input) {
ExecutorTestHelper<1, 1>(*fakedQuery)
.setExecBlock<CountCollectExecutor>(MakeInfos(1), ExecutionNode::COLLECT)
.addConsumer<CountCollectExecutor>(MakeInfos(1), ExecutionNode::COLLECT)
.expectedStats(ExecutionStats{})
.setInputSplitType(GetSplit())
.setInputValue({{0}, {1}, {2}, {3}})
Expand All @@ -155,7 +155,7 @@ TEST_P(CountCollectExecutorTest, count_input) {

TEST_P(CountCollectExecutorTest, empty_input_skip) {
ExecutorTestHelper<1, 1>(*fakedQuery)
.setExecBlock<CountCollectExecutor>(MakeInfos(1), ExecutionNode::COLLECT)
.addConsumer<CountCollectExecutor>(MakeInfos(1), ExecutionNode::COLLECT)
.expectedStats(ExecutionStats{})
.setInputSplitType(GetSplit())
.setInputValue({})
Expand All @@ -168,7 +168,7 @@ TEST_P(CountCollectExecutorTest, empty_input_skip) {

TEST_P(CountCollectExecutorTest, count_input_skip) {
ExecutorTestHelper<1, 1>(*fakedQuery)
.setExecBlock<CountCollectExecutor>(MakeInfos(1), ExecutionNode::COLLECT)
.addConsumer<CountCollectExecutor>(MakeInfos(1), ExecutionNode::COLLECT)
.expectedStats(ExecutionStats{})
.setInputSplitType(GetSplit())
.setInputValue({{0}, {1}, {2}, {3}})
Expand All @@ -181,7 +181,7 @@ TEST_P(CountCollectExecutorTest, count_input_skip) {

TEST_P(CountCollectExecutorTest, empty_input_fullCount) {
ExecutorTestHelper<1, 1>(*fakedQuery)
.setExecBlock<CountCollectExecutor>(MakeInfos(1), ExecutionNode::COLLECT)
.addConsumer<CountCollectExecutor>(MakeInfos(1), ExecutionNode::COLLECT)
.expectedStats(ExecutionStats{})
.setInputSplitType(GetSplit())
.setInputValue({})
Expand All @@ -194,7 +194,7 @@ TEST_P(CountCollectExecutorTest, empty_input_fullCount) {

TEST_P(CountCollectExecutorTest, count_input_fullCount) {
ExecutorTestHelper<1, 1>(*fakedQuery)
.setExecBlock<CountCollectExecutor>(MakeInfos(1), ExecutionNode::COLLECT)
.addConsumer<CountCollectExecutor>(MakeInfos(1), ExecutionNode::COLLECT)
.expectedStats(ExecutionStats{})
.setInputSplitType(GetSplit())
.setInputValue({{0}, {1}, {2}, {3}})
Expand All @@ -207,7 +207,7 @@ TEST_P(CountCollectExecutorTest, count_input_fullCount) {

TEST_P(CountCollectExecutorTest, count_input_softlimit) {
ExecutorTestHelper<1, 1>(*fakedQuery)
.setExecBlock<CountCollectExecutor>(MakeInfos(1), ExecutionNode::COLLECT)
.addConsumer<CountCollectExecutor>(MakeInfos(1), ExecutionNode::COLLECT)
.expectedStats(ExecutionStats{})
.setInputSplitType(GetSplit())
.setInputValue({{0}, {1}, {2}, {3}})
Expand All @@ -219,18 +219,13 @@ TEST_P(CountCollectExecutorTest, count_input_softlimit) {
}

TEST_P(CountCollectExecutorTest, count_in_empty_subquery) {
ExecutorTestHelper<1, 1> helper(*fakedQuery);

Pipeline pipe{};
pipe.addConsumer(helper.createExecBlock<SubqueryStartExecutor>(MakeSubqueryStartInfos(),
ExecutionNode::SUBQUERY_START))
.addConsumer(helper.createExecBlock<LambdaExe>(MakeRemoveAllLinesInfos(),
ExecutionNode::FILTER))
.addConsumer(helper.createExecBlock<CountCollectExecutor>(MakeInfos(1), ExecutionNode::COLLECT))
.addConsumer(helper.createExecBlock<SubqueryEndExecutor>(MakeSubqueryEndInfos(1),
ExecutionNode::SUBQUERY_END));

helper.setPipeline(std::move(pipe))
auto helper = ExecutorTestHelper<1, 1>();

helper
.addConsumer<SubqueryStartExecutor>(MakeSubqueryStartInfos(), ExecutionNode::SUBQUERY_START)
.addConsumer<LambdaExe>(MakeRemoveAllLinesInfos(), ExecutionNode::FILTER)
.addConsumer<CountCollectExecutor>(MakeInfos(1), ExecutionNode::COLLECT)
.addConsumer<SubqueryEndExecutor>(MakeSubqueryEndInfos(1), ExecutionNode::SUBQUERY_END)
.expectedStats(ExecutionStats{})
.setInputSplitType(GetSplit())
.setInputValue({{0}, {1}, {2}, {3}})
Expand All @@ -240,18 +235,14 @@ TEST_P(CountCollectExecutorTest, count_in_empty_subquery) {
.setCall(AqlCall{})
.run();
}

TEST_P(CountCollectExecutorTest, count_in_subquery) {
ExecutorTestHelper<1, 1> helper(*fakedQuery);

Pipeline pipe{};
pipe.addConsumer(helper.createExecBlock<SubqueryStartExecutor>(MakeSubqueryStartInfos(),
ExecutionNode::SUBQUERY_START))
.addConsumer(helper.createExecBlock<CountCollectExecutor>(MakeInfos(1), ExecutionNode::COLLECT))
.addConsumer(helper.createExecBlock<SubqueryEndExecutor>(MakeSubqueryEndInfos(1),
ExecutionNode::SUBQUERY_END));
// ExecutorTestHelper<1, 1> helper(*fakedQuery);
auto helper = ExecutorTestHelper<1, 1>();

helper.setPipeline(std::move(pipe))
helper
.addConsumer<SubqueryStartExecutor>(MakeSubqueryStartInfos(), ExecutionNode::SUBQUERY_START)
.addConsumer<CountCollectExecutor>(MakeInfos(1), ExecutionNode::COLLECT)
.addConsumer<SubqueryEndExecutor>(MakeSubqueryEndInfos(1), ExecutionNode::SUBQUERY_END)
.expectedStats(ExecutionStats{})
.setInputSplitType(GetSplit())
.setInputValue({{0}, {1}, {2}, {3}})
Expand Down
26 changes: 8 additions & 18 deletions tests/Aql/EnumerateListExecutorTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,28 +135,18 @@ TEST_F(EnumerateListExecutorTest, test_check_state_second_row_border) {
// new framework tests
using EnumerateListTestHelper = ExecutorTestHelper<1, 1>;
using EnumerateListSplitType = EnumerateListTestHelper::SplitType;
using EnumerateListParamType = std::tuple<EnumerateListSplitType>;

class EnumerateListExecutorTestProduce
: public ::testing::TestWithParam<std::tuple<EnumerateListSplitType>> {
: public AqlExecutorTestCaseWithParam<EnumerateListParamType, false> {
protected:
ResourceMonitor monitor;
AqlItemBlockManager itemBlockManager;

mocks::MockAqlServer server;
std::unique_ptr<arangodb::aql::Query> fakedQuery;
EnumerateListExecutorInfos infos;

SharedAqlItemBlockPtr block;
NoStats stats;

EnumerateListExecutorTestProduce()
: itemBlockManager(&monitor, SerializationFormat::SHADOWROWS),
fakedQuery(server.createFakeQuery()),
infos(0, 1, 1, 2, {}, {0}) {
auto engine =
std::make_unique<ExecutionEngine>(*fakedQuery, SerializationFormat::SHADOWROWS);
fakedQuery->setEngine(engine.release());
}
: infos(0, 1, 1, 2, {}, {0}) {}

auto makeInfos(RegisterId inputRegister = 0, RegisterId outputRegister = 1,
RegisterId nrInputRegister = 1, RegisterId nrOutputRegister = 2,
Expand Down Expand Up @@ -220,7 +210,7 @@ TEST_P(EnumerateListExecutorTestProduce, default_1) {
TEST_P(EnumerateListExecutorTestProduce, offset_1) {
auto [split] = GetParam();

ExecutorTestHelper(*fakedQuery)
ExecutorTestHelper<1,1>(*fakedQuery)
.setExecBlock<EnumerateListExecutor>(makeInfos())
.setInputValue({{{R"([1, 2, 3, 4, 5, 6, 7, 8, 9, 10])"}}})
.setInputSplitType(split)
Expand All @@ -234,7 +224,7 @@ TEST_P(EnumerateListExecutorTestProduce, offset_1) {
TEST_P(EnumerateListExecutorTestProduce, offset_2) {
auto [split] = GetParam();

ExecutorTestHelper(*fakedQuery)
ExecutorTestHelper<1,1>(*fakedQuery)
.setExecBlock<EnumerateListExecutor>(makeInfos())
.setInputValue({{{R"([1, 2, 3, 4, 5, 6, 7, 8, 9, 10])"}}})
.setInputSplitType(split)
Expand All @@ -248,7 +238,7 @@ TEST_P(EnumerateListExecutorTestProduce, offset_2) {
TEST_P(EnumerateListExecutorTestProduce, offset_3) {
auto [split] = GetParam();

ExecutorTestHelper(*fakedQuery)
ExecutorTestHelper<1,1>(*fakedQuery)
.setExecBlock<EnumerateListExecutor>(makeInfos())
.setInputValue({{{R"([1, 2, 3, 4, 5, 6, 7, 8, 9, 10])"}}})
.setInputSplitType(split)
Expand All @@ -262,7 +252,7 @@ TEST_P(EnumerateListExecutorTestProduce, offset_3) {
TEST_P(EnumerateListExecutorTestProduce, offset_4) {
auto [split] = GetParam();

ExecutorTestHelper(*fakedQuery)
ExecutorTestHelper<1,1>(*fakedQuery)
.setExecBlock<EnumerateListExecutor>(makeInfos())
.setInputValue({{{R"([1, 2, 3, 4, 5, 6, 7, 8, 9, 10])"}}})
.setInputSplitType(split)
Expand All @@ -276,7 +266,7 @@ TEST_P(EnumerateListExecutorTestProduce, offset_4) {
TEST_P(EnumerateListExecutorTestProduce, offset_5) {
auto [split] = GetParam();

ExecutorTestHelper(*fakedQuery)
ExecutorTestHelper<1,1>(*fakedQuery)
.setExecBlock<EnumerateListExecutor>(makeInfos())
.setInputValue({{{R"([1, 2, 3, 4, 5, 6, 7, 8, 9, 10])"}}})
.setInputSplitType(split)
Expand Down
Loading
0