diff --git a/core/trino-main/src/main/java/io/trino/connector/InternalMetadataProvider.java b/core/trino-main/src/main/java/io/trino/connector/InternalMetadataProvider.java index 5eeb0447bf74..e579c22d9d90 100644 --- a/core/trino-main/src/main/java/io/trino/connector/InternalMetadataProvider.java +++ b/core/trino-main/src/main/java/io/trino/connector/InternalMetadataProvider.java @@ -65,7 +65,7 @@ public Optional getRelationMetadata(ConnectorSession conne Optional tableHandle = metadata.getTableHandle(session, qualifiedName); if (tableHandle.isPresent()) { - return Optional.of(metadata.getTableSchema(session, tableHandle.get()).getTableSchema()); + return Optional.of(metadata.getTableSchema(session, tableHandle.get()).tableSchema()); } return Optional.empty(); diff --git a/core/trino-main/src/main/java/io/trino/connector/system/TableCommentSystemTable.java b/core/trino-main/src/main/java/io/trino/connector/system/TableCommentSystemTable.java index 828d7feb44b4..22befbf2c2a7 100644 --- a/core/trino-main/src/main/java/io/trino/connector/system/TableCommentSystemTable.java +++ b/core/trino-main/src/main/java/io/trino/connector/system/TableCommentSystemTable.java @@ -217,7 +217,7 @@ private RelationComment getTableCommentRedirectionAware(Session session, Qualifi } } - return new RelationComment(true, metadata.getTableMetadata(session, redirectionAware.tableHandle().get()).getMetadata().getComment()); + return new RelationComment(true, metadata.getTableMetadata(session, redirectionAware.tableHandle().get()).metadata().getComment()); } private record RelationComment(boolean found, Optional comment) diff --git a/core/trino-main/src/main/java/io/trino/execution/CreateTableTask.java b/core/trino-main/src/main/java/io/trino/execution/CreateTableTask.java index 43e7dbccacdd..16fecfbe92ee 100644 --- a/core/trino-main/src/main/java/io/trino/execution/CreateTableTask.java +++ b/core/trino-main/src/main/java/io/trino/execution/CreateTableTask.java @@ -240,14 +240,14 @@ else if (element instanceof LikeClause likeClause) { throw semanticException(NOT_SUPPORTED, statement, "Only one LIKE clause can specify INCLUDING PROPERTIES"); } includingProperties = true; - inheritedProperties = likeTableMetadata.getMetadata().getProperties(); + inheritedProperties = likeTableMetadata.metadata().getProperties(); } try { accessControl.checkCanSelectFromColumns( session.toSecurityContext(), likeTableName, - likeTableMetadata.getColumns().stream() + likeTableMetadata.columns().stream() .map(ColumnMetadata::getName) .collect(toImmutableSet())); } @@ -263,7 +263,7 @@ else if (element instanceof LikeClause likeClause) { } } - likeTableMetadata.getColumns().stream() + likeTableMetadata.columns().stream() .filter(column -> !column.isHidden()) .forEach(column -> { if (columns.containsKey(column.getName().toLowerCase(Locale.ENGLISH))) { diff --git a/core/trino-main/src/main/java/io/trino/execution/DropColumnTask.java b/core/trino-main/src/main/java/io/trino/execution/DropColumnTask.java index 0f97988c6f96..1c4fd2914bc8 100644 --- a/core/trino-main/src/main/java/io/trino/execution/DropColumnTask.java +++ b/core/trino-main/src/main/java/io/trino/execution/DropColumnTask.java @@ -103,7 +103,7 @@ public ListenableFuture execute( throw semanticException(NOT_SUPPORTED, statement, "Cannot drop hidden column"); } if (fieldPath.isEmpty()) { - if (metadata.getTableMetadata(session, tableHandle).getColumns().stream() + if (metadata.getTableMetadata(session, tableHandle).columns().stream() .filter(info -> !info.isHidden()).count() <= 1) { throw semanticException(NOT_SUPPORTED, statement, "Cannot drop the only column in a table"); } diff --git a/core/trino-main/src/main/java/io/trino/metadata/MetadataListing.java b/core/trino-main/src/main/java/io/trino/metadata/MetadataListing.java index 8088d145a927..db9bb985a54e 100644 --- a/core/trino-main/src/main/java/io/trino/metadata/MetadataListing.java +++ b/core/trino-main/src/main/java/io/trino/metadata/MetadataListing.java @@ -325,7 +325,7 @@ private static Map> doListTableColumns(Ses throw e; } - List columns = metadata.getTableMetadata(session, targetTableHandle).getColumns(); + List columns = metadata.getTableMetadata(session, targetTableHandle).columns(); Set allowedColumns = accessControl.filterColumns( session.toSecurityContext(), diff --git a/core/trino-main/src/main/java/io/trino/metadata/MetadataManager.java b/core/trino-main/src/main/java/io/trino/metadata/MetadataManager.java index a8c53b8693ca..912694a8a9ab 100644 --- a/core/trino-main/src/main/java/io/trino/metadata/MetadataManager.java +++ b/core/trino-main/src/main/java/io/trino/metadata/MetadataManager.java @@ -627,7 +627,7 @@ public List listTableColumns(Session session, QualifiedTab return Optional.of(RelationColumnsMetadata.forRedirectedTable(schemaTableName)); } if (redirectionAware.tableHandle().isPresent()) { - return Optional.of(RelationColumnsMetadata.forTable(schemaTableName, getTableMetadata(session, redirectionAware.tableHandle().get()).getColumns())); + return Optional.of(RelationColumnsMetadata.forTable(schemaTableName, getTableMetadata(session, redirectionAware.tableHandle().get()).columns())); } } catch (RuntimeException e) { diff --git a/core/trino-main/src/main/java/io/trino/metadata/TableMetadata.java b/core/trino-main/src/main/java/io/trino/metadata/TableMetadata.java index 7da96f5c799a..71f83f1ade11 100644 --- a/core/trino-main/src/main/java/io/trino/metadata/TableMetadata.java +++ b/core/trino-main/src/main/java/io/trino/metadata/TableMetadata.java @@ -22,48 +22,32 @@ import static java.util.Objects.requireNonNull; -public class TableMetadata +public record TableMetadata(CatalogName catalogName, ConnectorTableMetadata metadata) { - private final CatalogName catalogName; - private final ConnectorTableMetadata metadata; - - public TableMetadata(CatalogName catalogName, ConnectorTableMetadata metadata) + public TableMetadata { requireNonNull(catalogName, "catalogName is null"); requireNonNull(metadata, "metadata is null"); - - this.catalogName = catalogName; - this.metadata = metadata; } - public QualifiedObjectName getQualifiedName() + public QualifiedObjectName qualifiedName() { return new QualifiedObjectName(catalogName.toString(), metadata.getTable().getSchemaName(), metadata.getTable().getTableName()); } - public CatalogName getCatalogName() - { - return catalogName; - } - - public ConnectorTableMetadata getMetadata() - { - return metadata; - } - - public SchemaTableName getTable() + public SchemaTableName table() { return metadata.getTable(); } - public List getColumns() + public List columns() { return metadata.getColumns(); } - public ColumnMetadata getColumn(String name) + public ColumnMetadata column(String name) { - return getColumns().stream() + return columns().stream() .filter(columnMetadata -> columnMetadata.getName().equals(name)) .findFirst() .orElseThrow(() -> new IllegalArgumentException("Invalid column name: " + name)); diff --git a/core/trino-main/src/main/java/io/trino/metadata/TableSchema.java b/core/trino-main/src/main/java/io/trino/metadata/TableSchema.java index 078c9f8e5e9f..deac43ba82f6 100644 --- a/core/trino-main/src/main/java/io/trino/metadata/TableSchema.java +++ b/core/trino-main/src/main/java/io/trino/metadata/TableSchema.java @@ -23,46 +23,30 @@ import static com.google.common.collect.MoreCollectors.toOptional; import static java.util.Objects.requireNonNull; -public final class TableSchema +public record TableSchema(CatalogName catalogName, ConnectorTableSchema tableSchema) { - private final CatalogName catalogName; - private final ConnectorTableSchema tableSchema; - - public TableSchema(CatalogName catalogName, ConnectorTableSchema tableSchema) + public TableSchema { requireNonNull(catalogName, "catalogName is null"); requireNonNull(tableSchema, "metadata is null"); - - this.catalogName = catalogName; - this.tableSchema = tableSchema; } - public QualifiedObjectName getQualifiedName() + public QualifiedObjectName qualifiedName() { return new QualifiedObjectName(catalogName.toString(), tableSchema.getTable().getSchemaName(), tableSchema.getTable().getTableName()); } - public CatalogName getCatalogName() - { - return catalogName; - } - - public ConnectorTableSchema getTableSchema() - { - return tableSchema; - } - - public SchemaTableName getTable() + public SchemaTableName table() { return tableSchema.getTable(); } - public List getColumns() + public List columns() { return tableSchema.getColumns(); } - public ColumnSchema getColumn(String name) + public ColumnSchema column(String name) { return tableSchema.getColumns().stream() .filter(columnMetadata -> columnMetadata.getName().equals(name)) diff --git a/core/trino-main/src/main/java/io/trino/sql/analyzer/StatementAnalyzer.java b/core/trino-main/src/main/java/io/trino/sql/analyzer/StatementAnalyzer.java index 1ba4ee6c3bc0..fcc6e363d975 100644 --- a/core/trino-main/src/main/java/io/trino/sql/analyzer/StatementAnalyzer.java +++ b/core/trino-main/src/main/java/io/trino/sql/analyzer/StatementAnalyzer.java @@ -589,10 +589,10 @@ protected Scope visitInsert(Insert insert, Optional scope) TableSchema tableSchema = metadata.getTableSchema(session, targetTableHandle.get()); - List columns = tableSchema.getColumns().stream() + List columns = tableSchema.columns().stream() .filter(column -> !column.isHidden()) .collect(toImmutableList()); - List checkConstraints = tableSchema.getTableSchema().getCheckConstraints(); + List checkConstraints = tableSchema.tableSchema().getCheckConstraints(); for (ColumnSchema column : columns) { if (accessControl.getColumnMask(session.toSecurityContext(), targetTable, column.getName(), column.getType()).isPresent()) { @@ -649,7 +649,7 @@ protected Scope visitInsert(Insert insert, Optional scope) newTableLayout)); List tableTypes = insertColumns.stream() - .map(insertColumn -> tableSchema.getColumn(insertColumn).getType()) + .map(insertColumn -> tableSchema.column(insertColumn).getType()) .collect(toImmutableList()); List queryTypes = queryScope.getRelationType().getVisibleFields().stream() @@ -721,7 +721,7 @@ protected Scope visitRefreshMaterializedView(RefreshMaterializedView refreshMate analysis.setSkipMaterializedViewRefresh(metadata.getMaterializedViewFreshness(session, name).getFreshness() == FRESH); TableMetadata tableMetadata = metadata.getTableMetadata(session, targetTableHandle); - List insertColumns = tableMetadata.getColumns().stream() + List insertColumns = tableMetadata.columns().stream() .filter(column -> !column.isHidden()) .map(ColumnMetadata::getName) .collect(toImmutableList()); @@ -734,7 +734,7 @@ protected Scope visitRefreshMaterializedView(RefreshMaterializedView refreshMate insertColumns.stream().map(columnHandles::get).collect(toImmutableList()))); List tableTypes = insertColumns.stream() - .map(insertColumn -> tableMetadata.getColumn(insertColumn).getType()) + .map(insertColumn -> tableMetadata.column(insertColumn).getType()) .collect(toImmutableList()); Stream columns = Streams.zip( @@ -830,7 +830,7 @@ protected Scope visitDelete(Delete node, Optional scope) accessControl.checkCanDeleteFromTable(session.toSecurityContext(), tableName); TableSchema tableSchema = metadata.getTableSchema(session, handle); - for (ColumnSchema tableColumn : tableSchema.getColumns()) { + for (ColumnSchema tableColumn : tableSchema.columns()) { if (accessControl.getColumnMask(session.toSecurityContext(), tableName, tableColumn.getName(), tableColumn.getType()).isPresent()) { throw semanticException(NOT_SUPPORTED, node, "Delete from table with column mask"); } @@ -851,7 +851,7 @@ protected Scope visitDelete(Delete node, Optional scope) .withRelationType(RelationId.anonymous(), analysis.getScope(table).getRelationType()) .build(); analyzeFiltersAndMasks(table, tableName, analysis.getScope(table).getRelationType(), accessControlScope); - analyzeCheckConstraints(table, tableName, accessControlScope, tableSchema.getTableSchema().getCheckConstraints()); + analyzeCheckConstraints(table, tableName, accessControlScope, tableSchema.tableSchema().getCheckConstraints()); analysis.registerTable(table, Optional.of(handle), tableName, session.getIdentity().getUser(), accessControlScope, Optional.empty()); createMergeAnalysis(table, handle, tableSchema, tableScope, tableScope, ImmutableList.of()); @@ -1257,7 +1257,7 @@ protected Scope visitTableExecute(TableExecute node, Optional scope) } TableMetadata tableMetadata = metadata.getTableMetadata(session, tableHandle); - for (ColumnMetadata tableColumn : tableMetadata.getColumns()) { + for (ColumnMetadata tableColumn : tableMetadata.columns()) { if (accessControl.getColumnMask(session.toSecurityContext(), tableName, tableColumn.getName(), tableColumn.getType()).isPresent()) { throw semanticException(NOT_SUPPORTED, node, "ALTER TABLE EXECUTE is not supported for table with column masks"); } @@ -2642,7 +2642,7 @@ private List analyzeTableOutputFields(Table table, QualifiedObjectName ta { // TODO: discover columns lazily based on where they are needed (to support connectors that can't enumerate all tables) ImmutableList.Builder fields = ImmutableList.builder(); - for (ColumnSchema column : tableSchema.getColumns()) { + for (ColumnSchema column : tableSchema.columns()) { Field field = Field.newQualified( table.getName(), Optional.of(column.getName()), @@ -3366,7 +3366,7 @@ protected Scope visitUpdate(Update update, Optional scope) TableSchema tableSchema = metadata.getTableSchema(session, handle); - List allColumns = tableSchema.getColumns(); + List allColumns = tableSchema.columns(); Map columns = allColumns.stream() .collect(toImmutableMap(ColumnSchema::getName, Function.identity())); @@ -3411,7 +3411,7 @@ protected Scope visitUpdate(Update update, Optional scope) Scope tableScope = analyzer.analyzeForUpdate(table, scope, UpdateKind.UPDATE); update.getWhere().ifPresent(where -> analyzeWhere(update, tableScope, where)); - analyzeCheckConstraints(table, tableName, tableScope, tableSchema.getTableSchema().getCheckConstraints()); + analyzeCheckConstraints(table, tableName, tableScope, tableSchema.tableSchema().getCheckConstraints()); analysis.registerTable(table, redirection.tableHandle(), tableName, session.getIdentity().getUser(), tableScope, Optional.empty()); ImmutableList.Builder analysesBuilder = ImmutableList.builder(); @@ -3499,7 +3499,7 @@ protected Scope visitMerge(Merge merge, Optional scope) TableSchema tableSchema = metadata.getTableSchema(session, targetTableHandle); - List dataColumnSchemas = tableSchema.getColumns().stream() + List dataColumnSchemas = tableSchema.columns().stream() .filter(column -> !column.isHidden()) .collect(toImmutableList()); @@ -3532,7 +3532,7 @@ protected Scope visitMerge(Merge merge, Optional scope) Scope targetTableScope = analyzer.analyzeForUpdate(relation, Optional.of(mergeScope), UpdateKind.MERGE); Scope sourceTableScope = process(merge.getSource(), mergeScope); Scope joinScope = createAndAssignScope(merge, Optional.of(mergeScope), targetTableScope.getRelationType().joinWith(sourceTableScope.getRelationType())); - analyzeCheckConstraints(table, tableName, targetTableScope, tableSchema.getTableSchema().getCheckConstraints()); + analyzeCheckConstraints(table, tableName, targetTableScope, tableSchema.tableSchema().getCheckConstraints()); analysis.registerTable(table, redirection.tableHandle(), tableName, session.getIdentity().getUser(), targetTableScope, Optional.empty()); for (ColumnSchema column : dataColumnSchemas) { @@ -3657,7 +3657,7 @@ private void createMergeAnalysis(Table table, TableHandle handle, TableSchema ta } Map columnHandleFieldNumbers = columnHandleFieldNumbersBuilder.buildOrThrow(); - List dataColumnSchemas = tableSchema.getColumns().stream() + List dataColumnSchemas = tableSchema.columns().stream() .filter(column -> !column.isHidden()) .collect(toImmutableList()); Optional insertLayout = metadata.getInsertLayout(session, handle); @@ -3682,7 +3682,7 @@ private void createMergeAnalysis(Table table, TableHandle handle, TableSchema ta .map(fieldIndexes::get) .collect(toImmutableList()); - Set nonNullableColumnHandles = metadata.getTableMetadata(session, handle).getColumns().stream() + Set nonNullableColumnHandles = metadata.getTableMetadata(session, handle).columns().stream() .filter(column -> !column.isNullable()) .map(ColumnMetadata::getName) .map(allColumnHandles::get) diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/LogicalPlanner.java b/core/trino-main/src/main/java/io/trino/sql/planner/LogicalPlanner.java index 60e99ab82df0..84494bde0d36 100644 --- a/core/trino-main/src/main/java/io/trino/sql/planner/LogicalPlanner.java +++ b/core/trino-main/src/main/java/io/trino/sql/planner/LogicalPlanner.java @@ -414,7 +414,7 @@ private RelationPlan createAnalyzePlan(Analysis analysis, Analyze analyzeStateme ImmutableMap.Builder symbolToColumnHandle = ImmutableMap.builder(); ImmutableMap.Builder columnNameToSymbol = ImmutableMap.builder(); TableMetadata tableMetadata = metadata.getTableMetadata(session, targetTable); - for (ColumnMetadata column : tableMetadata.getColumns()) { + for (ColumnMetadata column : tableMetadata.columns()) { Symbol symbol = symbolAllocator.newSymbol(column.getName(), column.getType()); tableScanOutputs.add(symbol); symbolToColumnHandle.put(symbol, columnHandles.get(column.getName())); @@ -522,7 +522,7 @@ private RelationPlan getInsertPlan( boolean supportsMissingColumnsOnInsert = metadata.supportsMissingColumnsOnInsert(session, tableHandle); ImmutableList.Builder insertedColumnsBuilder = ImmutableList.builder(); - for (ColumnMetadata column : tableMetadata.getColumns()) { + for (ColumnMetadata column : tableMetadata.columns()) { if (column.isHidden()) { continue; } @@ -588,7 +588,7 @@ private RelationPlan getInsertPlan( .map(ColumnMetadata::getName) .collect(toImmutableList()); - TableStatisticsMetadata statisticsMetadata = metadata.getStatisticsCollectionMetadataForWrite(session, tableHandle.getCatalogHandle(), tableMetadata.getMetadata()); + TableStatisticsMetadata statisticsMetadata = metadata.getStatisticsCollectionMetadataForWrite(session, tableHandle.getCatalogHandle(), tableMetadata.metadata()); if (materializedViewRefreshWriterTarget.isPresent()) { return createTableWriterPlan( @@ -969,7 +969,7 @@ private RelationPlan createTableExecutePlan(Analysis analysis, TableExecute stat PlanNode sourcePlanRoot = sourcePlanBuilder.getRoot(); TableMetadata tableMetadata = metadata.getTableMetadata(session, tableHandle); - List columnNames = tableMetadata.getColumns().stream() + List columnNames = tableMetadata.columns().stream() .filter(column -> !column.isHidden()) // todo this filter is redundant .map(ColumnMetadata::getName) .collect(toImmutableList()); diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/QueryPlanner.java b/core/trino-main/src/main/java/io/trino/sql/planner/QueryPlanner.java index b439eb1ab73b..38e1dadaeb78 100644 --- a/core/trino-main/src/main/java/io/trino/sql/planner/QueryPlanner.java +++ b/core/trino-main/src/main/java/io/trino/sql/planner/QueryPlanner.java @@ -521,7 +521,7 @@ public PlanNode plan(Delete node) TableMetadata tableMetadata = plannerContext.getMetadata().getTableMetadata(session, handle); ImmutableList.Builder typeBuilder = ImmutableList.builder(); ImmutableList.Builder namesBuilder = ImmutableList.builder(); - tableMetadata.getMetadata().getColumns().stream() + tableMetadata.metadata().getColumns().stream() .filter(column -> !column.isHidden()) .forEach(columnMetadata -> { typeBuilder.add(columnMetadata.getType()); @@ -569,7 +569,7 @@ public PlanNode plan(Delete node) new MergeTarget( handle, Optional.empty(), - tableMetadata.getTable(), + tableMetadata.table(), paradigmAndTypes), projectNode.getOutputSymbols(), partitioningScheme, diff --git a/core/trino-main/src/main/java/io/trino/sql/rewrite/ShowQueriesRewrite.java b/core/trino-main/src/main/java/io/trino/sql/rewrite/ShowQueriesRewrite.java index b3b5de4ca267..a038de9804bf 100644 --- a/core/trino-main/src/main/java/io/trino/sql/rewrite/ShowQueriesRewrite.java +++ b/core/trino-main/src/main/java/io/trino/sql/rewrite/ShowQueriesRewrite.java @@ -688,7 +688,7 @@ protected Node visitShowCreate(ShowCreate node, Void context) QualifiedObjectName targetTableName = redirection.redirectedTableName().orElse(objectName); accessControl.checkCanShowCreateTable(session.toSecurityContext(), targetTableName); - ConnectorTableMetadata connectorTableMetadata = metadata.getTableMetadata(session, tableHandle).getMetadata(); + ConnectorTableMetadata connectorTableMetadata = metadata.getTableMetadata(session, tableHandle).metadata(); Collection> allColumnProperties = columnPropertyManager.getAllProperties(tableHandle.getCatalogHandle()); diff --git a/core/trino-main/src/test/java/io/trino/execution/TestAddColumnTask.java b/core/trino-main/src/test/java/io/trino/execution/TestAddColumnTask.java index e079705166ab..9b9db1e32d6f 100644 --- a/core/trino-main/src/test/java/io/trino/execution/TestAddColumnTask.java +++ b/core/trino-main/src/test/java/io/trino/execution/TestAddColumnTask.java @@ -64,11 +64,11 @@ public void testAddColumn() QualifiedObjectName tableName = qualifiedObjectName("existing_table"); metadata.createTable(testSession, TEST_CATALOG_NAME, someTable(tableName), FAIL); TableHandle table = metadata.getTableHandle(testSession, tableName).get(); - assertThat(metadata.getTableMetadata(testSession, table).getColumns()) + assertThat(metadata.getTableMetadata(testSession, table).columns()) .containsExactly(new ColumnMetadata("test", BIGINT)); getFutureValue(executeAddColumn(asQualifiedName(tableName), QualifiedName.of("new_col"), INTEGER, Optional.empty(), false, false)); - assertThat(metadata.getTableMetadata(testSession, table).getColumns()) + assertThat(metadata.getTableMetadata(testSession, table).columns()) .containsExactly(new ColumnMetadata("test", BIGINT), new ColumnMetadata("new_col", INTEGER)); } @@ -80,7 +80,7 @@ public void testAddColumnWithComment() TableHandle table = metadata.getTableHandle(testSession, tableName).get(); getFutureValue(executeAddColumn(asQualifiedName(tableName), QualifiedName.of("new_col"), INTEGER, Optional.of("test comment"), false, false)); - assertThat(metadata.getTableMetadata(testSession, table).getColumns()) + assertThat(metadata.getTableMetadata(testSession, table).columns()) .containsExactly( new ColumnMetadata("test", BIGINT), ColumnMetadata.builder() @@ -99,7 +99,7 @@ public void testAddColumnWithColumnProperty() Property columnProperty = new Property(new Identifier("column_property"), new LongLiteral("111")); getFutureValue(executeAddColumn(asQualifiedName(tableName), QualifiedName.of("new_col"), INTEGER, ImmutableList.of(columnProperty), false, false)); - ColumnMetadata columnMetadata = metadata.getTableMetadata(testSession, table).getColumns().stream() + ColumnMetadata columnMetadata = metadata.getTableMetadata(testSession, table).columns().stream() .filter(column -> column.getName().equals("new_col")) .collect(onlyElement()); assertThat(columnMetadata.getProperties()).containsExactly(Map.entry("column_property", 111L)); @@ -130,11 +130,11 @@ public void testAddColumnNotExists() QualifiedObjectName tableName = qualifiedObjectName("existing_table"); metadata.createTable(testSession, TEST_CATALOG_NAME, someTable(tableName), FAIL); TableHandle table = metadata.getTableHandle(testSession, tableName).get(); - assertThat(metadata.getTableMetadata(testSession, table).getColumns()) + assertThat(metadata.getTableMetadata(testSession, table).columns()) .containsExactly(new ColumnMetadata("test", BIGINT)); getFutureValue(executeAddColumn(asQualifiedName(tableName), QualifiedName.of("test"), INTEGER, Optional.empty(), false, true)); - assertThat(metadata.getTableMetadata(testSession, table).getColumns()) + assertThat(metadata.getTableMetadata(testSession, table).columns()) .containsExactly(new ColumnMetadata("test", BIGINT)); } @@ -177,11 +177,11 @@ public void testAddFieldWithNotExists() QualifiedObjectName tableName = qualifiedObjectName("existing_table"); metadata.createTable(testSession, TEST_CATALOG_NAME, rowTable(tableName, new RowType.Field(Optional.of("a"), BIGINT)), FAIL); TableHandle table = metadata.getTableHandle(testSession, tableName).get(); - assertThat(metadata.getTableMetadata(testSession, table).getColumns()) + assertThat(metadata.getTableMetadata(testSession, table).columns()) .containsExactly(new ColumnMetadata("col", rowType(new RowType.Field(Optional.of("a"), BIGINT)))); getFutureValue(executeAddColumn(asQualifiedName(tableName), QualifiedName.of("col", "a"), INTEGER, false, true)); - assertThat(metadata.getTableMetadata(testSession, table).getColumns()) + assertThat(metadata.getTableMetadata(testSession, table).columns()) .containsExactly(new ColumnMetadata("col", rowType(new RowType.Field(Optional.of("a"), BIGINT)))); } @@ -239,7 +239,7 @@ public void testUnsupportedAddDuplicatedField() QualifiedObjectName tableName = qualifiedObjectName("existing_table"); metadata.createTable(testSession, TEST_CATALOG_NAME, rowTable(tableName, new RowType.Field(Optional.of("a"), BIGINT)), FAIL); TableHandle table = metadata.getTableHandle(testSession, tableName).orElseThrow(); - assertThat(metadata.getTableMetadata(testSession, table).getColumns()) + assertThat(metadata.getTableMetadata(testSession, table).columns()) .containsExactly(new ColumnMetadata("col", rowType(new RowType.Field(Optional.of("a"), BIGINT)))); assertTrinoExceptionThrownBy(() -> getFutureValue(executeAddColumn(asQualifiedName(tableName), QualifiedName.of("col", "a"), INTEGER, false, false))) @@ -248,7 +248,7 @@ public void testUnsupportedAddDuplicatedField() assertTrinoExceptionThrownBy(() -> getFutureValue(executeAddColumn(asQualifiedName(tableName), QualifiedName.of("col", "A"), INTEGER, false, false))) .hasErrorCode(COLUMN_ALREADY_EXISTS) .hasMessage("Field 'a' already exists"); - assertThat(metadata.getTableMetadata(testSession, table).getColumns()) + assertThat(metadata.getTableMetadata(testSession, table).columns()) .containsExactly(new ColumnMetadata("col", rowType(new RowType.Field(Optional.of("a"), BIGINT)))); } @@ -264,7 +264,7 @@ public void testUnsupportedAddAmbiguousField() new RowType.Field(Optional.of("A"), rowType(new RowType.Field(Optional.of("y"), INTEGER)))), FAIL); TableHandle table = metadata.getTableHandle(testSession, tableName).get(); - assertThat(metadata.getTableMetadata(testSession, table).getColumns()) + assertThat(metadata.getTableMetadata(testSession, table).columns()) .containsExactly(new ColumnMetadata("col", rowType( new RowType.Field(Optional.of("a"), rowType(new RowType.Field(Optional.of("x"), INTEGER))), new RowType.Field(Optional.of("A"), rowType(new RowType.Field(Optional.of("y"), INTEGER)))))); @@ -272,7 +272,7 @@ public void testUnsupportedAddAmbiguousField() assertTrinoExceptionThrownBy(() -> getFutureValue(executeAddColumn(asQualifiedName(tableName), QualifiedName.of("col", "a", "z"), INTEGER, false, false))) .hasErrorCode(AMBIGUOUS_NAME) .hasMessage("Field path [a, z] within row(a row(x integer), A row(y integer)) is ambiguous"); - assertThat(metadata.getTableMetadata(testSession, table).getColumns()) + assertThat(metadata.getTableMetadata(testSession, table).columns()) .containsExactly(new ColumnMetadata("col", rowType( new RowType.Field(Optional.of("a"), rowType(new RowType.Field(Optional.of("x"), INTEGER))), new RowType.Field(Optional.of("A"), rowType(new RowType.Field(Optional.of("y"), INTEGER)))))); diff --git a/core/trino-main/src/test/java/io/trino/execution/TestCommentTask.java b/core/trino-main/src/test/java/io/trino/execution/TestCommentTask.java index 253ae73e0617..0748ca4bf702 100644 --- a/core/trino-main/src/test/java/io/trino/execution/TestCommentTask.java +++ b/core/trino-main/src/test/java/io/trino/execution/TestCommentTask.java @@ -47,11 +47,11 @@ public void testCommentTable() { QualifiedObjectName tableName = qualifiedObjectName("existing_table"); metadata.createTable(testSession, TEST_CATALOG_NAME, someTable(tableName), FAIL); - assertThat(metadata.getTableMetadata(testSession, metadata.getTableHandle(testSession, tableName).get()).getMetadata().getComment()) + assertThat(metadata.getTableMetadata(testSession, metadata.getTableHandle(testSession, tableName).get()).metadata().getComment()) .isEmpty(); getFutureValue(setComment(TABLE, asQualifiedName(tableName), Optional.of("new comment"))); - assertThat(metadata.getTableMetadata(testSession, metadata.getTableHandle(testSession, tableName).get()).getMetadata().getComment()) + assertThat(metadata.getTableMetadata(testSession, metadata.getTableHandle(testSession, tableName).get()).metadata().getComment()) .isEqualTo(Optional.of("new comment")); } @@ -119,7 +119,7 @@ public void testCommentTableColumn() getFutureValue(setComment(COLUMN, columnName, Optional.of("new test column comment"))); TableHandle tableHandle = metadata.getTableHandle(testSession, tableName).get(); - ConnectorTableMetadata connectorTableMetadata = metadata.getTableMetadata(testSession, tableHandle).getMetadata(); + ConnectorTableMetadata connectorTableMetadata = metadata.getTableMetadata(testSession, tableHandle).metadata(); assertThat(Optional.ofNullable(connectorTableMetadata.getColumns().stream().filter(column -> "test".equals(column.getName())).collect(onlyElement()).getComment())) .isEqualTo(Optional.of("new test column comment")); } diff --git a/core/trino-main/src/test/java/io/trino/execution/TestDropColumnTask.java b/core/trino-main/src/test/java/io/trino/execution/TestDropColumnTask.java index d62ea3bf2116..af6667b76fdb 100644 --- a/core/trino-main/src/test/java/io/trino/execution/TestDropColumnTask.java +++ b/core/trino-main/src/test/java/io/trino/execution/TestDropColumnTask.java @@ -49,11 +49,11 @@ public void testDropColumn() QualifiedObjectName tableName = qualifiedObjectName("existing_table"); metadata.createTable(testSession, TEST_CATALOG_NAME, simpleTable(tableName), FAIL); TableHandle table = metadata.getTableHandle(testSession, tableName).get(); - assertThat(metadata.getTableMetadata(testSession, table).getColumns()) + assertThat(metadata.getTableMetadata(testSession, table).columns()) .containsExactly(new ColumnMetadata("a", BIGINT), new ColumnMetadata("b", BIGINT)); getFutureValue(executeDropColumn(asQualifiedName(tableName), QualifiedName.of("b"), false, false)); - assertThat(metadata.getTableMetadata(testSession, table).getColumns()) + assertThat(metadata.getTableMetadata(testSession, table).columns()) .containsExactly(new ColumnMetadata("a", BIGINT)); } @@ -63,7 +63,7 @@ public void testDropOnlyColumn() QualifiedObjectName tableName = qualifiedObjectName("existing_table"); metadata.createTable(testSession, TEST_CATALOG_NAME, someTable(tableName), FAIL); TableHandle table = metadata.getTableHandle(testSession, tableName).get(); - assertThat(metadata.getTableMetadata(testSession, table).getColumns()) + assertThat(metadata.getTableMetadata(testSession, table).columns()) .containsExactly(new ColumnMetadata("test", BIGINT)); assertTrinoExceptionThrownBy(() -> getFutureValue(executeDropColumn(asQualifiedName(tableName), QualifiedName.of("test"), false, false))) @@ -109,7 +109,7 @@ public void testDropColumnIfExists() TableHandle table = metadata.getTableHandle(testSession, tableName).get(); getFutureValue(executeDropColumn(asQualifiedName(tableName), QualifiedName.of("c"), false, true)); - assertThat(metadata.getTableMetadata(testSession, table).getColumns()) + assertThat(metadata.getTableMetadata(testSession, table).columns()) .containsExactly(new ColumnMetadata("a", BIGINT), new ColumnMetadata("b", BIGINT)); } @@ -119,7 +119,7 @@ public void testUnsupportedDropDuplicatedField() QualifiedObjectName tableName = qualifiedObjectName("existing_table"); metadata.createTable(testSession, TEST_CATALOG_NAME, rowTable(tableName, new Field(Optional.of("a"), BIGINT), new Field(Optional.of("a"), BIGINT)), FAIL); TableHandle table = metadata.getTableHandle(testSession, tableName).get(); - assertThat(metadata.getTableMetadata(testSession, table).getColumns()) + assertThat(metadata.getTableMetadata(testSession, table).columns()) .isEqualTo(ImmutableList.of(new ColumnMetadata("col", RowType.rowType( new Field(Optional.of("a"), BIGINT), new Field(Optional.of("a"), BIGINT))))); @@ -134,7 +134,7 @@ public void testUnsupportedDropOnlyField() QualifiedObjectName tableName = qualifiedObjectName("existing_table"); metadata.createTable(testSession, TEST_CATALOG_NAME, rowTable(tableName, new Field(Optional.of("a"), BIGINT)), FAIL); TableHandle table = metadata.getTableHandle(testSession, tableName).get(); - assertThat(metadata.getTableMetadata(testSession, table).getColumns()) + assertThat(metadata.getTableMetadata(testSession, table).columns()) .containsExactly(new ColumnMetadata("col", RowType.rowType(new Field(Optional.of("a"), BIGINT)))); assertTrinoExceptionThrownBy(() -> getFutureValue(executeDropColumn(asQualifiedName(tableName), QualifiedName.of("col", "a"), false, false))) diff --git a/core/trino-main/src/test/java/io/trino/execution/TestDropNotNullConstraintConstraintTask.java b/core/trino-main/src/test/java/io/trino/execution/TestDropNotNullConstraintConstraintTask.java index a4aca5bec3a2..ba6f019f00b6 100644 --- a/core/trino-main/src/test/java/io/trino/execution/TestDropNotNullConstraintConstraintTask.java +++ b/core/trino-main/src/test/java/io/trino/execution/TestDropNotNullConstraintConstraintTask.java @@ -68,11 +68,11 @@ public void testDropNotNullConstraint() metadata.createTable(testSession, TEST_CATALOG_NAME, simpleTable(tableName), FAIL); TableHandle table = metadata.getTableHandle(testSession, tableName).orElseThrow(); - assertThat(metadata.getTableMetadata(testSession, table).getColumns()) + assertThat(metadata.getTableMetadata(testSession, table).columns()) .containsExactly(notNullColumn("a", BIGINT), notNullColumn("b", BIGINT)); getFutureValue(executeDropNotNullConstraint(asQualifiedName(tableName), identifier("b"), false)); - assertThat(metadata.getTableMetadata(testSession, table).getColumns()) + assertThat(metadata.getTableMetadata(testSession, table).columns()) .containsExactly(notNullColumn("a", BIGINT), nullableColumn("b", BIGINT)); } diff --git a/core/trino-main/src/test/java/io/trino/execution/TestRenameColumnTask.java b/core/trino-main/src/test/java/io/trino/execution/TestRenameColumnTask.java index bb3e68257d40..2657f52dc265 100644 --- a/core/trino-main/src/test/java/io/trino/execution/TestRenameColumnTask.java +++ b/core/trino-main/src/test/java/io/trino/execution/TestRenameColumnTask.java @@ -53,11 +53,11 @@ public void testRenameColumn() QualifiedObjectName tableName = qualifiedObjectName("existing_table"); metadata.createTable(testSession, TEST_CATALOG_NAME, simpleTable(tableName), FAIL); TableHandle table = metadata.getTableHandle(testSession, tableName).get(); - assertThat(metadata.getTableMetadata(testSession, table).getColumns()) + assertThat(metadata.getTableMetadata(testSession, table).columns()) .containsExactly(new ColumnMetadata("a", BIGINT), new ColumnMetadata("b", BIGINT)); getFutureValue(executeRenameColumn(asQualifiedName(tableName), QualifiedName.of("a"), identifier("a_renamed"), false, false)); - assertThat(metadata.getTableMetadata(testSession, table).getColumns()) + assertThat(metadata.getTableMetadata(testSession, table).columns()) .containsExactly(new ColumnMetadata("a_renamed", BIGINT), new ColumnMetadata("b", BIGINT)); } @@ -99,7 +99,7 @@ public void testRenameColumnIfExists() TableHandle table = metadata.getTableHandle(testSession, tableName).get(); getFutureValue(executeRenameColumn(asQualifiedName(tableName), QualifiedName.of("missing_column"), identifier("test"), false, true)); - assertThat(metadata.getTableMetadata(testSession, table).getColumns()) + assertThat(metadata.getTableMetadata(testSession, table).columns()) .containsExactly(new ColumnMetadata("a", BIGINT), new ColumnMetadata("b", BIGINT)); } @@ -163,7 +163,7 @@ public void testRenameFieldIfExists() TableHandle table = metadata.getTableHandle(testSession, tableName).get(); getFutureValue(executeRenameColumn(asQualifiedName(tableName), QualifiedName.of("c"), identifier("x"), false, true)); - assertThat(metadata.getTableMetadata(testSession, table).getColumns()) + assertThat(metadata.getTableMetadata(testSession, table).columns()) .containsExactly(new ColumnMetadata("a", BIGINT), new ColumnMetadata("b", BIGINT)); } @@ -173,7 +173,7 @@ public void testUnsupportedRenameDuplicatedField() QualifiedObjectName tableName = qualifiedObjectName("existing_table"); metadata.createTable(testSession, TEST_CATALOG_NAME, rowTable(tableName, new RowType.Field(Optional.of("a"), BIGINT), new RowType.Field(Optional.of("a"), BIGINT)), FAIL); TableHandle table = metadata.getTableHandle(testSession, tableName).get(); - assertThat(metadata.getTableMetadata(testSession, table).getColumns()) + assertThat(metadata.getTableMetadata(testSession, table).columns()) .isEqualTo(ImmutableList.of(new ColumnMetadata("col", RowType.rowType( new RowType.Field(Optional.of("a"), BIGINT), new RowType.Field(Optional.of("a"), BIGINT))))); @@ -188,7 +188,7 @@ public void testUnsupportedRenameToExistingField() QualifiedObjectName tableName = qualifiedObjectName("existing_table"); metadata.createTable(testSession, TEST_CATALOG_NAME, rowTable(tableName, new RowType.Field(Optional.of("a"), BIGINT), new RowType.Field(Optional.of("b"), BIGINT)), FAIL); TableHandle table = metadata.getTableHandle(testSession, tableName).get(); - assertThat(metadata.getTableMetadata(testSession, table).getColumns()) + assertThat(metadata.getTableMetadata(testSession, table).columns()) .isEqualTo(ImmutableList.of(new ColumnMetadata("col", RowType.rowType( new RowType.Field(Optional.of("a"), BIGINT), new RowType.Field(Optional.of("b"), BIGINT))))); diff --git a/core/trino-main/src/test/java/io/trino/execution/TestSetColumnTypeTask.java b/core/trino-main/src/test/java/io/trino/execution/TestSetColumnTypeTask.java index dd75f0edae19..19e3406666ca 100644 --- a/core/trino-main/src/test/java/io/trino/execution/TestSetColumnTypeTask.java +++ b/core/trino-main/src/test/java/io/trino/execution/TestSetColumnTypeTask.java @@ -54,17 +54,17 @@ public void testSetDataType() QualifiedObjectName tableName = qualifiedObjectName("existing_table"); metadata.createTable(testSession, TEST_CATALOG_NAME, someTable(tableName), FAIL); TableHandle table = metadata.getTableHandle(testSession, tableName).get(); - assertThat(metadata.getTableMetadata(testSession, table).getColumns()) + assertThat(metadata.getTableMetadata(testSession, table).columns()) .isEqualTo(ImmutableList.of(new ColumnMetadata("test", BIGINT))); // Change the column type to integer from bigint getFutureValue(executeSetColumnType(asQualifiedName(tableName), QualifiedName.of("test"), toSqlType(INTEGER), false)); - assertThat(metadata.getTableMetadata(testSession, table).getColumns()) + assertThat(metadata.getTableMetadata(testSession, table).columns()) .isEqualTo(ImmutableList.of(new ColumnMetadata("test", INTEGER))); // Specify the same column type getFutureValue(executeSetColumnType(asQualifiedName(tableName), QualifiedName.of("test"), toSqlType(INTEGER), false)); - assertThat(metadata.getTableMetadata(testSession, table).getColumns()) + assertThat(metadata.getTableMetadata(testSession, table).columns()) .isEqualTo(ImmutableList.of(new ColumnMetadata("test", INTEGER))); } @@ -149,7 +149,7 @@ public void testUnsupportedSetDataTypeDuplicatedField() QualifiedObjectName tableName = qualifiedObjectName("existing_table"); metadata.createTable(testSession, TEST_CATALOG_NAME, rowTable(tableName, new RowType.Field(Optional.of("a"), BIGINT), new RowType.Field(Optional.of("a"), BIGINT)), FAIL); TableHandle table = metadata.getTableHandle(testSession, tableName).get(); - assertThat(metadata.getTableMetadata(testSession, table).getColumns()) + assertThat(metadata.getTableMetadata(testSession, table).columns()) .isEqualTo(ImmutableList.of(new ColumnMetadata("col", RowType.rowType( new RowType.Field(Optional.of("a"), BIGINT), new RowType.Field(Optional.of("a"), BIGINT))))); diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/BaseHiveConnectorTest.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/BaseHiveConnectorTest.java index fb6cfdaf99c7..ce9d00a53e4e 100644 --- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/BaseHiveConnectorTest.java +++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/BaseHiveConnectorTest.java @@ -1677,7 +1677,7 @@ private void testCreatePartitionedTable(Session session, HiveStorageFormat stora assertUpdate(session, createTable); TableMetadata tableMetadata = getTableMetadata(catalog, TPCH_SCHEMA, "test_partitioned_table"); - assertThat(tableMetadata.getMetadata().getProperties()).containsEntry(STORAGE_FORMAT_PROPERTY, storageFormat); + assertThat(tableMetadata.metadata().getProperties()).containsEntry(STORAGE_FORMAT_PROPERTY, storageFormat); List partitionedBy = ImmutableList.of( "_partition_string", @@ -1692,8 +1692,8 @@ private void testCreatePartitionedTable(Session session, HiveStorageFormat stora "_partition_decimal_long", "_partition_date", "_partition_timestamp"); - assertThat(tableMetadata.getMetadata().getProperties()).containsEntry(PARTITIONED_BY_PROPERTY, partitionedBy); - for (ColumnMetadata columnMetadata : tableMetadata.getColumns()) { + assertThat(tableMetadata.metadata().getProperties()).containsEntry(PARTITIONED_BY_PROPERTY, partitionedBy); + for (ColumnMetadata columnMetadata : tableMetadata.columns()) { boolean partitionKey = partitionedBy.contains(columnMetadata.getName()); assertThat(columnMetadata.getExtraInfo()).isEqualTo(columnExtraInfo(partitionKey)); } @@ -1803,7 +1803,7 @@ private void createTableLike(String likeSuffix, boolean hasPartition) // Verify the partition keys are correctly created List partitionedBy = ImmutableList.of("partition_bigint", "partition_decimal_long"); - assertThat(tableMetadata.getMetadata().getProperties()).containsEntry(PARTITIONED_BY_PROPERTY, partitionedBy); + assertThat(tableMetadata.metadata().getProperties()).containsEntry(PARTITIONED_BY_PROPERTY, partitionedBy); // Verify the column types assertColumnType(tableMetadata, "string_col", createUnboundedVarcharType()); @@ -1904,7 +1904,7 @@ private void testCreateTableAs(Session session, HiveStorageFormat storageFormat) assertUpdate(session, createTableAs, 1); TableMetadata tableMetadata = getTableMetadata(catalog, TPCH_SCHEMA, "test_format_table"); - assertThat(tableMetadata.getMetadata().getProperties()).containsEntry(STORAGE_FORMAT_PROPERTY, storageFormat); + assertThat(tableMetadata.metadata().getProperties()).containsEntry(STORAGE_FORMAT_PROPERTY, storageFormat); assertColumnType(tableMetadata, "_varchar", createVarcharType(3)); assertColumnType(tableMetadata, "_char", createCharType(10)); @@ -1940,8 +1940,8 @@ private void testCreatePartitionedTableAs(Session session, HiveStorageFormat sto assertUpdate(session, createTable, "SELECT count(*) FROM orders"); TableMetadata tableMetadata = getTableMetadata(catalog, TPCH_SCHEMA, "test_create_partitioned_table_as"); - assertThat(tableMetadata.getMetadata().getProperties()).containsEntry(STORAGE_FORMAT_PROPERTY, storageFormat); - assertThat(tableMetadata.getMetadata().getProperties()).containsEntry(PARTITIONED_BY_PROPERTY, ImmutableList.of("ship_priority", "order_status")); + assertThat(tableMetadata.metadata().getProperties()).containsEntry(STORAGE_FORMAT_PROPERTY, storageFormat); + assertThat(tableMetadata.metadata().getProperties()).containsEntry(PARTITIONED_BY_PROPERTY, ImmutableList.of("ship_priority", "order_status")); List partitions = getPartitions("test_create_partitioned_table_as"); assertThat(partitions.size()).isEqualTo(3); @@ -2178,11 +2178,11 @@ private void testEmptyBucketedTable(Session baseSession, HiveStorageFormat stora assertUpdate(createTable); TableMetadata tableMetadata = getTableMetadata(catalog, TPCH_SCHEMA, tableName); - assertThat(tableMetadata.getMetadata().getProperties()).containsEntry(STORAGE_FORMAT_PROPERTY, storageFormat); + assertThat(tableMetadata.metadata().getProperties()).containsEntry(STORAGE_FORMAT_PROPERTY, storageFormat); - assertThat(tableMetadata.getMetadata().getProperties().get(PARTITIONED_BY_PROPERTY)).isNull(); - assertThat(tableMetadata.getMetadata().getProperties()).containsEntry(BUCKETED_BY_PROPERTY, ImmutableList.of("bucket_key")); - assertThat(tableMetadata.getMetadata().getProperties()).containsEntry(BUCKET_COUNT_PROPERTY, 11); + assertThat(tableMetadata.metadata().getProperties().get(PARTITIONED_BY_PROPERTY)).isNull(); + assertThat(tableMetadata.metadata().getProperties()).containsEntry(BUCKETED_BY_PROPERTY, ImmutableList.of("bucket_key")); + assertThat(tableMetadata.metadata().getProperties()).containsEntry(BUCKET_COUNT_PROPERTY, 11); assertThat(computeActual("SELECT * from " + tableName).getRowCount()).isEqualTo(0); @@ -2240,11 +2240,11 @@ private void testBucketedTable(Session session, HiveStorageFormat storageFormat, assertUpdate(parallelWriter, createTable, 3); TableMetadata tableMetadata = getTableMetadata(catalog, TPCH_SCHEMA, tableName); - assertThat(tableMetadata.getMetadata().getProperties()).containsEntry(STORAGE_FORMAT_PROPERTY, storageFormat); + assertThat(tableMetadata.metadata().getProperties()).containsEntry(STORAGE_FORMAT_PROPERTY, storageFormat); - assertThat(tableMetadata.getMetadata().getProperties().get(PARTITIONED_BY_PROPERTY)).isNull(); - assertThat(tableMetadata.getMetadata().getProperties()).containsEntry(BUCKETED_BY_PROPERTY, ImmutableList.of("bucket_key")); - assertThat(tableMetadata.getMetadata().getProperties()).containsEntry(BUCKET_COUNT_PROPERTY, 11); + assertThat(tableMetadata.metadata().getProperties().get(PARTITIONED_BY_PROPERTY)).isNull(); + assertThat(tableMetadata.metadata().getProperties()).containsEntry(BUCKETED_BY_PROPERTY, ImmutableList.of("bucket_key")); + assertThat(tableMetadata.metadata().getProperties()).containsEntry(BUCKET_COUNT_PROPERTY, 11); assertQuery("SELECT * from " + tableName, "VALUES ('a', 'b', 'c'), ('aa', 'bb', 'cc'), ('aaa', 'bbb', 'ccc')"); @@ -2697,11 +2697,11 @@ private void testCreatePartitionedBucketedTableAsWithUnionAll(HiveStorageFormat private void verifyPartitionedBucketedTable(HiveStorageFormat storageFormat, String tableName) { TableMetadata tableMetadata = getTableMetadata(catalog, TPCH_SCHEMA, tableName); - assertThat(tableMetadata.getMetadata().getProperties()).containsEntry(STORAGE_FORMAT_PROPERTY, storageFormat); + assertThat(tableMetadata.metadata().getProperties()).containsEntry(STORAGE_FORMAT_PROPERTY, storageFormat); - assertThat(tableMetadata.getMetadata().getProperties()).containsEntry(PARTITIONED_BY_PROPERTY, ImmutableList.of("orderstatus")); - assertThat(tableMetadata.getMetadata().getProperties()).containsEntry(BUCKETED_BY_PROPERTY, ImmutableList.of("custkey", "custkey2")); - assertThat(tableMetadata.getMetadata().getProperties()).containsEntry(BUCKET_COUNT_PROPERTY, 11); + assertThat(tableMetadata.metadata().getProperties()).containsEntry(PARTITIONED_BY_PROPERTY, ImmutableList.of("orderstatus")); + assertThat(tableMetadata.metadata().getProperties()).containsEntry(BUCKETED_BY_PROPERTY, ImmutableList.of("custkey", "custkey2")); + assertThat(tableMetadata.metadata().getProperties()).containsEntry(BUCKET_COUNT_PROPERTY, 11); List partitions = getPartitions(tableName); assertThat(partitions.size()).isEqualTo(3); @@ -2865,11 +2865,11 @@ private void testInsertPartitionedBucketedTableFewRows(Session session, HiveStor private void verifyPartitionedBucketedTableAsFewRows(HiveStorageFormat storageFormat, String tableName) { TableMetadata tableMetadata = getTableMetadata(catalog, TPCH_SCHEMA, tableName); - assertThat(tableMetadata.getMetadata().getProperties()).containsEntry(STORAGE_FORMAT_PROPERTY, storageFormat); + assertThat(tableMetadata.metadata().getProperties()).containsEntry(STORAGE_FORMAT_PROPERTY, storageFormat); - assertThat(tableMetadata.getMetadata().getProperties()).containsEntry(PARTITIONED_BY_PROPERTY, ImmutableList.of("partition_key")); - assertThat(tableMetadata.getMetadata().getProperties()).containsEntry(BUCKETED_BY_PROPERTY, ImmutableList.of("bucket_key")); - assertThat(tableMetadata.getMetadata().getProperties()).containsEntry(BUCKET_COUNT_PROPERTY, 11); + assertThat(tableMetadata.metadata().getProperties()).containsEntry(PARTITIONED_BY_PROPERTY, ImmutableList.of("partition_key")); + assertThat(tableMetadata.metadata().getProperties()).containsEntry(BUCKETED_BY_PROPERTY, ImmutableList.of("bucket_key")); + assertThat(tableMetadata.metadata().getProperties()).containsEntry(BUCKET_COUNT_PROPERTY, 11); List partitions = getPartitions(tableName); assertThat(partitions.size()).isEqualTo(3); @@ -3185,7 +3185,7 @@ private void testInsert(Session session, HiveStorageFormat storageFormat) assertUpdate(session, createTable); TableMetadata tableMetadata = getTableMetadata(catalog, TPCH_SCHEMA, "test_insert_format_table"); - assertThat(tableMetadata.getMetadata().getProperties()).containsEntry(STORAGE_FORMAT_PROPERTY, storageFormat); + assertThat(tableMetadata.metadata().getProperties()).containsEntry(STORAGE_FORMAT_PROPERTY, storageFormat); assertColumnType(tableMetadata, "_string", createUnboundedVarcharType()); assertColumnType(tableMetadata, "_varchar", createVarcharType(65535)); @@ -3256,8 +3256,8 @@ private void testInsertPartitionedTable(Session session, HiveStorageFormat stora assertUpdate(session, createTable); TableMetadata tableMetadata = getTableMetadata(catalog, TPCH_SCHEMA, "test_insert_partitioned_table"); - assertThat(tableMetadata.getMetadata().getProperties()).containsEntry(STORAGE_FORMAT_PROPERTY, storageFormat); - assertThat(tableMetadata.getMetadata().getProperties()).containsEntry(PARTITIONED_BY_PROPERTY, ImmutableList.of("ship_priority", "order_status")); + assertThat(tableMetadata.metadata().getProperties()).containsEntry(STORAGE_FORMAT_PROPERTY, storageFormat); + assertThat(tableMetadata.metadata().getProperties()).containsEntry(PARTITIONED_BY_PROPERTY, ImmutableList.of("ship_priority", "order_status")); String partitionsTable = "\"test_insert_partitioned_table$partitions\""; @@ -3329,8 +3329,8 @@ private void testInsertPartitionedTableExistingPartition(Session session, HiveSt assertUpdate(session, createTable); TableMetadata tableMetadata = getTableMetadata(catalog, TPCH_SCHEMA, tableName); - assertThat(tableMetadata.getMetadata().getProperties()).containsEntry(STORAGE_FORMAT_PROPERTY, storageFormat); - assertThat(tableMetadata.getMetadata().getProperties()).containsEntry(PARTITIONED_BY_PROPERTY, ImmutableList.of("order_status")); + assertThat(tableMetadata.metadata().getProperties()).containsEntry(STORAGE_FORMAT_PROPERTY, storageFormat); + assertThat(tableMetadata.metadata().getProperties()).containsEntry(PARTITIONED_BY_PROPERTY, ImmutableList.of("order_status")); for (int i = 0; i < 3; i++) { assertUpdate( @@ -3387,8 +3387,8 @@ private void testInsertPartitionedTableOverwriteExistingPartition(Session sessio assertUpdate(session, createTable); TableMetadata tableMetadata = getTableMetadata(catalog, TPCH_SCHEMA, tableName); - assertThat(tableMetadata.getMetadata().getProperties()).containsEntry(STORAGE_FORMAT_PROPERTY, storageFormat); - assertThat(tableMetadata.getMetadata().getProperties()).containsEntry(PARTITIONED_BY_PROPERTY, ImmutableList.of("order_status")); + assertThat(tableMetadata.metadata().getProperties()).containsEntry(STORAGE_FORMAT_PROPERTY, storageFormat); + assertThat(tableMetadata.metadata().getProperties()).containsEntry(PARTITIONED_BY_PROPERTY, ImmutableList.of("order_status")); for (int i = 0; i < 3; i++) { assertUpdate( @@ -3502,7 +3502,7 @@ public void testPartitionPerScanLimit() assertUpdate(createTable); TableMetadata tableMetadata = getTableMetadata(catalog, TPCH_SCHEMA, tableName); - assertThat(tableMetadata.getMetadata().getProperties()).containsEntry(PARTITIONED_BY_PROPERTY, ImmutableList.of("part")); + assertThat(tableMetadata.metadata().getProperties()).containsEntry(PARTITIONED_BY_PROPERTY, ImmutableList.of("part")); // insert 1200 partitions for (int i = 0; i < 12; i++) { @@ -3704,7 +3704,7 @@ private void testInsertUnpartitionedTable(Session session, HiveStorageFormat sto assertUpdate(session, createTable); TableMetadata tableMetadata = getTableMetadata(catalog, TPCH_SCHEMA, tableName); - assertThat(tableMetadata.getMetadata().getProperties()).containsEntry(STORAGE_FORMAT_PROPERTY, storageFormat); + assertThat(tableMetadata.metadata().getProperties()).containsEntry(STORAGE_FORMAT_PROPERTY, storageFormat); for (int i = 0; i < 3; i++) { assertUpdate( @@ -4064,12 +4064,12 @@ public void testBucketedCatalog() String bucketedSchema = bucketedSession.getSchema().get(); TableMetadata ordersTableMetadata = getTableMetadata(bucketedCatalog, bucketedSchema, "orders"); - assertThat(ordersTableMetadata.getMetadata().getProperties()).containsEntry(BUCKETED_BY_PROPERTY, ImmutableList.of("custkey")); - assertThat(ordersTableMetadata.getMetadata().getProperties()).containsEntry(BUCKET_COUNT_PROPERTY, 11); + assertThat(ordersTableMetadata.metadata().getProperties()).containsEntry(BUCKETED_BY_PROPERTY, ImmutableList.of("custkey")); + assertThat(ordersTableMetadata.metadata().getProperties()).containsEntry(BUCKET_COUNT_PROPERTY, 11); TableMetadata customerTableMetadata = getTableMetadata(bucketedCatalog, bucketedSchema, "customer"); - assertThat(customerTableMetadata.getMetadata().getProperties()).containsEntry(BUCKETED_BY_PROPERTY, ImmutableList.of("custkey")); - assertThat(customerTableMetadata.getMetadata().getProperties()).containsEntry(BUCKET_COUNT_PROPERTY, 11); + assertThat(customerTableMetadata.metadata().getProperties()).containsEntry(BUCKETED_BY_PROPERTY, ImmutableList.of("custkey")); + assertThat(customerTableMetadata.metadata().getProperties()).containsEntry(BUCKET_COUNT_PROPERTY, 11); } @Test @@ -4708,10 +4708,10 @@ private void testPathHiddenColumn(Session session, HiveStorageFormat storageForm assertThat(getQueryRunner().tableExists(getSession(), "test_path")).isTrue(); TableMetadata tableMetadata = getTableMetadata(catalog, TPCH_SCHEMA, "test_path"); - assertThat(tableMetadata.getMetadata().getProperties()).containsEntry(STORAGE_FORMAT_PROPERTY, storageFormat); + assertThat(tableMetadata.metadata().getProperties()).containsEntry(STORAGE_FORMAT_PROPERTY, storageFormat); List columnNames = ImmutableList.of("col0", "col1", PATH_COLUMN_NAME, FILE_SIZE_COLUMN_NAME, FILE_MODIFIED_TIME_COLUMN_NAME, PARTITION_COLUMN_NAME); - List columnMetadatas = tableMetadata.getColumns(); + List columnMetadatas = tableMetadata.columns(); assertThat(columnMetadatas.size()).isEqualTo(columnNames.size()); for (int i = 0; i < columnMetadatas.size(); i++) { ColumnMetadata columnMetadata = columnMetadatas.get(i); @@ -4765,11 +4765,11 @@ public void testBucketHiddenColumn() assertThat(getQueryRunner().tableExists(getSession(), "test_bucket_hidden_column")).isTrue(); TableMetadata tableMetadata = getTableMetadata(catalog, TPCH_SCHEMA, "test_bucket_hidden_column"); - assertThat(tableMetadata.getMetadata().getProperties()).containsEntry(BUCKETED_BY_PROPERTY, ImmutableList.of("col0")); - assertThat(tableMetadata.getMetadata().getProperties()).containsEntry(BUCKET_COUNT_PROPERTY, 2); + assertThat(tableMetadata.metadata().getProperties()).containsEntry(BUCKETED_BY_PROPERTY, ImmutableList.of("col0")); + assertThat(tableMetadata.metadata().getProperties()).containsEntry(BUCKET_COUNT_PROPERTY, 2); List columnNames = ImmutableList.of("col0", "col1", PATH_COLUMN_NAME, BUCKET_COLUMN_NAME, FILE_SIZE_COLUMN_NAME, FILE_MODIFIED_TIME_COLUMN_NAME); - List columnMetadatas = tableMetadata.getColumns(); + List columnMetadatas = tableMetadata.columns(); assertThat(columnMetadatas.size()).isEqualTo(columnNames.size()); for (int i = 0; i < columnMetadatas.size(); i++) { ColumnMetadata columnMetadata = columnMetadatas.get(i); @@ -4819,7 +4819,7 @@ public void testFileSizeHiddenColumn() TableMetadata tableMetadata = getTableMetadata(catalog, TPCH_SCHEMA, "test_file_size"); List columnNames = ImmutableList.of("col0", "col1", PATH_COLUMN_NAME, FILE_SIZE_COLUMN_NAME, FILE_MODIFIED_TIME_COLUMN_NAME, PARTITION_COLUMN_NAME); - List columnMetadatas = tableMetadata.getColumns(); + List columnMetadatas = tableMetadata.columns(); assertThat(columnMetadatas.size()).isEqualTo(columnNames.size()); for (int i = 0; i < columnMetadatas.size(); i++) { ColumnMetadata columnMetadata = columnMetadatas.get(i); @@ -4879,7 +4879,7 @@ private void testFileModifiedTimeHiddenColumn(HiveTimestampPrecision precision) TableMetadata tableMetadata = getTableMetadata(catalog, TPCH_SCHEMA, "test_file_modified_time"); List columnNames = ImmutableList.of("col0", "col1", PATH_COLUMN_NAME, FILE_SIZE_COLUMN_NAME, FILE_MODIFIED_TIME_COLUMN_NAME, PARTITION_COLUMN_NAME); - List columnMetadatas = tableMetadata.getColumns(); + List columnMetadatas = tableMetadata.columns(); assertThat(columnMetadatas.size()).isEqualTo(columnNames.size()); for (int i = 0; i < columnMetadatas.size(); i++) { ColumnMetadata columnMetadata = columnMetadatas.get(i); @@ -4931,10 +4931,10 @@ public void testPartitionHiddenColumn() assertThat(getQueryRunner().tableExists(getSession(), "test_partition_hidden_column")).isTrue(); TableMetadata tableMetadata = getTableMetadata(catalog, TPCH_SCHEMA, "test_partition_hidden_column"); - assertThat(tableMetadata.getMetadata().getProperties()).containsEntry(PARTITIONED_BY_PROPERTY, ImmutableList.of("col1", "col2")); + assertThat(tableMetadata.metadata().getProperties()).containsEntry(PARTITIONED_BY_PROPERTY, ImmutableList.of("col1", "col2")); List columnNames = ImmutableList.of("col0", "col1", "col2", PATH_COLUMN_NAME, FILE_SIZE_COLUMN_NAME, FILE_MODIFIED_TIME_COLUMN_NAME, PARTITION_COLUMN_NAME); - List columnMetadatas = tableMetadata.getColumns(); + List columnMetadatas = tableMetadata.columns(); assertThat(columnMetadatas.size()).isEqualTo(columnNames.size()); for (int i = 0; i < columnMetadatas.size(); i++) { ColumnMetadata columnMetadata = columnMetadatas.get(i); @@ -8940,7 +8940,7 @@ public void testAutoPurgeProperty() assertUpdate(createTableSql, 1500L); TableMetadata tableMetadataDefaults = getTableMetadata(catalog, TPCH_SCHEMA, tableName); - assertThat(tableMetadataDefaults.getMetadata().getProperties()).doesNotContainKey(AUTO_PURGE); + assertThat(tableMetadataDefaults.metadata().getProperties()).doesNotContainKey(AUTO_PURGE); assertUpdate("DROP TABLE " + tableName); @@ -8954,7 +8954,7 @@ public void testAutoPurgeProperty() assertUpdate(createTableSqlWithAutoPurge, 1500L); TableMetadata tableMetadataWithPurge = getTableMetadata(catalog, TPCH_SCHEMA, tableName); - assertThat(tableMetadataWithPurge.getMetadata().getProperties()).containsEntry(AUTO_PURGE, true); + assertThat(tableMetadataWithPurge.metadata().getProperties()).containsEntry(AUTO_PURGE, true); assertUpdate("DROP TABLE " + tableName); } @@ -9283,7 +9283,7 @@ private Type canonicalizeType(Type type) private void assertColumnType(TableMetadata tableMetadata, String columnName, Type expectedType) { - assertThat(tableMetadata.getColumn(columnName).getType()).isEqualTo(canonicalizeType(expectedType)); + assertThat(tableMetadata.column(columnName).getType()).isEqualTo(canonicalizeType(expectedType)); } private void assertConstraints(@Language("SQL") String query, Set expected) @@ -9300,10 +9300,10 @@ private void assertConstraints(@Language("SQL") String query, Set partitionKeys) { - Object partitionByProperty = tableMetadata.getMetadata().getProperties().get(PARTITIONED_BY_PROPERTY); + Object partitionByProperty = tableMetadata.metadata().getProperties().get(PARTITIONED_BY_PROPERTY); if (hasPartition) { assertThat(partitionByProperty).isEqualTo(partitionKeys); - for (ColumnMetadata columnMetadata : tableMetadata.getColumns()) { + for (ColumnMetadata columnMetadata : tableMetadata.columns()) { boolean partitionKey = partitionKeys.contains(columnMetadata.getName()); assertThat(columnMetadata.getExtraInfo()).isEqualTo(columnExtraInfo(partitionKey)); }