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

Return fields in BEGIN, ROLLBACK, COMMIT

Browse Source 
Reviewers: buda

Reviewed By: buda

Subscribers: pullbot

Differential Revision: https://phabricator.memgraph.io/D683
This commit is contained in:
Mislav Bradac 2017-08-19 12:42:58 +02:00
parent 5a69f46f1f
commit 1dec024bc8
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/communication/bolt/v1/states/idle_result.hpp
View File

@ -15,6 +15,9 @@ namespace communication::bolt {
template <typename Session> template <typename Session>
State HandleRun(Session &session, State state, Marker marker) { State HandleRun(Session &session, State state, Marker marker) {
const std::map<std::string, query::TypedValue> kEmptyFields = {
{"fields", std::vector<query::TypedValue>{}}};
if (marker != Marker::TinyStruct2) { if (marker != Marker::TinyStruct2) {
DLOG(WARNING) << fmt::format( DLOG(WARNING) << fmt::format(
"Expected TinyStruct2 marker, but received 0x{:02X}!", "Expected TinyStruct2 marker, but received 0x{:02X}!",
@ -38,7 +41,7 @@ State HandleRun(Session &session, State state, Marker marker) {
if (query.Value<std::string>() == "ROLLBACK") { if (query.Value<std::string>() == "ROLLBACK") {
session.Abort(); session.Abort();
// One MessageSuccess for RUN command should be flushed. // One MessageSuccess for RUN command should be flushed.
session.encoder_.MessageSuccess(); session.encoder_.MessageSuccess(kEmptyFields);
// One for PULL_ALL should be chunked. // One for PULL_ALL should be chunked.
session.encoder_.MessageSuccess({}, false); session.encoder_.MessageSuccess({}, false);
return State::Result; return State::Result;
@ -84,7 +87,7 @@ State HandleRun(Session &session, State state, Marker marker) {
// Same goes for "ROLLBACK" and "COMMIT". // Same goes for "ROLLBACK" and "COMMIT".
// //
// One MessageSuccess for RUN command should be flushed. // One MessageSuccess for RUN command should be flushed.
session.encoder_.MessageSuccess(); session.encoder_.MessageSuccess(kEmptyFields);
// One for PULL_ALL should be chunked. // One for PULL_ALL should be chunked.
session.encoder_.MessageSuccess({}, false); session.encoder_.MessageSuccess({}, false);
return State::Result; return State::Result;
@ -94,14 +97,14 @@ State HandleRun(Session &session, State state, Marker marker) {
if (query.Value<std::string>() == "COMMIT") { if (query.Value<std::string>() == "COMMIT") {
session.Commit(); session.Commit();
// One MessageSuccess for RUN command should be flushed. // One MessageSuccess for RUN command should be flushed.
session.encoder_.MessageSuccess(); session.encoder_.MessageSuccess(kEmptyFields);
// One for PULL_ALL should be chunked. // One for PULL_ALL should be chunked.
session.encoder_.MessageSuccess({}, false); session.encoder_.MessageSuccess({}, false);
return State::Result; return State::Result;
} else if (query.Value<std::string>() == "ROLLBACK") { } else if (query.Value<std::string>() == "ROLLBACK") {
session.Abort(); session.Abort();
// One MessageSuccess for RUN command should be flushed. // One MessageSuccess for RUN command should be flushed.
session.encoder_.MessageSuccess(); session.encoder_.MessageSuccess(kEmptyFields);
// One for PULL_ALL should be chunked. // One for PULL_ALL should be chunked.
session.encoder_.MessageSuccess({}, false); session.encoder_.MessageSuccess({}, false);
return State::Result; return State::Result;