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

Merge branch 'master' into Implement-constant-time-label-and-edge-type-retrieval

Browse Source
This commit is contained in:
gvolfing 2023-12-04 18:46:00 +01:00 committed by GitHub
commit eeb9671bac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 56 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/glue/SessionHL.cpp
View File

@ -234,11 +234,55 @@ std::pair<std::vector<std::string>, std::optional<int>> SessionHL::Interpret(
throw memgraph::communication::bolt::ClientError(e.what()); throw memgraph::communication::bolt::ClientError(e.what());
} }
} }
void SessionHL::RollbackTransaction() { interpreter_.RollbackTransaction(); }
void SessionHL::CommitTransaction() { interpreter_.CommitTransaction(); } void SessionHL::RollbackTransaction() {
void SessionHL::BeginTransaction(const std::map<std::string, memgraph::communication::bolt::Value> &extra) { try {
interpreter_.BeginTransaction(ToQueryExtras(extra)); interpreter_.RollbackTransaction();
} catch (const memgraph::query::QueryException &e) {
// Count the number of specific exceptions thrown
metrics::IncrementCounter(GetExceptionName(e));
// Wrap QueryException into ClientError, because we want to allow the
// client to fix their query.
throw memgraph::communication::bolt::ClientError(e.what());
} catch (const memgraph::query::ReplicationException &e) {
// Count the number of specific exceptions thrown
metrics::IncrementCounter(GetExceptionName(e));
throw memgraph::communication::bolt::ClientError(e.what());
}
} }
void SessionHL::CommitTransaction() {
try {
interpreter_.CommitTransaction();
} catch (const memgraph::query::QueryException &e) {
// Count the number of specific exceptions thrown
metrics::IncrementCounter(GetExceptionName(e));
// Wrap QueryException into ClientError, because we want to allow the
// client to fix their query.
throw memgraph::communication::bolt::ClientError(e.what());
} catch (const memgraph::query::ReplicationException &e) {
// Count the number of specific exceptions thrown
metrics::IncrementCounter(GetExceptionName(e));
throw memgraph::communication::bolt::ClientError(e.what());
}
}
void SessionHL::BeginTransaction(const std::map<std::string, memgraph::communication::bolt::Value> &extra) {
try {
interpreter_.BeginTransaction(ToQueryExtras(extra));
} catch (const memgraph::query::QueryException &e) {
// Count the number of specific exceptions thrown
metrics::IncrementCounter(GetExceptionName(e));
// Wrap QueryException into ClientError, because we want to allow the
// client to fix their query.
throw memgraph::communication::bolt::ClientError(e.what());
} catch (const memgraph::query::ReplicationException &e) {
// Count the number of specific exceptions thrown
metrics::IncrementCounter(GetExceptionName(e));
throw memgraph::communication::bolt::ClientError(e.what());
}
}
void SessionHL::Configure(const std::map<std::string, memgraph::communication::bolt::Value> &run_time_info) { void SessionHL::Configure(const std::map<std::string, memgraph::communication::bolt::Value> &run_time_info) {
#ifdef MG_ENTERPRISE #ifdef MG_ENTERPRISE
std::string db; std::string db;

16
tests/drivers/python/v5_8/transactions.py
View File

@ -96,12 +96,12 @@ def clear_db(session):
with GraphDatabase.driver("bolt://localhost:7687", auth=None, encrypted=False) as driver: with GraphDatabase.driver("bolt://localhost:7687", auth=None, encrypted=False) as driver:
with driver.session() as session: with driver.session() as session:
# Clear the DB # Clear the DB
session.run("MATCH (n) DETACH DELETE n;") session.run("MATCH (n) DETACH DELETE n;").consume()
# Add constraints # Add constraints
session.run("CREATE CONSTRAINT ON (n:Person) ASSERT n.id IS UNIQUE;") session.run("CREATE CONSTRAINT ON (n:Person) ASSERT n.id IS UNIQUE;").consume()
session.run("CREATE CONSTRAINT ON (n:Employee) ASSERT n.id IS UNIQUE;") session.run("CREATE CONSTRAINT ON (n:Employee) ASSERT n.id IS UNIQUE;").consume()
session.run("CREATE CONSTRAINT ON (n:Employee) ASSERT EXISTS (n.id);") session.run("CREATE CONSTRAINT ON (n:Employee) ASSERT EXISTS (n.id);").consume()
# Set the initial graph state # Set the initial graph state
session.execute_write(lambda tx: tx.run("CREATE (n:Employee:Person {id: '123', alt_id: '100'}) RETURN n;")) session.execute_write(lambda tx: tx.run("CREATE (n:Employee:Person {id: '123', alt_id: '100'}) RETURN n;"))
@ -109,18 +109,18 @@ with GraphDatabase.driver("bolt://localhost:7687", auth=None, encrypted=False) a
# Run a transaction that violates a constraint # Run a transaction that violates a constraint
try: try:
session.execute_write(violate_constraint) session.execute_write(violate_constraint)
except TransientError: except ClientError:
pass pass
else: else:
clear_db(session) clear_db(session)
raise Exception("neo4j.exceptions.TransientError should have been thrown!") raise Exception("neo4j.exceptions.ClientError should have been thrown!")
# Run a transaction that violates no constraints even though an intermediate result does # Run a transaction that violates no constraints even though an intermediate result does
try: try:
session.execute_write(violate_constraint_on_intermediate_result) session.execute_write(violate_constraint_on_intermediate_result)
except TransientError: except ClientError:
clear_db(session) clear_db(session)
raise Exception("neo4j.exceptions.TransientError should not have been thrown!") raise Exception("neo4j.exceptions.ClientError should not have been thrown!")
clear_db(session) clear_db(session)