Skip to content

ESQL: Small nullify fix cleanups#143998

Merged
alex-spies merged 9 commits intoelastic:mainfrom
alex-spies:small-nullify-fix-cleanups
Mar 12, 2026
Merged

ESQL: Small nullify fix cleanups#143998
alex-spies merged 9 commits intoelastic:mainfrom
alex-spies:small-nullify-fix-cleanups

Conversation

@alex-spies
Copy link
Copy Markdown
Contributor

Follow-up to #142300, addressing the remaining comments and increasing test coverage.

In particular, the reproducer added in #142300 does not reproduce anymore because the new approach from #143399 avoids shadowing existing fields with NULL aliases as long as a FROM command is used. This adds an analyzer test which uses ROW and still reproduces the failure when #142300 gets reverted.

@alex-spies alex-spies requested a review from idegtiarenko March 11, 2026 10:16
@alex-spies alex-spies added >test Issues or PRs that are addressing/adding tests auto-backport Automatically create backport pull requests when merged :ml/ES|QL ML Commands in ES|QL e.g. CATEGORIZE, SAMPLE, CHANGE_POINT etc... v9.4.0 v9.3.3 labels Mar 11, 2026
@elasticsearchmachine elasticsearchmachine added the Team:ML Meta label for the ML team label Mar 11, 2026
@elasticsearchmachine
Copy link
Copy Markdown
Collaborator

Pinging @elastic/ml-core (Team:ML)

@Override
protected String maybeRandomizeQuery(String query) {
return randomlyNullify(query);
}
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would this also require checking nullified fields capability in upgrade case?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, bwc tests are run with the mixed cluster and ccs test suites.

@alex-spies alex-spies added the auto-merge-without-approval Automatically merge pull request when CI checks pass (NB doesn't wait for reviews!) label Mar 11, 2026
@alex-spies
Copy link
Copy Markdown
Contributor Author

Thanks for the review @idegtiarenko !

@alex-spies
Copy link
Copy Markdown
Contributor Author

CI reporting seems stuck, all checks are green on buildkite. Merging.

@alex-spies alex-spies merged commit 0af3229 into elastic:main Mar 12, 2026
22 of 25 checks passed
@alex-spies alex-spies deleted the small-nullify-fix-cleanups branch March 12, 2026 08:27
@elasticsearchmachine
Copy link
Copy Markdown
Collaborator

💔 Backport failed

Status Branch Result
9.3 Commit could not be cherrypicked due to conflicts

You can use sqren/backport to manually backport by running backport --upstream elastic/elasticsearch --pr 143998

@alex-spies
Copy link
Copy Markdown
Contributor Author

💚 All backports created successfully

Status Branch Result
9.3

Questions ?

Please refer to the Backport tool documentation

alex-spies added a commit to alex-spies/elasticsearch that referenced this pull request Mar 13, 2026
* Randomly nullify also in multi-node spec tests
* Move child output removal into collectUnresolved
* Add more reproducers (original reproducer also got fixed by another change)

(cherry picked from commit 0af3229)

# Conflicts:
#	x-pack/plugin/esql/qa/server/src/main/java/org/elasticsearch/xpack/esql/qa/rest/EsqlSpecTestCase.java
#	x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/analysis/AnalyzerUnmappedTests.java
@alex-spies alex-spies removed the :ml/ES|QL ML Commands in ES|QL e.g. CATEGORIZE, SAMPLE, CHANGE_POINT etc... label Mar 13, 2026
@alex-spies alex-spies added the :Analytics/ES|QL AKA ESQL label Mar 13, 2026
elasticsearchmachine pushed a commit that referenced this pull request Mar 13, 2026
* Randomly nullify also in multi-node spec tests
* Move child output removal into collectUnresolved
* Add more reproducers (original reproducer also got fixed by another change)

(cherry picked from commit 0af3229)

# Conflicts:
#	x-pack/plugin/esql/qa/server/src/main/java/org/elasticsearch/xpack/esql/qa/rest/EsqlSpecTestCase.java
#	x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/analysis/AnalyzerUnmappedTests.java
michalborek pushed a commit to michalborek/elasticsearch that referenced this pull request Mar 23, 2026
* Randomly nullify also in multi-node spec tests
* Move child output removal into collectUnresolved
* Add more reproducers (original reproducer also got fixed by another change)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

:Analytics/ES|QL AKA ESQL auto-backport Automatically create backport pull requests when merged auto-merge-without-approval Automatically merge pull request when CI checks pass (NB doesn't wait for reviews!) backport pending Team:ML Meta label for the ML team >test Issues or PRs that are addressing/adding tests v9.3.3 v9.4.0

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants