Skip to content

Commit b85d8e6

Browse files
refactor names
1 parent b6dde60 commit b85d8e6

File tree

3 files changed

+16
-16
lines changed

3 files changed

+16
-16
lines changed

core/src/main/java/org/apache/iceberg/RestTable.java renamed to core/src/main/java/org/apache/iceberg/RESTTable.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,15 @@
2525
import org.apache.iceberg.rest.RESTClient;
2626
import org.apache.iceberg.rest.ResourcePaths;
2727

28-
public class RestTable extends BaseTable {
28+
public class RESTTable extends BaseTable {
2929
private final RESTClient client;
3030
private final String path;
3131
private final Supplier<Map<String, String>> headers;
3232
private final MetricsReporter reporter;
3333
private final ResourcePaths resourcePaths;
3434
private final TableIdentifier tableIdentifier;
3535

36-
public RestTable(
36+
public RESTTable(
3737
TableOperations ops,
3838
String name,
3939
MetricsReporter reporter,
@@ -57,7 +57,7 @@ public TableScan newScan() {
5757
// correct snapshotId to use for point in time cases. When looking at spark
5858
// it seems it follows similar approach, see class SparkDistributedDataScan
5959

60-
return new RestTableScan(
60+
return new RESTTableScan(
6161
this,
6262
schema(),
6363
ImmutableTableScanContext.builder().metricsReporter(reporter).build(),

core/src/main/java/org/apache/iceberg/RestTableScan.java renamed to core/src/main/java/org/apache/iceberg/RESTTableScan.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
import org.apache.iceberg.types.Types;
3737
import org.apache.iceberg.util.ParallelIterable;
3838

39-
class RestTableScan extends DataTableScan {
39+
class RESTTableScan extends DataTableScan {
4040
private final RESTClient client;
4141
private final String path;
4242
private final Supplier<Map<String, String>> headers;
@@ -48,7 +48,7 @@ class RestTableScan extends DataTableScan {
4848
// TODO revisit if this property should be configurable
4949
private static final int FETCH_PLANNING_SLEEP_DURATION_MS = 1000;
5050

51-
RestTableScan(
51+
RESTTableScan(
5252
Table table,
5353
Schema schema,
5454
TableScanContext context,
@@ -71,7 +71,7 @@ class RestTableScan extends DataTableScan {
7171
@Override
7272
protected TableScan newRefinedScan(
7373
Table refinedTable, Schema refinedSchema, TableScanContext refinedContext) {
74-
return new RestTableScan(
74+
return new RESTTableScan(
7575
refinedTable,
7676
refinedSchema,
7777
refinedContext,

core/src/main/java/org/apache/iceberg/rest/RESTSessionCatalog.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
import org.apache.iceberg.MetadataTableUtils;
3737
import org.apache.iceberg.MetadataUpdate;
3838
import org.apache.iceberg.PartitionSpec;
39-
import org.apache.iceberg.RestTable;
39+
import org.apache.iceberg.RESTTable;
4040
import org.apache.iceberg.Schema;
4141
import org.apache.iceberg.SortOrder;
4242
import org.apache.iceberg.Table;
@@ -259,10 +259,10 @@ public void initialize(String name, Map<String, String> unresolved) {
259259
this.reporter = CatalogUtil.loadMetricsReporter(mergedProps);
260260

261261
this.reportingViaRestEnabled =
262-
PropertyUtil.propertyAsBoolean(
263-
mergedProps,
264-
RESTCatalogProperties.METRICS_REPORTING_ENABLED,
265-
RESTCatalogProperties.METRICS_REPORTING_ENABLED_DEFAULT);
262+
PropertyUtil.propertyAsBoolean(
263+
mergedProps,
264+
RESTCatalogProperties.METRICS_REPORTING_ENABLED,
265+
RESTCatalogProperties.METRICS_REPORTING_ENABLED_DEFAULT);
266266
this.restServerPlanningEnabled =
267267
PropertyUtil.propertyAsBoolean(mergedProps, REST_SERVER_PLANNING_ENABLED, false);
268268
super.initialize(name, mergedProps);
@@ -469,7 +469,7 @@ public Table loadTable(SessionContext context, TableIdentifier identifier) {
469469

470470
trackFileIO(ops);
471471

472-
RestTable restTable = tableSupportsRemoteScanPlanning(ops, finalIdentifier, tableClient);
472+
RESTTable restTable = tableSupportsRemoteScanPlanning(ops, finalIdentifier, tableClient);
473473
if (restTable != null) {
474474
return restTable;
475475
}
@@ -486,13 +486,13 @@ public Table loadTable(SessionContext context, TableIdentifier identifier) {
486486
return table;
487487
}
488488

489-
private RestTable tableSupportsRemoteScanPlanning(
489+
private RESTTable tableSupportsRemoteScanPlanning(
490490
TableOperations ops, TableIdentifier finalIdentifier, RESTClient restClient) {
491491
if (ops.current().properties().containsKey(REST_TABLE_SCAN_PLANNING_PROPERTY)) {
492492
boolean tableSupportsRemotePlanning =
493493
ops.current().propertyAsBoolean(REST_TABLE_SCAN_PLANNING_PROPERTY, false);
494494
if (tableSupportsRemotePlanning && restServerPlanningEnabled) {
495-
return new RestTable(
495+
return new RESTTable(
496496
ops,
497497
fullTableName(finalIdentifier),
498498
metricsReporter(paths.metrics(finalIdentifier), restClient),
@@ -573,7 +573,7 @@ public Table registerTable(
573573

574574
trackFileIO(ops);
575575

576-
RestTable restTable = tableSupportsRemoteScanPlanning(ops, ident, tableClient);
576+
RESTTable restTable = tableSupportsRemoteScanPlanning(ops, ident, tableClient);
577577
if (restTable != null) {
578578
return restTable;
579579
}
@@ -837,7 +837,7 @@ public Table create() {
837837

838838
trackFileIO(ops);
839839

840-
RestTable restTable = tableSupportsRemoteScanPlanning(ops, ident, tableClient);
840+
RESTTable restTable = tableSupportsRemoteScanPlanning(ops, ident, tableClient);
841841
if (restTable != null) {
842842
return restTable;
843843
}

0 commit comments

Comments
 (0)