honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix bwc test for hashing / routing and simplify test to be a real unittest

This commit is contained in:
Simon Willnauer 2015-10-08 16:51:58 +02:00
parent 7329493783
commit 61c7302bfb
1 changed files with 23 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
core/src/test/java/org/elasticsearch/cluster/routing/RoutingBackwardCompatibilityTests.java
View File

@ -38,9 +38,6 @@ import java.util.Arrays;
public class RoutingBackwardCompatibilityTests extends ESTestCase {
public void testBackwardCompatibility() throws Exception {
Path baseDir = createTempDir();
Node node = new Node(Settings.builder().put("path.home", baseDir.toString()).build());
try {
try (BufferedReader reader = new BufferedReader(new InputStreamReader(RoutingBackwardCompatibilityTests.class.getResourceAsStream("/org/elasticsearch/cluster/routing/shard_routes.txt"), "UTF-8"))) {
for (String line = reader.readLine(); line != null; line = reader.readLine()) {
if (line.startsWith("#")) { // comment
@ -53,10 +50,10 @@ public class RoutingBackwardCompatibilityTests extends ESTestCase {
final String type = parts[2];
final String id = parts[3];
final String routing = "null".equals(parts[4]) ? null : parts[4];
final int pre20ExpectedShardId = Integer.parseInt(parts[5]);
final int pre20ExpectedShardId = Integer.parseInt(parts[5]); // not needed anymore - old hashing is gone
final int currentExpectedShard = Integer.parseInt(parts[6]);
OperationRouting operationRouting = node.injector().getInstance(OperationRouting.class);
OperationRouting operationRouting = new OperationRouting(Settings.EMPTY, null);
for (Version version : VersionUtils.allVersions()) {
final Settings settings = settings(version).build();
IndexMetaData indexMetaData = IndexMetaData.builder(index).settings(settings).numberOfShards(numberOfShards).numberOfReplicas(randomInt(3)).build();
@ -64,17 +61,9 @@ public class RoutingBackwardCompatibilityTests extends ESTestCase {
RoutingTable routingTable = RoutingTable.builder().addAsNew(indexMetaData).build();
ClusterState clusterState = ClusterState.builder(ClusterName.DEFAULT).metaData(metaData).routingTable(routingTable).build();
final int shardId = operationRouting.indexShards(clusterState, index, type, id, routing).shardId().getId();
if (version.before(Version.V_2_0_0_beta1)) {
assertEquals(pre20ExpectedShardId, shardId);
} else {
assertEquals(currentExpectedShard, shardId);
}
}
}
}
} finally {
node.close();
}
}
}