Skip to content

Commit 4a07851

Browse files
ZacBlancoZacBlanco
committed
Fix style and tests
1 parent 2826a04 commit 4a07851

9 files changed

+58
-45
lines changed

‎presto-iceberg/src/main/java/com/facebook/presto/iceberg/IcebergAbstractMetadata.java

-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@
6868
import com.google.common.collect.ImmutableSet;
6969
import com.google.common.collect.Maps;
7070
import io.airlift.slice.Slice;
71-
import io.airlift.units.DataSize;
7271
import org.apache.hadoop.fs.Path;
7372
import org.apache.iceberg.AppendFiles;
7473
import org.apache.iceberg.BaseTable;

‎presto-iceberg/src/main/java/com/facebook/presto/iceberg/IcebergTableProperties.java

-5
Original file line numberDiff line numberDiff line change
@@ -16,23 +16,18 @@
1616
import com.facebook.presto.common.type.ArrayType;
1717
import com.facebook.presto.spi.session.PropertyMetadata;
1818
import com.google.common.collect.ImmutableList;
19-
import io.airlift.units.DataSize;
2019
import org.apache.iceberg.RowLevelOperationMode;
2120
import org.apache.iceberg.TableProperties;
2221

2322
import javax.inject.Inject;
2423

25-
import java.lang.reflect.AccessibleObject;
26-
import java.util.Arrays;
2724
import java.util.Collection;
2825
import java.util.List;
2926
import java.util.Map;
30-
import java.util.Set;
3127

3228
import static com.facebook.presto.common.type.VarcharType.VARCHAR;
3329
import static com.facebook.presto.common.type.VarcharType.createUnboundedVarcharType;
3430
import static com.facebook.presto.spi.session.PropertyMetadata.booleanProperty;
35-
import static com.facebook.presto.spi.session.PropertyMetadata.dataSizeProperty;
3631
import static com.facebook.presto.spi.session.PropertyMetadata.integerProperty;
3732
import static com.facebook.presto.spi.session.PropertyMetadata.longProperty;
3833
import static com.facebook.presto.spi.session.PropertyMetadata.stringProperty;

‎presto-iceberg/src/main/java/com/facebook/presto/iceberg/IcebergUtil.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,6 @@
132132
import static com.facebook.presto.iceberg.ExpressionConverter.toIcebergExpression;
133133
import static com.facebook.presto.iceberg.FileContent.POSITION_DELETES;
134134
import static com.facebook.presto.iceberg.FileContent.fromIcebergFileContent;
135-
import static com.facebook.presto.iceberg.FileFormat.PARQUET;
136135
import static com.facebook.presto.iceberg.IcebergColumnHandle.DATA_SEQUENCE_NUMBER_COLUMN_HANDLE;
137136
import static com.facebook.presto.iceberg.IcebergColumnHandle.PATH_COLUMN_HANDLE;
138137
import static com.facebook.presto.iceberg.IcebergErrorCode.ICEBERG_INVALID_FORMAT_VERSION;
@@ -1269,7 +1268,8 @@ public static String dataLocation(Table icebergTable)
12691268
return dataLocation;
12701269
}
12711270

1272-
public static Long getSplitSize(Table table) {
1271+
public static Long getSplitSize(Table table)
1272+
{
12731273
return Long.parseLong(table.properties()
12741274
.getOrDefault(SPLIT_SIZE,
12751275
String.valueOf(SPLIT_SIZE_DEFAULT)));

‎presto-iceberg/src/test/java/com/facebook/presto/iceberg/IcebergDistributedSmokeTestBase.java

+20-10
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,8 @@ public void testShowCreateTable()
146146
" location = '%s',\n" +
147147
" metadata_delete_after_commit = false,\n" +
148148
" metadata_previous_versions_max = 100,\n" +
149-
" metrics_max_inferred_column = 100\n" +
149+
" metrics_max_inferred_column = 100,\n" +
150+
" \"read.split.target-size\" = 134217728\n" +
150151
")", schemaName, getLocation(schemaName, "orders")));
151152
}
152153

