From ec495469099fc26c64736fd103facc25f8370a26 Mon Sep 17 00:00:00 2001 From: Håvard Pettersen Date: Fri, 28 Apr 2023 13:07:55 +0200 Subject: pick up create flag for put operations --- .../document/restapi/resource/DocumentV1ApiHandler.java | 15 +++++++++------ .../document/restapi/resource/DocumentV1ApiTest.java | 3 ++- 2 files changed, 11 insertions(+), 7 deletions(-) (limited to 'vespaclient-container-plugin/src') 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 45c93ec0755..1281bece66e 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 @@ -460,15 +460,17 @@ public class DocumentV1ApiHandler extends AbstractRequestHandler { return new ForwardingContentChannel(in -> { enqueueAndDispatch(request, handler, () -> { - ParsedDocumentOperation put = parser.parsePut(in, path.id().toString()); - getProperty(request, CONDITION).map(TestAndSetCondition::new).ifPresent(c -> put.operation().setCondition(c)); + ParsedDocumentOperation parsed = parser.parsePut(in, path.id().toString()); + DocumentPut put = (DocumentPut)parsed.operation(); + getProperty(request, CONDITION).map(TestAndSetCondition::new).ifPresent(c -> put.setCondition(c)); + getProperty(request, CREATE, booleanParser).ifPresent(put::setCreateIfNonExistent); DocumentOperationParameters parameters = parametersFromRequest(request, ROUTE) .withResponseHandler(response -> { outstanding.decrementAndGet(); - updatePutMetrics(response.outcome(), latencyOf(request)); - handleFeedOperation(path, put.fullyApplied(), handler, response); + updatePutMetrics(response.outcome(), latencyOf(request), put.getCreateIfNonExistent()); + handleFeedOperation(path, parsed.fullyApplied(), handler, response); }); - return () -> dispatchOperation(() -> asyncSession.put((DocumentPut)put.operation(), parameters)); + return () -> dispatchOperation(() -> asyncSession.put(put, parameters)); }); }); } @@ -1091,7 +1093,8 @@ public class DocumentV1ApiHandler extends AbstractRequestHandler { private static double latencyOf(HttpRequest r) { return (System.nanoTime() - r.relativeCreatedAtNanoTime()) / 1e+9d; } - private void updatePutMetrics(Outcome outcome, double latency) { + private void updatePutMetrics(Outcome outcome, double latency, boolean create) { + if (create && outcome == Outcome.NOT_FOUND) outcome = Outcome.SUCCESS; // >_< incrementMetricNumOperations(); incrementMetricNumPuts(); sampleLatency(latency); switch (outcome) { case SUCCESS -> incrementMetricSucceeded(); diff --git a/vespaclient-container-plugin/src/test/java/com/yahoo/document/restapi/resource/DocumentV1ApiTest.java b/vespaclient-container-plugin/src/test/java/com/yahoo/document/restapi/resource/DocumentV1ApiTest.java index 1d81c45daf1..8f3fc27488f 100644 --- a/vespaclient-container-plugin/src/test/java/com/yahoo/document/restapi/resource/DocumentV1ApiTest.java +++ b/vespaclient-container-plugin/src/test/java/com/yahoo/document/restapi/resource/DocumentV1ApiTest.java @@ -687,6 +687,7 @@ public class DocumentV1ApiTest { access.session.expect((put, parameters) -> { DocumentPut expectedPut = new DocumentPut(doc2); expectedPut.setCondition(new TestAndSetCondition("test it")); + expectedPut.setCreateIfNonExistent(true); assertEquals(expectedPut, put); assertEquals(parameters().withTraceLevel(9), parameters); Trace trace = new Trace(9); @@ -697,7 +698,7 @@ public class DocumentV1ApiTest { parameters.responseHandler().get().handleResponse(new DocumentResponse(0, doc2, trace)); return new Result(); }); - response = driver.sendRequest("http://localhost/document/v1/space/music/number/1/two?condition=test%20it&tracelevel=9", POST, + response = driver.sendRequest("http://localhost/document/v1/space/music/number/1/two?create=true&condition=test%20it&tracelevel=9", POST, "{" + " \"fields\": {" + " \"artist\": \"Asa-Chan & Jun-Ray\"," + -- cgit v1.2.3