Skip to content

Fix encoding for Elasticsearch count pushdown #23425

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
hashhar merged 2 commits into from
Sep 19, 2024
Merged

Fix encoding for Elasticsearch count pushdown #23425

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1e3499e
Fix encoding for Elasticsearch count pushdown
bvolpato-dd Sep 13, 2024
3855a2a
Fix encoding for OpenSearch count pushdown
bvolpato-dd Sep 15, 2024
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
2 changes: 1 addition & 1 deletion ...elasticsearch/src/main/java/io/trino/plugin/elasticsearch/client/ElasticsearchClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -666,7 +666,7 @@ public long count(String index, int shard, QueryBuilder query)
"GET",
format("/%s/_count?preference=_shards:%s", index, shard),
ImmutableMap.of(),
new StringEntity(sourceBuilder.toString()),
new StringEntity(sourceBuilder.toString(), UTF_8),
new BasicHeader("Content-Type", "application/json"));
}
catch (ResponseException e) {
Expand Down
32 changes: 32 additions & 0 deletions ...ticsearch/src/test/java/io/trino/plugin/elasticsearch/BaseElasticsearchConnectorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1536,6 +1536,38 @@ public void testFilters()
assertQuery("SELECT count(*) FROM filter_pushdown WHERE ipv6_column = IPADDRESS '2001:db8::1:0:0:1'", "VALUES 1");
}

@Test
public void testFiltersCharset()
throws IOException
{
String indexName = "filter_charset_pushdown";

@Language("JSON")
String mappings = """
{
"properties": {
"keyword_column": { "type": "keyword" },
"text_column": { "type": "text" }
}
}
""";

createIndex(indexName, mappings);

index(indexName, ImmutableMap.<String, Object>builder()
.put("keyword_column", "Türkiye")
.put("text_column", "Türkiye")
.buildOrThrow());

assertQuery("SELECT count(*) FROM filter_charset_pushdown WHERE keyword_column = 'Türkiye'", "VALUES 1");
assertQuery("SELECT count(*) FROM filter_charset_pushdown WHERE keyword_column = 'bar'", "VALUES 0");
assertQuery("SELECT count(*) FROM filter_charset_pushdown WHERE text_column = 'Türkiye'", "VALUES 1");
assertQuery("SELECT count(*) FROM filter_charset_pushdown WHERE text_column = 'some'", "VALUES 0");

assertQuery("SELECT keyword_column FROM filter_charset_pushdown WHERE keyword_column = 'Türkiye'", "VALUES ('Türkiye')");
assertQuery("SELECT text_column FROM filter_charset_pushdown WHERE text_column = 'Türkiye'", "VALUES ('Türkiye')");
}

@Test
public void testLimitPushdown()
throws IOException
Expand Down
2 changes: 1 addition & 1 deletion ...in/trino-opensearch/src/main/java/io/trino/plugin/opensearch/client/OpenSearchClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -667,7 +667,7 @@ public long count(String index, int shard, QueryBuilder query)
"GET",
format("/%s/_count?preference=_shards:%s", index, shard),
ImmutableMap.of(),
new StringEntity(sourceBuilder.toString()),
new StringEntity(sourceBuilder.toString(), UTF_8),
new BasicHeader("Content-Type", "application/json"));
}
catch (ResponseException e) {
Expand Down
32 changes: 32 additions & 0 deletions ...rino-opensearch/src/test/java/io/trino/plugin/opensearch/BaseOpenSearchConnectorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1583,6 +1583,38 @@ public void testFilters()
assertQuery("SELECT count(*) FROM filter_pushdown WHERE ipv6_column = IPADDRESS '2001:db8::1:0:0:1'", "VALUES 1");
}

@Test
public void testFiltersCharset()
throws IOException
{
String indexName = "filter_charset_pushdown";

@Language("JSON")
String mappings = """
{
"properties": {
"keyword_column": { "type": "keyword" },
"text_column": { "type": "text" }
}
}
""";

createIndex(indexName, mappings);

index(indexName, ImmutableMap.<String, Object>builder()
.put("keyword_column", "Türkiye")
.put("text_column", "Türkiye")
.buildOrThrow());

assertQuery("SELECT count(*) FROM filter_charset_pushdown WHERE keyword_column = 'Türkiye'", "VALUES 1");
assertQuery("SELECT count(*) FROM filter_charset_pushdown WHERE keyword_column = 'bar'", "VALUES 0");
assertQuery("SELECT count(*) FROM filter_charset_pushdown WHERE text_column = 'Türkiye'", "VALUES 1");
assertQuery("SELECT count(*) FROM filter_charset_pushdown WHERE text_column = 'some'", "VALUES 0");

assertQuery("SELECT keyword_column FROM filter_charset_pushdown WHERE keyword_column = 'Türkiye'", "VALUES ('Türkiye')");
assertQuery("SELECT text_column FROM filter_charset_pushdown WHERE text_column = 'Türkiye'", "VALUES ('Türkiye')");
}

@Test
public void testLimitPushdown()
throws IOException
Expand Down