Multi-databases support for routing driver #587
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
zhenlineo
force-pushed
the
2.0-routing-table
branch
from
925840e to
2ffd5f4
Compare
zhenlineo
force-pushed
the
2.0-routing-table
branch
4 times, most recently
from
a7a9a8d to
a1ba224
Compare
added 5 commits
June 26, 2019 15:51
…abase. As this makes the routing table map easier for server version lower than 4.0. Otherwise, if we default to get routing table for system_db, we need to detect if it is server version lower than 4.0. If so, we can only get routing table for default_db, and then we need to reset the key in routing table map to be default_db. TODO: Removing stale routing table from routing table map. Also missing any integration tests for 4.0 routing driver.
zhenlineo
force-pushed
the
2.0-routing-table
branch
2 times, most recently
from
c567641 to
771e6d6
Compare
zhenlineo
force-pushed
the
2.0-routing-table
branch
from
771e6d6 to
63d6f93
Compare
zhenlineo
force-pushed
the
2.0-routing-table
branch
from
0de7d22 to
d09054a
Compare
…getRoutingTable`, as this procedure is not only used by cluster but also single instance.
ali-ince
reviewed
Jul 2, 2019
There was a problem hiding this comment.
@zhenlineo Looks good to me. I've made small comments mostly with naming suggestions.
driver/src/main/java/org/neo4j/driver/internal/cluster/RoutingTableHandler.java
Outdated
Show resolved
Hide resolved
driver/src/main/java/org/neo4j/driver/internal/cluster/RoutingTableRegistryImpl.java
Outdated
Show resolved
Hide resolved
driver/src/main/java/org/neo4j/driver/exceptions/RoutingException.java
Outdated
Show resolved
Hide resolved
driver/src/main/java/org/neo4j/driver/internal/cluster/ClusterRoutingTable.java
Outdated
Show resolved
Hide resolved
driver/src/main/java/org/neo4j/driver/internal/cluster/RoutingProcedureRunner.java
Outdated
Show resolved
Hide resolved
driver/src/main/java/org/neo4j/driver/internal/cluster/RoutingProcedureRunner.java
Outdated
Show resolved
Hide resolved
| { | ||
| if ( serverVersion.greaterThanOrEqual( v3_2_0 ) ) | ||
| if ( serverVersion.greaterThanOrEqual( v4_0_0 )) |
There was a problem hiding this comment.
Maybe we should consider moving to compare protocol versions instead of server versions over time.
There was a problem hiding this comment.
Strictly speaking we cannot test bolt version as the procedures are not part of bolt protocol.
driver/src/main/java/org/neo4j/driver/internal/cluster/RoutingTableRegistryImpl.java
Outdated
Show resolved
Hide resolved
Fixed a flaky test due to misused timeout value
zhenlineo
force-pushed
the
2.0-routing-table
branch
from
800d376 to
b6d1c2a
Compare
|
I lost one comment. I left a TODO to make |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
GetRoutingTableprocedure now accepts an optional parameterdatabasefor fetching routing table for the specified database. To obtain routing table for default database, usedatabase = nullrather thandatabase = ''.GetRoutingTableprocedure should be executed on system database as it is a DBMS procedure.Basics:
RoutingTableRegistrykeeps a concurrent map from database names toRoutingTableHandler.RoutingTableHandlerholds aRoutingTable(empty at creation) and handles removal of servers from routing table in case of connection errors.Discoveryprovides discovery service. Given a routing table, it reads available routers and finds a connection from connection pool to perform discovery. If success, it updates the routing table and connection pool. If failed, it throws error.RoutingTableRegistry,DiscoveryandConnectionPoolare shared resources by all threads in drivers.RoutingTableHandlerandRoutingTableis (mostly) used by a single thread.