Skip to content

[ES|QL] Lookup join and Inline stats support for query approximation #145980

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jan-elastic wants to merge 8 commits into
base: main
Choose a base branch
from
Open

[ES|QL] Lookup join and Inline stats support for query approximation #145980

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a1fa1cb
assert metadata in CsvIT
jan-elastic Apr 8, 2026
4c6194a
approximate lookup join
jan-elastic Apr 8, 2026
9fb2023
approximate inline stats
jan-elastic Apr 8, 2026
e348103
update capability
jan-elastic Apr 9, 2026
96d74a2
document caveat
jan-elastic Apr 10, 2026
2b2d260
Update docs/changelog/145980.yaml
jan-elastic Apr 10, 2026
184d6c9
More tests
jan-elastic Apr 14, 2026
4883422
small fixes
jan-elastic Apr 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions docs/changelog/145980.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
area: "Machine Learning"
issues: []
pr: 145980
summary: Lookup join and Inline stats support for query approximation
type: feature
2 changes: 1 addition & 1 deletion ...aRestTest/java/org/elasticsearch/xpack/esql/qa/single_node/GenerativeApproximationIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public class GenerativeApproximationIT extends GenerativeApproximationRestTest {

@Before
public void checkCapability() {
assumeTrue("query approximation should be enabled", EsqlCapabilities.Cap.APPROXIMATION_V6.isEnabled());
assumeTrue("query approximation should be enabled", EsqlCapabilities.Cap.APPROXIMATION_V7.isEnabled());
}

@ClassRule
Expand Down
2 changes: 1 addition & 1 deletion ...n/esql/qa/server/src/main/java/org/elasticsearch/xpack/esql/qa/rest/RestEsqlTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1951,7 +1951,7 @@ public void testRandomTimezoneBuckets() throws IOException {
}

public void testApproximationColumnMetadata() throws IOException {
assumeTrue("approximation support", EsqlCapabilities.Cap.APPROXIMATION_V6.isEnabled());
assumeTrue("approximation support", EsqlCapabilities.Cap.APPROXIMATION_V7.isEnabled());
bulkLoadTestData(10);

String query = "SET approximation=true; " + fromIndex() + " | STATS count=COUNT()";
Expand Down
4 changes: 2 additions & 2 deletions ...java/org/elasticsearch/xpack/esql/qa/rest/generative/GenerativeApproximationRestTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
import java.util.List;
import java.util.Map;

import static org.elasticsearch.xpack.esql.action.EsqlCapabilities.Cap.APPROXIMATION_V6;
import static org.elasticsearch.xpack.esql.action.EsqlCapabilities.Cap.APPROXIMATION_V7;
import static org.elasticsearch.xpack.esql.action.EsqlCapabilities.Cap.FIX_SUM_AGG_LONG_OVERFLOW;

/**
Expand Down Expand Up @@ -73,7 +73,7 @@ protected void assertResults(
@Override
protected void shouldSkipTest(String testName) throws IOException {
super.shouldSkipTest(testName);
assumeFalse("No approximation tests", testCase.requiredCapabilities.contains(APPROXIMATION_V6.capabilityName()));
assumeFalse("No approximation tests", testCase.requiredCapabilities.contains(APPROXIMATION_V7.capabilityName()));
assumeFalse(
"Approximation casts integer SUM to double, preventing long overflow",
testCase.requiredCapabilities.contains(FIX_SUM_AGG_LONG_OVERFLOW.capabilityName())
Expand Down
4 changes: 2 additions & 2 deletions ...src/main/java/org/elasticsearch/xpack/esql/qa/rest/generative/GenerativeForkRestTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
import java.util.List;

import static org.elasticsearch.xpack.esql.CsvTestUtils.loadCsvSpecValues;
import static org.elasticsearch.xpack.esql.action.EsqlCapabilities.Cap.APPROXIMATION_V6;
import static org.elasticsearch.xpack.esql.action.EsqlCapabilities.Cap.APPROXIMATION_V7;
import static org.elasticsearch.xpack.esql.action.EsqlCapabilities.Cap.ESQL_WITHOUT_GROUPING;
import static org.elasticsearch.xpack.esql.action.EsqlCapabilities.Cap.FORK_V9;
import static org.elasticsearch.xpack.esql.action.EsqlCapabilities.Cap.METRICS_GROUP_BY_ALL;
Expand Down Expand Up @@ -92,7 +92,7 @@ protected void shouldSkipTest(String testName) throws IOException {

assumeFalse(
"Tests using query approximation are skipped since query approximation is not supported with FORK",
testCase.requiredCapabilities.contains(APPROXIMATION_V6.capabilityName())
testCase.requiredCapabilities.contains(APPROXIMATION_V7.capabilityName())
);

assumeFalse(
Expand Down
2 changes: 1 addition & 1 deletion ...es/src/main/java/org/elasticsearch/xpack/esql/generator/command/source/FromGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public CommandDescription generate(
if (useUnmappedFields) {
result.append(SET_UNMAPPED_FIELDS_PREFIX);
}
boolean setQueryApproximation = EsqlCapabilities.Cap.APPROXIMATION_V6.isEnabled()
boolean setQueryApproximation = EsqlCapabilities.Cap.APPROXIMATION_V7.isEnabled()
&& randomDouble() < QUERY_APPROXIMATION_SETTING_PROBABILITY;
if (setQueryApproximation) {
result.append(randomQueryApproximationSettings());
Expand Down
Loading
Loading