Skip to content

Allow migrating external tables in Iceberg #16704

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 1 commit into from
Apr 17, 2023
Merged

Allow migrating external tables in Iceberg #16704

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
4 changes: 2 additions & 2 deletions plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/procedure/MigrateProcedure.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,8 +192,8 @@ public void doMigrate(ConnectorSession session, String schemaName, String tableN
if (parseBoolean(transactionalProperty)) {
throw new TrinoException(NOT_SUPPORTED, "Migrating transactional tables is unsupported");
}
if (!"MANAGED_TABLE".equalsIgnoreCase(hiveTable.getTableType())) {
throw new TrinoException(NOT_SUPPORTED, "The procedure supports migrating only managed tables: " + hiveTable.getTableType());
if (!"MANAGED_TABLE".equalsIgnoreCase(hiveTable.getTableType()) && !"EXTERNAL_TABLE".equalsIgnoreCase(hiveTable.getTableType())) {
throw new TrinoException(NOT_SUPPORTED, "The procedure doesn't support migrating %s table type".formatted(hiveTable.getTableType()));
}
if (isDeltaLakeTable(hiveTable)) {
throw new TrinoException(NOT_SUPPORTED, "The procedure doesn't support migrating Delta Lake tables");
Expand Down
2 changes: 1 addition & 1 deletion plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergMigrateProcedure.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ public void testMigrateUnsupportedTableType()

assertQueryFails(
"CALL iceberg.system.migrate('tpch', '" + viewName + "')",
"The procedure supports migrating only managed tables: .*");
"The procedure doesn't support migrating VIRTUAL_VIEW table type");

assertQuery("SELECT * FROM " + trinoViewInHive, "VALUES 1");
assertQuery("SELECT * FROM " + trinoViewInIceberg, "VALUES 1");
Expand Down
44 changes: 44 additions & 0 deletions ...product-tests/src/main/java/io/trino/tests/product/iceberg/TestIcebergProcedureCalls.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,16 @@
import org.assertj.core.api.Assertions;
import org.testng.annotations.Test;

import java.util.function.Consumer;

import static io.trino.tempto.assertions.QueryAssert.Row.row;
import static io.trino.tempto.assertions.QueryAssert.assertQueryFailure;
import static io.trino.tempto.assertions.QueryAssert.assertThat;
import static io.trino.testing.TestingNames.randomNameSuffix;
import static io.trino.tests.product.TestGroups.ICEBERG;
import static io.trino.tests.product.TestGroups.PROFILE_SPECIFIC_TESTS;
import static io.trino.tests.product.hive.util.TableLocationUtils.getTableLocation;
import static io.trino.tests.product.utils.QueryExecutors.onHive;
import static io.trino.tests.product.utils.QueryExecutors.onSpark;
import static io.trino.tests.product.utils.QueryExecutors.onTrino;
import static java.lang.String.format;
Expand Down Expand Up @@ -122,6 +126,46 @@ public void testMigrateHiveBucketedOnMultipleColumns()
onTrino().executeQuery("DROP TABLE IF EXISTS " + hiveTableName);
}

@Test(groups = {ICEBERG, PROFILE_SPECIFIC_TESTS})
public void testTrinoMigrateExternalTable()
{
migrateExternalTable(tableName -> onTrino().executeQuery("CALL iceberg.system.migrate('default', '" + tableName + "')"));
}

@Test(groups = {ICEBERG, PROFILE_SPECIFIC_TESTS})
public void testSparkMigrateExternalTable()
{
migrateExternalTable(tableName -> onSpark().executeQuery("CALL iceberg_test.system.migrate('default." + tableName + "')"));
}

private void migrateExternalTable(Consumer<String> migrateTable)
{
String managedTableName = "test_migrate_managed_" + randomNameSuffix();
String externalTableName = "test_migrate_external_" + randomNameSuffix();
String icebergTableName = "iceberg.default." + externalTableName;
String sparkTableName = "iceberg_test.default." + externalTableName;

onTrino().executeQuery("DROP TABLE IF EXISTS hive.default." + managedTableName);
onTrino().executeQuery("CREATE TABLE hive.default." + managedTableName + " AS SELECT 1 x");
String tableLocation = getTableLocation("hive.default." + managedTableName);
onTrino().executeQuery("CREATE TABLE hive.default." + externalTableName + "(x integer) WITH (external_location = '" + tableLocation + "')");

// Migrate an external table
migrateTable.accept(externalTableName);

assertThat(onTrino().executeQuery("SELECT * FROM " + icebergTableName)).containsOnly(row(1));
assertThat(onSpark().executeQuery("SELECT * FROM " + sparkTableName)).containsOnly(row(1));

// The migrated table behaves like managed tables because Iceberg doesn't have an external table concept
onTrino().executeQuery("DROP TABLE " + icebergTableName);

assertQueryFailure(() -> onTrino().executeQuery("SELECT * FROM hive.default." + managedTableName))
.hasMessageContaining("Partition location does not exist");
assertThat(onHive().executeQuery("SELECT * FROM default." + managedTableName)).hasNoRows();

onTrino().executeQuery("DROP TABLE hive.default." + managedTableName);
}

@Test(groups = {ICEBERG, PROFILE_SPECIFIC_TESTS})
public void testMigrateUnsupportedTransactionalTable()
{
Expand Down