Skip to content

Compatibility with Bolt protocol #43

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
gitbuda merged 4 commits into from
Feb 26, 2023
Merged

Compatibility with Bolt protocol #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f3e3fda
Update compatibility with Bolt protocol
jmatak Aug 24, 2022
62ae5fd
Add new line
jmatak Aug 24, 2022
614a7fc
Merge branch 'master' into compatibility-with-bolt-protocol
gitbuda Feb 24, 2023
5dc072a
Destroy both value and map if something fails
gitbuda Feb 26, 2023
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
32 changes: 30 additions & 2 deletions src/mgclient.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,35 @@

const char *mg_client_version() { return MGCLIENT_VERSION; }

int mg_init() { return mg_socket_init(); }
int mg_init_session_static_vars() {
mg_value *n_val = mg_value_make_integer(-1);
if (!n_val) {
goto fatal_failure;
}
mg_default_pull_extra_map = mg_map_make_empty(1);
if (!mg_default_pull_extra_map) {
goto fatal_failure;
Comment thread
gitbuda marked this conversation as resolved.
}
if (mg_map_insert_unsafe(mg_default_pull_extra_map, "n", n_val) != 0) {
goto fatal_failure;
}
return MG_SUCCESS;

fatal_failure:
if (n_val) {
mg_value_destroy(n_val);
}
if (mg_default_pull_extra_map) {
mg_map_destroy(mg_default_pull_extra_map);
}
return MG_ERROR_CLIENT_ERROR;
}

int mg_init() {
int init_status = mg_init_session_static_vars();
if (init_status != 0) return init_status;
return mg_socket_init();
}

void mg_finalize() { mg_socket_finalize(); }

Expand Down Expand Up @@ -796,7 +824,7 @@ int mg_session_pull(mg_session *session, const mg_map *pull_information) {

int status = 0;
if (session->version == 4 && !pull_information) {
pull_information = &mg_empty_map;
pull_information = mg_default_pull_extra_map;
}

status = mg_session_send_pull_message(session, pull_information);
Expand Down
2 changes: 2 additions & 0 deletions src/mgvalue.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1871,4 +1871,6 @@ int mg_value_equal(const mg_value *lhs, const mg_value *rhs) {
return 0;
}

mg_map *mg_default_pull_extra_map;

mg_map mg_empty_map = {0, 0, NULL, NULL};
2 changes: 2 additions & 0 deletions src/mgvalue.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,6 +291,8 @@ int mg_path_equal(const mg_path *lhs, const mg_path *rhs);

int mg_value_equal(const mg_value *lhs, const mg_value *rhs);

extern mg_map *mg_default_pull_extra_map;

extern mg_map mg_empty_map;

#ifdef __cplusplus
Expand Down
15 changes: 8 additions & 7 deletions tests/client.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -689,6 +689,7 @@ class RunTest : public ::testing::Test {
sc = tmp[0];
ss = tmp[1];

mg_init();
session = mg_session_init((mg_allocator *)&allocator);
mg_raw_transport_init(sc, (mg_raw_transport **)&session->transport,
(mg_allocator *)&allocator);
Expand Down Expand Up @@ -925,7 +926,7 @@ void RunTest::OkNoResults(int version) {
if (version == 4) {
mg_message_pull *pull_message = message->pull_v;
ASSERT_TRUE(pull_message->extra);
ASSERT_EQ(mg_map_size(pull_message->extra), 0u);
ASSERT_EQ(mg_map_size(pull_message->extra), 1u);
}
mg_message_destroy_ca(message, session->decoder_allocator);
}
Expand Down Expand Up @@ -1016,7 +1017,7 @@ void RunTest::MultipleQueries(int version) {
if (version == 4) {
mg_message_pull *pull_message = message->pull_v;
ASSERT_TRUE(pull_message->extra);
ASSERT_EQ(mg_map_size(pull_message->extra), 0u);
ASSERT_EQ(mg_map_size(pull_message->extra), 1u);
}
mg_message_destroy_ca(message, session->decoder_allocator);
}
Expand Down Expand Up @@ -1132,7 +1133,7 @@ void RunTest::OkWithResults(int version) {
if (version == 4) {
mg_message_pull *pull_message = message->pull_v;
ASSERT_TRUE(pull_message->extra);
ASSERT_EQ(mg_map_size(pull_message->extra), 0u);
ASSERT_EQ(mg_map_size(pull_message->extra), 1u);
}
mg_message_destroy_ca(message, session->decoder_allocator);
}
Expand Down Expand Up @@ -1252,7 +1253,7 @@ void RunTest::QueryRuntimeError(int version) {
if (version == 4) {
mg_message_pull *pull_message = message->pull_v;
ASSERT_TRUE(pull_message->extra);
ASSERT_EQ(mg_map_size(pull_message->extra), 0u);
ASSERT_EQ(mg_map_size(pull_message->extra), 1u);
}
mg_message_destroy_ca(message, session->decoder_allocator);
}
Expand Down Expand Up @@ -1363,7 +1364,7 @@ void RunTest::QueryDatabaseError(int version) {
if (version == 4) {
mg_message_pull *pull_message = message->pull_v;
ASSERT_TRUE(pull_message->extra);
ASSERT_EQ(mg_map_size(pull_message->extra), 0u);
ASSERT_EQ(mg_map_size(pull_message->extra), 1u);
}
mg_message_destroy_ca(message, session->decoder_allocator);
}
Expand Down Expand Up @@ -1454,7 +1455,7 @@ void RunTest::RunWithParams(int version) {
if (version == 4) {
mg_message_pull *pull_message = message->pull_v;
ASSERT_TRUE(pull_message->extra);
ASSERT_EQ(mg_map_size(pull_message->extra), 0u);
ASSERT_EQ(mg_map_size(pull_message->extra), 1u);
}
mg_message_destroy_ca(message, session->decoder_allocator);
}
Expand Down Expand Up @@ -1759,7 +1760,7 @@ TEST_F(RunTest, TransactionBasic) {
ASSERT_EQ(message->type, MG_MESSAGE_TYPE_PULL);
mg_message_pull *pull_message = message->pull_v;
ASSERT_TRUE(pull_message->extra);
ASSERT_EQ(mg_map_size(pull_message->extra), 0u);
ASSERT_EQ(mg_map_size(pull_message->extra), 1u);
mg_message_destroy_ca(message, session->decoder_allocator);
}

Expand Down