From 1d6f5f741a306c9e8842195fe288fecf6172fd42 Mon Sep 17 00:00:00 2001 From: Yuya Ebihara Date: Wed, 11 Oct 2023 14:04:56 +0900 Subject: [PATCH] Use dedicated schemas in Delta Lake smoke tests Also, restore the assertion which was deleted in https://github.com/trinodb/trino/commit/ee72515430cdfcc9f86d31c26d84aef81c2b722e --- .../BaseDeltaLakeConnectorSmokeTest.java | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/BaseDeltaLakeConnectorSmokeTest.java b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/BaseDeltaLakeConnectorSmokeTest.java index 73b1e63f232f..ff7601c9b5a5 100644 --- a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/BaseDeltaLakeConnectorSmokeTest.java +++ b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/BaseDeltaLakeConnectorSmokeTest.java @@ -481,20 +481,25 @@ public void testHiddenColumns() @Test public void testHiveViewsCannotBeAccessed() { + String schemaName = "test_schema" + randomNameSuffix(); String viewName = "dummy_view"; - hiveHadoop.runOnHive(format("CREATE VIEW %1$s.%2$s AS SELECT * FROM %1$s.customer", SCHEMA, viewName)); - assertThatThrownBy(() -> computeActual("DESCRIBE " + viewName)).hasMessageContaining(format("%s.%s is not a Delta Lake table", SCHEMA, viewName)); - hiveHadoop.runOnHive("DROP VIEW " + viewName); + hiveHadoop.runOnHive("CREATE DATABASE " + schemaName); + hiveHadoop.runOnHive(format("CREATE VIEW %s.%s AS SELECT * FROM %s.customer", schemaName, viewName, SCHEMA)); + assertEquals(computeScalar(format("SHOW TABLES FROM %s LIKE '%s'", schemaName, viewName)), viewName); + assertThatThrownBy(() -> computeActual("DESCRIBE " + schemaName + "." + viewName)).hasMessageContaining(format("%s.%s is not a Delta Lake table", schemaName, viewName)); + hiveHadoop.runOnHive("DROP DATABASE " + schemaName + " CASCADE"); } @Test public void testNonDeltaTablesCannotBeAccessed() { + String schemaName = "test_schema" + randomNameSuffix(); String tableName = "hive_table"; - hiveHadoop.runOnHive(format("CREATE TABLE %s.%s (id BIGINT)", SCHEMA, tableName)); - assertEquals(computeScalar(format("SHOW TABLES LIKE '%s'", tableName)), tableName); - assertThatThrownBy(() -> computeActual("DESCRIBE " + tableName)).hasMessageContaining(tableName + " is not a Delta Lake table"); - hiveHadoop.runOnHive(format("DROP TABLE %s.%s", SCHEMA, tableName)); + hiveHadoop.runOnHive("CREATE DATABASE " + schemaName); + hiveHadoop.runOnHive(format("CREATE TABLE %s.%s (id BIGINT)", schemaName, tableName)); + assertEquals(computeScalar(format("SHOW TABLES FROM %s LIKE '%s'", schemaName, tableName)), tableName); + assertThatThrownBy(() -> computeActual("DESCRIBE " + schemaName + "." + tableName)).hasMessageContaining(tableName + " is not a Delta Lake table"); + hiveHadoop.runOnHive("DROP DATABASE " + schemaName + " CASCADE"); } @Test