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

Add index selection pass for KQIR planning #2278

Merged
merged 10 commits into from
Apr 29, 2024
Merged

Add index selection pass for KQIR planning #2278

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
a06e4c6
Add index selection pass for KQIR planning
PragmaTwice Apr 27, 2024
63192a5
Merge branch 'unstable' into index-selection
PragmaTwice Apr 27, 2024
7b6314a
add license
PragmaTwice Apr 27, 2024
7048088
Merge branch 'index-selection' of github.com:PragmaTwice/kvrocks into…
PragmaTwice Apr 27, 2024
307569c
add more test
PragmaTwice Apr 27, 2024
9fe3b14
fix
PragmaTwice Apr 27, 2024
97a9b40
fix
PragmaTwice Apr 28, 2024
0fe2331
add more tests
PragmaTwice Apr 28, 2024
10a9fb7
add more tests
PragmaTwice Apr 28, 2024
864e5e0
Merge branch 'unstable' into index-selection
PragmaTwice Apr 28, 2024
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
Prev Previous commit
Next Next commit
add more test
  • Loading branch information
@PragmaTwice
PragmaTwice committed Apr 27, 2024
commit 307569c4b83b46f1a4d244e30a6e8de9de1aad0c
6 changes: 3 additions & 3 deletions src/search/passes/index_selection.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ struct IndexSelection : Visitor {
};

std::map<const FieldInfo *, AggregatedNodes> agg_nodes;
std::vector<Node *> rest_nodes;
std::vector<QueryExpr *> rest_nodes;

for (const auto &n : node->inners) {
IntervalSet is;
Expand Down Expand Up @@ -212,8 +212,8 @@ struct IndexSelection : Visitor {
n.second.nodes);
}

for (auto &n : rest_nodes) {
auto op = TransformExpr(node);
for (auto n : rest_nodes) {
auto op = TransformExpr(n);

available_plans.emplace_back(std::move(op), std::set<Node *>{n});
}
Expand Down
39 changes: 38 additions & 1 deletion tests/cppunit/ir_pass_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@

#include "search/ir_pass.h"

#include "fmt/core.h"
#include "gtest/gtest.h"
#include "search/interval.h"
#include "search/ir_sema_checker.h"
Expand Down Expand Up @@ -169,7 +170,7 @@ TEST(IRPassTest, IntervalAnalysis) {

static IndexMap MakeIndexMap() {
auto f1 = FieldInfo("t1", std::make_unique<redis::SearchTagFieldMetadata>());
auto f2 = FieldInfo("t2", std::make_unique<redis::SearchNumericFieldMetadata>());
auto f2 = FieldInfo("t2", std::make_unique<redis::SearchTagFieldMetadata>());
f2.metadata->noindex = true;
auto f3 = FieldInfo("n1", std::make_unique<redis::SearchNumericFieldMetadata>());
auto f4 = FieldInfo("n2", std::make_unique<redis::SearchNumericFieldMetadata>());
Expand Down Expand Up @@ -200,4 +201,40 @@ TEST(IRPassTest, IndexSelection) {

auto passes = PassManager::Default();
ASSERT_EQ(PassManager::Execute(passes, ParseS(sc, "select * from ia"))->Dump(), "project *: full-scan ia");
ASSERT_EQ(PassManager::Execute(passes, ParseS(sc, "select * from ia order by n1"))->Dump(),
"project *: numeric-scan n1, [-inf, inf), asc");
ASSERT_EQ(PassManager::Execute(passes, ParseS(sc, "select * from ia order by n1 limit 1"))->Dump(),
"project *: (limit 0, 1: numeric-scan n1, [-inf, inf), asc)");
ASSERT_EQ(PassManager::Execute(passes, ParseS(sc, "select * from ia order by n3"))->Dump(),
"project *: (sort n3, asc: full-scan ia)");
ASSERT_EQ(PassManager::Execute(passes, ParseS(sc, "select * from ia order by n3 limit 1"))->Dump(),
"project *: (top-n sort n3, asc, 0, 1: full-scan ia)");
ASSERT_EQ(PassManager::Execute(passes, ParseS(sc, "select * from ia where n2 = 1 order by n1"))->Dump(),
"project *: (filter n2 = 1: numeric-scan n1, [-inf, inf), asc)");

ASSERT_EQ(PassManager::Execute(passes, ParseS(sc, "select * from ia where n1 = 1"))->Dump(),
fmt::format("project *: numeric-scan n1, [1, {}), asc", IntervalSet::NextNum(1)));
ASSERT_EQ(PassManager::Execute(passes, ParseS(sc, "select * from ia where n1 >= 1"))->Dump(),
"project *: numeric-scan n1, [1, inf), asc");
ASSERT_EQ(PassManager::Execute(passes, ParseS(sc, "select * from ia where n1 >= 1 and n1 < 2"))->Dump(),
"project *: numeric-scan n1, [1, 2), asc");
ASSERT_EQ(PassManager::Execute(passes, ParseS(sc, "select * from ia where n1 >= 1 and n2 >= 2"))->Dump(),
"project *: (filter n2 >= 2: numeric-scan n1, [1, inf), asc)");
ASSERT_EQ(PassManager::Execute(passes, ParseS(sc, "select * from ia where n1 >= 1 and n2 = 2"))->Dump(),
fmt::format("project *: (filter n1 >= 1: numeric-scan n2, [2, {}), asc)", IntervalSet::NextNum(2)));
ASSERT_EQ(PassManager::Execute(passes, ParseS(sc, "select * from ia where n1 >= 1 and n3 = 2"))->Dump(),
"project *: (filter n3 = 2: numeric-scan n1, [1, inf), asc)");
ASSERT_EQ(PassManager::Execute(passes, ParseS(sc, "select * from ia where n3 = 1"))->Dump(),
"project *: (filter n3 = 1: full-scan ia)");
ASSERT_EQ(PassManager::Execute(passes, ParseS(sc, "select * from ia where n1 = 1 and n3 = 2"))->Dump(),
fmt::format("project *: (filter n3 = 2: numeric-scan n1, [1, {}), asc)", IntervalSet::NextNum(1)));
ASSERT_EQ(PassManager::Execute(passes, ParseS(sc, "select * from ia where n1 = 1 and t1 hastag \"a\""))->Dump(),
fmt::format("project *: (filter t1 hastag \"a\": numeric-scan n1, [1, {}), asc)", IntervalSet::NextNum(1)));
ASSERT_EQ(PassManager::Execute(passes, ParseS(sc, "select * from ia where t1 hastag \"a\""))->Dump(),
"project *: tag-scan t1, a");
ASSERT_EQ(
PassManager::Execute(passes, ParseS(sc, "select * from ia where t1 hastag \"a\" and t2 hastag \"a\""))->Dump(),
"project *: (filter t2 hastag \"a\": tag-scan t1, a)");
ASSERT_EQ(PassManager::Execute(passes, ParseS(sc, "select * from ia where t2 hastag \"a\""))->Dump(),
"project *: (filter t2 hastag \"a\": full-scan ia)");
}
Loading