Core: Make TableScanContext immutable (#5985)

Co-authored-by: Liwei Li <[email protected]>
apache · Apr 27, 2023 · 882459d · 882459d
1 parent bbacaf4
commit 882459d
Show file tree

Hide file tree

Showing 6 changed files with 98 additions and 297 deletions.
diff --git a/core/src/main/java/org/apache/iceberg/BaseIncrementalChangelogScan.java b/core/src/main/java/org/apache/iceberg/BaseIncrementalChangelogScan.java
@@ -39,7 +39,7 @@ class BaseIncrementalChangelogScan
     implements IncrementalChangelogScan {
 
   BaseIncrementalChangelogScan(Table table) {
-    this(table, table.schema(), new TableScanContext());
+    this(table, table.schema(), TableScanContext.empty());
   }
 
   private BaseIncrementalChangelogScan(Table table, Schema schema, TableScanContext context) {

diff --git a/core/src/main/java/org/apache/iceberg/BaseMetadataTableScan.java b/core/src/main/java/org/apache/iceberg/BaseMetadataTableScan.java
@@ -25,7 +25,7 @@ abstract class BaseMetadataTableScan extends BaseTableScan {
   private final MetadataTableType tableType;
 
   protected BaseMetadataTableScan(Table table, Schema schema, MetadataTableType tableType) {
-    super(table, schema, new TableScanContext());
+    super(table, schema, TableScanContext.empty());
     this.tableType = tableType;
   }
 

diff --git a/core/src/main/java/org/apache/iceberg/BaseTable.java b/core/src/main/java/org/apache/iceberg/BaseTable.java
@@ -70,13 +70,14 @@ public void refresh() {
 
   @Override
   public TableScan newScan() {
-    return new DataTableScan(this, schema(), new TableScanContext().reportWith(reporter));
+    return new DataTableScan(
+        this, schema(), ImmutableTableScanContext.builder().metricsReporter(reporter).build());
   }
 
   @Override
   public IncrementalAppendScan newIncrementalAppendScan() {
     return new BaseIncrementalAppendScan(
-        this, schema(), new TableScanContext().reportWith(reporter));
+        this, schema(), ImmutableTableScanContext.builder().metricsReporter(reporter).build());
   }
 
   @Override

diff --git a/core/src/main/java/org/apache/iceberg/PositionDeletesTable.java b/core/src/main/java/org/apache/iceberg/PositionDeletesTable.java
@@ -131,7 +131,7 @@ public static class PositionDeletesBatchScan
       extends SnapshotScan<BatchScan, ScanTask, ScanTaskGroup<ScanTask>> implements BatchScan {
 
     protected PositionDeletesBatchScan(Table table, Schema schema) {
-      super(table, schema, new TableScanContext());
+      super(table, schema, TableScanContext.empty());
     }
 
     protected PositionDeletesBatchScan(Table table, Schema schema, TableScanContext context) {