[ESQL] Consolidate EsqlProject into Project #140238

MattAlp · 2026-01-06T20:30:31Z

This consolidates the EsqlProject class into Project, eliminating unnecessary class hierarchy originating from the QL merge. We've been meaning to do this for a while, #139248 did a lot of similar heavy lifting recently.

The changes themselves:

Merged lenient expressionsResolved() behavior from EsqlProject into Project, allowing UnsupportedAttribute to pass through projections unchanged
Added ESQL_PROJECT_ENTRY to PlanWritables for backward compatibility when deserializing old "EsqlProject" plans from mixed-version clusters
Added checkUnsupportedAttributeRenaming() to Verifier to ensure renaming UnsupportedAttribute via Alias is still blocked (this check now runs unconditionally, not gated by resolved() status)
Added regression tests validating UnsupportedAttribute pass-through and rename-blocking behavior

Closes #109195

github-actions · 2026-01-06T20:32:00Z

ℹ️ Important: Docs version tagging

👋 Thanks for updating the docs! Just a friendly reminder that our docs are now cumulative. This means all 9.x versions are documented on the same page and published off of the main branch, instead of creating separate pages for each minor version.

We use applies_to tags to mark version-specific features and changes.

Expand for a quick overview

When to use applies_to tags:

✅ At the page level to indicate which products/deployments the content applies to (mandatory)
✅ When features change state (e.g. preview, ga) in a specific version
✅ When availability differs across deployments and environments

What NOT to do:

❌ Don't remove or replace information that applies to an older version
❌ Don't add new information that applies to a specific version without an applies_to tag
❌ Don't forget that applies_to tags can be used at the page, section, and inline level

🤔 Need help?

Check out the cumulative docs guidelines
Reach out in the #docs Slack channel

elasticsearchmachine · 2026-01-06T20:36:41Z

Pinging @elastic/es-analytical-engine (Team:Analytics)

Merges the EsqlProject class into Project, eliminating unnecessary class hierarchy after the QL merge. Key changes: - Move lenient expressionsResolved() behavior from EsqlProject to Project, allowing UnsupportedAttribute to pass through projections unchanged - Add ESQL_PROJECT_ENTRY to PlanWritables for backward compatibility when deserializing old "EsqlProject" plans from mixed-version clusters - Add checkUnsupportedAttributeRenaming() to Verifier to ensure renaming UnsupportedAttribute via Alias is still blocked (this check now runs unconditionally, not gated by resolved() status) - Update all instantiation sites to use Project instead of EsqlProject - Update comments referencing EsqlProject Closes elastic#111957

- Replace all EsqlProject references with Project in test assertions - Remove EsqlProjectSerializationTests (no longer needed) - Add regression tests in VerifierTests to validate that: - UnsupportedAttribute can pass through KEEP (Project) unchanged - Renaming UnsupportedAttribute fails even after passing through KEEP

...k/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/plan/logical/local/EsqlProject.java

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/plan/logical/Project.java

idegtiarenko

Left couple of suggestions, overall looks good to me.
I am not changing this area often so it would be nice to have one extra review for this change.

ivancea

Thanks, LGTM!

…plan/logical/Project.java Co-authored-by: Ievgen Degtiarenko <[email protected]>

We warn for unhandled annotations because of codegen

Test assertions will fail during deser if we create a `Project` with the name `EsqlProject` (old -> new transmission)

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/plan/logical/Project.java

.../esql/compute/gen/src/main/java/org/elasticsearch/compute/gen/MarkerAnnotationProcessor.java

ivancea · 2026-01-08T10:28:30Z

.../esql/compute/gen/src/main/java/org/elasticsearch/compute/gen/MarkerAnnotationProcessor.java

Should this be moved with the annotation in :libs:core?
Depending on if we can use UpdateForV10.class.getCanonicalName(), this processor may be difficult to find. Unless it fails on compile time anyway, which could work I guess.

astefan

LGTM

astefan · 2026-01-09T13:56:09Z

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/plan/logical/Project.java

+    /**
+     * Backward compatibility entry + name for reading the consolidated `EsqlProject` plans from pre-9.4.0 nodes.
+     */
+    private static final String LEGACY_PROJECT_NAME = "EsqlProject";


Nit: If this is something that is targeted to ESQL team, I think LEGACY_LOGICAL_PLAN_NAME describes better the constant and intention.

alex-spies

LGTM. Thanks @MattAlp !

alex-spies · 2026-01-09T16:10:52Z

Ah, @MattAlp , because this affects serialization, you may want to run the CI with the test-full-bwc label on this PR.

elasticsearchmachine added v9.4.0 needs:triage Requires assignment of a team area label labels Jan 6, 2026

MattAlp added >refactoring >tech debt :Analytics/ES|QL AKA ESQL and removed needs:triage Requires assignment of a team area label labels Jan 6, 2026

elasticsearchmachine added the Team:Analytics Meta label for analytical engine team (ESQL/Aggs/Geo) label Jan 6, 2026

MattAlp requested review from alex-spies, bpintea and ivancea January 6, 2026 20:42

MattAlp added 3 commits January 6, 2026 15:49

Apply spotless & regenerate files

199dd85

MattAlp force-pushed the consolidate-esql-project branch from 61512a8 to 199dd85 Compare January 6, 2026 20:54

MattAlp requested a review from nik9000 January 6, 2026 21:04