Skip to content

Fix DESCRIBE OUTPUT with versioned tables #29079

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 13, 2026
Merged

Fix DESCRIBE OUTPUT with versioned tables #29079

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
6 changes: 3 additions & 3 deletions core/trino-main/src/main/java/io/trino/sql/analyzer/StatementAnalyzer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6071,16 +6071,16 @@ private Optional<TableVersion> extractTableVersion(Table table, Optional<Express
if (version.isEmpty()) {
return tableVersion;
}
if (analysis.isDescribe()) {
throw semanticException(NOT_SUPPORTED, table, "DESCRIBE is not supported if a versioned table uses parameters");
}
ExpressionAnalysis expressionAnalysis = analyzeExpression(version.get(), scope.get());
analysis.recordSubqueries(table, expressionAnalysis);

// Once the range value is analyzed, we can evaluate it
Type versionType = expressionAnalysis.getType(version.get());
PointerType pointerType = toPointerType(table.getQueryPeriod().get().getRangeType());
if (versionType == UNKNOWN) {
if (analysis.isDescribe()) {
throw semanticException(NOT_SUPPORTED, table, "DESCRIBE is not supported if a versioned table uses parameters");
}
throw semanticException(INVALID_ARGUMENTS, table.getQueryPeriod().get(), "Pointer value cannot be NULL");
}
Object evaluatedVersion = evaluateConstant(version.get(), versionType, analysis.getParameters(), plannerContext, session, accessControl);
Expand Down
26 changes: 26 additions & 0 deletions plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/BaseIcebergConnectorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7948,6 +7948,32 @@ public void testPreparedStatementWithParameterizedVersionedTable()
assertQueryFails(session, "DESCRIBE OUTPUT my_query", ".* DESCRIBE is not supported if a versioned table uses parameters");
Comment thread
ebyhr marked this conversation as resolved.
}

@Test
public void testDescribeOutputWithVersionedTable()
{
try (TestTable table = newTrinoTable("test", "(x int)", List.of("1"))) {
Session firstSession = Session.builder(getSession())
.addPreparedStatement("my_query", "SELECT * FROM %s FOR VERSION AS OF %s".formatted(table.getName(), getCurrentSnapshotId(table.getName())))
Comment thread
ebyhr marked this conversation as resolved.
.build();
assertThat(query(firstSession, "DESCRIBE OUTPUT my_query"))
Comment thread
ebyhr marked this conversation as resolved.
.matches("VALUES ('x', 'iceberg', 'tpch', '" + table.getName() + "', 'integer', 4, false)");

// Add a new snapshot with a new column for a different output
assertUpdate("ALTER TABLE " + table.getName() + " ADD COLUMN y int");
assertUpdate("INSERT INTO " + table.getName() + " VALUES (2, 2)", 1);

Session secondSession = Session.builder(getSession())
.addPreparedStatement("my_query", "SELECT * FROM %s FOR VERSION AS OF %s".formatted(table.getName(), getCurrentSnapshotId(table.getName())))
.build();
assertThat(query(firstSession, "DESCRIBE OUTPUT my_query"))
.matches("VALUES ('x', 'iceberg', 'tpch', '" + table.getName() + "', 'integer', 4, false)");
assertThat(query(secondSession, "DESCRIBE OUTPUT my_query"))
.matches("VALUES" +
"('x', 'iceberg', 'tpch', '" + table.getName() + "', 'integer', 4, false)," +
"('y', 'iceberg', 'tpch', '" + table.getName() + "', 'integer', 4, false)");
}
}

@Test
public void testDeleteRetainsTableHistory()
{
Expand Down