diff --git a/spark/v3.4/spark/src/main/java/org/apache/iceberg/spark/source/metrics/InMemoryReadMetricReporter.java b/core/src/main/java/org/apache/iceberg/metrics/InMemoryReadMetricReporter.java similarity index 85% rename from spark/v3.4/spark/src/main/java/org/apache/iceberg/spark/source/metrics/InMemoryReadMetricReporter.java rename to core/src/main/java/org/apache/iceberg/metrics/InMemoryReadMetricReporter.java index 079e205dae37..9b4a73f53d82 100644 --- a/spark/v3.4/spark/src/main/java/org/apache/iceberg/spark/source/metrics/InMemoryReadMetricReporter.java +++ b/core/src/main/java/org/apache/iceberg/metrics/InMemoryReadMetricReporter.java @@ -16,11 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iceberg.spark.source.metrics; - -import org.apache.iceberg.metrics.MetricsReport; -import org.apache.iceberg.metrics.MetricsReporter; -import org.apache.iceberg.metrics.ScanReport; +package org.apache.iceberg.metrics; public class InMemoryReadMetricReporter implements MetricsReporter { diff --git a/spark/v3.4/spark/src/main/java/org/apache/iceberg/spark/source/SparkScan.java b/spark/v3.4/spark/src/main/java/org/apache/iceberg/spark/source/SparkScan.java index 44491c3e7d38..e6c4ee5a0a50 100644 --- a/spark/v3.4/spark/src/main/java/org/apache/iceberg/spark/source/SparkScan.java +++ b/spark/v3.4/spark/src/main/java/org/apache/iceberg/spark/source/SparkScan.java @@ -30,7 +30,6 @@ import org.apache.iceberg.Table; import org.apache.iceberg.expressions.Expression; import org.apache.iceberg.metrics.ScanReport; -import org.apache.iceberg.relocated.com.google.common.base.Preconditions; import org.apache.iceberg.relocated.com.google.common.collect.Lists; import org.apache.iceberg.spark.Spark3Util; import org.apache.iceberg.spark.SparkReadConf; diff --git a/spark/v3.4/spark/src/main/java/org/apache/iceberg/spark/source/SparkScanBuilder.java b/spark/v3.4/spark/src/main/java/org/apache/iceberg/spark/source/SparkScanBuilder.java index 5a0057d7d14a..13f3d59f9cd1 100644 --- a/spark/v3.4/spark/src/main/java/org/apache/iceberg/spark/source/SparkScanBuilder.java +++ b/spark/v3.4/spark/src/main/java/org/apache/iceberg/spark/source/SparkScanBuilder.java @@ -43,6 +43,7 @@ import org.apache.iceberg.expressions.ExpressionUtil; import org.apache.iceberg.expressions.Expressions; import org.apache.iceberg.io.CloseableIterable; +import org.apache.iceberg.metrics.InMemoryReadMetricReporter; import org.apache.iceberg.relocated.com.google.common.base.Preconditions; import org.apache.iceberg.relocated.com.google.common.collect.ImmutableList; import org.apache.iceberg.relocated.com.google.common.collect.Lists; @@ -52,7 +53,6 @@ import org.apache.iceberg.spark.SparkReadConf; import org.apache.iceberg.spark.SparkReadOptions; import org.apache.iceberg.spark.SparkSchemaUtil; -import org.apache.iceberg.spark.source.metrics.InMemoryReadMetricReporter; import org.apache.iceberg.types.Type; import org.apache.iceberg.types.TypeUtil; import org.apache.iceberg.types.Types; diff --git a/spark/v3.4/spark/src/main/java/org/apache/iceberg/spark/source/SparkStagedScanBuilder.java b/spark/v3.4/spark/src/main/java/org/apache/iceberg/spark/source/SparkStagedScanBuilder.java index 99e28724439b..ca4f75a7748e 100644 --- a/spark/v3.4/spark/src/main/java/org/apache/iceberg/spark/source/SparkStagedScanBuilder.java +++ b/spark/v3.4/spark/src/main/java/org/apache/iceberg/spark/source/SparkStagedScanBuilder.java @@ -19,8 +19,8 @@ package org.apache.iceberg.spark.source; import org.apache.iceberg.Table; +import org.apache.iceberg.metrics.InMemoryReadMetricReporter; import org.apache.iceberg.spark.SparkReadConf; -import org.apache.iceberg.spark.source.metrics.InMemoryReadMetricReporter; import org.apache.spark.sql.SparkSession; import org.apache.spark.sql.connector.read.Scan; import org.apache.spark.sql.connector.read.ScanBuilder;