From f237453d05aa99200572d87f9868bcff6d63842c Mon Sep 17 00:00:00 2001 From: Jonas Kunz Date: Mon, 10 Nov 2025 12:34:37 +0100 Subject: [PATCH 1/2] Unmute and fix exponential_histogram.LoadFiltered CSV test --- muted-tests.yml | 3 --- .../src/main/resources/exponential_histogram.csv-spec | 2 +- .../elasticsearch/xpack/esql/action/EsqlCapabilities.java | 6 ++++++ 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/muted-tests.yml b/muted-tests.yml index 36da48ff4ce6c..94a5119223cf2 100644 --- a/muted-tests.yml +++ b/muted-tests.yml @@ -445,9 +445,6 @@ tests: - class: org.elasticsearch.xpack.inference.action.filter.ShardBulkInferenceActionFilterBasicLicenseIT method: testLicenseInvalidForInference {p0=false} issue: https://github.com/elastic/elasticsearch/issues/137691 -- class: org.elasticsearch.xpack.esql.qa.mixed.MixedClusterEsqlSpecIT - method: test {csv-spec:exponential_histogram.LoadFiltered} - issue: https://github.com/elastic/elasticsearch/issues/137727 - class: org.elasticsearch.xpack.inference.InferenceRestIT method: test {p0=inference/70_text_similarity_rank_retriever/Text similarity reranker with min_score zero includes all docs} issue: https://github.com/elastic/elasticsearch/issues/137732 diff --git a/x-pack/plugin/esql/qa/testFixtures/src/main/resources/exponential_histogram.csv-spec b/x-pack/plugin/esql/qa/testFixtures/src/main/resources/exponential_histogram.csv-spec index 941d1abcdb72f..475e568230279 100644 --- a/x-pack/plugin/esql/qa/testFixtures/src/main/resources/exponential_histogram.csv-spec +++ b/x-pack/plugin/esql/qa/testFixtures/src/main/resources/exponential_histogram.csv-spec @@ -1,5 +1,5 @@ loadFiltered -required_capability: exponential_histogram +required_capability: exponential_histogram_topn FROM exp_histo_sample | WHERE STARTS_WITH(instance, "dummy") | SORT instance | KEEP instance, responseTime ; diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/action/EsqlCapabilities.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/action/EsqlCapabilities.java index bd7e924f84cc1..b8a66aeadfa38 100644 --- a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/action/EsqlCapabilities.java +++ b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/action/EsqlCapabilities.java @@ -1547,6 +1547,12 @@ public enum Cap { */ EXPONENTIAL_HISTOGRAM(EXPONENTIAL_HISTOGRAM_FEATURE_FLAG), + /** + * Support for exponential_histogram type in TOPN + */ + EXPONENTIAL_HISTOGRAM_TOPN(EXPONENTIAL_HISTOGRAM_FEATURE_FLAG), + + /** * Create new block when filtering OrdinalBytesRefBlock */ From d6311c5b458ad57310894f1942c0e669950d4d5e Mon Sep 17 00:00:00 2001 From: elasticsearchmachine Date: Mon, 10 Nov 2025 11:46:08 +0000 Subject: [PATCH 2/2] [CI] Auto commit changes from spotless --- .../org/elasticsearch/xpack/esql/action/EsqlCapabilities.java | 1 - 1 file changed, 1 deletion(-) diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/action/EsqlCapabilities.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/action/EsqlCapabilities.java index b8a66aeadfa38..589bf16e82138 100644 --- a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/action/EsqlCapabilities.java +++ b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/action/EsqlCapabilities.java @@ -1552,7 +1552,6 @@ public enum Cap { */ EXPONENTIAL_HISTOGRAM_TOPN(EXPONENTIAL_HISTOGRAM_FEATURE_FLAG), - /** * Create new block when filtering OrdinalBytesRefBlock */