Skip to content

ESQL: Fix NULL handling in IN clause #125832

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

Merged
merged 10 commits into from
Apr 11, 2025
Merged

ESQL: Fix NULL handling in IN clause #125832

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
0eda16c
Fix expression null check
kanoshiou Mar 28, 2025
11795aa
Update docs/changelog/125832.yaml
kanoshiou Mar 28, 2025
15622be
Update csv test
kanoshiou Mar 28, 2025
7b4499c
Update tests
kanoshiou Mar 28, 2025
9f7062f
Merge branch 'main' into NPE-when-converting-NULL-in-IN-clause
kanoshiou Apr 7, 2025
39dabc8
Merge branch 'main' into NPE-when-converting-NULL-in-IN-clause
idegtiarenko Apr 8, 2025
2a3a612
Merge branch 'refs/heads/main' into NPE-when-converting-NULL-in-IN-cl…
kanoshiou Apr 9, 2025
2fd4e60
Fix bwc
kanoshiou Apr 9, 2025
4fc6684
Merge branch 'refs/heads/main' into NPE-when-converting-NULL-in-IN-cl…
kanoshiou Apr 11, 2025
9e4100a
Update tests
kanoshiou Apr 11, 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
Prev Previous commit
Next Next commit
Update tests
  • Loading branch information
@kanoshiou
kanoshiou committed Mar 28, 2025
commit 7b4499cdee7899af4c7f62c6744cc1dd801e39b4
16 changes: 16 additions & 0 deletions ...t/java/org/elasticsearch/xpack/esql/expression/predicate/operator/comparison/InTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,25 @@
import org.elasticsearch.geo.GeometryTestUtils;
import org.elasticsearch.geo.ShapeTestUtils;
import org.elasticsearch.xpack.esql.core.expression.Expression;
import org.elasticsearch.xpack.esql.core.expression.FieldAttribute;
import org.elasticsearch.xpack.esql.core.expression.FoldContext;
import org.elasticsearch.xpack.esql.core.expression.Literal;
import org.elasticsearch.xpack.esql.core.querydsl.query.TermsQuery;
import org.elasticsearch.xpack.esql.core.tree.Source;
import org.elasticsearch.xpack.esql.core.type.DataType;
import org.elasticsearch.xpack.esql.core.type.EsField;
import org.elasticsearch.xpack.esql.expression.function.AbstractFunctionTestCase;
import org.elasticsearch.xpack.esql.expression.function.TestCaseSupplier;
import org.elasticsearch.xpack.esql.planner.TranslatorHandler;
import org.junit.AfterClass;

import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Set;
import java.util.function.Supplier;
import java.util.stream.IntStream;

Expand Down Expand Up @@ -81,6 +87,16 @@ private static Literal L(Object value) {
return of(EMPTY, value);
}

public void testConvertedNull() {
In in = new In(
EMPTY,
new FieldAttribute(Source.EMPTY, "field", new EsField("suffix", DataType.KEYWORD, Map.of(), true)),
Arrays.asList(ONE, new Literal(Source.EMPTY, null, DataType.INTEGER), THREE)
Copy link
Contributor

Choose a reason for hiding this comment

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

Could we randomise the data type here?

);
var query = in.asQuery(TranslatorHandler.TRANSLATOR_HANDLER);
assertEquals(new TermsQuery(EMPTY, "field", Set.of(1, 3)), query);
}

@ParametersFactory
public static Iterable<Object[]> parameters() {
List<TestCaseSupplier> suppliers = new ArrayList<>();
Expand Down
Loading