ESQL: Fix CASE when conditions are multivalued #112401
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -105,8 +105,10 @@ protected static List<TestCaseSupplier> withNoRowsExpectingNull(List<TestCaseSup | |
| testCase.expectedType(), | ||
| nullValue(), | ||
| null, | ||
| null, | ||
| testCase.getExpectedTypeError(), | ||
| null, | ||
| null, | ||
| null | ||
| ); | ||
| })); | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -217,8 +217,10 @@ protected static List<TestCaseSupplier> anyNullIsNull( | |
| expectedType.expectedType(finalNullPosition, nulledData.type(), oc), | ||
| nullValue(), | ||
| null, | ||
| null, | ||
| oc.getExpectedTypeError(), | ||
| null, | ||
| null, | ||
| null | ||
| ); | ||
| })); | ||
|
|
@@ -246,8 +248,10 @@ protected static List<TestCaseSupplier> anyNullIsNull( | |
| expectedType.expectedType(finalNullPosition, DataType.NULL, oc), | ||
| nullValue(), | ||
| null, | ||
| null, | ||
| oc.getExpectedTypeError(), | ||
| null, | ||
| null, | ||
| null | ||
| ); | ||
| })); | ||
|
|
@@ -642,9 +646,11 @@ protected static List<TestCaseSupplier> randomizeBytesRefsOffset(List<TestCaseSu | |
| testCase.expectedType(), | ||
| testCase.getMatcher(), | ||
| testCase.getExpectedWarnings(), | ||
| testCase.getExpectedBuildEvaluatorWarnings(), | ||
| testCase.getExpectedTypeError(), | ||
| testCase.foldingExceptionClass(), | ||
| testCase.foldingExceptionMessage(), | ||
| testCase.extra() | ||
| ); | ||
| })).toList(); | ||
| } | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -38,7 +38,6 @@ | |
| import java.util.stream.Collectors; | ||
| import java.util.stream.IntStream; | ||
|
|
||
| import static org.hamcrest.Matchers.either; | ||
| import static org.hamcrest.Matchers.equalTo; | ||
| import static org.hamcrest.Matchers.is; | ||
|
|
@@ -120,6 +119,9 @@ public final void testEvaluate() { | |
|
|
||
| Object result; | ||
| try (ExpressionEvaluator evaluator = evaluator(expression).get(driverContext())) { | ||
| if (testCase.getExpectedBuildEvaluatorWarnings() != null) { | ||
| assertWarnings(testCase.getExpectedBuildEvaluatorWarnings()); | ||
| } | ||
| try (Block block = evaluator.eval(row(testCase.getDataValues()))) { | ||
| assertThat(block.getPositionCount(), is(1)); | ||
| result = toJavaObjectUnsignedLongAware(block, 0); | ||
|
|
@@ -177,6 +179,10 @@ public final void testEvaluateBlockWithNulls() { | |
| */ | ||
| public final void testCrankyEvaluateBlockWithoutNulls() { | ||
| assumeTrue("sometimes the cranky breaker silences warnings, just skip these cases", testCase.getExpectedWarnings() == null); | ||
| assumeTrue( | ||
| "sometimes the cranky breaker silences warnings, just skip these cases", | ||
| testCase.getExpectedBuildEvaluatorWarnings() == null | ||
| ); | ||
| try { | ||
| testEvaluateBlock(driverContext().blockFactory(), crankyContext(), false); | ||
| } catch (CircuitBreakingException ex) { | ||
|
|
@@ -190,6 +196,10 @@ public final void testCrankyEvaluateBlockWithoutNulls() { | |
| */ | ||
| public final void testCrankyEvaluateBlockWithNulls() { | ||
| assumeTrue("sometimes the cranky breaker silences warnings, just skip these cases", testCase.getExpectedWarnings() == null); | ||
| assumeTrue( | ||
| "sometimes the cranky breaker silences warnings, just skip these cases", | ||
| testCase.getExpectedBuildEvaluatorWarnings() == null | ||
| ); | ||
| try { | ||
| testEvaluateBlock(driverContext().blockFactory(), crankyContext(), true); | ||
| } catch (CircuitBreakingException ex) { | ||
|
|
@@ -242,10 +252,13 @@ private void testEvaluateBlock(BlockFactory inputBlockFactory, DriverContext con | |
| ExpressionEvaluator eval = evaluator(expression).get(context); | ||
| Block block = eval.eval(new Page(positions, manyPositionsBlocks)) | ||
| ) { | ||
| if (testCase.getExpectedBuildEvaluatorWarnings() != null) { | ||
| assertWarnings(testCase.getExpectedBuildEvaluatorWarnings()); | ||
| } | ||
| assertThat(block.getPositionCount(), is(positions)); | ||
| for (int p = 0; p < positions; p++) { | ||
| if (nullPositions.contains(p)) { | ||
| assertThat(toJavaObjectUnsignedLongAware(block, p), allNullsMatcher()); | ||
| continue; | ||
| } | ||
| assertThat(toJavaObjectUnsignedLongAware(block, p), testCase.getMatcher()); | ||
|
|
@@ -275,6 +288,9 @@ public final void testEvaluateInManyThreads() throws ExecutionException, Interru | |
| int count = 10_000; | ||
| int threads = 5; | ||
| var evalSupplier = evaluator(expression); | ||
| if (testCase.getExpectedBuildEvaluatorWarnings() != null) { | ||
| assertWarnings(testCase.getExpectedBuildEvaluatorWarnings()); | ||
| } | ||
| ExecutorService exec = Executors.newFixedThreadPool(threads); | ||
| try { | ||
| List<Future<?>> futures = new ArrayList<>(); | ||
|
|
@@ -310,6 +326,9 @@ public final void testEvaluatorToString() { | |
| assumeTrue("Can't build evaluator", testCase.canBuildEvaluator()); | ||
| var factory = evaluator(expression); | ||
| try (ExpressionEvaluator ev = factory.get(driverContext())) { | ||
| if (testCase.getExpectedBuildEvaluatorWarnings() != null) { | ||
| assertWarnings(testCase.getExpectedBuildEvaluatorWarnings()); | ||
| } | ||
| assertThat(ev.toString(), testCase.evaluatorToString()); | ||
| } | ||
| } | ||
|
|
@@ -322,6 +341,9 @@ public final void testFactoryToString() { | |
| } | ||
| assumeTrue("Can't build evaluator", testCase.canBuildEvaluator()); | ||
| var factory = evaluator(buildFieldExpression(testCase)); | ||
| if (testCase.getExpectedBuildEvaluatorWarnings() != null) { | ||
| assertWarnings(testCase.getExpectedBuildEvaluatorWarnings()); | ||
| } | ||
| assertThat(factory.toString(), testCase.evaluatorToString()); | ||
| } | ||
|
|
||
|
|
@@ -342,6 +364,9 @@ public final void testFold() { | |
| result = NumericUtils.unsignedLongAsBigInteger((Long) result); | ||
| } | ||
| assertThat(result, testCase.getMatcher()); | ||
| if (testCase.getExpectedBuildEvaluatorWarnings() != null) { | ||
| assertWarnings(testCase.getExpectedBuildEvaluatorWarnings()); | ||
| } | ||
| if (testCase.getExpectedWarnings() != null) { | ||
| assertWarnings(testCase.getExpectedWarnings()); | ||
| } | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nice tests!
ROW foo = CASE([true, true], ...just to make it obvious thatCASEdoesn't have implicitANYorALLlogic.ROW a = [true, false] | EVAL c = CASE(MV_SLICE(a, 0, 2), "foo", "bar")as well? This one failed differently from others, so I guess it exercised a different code path? A test case with an mv expression insideCASEis probably a good idea, anyway. Or, similarly but more realistically, using a conversion function likeROW a = ["true", "false"] | EVAL c = CASE(a::boolean, "foo", "bar")FROM idx* | EVAL x = CASE(field::boolean, 1, 2); I'd only do that if we expect weird interactions with block loading, though, which probably is not the case.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Generally if you ask "should we add this csv-spec test?" the answer is just yes. It's cheap.