From f74b0b8191c12106aae04a2807861aa8ae092f7c Mon Sep 17 00:00:00 2001 From: Gao Binlong Date: Mon, 25 Mar 2024 20:42:47 +0800 Subject: [PATCH] Modify changelog & comment Signed-off-by: Gao Binlong --- CHANGELOG.md | 2 +- .../test/java/org/opensearch/ingest/IngestServiceTests.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 62e2540e32713..344f643a55e23 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -113,7 +113,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), ### Removed ### Fixed -- Fix bulk upsert ignores the default_pipeline and final_pipeline when auto-created index matches with the index template +- Fix bulk upsert ignores the default_pipeline and final_pipeline when auto-created index matches the index template ([#12891](https://github.com/opensearch-project/OpenSearch/pull/12891)) ### Security diff --git a/server/src/test/java/org/opensearch/ingest/IngestServiceTests.java b/server/src/test/java/org/opensearch/ingest/IngestServiceTests.java index 2a7a8e4531c55..01248dda3980b 100644 --- a/server/src/test/java/org/opensearch/ingest/IngestServiceTests.java +++ b/server/src/test/java/org/opensearch/ingest/IngestServiceTests.java @@ -1583,7 +1583,7 @@ public void testResolveRequiredOrDefaultPipelineDefaultPipeline() { assertThat(indexRequest.isPipelineResolved(), is(true)); assertThat(indexRequest.getPipeline(), equalTo("default-pipeline")); - // index name matches with ITMD within bulk upsert: + // index name matches with ITMD for bulk upsert IndexRequest upsertRequest = new IndexRequest().source(emptyMap()); UpdateRequest updateRequest = new UpdateRequest("idx", "id1").upsert(upsertRequest).script(mockScript("1")); result = IngestService.resolvePipelines(updateRequest, TransportBulkAction.getIndexWriteRequest(updateRequest), metadata); @@ -1628,7 +1628,7 @@ public void testResolveFinalPipeline() { assertThat(indexRequest.getPipeline(), equalTo("_none")); assertThat(indexRequest.getFinalPipeline(), equalTo("final-pipeline")); - // index name matches with ITMD within bulk upsert: + // index name matches with ITMD for bulk upsert: IndexRequest upsertRequest = new IndexRequest().source(emptyMap()); UpdateRequest updateRequest = new UpdateRequest("idx", "id1").upsert(upsertRequest).script(mockScript("1")); result = IngestService.resolvePipelines(updateRequest, TransportBulkAction.getIndexWriteRequest(updateRequest), metadata);