@@ -427,7 +428,8 @@ protected void testCreatePartitionedTableAs(Session session, FileFormat fileForm
427428
" metadata_delete_after_commit = false,\n" +
428429
" metadata_previous_versions_max = 100,\n" +
429430
" metrics_max_inferred_column = 100,\n" +
430-
" partitioning = ARRAY['order_status','ship_priority','bucket(order_key, 9)']\n" +
431+
" partitioning = ARRAY['order_status','ship_priority','bucket(order_key, 9)'],\n" +
432+
" \"read.split.target-size\" = 134217728\n" +
431433
")",
432434
getSession().getCatalog().get(),
433435
getSession().getSchema().get(),
@@ -630,7 +632,8 @@ public void testTableComments()
630632
" location = '%s',\n" +
631633
" metadata_delete_after_commit = false,\n" +
632634
" metadata_previous_versions_max = 100,\n" +
633-
" metrics_max_inferred_column = 100\n" +
635+
" metrics_max_inferred_column = 100,\n" +
636+
" \"read.split.target-size\" = 134217728\n" +
634637
")";
635638
String createTableSql = format(createTableTemplate, schemaName, "test table comment", getLocation(schemaName, "test_table_comments"));
636639

@@ -722,7 +725,8 @@ private void testCreateTableLike()
722725
" metadata_delete_after_commit = false,\n" +
723726
" metadata_previous_versions_max = 100,\n" +
724727
" metrics_max_inferred_column = 100,\n" +
725-
" partitioning = ARRAY['adate']\n" +
728+
" partitioning = ARRAY['adate'],\n" +
729+
" \"read.split.target-size\" = 134217728\n" +
726730
")", getLocation(schemaName, "test_create_table_like_original")));
727731

728732
assertUpdate(session, "CREATE TABLE test_create_table_like_copy0 (LIKE test_create_table_like_original, col2 INTEGER)");
@@ -738,7 +742,8 @@ private void testCreateTableLike()
738742
" location = '%s',\n" +
739743
" metadata_delete_after_commit = false,\n" +
740744
" metadata_previous_versions_max = 100,\n" +
741-
" metrics_max_inferred_column = 100\n" +
745+
" metrics_max_inferred_column = 100,\n" +
746+
" \"read.split.target-size\" = 134217728\n" +
742747
")", getLocation(schemaName, "test_create_table_like_copy1")));
743748
dropTable(session, "test_create_table_like_copy1");
744749

@@ -750,7 +755,8 @@ private void testCreateTableLike()
750755
" location = '%s',\n" +
751756
" metadata_delete_after_commit = false,\n" +
752757
" metadata_previous_versions_max = 100,\n" +
753-
" metrics_max_inferred_column = 100\n" +
758+
" metrics_max_inferred_column = 100,\n" +
759+
" \"read.split.target-size\" = 134217728\n" +
754760
")", getLocation(schemaName, "test_create_table_like_copy2")));
755761
dropTable(session, "test_create_table_like_copy2");
756762

