tursom/memgraph
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix MATCH not allowed on replica (#709)

Browse Source
This commit is contained in:
Bruno Sačarić 2022-12-23 14:47:12 +01:00 committed by GitHub
parent d72e7fa38d
commit 1f2a15e7c8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 42 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/query/plan/read_write_type_checker.cpp
View File

@ -91,18 +91,25 @@ bool ReadWriteTypeChecker::PreVisit([[maybe_unused]] Foreach &op) {
bool ReadWriteTypeChecker::Visit(Once &) { return false; } // NOLINT(hicpp-named-parameter)
void ReadWriteTypeChecker::UpdateType(RWType op_type) {
// Update type only if it's not the NONE type and the current operator's type
// is different than the one that's currently inferred.
if (type != RWType::NONE && type != op_type) {
type = RWType::RW;
}
// Stop inference because RW is the most "dominant" type, i.e. it isn't
// affected by the type of nodes in the plan appearing after the node for
// which the type is set to RW.
if (type == RWType::RW) {
return;
}
if (type == RWType::NONE && op_type != RWType::NONE) {
// if op_type is NONE, type doesn't change.
if (op_type == RWType::NONE) {
return;
}
// Update type only if it's not the NONE type and the current operator's type
// is different than the one that's currently inferred.
if (type != RWType::NONE && type != op_type) {
type = RWType::RW;
}
if (type == RWType::NONE) {
type = op_type;
}
}

3
src/query/plan/read_write_type_checker.hpp
View File

@ -15,7 +15,7 @@
namespace memgraph::query::plan {
class ReadWriteTypeChecker : public virtual HierarchicalLogicalOperatorVisitor {
struct ReadWriteTypeChecker : public virtual HierarchicalLogicalOperatorVisitor {
public:
ReadWriteTypeChecker() = default;
@ -89,7 +89,6 @@ class ReadWriteTypeChecker : public virtual HierarchicalLogicalOperatorVisitor {
bool Visit(Once &) override;
private:
void UpdateType(RWType op_type);
};

28
tests/unit/query_plan_read_write_typecheck.cpp
View File

@ -253,3 +253,31 @@ TEST_F(ReadWriteTypeCheckTest, Foreach) {
std::shared_ptr<LogicalOperator> foreach = std::make_shared<plan::Foreach>(nullptr, nullptr, nullptr, x);
CheckPlanType(foreach.get(), RWType::RW);
}
TEST_F(ReadWriteTypeCheckTest, CheckUpdateType) {
std::array<std::array<RWType, 3>, 16> scenarios = {{
{RWType::NONE, RWType::NONE, RWType::NONE},
{RWType::NONE, RWType::R, RWType::R},
{RWType::NONE, RWType::W, RWType::W},
{RWType::NONE, RWType::RW, RWType::RW},
{RWType::R, RWType::NONE, RWType::R},
{RWType::R, RWType::R, RWType::R},
{RWType::R, RWType::W, RWType::RW},
{RWType::R, RWType::RW, RWType::RW},
{RWType::W, RWType::NONE, RWType::W},
{RWType::W, RWType::R, RWType::RW},
{RWType::W, RWType::W, RWType::W},
{RWType::W, RWType::RW, RWType::RW},
{RWType::RW, RWType::NONE, RWType::RW},
{RWType::RW, RWType::R, RWType::RW},
{RWType::RW, RWType::W, RWType::RW},
{RWType::RW, RWType::RW, RWType::RW},
}};
auto rw_type_checker = ReadWriteTypeChecker();
for (auto scenario : scenarios) {
rw_type_checker.type = scenario[0];
rw_type_checker.UpdateType(scenario[1]);
EXPECT_EQ(scenario[2], rw_type_checker.type);
}
}