diff --git a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/HdfsInputFile.java b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/HdfsInputFile.java index d5875404a1712..0529073e62e87 100644 --- a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/HdfsInputFile.java +++ b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/HdfsInputFile.java @@ -83,7 +83,8 @@ public HdfsInputStream(SeekableInputStream delegate) } @Override - public int read() throws IOException + public int read() + throws IOException { return delegate.read(); } @@ -96,19 +97,22 @@ public int read(byte[] b, int off, int len) } @Override - public long getPos() throws IOException + public long getPos() + throws IOException { return delegate.getPos(); } @Override - public void seek(long newPos) throws IOException + public void seek(long newPos) + throws IOException { delegate.seek(newPos); } @Override - public void close() throws IOException + public void close() + throws IOException { delegate.close(); } diff --git a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/HiveTableOperations.java b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/HiveTableOperations.java index 4ea437d5feea9..f7a153f0a1066 100644 --- a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/HiveTableOperations.java +++ b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/HiveTableOperations.java @@ -181,15 +181,16 @@ private static synchronized void initTableLevelLockCache(long evictionTimeout) { if (commitLockCache == null) { commitLockCache = CacheBuilder.newBuilder() - .expireAfterAccess(evictionTimeout, TimeUnit.MILLISECONDS) - .build( - new CacheLoader() { - @Override - public ReentrantLock load(String fullName) - { - return new ReentrantLock(); - } - }); + .expireAfterAccess(evictionTimeout, TimeUnit.MILLISECONDS) + .build( + new CacheLoader() + { + @Override + public ReentrantLock load(String fullName) + { + return new ReentrantLock(); + } + }); } } @@ -304,11 +305,11 @@ public void commit(@Nullable TableMetadata base, TableMetadata metadata) PrestoPrincipal owner = new PrestoPrincipal(USER, table.getOwner()); PrincipalPrivileges privileges = new PrincipalPrivileges( ImmutableMultimap.builder() - .put(table.getOwner(), new HivePrivilegeInfo(SELECT, true, owner, owner)) - .put(table.getOwner(), new HivePrivilegeInfo(INSERT, true, owner, owner)) - .put(table.getOwner(), new HivePrivilegeInfo(UPDATE, true, owner, owner)) - .put(table.getOwner(), new HivePrivilegeInfo(DELETE, true, owner, owner)) - .build(), + .put(table.getOwner(), new HivePrivilegeInfo(SELECT, true, owner, owner)) + .put(table.getOwner(), new HivePrivilegeInfo(INSERT, true, owner, owner)) + .put(table.getOwner(), new HivePrivilegeInfo(UPDATE, true, owner, owner)) + .put(table.getOwner(), new HivePrivilegeInfo(DELETE, true, owner, owner)) + .build(), ImmutableMultimap.of()); if (base == null) { metastore.createTable(metastoreContext, table, privileges, emptyList()); diff --git a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/IcebergPageSink.java b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/IcebergPageSink.java index d7977cbb008e7..a80bfcd376722 100644 --- a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/IcebergPageSink.java +++ b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/IcebergPageSink.java @@ -457,8 +457,8 @@ private static class PagePartitioner private Page transformedPage; public PagePartitioner(PageIndexerFactory pageIndexerFactory, - List columns, - ConnectorSession session) + List columns, + ConnectorSession session) { this.pageIndexer = pageIndexerFactory.createPageIndexer(columns.stream() .map(PartitionColumn::getResultType) diff --git a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/IcebergUtil.java b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/IcebergUtil.java index 09a879702e4a0..4bff5c5d4bd80 100644 --- a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/IcebergUtil.java +++ b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/IcebergUtil.java @@ -130,7 +130,6 @@ import static com.facebook.presto.iceberg.ExpressionConverter.toIcebergExpression; import static com.facebook.presto.iceberg.FileContent.POSITION_DELETES; import static com.facebook.presto.iceberg.FileContent.fromIcebergFileContent; -import static com.facebook.presto.iceberg.FileFormat.PARQUET; import static com.facebook.presto.iceberg.IcebergColumnHandle.DATA_SEQUENCE_NUMBER_COLUMN_HANDLE; import static com.facebook.presto.iceberg.IcebergColumnHandle.PATH_COLUMN_HANDLE; import static com.facebook.presto.iceberg.IcebergErrorCode.ICEBERG_INVALID_FORMAT_VERSION; @@ -856,10 +855,10 @@ public static long getDataSequenceNumber(ContentFile file) * @param requestedSchema If provided, only delete files with this schema will be provided */ public static CloseableIterable getDeleteFiles(Table table, - long snapshot, - TupleDomain filter, - Optional> requestedPartitionSpec, - Optional> requestedSchema) + long snapshot, + TupleDomain filter, + Optional> requestedPartitionSpec, + Optional> requestedSchema) { Expression filterExpression = toIcebergExpression(filter); CloseableIterable fileTasks = table.newScan().useSnapshot(snapshot).filter(filterExpression).planFiles(); @@ -1035,9 +1034,9 @@ private static class DeleteFilesIterator private DeleteFile currentFile; private DeleteFilesIterator(Map partitionSpecsById, - CloseableIterator fileTasks, - Optional> requestedPartitionSpec, - Optional> requestedSchema) + CloseableIterator fileTasks, + Optional> requestedPartitionSpec, + Optional> requestedSchema) { this.partitionSpecsById = partitionSpecsById; this.fileTasks = fileTasks; @@ -1221,8 +1220,8 @@ public static Optional partitionDataFromStructLike(PartitionSpec /** * Get the metadata location for target {@link Table}, - * considering iceberg table properties {@code WRITE_METADATA_LOCATION} - * */ + * considering iceberg table properties {@code WRITE_METADATA_LOCATION} + */ public static String metadataLocation(Table icebergTable) { String metadataLocation = icebergTable.properties().get(TableProperties.WRITE_METADATA_LOCATION); @@ -1237,8 +1236,8 @@ public static String metadataLocation(Table icebergTable) /** * Get the data location for target {@link Table}, - * considering iceberg table properties {@code WRITE_DATA_LOCATION}, {@code OBJECT_STORE_PATH} and {@code WRITE_FOLDER_STORAGE_LOCATION} - * */ + * considering iceberg table properties {@code WRITE_DATA_LOCATION}, {@code OBJECT_STORE_PATH} and {@code WRITE_FOLDER_STORAGE_LOCATION} + */ public static String dataLocation(Table icebergTable) { Map properties = icebergTable.properties(); diff --git a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/PartitionTable.java b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/PartitionTable.java index a7f3e4e446556..6b44515e91810 100644 --- a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/PartitionTable.java +++ b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/PartitionTable.java @@ -141,10 +141,10 @@ private List getPartitionColumnsMetadata(List fi private List getColumnMetadata(List columns) { return columns.stream().map(column -> new ColumnMetadata(column.name(), - RowType.from(ImmutableList.of( - new RowType.Field(Optional.of("min"), toPrestoType(column.type(), typeManager)), - new RowType.Field(Optional.of("max"), toPrestoType(column.type(), typeManager)), - new RowType.Field(Optional.of("null_count"), BIGINT))))) + RowType.from(ImmutableList.of( + new RowType.Field(Optional.of("min"), toPrestoType(column.type(), typeManager)), + new RowType.Field(Optional.of("max"), toPrestoType(column.type(), typeManager)), + new RowType.Field(Optional.of("null_count"), BIGINT))))) .collect(toImmutableList()); } diff --git a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/PartitionTransforms.java b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/PartitionTransforms.java index 13848b7ad082f..ac696e181d6f2 100644 --- a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/PartitionTransforms.java +++ b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/PartitionTransforms.java @@ -61,6 +61,7 @@ public final class PartitionTransforms private static final DateTimeField MONTH_OF_YEAR_UTC = getInstanceUTC().monthOfYear(); public static final int MILLISECONDS_PER_HOUR = 60 * 60 * 1000; public static final int MILLISECONDS_PER_DAY = MILLISECONDS_PER_HOUR * 24; + private PartitionTransforms() {} /** @@ -550,9 +551,9 @@ public static class ColumnTransform private final ValueTransform valueTransform; public ColumnTransform(String transformName, - Type type, - Function transform, - ValueTransform valueTransform) + Type type, + Function transform, + ValueTransform valueTransform) { this.transformName = requireNonNull(transformName, "transformName is null"); this.type = requireNonNull(type, "resultType is null"); diff --git a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/PrestoIcebergTableForMetricsConfig.java b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/PrestoIcebergTableForMetricsConfig.java index 601e03c368689..d770223e39f29 100644 --- a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/PrestoIcebergTableForMetricsConfig.java +++ b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/PrestoIcebergTableForMetricsConfig.java @@ -50,7 +50,7 @@ /** * This is a dummy class required for {@link org.apache.iceberg.MetricsConfig#forTable} - * */ + */ public class PrestoIcebergTableForMetricsConfig implements Table { diff --git a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/optimizer/IcebergFilterPushdown.java b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/optimizer/IcebergFilterPushdown.java index 38f09363270b1..f60e149c56750 100644 --- a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/optimizer/IcebergFilterPushdown.java +++ b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/optimizer/IcebergFilterPushdown.java @@ -153,7 +153,7 @@ protected ConnectorPushdownFilterResult getConnectorPushdownFilterResult( Optional> requestedColumns = currentLayoutHandle.map(layout -> ((IcebergTableLayoutHandle) layout).getRequestedColumns()).orElse(Optional.empty()); TupleDomain partitionColumnPredicate = TupleDomain.withColumnDomains(Maps.filterKeys( - constraint.getSummary().getDomains().get(), Predicates.in(partitionColumns))); + constraint.getSummary().getDomains().get(), Predicates.in(partitionColumns))); List partitions = getPartitions( typeManager, diff --git a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/optimizer/IcebergMetadataOptimizer.java b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/optimizer/IcebergMetadataOptimizer.java index 3622947acf497..68e5d2abeb726 100644 --- a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/optimizer/IcebergMetadataOptimizer.java +++ b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/optimizer/IcebergMetadataOptimizer.java @@ -90,10 +90,10 @@ public class IcebergMetadataOptimizer private final StandardFunctionResolution functionResolution; public IcebergMetadataOptimizer(FunctionMetadataManager functionMetadataManager, - TypeManager typeManager, - IcebergTransactionManager icebergTransactionManager, - RowExpressionService rowExpressionService, - StandardFunctionResolution functionResolution) + TypeManager typeManager, + IcebergTransactionManager icebergTransactionManager, + RowExpressionService rowExpressionService, + StandardFunctionResolution functionResolution) { this.functionMetadataManager = requireNonNull(functionMetadataManager, "functionMetadataManager is null"); this.typeManager = requireNonNull(typeManager, "typeManager is null"); @@ -131,13 +131,13 @@ private static class Optimizer private final List> allowedFunctionsPredicates; private Optimizer(ConnectorSession connectorSession, - PlanNodeIdAllocator idAllocator, - FunctionMetadataManager functionMetadataManager, - TypeManager typeManager, - IcebergTransactionManager icebergTransactionManager, - RowExpressionService rowExpressionService, - StandardFunctionResolution functionResolution, - int rowsForMetadataOptimizationThreshold) + PlanNodeIdAllocator idAllocator, + FunctionMetadataManager functionMetadataManager, + TypeManager typeManager, + IcebergTransactionManager icebergTransactionManager, + RowExpressionService rowExpressionService, + StandardFunctionResolution functionResolution, + int rowsForMetadataOptimizationThreshold) { checkArgument(rowsForMetadataOptimizationThreshold >= 0, "The value of `rowsForMetadataOptimizationThreshold` should not less than 0"); this.connectorSession = connectorSession; diff --git a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/optimizer/IcebergPlanOptimizer.java b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/optimizer/IcebergPlanOptimizer.java index d8ff0d65bba81..3526cfb97c831 100644 --- a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/optimizer/IcebergPlanOptimizer.java +++ b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/optimizer/IcebergPlanOptimizer.java @@ -87,9 +87,9 @@ public class IcebergPlanOptimizer private final IcebergTransactionManager transactionManager; IcebergPlanOptimizer(StandardFunctionResolution functionResolution, - RowExpressionService rowExpressionService, - FunctionMetadataManager functionMetadataManager, - IcebergTransactionManager transactionManager) + RowExpressionService rowExpressionService, + FunctionMetadataManager functionMetadataManager, + IcebergTransactionManager transactionManager) { this.functionResolution = requireNonNull(functionResolution, "functionResolution is null"); this.rowExpressionService = requireNonNull(rowExpressionService, "rowExpressionService is null"); @@ -190,10 +190,10 @@ public PlanNode visitFilter(FilterNode filter, RewriteContext context) // Get predicate expression on entire columns that could not be enforced by iceberg table TupleDomain nonPartitionColumnPredicate = TupleDomain.withColumnDomains( - Maps.filterKeys( - entireColumnDomain.transform(icebergColumnHandle -> (ColumnHandle) icebergColumnHandle) - .getDomains().get(), - Predicates.not(Predicates.in(enforcedColumns)))) + Maps.filterKeys( + entireColumnDomain.transform(icebergColumnHandle -> (ColumnHandle) icebergColumnHandle) + .getDomains().get(), + Predicates.not(Predicates.in(enforcedColumns)))) .transform(columnHandle -> new Subfield(columnHandleToNameMapping.get(columnHandle), ImmutableList.of())) .transform(subfield -> subfieldExtractor.toRowExpression(subfield, columnTypes.get(subfield.getRootName()))); RowExpression nonPartitionColumn = rowExpressionService.getDomainTranslator().toPredicate(nonPartitionColumnPredicate); @@ -374,13 +374,13 @@ private static boolean yieldSamePartitioningValue( !field.transform().isIdentity()) { TimestampType timestampType = (TimestampType) sourceType; first = adjustTimestampForPartitionTransform( - session.getSqlFunctionProperties(), - timestampType, - first); + session.getSqlFunctionProperties(), + timestampType, + first); second = adjustTimestampForPartitionTransform( - session.getSqlFunctionProperties(), - timestampType, - second); + session.getSqlFunctionProperties(), + timestampType, + second); } Object firstTransformed = transform.getValueTransform().apply(nativeValueToBlock(sourceType, first), 0); Object secondTransformed = transform.getValueTransform().apply(nativeValueToBlock(sourceType, second), 0); diff --git a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/procedure/RemoveOrphanFiles.java b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/procedure/RemoveOrphanFiles.java index 6bede7267f408..1cd87cee0b6fd 100644 --- a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/procedure/RemoveOrphanFiles.java +++ b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/procedure/RemoveOrphanFiles.java @@ -82,7 +82,7 @@ public class RemoveOrphanFiles @Inject public RemoveOrphanFiles(IcebergMetadataFactory metadataFactory, - HdfsEnvironment hdfsEnvironment) + HdfsEnvironment hdfsEnvironment) { this.metadataFactory = requireNonNull(metadataFactory, "metadataFactory is null"); this.hdfsEnvironment = requireNonNull(hdfsEnvironment, "hdfsEnvironment is null"); diff --git a/presto-iceberg/src/main/java/org/apache/iceberg/IcebergLibUtils.java b/presto-iceberg/src/main/java/org/apache/iceberg/IcebergLibUtils.java index ba0511e9d4e81..ba3543661dc3e 100644 --- a/presto-iceberg/src/main/java/org/apache/iceberg/IcebergLibUtils.java +++ b/presto-iceberg/src/main/java/org/apache/iceberg/IcebergLibUtils.java @@ -23,8 +23,8 @@ private IcebergLibUtils() /** * Call the method in Iceberg lib's protected class to set explicitly - * whether to use incremental cleanup when expiring snapshots - * */ + * whether to use incremental cleanup when expiring snapshots + */ public static ExpireSnapshots withIncrementalCleanup(ExpireSnapshots expireSnapshots, boolean incrementalCleanup) { requireNonNull(expireSnapshots, "expireSnapshots is null"); diff --git a/presto-iceberg/src/test/java/com/facebook/presto/iceberg/IcebergDistributedSmokeTestBase.java b/presto-iceberg/src/test/java/com/facebook/presto/iceberg/IcebergDistributedSmokeTestBase.java index a308202869338..f3d1e0ed6cef8 100644 --- a/presto-iceberg/src/test/java/com/facebook/presto/iceberg/IcebergDistributedSmokeTestBase.java +++ b/presto-iceberg/src/test/java/com/facebook/presto/iceberg/IcebergDistributedSmokeTestBase.java @@ -123,6 +123,7 @@ public void testDescribeTable() MaterializedResult actualColumns = computeActual("DESCRIBE orders"); Assert.assertEquals(actualColumns, expectedColumns); } + @Test public void testShowCreateTable() { @@ -771,15 +772,15 @@ private void testCreateTableLike() assertUpdate(session, "CREATE TABLE test_create_table_like_copy4 (LIKE test_create_table_like_original INCLUDING PROPERTIES) WITH (format = 'ORC')"); assertEquals(getTablePropertiesString("test_create_table_like_copy4"), format("WITH (\n" + - " delete_mode = 'merge-on-read',\n" + - " format = 'ORC',\n" + - " format_version = '2',\n" + - " location = '%s',\n" + - " metadata_delete_after_commit = false,\n" + - " metadata_previous_versions_max = 100,\n" + - " metrics_max_inferred_column = 100,\n" + - " partitioning = ARRAY['adate']\n" + - ")", + " delete_mode = 'merge-on-read',\n" + + " format = 'ORC',\n" + + " format_version = '2',\n" + + " location = '%s',\n" + + " metadata_delete_after_commit = false,\n" + + " metadata_previous_versions_max = 100,\n" + + " metrics_max_inferred_column = 100,\n" + + " partitioning = ARRAY['adate']\n" + + ")", getLocation(schemaName, "test_create_table_like_original"))); dropTable(session, "test_create_table_like_copy4"); } diff --git a/presto-iceberg/src/test/java/com/facebook/presto/iceberg/TestIcebergDistributedQueries.java b/presto-iceberg/src/test/java/com/facebook/presto/iceberg/TestIcebergDistributedQueries.java index 8bfb68d48872d..3b394a4b74de5 100644 --- a/presto-iceberg/src/test/java/com/facebook/presto/iceberg/TestIcebergDistributedQueries.java +++ b/presto-iceberg/src/test/java/com/facebook/presto/iceberg/TestIcebergDistributedQueries.java @@ -54,7 +54,8 @@ protected TestIcebergDistributedQueries(CatalogType catalogType) } @Override - protected QueryRunner createQueryRunner() throws Exception + protected QueryRunner createQueryRunner() + throws Exception { return IcebergQueryRunner.createIcebergQueryRunner(ImmutableMap.of(), catalogType, extraConnectorProperties); } diff --git a/presto-iceberg/src/test/java/com/facebook/presto/iceberg/TestIcebergFileWriter.java b/presto-iceberg/src/test/java/com/facebook/presto/iceberg/TestIcebergFileWriter.java index 734d47172ded8..c9b84e4ee2904 100644 --- a/presto-iceberg/src/test/java/com/facebook/presto/iceberg/TestIcebergFileWriter.java +++ b/presto-iceberg/src/test/java/com/facebook/presto/iceberg/TestIcebergFileWriter.java @@ -76,7 +76,8 @@ public class TestIcebergFileWriter private ConnectorSession connectorSession; @BeforeClass - public void setup() throws Exception + public void setup() + throws Exception { ConnectorId connectorId = new ConnectorId("iceberg"); SessionPropertyManager sessionPropertyManager = createTestingSessionPropertyManager(); @@ -119,7 +120,8 @@ public void setup() throws Exception } @Test - public void testWriteParquetFileWithLogicalTypes() throws Exception + public void testWriteParquetFileWithLogicalTypes() + throws Exception { Path path = new Path(createTempDir().getAbsolutePath() + "/test.parquet"); Schema icebergSchema = toIcebergSchema(ImmutableList.of( diff --git a/presto-iceberg/src/test/java/com/facebook/presto/iceberg/TestIcebergMetadataListing.java b/presto-iceberg/src/test/java/com/facebook/presto/iceberg/TestIcebergMetadataListing.java index 0c7cb8e8b324c..6f522c12f7aad 100644 --- a/presto-iceberg/src/test/java/com/facebook/presto/iceberg/TestIcebergMetadataListing.java +++ b/presto-iceberg/src/test/java/com/facebook/presto/iceberg/TestIcebergMetadataListing.java @@ -40,6 +40,7 @@ public class TestIcebergMetadataListing extends AbstractTestQueryFramework { private static final int TEST_TIMEOUT = 10_000; + @Override protected QueryRunner createQueryRunner() throws Exception @@ -126,7 +127,7 @@ public void testTableDescribing() * when refreshing Iceberg table metadata. If this test fails, check the refreshFromMetadataLocation method * in HiveTableOperations. */ - @Test (timeOut = TEST_TIMEOUT) + @Test(timeOut = TEST_TIMEOUT) public void testTableDropWithMissingMetadata() { assertQuerySucceeds("CREATE SCHEMA hive.test_metadata_schema"); @@ -170,6 +171,7 @@ public void testRenameView() assertUpdate("DROP TABLE iceberg.test_rename_view_schema.iceberg_test_table"); assertQuerySucceeds("DROP SCHEMA IF EXISTS iceberg.test_rename_view_schema"); } + @Test public void testRenameViewIfNotExists() { diff --git a/presto-iceberg/src/test/java/com/facebook/presto/iceberg/TestIcebergSplitManager.java b/presto-iceberg/src/test/java/com/facebook/presto/iceberg/TestIcebergSplitManager.java index bb7f2f26ff5f8..af92ef89fad4e 100644 --- a/presto-iceberg/src/test/java/com/facebook/presto/iceberg/TestIcebergSplitManager.java +++ b/presto-iceberg/src/test/java/com/facebook/presto/iceberg/TestIcebergSplitManager.java @@ -174,10 +174,10 @@ private Session sessionWithFilterPushdown(boolean pushdown) } private void validateSplitsPlannedForSql(SplitManager splitManager, - TransactionManager transactionManager, - boolean filterPushdown, - String sql, - int expectedSplitCount) + TransactionManager transactionManager, + boolean filterPushdown, + String sql, + int expectedSplitCount) { Session session = sessionWithFilterPushdown(filterPushdown); List tableScanNodes = getTableScanFromOptimizedPlanOfSql(sql, session); diff --git a/presto-iceberg/src/test/java/com/facebook/presto/iceberg/TestIcebergTableVersion.java b/presto-iceberg/src/test/java/com/facebook/presto/iceberg/TestIcebergTableVersion.java index 7f75dfcea61c4..c8f497db7272b 100644 --- a/presto-iceberg/src/test/java/com/facebook/presto/iceberg/TestIcebergTableVersion.java +++ b/presto-iceberg/src/test/java/com/facebook/presto/iceberg/TestIcebergTableVersion.java @@ -147,6 +147,7 @@ private long getLatestSnapshotId(String tableName) return (long) computeActual("SELECT snapshot_id FROM " + schemaName + "." + "\"" + tableName + "$snapshots\" ORDER BY committed_at DESC LIMIT 1") .getOnlyValue(); } + private String getLatestTimestampId(String tableName) { return (String) computeActual("SELECT cast(made_current_at as varchar) FROM " + schemaName + "." + "\"" + tableName + "$history\" ORDER BY made_current_at DESC LIMIT 1") diff --git a/presto-iceberg/src/test/java/com/facebook/presto/iceberg/TestIcebergTypes.java b/presto-iceberg/src/test/java/com/facebook/presto/iceberg/TestIcebergTypes.java index 28265c9289c9b..bf29a2e516e4a 100644 --- a/presto-iceberg/src/test/java/com/facebook/presto/iceberg/TestIcebergTypes.java +++ b/presto-iceberg/src/test/java/com/facebook/presto/iceberg/TestIcebergTypes.java @@ -35,7 +35,8 @@ public class TestIcebergTypes extends AbstractTestQueryFramework { - protected QueryRunner createQueryRunner() throws Exception + protected QueryRunner createQueryRunner() + throws Exception { return createIcebergQueryRunner(ImmutableMap.of(), ImmutableMap.of()); } diff --git a/presto-iceberg/src/test/java/com/facebook/presto/iceberg/nessie/TestNessieMultiBranching.java b/presto-iceberg/src/test/java/com/facebook/presto/iceberg/nessie/TestNessieMultiBranching.java index 4ff896164702b..f9a69ff1e0542 100644 --- a/presto-iceberg/src/test/java/com/facebook/presto/iceberg/nessie/TestNessieMultiBranching.java +++ b/presto-iceberg/src/test/java/com/facebook/presto/iceberg/nessie/TestNessieMultiBranching.java @@ -70,7 +70,8 @@ public void tearDown() } @AfterMethod - public void resetData() throws NessieNotFoundException, NessieConflictException + public void resetData() + throws NessieNotFoundException, NessieConflictException { Branch defaultBranch = nessieApiV1.getDefaultBranch(); for (Reference r : nessieApiV1.getAllReferences().get().getReferences()) { diff --git a/presto-iceberg/src/test/java/com/facebook/presto/iceberg/procedure/TestIcebergRegisterAndUnregisterProcedure.java b/presto-iceberg/src/test/java/com/facebook/presto/iceberg/procedure/TestIcebergRegisterAndUnregisterProcedure.java index 30bc013cf7604..2d2603e881028 100644 --- a/presto-iceberg/src/test/java/com/facebook/presto/iceberg/procedure/TestIcebergRegisterAndUnregisterProcedure.java +++ b/presto-iceberg/src/test/java/com/facebook/presto/iceberg/procedure/TestIcebergRegisterAndUnregisterProcedure.java @@ -74,9 +74,9 @@ protected QueryRunner createQueryRunner() throws Exception { session = testSessionBuilder() - .setCatalog(ICEBERG_CATALOG) - .setSchema(TEST_SCHEMA) - .build(); + .setCatalog(ICEBERG_CATALOG) + .setSchema(TEST_SCHEMA) + .build(); DistributedQueryRunner queryRunner = DistributedQueryRunner.builder(session).build(); @@ -537,6 +537,7 @@ protected static HdfsEnvironment getHdfsEnvironment() hiveClientConfig); return new HdfsEnvironment(hdfsConfiguration, metastoreClientConfig, new NoHdfsAuthentication()); } + protected ExtendedHiveMetastore getFileHiveMetastore() { FileHiveMetastore fileHiveMetastore = new FileHiveMetastore(getHdfsEnvironment(), diff --git a/presto-iceberg/src/test/java/com/facebook/presto/iceberg/rest/TestIcebergSmokeRestNestedNamespace.java b/presto-iceberg/src/test/java/com/facebook/presto/iceberg/rest/TestIcebergSmokeRestNestedNamespace.java index 1613bcfd9ba10..d651754bf1ff7 100644 --- a/presto-iceberg/src/test/java/com/facebook/presto/iceberg/rest/TestIcebergSmokeRestNestedNamespace.java +++ b/presto-iceberg/src/test/java/com/facebook/presto/iceberg/rest/TestIcebergSmokeRestNestedNamespace.java @@ -125,9 +125,9 @@ protected QueryRunner createQueryRunner() // additional catalog for testing nested namespace disabled icebergQueryRunner.createCatalog(ICEBERG_NESTED_NAMESPACE_DISABLED_CATALOG, "iceberg", new ImmutableMap.Builder() - .putAll(restConnectorProperties) - .put("iceberg.rest.nested.namespace.enabled", "false") - .build()); + .putAll(restConnectorProperties) + .put("iceberg.rest.nested.namespace.enabled", "false") + .build()); return icebergQueryRunner; }