diff options
author | Tor Brede Vekterli <vekterli@yahooinc.com> | 2022-05-31 15:26:04 +0200 |
---|---|---|
committer | gjoranv <gv@verizonmedia.com> | 2022-06-08 11:45:22 +0200 |
commit | 506cc95a1a6964b57e348be704357a72773aed60 (patch) | |
tree | 6fa992da69e52a5e32be53b0b8d1401acce67edf /vespaclient-container-plugin/src/main/java | |
parent | c0b8b728ff8104b8f1e8c4445c08adf22f53c892 (diff) |
Use DocumentOnly-fieldset by default
Also remove deprecated and unsupported header-only visitor parameter
Diffstat (limited to 'vespaclient-container-plugin/src/main/java')
-rw-r--r-- | vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/resource/DocumentV1ApiHandler.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/resource/DocumentV1ApiHandler.java b/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/resource/DocumentV1ApiHandler.java index d3f8bb40b04..8c2e39d595e 100644 --- a/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/resource/DocumentV1ApiHandler.java +++ b/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/resource/DocumentV1ApiHandler.java @@ -22,6 +22,7 @@ import com.yahoo.document.TestAndSetCondition; import com.yahoo.document.config.DocumentmanagerConfig; import com.yahoo.document.fieldset.AllFields; import com.yahoo.document.fieldset.DocIdOnly; +import com.yahoo.document.fieldset.DocumentOnly; import com.yahoo.document.idstring.IdIdString; import com.yahoo.document.json.DocumentOperationType; import com.yahoo.document.json.JsonReader; @@ -377,8 +378,7 @@ public class DocumentV1ApiHandler extends AbstractRequestHandler { StorageCluster destination = resolveCluster(Optional.of(requireProperty(request, DESTINATION_CLUSTER)), clusters); VisitorParameters parameters = parseParameters(request, path); parameters.setRemoteDataHandler("[Content:cluster=" + destination.name() + "]"); // Bypass indexing. - // TODO Vespa 8: change to DocumentOnly.NAME - parameters.setFieldSet(AllFields.NAME); + parameters.setFieldSet(DocumentOnly.NAME); return () -> { visitWithRemote(request, parameters, handler); return true; // VisitorSession has its own throttle handling. @@ -1102,8 +1102,8 @@ public class DocumentV1ApiHandler extends AbstractRequestHandler { throw new IllegalArgumentException("Must set 'cluster' parameter to a valid content cluster id when visiting at a root /document/v1/ level"); VisitorParameters parameters = parseCommonParameters(request, path, cluster); - // TODO Vespa 8: change to DocumentOnly.NAME - parameters.setFieldSet(getProperty(request, FIELD_SET).orElse(path.documentType().map(type -> type + ":[document]").orElse(AllFields.NAME))); + // TODO can the else-case be safely reduced to always be DocumentOnly.NAME? + parameters.setFieldSet(getProperty(request, FIELD_SET).orElse(path.documentType().map(type -> type + ":[document]").orElse(DocumentOnly.NAME))); parameters.setMaxTotalHits(wantedDocumentCount); parameters.visitInconsistentBuckets(true); long timeoutMs = Math.max(1, request.getTimeout(MILLISECONDS) - handlerTimeout.toMillis()); |