summaryrefslogtreecommitdiffstats
path: root/clustercontroller-reindexer
diff options
context:
space:
mode:
authorJon Marius Venstad <venstad@gmail.com>2020-11-05 20:33:08 +0100
committerJon Marius Venstad <venstad@gmail.com>2020-11-05 20:33:08 +0100
commit6ad9ce9460a3d8a3743234960164a14dfa952151 (patch)
tree771e460559df5ca431ee3852e1f8cec45a6a1b92 /clustercontroller-reindexer
parent392f878cdd4e636b8b20d3188dd20ba16bc3393e (diff)
Use fieldSet :[document]
Diffstat (limited to 'clustercontroller-reindexer')
-rw-r--r--clustercontroller-reindexer/src/main/java/ai/vespa/reindexing/Reindexer.java2
-rw-r--r--clustercontroller-reindexer/src/test/java/ai/vespa/reindexing/ReindexerTest.java4
-rw-r--r--clustercontroller-reindexer/src/test/resources/schemas/music.sd3
3 files changed, 6 insertions, 3 deletions
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 420e5258715..8bcba483156 100644
--- a/clustercontroller-reindexer/src/main/java/ai/vespa/reindexing/Reindexer.java
+++ b/clustercontroller-reindexer/src/main/java/ai/vespa/reindexing/Reindexer.java
@@ -153,7 +153,7 @@ public class Reindexer {
VisitorParameters parameters = new VisitorParameters(type.getName());
parameters.setRemoteDataHandler(cluster.name());
parameters.setResumeToken(progress);
- parameters.setFieldSet(type.getName() + ":" + type.getFields().stream().map(Field::getName).collect(joining(",")));
+ parameters.setFieldSet(type.getName() + ":[document]");
parameters.setPriority(DocumentProtocol.Priority.LOW_1);
parameters.setRoute(cluster.route());
parameters.setBucketSpace(cluster.bucketOf(type));
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 b3a83884c25..263c32739a7 100644
--- a/clustercontroller-reindexer/src/test/java/ai/vespa/reindexing/ReindexerTest.java
+++ b/clustercontroller-reindexer/src/test/java/ai/vespa/reindexing/ReindexerTest.java
@@ -84,11 +84,11 @@ class ReindexerTest {
}
@Test
- void parameters() throws ReindexingLockException {
+ void parameters() {
Reindexer reindexer = new Reindexer(cluster, Map.of(), database, access, clock);
ProgressToken token = new ProgressToken();
VisitorParameters parameters = reindexer.createParameters(music, token);
- assertEquals("music:artist", parameters.getFieldSet());
+ assertEquals("music:[document]", parameters.getFieldSet());
assertSame(token, parameters.getResumeToken());
assertEquals("default", parameters.getBucketSpace());
assertEquals("[Storage:cluster=cluster;clusterconfigid=id]", parameters.getRoute().toString());
diff --git a/clustercontroller-reindexer/src/test/resources/schemas/music.sd b/clustercontroller-reindexer/src/test/resources/schemas/music.sd
index a289f5a686b..e55fff26ea5 100644
--- a/clustercontroller-reindexer/src/test/resources/schemas/music.sd
+++ b/clustercontroller-reindexer/src/test/resources/schemas/music.sd
@@ -1,5 +1,8 @@
# Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
search music {
+ field auxilliary type int {
+ indexing: random 123 | summary
+ }
document music {
field artist type string { }
}