diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergMetadata.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergMetadata.java index 65d452344610..60c3ac023c41 100644 --- a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergMetadata.java +++ b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergMetadata.java @@ -1700,8 +1700,8 @@ private Optional getTableHandleForAddFilesFromTable Table icebergTable = catalog.loadTable(session, tableHandle.getSchemaTableName()); checkProcedureArgument( - icebergTable.schemas().size() >= sourceTable.getDataColumns().size(), - "Target table should have at least %d columns but got %d", sourceTable.getDataColumns().size(), icebergTable.schemas().size()); + icebergTable.schema().columns().size() >= sourceTable.getDataColumns().size(), + "Target table should have at least %d columns but got %d", sourceTable.getDataColumns().size(), icebergTable.schema().columns().size()); checkProcedureArgument( icebergTable.spec().fields().size() == sourceTable.getPartitionColumns().size(), "Numbers of partition columns should be equivalent. target: %d, source: %d", icebergTable.spec().fields().size(), sourceTable.getPartitionColumns().size()); diff --git a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/procedure/TestIcebergAddFilesProcedure.java b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/procedure/TestIcebergAddFilesProcedure.java index f4550150a91f..f7903b085acb 100644 --- a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/procedure/TestIcebergAddFilesProcedure.java +++ b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/procedure/TestIcebergAddFilesProcedure.java @@ -124,12 +124,12 @@ private void testAddFilesDifferentFileFormat(String hiveFormat, String icebergFo String hiveTableName = "test_add_files_" + randomNameSuffix(); String icebergTableName = "test_add_files_" + randomNameSuffix(); - assertUpdate("CREATE TABLE iceberg.tpch." + icebergTableName + " WITH (format = '" + icebergFormat + "') AS SELECT 1 x", 1); - assertUpdate("CREATE TABLE hive.tpch." + hiveTableName + " WITH (format = '" + hiveFormat + "') AS SELECT 2 x", 1); + assertUpdate("CREATE TABLE iceberg.tpch." + icebergTableName + " WITH (format = '" + icebergFormat + "') AS SELECT 1 x, 2 y", 1); + assertUpdate("CREATE TABLE hive.tpch." + hiveTableName + " WITH (format = '" + hiveFormat + "') AS SELECT 3 x, 4 y", 1); assertUpdate("ALTER TABLE " + icebergTableName + " EXECUTE add_files_from_table('tpch', '" + hiveTableName + "')"); - assertQuery("SELECT * FROM " + icebergTableName, "VALUES 1, 2"); + assertQuery("SELECT * FROM " + icebergTableName, "VALUES (1, 2), (3, 4)"); assertUpdate("DROP TABLE hive.tpch." + hiveTableName); assertUpdate("DROP TABLE iceberg.tpch." + icebergTableName);