diff options
4 files changed, 19 insertions, 13 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 { } } diff --git a/document/src/main/java/com/yahoo/document/fieldset/FieldSetRepo.java b/document/src/main/java/com/yahoo/document/fieldset/FieldSetRepo.java index 285c78ef0ab..905376e81ca 100644 --- a/document/src/main/java/com/yahoo/document/fieldset/FieldSetRepo.java +++ b/document/src/main/java/com/yahoo/document/fieldset/FieldSetRepo.java @@ -34,21 +34,24 @@ public class FieldSetRepo { FieldSet parseFieldCollection(DocumentTypeManager docMan, String docType, String fieldNames) { DocumentType type = docMan.getDocumentType(docType); if (type == null) { - throw new IllegalArgumentException("Unknown document type " + docType); + throw new IllegalArgumentException("Unknown document type " + docType); } - StringTokenizer tokenizer = new StringTokenizer(fieldNames, ","); FieldCollection collection = new FieldCollection(type); - - while (tokenizer.hasMoreTokens()) { - String token = tokenizer.nextToken(); - Field f = type.getField(token); - if (f == null) { - throw new IllegalArgumentException("No such field " + token); + if (fieldNames.equals("[document]")) { + collection.addAll(type.fieldSet()); + } + else { + StringTokenizer tokenizer = new StringTokenizer(fieldNames, ","); + while (tokenizer.hasMoreTokens()) { + String token = tokenizer.nextToken(); + Field f = type.getField(token); + if (f == null) { + throw new IllegalArgumentException("No such field " + token); + } + collection.add(f); } - collection.add(f); } - return collection; } |