Skip to content

Fix incorrect pushdown if IS NULL predicate in Elasticsearch #16428

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
zhenxiao merged 1 commit into from
Jul 16, 2021
Merged

Fix incorrect pushdown if IS NULL predicate in Elasticsearch #16428

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
3 changes: 3 additions & 0 deletions ...sticsearch/src/main/java/com/facebook/presto/elasticsearch/ElasticsearchQueryBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,9 @@ private static QueryBuilder buildTermQuery(BoolQueryBuilder queryBuilder, Connec
}
queryBuilder.should(rangeQueryBuilder);
}
if (domain.isNullAllowed()) {
queryBuilder.should(new BoolQueryBuilder().mustNot(new ExistsQueryBuilder(columnName)));
}
return queryBuilder;
}

Expand Down
81 changes: 81 additions & 0 deletions ...rc/test/java/com/facebook/presto/elasticsearch/TestElasticsearchIntegrationSmokeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,6 +299,87 @@ public void testEmptyObjectFields()
"VALUES ('stringfield', 32)");
}

@Test
public void testNullPredicate()
{
String indexName = "null_predicate1";

embeddedElasticsearchNode.getClient()
.admin()
.indices()
.prepareCreate(indexName)
.addMapping("doc",
"null_keyword", "type=keyword",
"custkey", "type=keyword")
.get();
index(indexName, ImmutableMap.<String, Object>builder()
.put("null_keyword", 32)
.put("custkey", 1301)
.build());
embeddedElasticsearchNode.getClient()
.admin()
.indices()
.refresh(refreshRequest(indexName))
.actionGet();

assertQueryReturnsEmptyResult("SELECT * FROM null_predicate1 WHERE null_keyword IS NULL");
assertQueryReturnsEmptyResult("SELECT * FROM null_predicate1 WHERE null_keyword = '10' OR null_keyword IS NULL");

assertQuery("SELECT custkey, null_keyword FROM null_predicate1 WHERE null_keyword = '32' OR null_keyword IS NULL", "VALUES (1301, 32)");
assertQuery("SELECT custkey FROM null_predicate1 WHERE null_keyword = '32' OR null_keyword IS NULL", "VALUES (1301)");

// not null filter
// filtered column is selected
assertQuery("SELECT custkey, null_keyword FROM null_predicate1 WHERE null_keyword IS NOT NULL", "VALUES (1301, 32)");
assertQuery("SELECT custkey, null_keyword FROM null_predicate1 WHERE null_keyword = '32' OR null_keyword IS NOT NULL", "VALUES (1301, 32)");

// filtered column is not selected
assertQuery("SELECT custkey FROM null_predicate1 WHERE null_keyword = '32' OR null_keyword IS NOT NULL", "VALUES (1301)");

indexName = "null_predicate2";

embeddedElasticsearchNode.getClient()
.admin()
.indices()
.prepareCreate(indexName)
.addMapping("doc",
"null_keyword", "type=keyword",
"custkey", "type=keyword")
.get();
index(indexName, ImmutableMap.<String, Object>builder()
.put("custkey", 1301)
.build());
embeddedElasticsearchNode.getClient()
.admin()
.indices()
.refresh(refreshRequest(indexName))
.actionGet();

// not null filter
assertQueryReturnsEmptyResult("SELECT * FROM null_predicate2 WHERE null_keyword IS NOT NULL");
assertQueryReturnsEmptyResult("SELECT * FROM null_predicate2 WHERE null_keyword = '10' OR null_keyword IS NOT NULL");

// filtered column is selected
assertQuery("SELECT custkey, null_keyword FROM null_predicate2 WHERE null_keyword IS NULL", "VALUES (1301, NULL)");
assertQuery("SELECT custkey, null_keyword FROM null_predicate2 WHERE null_keyword = '32' OR null_keyword IS NULL", "VALUES (1301, NULL)");

// filtered column is not selected
assertQuery("SELECT custkey FROM null_predicate2 WHERE null_keyword = '32' OR null_keyword IS NULL", "VALUES (1301)");

index(indexName, ImmutableMap.<String, Object>builder()
.put("null_keyword", 32)
.put("custkey", 1302)
.build());
embeddedElasticsearchNode.getClient()
.admin()
.indices()
.refresh(refreshRequest(indexName))
.actionGet();

assertQuery("SELECT custkey, null_keyword FROM null_predicate2 WHERE null_keyword = '32' OR null_keyword IS NULL", "VALUES (1301, NULL), (1302, 32)");
assertQuery("SELECT custkey FROM null_predicate2 WHERE null_keyword = '32' OR null_keyword IS NULL", "VALUES (1301), (1302)");
}

@Test
public void testNestedFields()
{
Expand Down