Skip to content

Commit

Permalink
Updating procedure name in response to drivers/po request.
Browse files Browse the repository at this point in the history
  • Loading branch information
Mark Needham committed Aug 12, 2016
1 parent c31f6fb commit 8dd31da
Show file tree
Hide file tree
Showing 6 changed files with 35 additions and 35 deletions.
4 changes: 2 additions & 2 deletions enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/EnterpriseCoreEditionModule.java
View file
Expand Up @@ -51,7 +51,7 @@
import org.neo4j.coreedge.messaging.SenderService; import org.neo4j.coreedge.messaging.SenderService;
import org.neo4j.coreedge.discovery.procedures.AcquireEndpointsProcedure; import org.neo4j.coreedge.discovery.procedures.AcquireEndpointsProcedure;
import org.neo4j.coreedge.discovery.procedures.ClusterOverviewProcedure; import org.neo4j.coreedge.discovery.procedures.ClusterOverviewProcedure;
import org.neo4j.coreedge.discovery.procedures.DiscoverCoreServersProcedure; import org.neo4j.coreedge.discovery.procedures.DiscoverEndpointAcquisitionServersProcedure;
import org.neo4j.coreedge.logging.BetterMessageLogger; import org.neo4j.coreedge.logging.BetterMessageLogger;
import org.neo4j.coreedge.logging.MessageLogger; import org.neo4j.coreedge.logging.MessageLogger;
import org.neo4j.coreedge.logging.NullMessageLogger; import org.neo4j.coreedge.logging.NullMessageLogger;
Expand Down Expand Up @@ -114,7 +114,7 @@ public void registerProcedures( Procedures procedures )
{ {
try try
{ {
procedures.register( new DiscoverCoreServersProcedure( discoveryService, logProvider ) ); procedures.register( new DiscoverEndpointAcquisitionServersProcedure( discoveryService, logProvider ) );
procedures.register( new AcquireEndpointsProcedure( discoveryService, consensusModule.raftMachine(), logProvider ) ); procedures.register( new AcquireEndpointsProcedure( discoveryService, consensusModule.raftMachine(), logProvider ) );
procedures.register( new ClusterOverviewProcedure( discoveryService, consensusModule.raftMachine(), logProvider ) ); procedures.register( new ClusterOverviewProcedure( discoveryService, consensusModule.raftMachine(), logProvider ) );
procedures.register( new CoreRoleProcedure( consensusModule.raftMachine()) ); procedures.register( new CoreRoleProcedure( consensusModule.raftMachine()) );
Expand Down
6 changes: 3 additions & 3 deletions ...cedures/DiscoverCoreServersProcedure.java → ...rEndpointAcquisitionServersProcedure.java
View file
Expand Up @@ -39,13 +39,13 @@
import static java.util.stream.Collectors.toSet; import static java.util.stream.Collectors.toSet;
import static org.neo4j.kernel.api.proc.ProcedureSignature.procedureSignature; import static org.neo4j.kernel.api.proc.ProcedureSignature.procedureSignature;


public class DiscoverCoreServersProcedure extends CallableProcedure.BasicProcedure public class DiscoverEndpointAcquisitionServersProcedure extends CallableProcedure.BasicProcedure
{ {
public static final String NAME = "discoverCoreServers"; public static final String NAME = "discoverEndpointAcquisitionServers";
private final CoreTopologyService discoveryService; private final CoreTopologyService discoveryService;
private final Log log; private final Log log;


public DiscoverCoreServersProcedure( CoreTopologyService discoveryService, LogProvider logProvider ) public DiscoverEndpointAcquisitionServersProcedure( CoreTopologyService discoveryService, LogProvider logProvider )
{ {
super( procedureSignature( new ProcedureSignature.ProcedureName( new String[]{"dbms", "cluster"}, NAME ) ) super( procedureSignature( new ProcedureSignature.ProcedureName( new String[]{"dbms", "cluster"}, NAME ) )
.out( "address", Neo4jTypes.NTString ).build() ); .out( "address", Neo4jTypes.NTString ).build() );
Expand Down
28 changes: 14 additions & 14 deletions .../src/test/java/org/neo4j/coreedge/discovery/procedures/AcquireEndpointsProcedureTest.java
View file
Expand Up @@ -53,9 +53,9 @@ public void shouldRecommendTheCoreLeaderForWriteAndEdgeForRead() throws Exceptio


Map<MemberId,CoreAddresses> coreMembers = new HashMap<>(); Map<MemberId,CoreAddresses> coreMembers = new HashMap<>();
MemberId theLeader = member( 0 ); MemberId theLeader = member( 0 );
coreMembers.put( theLeader, DiscoverCoreServersProcedureTest.coreAddresses( 0 ) ); coreMembers.put( theLeader, DiscoverEndpointAcquisitionServersProcedureTest.coreAddresses( 0 ) );


final ClusterTopology clusterTopology = new ClusterTopology( false, coreMembers, DiscoverCoreServersProcedureTest.addresses( 1 ) ); final ClusterTopology clusterTopology = new ClusterTopology( false, coreMembers, DiscoverEndpointAcquisitionServersProcedureTest.addresses( 1 ) );
when( topologyService.currentTopology() ).thenReturn( clusterTopology ); when( topologyService.currentTopology() ).thenReturn( clusterTopology );


LeaderLocator leaderLocator = mock( LeaderLocator.class ); LeaderLocator leaderLocator = mock( LeaderLocator.class );
Expand All @@ -69,8 +69,8 @@ public void shouldRecommendTheCoreLeaderForWriteAndEdgeForRead() throws Exceptio


// then // then
MatcherAssert.assertThat( members, containsInAnyOrder( MatcherAssert.assertThat( members, containsInAnyOrder(
new Object[]{DiscoverCoreServersProcedureTest.coreAddresses( 0 ).getRaftServer().toString(), "WRITE"}, new Object[]{DiscoverEndpointAcquisitionServersProcedureTest.coreAddresses( 0 ).getRaftServer().toString(), "WRITE"},
new Object[]{DiscoverCoreServersProcedureTest.coreAddresses( 1 ).getRaftServer().toString(), "READ"} new Object[]{DiscoverEndpointAcquisitionServersProcedureTest.coreAddresses( 1 ).getRaftServer().toString(), "READ"}
) ); ) );
} }


Expand All @@ -82,9 +82,9 @@ public void shouldOnlyRecommendOneReadServerEvenIfMultipleAreAvailable() throws


Map<MemberId, CoreAddresses> coreMembers = new HashMap<>(); Map<MemberId, CoreAddresses> coreMembers = new HashMap<>();
MemberId theLeader = member( 0 ); MemberId theLeader = member( 0 );
coreMembers.put( theLeader, DiscoverCoreServersProcedureTest.coreAddresses( 0 ) ); coreMembers.put( theLeader, DiscoverEndpointAcquisitionServersProcedureTest.coreAddresses( 0 ) );


final ClusterTopology clusterTopology = new ClusterTopology( false, coreMembers, DiscoverCoreServersProcedureTest.addresses( 1, 2, 3 ) ); final ClusterTopology clusterTopology = new ClusterTopology( false, coreMembers, DiscoverEndpointAcquisitionServersProcedureTest.addresses( 1, 2, 3 ) );
when( topologyService.currentTopology() ).thenReturn( clusterTopology ); when( topologyService.currentTopology() ).thenReturn( clusterTopology );


LeaderLocator leaderLocator = mock( LeaderLocator.class ); LeaderLocator leaderLocator = mock( LeaderLocator.class );
Expand All @@ -108,8 +108,8 @@ public void shouldReturnCoreMemberAsReadServerIfNoEdgeServersAvailable() throws


Map<MemberId, CoreAddresses> coreMembers = new HashMap<>(); Map<MemberId, CoreAddresses> coreMembers = new HashMap<>();
MemberId theLeader = member( 0 ); MemberId theLeader = member( 0 );
coreMembers.put( theLeader, DiscoverCoreServersProcedureTest.coreAddresses( 0 ) ); coreMembers.put( theLeader, DiscoverEndpointAcquisitionServersProcedureTest.coreAddresses( 0 ) );
final ClusterTopology clusterTopology = new ClusterTopology( false, coreMembers, DiscoverCoreServersProcedureTest.addresses() ); final ClusterTopology clusterTopology = new ClusterTopology( false, coreMembers, DiscoverEndpointAcquisitionServersProcedureTest.addresses() );


when( topologyService.currentTopology() ).thenReturn( clusterTopology ); when( topologyService.currentTopology() ).thenReturn( clusterTopology );


Expand All @@ -124,8 +124,8 @@ public void shouldReturnCoreMemberAsReadServerIfNoEdgeServersAvailable() throws


// then // then
assertThat( members, containsInAnyOrder( assertThat( members, containsInAnyOrder(
new Object[]{DiscoverCoreServersProcedureTest.coreAddresses( 0 ).getRaftServer().toString(), "WRITE"}, new Object[]{DiscoverEndpointAcquisitionServersProcedureTest.coreAddresses( 0 ).getRaftServer().toString(), "WRITE"},
new Object[]{DiscoverCoreServersProcedureTest.coreAddresses( 0 ).getRaftServer().toString(), "READ"} new Object[]{DiscoverEndpointAcquisitionServersProcedureTest.coreAddresses( 0 ).getRaftServer().toString(), "READ"}
) ); ) );
} }


Expand All @@ -136,9 +136,9 @@ public void shouldReturnNoWriteEndpointsIfThereIsNoLeader() throws Exception
final CoreTopologyService topologyService = mock( CoreTopologyService.class ); final CoreTopologyService topologyService = mock( CoreTopologyService.class );


Map<MemberId, CoreAddresses> coreMembers = new HashMap<>(); Map<MemberId, CoreAddresses> coreMembers = new HashMap<>();
coreMembers.put( member( 0 ), DiscoverCoreServersProcedureTest.coreAddresses( 0 ) ); coreMembers.put( member( 0 ), DiscoverEndpointAcquisitionServersProcedureTest.coreAddresses( 0 ) );


final ClusterTopology clusterTopology = new ClusterTopology( false, coreMembers, DiscoverCoreServersProcedureTest.addresses() ); final ClusterTopology clusterTopology = new ClusterTopology( false, coreMembers, DiscoverEndpointAcquisitionServersProcedureTest.addresses() );


when( topologyService.currentTopology() ).thenReturn( clusterTopology ); when( topologyService.currentTopology() ).thenReturn( clusterTopology );


Expand All @@ -163,9 +163,9 @@ public void shouldReturnNoWriteEndpointsIfThereIsNoAddressForTheLeader() throws
final CoreTopologyService topologyService = mock( CoreTopologyService.class ); final CoreTopologyService topologyService = mock( CoreTopologyService.class );


Map<MemberId, CoreAddresses> coreMembers = new HashMap<>(); Map<MemberId, CoreAddresses> coreMembers = new HashMap<>();
coreMembers.put( member( 0 ), DiscoverCoreServersProcedureTest.coreAddresses( 0 ) ); coreMembers.put( member( 0 ), DiscoverEndpointAcquisitionServersProcedureTest.coreAddresses( 0 ) );


final ClusterTopology clusterTopology = new ClusterTopology( false, coreMembers, DiscoverCoreServersProcedureTest.addresses() ); final ClusterTopology clusterTopology = new ClusterTopology( false, coreMembers, DiscoverEndpointAcquisitionServersProcedureTest.addresses() );


when( topologyService.currentTopology() ).thenReturn( clusterTopology ); when( topologyService.currentTopology() ).thenReturn( clusterTopology );


Expand Down
8 changes: 4 additions & 4 deletions ...e/src/test/java/org/neo4j/coreedge/discovery/procedures/ClusterOverviewProcedureTest.java
View file
Expand Up @@ -55,11 +55,11 @@ public void shouldRecommendTheCoreLeaderForWriteAndEdgeForRead() throws Exceptio
MemberId follower1 = new MemberId( UUID.randomUUID() ); MemberId follower1 = new MemberId( UUID.randomUUID() );
MemberId follower2 = new MemberId( UUID.randomUUID() ); MemberId follower2 = new MemberId( UUID.randomUUID() );


coreMembers.put( theLeader, DiscoverCoreServersProcedureTest.coreAddresses( 0 ) ); coreMembers.put( theLeader, DiscoverEndpointAcquisitionServersProcedureTest.coreAddresses( 0 ) );
coreMembers.put( follower1, DiscoverCoreServersProcedureTest.coreAddresses( 1 ) ); coreMembers.put( follower1, DiscoverEndpointAcquisitionServersProcedureTest.coreAddresses( 1 ) );
coreMembers.put( follower2, DiscoverCoreServersProcedureTest.coreAddresses( 2 ) ); coreMembers.put( follower2, DiscoverEndpointAcquisitionServersProcedureTest.coreAddresses( 2 ) );


Set<EdgeAddresses> edges = DiscoverCoreServersProcedureTest.addresses( 4, 5 ); Set<EdgeAddresses> edges = DiscoverEndpointAcquisitionServersProcedureTest.addresses( 4, 5 );


final ClusterTopology clusterTopology = new ClusterTopology( false, coreMembers, edges ); final ClusterTopology clusterTopology = new ClusterTopology( false, coreMembers, edges );
when( topologyService.currentTopology() ).thenReturn( clusterTopology ); when( topologyService.currentTopology() ).thenReturn( clusterTopology );
Expand Down
20 changes: 10 additions & 10 deletions ...res/DiscoverCoreServersProcedureTest.java → ...pointAcquisitionServersProcedureTest.java
View file
Expand Up @@ -45,7 +45,7 @@
import static org.neo4j.coreedge.identity.RaftTestMember.member; import static org.neo4j.coreedge.identity.RaftTestMember.member;
import static org.neo4j.helpers.collection.Iterators.asList; import static org.neo4j.helpers.collection.Iterators.asList;


public class DiscoverCoreServersProcedureTest public class DiscoverEndpointAcquisitionServersProcedureTest
{ {
@Test @Test
public void shouldOnlyReturnCoreMembers() throws Exception public void shouldOnlyReturnCoreMembers() throws Exception
Expand All @@ -61,8 +61,8 @@ public void shouldOnlyReturnCoreMembers() throws Exception
final ClusterTopology clusterTopology = new ClusterTopology( false, coreMembers, addresses( 3, 4, 5 ) ); final ClusterTopology clusterTopology = new ClusterTopology( false, coreMembers, addresses( 3, 4, 5 ) );
when( coreTopologyService.currentTopology() ).thenReturn( clusterTopology ); when( coreTopologyService.currentTopology() ).thenReturn( clusterTopology );


final DiscoverCoreServersProcedure proc = final DiscoverEndpointAcquisitionServersProcedure proc =
new DiscoverCoreServersProcedure( coreTopologyService, NullLogProvider.getInstance() ); new DiscoverEndpointAcquisitionServersProcedure( coreTopologyService, NullLogProvider.getInstance() );


// when // when
final List<Object[]> members = asList( proc.apply( null, new Object[0] ) ); final List<Object[]> members = asList( proc.apply( null, new Object[0] ) );
Expand All @@ -85,8 +85,8 @@ public void shouldReturnSelfIfOnlyMemberOfTheCluster() throws Exception


final ClusterTopology clusterTopology = new ClusterTopology( false, coreMembers, addresses( 3, 4, 5 ) ); final ClusterTopology clusterTopology = new ClusterTopology( false, coreMembers, addresses( 3, 4, 5 ) );
when( coreTopologyService.currentTopology() ).thenReturn( clusterTopology ); when( coreTopologyService.currentTopology() ).thenReturn( clusterTopology );
final DiscoverCoreServersProcedure proc = final DiscoverEndpointAcquisitionServersProcedure proc =
new DiscoverCoreServersProcedure( coreTopologyService, NullLogProvider.getInstance() ); new DiscoverEndpointAcquisitionServersProcedure( coreTopologyService, NullLogProvider.getInstance() );


// when // when
final List<Object[]> members = asList( proc.apply( null, new Object[0] ) ); final List<Object[]> members = asList( proc.apply( null, new Object[0] ) );
Expand All @@ -109,8 +109,8 @@ public void shouldReturnLimitedNumberOfAddresses() throws Exception
final ClusterTopology clusterTopology = new ClusterTopology( false, coreMembers, addresses( 3, 4, 5) ); final ClusterTopology clusterTopology = new ClusterTopology( false, coreMembers, addresses( 3, 4, 5) );
when( coreTopologyService.currentTopology() ).thenReturn( clusterTopology ); when( coreTopologyService.currentTopology() ).thenReturn( clusterTopology );


final DiscoverCoreServersProcedure proc = final DiscoverEndpointAcquisitionServersProcedure proc =
new DiscoverCoreServersProcedure( coreTopologyService, NullLogProvider.getInstance() ); new DiscoverEndpointAcquisitionServersProcedure( coreTopologyService, NullLogProvider.getInstance() );


// when // when
final List<Object[]> members = asList( proc.apply( null, new Object[]{1} ) ); final List<Object[]> members = asList( proc.apply( null, new Object[]{1} ) );
Expand All @@ -133,8 +133,8 @@ public void shouldReturnAllAddressesWhenLimitInNotNumeric() throws Exception
final ClusterTopology clusterTopology = new ClusterTopology( false, coreMembers, addresses( 3, 4, 5 ) ); final ClusterTopology clusterTopology = new ClusterTopology( false, coreMembers, addresses( 3, 4, 5 ) );
when( coreTopologyService.currentTopology() ).thenReturn( clusterTopology ); when( coreTopologyService.currentTopology() ).thenReturn( clusterTopology );


final DiscoverCoreServersProcedure proc = final DiscoverEndpointAcquisitionServersProcedure proc =
new DiscoverCoreServersProcedure( coreTopologyService, NullLogProvider.getInstance() ); new DiscoverEndpointAcquisitionServersProcedure( coreTopologyService, NullLogProvider.getInstance() );


// when // when
final List<Object[]> members = asList( proc.apply( null, new Object[]{"not numeric"} ) ); final List<Object[]> members = asList( proc.apply( null, new Object[]{"not numeric"} ) );
Expand All @@ -146,7 +146,7 @@ public void shouldReturnAllAddressesWhenLimitInNotNumeric() throws Exception
static Set<EdgeAddresses> addresses( int... ids ) static Set<EdgeAddresses> addresses( int... ids )
{ {
return Arrays.stream( ids ) return Arrays.stream( ids )
.mapToObj( DiscoverCoreServersProcedureTest::edgeAddresses ) .mapToObj( DiscoverEndpointAcquisitionServersProcedureTest::edgeAddresses )
.collect( Collectors.toSet() ); .collect( Collectors.toSet() );
} }


Expand Down
4 changes: 2 additions & 2 deletions enterprise/core-edge/src/test/java/org/neo4j/coreedge/scenarios/ClusterDiscoveryIT.java
View file
Expand Up @@ -26,7 +26,7 @@


import org.neo4j.coreedge.discovery.Cluster; import org.neo4j.coreedge.discovery.Cluster;
import org.neo4j.coreedge.discovery.procedures.AcquireEndpointsProcedure; import org.neo4j.coreedge.discovery.procedures.AcquireEndpointsProcedure;
import org.neo4j.coreedge.discovery.procedures.DiscoverCoreServersProcedure; import org.neo4j.coreedge.discovery.procedures.DiscoverEndpointAcquisitionServersProcedure;
import org.neo4j.kernel.api.KernelAPI; import org.neo4j.kernel.api.KernelAPI;
import org.neo4j.kernel.api.KernelTransaction; import org.neo4j.kernel.api.KernelTransaction;
import org.neo4j.kernel.api.KernelTransaction.Type; import org.neo4j.kernel.api.KernelTransaction.Type;
Expand Down Expand Up @@ -116,7 +116,7 @@ private List<Object[]> discoverClusterMembers( GraphDatabaseFacade db ) throws T


// when // when
return asList( statement.readOperations().procedureCallRead( return asList( statement.readOperations().procedureCallRead(
procedureName( "dbms", "cluster", DiscoverCoreServersProcedure.NAME ), procedureName( "dbms", "cluster", DiscoverEndpointAcquisitionServersProcedure.NAME ),
new Object[0] ) ); new Object[0] ) );
} }


Expand Down

0 comments on commit 8dd31da

Please sign in to comment.