From e450460f3f2266d3e16542d82f9d7ce45e25febc Mon Sep 17 00:00:00 2001 From: Mridula Date: Tue, 1 Jul 2025 17:44:03 +0100 Subject: [PATCH 1/7] fixed failing pinned retriever test --- muted-tests.yml | 3 --- .../rest-api-spec/test/rrf/950_pinned_interaction.yml | 2 -- 2 files changed, 5 deletions(-) diff --git a/muted-tests.yml b/muted-tests.yml index 5c4e29a834537..e601ef820e691 100644 --- a/muted-tests.yml +++ b/muted-tests.yml @@ -509,9 +509,6 @@ tests: - class: org.elasticsearch.qa.verify_version_constants.VerifyVersionConstantsIT method: testLuceneVersionConstant issue: https://github.com/elastic/elasticsearch/issues/125638 -- class: org.elasticsearch.xpack.rank.rrf.RRFRankClientYamlTestSuiteIT - method: test {yaml=rrf/950_pinned_interaction/rrf with pinned retriever as a sub-retriever} - issue: https://github.com/elastic/elasticsearch/issues/129845 - class: org.elasticsearch.gradle.internal.InternalDistributionBwcSetupPluginFuncTest method: "builds distribution from branches via archives extractedAssemble [bwcDistVersion: 8.2.1, bwcProject: bugfix, expectedAssembleTaskName: extractedAssemble, #2]" diff --git a/x-pack/plugin/rank-rrf/src/yamlRestTest/resources/rest-api-spec/test/rrf/950_pinned_interaction.yml b/x-pack/plugin/rank-rrf/src/yamlRestTest/resources/rest-api-spec/test/rrf/950_pinned_interaction.yml index e5629b7715994..2041a55a3613b 100644 --- a/x-pack/plugin/rank-rrf/src/yamlRestTest/resources/rest-api-spec/test/rrf/950_pinned_interaction.yml +++ b/x-pack/plugin/rank-rrf/src/yamlRestTest/resources/rest-api-spec/test/rrf/950_pinned_interaction.yml @@ -92,7 +92,5 @@ setup: - match: { hits.total.value: 5 } - match: { hits.hits.0._id: doc1 } - lt: { hits.hits.0._score: 100.0 } - - match: { hits.hits.1._id: doc4 } - - match: { hits.hits.2._id: doc5 } From 0312cf3af43b4284e55383d29ebbd27eb682dfcd Mon Sep 17 00:00:00 2001 From: Mridula Date: Tue, 1 Jul 2025 18:03:09 +0100 Subject: [PATCH 2/7] Update docs/changelog/130402.yaml --- docs/changelog/130402.yaml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 docs/changelog/130402.yaml diff --git a/docs/changelog/130402.yaml b/docs/changelog/130402.yaml new file mode 100644 index 0000000000000..31d788b23fc75 --- /dev/null +++ b/docs/changelog/130402.yaml @@ -0,0 +1,5 @@ +pr: 130402 +summary: "Fixed RRF YAML REST Test: `rrf with pinned retriever as a sub-retriever`" +area: Relevance +type: bug +issues: [] From 4a17144afa3a4386c33c960b4971c8607c07189e Mon Sep 17 00:00:00 2001 From: Mridula Date: Wed, 2 Jul 2025 13:46:20 +0100 Subject: [PATCH 3/7] Delete docs/changelog/130402.yaml --- docs/changelog/130402.yaml | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 docs/changelog/130402.yaml diff --git a/docs/changelog/130402.yaml b/docs/changelog/130402.yaml deleted file mode 100644 index 31d788b23fc75..0000000000000 --- a/docs/changelog/130402.yaml +++ /dev/null @@ -1,5 +0,0 @@ -pr: 130402 -summary: "Fixed RRF YAML REST Test: `rrf with pinned retriever as a sub-retriever`" -area: Relevance -type: bug -issues: [] From 9125b3882cc70fe07c4cf3bfa0713fe686bad04a Mon Sep 17 00:00:00 2001 From: Mridula Date: Wed, 2 Jul 2025 14:23:42 +0100 Subject: [PATCH 4/7] Worked on the PR comments --- .../test/rrf/950_pinned_interaction.yml | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/x-pack/plugin/rank-rrf/src/yamlRestTest/resources/rest-api-spec/test/rrf/950_pinned_interaction.yml b/x-pack/plugin/rank-rrf/src/yamlRestTest/resources/rest-api-spec/test/rrf/950_pinned_interaction.yml index 2041a55a3613b..434bf4805859b 100644 --- a/x-pack/plugin/rank-rrf/src/yamlRestTest/resources/rest-api-spec/test/rrf/950_pinned_interaction.yml +++ b/x-pack/plugin/rank-rrf/src/yamlRestTest/resources/rest-api-spec/test/rrf/950_pinned_interaction.yml @@ -77,20 +77,15 @@ setup: retriever: rrf: retrievers: - - - standard: - query: - match: { text: "document" } - pinned: ids: ["doc4", "doc5"] retriever: standard: query: - match: { text: "document" } - - - match: { hits.total.value: 5 } - - match: { hits.hits.0._id: doc1 } - - lt: { hits.hits.0._score: 100.0 } + match_none: {} + - match: { hits.total.value: 2 } + - match: { hits.hits.0._id: doc4 } + - match: { hits.hits.1._id: doc5 } From 19b9ce5081aa13d9ca3ca5ec4a22af31364387e0 Mon Sep 17 00:00:00 2001 From: Mridula Date: Wed, 2 Jul 2025 14:59:05 +0100 Subject: [PATCH 5/7] Fixed the Match_none --- .../rest-api-spec/test/rrf/950_pinned_interaction.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/x-pack/plugin/rank-rrf/src/yamlRestTest/resources/rest-api-spec/test/rrf/950_pinned_interaction.yml b/x-pack/plugin/rank-rrf/src/yamlRestTest/resources/rest-api-spec/test/rrf/950_pinned_interaction.yml index 434bf4805859b..e862fde00df13 100644 --- a/x-pack/plugin/rank-rrf/src/yamlRestTest/resources/rest-api-spec/test/rrf/950_pinned_interaction.yml +++ b/x-pack/plugin/rank-rrf/src/yamlRestTest/resources/rest-api-spec/test/rrf/950_pinned_interaction.yml @@ -77,15 +77,19 @@ setup: retriever: rrf: retrievers: + - + standard: + query: + match_none: {} - pinned: ids: ["doc4", "doc5"] retriever: standard: query: - match_none: {} + match: { text: "document" } - - match: { hits.total.value: 2 } + - match: { hits.total.value: 5 } - match: { hits.hits.0._id: doc4 } - match: { hits.hits.1._id: doc5 } From 3437c634fdde4a366555bc25d5054a9c4d7b2317 Mon Sep 17 00:00:00 2001 From: Mridula Date: Wed, 2 Jul 2025 14:59:44 +0100 Subject: [PATCH 6/7] space format --- .../resources/rest-api-spec/test/rrf/950_pinned_interaction.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x-pack/plugin/rank-rrf/src/yamlRestTest/resources/rest-api-spec/test/rrf/950_pinned_interaction.yml b/x-pack/plugin/rank-rrf/src/yamlRestTest/resources/rest-api-spec/test/rrf/950_pinned_interaction.yml index e862fde00df13..5d94dbf27f169 100644 --- a/x-pack/plugin/rank-rrf/src/yamlRestTest/resources/rest-api-spec/test/rrf/950_pinned_interaction.yml +++ b/x-pack/plugin/rank-rrf/src/yamlRestTest/resources/rest-api-spec/test/rrf/950_pinned_interaction.yml @@ -77,7 +77,7 @@ setup: retriever: rrf: retrievers: - - + - standard: query: match_none: {} From e8cc8039aa1cc6ca5145f3408aa8250188fbc149 Mon Sep 17 00:00:00 2001 From: Mridula Date: Wed, 2 Jul 2025 15:00:33 +0100 Subject: [PATCH 7/7] space format --- .../resources/rest-api-spec/test/rrf/950_pinned_interaction.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x-pack/plugin/rank-rrf/src/yamlRestTest/resources/rest-api-spec/test/rrf/950_pinned_interaction.yml b/x-pack/plugin/rank-rrf/src/yamlRestTest/resources/rest-api-spec/test/rrf/950_pinned_interaction.yml index 5d94dbf27f169..bbdc7aff43b69 100644 --- a/x-pack/plugin/rank-rrf/src/yamlRestTest/resources/rest-api-spec/test/rrf/950_pinned_interaction.yml +++ b/x-pack/plugin/rank-rrf/src/yamlRestTest/resources/rest-api-spec/test/rrf/950_pinned_interaction.yml @@ -77,7 +77,7 @@ setup: retriever: rrf: retrievers: - - + - standard: query: match_none: {}