Skip to content

[fix](ES catalog)Make col != '' behavior consistent with SQL (#34151) #34190

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
morningman merged 1 commit into from
Apr 26, 2024
Merged

[fix](ES catalog)Make col != '' behavior consistent with SQL (#34151) #34190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 10 additions & 0 deletions fe/fe-core/src/main/java/org/apache/doris/external/elasticsearch/QueryBuilders.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.Builder;
import lombok.Data;
import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.joda.time.format.DateTimeFormat;
Expand Down Expand Up @@ -137,6 +138,15 @@ private static QueryBuilder parseBinaryPredicate(Expr expr, TExprOpcode opCode,
case EQ_FOR_NULL:
return QueryBuilders.termQuery(column, value);
case NE:
// col != '' means col.length() > 0 in SQL syntax.
// The `NULL` value should not present in results.
// It equals
// '{"bool":{"must":{"bool":{"must_not":{"term":{"col":""}},"must":{"exists":{"field":"col"}}}}}}'
// in Elasticsearch
if (value instanceof String && StringUtils.isEmpty((String) value)) {
return QueryBuilders.boolQuery().mustNot(QueryBuilders.termQuery(column, value))
.must(QueryBuilders.existsQuery(column));
}
return QueryBuilders.boolQuery().mustNot(QueryBuilders.termQuery(column, value));
case GE:
return QueryBuilders.rangeQuery(column).gte(value);
Expand Down
9 changes: 9 additions & 0 deletions fe/fe-core/src/test/java/org/apache/doris/external/elasticsearch/QueryBuildersTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,15 @@ public void testBinaryPredicateConvertEsDsl() {
Assertions.assertEquals("{\"term\":{\"k2\":\"2023-02-19T22:00:00.000+08:00\"}}",
QueryBuilders.toEsDsl(dateTimeEqExpr, new ArrayList<>(), new HashMap<>(),
BuilderOptions.builder().needCompatDateFields(Lists.newArrayList("k2")).build()).toJson());
SlotRef k3 = new SlotRef(null, "k3");
Expr stringLiteral = new StringLiteral("");
Expr stringNeExpr = new BinaryPredicate(Operator.NE, k3, stringLiteral);
Assertions.assertEquals("{\"bool\":{\"must\":{\"exists\":{\"field\":\"k3\"}},\"must_not\":{\"term\":{\"k3\":\"\"}}}}",
QueryBuilders.toEsDsl(stringNeExpr).toJson());
stringLiteral = new StringLiteral("message");
stringNeExpr = new BinaryPredicate(Operator.NE, k3, stringLiteral);
Assertions.assertEquals("{\"bool\":{\"must_not\":{\"term\":{\"k3\":\"message\"}}}}",
QueryBuilders.toEsDsl(stringNeExpr).toJson());
}

@Test
Expand Down
9 changes: 1 addition & 8 deletions regression-test/data/external_table_p0/es/test_es_query.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@
2022-08-08 2022-08-11T12:10:10 2022-08-11T12:10:10 2022-08-11T12:10:10 2022-08-11T11:10:10

-- !sql04 --
\N
\N
I'm not null or empty

-- !sql05 --
Expand Down Expand Up @@ -91,7 +89,6 @@ true 1 128 32768 -1 0 1.0 1.0 1.0 1.0 2020-01-01 2020-01-01T12:00 a d 192.168.0.
2022-08-08T20:10:10

-- !sql_6_16 --
\N
I'm not null or empty

-- !sql_6_17 --
Expand Down Expand Up @@ -168,8 +165,6 @@ value1 value2
2022-08-08T20:10:10

-- !sql_7_19 --
\N
\N
I'm not null or empty

-- !sql_7_20 --
Expand All @@ -188,7 +183,7 @@ I'm not null or empty
[1, 0, 1, 1] [1, -2, -3, 4] ["2020-01-01", "2020-01-02"] ["2020-01-01 12:00:00", "2020-01-02 13:01:01"] [1, 2, 3, 4] [1, 1.1, 1.2, 1.3] [1, 2, 3, 4] [32768, 32769, -32769, -32770] ["192.168.0.1", "127.0.0.1"] ["a", "b", "c"] [-1, 0, 1, 2] ["{"name":"Andy","age":18}", "{"name":"Tim","age":28}"] [1, 2, 3, 4] [128, 129, -129, -130] ["d", "e", "f"] [0, 1, 2, 3] \N I'm not null or empty \N string3 2022-08-09T00:40:10 text3_4*5 5.0 2022-08-08T00:00 2022-08-10T12:10:10 1660104610000 2022-08-10T12:10:10 2022-08-10T20:10:10 3333
[1, 0, 1, 1] [1, -2, -3, 4] ["2020-01-01", "2020-01-02"] ["2020-01-01 12:00:00", "2020-01-02 13:01:01"] [1, 2, 3, 4] [1, 1.1, 1.2, 1.3] [1, 2, 3, 4] [32768, 32769, -32769, -32770] ["192.168.0.1", "127.0.0.1"] ["a", "b", "c"] [-1, 0, 1, 2] ["{"name":"Andy","age":18}", "{"name":"Tim","age":28}"] [1, 2, 3, 4] [128, 129, -129, -130] ["d", "e", "f"] [0, 1, 2, 3] debug \N This string can be quite lengthy string1 2022-08-08T20:10:10 text#1 3.14 2022-08-08T00:00 2022-08-08T12:10:10 1659931810000 2022-08-08T12:10:10 2022-08-08T20:10:10 12345

-- !sql_7_19 --
-- !sql_7_24 --
value1 value2

-- !sql_8_01 --
Expand Down Expand Up @@ -255,8 +250,6 @@ value1 value2
2022-08-08T20:10:10

-- !sql_8_17 --
\N
\N
I'm not null or empty

-- !sql_8_18 --
Expand Down
2 changes: 1 addition & 1 deletion regression-test/suites/external_table_p0/es/test_es_query.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ suite("test_es_query", "p0,external,es,external_docker,external_docker_es") {
}
assertTrue(containeHide7)

order_qt_sql_7_19 """select * from test3_20231005"""
order_qt_sql_7_24 """select * from test3_20231005"""

sql """switch test_es_query_es8"""
order_qt_sql_8_01 """select * from test1 where test2='text#1'"""
Expand Down