From be0f9d979670297fb5843602a0be7283afd11559 Mon Sep 17 00:00:00 2001
From: Dominik Gleich <dominik.gleich@memgraph.io>
Date: Fri, 24 Feb 2017 11:27:54 +0100
Subject: [PATCH] Fix hardcoded queries to accomodate commit not returing
boolean.
Reviewers: buda
Reviewed By: buda
Subscribers: pullbot
Differential Revision: https://phabricator.memgraph.io/D69
---
.../hardcoded_query/create_full_profile_conceals_return.cpp | 3 ++-
.../integration/hardcoded_query/create_full_profile_return.cpp | 3 ++-
.../hardcoded_query/create_full_profile_reveals_return.cpp | 3 ++-
tests/integration/hardcoded_query/create_garment.cpp | 3 ++-
tests/integration/hardcoded_query/create_garment_conceals.cpp | 3 ++-
tests/integration/hardcoded_query/create_garment_reveals.cpp | 3 ++-
.../hardcoded_query/match_garment_default_outfit.cpp | 3 ++-
.../hardcoded_query/match_garment_set_label_general_return.hpp | 3 ++-
.../hardcoded_query/match_profile_garment_set_score.cpp | 3 ++-
9 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/tests/integration/hardcoded_query/create_full_profile_conceals_return.cpp b/tests/integration/hardcoded_query/create_full_profile_conceals_return.cpp
index 334a2fcc9..7b7097498 100644
--- a/tests/integration/hardcoded_query/create_full_profile_conceals_return.cpp
+++ b/tests/integration/hardcoded_query/create_full_profile_conceals_return.cpp
@@ -24,7 +24,8 @@ class CPUPlan : public PlanInterface<Stream> {
stream.write_field("p");
stream.write_vertex_record(v);
stream.write_meta("rw");
- return db_accessor.transaction_.commit();
+ db_accessor.transaction_.commit();
+ return true;
}
~CPUPlan() {}
diff --git a/tests/integration/hardcoded_query/create_full_profile_return.cpp b/tests/integration/hardcoded_query/create_full_profile_return.cpp
index ed1223ce9..de025c2c4 100644
--- a/tests/integration/hardcoded_query/create_full_profile_return.cpp
+++ b/tests/integration/hardcoded_query/create_full_profile_return.cpp
@@ -22,7 +22,8 @@ class CPUPlan : public PlanInterface<Stream> {
stream.write_field("p");
stream.write_vertex_record(v);
stream.write_meta("rw");
- return db_accessor.transaction_.commit();
+ db_accessor.transaction_.commit();
+ return true;
}
~CPUPlan() {}
diff --git a/tests/integration/hardcoded_query/create_full_profile_reveals_return.cpp b/tests/integration/hardcoded_query/create_full_profile_reveals_return.cpp
index 43ee32d79..5c120a0ff 100644
--- a/tests/integration/hardcoded_query/create_full_profile_reveals_return.cpp
+++ b/tests/integration/hardcoded_query/create_full_profile_reveals_return.cpp
@@ -24,7 +24,8 @@ class CPUPlan : public PlanInterface<Stream> {
stream.write_field("p");
stream.write_vertex_record(v);
stream.write_meta("rw");
- return db_accessor.transaction_.commit();
+ db_accessor.transaction_.commit();
+ return true;
}
~CPUPlan() {}
diff --git a/tests/integration/hardcoded_query/create_garment.cpp b/tests/integration/hardcoded_query/create_garment.cpp
index 7d1dde591..354f78e77 100644
--- a/tests/integration/hardcoded_query/create_garment.cpp
+++ b/tests/integration/hardcoded_query/create_garment.cpp
@@ -22,7 +22,8 @@ class CPUPlan : public PlanInterface<Stream> {
stream.write_field("g");
stream.write_vertex_record(v);
stream.write_meta("rw");
- return db_accessor.transaction_.commit();
+ db_accessor.transaction_.commit();
+ return true;
}
~CPUPlan() {}
diff --git a/tests/integration/hardcoded_query/create_garment_conceals.cpp b/tests/integration/hardcoded_query/create_garment_conceals.cpp
index b8fdc3f91..b8d02fe4e 100644
--- a/tests/integration/hardcoded_query/create_garment_conceals.cpp
+++ b/tests/integration/hardcoded_query/create_garment_conceals.cpp
@@ -24,7 +24,8 @@ class CPUPlan : public PlanInterface<Stream> {
stream.write_field("g");
stream.write_vertex_record(v);
stream.write_meta("rw");
- return db_accessor.transaction_.commit();
+ db_accessor.transaction_.commit();
+ return true;
}
~CPUPlan() {}
diff --git a/tests/integration/hardcoded_query/create_garment_reveals.cpp b/tests/integration/hardcoded_query/create_garment_reveals.cpp
index eb34ca6a3..74c072278 100644
--- a/tests/integration/hardcoded_query/create_garment_reveals.cpp
+++ b/tests/integration/hardcoded_query/create_garment_reveals.cpp
@@ -24,7 +24,8 @@ class CPUPlan : public PlanInterface<Stream> {
stream.write_field("g");
stream.write_vertex_record(v);
stream.write_meta("rw");
- return db_accessor.transaction_.commit();
+ db_accessor.transaction_.commit();
+ return true;
}
~CPUPlan() {}
diff --git a/tests/integration/hardcoded_query/match_garment_default_outfit.cpp b/tests/integration/hardcoded_query/match_garment_default_outfit.cpp
index 0f354a8f4..640d4550e 100644
--- a/tests/integration/hardcoded_query/match_garment_default_outfit.cpp
+++ b/tests/integration/hardcoded_query/match_garment_default_outfit.cpp
@@ -45,7 +45,8 @@ class CPUPlan : public PlanInterface<Stream> {
stream.write_edge_record(e);
}
stream.write_meta("rw");
- return db_accessor.transaction_.commit();
+ db_accessor.transaction_.commit();
+ return true;
}
~CPUPlan() {}
diff --git a/tests/integration/hardcoded_query/match_garment_set_label_general_return.hpp b/tests/integration/hardcoded_query/match_garment_set_label_general_return.hpp
index 525de0283..d0f5f1b15 100644
--- a/tests/integration/hardcoded_query/match_garment_set_label_general_return.hpp
+++ b/tests/integration/hardcoded_query/match_garment_set_label_general_return.hpp
@@ -28,5 +28,6 @@ bool run_general_query(GraphDbAccessor &db_accessor,
}
}
stream.write_meta("rw");
- return db_accessor.transaction_.commit();
+ db_accessor.transaction_.commit();
+ return true;
}
diff --git a/tests/integration/hardcoded_query/match_profile_garment_set_score.cpp b/tests/integration/hardcoded_query/match_profile_garment_set_score.cpp
index 3f9f2ec6e..d2ef1a56a 100644
--- a/tests/integration/hardcoded_query/match_profile_garment_set_score.cpp
+++ b/tests/integration/hardcoded_query/match_profile_garment_set_score.cpp
@@ -51,7 +51,8 @@ class CPUPlan : public PlanInterface<Stream> {
stream.write_edge_record(e);
}
stream.write_meta("rw");
- return db_accessor.transaction_.commit();
+ db_accessor.transaction_.commit();
+ return true;
}
~CPUPlan() {}