@@ -764,7 +770,8 @@ private void testCreateTableLike()
764770
" metadata_delete_after_commit = false,\n" +
765771
" metadata_previous_versions_max = 100,\n" +
766772
" metrics_max_inferred_column = 100,\n" +
767-
" partitioning = ARRAY['adate']\n" +
773+
" partitioning = ARRAY['adate'],\n" +
774+
" \"read.split.target-size\" = 134217728\n" +
768775
")",
769776
getLocation(schemaName, "test_create_table_like_original")));
770777
dropTable(session, "test_create_table_like_copy3");
@@ -778,7 +785,8 @@ private void testCreateTableLike()
778785
" metadata_delete_after_commit = false,\n" +
779786
" metadata_previous_versions_max = 100,\n" +
780787
" metrics_max_inferred_column = 100,\n" +
781-
" partitioning = ARRAY['adate']\n" +
788+
" partitioning = ARRAY['adate'],\n" +
789+
" \"read.split.target-size\" = 134217728\n" +
782790
")",
783791
getLocation(schemaName, "test_create_table_like_original")));
784792
dropTable(session, "test_create_table_like_copy4");
@@ -794,7 +802,8 @@ private void testCreateTableLike()
794802
" metadata_delete_after_commit = false,\n" +
795803
" metadata_previous_versions_max = 100,\n" +
796804
" metrics_max_inferred_column = 100,\n" +
797-
" partitioning = ARRAY['adate']\n" +
805+
" partitioning = ARRAY['adate'],\n" +
806+
" \"read.split.target-size\" = 134217728\n" +
798807
")",
799808
getLocation(schemaName, "test_create_table_like_copy5")));
800809
dropTable(session, "test_create_table_like_copy5");
@@ -841,7 +850,8 @@ protected void testCreateTableWithFormatVersion(String formatVersion, String def
841850
" location = '%s',\n" +
842851
" metadata_delete_after_commit = false,\n" +
843852
" metadata_previous_versions_max = 100,\n" +
844-
" metrics_max_inferred_column = 100\n" +
853+
" metrics_max_inferred_column = 100,\n" +
854+
" \"read.split.target-size\" = 134217728\n" +
845855
")",
846856
getSession().getCatalog().get(),
847857
getSession().getSchema().get(),

‎presto-iceberg/src/test/java/com/facebook/presto/iceberg/TestIcebergSplitManager.java

-4
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616
import com.facebook.presto.Session;
1717
import com.facebook.presto.common.transaction.TransactionId;
1818
import com.facebook.presto.execution.Lifespan;
19-
import com.facebook.presto.execution.ScheduledSplit;
20-
import com.facebook.presto.metadata.Split;
2119
import com.facebook.presto.spi.TableHandle;
2220
import com.facebook.presto.spi.WarningCollector;
2321
import com.facebook.presto.spi.connector.ConnectorSplitManager.SplitSchedulingStrategy;
@@ -31,7 +29,6 @@
3129
import com.facebook.presto.testing.QueryRunner;
3230
import com.facebook.presto.tests.AbstractTestQueryFramework;
3331
import com.facebook.presto.transaction.TransactionManager;
34-
import com.google.common.collect.ImmutableList;
3532
import com.google.common.collect.ImmutableMap;
3633
import org.apache.iceberg.TableProperties;
3734
import org.testng.annotations.Test;
@@ -48,7 +45,6 @@
4845
import static com.facebook.presto.iceberg.IcebergSessionProperties.TARGET_SPLIT_SIZE;
4946
import static com.facebook.presto.spi.connector.NotPartitionedPartitionHandle.NOT_PARTITIONED;
5047
import static org.testng.Assert.assertEquals;
51-
import static org.testng.Assert.assertNotEquals;
5248
import static org.testng.Assert.assertNotNull;
5349
import static org.testng.Assert.assertTrue;
5450
import static org.testng.Assert.fail;

‎presto-iceberg/src/test/java/com/facebook/presto/iceberg/TestIcebergSystemTables.java

+11-6
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import com.facebook.presto.tests.DistributedQueryRunner;
2424
import com.facebook.presto.transaction.TransactionManager;
2525
import com.google.common.collect.ImmutableMap;
26+
import io.airlift.units.DataSize;
2627
import org.testng.annotations.AfterClass;
2728
import org.testng.annotations.BeforeClass;
2829
import org.testng.annotations.Test;
@@ -258,11 +259,11 @@ protected void checkTableProperties(String tableName, String deleteMode)
258259
{
259260
assertQuery(String.format("SHOW COLUMNS FROM test_schema.\"%s$properties\"", tableName),
260261
"VALUES ('key', 'varchar', '', '')," + "('value', 'varchar', '', '')");
261-
assertQuery(String.format("SELECT COUNT(*) FROM test_schema.\"%s$properties\"", tableName), "VALUES 7");
262+
assertQuery(String.format("SELECT COUNT(*) FROM test_schema.\"%s$properties\"", tableName), "VALUES 8");
262263
List<MaterializedRow> materializedRows = computeActual(getSession(),
263264
String.format("SELECT * FROM test_schema.\"%s$properties\"", tableName)).getMaterializedRows();
264265

265-
assertThat(materializedRows).hasSize(7);
266+
assertThat(materializedRows).hasSize(8);
266267
assertThat(materializedRows)
267268
.anySatisfy(row -> assertThat(row)
268269
.isEqualTo(new MaterializedRow(MaterializedResult.DEFAULT_PRECISION, "write.delete.mode", deleteMode)))
@@ -277,18 +278,20 @@ protected void checkTableProperties(String tableName, String deleteMode)
277278
.anySatisfy(row -> assertThat(row)
278279
.isEqualTo(new MaterializedRow(MaterializedResult.DEFAULT_PRECISION, "write.metadata.delete-after-commit.enabled", "false")))
279280
.anySatisfy(row -> assertThat(row)
280-
.isEqualTo(new MaterializedRow(MaterializedResult.DEFAULT_PRECISION, "write.metadata.metrics.max-inferred-column-defaults", "100")));
281+
.isEqualTo(new MaterializedRow(MaterializedResult.DEFAULT_PRECISION, "write.metadata.metrics.max-inferred-column-defaults", "100")))
282+
.anySatisfy(row -> assertThat(row)
283+
.isEqualTo(new MaterializedRow(MaterializedResult.DEFAULT_PRECISION, IcebergTableProperties.TARGET_SPLIT_SIZE, Long.toString(DataSize.valueOf("128MB").toBytes()))));
281284
}
282285

