Skip to content

Add SUPPORTS_MAP_TYPE to TestingConnectorBehavior #24270

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
merged 1 commit into from
Nov 27, 2024
Merged

Add SUPPORTS_MAP_TYPE to TestingConnectorBehavior #24270

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
1 change: 1 addition & 0 deletions plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestJdbcConnectorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ protected boolean hasBehavior(TestingConnectorBehavior connectorBehavior)
SUPPORTS_CREATE_TABLE_WITH_COLUMN_COMMENT,
SUPPORTS_CREATE_TABLE_WITH_TABLE_COMMENT,
SUPPORTS_LIMIT_PUSHDOWN,
SUPPORTS_MAP_TYPE,
SUPPORTS_RENAME_TABLE_ACROSS_SCHEMAS,
SUPPORTS_ROW_TYPE,
SUPPORTS_TOPN_PUSHDOWN -> false;
Expand Down
1 change: 1 addition & 0 deletions plugin/trino-bigquery/src/test/java/io/trino/plugin/bigquery/BaseBigQueryConnectorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ protected boolean hasBehavior(TestingConnectorBehavior connectorBehavior)
case SUPPORTS_ADD_COLUMN,
SUPPORTS_CREATE_MATERIALIZED_VIEW,
SUPPORTS_CREATE_VIEW,
SUPPORTS_MAP_TYPE,
SUPPORTS_MERGE,
SUPPORTS_NEGATIVE_DATE,
SUPPORTS_NOT_NULL_CONSTRAINT,
Expand Down
1 change: 1 addition & 0 deletions ...n/trino-cassandra/src/test/java/io/trino/plugin/cassandra/TestCassandraConnectorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ protected boolean hasBehavior(TestingConnectorBehavior connectorBehavior)
SUPPORTS_CREATE_TABLE_WITH_COLUMN_COMMENT,
SUPPORTS_CREATE_TABLE_WITH_TABLE_COMMENT,
SUPPORTS_CREATE_VIEW,
SUPPORTS_MAP_TYPE,
SUPPORTS_MERGE,
SUPPORTS_NOT_NULL_CONSTRAINT,
SUPPORTS_RENAME_COLUMN,
Expand Down
1 change: 1 addition & 0 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 @@ -79,6 +79,7 @@ protected boolean hasBehavior(TestingConnectorBehavior connectorBehavior)
SUPPORTS_ARRAY,
SUPPORTS_DELETE,
SUPPORTS_DROP_NOT_NULL_CONSTRAINT,
SUPPORTS_MAP_TYPE,
SUPPORTS_NEGATIVE_DATE,
SUPPORTS_ROW_TYPE,
SUPPORTS_SET_COLUMN_TYPE,
Expand Down
1 change: 1 addition & 0 deletions plugin/trino-exasol/src/test/java/io/trino/plugin/exasol/TestExasolConnectorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ protected boolean hasBehavior(TestingConnectorBehavior connectorBehavior)
SUPPORTS_CREATE_TABLE,
SUPPORTS_DELETE,
SUPPORTS_INSERT,
SUPPORTS_MAP_TYPE,
SUPPORTS_NEGATIVE_DATE, // min date is 0001-01-01
SUPPORTS_RENAME_COLUMN,
SUPPORTS_RENAME_TABLE,
Expand Down
1 change: 1 addition & 0 deletions plugin/trino-ignite/src/test/java/io/trino/plugin/ignite/TestIgniteConnectorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ protected boolean hasBehavior(TestingConnectorBehavior connectorBehavior)
SUPPORTS_CREATE_TABLE_WITH_COLUMN_COMMENT,
SUPPORTS_CREATE_TABLE_WITH_TABLE_COMMENT,
SUPPORTS_JOIN_PUSHDOWN_WITH_FULL_JOIN,
SUPPORTS_MAP_TYPE,
SUPPORTS_NATIVE_QUERY,
SUPPORTS_NEGATIVE_DATE,
SUPPORTS_RENAME_COLUMN,
Expand Down
1 change: 1 addition & 0 deletions plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/TestKuduConnectorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ protected boolean hasBehavior(TestingConnectorBehavior connectorBehavior)
SUPPORTS_CREATE_MATERIALIZED_VIEW,
SUPPORTS_CREATE_TABLE_WITH_COLUMN_COMMENT,
SUPPORTS_CREATE_VIEW,
SUPPORTS_MAP_TYPE,
SUPPORTS_NEGATIVE_DATE,
SUPPORTS_NOT_NULL_CONSTRAINT,
SUPPORTS_RENAME_SCHEMA,
Expand Down
1 change: 1 addition & 0 deletions plugin/trino-mariadb/src/test/java/io/trino/plugin/mariadb/BaseMariaDbConnectorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ protected boolean hasBehavior(TestingConnectorBehavior connectorBehavior)
SUPPORTS_DROP_NOT_NULL_CONSTRAINT,
SUPPORTS_JOIN_PUSHDOWN_WITH_DISTINCT_FROM,
SUPPORTS_JOIN_PUSHDOWN_WITH_FULL_JOIN,
SUPPORTS_MAP_TYPE,
SUPPORTS_NEGATIVE_DATE,
SUPPORTS_PREDICATE_PUSHDOWN_WITH_VARCHAR_EQUALITY,
SUPPORTS_PREDICATE_PUSHDOWN_WITH_VARCHAR_INEQUALITY,
Expand Down
1 change: 1 addition & 0 deletions plugin/trino-mysql/src/test/java/io/trino/plugin/mysql/BaseMySqlConnectorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ protected boolean hasBehavior(TestingConnectorBehavior connectorBehavior)
SUPPORTS_DROP_NOT_NULL_CONSTRAINT,
SUPPORTS_JOIN_PUSHDOWN_WITH_DISTINCT_FROM,
SUPPORTS_JOIN_PUSHDOWN_WITH_FULL_JOIN,
SUPPORTS_MAP_TYPE,
SUPPORTS_NEGATIVE_DATE,
SUPPORTS_PREDICATE_PUSHDOWN_WITH_VARCHAR_EQUALITY,
SUPPORTS_PREDICATE_PUSHDOWN_WITH_VARCHAR_INEQUALITY,
Expand Down
1 change: 1 addition & 0 deletions plugin/trino-oracle/src/test/java/io/trino/plugin/oracle/BaseOracleConnectorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ protected boolean hasBehavior(TestingConnectorBehavior connectorBehavior)
SUPPORTS_CREATE_TABLE_WITH_COLUMN_COMMENT,
SUPPORTS_DROP_NOT_NULL_CONSTRAINT,
SUPPORTS_JOIN_PUSHDOWN_WITH_DISTINCT_FROM,
SUPPORTS_MAP_TYPE,
SUPPORTS_RENAME_TABLE_ACROSS_SCHEMAS,
SUPPORTS_ROW_TYPE,
SUPPORTS_SET_COLUMN_TYPE,
Expand Down
1 change: 1 addition & 0 deletions plugin/trino-phoenix5/src/test/java/io/trino/plugin/phoenix5/TestPhoenixConnectorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ protected boolean hasBehavior(TestingConnectorBehavior connectorBehavior)
SUPPORTS_CREATE_TABLE_WITH_TABLE_COMMENT,
SUPPORTS_DROP_SCHEMA_CASCADE,
SUPPORTS_LIMIT_PUSHDOWN,
SUPPORTS_MAP_TYPE,
SUPPORTS_NATIVE_QUERY,
SUPPORTS_NOT_NULL_CONSTRAINT,
SUPPORTS_RENAME_COLUMN,
Expand Down
1 change: 1 addition & 0 deletions plugin/trino-pinot/src/test/java/io/trino/plugin/pinot/TestPinotConnectorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ protected boolean hasBehavior(TestingConnectorBehavior connectorBehavior)
SUPPORTS_CREATE_VIEW,
SUPPORTS_DELETE,
SUPPORTS_INSERT,
SUPPORTS_MAP_TYPE,
SUPPORTS_MERGE,
SUPPORTS_RENAME_COLUMN,
SUPPORTS_RENAME_TABLE,
Expand Down
1 change: 1 addition & 0 deletions ...rino-postgresql/src/test/java/io/trino/plugin/postgresql/TestPostgreSqlConnectorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@ protected boolean hasBehavior(TestingConnectorBehavior connectorBehavior)
case SUPPORTS_ADD_COLUMN_WITH_COMMENT,
SUPPORTS_CREATE_TABLE_WITH_COLUMN_COMMENT,
SUPPORTS_JOIN_PUSHDOWN_WITH_FULL_JOIN,
SUPPORTS_MAP_TYPE,
SUPPORTS_PREDICATE_PUSHDOWN_WITH_VARCHAR_INEQUALITY,
SUPPORTS_RENAME_TABLE_ACROSS_SCHEMAS,
SUPPORTS_ROW_TYPE -> false;
Expand Down
1 change: 1 addition & 0 deletions plugin/trino-redis/src/test/java/io/trino/plugin/redis/BaseRedisConnectorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ protected boolean hasBehavior(TestingConnectorBehavior connectorBehavior)
SUPPORTS_CREATE_VIEW,
SUPPORTS_DELETE,
SUPPORTS_INSERT,
SUPPORTS_MAP_TYPE,
SUPPORTS_MERGE,
SUPPORTS_RENAME_COLUMN,
SUPPORTS_RENAME_TABLE,
Expand Down
1 change: 1 addition & 0 deletions plugin/trino-redshift/src/test/java/io/trino/plugin/redshift/TestRedshiftConnectorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ protected boolean hasBehavior(TestingConnectorBehavior connectorBehavior)
SUPPORTS_DROP_SCHEMA_CASCADE,
SUPPORTS_JOIN_PUSHDOWN_WITH_DISTINCT_FROM,
SUPPORTS_JOIN_PUSHDOWN_WITH_FULL_JOIN,
SUPPORTS_MAP_TYPE,
SUPPORTS_RENAME_TABLE_ACROSS_SCHEMAS,
SUPPORTS_ROW_TYPE,
SUPPORTS_SET_COLUMN_TYPE -> false;
Expand Down
1 change: 1 addition & 0 deletions ...o-singlestore/src/test/java/io/trino/plugin/singlestore/TestSingleStoreConnectorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ protected boolean hasBehavior(TestingConnectorBehavior connectorBehavior)
SUPPORTS_CREATE_TABLE_WITH_TABLE_COMMENT,
SUPPORTS_JOIN_PUSHDOWN_WITH_DISTINCT_FROM,
SUPPORTS_JOIN_PUSHDOWN_WITH_FULL_JOIN,
SUPPORTS_MAP_TYPE,
SUPPORTS_PREDICATE_PUSHDOWN_WITH_VARCHAR_EQUALITY,
SUPPORTS_PREDICATE_PUSHDOWN_WITH_VARCHAR_INEQUALITY,
SUPPORTS_RENAME_SCHEMA,
Expand Down
1 change: 1 addition & 0 deletions ...n/trino-snowflake/src/test/java/io/trino/plugin/snowflake/TestSnowflakeConnectorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ protected boolean hasBehavior(TestingConnectorBehavior connectorBehavior)
SUPPORTS_ARRAY,
SUPPORTS_COMMENT_ON_COLUMN,
SUPPORTS_CREATE_TABLE_WITH_COLUMN_COMMENT,
SUPPORTS_MAP_TYPE,
SUPPORTS_PREDICATE_PUSHDOWN_WITH_VARCHAR_EQUALITY,
SUPPORTS_PREDICATE_PUSHDOWN_WITH_VARCHAR_INEQUALITY,
SUPPORTS_ROW_TYPE,
Expand Down
1 change: 1 addition & 0 deletions ...n/trino-sqlserver/src/test/java/io/trino/plugin/sqlserver/BaseSqlServerConnectorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ protected boolean hasBehavior(TestingConnectorBehavior connectorBehavior)
SUPPORTS_DROP_NOT_NULL_CONSTRAINT,
SUPPORTS_DROP_SCHEMA_CASCADE,
SUPPORTS_JOIN_PUSHDOWN_WITH_DISTINCT_FROM,
SUPPORTS_MAP_TYPE,
SUPPORTS_NEGATIVE_DATE,
SUPPORTS_PREDICATE_PUSHDOWN_WITH_VARCHAR_INEQUALITY,
SUPPORTS_RENAME_SCHEMA,
Expand Down
1 change: 1 addition & 0 deletions plugin/trino-vertica/src/test/java/io/trino/plugin/vertica/TestVerticaConnectorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ protected boolean hasBehavior(TestingConnectorBehavior connectorBehavior)
SUPPORTS_CREATE_TABLE_WITH_TABLE_COMMENT,
SUPPORTS_DROP_COLUMN,
SUPPORTS_JOIN_PUSHDOWN_WITH_DISTINCT_FROM,
SUPPORTS_MAP_TYPE,
SUPPORTS_RENAME_SCHEMA,
SUPPORTS_RENAME_TABLE_ACROSS_SCHEMAS,
SUPPORTS_ROW_TYPE,
Expand Down
29 changes: 25 additions & 4 deletions testing/trino-testing/src/main/java/io/trino/testing/BaseConnectorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@
import static io.trino.testing.TestingConnectorBehavior.SUPPORTS_DROP_NOT_NULL_CONSTRAINT;
import static io.trino.testing.TestingConnectorBehavior.SUPPORTS_DROP_SCHEMA_CASCADE;
import static io.trino.testing.TestingConnectorBehavior.SUPPORTS_INSERT;
import static io.trino.testing.TestingConnectorBehavior.SUPPORTS_MAP_TYPE;
import static io.trino.testing.TestingConnectorBehavior.SUPPORTS_MATERIALIZED_VIEW_FRESHNESS_FROM_BASE_TABLES;
import static io.trino.testing.TestingConnectorBehavior.SUPPORTS_MERGE;
import static io.trino.testing.TestingConnectorBehavior.SUPPORTS_MULTI_STATEMENT_WRITES;
Expand Down Expand Up @@ -3299,7 +3300,7 @@ public void testSetFieldTypeInNestedArray()
@Test
public void testSetFieldMapKeyType()
{
skipTestUnless(hasBehavior(SUPPORTS_CREATE_TABLE_WITH_DATA) && hasBehavior(SUPPORTS_ROW_TYPE));
skipTestUnless(hasBehavior(SUPPORTS_CREATE_TABLE_WITH_DATA) && hasBehavior(SUPPORTS_MAP_TYPE) && hasBehavior(SUPPORTS_ROW_TYPE));

String tableDefinition = "AS SELECT CAST(map(array[row(1)], array[2]) AS map(row(field integer), integer)) AS col";
if (!hasBehavior(SUPPORTS_SET_FIELD_TYPE_IN_MAP)) {
Expand All @@ -3323,7 +3324,7 @@ public void testSetFieldMapKeyType()
@Test
public void testSetFieldMapValueType()
{
skipTestUnless(hasBehavior(SUPPORTS_CREATE_TABLE_WITH_DATA) && hasBehavior(SUPPORTS_ROW_TYPE));
skipTestUnless(hasBehavior(SUPPORTS_CREATE_TABLE_WITH_DATA) && hasBehavior(SUPPORTS_MAP_TYPE) && hasBehavior(SUPPORTS_ROW_TYPE));

String tableDefinition = "AS SELECT CAST(map(array[1], array[row(2)]) AS map(integer, row(field integer))) AS col";
if (!hasBehavior(SUPPORTS_SET_FIELD_TYPE_IN_MAP)) {
Expand All @@ -3347,7 +3348,7 @@ public void testSetFieldMapValueType()
@Test
public void testSetNestedFieldMapKeyType()
{
skipTestUnless(hasBehavior(SUPPORTS_SET_FIELD_TYPE_IN_ARRAY) && hasBehavior(SUPPORTS_SET_FIELD_TYPE_IN_MAP) && hasBehavior(SUPPORTS_CREATE_TABLE_WITH_DATA) && hasBehavior(SUPPORTS_ARRAY) && hasBehavior(SUPPORTS_ROW_TYPE));
skipTestUnless(hasBehavior(SUPPORTS_SET_FIELD_TYPE_IN_ARRAY) && hasBehavior(SUPPORTS_SET_FIELD_TYPE_IN_MAP) && hasBehavior(SUPPORTS_CREATE_TABLE_WITH_DATA) && hasBehavior(SUPPORTS_ARRAY) && hasBehavior(SUPPORTS_MAP_TYPE) && hasBehavior(SUPPORTS_ROW_TYPE));

try (TestTable table = new TestTable(
getQueryRunner()::execute,
Expand All @@ -3366,7 +3367,7 @@ public void testSetNestedFieldMapKeyType()
@Test
public void testSetNestedFieldMapValueType()
{
skipTestUnless(hasBehavior(SUPPORTS_SET_FIELD_TYPE_IN_ARRAY) && hasBehavior(SUPPORTS_SET_FIELD_TYPE_IN_MAP) && hasBehavior(SUPPORTS_CREATE_TABLE_WITH_DATA) && hasBehavior(SUPPORTS_ARRAY) && hasBehavior(SUPPORTS_ROW_TYPE));
skipTestUnless(hasBehavior(SUPPORTS_SET_FIELD_TYPE_IN_ARRAY) && hasBehavior(SUPPORTS_SET_FIELD_TYPE_IN_MAP) && hasBehavior(SUPPORTS_CREATE_TABLE_WITH_DATA) && hasBehavior(SUPPORTS_ARRAY) && hasBehavior(SUPPORTS_MAP_TYPE) && hasBehavior(SUPPORTS_ROW_TYPE));

try (TestTable table = new TestTable(
getQueryRunner()::execute,
Expand Down Expand Up @@ -4539,6 +4540,26 @@ public void testInsertArray()
}
}

@Test
public void testInsertMap()
{
skipTestUnless(hasBehavior(SUPPORTS_CREATE_TABLE) && hasBehavior(SUPPORTS_INSERT));

String tableName = "test_insert_map_" + randomNameSuffix();
if (!hasBehavior(SUPPORTS_MAP_TYPE)) {
assertThat(query("CREATE TABLE " + tableName + " (a map(integer, integer))"))
// TODO Unify failure message across connectors
.failure().hasMessageMatching("[Uu]nsupported (column )?type: \\Qmap(integer, integer)");
abort("not supported");
}

try (TestTable table = new TestTable(getQueryRunner()::execute, "test_insert_map_", "(col map(integer, integer))")) {
assertUpdate("INSERT INTO " + table.getName() + " VALUES map(ARRAY[1], ARRAY[2])", 1);
assertThat(query("SELECT * FROM " + table.getName()))
.matches("VALUES map(ARRAY[1], ARRAY[2])");
}
}

@Test
public void testInsertSameValues()
{
Expand Down
1 change: 1 addition & 0 deletions testing/trino-testing/src/main/java/io/trino/testing/TestingConnectorBehavior.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ public enum TestingConnectorBehavior
SUPPORTS_TRUNCATE(SUPPORTS_DELETE),

SUPPORTS_ARRAY,
SUPPORTS_MAP_TYPE,
SUPPORTS_ROW_TYPE,

SUPPORTS_PREDICATE_PUSHDOWN,
Expand Down
1 change: 1 addition & 0 deletions testing/trino-tests/src/test/java/io/trino/tests/tpch/TestTpchConnectorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ protected boolean hasBehavior(TestingConnectorBehavior connectorBehavior)
SUPPORTS_CREATE_VIEW,
SUPPORTS_DELETE,
SUPPORTS_INSERT,
SUPPORTS_MAP_TYPE,
SUPPORTS_MERGE,
SUPPORTS_RENAME_COLUMN,
SUPPORTS_RENAME_TABLE,
Expand Down