From 243ab040eda5a53a7001966fcf4722b4ad7daae0 Mon Sep 17 00:00:00 2001 From: Kathleen DeRusso Date: Wed, 21 May 2025 13:19:05 -0400 Subject: [PATCH] Fix: Add NamedWriteable for RuleQueryRankDoc (#128153) * Add NamedWriteable for QueryRule rank doc * Update test * Update docs/changelog/128153.yaml * Add multi cluster test for query rules * Commenting out code - explicitly trying to spur a test failure * [CI] Auto commit changes from spotless * Streamline test for multi cluster * Revert changes to try to break test * Fix compile error --------- Co-authored-by: elasticsearchmachine (cherry picked from commit b335c1a8ebc357d7437e03b2c85ad7e3c1942456) # Conflicts: # x-pack/plugin/ent-search/src/yamlRestTest/resources/rest-api-spec/test/entsearch/rules/40_rule_query_search.yml --- docs/changelog/128153.yaml | 6 ++++++ .../elasticsearch/xpack/application/EnterpriseSearch.java | 7 +++++++ 2 files changed, 13 insertions(+) create mode 100644 docs/changelog/128153.yaml diff --git a/docs/changelog/128153.yaml b/docs/changelog/128153.yaml new file mode 100644 index 0000000000000..fda435438ff53 --- /dev/null +++ b/docs/changelog/128153.yaml @@ -0,0 +1,6 @@ +pr: 128153 +summary: "Fix: Add `NamedWriteable` for `RuleQueryRankDoc`" +area: Relevance +type: bug +issues: + - 126071 diff --git a/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/EnterpriseSearch.java b/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/EnterpriseSearch.java index a354ca4b4b31c..83b4bed99c8f1 100644 --- a/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/EnterpriseSearch.java +++ b/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/EnterpriseSearch.java @@ -30,6 +30,7 @@ import org.elasticsearch.plugins.SystemIndexPlugin; import org.elasticsearch.rest.RestController; import org.elasticsearch.rest.RestHandler; +import org.elasticsearch.search.rank.RankDoc; import org.elasticsearch.xcontent.ParseField; import org.elasticsearch.xpack.application.analytics.AnalyticsTemplateRegistry; import org.elasticsearch.xpack.application.analytics.action.DeleteAnalyticsCollectionAction; @@ -179,6 +180,7 @@ import org.elasticsearch.xpack.application.rules.action.TransportPutQueryRulesetAction; import org.elasticsearch.xpack.application.rules.action.TransportTestQueryRulesetAction; import org.elasticsearch.xpack.application.rules.retriever.QueryRuleRetrieverBuilder; +import org.elasticsearch.xpack.application.rules.retriever.RuleQueryRankDoc; import org.elasticsearch.xpack.application.search.SearchApplicationIndexService; import org.elasticsearch.xpack.application.search.action.DeleteSearchApplicationAction; import org.elasticsearch.xpack.application.search.action.GetSearchApplicationAction; @@ -347,6 +349,11 @@ protected XPackLicenseState getLicenseState() { return Collections.unmodifiableList(actionHandlers); } + @Override + public List getNamedWriteables() { + return List.of(new NamedWriteableRegistry.Entry(RankDoc.class, RuleQueryRankDoc.NAME, RuleQueryRankDoc::new)); + } + @Override public List getRestHandlers( Settings settings,