283286
protected void checkORCFormatTableProperties(String tableName, String deleteMode)
284287
{
285288
assertQuery(String.format("SHOW COLUMNS FROM test_schema.\"%s$properties\"", tableName),
286289
"VALUES ('key', 'varchar', '', '')," + "('value', 'varchar', '', '')");
287-
assertQuery(String.format("SELECT COUNT(*) FROM test_schema.\"%s$properties\"", tableName), "VALUES 8");
290+
assertQuery(String.format("SELECT COUNT(*) FROM test_schema.\"%s$properties\"", tableName), "VALUES 9");
288291
List<MaterializedRow> materializedRows = computeActual(getSession(),
289292
String.format("SELECT * FROM test_schema.\"%s$properties\"", tableName)).getMaterializedRows();
290293

291-
assertThat(materializedRows).hasSize(8);
294+
assertThat(materializedRows).hasSize(9);
292295
assertThat(materializedRows)
293296
.anySatisfy(row -> assertThat(row)
294297
.isEqualTo(new MaterializedRow(MaterializedResult.DEFAULT_PRECISION, "write.delete.mode", deleteMode)))
@@ -305,7 +308,9 @@ protected void checkORCFormatTableProperties(String tableName, String deleteMode
305308
.anySatisfy(row -> assertThat(row)
306309
.isEqualTo(new MaterializedRow(MaterializedResult.DEFAULT_PRECISION, "write.metadata.delete-after-commit.enabled", "false")))
307310
.anySatisfy(row -> assertThat(row)
308-
.isEqualTo(new MaterializedRow(MaterializedResult.DEFAULT_PRECISION, "write.metadata.metrics.max-inferred-column-defaults", "100")));
311+
.isEqualTo(new MaterializedRow(MaterializedResult.DEFAULT_PRECISION, "write.metadata.metrics.max-inferred-column-defaults", "100")))
312+
.anySatisfy(row -> assertThat(row)
313+
.isEqualTo(new MaterializedRow(MaterializedResult.DEFAULT_PRECISION, IcebergTableProperties.TARGET_SPLIT_SIZE, Long.toString(DataSize.valueOf("128MB").toBytes()))));
309314
}
310315

311316
@Test

‎presto-iceberg/src/test/java/com/facebook/presto/iceberg/nessie/TestIcebergSystemTablesNessie.java

