Skip to content

Add helper method to create V3 table in TestIcebergV3 #28869

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
Mar 26, 2026
+25 −54
Merged

Add helper method to create V3 table in TestIcebergV3 #28869

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
79 changes: 25 additions & 54 deletions plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergV3.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,24 +465,16 @@ void testTimestampNano()
throws IOException
{
String tableName = "test_timestamp_nano_" + randomNameSuffix();
Path tableLocation = dataDirectory.resolve(tableName);

// Create table with timestamp_nano column using Iceberg API
Schema schema = new Schema(
Types.NestedField.required(1, "id", Types.IntegerType.get()),
Types.NestedField.optional(2, "ts_nano", Types.TimestampNanoType.withoutZone()));

Table table = HADOOP_TABLES.create(
schema,
PartitionSpec.unpartitioned(),
SortOrder.unsorted(),
ImmutableMap.of(FORMAT_VERSION, "3"),
tableLocation.toString());
Table table = createV3Table(tableName, schema);

// Write data with nanosecond precision
String dataPath = tableLocation.resolve("data")
.resolve("data-" + UUID.randomUUID() + ".parquet")
.toString();
String dataPath = table.location() + "/data/data-" + UUID.randomUUID() + ".parquet";
try (DataWriter<Record> writer = Parquet.writeData(table.io().newOutputFile(dataPath))
.forTable(table)
.withSpec(table.spec())
Expand All @@ -501,14 +493,10 @@ void testTimestampNano()
.commit();
}

// Register table in Trino and verify
String registered = "registered_timestamp_nano_" + randomNameSuffix();
assertUpdate("CALL system.register_table(CURRENT_SCHEMA, '%s', '%s')".formatted(registered, tableLocation));

assertThat(query("SELECT id, ts_nano FROM " + registered))
assertThat(query("SELECT id, ts_nano FROM " + tableName))
.matches("VALUES (1, TIMESTAMP '2024-01-15 12:30:45.123456789')");

assertUpdate("DROP TABLE " + registered);
assertUpdate("DROP TABLE " + tableName);
}

@Test
Expand Down Expand Up @@ -566,24 +554,16 @@ void testTimestampNanoWithTimeZone()
throws IOException
{
String tableName = "test_timestamp_nano_tz_" + randomNameSuffix();
Path tableLocation = dataDirectory.resolve(tableName);

// Create table with timestamp_nano (with UTC adjustment) column using Iceberg API
Schema schema = new Schema(
Types.NestedField.required(1, "id", Types.IntegerType.get()),
Types.NestedField.optional(2, "ts_nano_tz", Types.TimestampNanoType.withZone()));

Table table = HADOOP_TABLES.create(
schema,
PartitionSpec.unpartitioned(),
SortOrder.unsorted(),
ImmutableMap.of(FORMAT_VERSION, "3"),
tableLocation.toString());
Table table = createV3Table(tableName, schema);

// Write data with nanosecond precision
String dataPath = tableLocation.resolve("data")
.resolve("data-" + UUID.randomUUID() + ".parquet")
.toString();
String dataPath = table.location() + "/data/data-" + UUID.randomUUID() + ".parquet";
try (DataWriter<Record> writer = Parquet.writeData(table.io().newOutputFile(dataPath))
.forTable(table)
.withSpec(table.spec())
Expand All @@ -602,14 +582,10 @@ void testTimestampNanoWithTimeZone()
.commit();
}

// Register table in Trino and verify
String registered = "registered_timestamp_nano_tz_" + randomNameSuffix();
assertUpdate("CALL system.register_table(CURRENT_SCHEMA, '%s', '%s')".formatted(registered, tableLocation));

assertThat(query("SELECT id, ts_nano_tz FROM " + registered))
assertThat(query("SELECT id, ts_nano_tz FROM " + tableName))
.matches("VALUES (1, TIMESTAMP '2024-01-15 12:30:45.123456789 UTC')");

assertUpdate("DROP TABLE " + registered);
assertUpdate("DROP TABLE " + tableName);
}

@Test
Expand Down Expand Up @@ -714,7 +690,6 @@ void testV3WriteDefault()
// Create a v3 table with a column that has write-default (but not initial-default)
// Note: write-default is used for INSERT, initial-default is used for reading missing columns
String tableName = "v3_write_defaults_" + randomNameSuffix();
SchemaTableName schemaTableName = new SchemaTableName("tpch", tableName);
Schema schemaWithWriteDefault = new Schema(
Types.NestedField.optional("id")
.withId(1)
Expand All @@ -725,16 +700,7 @@ void testV3WriteDefault()
.ofType(Types.IntegerType.get())
.withWriteDefault(Expressions.lit(99))
.build());

catalog.newCreateTableTransaction(
SESSION,
schemaTableName,
schemaWithWriteDefault,
PartitionSpec.unpartitioned(),
SortOrder.unsorted(),
Optional.ofNullable(catalog.defaultTableLocation(SESSION, schemaTableName)),
ImmutableMap.of("format-version", "3"))
.commitTransaction();
createV3Table(tableName, schemaWithWriteDefault);

BaseTable tempTable = loadTable(temp);
loadTable(tableName).newFastAppend()
Expand All @@ -753,7 +719,6 @@ void testV3WriteDefault()
void testWriteDefaultOnInsert()
{
String tableName = "test_write_default_insert_" + randomNameSuffix();
SchemaTableName schemaTableName = new SchemaTableName("tpch", tableName);

// Create a v3 table with write-default on column 'b'
Schema schemaWithWriteDefault = new Schema(
Expand All @@ -766,16 +731,7 @@ void testWriteDefaultOnInsert()
.ofType(Types.IntegerType.get())
.withWriteDefault(Expressions.lit(42))
.build());

catalog.newCreateTableTransaction(
SESSION,
schemaTableName,
schemaWithWriteDefault,
PartitionSpec.unpartitioned(),
SortOrder.unsorted(),
Optional.ofNullable(catalog.defaultTableLocation(SESSION, schemaTableName)),
ImmutableMap.of("format-version", "3"))
.commitTransaction();
createV3Table(tableName, schemaWithWriteDefault);

// Verify SHOW CREATE TABLE shows DEFAULT
assertThat((String) computeScalar("SHOW CREATE TABLE " + tableName))
Expand Down Expand Up @@ -1702,4 +1658,19 @@ void testOrcTimestampNanoWithTimeZoneFiltering()
assertUpdate("DROP TABLE IF EXISTS " + tableName);
}
}

private Table createV3Table(String tableName, Schema schema)
{
SchemaTableName schemaTableName = new SchemaTableName(getSession().getSchema().orElseThrow(), tableName);
catalog.newCreateTableTransaction(
SESSION,
schemaTableName,
schema,
PartitionSpec.unpartitioned(),
SortOrder.unsorted(),
Optional.ofNullable(catalog.defaultTableLocation(SESSION, schemaTableName)),
ImmutableMap.of(FORMAT_VERSION, "3"))
.commitTransaction();
return loadTable(schemaTableName.getTableName());
}
}