From 7efd5dfa1111e0aa94b97fbca06852de95258aa5 Mon Sep 17 00:00:00 2001 From: Jon Marius Venstad Date: Wed, 23 Dec 2020 12:56:32 +0100 Subject: Replace use of [Storage... with [Content... and avoid overriding config id --- .../src/main/java/ai/vespa/reindexing/Reindexer.java | 10 +++------- .../main/java/ai/vespa/reindexing/ReindexingMaintainer.java | 1 - .../src/test/java/ai/vespa/reindexing/ReindexerTest.java | 6 +++--- .../java/ai/vespa/reindexing/ReindexingMaintainerTest.java | 2 +- 4 files changed, 7 insertions(+), 12 deletions(-) (limited to 'clustercontroller-reindexer') diff --git a/clustercontroller-reindexer/src/main/java/ai/vespa/reindexing/Reindexer.java b/clustercontroller-reindexer/src/main/java/ai/vespa/reindexing/Reindexer.java index fd887a4196b..3b7c9160b53 100644 --- a/clustercontroller-reindexer/src/main/java/ai/vespa/reindexing/Reindexer.java +++ b/clustercontroller-reindexer/src/main/java/ai/vespa/reindexing/Reindexer.java @@ -217,12 +217,10 @@ public class Reindexer { static class Cluster { private final String name; - private final String configId; private final Map documentBuckets; - Cluster(String name, String configId, Map documentBuckets) { + Cluster(String name, Map documentBuckets) { this.name = requireNonNull(name); - this.configId = requireNonNull(configId); this.documentBuckets = Map.copyOf(documentBuckets); } @@ -231,7 +229,7 @@ public class Reindexer { } String route() { - return "[Storage:cluster=" + name + ";clusterconfigid=" + configId + "]"; + return "[Content:cluster=" + name + "]"; } String bucketSpaceOf(DocumentType documentType) { @@ -244,20 +242,18 @@ public class Reindexer { if (o == null || getClass() != o.getClass()) return false; Cluster cluster = (Cluster) o; return name.equals(cluster.name) && - configId.equals(cluster.configId) && documentBuckets.equals(cluster.documentBuckets); } @Override public int hashCode() { - return Objects.hash(name, configId, documentBuckets); + return Objects.hash(name, documentBuckets); } @Override public String toString() { return "Cluster{" + "name='" + name + '\'' + - ", configId='" + configId + '\'' + ", documentBuckets=" + documentBuckets + '}'; } diff --git a/clustercontroller-reindexer/src/main/java/ai/vespa/reindexing/ReindexingMaintainer.java b/clustercontroller-reindexer/src/main/java/ai/vespa/reindexing/ReindexingMaintainer.java index 8668ed037ef..e62314429fb 100644 --- a/clustercontroller-reindexer/src/main/java/ai/vespa/reindexing/ReindexingMaintainer.java +++ b/clustercontroller-reindexer/src/main/java/ai/vespa/reindexing/ReindexingMaintainer.java @@ -141,7 +141,6 @@ public class ReindexingMaintainer extends AbstractComponent { return clusters.storage().stream() .filter(storage -> storage.name().equals(name)) .map(storage -> new Cluster(name, - storage.configid(), bucketSpaces.cluster(name) .documentType().entrySet().stream() .collect(toMap(entry -> manager.getDocumentType(entry.getKey()), diff --git a/clustercontroller-reindexer/src/test/java/ai/vespa/reindexing/ReindexerTest.java b/clustercontroller-reindexer/src/test/java/ai/vespa/reindexing/ReindexerTest.java index 9a88d8aad1f..01586e06015 100644 --- a/clustercontroller-reindexer/src/test/java/ai/vespa/reindexing/ReindexerTest.java +++ b/clustercontroller-reindexer/src/test/java/ai/vespa/reindexing/ReindexerTest.java @@ -45,7 +45,7 @@ class ReindexerTest { final DocumentmanagerConfig musicConfig = Deriver.getDocumentManagerConfig("src/test/resources/schemas/music.sd").build(); final DocumentTypeManager manager = new DocumentTypeManager(musicConfig); final DocumentType music = manager.getDocumentType("music"); - final Cluster cluster = new Cluster("cluster", "id", Map.of(music, "default")); + final Cluster cluster = new Cluster("cluster", Map.of(music, "default")); final MockMetric metric = new MockMetric(); final ManualClock clock = new ManualClock(Instant.EPOCH); @@ -59,7 +59,7 @@ class ReindexerTest { @Test void throwsWhenUnknownBuckets() { assertThrows(NullPointerException.class, - () -> new Reindexer(new Cluster("cluster", "id", Map.of()), Map.of(music, Instant.EPOCH), database, failIfCalled, metric, clock, 0.2)); + () -> new Reindexer(new Cluster("cluster", Map.of()), Map.of(music, Instant.EPOCH), database, failIfCalled, metric, clock, 0.2)); } @Test @@ -84,7 +84,7 @@ class ReindexerTest { assertEquals("music:[document]", parameters.getFieldSet()); assertSame(token, parameters.getResumeToken()); assertEquals("default", parameters.getBucketSpace()); - assertEquals("[Storage:cluster=cluster;clusterconfigid=id]", parameters.getRoute().toString()); + assertEquals("[Content:cluster=cluster]", parameters.getRoute().toString()); assertEquals("cluster", parameters.getRemoteDataHandler()); assertEquals("music", parameters.getDocumentSelection()); assertEquals(DocumentProtocol.Priority.NORMAL_3, parameters.getPriority()); diff --git a/clustercontroller-reindexer/src/test/java/ai/vespa/reindexing/ReindexingMaintainerTest.java b/clustercontroller-reindexer/src/test/java/ai/vespa/reindexing/ReindexingMaintainerTest.java index afa68debadb..f69c5d28a01 100644 --- a/clustercontroller-reindexer/src/test/java/ai/vespa/reindexing/ReindexingMaintainerTest.java +++ b/clustercontroller-reindexer/src/test/java/ai/vespa/reindexing/ReindexingMaintainerTest.java @@ -43,7 +43,7 @@ class ReindexingMaintainerTest { .build(), manager)); - assertEquals(new Cluster("cluster", "configId", Map.of(manager.getDocumentType("music"), "default")), + assertEquals(new Cluster("cluster", Map.of(manager.getDocumentType("music"), "default")), parseCluster("cluster", new ClusterListConfig.Builder() .storage(new ClusterListConfig.Storage.Builder() -- cgit v1.2.3