+9-5
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,15 @@
1616
import com.facebook.presto.Session;
1717
import com.facebook.presto.iceberg.IcebergConfig;
1818
import com.facebook.presto.iceberg.IcebergPlugin;
19+
import com.facebook.presto.iceberg.IcebergTableProperties;
1920
import com.facebook.presto.iceberg.TestIcebergSystemTables;
2021
import com.facebook.presto.testing.MaterializedResult;
2122
import com.facebook.presto.testing.MaterializedRow;
2223
import com.facebook.presto.testing.QueryRunner;
2324
import com.facebook.presto.testing.containers.NessieContainer;
2425
import com.facebook.presto.tests.DistributedQueryRunner;
2526
import com.google.common.collect.ImmutableMap;
27+
import io.airlift.units.DataSize;
2628
import org.testng.annotations.AfterClass;
2729
import org.testng.annotations.BeforeClass;
2830

@@ -89,11 +91,11 @@ protected void checkTableProperties(String tableName, String deleteMode)
8991
{
9092
assertQuery(String.format("SHOW COLUMNS FROM test_schema.\"%s$properties\"", tableName),
9193
"VALUES ('key', 'varchar', '', '')," + "('value', 'varchar', '', '')");
92-
assertQuery(String.format("SELECT COUNT(*) FROM test_schema.\"%s$properties\"", tableName), "VALUES 9");
94+
assertQuery(String.format("SELECT COUNT(*) FROM test_schema.\"%s$properties\"", tableName), "VALUES 10");
9395
List<MaterializedRow> materializedRows = computeActual(getSession(),
9496
String.format("SELECT * FROM test_schema.\"%s$properties\"", tableName)).getMaterializedRows();
9597

96-
assertThat(materializedRows).hasSize(9);
98+
assertThat(materializedRows).hasSize(10);
9799
assertThat(materializedRows)
98100
.anySatisfy(row -> assertThat(row)
99101
.isEqualTo(new MaterializedRow(MaterializedResult.DEFAULT_PRECISION, "write.delete.mode", deleteMode)))
@@ -110,19 +112,21 @@ protected void checkTableProperties(String tableName, String deleteMode)
110112
.anySatisfy(row -> assertThat(row)
111113
.isEqualTo(new MaterializedRow(MaterializedResult.DEFAULT_PRECISION, "write.metadata.previous-versions-max", "100")))
112114
.anySatisfy(row -> assertThat(row)
113-
.isEqualTo(new MaterializedRow(MaterializedResult.DEFAULT_PRECISION, "write.metadata.metrics.max-inferred-column-defaults", "100")));
115+
.isEqualTo(new MaterializedRow(MaterializedResult.DEFAULT_PRECISION, "write.metadata.metrics.max-inferred-column-defaults", "100")))
116+
.anySatisfy(row -> assertThat(row)
117+
.isEqualTo(new MaterializedRow(MaterializedResult.DEFAULT_PRECISION, IcebergTableProperties.TARGET_SPLIT_SIZE, Long.toString(DataSize.valueOf("128MB").toBytes()))));
114118
}
115119

116120
@Override
117121
protected void checkORCFormatTableProperties(String tableName, String deleteMode)
118122
{
119123
assertQuery(String.format("SHOW COLUMNS FROM test_schema.\"%s$properties\"", tableName),
120124
"VALUES ('key', 'varchar', '', '')," + "('value', 'varchar', '', '')");
121-
assertQuery(String.format("SELECT COUNT(*) FROM test_schema.\"%s$properties\"", tableName), "VALUES 10");
125+
assertQuery(String.format("SELECT COUNT(*) FROM test_schema.\"%s$properties\"", tableName), "VALUES 11");
122126
List<MaterializedRow> materializedRows = computeActual(getSession(),
123127
String.format("SELECT * FROM test_schema.\"%s$properties\"", tableName)).getMaterializedRows();
124128

125-
assertThat(materializedRows).hasSize(10);
129+
assertThat(materializedRows).hasSize(11);
126130
assertThat(materializedRows)
127131
.anySatisfy(row -> assertThat(row)
128132
.isEqualTo(new MaterializedRow(MaterializedResult.DEFAULT_PRECISION, "write.delete.mode", deleteMode)))

0 commit comments

Comments
 (0)