Skip to content

4.1 new bolt version init #433

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
merged 3 commits into from
Jun 30, 2020
Merged

4.1 new bolt version init #433

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e881867
Python Aura Example (#431)
mneedham Jun 30, 2020
c911fce
Merge remote-tracking branch 'upstream/4.0' into 4.1
martin-neotech Jun 30, 2020
e858b72
initiated the 4.1 bolt protocol
martin-neotech Jun 30, 2020
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
11 changes: 9 additions & 2 deletions neo4j/io/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,10 +135,12 @@ def protocol_handlers(cls, protocol_version=None):
# Carry out Bolt subclass imports locally to avoid circular dependency issues.
from neo4j.io._bolt3 import Bolt3
from neo4j.io._bolt4x0 import Bolt4x0
from neo4j.io._bolt4x1 import Bolt4x1

handlers = {
Bolt3.PROTOCOL_VERSION: Bolt3,
Bolt4x0.PROTOCOL_VERSION: Bolt4x0
Bolt4x0.PROTOCOL_VERSION: Bolt4x0,
Bolt4x1.PROTOCOL_VERSION: Bolt4x1,
}

if protocol_version is None:
Expand Down Expand Up @@ -203,6 +205,10 @@ def open(cls, address, *, auth=None, timeout=None, **pool_config):
# Carry out Bolt subclass imports locally to avoid circular dependency issues.
from neo4j.io._bolt4x0 import Bolt4x0
connection = Bolt4x0(address, s, pool_config.max_connection_lifetime, auth=auth, user_agent=pool_config.user_agent)
elif pool_config.protocol_version == (4, 1):
# Carry out Bolt subclass imports locally to avoid circular dependency issues.
from neo4j.io._bolt4x1 import Bolt4x1
connection = Bolt4x1(address, s, pool_config.max_connection_lifetime, auth=auth, user_agent=pool_config.user_agent)
else:
log.debug("[#%04X] S: <CLOSE>", s.getpeername()[1])
s.shutdown(SHUT_RDWR)
Expand Down Expand Up @@ -650,6 +656,7 @@ def fetch_routing_info(self, *, address, timeout, database):
# Carry out Bolt subclass imports locally to avoid circular dependency issues.
from neo4j.io._bolt3 import Bolt3
from neo4j.io._bolt4x0 import Bolt4x0
from neo4j.io._bolt4x1 import Bolt4x1

from neo4j.api import (
SYSTEM_DATABASE,
Expand Down Expand Up @@ -686,7 +693,7 @@ def fail(md):
on_success=metadata.update,
on_failure=fail,
)
elif cx.PROTOCOL_VERSION == Bolt4x0.PROTOCOL_VERSION:
elif cx.PROTOCOL_VERSION in (Bolt4x0.PROTOCOL_VERSION, Bolt4x1.PROTOCOL_VERSION):
if database == DEFAULT_DATABASE:
cx.run(
"CALL dbms.routing.getRoutingTable($context)",
Expand Down
Loading