Inconsistency between java client and OpenSearch update by query resp…

…onses Signed-off-by: Andriy Redko <[email protected]>
opensearch-project · Dec 4, 2024 · c1eec75 · c1eec75
1 parent aefc6cb
commit c1eec75
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 0 deletions.
diff --git a/spring-data-opensearch/src/main/java/org/opensearch/data/client/osc/ResponseConverter.java b/spring-data-opensearch/src/main/java/org/opensearch/data/client/osc/ResponseConverter.java
@@ -489,6 +489,10 @@ public ByQueryResponse byQueryResponse(UpdateByQueryResponse response) {
             builder.withDeleted(response.deleted());
         }
 
+        if (response.updated() != null) {
+            builder.withUpdated(response.updated());
+        }
+
         if (response.batches() != null) {
             builder.withBatches(Math.toIntExact(response.batches()));
         }

diff --git a/.../test/java/org/springframework/data/elasticsearch/core/ElasticsearchIntegrationTests.java b/.../test/java/org/springframework/data/elasticsearch/core/ElasticsearchIntegrationTests.java
@@ -3669,6 +3669,36 @@ public void shouldDeleteDocumentForGivenQueryUsingParameters() {
                 IndexCoordinates.of(indexName));
         assertThat(searchHits.getTotalHits()).isEqualTo(0);
     }
+
+    @Test // OS-GH-387
+    public void shouldUpdateDocumentForGivenQueryUsingParameters() {
+        // Given
+        String documentId = nextIdAsString();
+        SampleEntity sampleEntity = SampleEntity.builder().id(documentId).message("some message")
+                .version(System.currentTimeMillis()).build();
+
+        IndexQuery indexQuery = getIndexQuery(sampleEntity);
+        String indexName = indexNameProvider.indexName();
+
+        operations.index(indexQuery, IndexCoordinates.of(indexName));
+
+        // When
+        final Query query = getTermQuery("id", documentId);
+        org.springframework.data.elasticsearch.core.document.Document document = org.springframework.data.elasticsearch.core.document.Document
+                .create();
+        document.put("message", "another message");
+
+        final UpdateQuery updateQuery = UpdateQuery.builder(query).withSlices(2).withDocument(document).build();
+        ByQueryResponse result = operations.updateByQuery(updateQuery, IndexCoordinates.of(indexName));
+
+        // Then
+        assertThat(result.getDeleted()).isEqualTo(0);
+        assertThat(result.getUpdated()).isEqualTo(1);
+        SearchHits<SampleEntity> searchHits = operations.search(query, SampleEntity.class,
+                IndexCoordinates.of(indexName));
+        assertThat(searchHits.getTotalHits()).isEqualTo(1);
+    }
+
 
     @Test
     public void shouldDeleteDocumentForGivenQueryAndUnavailableIndex() {