Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
0741bbb
Adopt a "LogicalPlan" approach to running multiple sub-queries,
astefan May 26, 2025
cd31f72
Update docs/changelog/128917.yaml
astefan Jun 4, 2025
811f5be
checkstyle
astefan Jun 4, 2025
567d600
More tests un-Ignored and updates after update from main
astefan Jun 4, 2025
f834ce7
Fix capability
astefan Jun 4, 2025
d3f2838
TEMP
astefan Jun 6, 2025
1e9c355
Adapt PruneColumns to have "visibility" into the right-hand side of
astefan Jun 11, 2025
fa22575
Merge branch 'main' of https://github.com/elastic/elasticsearch into …
astefan Jun 11, 2025
377328c
More fixes and tests
astefan Jun 11, 2025
1c745c7
Merge branch 'main' of https://github.com/elastic/elasticsearch into …
astefan Jun 12, 2025
cffa1d7
More deterministic test
astefan Jun 12, 2025
0882cbb
Merge branch 'main' of https://github.com/elastic/elasticsearch into …
astefan Jun 12, 2025
e3b5c92
Update docs/changelog/128917.yaml
astefan Jun 12, 2025
bc6f8cc
Test inlinestats after stats with bucket and top
astefan Jun 13, 2025
910c888
Merge branch 'main' of https://github.com/elastic/elasticsearch into …
astefan Jun 13, 2025
2d1a1ec
Merge branch 'support_multi_inlinestats_logicalPlan_approach' of http…
astefan Jun 13, 2025
bb0450c
Have Row - LocalRelation transformation use a copying blocks approach
astefan Jun 17, 2025
2f2cc30
Merge branch 'main' of https://github.com/elastic/elasticsearch into …
astefan Jun 20, 2025
a9e2d99
Attempt a serialization change to have to Suppliers for LocalRelation
astefan Jun 23, 2025
4661330
Merge branch 'main' of https://github.com/elastic/elasticsearch into …
astefan Jun 24, 2025
0500ab6
Adapt to EXPLAIN command
astefan Jun 25, 2025
4ed8c9b
Merge branch 'main' of https://github.com/elastic/elasticsearch into …
astefan Jun 25, 2025
17d5933
Add more tests and fix incorrect pruning of columns of the inlinestats'
astefan Jun 27, 2025
a88b8cf
Merge branch 'main' of https://github.com/elastic/elasticsearch into …
astefan Jun 27, 2025
41d2119
More stuff
astefan Jun 30, 2025
0cbfef9
Merge branch 'main' of https://github.com/elastic/elasticsearch into …
astefan Jun 30, 2025
bbe1a62
Tests fixes
astefan Jun 30, 2025
f136b79
Merge branch 'main' of https://github.com/elastic/elasticsearch into …
astefan Jun 30, 2025
0ba7a4a
Further fixes and addressing reviews
astefan Jun 30, 2025
a2527ea
Merge branch 'main' of https://github.com/elastic/elasticsearch into …
astefan Jul 2, 2025
c04806b
Merge branch 'main' of https://github.com/elastic/elasticsearch into …
astefan Jul 3, 2025
5bb4e4f
Rework the LocalSupplier serialization
astefan Jul 3, 2025
8d05f3f
Address reviews
astefan Jul 7, 2025
f7268ad
Merge branch 'main' of https://github.com/elastic/elasticsearch into …
astefan Jul 7, 2025
7ffaf8c
Merge branch 'main' of https://github.com/elastic/elasticsearch into …
astefan Jul 8, 2025
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
6 changes: 6 additions & 0 deletions docs/changelog/128917.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
pr: 128917
summary: Adopt a "LogicalPlan" approach to running multiple sub-queries (with INLINESTATS
so far)
area: ES|QL
type: enhancement
issues: []
Original file line number Diff line number Diff line change
Expand Up @@ -333,6 +333,7 @@ static TransportVersion def(int id) {
public static final TransportVersion ESQL_SERIALIZE_TIMESERIES_FIELD_TYPE = def(9_114_0_00);
public static final TransportVersion ML_INFERENCE_IBM_WATSONX_COMPLETION_ADDED = def(9_115_0_00);
public static final TransportVersion ESQL_SPLIT_ON_BIG_VALUES = def(9_116_0_00);
public static final TransportVersion ESQL_LOCAL_RELATION_WITH_NEW_BLOCKS = def(9_117_0_00);

/*
* STOP! READ THIS FIRST! No, really,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
import static org.elasticsearch.xpack.esql.action.EsqlCapabilities.Cap.FORK_V9;
import static org.elasticsearch.xpack.esql.action.EsqlCapabilities.Cap.INLINESTATS;
import static org.elasticsearch.xpack.esql.action.EsqlCapabilities.Cap.INLINESTATS_V2;
import static org.elasticsearch.xpack.esql.action.EsqlCapabilities.Cap.INLINESTATS_V7;
import static org.elasticsearch.xpack.esql.action.EsqlCapabilities.Cap.INLINESTATS_V8;
import static org.elasticsearch.xpack.esql.action.EsqlCapabilities.Cap.JOIN_LOOKUP_V12;
import static org.elasticsearch.xpack.esql.action.EsqlCapabilities.Cap.JOIN_PLANNING_V1;
import static org.elasticsearch.xpack.esql.action.EsqlCapabilities.Cap.METADATA_FIELDS_REMOTE_TEST;
Expand Down Expand Up @@ -128,7 +128,7 @@ protected void shouldSkipTest(String testName) throws IOException {
assumeFalse("INLINESTATS not yet supported in CCS", testCase.requiredCapabilities.contains(INLINESTATS.capabilityName()));
assumeFalse("INLINESTATS not yet supported in CCS", testCase.requiredCapabilities.contains(INLINESTATS_V2.capabilityName()));
assumeFalse("INLINESTATS not yet supported in CCS", testCase.requiredCapabilities.contains(JOIN_PLANNING_V1.capabilityName()));
assumeFalse("INLINESTATS not yet supported in CCS", testCase.requiredCapabilities.contains(INLINESTATS_V7.capabilityName()));
assumeFalse("INLINESTATS not yet supported in CCS", testCase.requiredCapabilities.contains(INLINESTATS_V8.capabilityName()));
assumeFalse("LOOKUP JOIN not yet supported in CCS", testCase.requiredCapabilities.contains(JOIN_LOOKUP_V12.capabilityName()));
// Unmapped fields require a coorect capability response from every cluster, which isn't currently implemented.
assumeFalse("UNMAPPED FIELDS not yet supported in CCS", testCase.requiredCapabilities.contains(UNMAPPED_FIELDS.capabilityName()));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@
import org.elasticsearch.xpack.esql.plan.logical.EsRelation;
import org.elasticsearch.xpack.esql.plan.logical.Limit;
import org.elasticsearch.xpack.esql.plan.logical.LogicalPlan;
import org.elasticsearch.xpack.esql.plan.logical.local.EmptyLocalSupplier;
import org.elasticsearch.xpack.esql.plan.logical.local.LocalRelation;
import org.elasticsearch.xpack.esql.plan.logical.local.LocalSupplier;
import org.elasticsearch.xpack.esql.plugin.EsqlPlugin;
Expand Down Expand Up @@ -446,7 +447,7 @@ public static Literal L(Object value) {
}

public static LogicalPlan emptySource() {
return new LocalRelation(Source.EMPTY, emptyList(), LocalSupplier.EMPTY);
return new LocalRelation(Source.EMPTY, emptyList(), EmptyLocalSupplier.EMPTY);
}

public static LogicalPlan localSource(BlockFactory blockFactory, List<Attribute> fields, List<Object> row) {
Expand Down
Loading
Loading