narendly commented on a change in pull request #844: Implement setRoutingData
for MetadataStoreDirectoryService
URL: https://github.com/apache/helix/pull/844#discussion_r386767904
##########
File path:
helix-rest/src/test/java/org/apache/helix/rest/metadatastore/accessor/TestZkRoutingDataWriter.java
##########
@@ -132,61 +132,86 @@ public void testSetRoutingData() {
public void testAddMetadataStoreRealmNonLeader() {
MockWriter mockWriter = new MockWriter(DUMMY_NAMESPACE, ZK_ADDR);
mockWriter.addMetadataStoreRealm(DUMMY_REALM);
- Assert.assertEquals("PUT", mockWriter.calledRequest.getMethod());
+ Assert.assertEquals(mockWriter.calledRequest.getMethod(), "PUT");
List<String> expectedUrlParams = Arrays
.asList(MetadataStoreRoutingConstants.MSDS_NAMESPACES_URL_PREFIX,
DUMMY_NAMESPACE,
MetadataStoreRoutingConstants.MSDS_GET_ALL_REALMS_ENDPOINT,
DUMMY_REALM);
String expectedUrl =
getBaseUri().toString() + String.join("/",
expectedUrlParams).replaceAll("//", "/")
.substring(1);
- Assert.assertEquals(expectedUrl,
mockWriter.calledRequest.getURI().toString());
+ Assert.assertEquals(mockWriter.calledRequest.getURI().toString(),
expectedUrl);
mockWriter.close();
}
@Test(dependsOnMethods = "testAddMetadataStoreRealmNonLeader")
public void testDeleteMetadataStoreRealmNonLeader() {
MockWriter mockWriter = new MockWriter(DUMMY_NAMESPACE, ZK_ADDR);
mockWriter.deleteMetadataStoreRealm(DUMMY_REALM);
- Assert.assertEquals("DELETE", mockWriter.calledRequest.getMethod());
+ Assert.assertEquals(mockWriter.calledRequest.getMethod(), "DELETE");
List<String> expectedUrlParams = Arrays
.asList(MetadataStoreRoutingConstants.MSDS_NAMESPACES_URL_PREFIX,
DUMMY_NAMESPACE,
MetadataStoreRoutingConstants.MSDS_GET_ALL_REALMS_ENDPOINT,
DUMMY_REALM);
String expectedUrl =
getBaseUri().toString() + String.join("/",
expectedUrlParams).replaceAll("//", "/")
.substring(1);
- Assert.assertEquals(expectedUrl,
mockWriter.calledRequest.getURI().toString());
+ Assert.assertEquals(mockWriter.calledRequest.getURI().toString(),
expectedUrl);
mockWriter.close();
}
@Test(dependsOnMethods = "testDeleteMetadataStoreRealmNonLeader")
public void testAddShardingKeyNonLeader() {
MockWriter mockWriter = new MockWriter(DUMMY_NAMESPACE, ZK_ADDR);
mockWriter.addShardingKey(DUMMY_REALM, DUMMY_SHARDING_KEY);
- Assert.assertEquals("PUT", mockWriter.calledRequest.getMethod());
+ Assert.assertEquals(mockWriter.calledRequest.getMethod(), "PUT");
List<String> expectedUrlParams = Arrays
.asList(MetadataStoreRoutingConstants.MSDS_NAMESPACES_URL_PREFIX,
DUMMY_NAMESPACE,
MetadataStoreRoutingConstants.MSDS_GET_ALL_REALMS_ENDPOINT,
DUMMY_REALM,
MetadataStoreRoutingConstants.MSDS_GET_ALL_SHARDING_KEYS_ENDPOINT,
DUMMY_SHARDING_KEY);
String expectedUrl =
getBaseUri().toString() + String.join("/",
expectedUrlParams).replaceAll("//", "/")
.substring(1);
- Assert.assertEquals(expectedUrl,
mockWriter.calledRequest.getURI().toString());
+ Assert.assertEquals(mockWriter.calledRequest.getURI().toString(),
expectedUrl);
mockWriter.close();
}
@Test(dependsOnMethods = "testAddShardingKeyNonLeader")
public void testDeleteShardingKeyNonLeader() {
MockWriter mockWriter = new MockWriter(DUMMY_NAMESPACE, ZK_ADDR);
mockWriter.deleteShardingKey(DUMMY_REALM, DUMMY_SHARDING_KEY);
- Assert.assertEquals("DELETE", mockWriter.calledRequest.getMethod());
+ Assert.assertEquals(mockWriter.calledRequest.getMethod(), "DELETE");
List<String> expectedUrlParams = Arrays
.asList(MetadataStoreRoutingConstants.MSDS_NAMESPACES_URL_PREFIX,
DUMMY_NAMESPACE,
MetadataStoreRoutingConstants.MSDS_GET_ALL_REALMS_ENDPOINT,
DUMMY_REALM,
MetadataStoreRoutingConstants.MSDS_GET_ALL_SHARDING_KEYS_ENDPOINT,
DUMMY_SHARDING_KEY);
String expectedUrl =
getBaseUri().toString() + String.join("/",
expectedUrlParams).replaceAll("//", "/")
.substring(1);
- Assert.assertEquals(expectedUrl,
mockWriter.calledRequest.getURI().toString());
+ Assert.assertEquals(mockWriter.calledRequest.getURI().toString(),
expectedUrl);
mockWriter.close();
}
+
+ @Test(dependsOnMethods = "testDeleteShardingKeyNonLeader")
+ public void testSetRoutingDataNonLeader() {
+ MockWriter mockWriter = new MockWriter(DUMMY_NAMESPACE, ZK_ADDR);
+ Map<String, List<String>> testRoutingDataMap =
+ ImmutableMap.of(DUMMY_REALM,
Collections.singletonList(DUMMY_SHARDING_KEY));
+ mockWriter.setRoutingData(testRoutingDataMap);
+ Assert.assertEquals(mockWriter.calledRequest.getMethod(), "PUT");
+ List<String> expectedUrlParams = Arrays
+ .asList(MetadataStoreRoutingConstants.MSDS_NAMESPACES_URL_PREFIX,
DUMMY_NAMESPACE,
+ MetadataStoreRoutingConstants.MSDS_GET_ALL_ROUTING_DATA_ENDPOINT);
+ String expectedUrl =
+ getBaseUri().toString() + String.join("/",
expectedUrlParams).replaceAll("//", "/")
+ .substring(1);
+ Assert.assertEquals(mockWriter.calledRequest.getURI().toString(),
expectedUrl);
+ mockWriter.close();
+ }
+
+ private void clearRoutingDataPath() {
+ for (String zkRealm : _baseAccessor
+ .getChildNames(MetadataStoreRoutingConstants.ROUTING_DATA_PATH,
AccessOption.PERSISTENT)) {
+ _baseAccessor.remove(MetadataStoreRoutingConstants.ROUTING_DATA_PATH +
"/" + zkRealm,
+ AccessOption.PERSISTENT);
Review comment:
It would be better to stick with ZkClient if possible outside of helix-core
module.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
