Skip to content

Test predicates pushdown to ClickHouse FLOAT type #23496

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
ebyhr merged 3 commits into from
Sep 20, 2024
Merged

Test predicates pushdown to ClickHouse FLOAT type #23496

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2f4d5dd
Make test repeatable
ssheikin Sep 17, 2024
5ec7f62
Improve ClickHouse TypeMapping test for double
ssheikin Sep 18, 2024
7a652b6
Test predicates pushdown to ClickHouse FLOAT type
ssheikin Sep 19, 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
6 changes: 6 additions & 0 deletions .../trino-clickhouse/src/test/java/io/trino/plugin/clickhouse/BaseClickHouseTypeMapping.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,11 +396,17 @@ public void testDouble()

.execute(getQueryRunner(), clickhouseCreateAndInsert("tpch.test_double"))

.addRoundTrip("double", "nan()", DOUBLE, "CAST(nan() AS DOUBLE)")
.addRoundTrip("double", "-infinity()", DOUBLE, "CAST(-infinity() AS DOUBLE)")
.addRoundTrip("double", "+infinity()", DOUBLE, "CAST(+infinity() AS DOUBLE)")
.addRoundTrip("double", "NULL", DOUBLE, "CAST(NULL AS DOUBLE)")

.execute(getQueryRunner(), trinoCreateAsSelect("trino_test_double"));

SqlDataTypeTest.create()
.addRoundTrip("double", "nan", DOUBLE, "CAST(nan() AS DOUBLE)")
.addRoundTrip("double", "-inf", DOUBLE, "CAST(-infinity() AS DOUBLE)")
.addRoundTrip("double", "+inf", DOUBLE, "CAST(+infinity() AS DOUBLE)")
.addRoundTrip("Nullable(double)", "NULL", DOUBLE, "CAST(NULL AS DOUBLE)")
.execute(getQueryRunner(), clickhouseCreateAndInsert("tpch.trino_test_nullable_double"));
}
Expand Down
60 changes: 56 additions & 4 deletions ...rino-clickhouse/src/test/java/io/trino/plugin/clickhouse/TestClickHouseConnectorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,10 +100,16 @@ protected QueryRunner createQueryRunner()
@Test
public void testSampleBySqlInjection()
{
assertQueryFails("CREATE TABLE test (p1 int NOT NULL, p2 boolean NOT NULL, x VARCHAR) WITH (engine = 'MergeTree', order_by = ARRAY['p1', 'p2'], primary_key = ARRAY['p1', 'p2'], sample_by = 'p2; drop table tpch.nation')", "(?s).*Missing columns: 'p2; drop table tpch.nation.*");
assertUpdate("CREATE TABLE test (p1 int NOT NULL, p2 boolean NOT NULL, x VARCHAR) WITH (engine = 'MergeTree', order_by = ARRAY['p1', 'p2'], primary_key = ARRAY['p1', 'p2'], sample_by = 'p2')");
assertQueryFails("ALTER TABLE test SET PROPERTIES sample_by = 'p2; drop table tpch.nation'", "(?s).*Missing columns: 'p2; drop table tpch.nation.*");
assertUpdate("ALTER TABLE test SET PROPERTIES sample_by = 'p2'");
String tableName = "sql_injection_" + randomNameSuffix();
try {
assertQueryFails("CREATE TABLE " + tableName + " (p1 int NOT NULL, p2 boolean NOT NULL, x VARCHAR) WITH (engine = 'MergeTree', order_by = ARRAY['p1', 'p2'], primary_key = ARRAY['p1', 'p2'], sample_by = 'p2; drop table tpch.nation')", "(?s).*Missing columns: 'p2; drop table tpch.nation.*");
assertUpdate("CREATE TABLE " + tableName + " (p1 int NOT NULL, p2 boolean NOT NULL, x VARCHAR) WITH (engine = 'MergeTree', order_by = ARRAY['p1', 'p2'], primary_key = ARRAY['p1', 'p2'], sample_by = 'p2')");
assertQueryFails("ALTER TABLE " + tableName + " SET PROPERTIES sample_by = 'p2; drop table tpch.nation'", "(?s).*Missing columns: 'p2; drop table tpch.nation.*");
assertUpdate("ALTER TABLE " + tableName + " SET PROPERTIES sample_by = 'p2'");
}
finally {
assertUpdate("DROP TABLE IF EXISTS " + tableName);
}
}

@Test
Expand Down Expand Up @@ -816,6 +822,52 @@ public void testLargeDefaultDomainCompactionThreshold()
"VALUES('" + propertyName + "','1000', '1000', 'integer', 'Maximum ranges to allow in a tuple domain without simplifying it')");
}

@Test
public void testFloatPredicatePushdown()
{
try (TestTable table = new TestTable(
getQueryRunner()::execute,
"test_float_predicate_pushdown",
"""
(
c_real real,
c_real_neg_infinity real,
c_real_pos_infinity real,
c_real_nan real,
c_double double,
c_double_neg_infinity double,
c_double_pos_infinity double,
c_double_nan double)""",
List.of("3.14, -infinity(), +infinity(), nan(), 3.14, -infinity(), +infinity(), nan()"))) {
assertThat(query("SELECT c_real FROM %s WHERE c_real = real '3.14'".formatted(table.getName())))
// because of https://github.com/trinodb/trino/issues/9998
.isNotFullyPushedDown(FilterNode.class);

assertThat(query("SELECT c_real FROM %s WHERE c_real_neg_infinity = -infinity()".formatted(table.getName())))
// because of https://github.com/trinodb/trino/issues/9998
.isNotFullyPushedDown(FilterNode.class);

assertThat(query("SELECT c_real FROM %s WHERE c_real_pos_infinity = +infinity()".formatted(table.getName())))
// because of https://github.com/trinodb/trino/issues/9998
.isNotFullyPushedDown(FilterNode.class);

assertThat(query("SELECT c_real FROM %s WHERE c_real_nan = nan()".formatted(table.getName())))
.isReplacedWithEmptyValues();

assertThat(query("SELECT c_real FROM %s WHERE c_double = double '3.14'".formatted(table.getName())))
.isFullyPushedDown();

assertThat(query("SELECT c_real FROM %s WHERE c_double_neg_infinity = -infinity()".formatted(table.getName())))
.isFullyPushedDown();

assertThat(query("SELECT c_real FROM %s WHERE c_double_pos_infinity = +infinity()".formatted(table.getName())))
.isFullyPushedDown();

assertThat(query("SELECT c_real FROM %s WHERE c_double_nan = nan()".formatted(table.getName())))
.isReplacedWithEmptyValues();
}
}

@Test
public void testTextualPredicatePushdown()
{
Expand Down