-
Notifications
You must be signed in to change notification settings - Fork 24.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
SQL: Fix queries with filter resulting in NO_MATCH (#34812)
Previously, `Mapper` was returning an incorrect plan which resulted in an ``` SQLFeatureNotSupportedException: Found 1 problem(s) line 1:8: Unexecutable item ``` Queries with a `WHERE` and/or `HAVING` clause which results in NO_MATCH are now handled correctly and return 0 rows. Fixes: #34613 Co-authored-by: Costin Leau <costin.leau@gmail.com>
- Loading branch information
Showing
5 changed files
with
113 additions
and
3 deletions.
There are no files selected for viewing
This file contains 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 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
98 changes: 98 additions & 0 deletions
98
x-pack/plugin/sql/src/test/java/org/elasticsearch/xpack/sql/planner/QueryFolderTests.java
This file contains 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 |
---|---|---|
@@ -0,0 +1,98 @@ | ||
/* | ||
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
* or more contributor license agreements. Licensed under the Elastic License; | ||
* you may not use this file except in compliance with the Elastic License. | ||
*/ | ||
package org.elasticsearch.xpack.sql.planner; | ||
|
||
import org.elasticsearch.test.AbstractBuilderTestCase; | ||
import org.elasticsearch.xpack.sql.analysis.analyzer.Analyzer; | ||
import org.elasticsearch.xpack.sql.analysis.index.EsIndex; | ||
import org.elasticsearch.xpack.sql.analysis.index.IndexResolution; | ||
import org.elasticsearch.xpack.sql.expression.function.FunctionRegistry; | ||
import org.elasticsearch.xpack.sql.optimizer.Optimizer; | ||
import org.elasticsearch.xpack.sql.parser.SqlParser; | ||
import org.elasticsearch.xpack.sql.plan.physical.LocalExec; | ||
import org.elasticsearch.xpack.sql.plan.physical.PhysicalPlan; | ||
import org.elasticsearch.xpack.sql.session.EmptyExecutable; | ||
import org.elasticsearch.xpack.sql.type.EsField; | ||
import org.elasticsearch.xpack.sql.type.TypesTests; | ||
import org.junit.AfterClass; | ||
import org.junit.BeforeClass; | ||
|
||
import java.util.Map; | ||
import java.util.TimeZone; | ||
|
||
import static org.hamcrest.Matchers.startsWith; | ||
|
||
public class QueryFolderTests extends AbstractBuilderTestCase { | ||
|
||
private static SqlParser parser; | ||
private static Analyzer analyzer; | ||
private static Optimizer optimizer; | ||
private static Planner planner; | ||
|
||
@BeforeClass | ||
public static void init() { | ||
parser = new SqlParser(); | ||
|
||
Map<String, EsField> mapping = TypesTests.loadMapping("mapping-multi-field-variation.json"); | ||
EsIndex test = new EsIndex("test", mapping); | ||
IndexResolution getIndexResult = IndexResolution.valid(test); | ||
analyzer = new Analyzer(new FunctionRegistry(), getIndexResult, TimeZone.getTimeZone("UTC")); | ||
optimizer = new Optimizer(); | ||
planner = new Planner(); | ||
} | ||
|
||
@AfterClass | ||
public static void destroy() { | ||
parser = null; | ||
analyzer = null; | ||
} | ||
|
||
private PhysicalPlan plan(String sql) { | ||
return planner.plan(optimizer.optimize(analyzer.analyze(parser.createStatement(sql), true)), true); | ||
} | ||
|
||
public void testFoldingToLocalExecWithProject() { | ||
PhysicalPlan p = plan("SELECT keyword FROM test WHERE 1 = 2"); | ||
assertEquals(LocalExec.class, p.getClass()); | ||
LocalExec le = (LocalExec) p; | ||
assertEquals(EmptyExecutable.class, le.executable().getClass()); | ||
EmptyExecutable ee = (EmptyExecutable) le.executable(); | ||
assertEquals(1, ee.output().size()); | ||
assertThat(ee.output().get(0).toString(), startsWith("keyword{f}#")); | ||
} | ||
|
||
public void testFoldingToLocalExecWithProject_WithOrderAndLimit() { | ||
PhysicalPlan p = plan("SELECT keyword FROM test WHERE 1 = 2 ORDER BY int LIMIT 10"); | ||
assertEquals(LocalExec.class, p.getClass()); | ||
LocalExec le = (LocalExec) p; | ||
assertEquals(EmptyExecutable.class, le.executable().getClass()); | ||
EmptyExecutable ee = (EmptyExecutable) le.executable(); | ||
assertEquals(1, ee.output().size()); | ||
assertThat(ee.output().get(0).toString(), startsWith("keyword{f}#")); | ||
} | ||
|
||
public void testFoldingToLocalExecWithProjectWithGroupBy_WithOrderAndLimit() { | ||
PhysicalPlan p = plan("SELECT keyword, max(int) FROM test WHERE 1 = 2 GROUP BY keyword ORDER BY 1 LIMIT 10"); | ||
assertEquals(LocalExec.class, p.getClass()); | ||
LocalExec le = (LocalExec) p; | ||
assertEquals(EmptyExecutable.class, le.executable().getClass()); | ||
EmptyExecutable ee = (EmptyExecutable) le.executable(); | ||
assertEquals(2, ee.output().size()); | ||
assertThat(ee.output().get(0).toString(), startsWith("keyword{f}#")); | ||
assertThat(ee.output().get(1).toString(), startsWith("MAX(int){a->")); | ||
} | ||
|
||
public void testFoldingToLocalExecWithProjectWithGroupBy_WithHaving_WithOrderAndLimit() { | ||
PhysicalPlan p = plan("SELECT keyword, max(int) FROM test GROUP BY keyword HAVING 1 = 2 ORDER BY 1 LIMIT 10"); | ||
assertEquals(LocalExec.class, p.getClass()); | ||
LocalExec le = (LocalExec) p; | ||
assertEquals(EmptyExecutable.class, le.executable().getClass()); | ||
EmptyExecutable ee = (EmptyExecutable) le.executable(); | ||
assertEquals(2, ee.output().size()); | ||
assertThat(ee.output().get(0).toString(), startsWith("keyword{f}#")); | ||
assertThat(ee.output().get(1).toString(), startsWith("MAX(int){a->")); | ||
} | ||
} |
This file contains 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 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