This is an automated email from the ASF dual-hosted git repository.
hongze pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-gluten.git
The following commit(s) were added to refs/heads/main by this push:
new d7e80426b [CORE] Rename OASPackageBridges (#7022)
d7e80426b is described below
commit d7e80426bfbdaca81bdde0b49d8e07c43cb751c3
Author: Hongze Zhang <[email protected]>
AuthorDate: Tue Aug 27 13:38:58 2024 +0800
[CORE] Rename OASPackageBridges (#7022)
---
.../scala/org/apache/gluten/backendsapi/clickhouse/CHIteratorApi.scala | 2 +-
.../main/scala/org/apache/gluten/metrics/BatchScanMetricsUpdater.scala | 2 +-
.../scala/org/apache/gluten/metrics/FileSourceScanMetricsUpdater.scala | 2 +-
.../scala/org/apache/gluten/metrics/HiveTableScanMetricsUpdater.scala | 2 +-
.../scala/org/apache/gluten/backendsapi/velox/VeloxIteratorApi.scala | 2 +-
.../src/main/scala/org/apache/gluten/backendsapi/IteratorApi.scala | 2 +-
.../org/apache/gluten/execution/GlutenWholeStageColumnarRDD.scala | 2 +-
.../src/main/scala/org/apache/gluten/metrics/MetricsUpdater.scala | 2 +-
.../sql/utils/{OASPackageBridge.scala => SparkInputMetricsUtil.scala} | 2 +-
.../main/java/org/apache/gluten/vectorized/JniByteInputStreams.java | 3 ++-
.../main/scala/org/apache/gluten/metrics/BatchScanMetricsUpdater.scala | 2 +-
.../scala/org/apache/gluten/metrics/FileSourceScanMetricsUpdater.scala | 2 +-
.../scala/org/apache/gluten/metrics/HiveTableScanMetricsUpdater.scala | 2 +-
.../storage/{OASPackageBridge.scala => SparkInputStreamUtil.scala} | 2 +-
14 files changed, 15 insertions(+), 14 deletions(-)
diff --git
a/backends-clickhouse/src/main/scala/org/apache/gluten/backendsapi/clickhouse/CHIteratorApi.scala
b/backends-clickhouse/src/main/scala/org/apache/gluten/backendsapi/clickhouse/CHIteratorApi.scala
index c77d57262..1b66fbaed 100644
---
a/backends-clickhouse/src/main/scala/org/apache/gluten/backendsapi/clickhouse/CHIteratorApi.scala
+++
b/backends-clickhouse/src/main/scala/org/apache/gluten/backendsapi/clickhouse/CHIteratorApi.scala
@@ -37,7 +37,7 @@ import org.apache.spark.sql.connector.read.InputPartition
import org.apache.spark.sql.execution.datasources.FilePartition
import org.apache.spark.sql.execution.metric.SQLMetric
import org.apache.spark.sql.types.{StructField, StructType}
-import org.apache.spark.sql.utils.OASPackageBridge.InputMetricsWrapper
+import org.apache.spark.sql.utils.SparkInputMetricsUtil.InputMetricsWrapper
import org.apache.spark.sql.vectorized.ColumnarBatch
import java.lang.{Long => JLong}
diff --git
a/backends-clickhouse/src/main/scala/org/apache/gluten/metrics/BatchScanMetricsUpdater.scala
b/backends-clickhouse/src/main/scala/org/apache/gluten/metrics/BatchScanMetricsUpdater.scala
index 2ee6e271d..1b9389351 100644
---
a/backends-clickhouse/src/main/scala/org/apache/gluten/metrics/BatchScanMetricsUpdater.scala
+++
b/backends-clickhouse/src/main/scala/org/apache/gluten/metrics/BatchScanMetricsUpdater.scala
@@ -17,7 +17,7 @@
package org.apache.gluten.metrics
import org.apache.spark.sql.execution.metric.SQLMetric
-import org.apache.spark.sql.utils.OASPackageBridge.InputMetricsWrapper
+import org.apache.spark.sql.utils.SparkInputMetricsUtil.InputMetricsWrapper
class BatchScanMetricsUpdater(@transient val metrics: Map[String, SQLMetric])
extends MetricsUpdater {
diff --git
a/backends-clickhouse/src/main/scala/org/apache/gluten/metrics/FileSourceScanMetricsUpdater.scala
b/backends-clickhouse/src/main/scala/org/apache/gluten/metrics/FileSourceScanMetricsUpdater.scala
index 4dcae8feb..437194873 100644
---
a/backends-clickhouse/src/main/scala/org/apache/gluten/metrics/FileSourceScanMetricsUpdater.scala
+++
b/backends-clickhouse/src/main/scala/org/apache/gluten/metrics/FileSourceScanMetricsUpdater.scala
@@ -17,7 +17,7 @@
package org.apache.gluten.metrics
import org.apache.spark.sql.execution.metric.SQLMetric
-import org.apache.spark.sql.utils.OASPackageBridge.InputMetricsWrapper
+import org.apache.spark.sql.utils.SparkInputMetricsUtil.InputMetricsWrapper
/**
* Note: "val metrics" is made transient to avoid sending driver-side metrics
to tasks, e.g.
diff --git
a/backends-clickhouse/src/main/scala/org/apache/gluten/metrics/HiveTableScanMetricsUpdater.scala
b/backends-clickhouse/src/main/scala/org/apache/gluten/metrics/HiveTableScanMetricsUpdater.scala
index 85e110987..a2af0fcde 100644
---
a/backends-clickhouse/src/main/scala/org/apache/gluten/metrics/HiveTableScanMetricsUpdater.scala
+++
b/backends-clickhouse/src/main/scala/org/apache/gluten/metrics/HiveTableScanMetricsUpdater.scala
@@ -17,7 +17,7 @@
package org.apache.gluten.metrics
import org.apache.spark.sql.execution.metric.SQLMetric
-import org.apache.spark.sql.utils.OASPackageBridge.InputMetricsWrapper
+import org.apache.spark.sql.utils.SparkInputMetricsUtil.InputMetricsWrapper
class HiveTableScanMetricsUpdater(@transient val metrics: Map[String,
SQLMetric])
extends MetricsUpdater {
diff --git
a/backends-velox/src/main/scala/org/apache/gluten/backendsapi/velox/VeloxIteratorApi.scala
b/backends-velox/src/main/scala/org/apache/gluten/backendsapi/velox/VeloxIteratorApi.scala
index d8355e1c4..7cf02f28d 100644
---
a/backends-velox/src/main/scala/org/apache/gluten/backendsapi/velox/VeloxIteratorApi.scala
+++
b/backends-velox/src/main/scala/org/apache/gluten/backendsapi/velox/VeloxIteratorApi.scala
@@ -37,7 +37,7 @@ import org.apache.spark.sql.connector.read.InputPartition
import org.apache.spark.sql.execution.datasources.{FilePartition,
PartitionedFile}
import org.apache.spark.sql.execution.metric.SQLMetric
import org.apache.spark.sql.types._
-import org.apache.spark.sql.utils.OASPackageBridge.InputMetricsWrapper
+import org.apache.spark.sql.utils.SparkInputMetricsUtil.InputMetricsWrapper
import org.apache.spark.sql.vectorized.ColumnarBatch
import org.apache.spark.util.ExecutorManager
diff --git
a/gluten-core/src/main/scala/org/apache/gluten/backendsapi/IteratorApi.scala
b/gluten-core/src/main/scala/org/apache/gluten/backendsapi/IteratorApi.scala
index b78064973..11211bd0d 100644
--- a/gluten-core/src/main/scala/org/apache/gluten/backendsapi/IteratorApi.scala
+++ b/gluten-core/src/main/scala/org/apache/gluten/backendsapi/IteratorApi.scala
@@ -27,7 +27,7 @@ import org.apache.spark._
import org.apache.spark.sql.connector.read.InputPartition
import org.apache.spark.sql.execution.metric.SQLMetric
import org.apache.spark.sql.types.StructType
-import org.apache.spark.sql.utils.OASPackageBridge.InputMetricsWrapper
+import org.apache.spark.sql.utils.SparkInputMetricsUtil.InputMetricsWrapper
import org.apache.spark.sql.vectorized.ColumnarBatch
trait IteratorApi {
diff --git
a/gluten-core/src/main/scala/org/apache/gluten/execution/GlutenWholeStageColumnarRDD.scala
b/gluten-core/src/main/scala/org/apache/gluten/execution/GlutenWholeStageColumnarRDD.scala
index 25293e918..de5fc85f3 100644
---
a/gluten-core/src/main/scala/org/apache/gluten/execution/GlutenWholeStageColumnarRDD.scala
+++
b/gluten-core/src/main/scala/org/apache/gluten/execution/GlutenWholeStageColumnarRDD.scala
@@ -25,7 +25,7 @@ import org.apache.spark.rdd.RDD
import org.apache.spark.sql.connector.read.InputPartition
import org.apache.spark.sql.execution.InputFileBlockHolderProxy
import org.apache.spark.sql.execution.metric.SQLMetric
-import org.apache.spark.sql.utils.OASPackageBridge.InputMetricsWrapper
+import org.apache.spark.sql.utils.SparkInputMetricsUtil.InputMetricsWrapper
import org.apache.spark.sql.vectorized.ColumnarBatch
import org.apache.spark.util.ExecutorManager
diff --git
a/gluten-core/src/main/scala/org/apache/gluten/metrics/MetricsUpdater.scala
b/gluten-core/src/main/scala/org/apache/gluten/metrics/MetricsUpdater.scala
index 5201df3b3..633bc404b 100644
--- a/gluten-core/src/main/scala/org/apache/gluten/metrics/MetricsUpdater.scala
+++ b/gluten-core/src/main/scala/org/apache/gluten/metrics/MetricsUpdater.scala
@@ -16,7 +16,7 @@
*/
package org.apache.gluten.metrics
-import org.apache.spark.sql.utils.OASPackageBridge.InputMetricsWrapper
+import org.apache.spark.sql.utils.SparkInputMetricsUtil.InputMetricsWrapper
/**
* A minimized controller for updating operator's metrics, which means it
never persists the
diff --git
a/gluten-core/src/main/scala/org/apache/spark/sql/utils/OASPackageBridge.scala
b/gluten-core/src/main/scala/org/apache/spark/sql/utils/SparkInputMetricsUtil.scala
similarity index 97%
rename from
gluten-core/src/main/scala/org/apache/spark/sql/utils/OASPackageBridge.scala
rename to
gluten-core/src/main/scala/org/apache/spark/sql/utils/SparkInputMetricsUtil.scala
index a318f79cd..8a8366d3e 100644
---
a/gluten-core/src/main/scala/org/apache/spark/sql/utils/OASPackageBridge.scala
+++
b/gluten-core/src/main/scala/org/apache/spark/sql/utils/SparkInputMetricsUtil.scala
@@ -19,7 +19,7 @@ package org.apache.spark.sql.utils
import org.apache.spark.executor.InputMetrics
/** Bridge to package org.apache.spark. */
-object OASPackageBridge {
+object SparkInputMetricsUtil {
implicit class InputMetricsWrapper(val m: InputMetrics) {
def bridgeIncBytesRead(v: Long): Unit = {
m.incBytesRead(v)
diff --git
a/gluten-data/src/main/java/org/apache/gluten/vectorized/JniByteInputStreams.java
b/gluten-data/src/main/java/org/apache/gluten/vectorized/JniByteInputStreams.java
index 5c404b040..0749d0cff 100644
---
a/gluten-data/src/main/java/org/apache/gluten/vectorized/JniByteInputStreams.java
+++
b/gluten-data/src/main/java/org/apache/gluten/vectorized/JniByteInputStreams.java
@@ -60,7 +60,8 @@ public final class JniByteInputStreams {
InputStream unwrapped = in;
if (unwrapped instanceof BufferReleasingInputStream) {
final BufferReleasingInputStream brin = (BufferReleasingInputStream)
unwrapped;
- unwrapped =
org.apache.spark.storage.OASPackageBridge.unwrapBufferReleasingInputStream(brin);
+ unwrapped =
+
org.apache.spark.storage.SparkInputStreamUtil.unwrapBufferReleasingInputStream(brin);
}
if (unwrapped instanceof CheckedInputStream) {
final CheckedInputStream cin = (CheckedInputStream) unwrapped;
diff --git
a/gluten-data/src/main/scala/org/apache/gluten/metrics/BatchScanMetricsUpdater.scala
b/gluten-data/src/main/scala/org/apache/gluten/metrics/BatchScanMetricsUpdater.scala
index 0d4dd7fb1..16eabedfd 100644
---
a/gluten-data/src/main/scala/org/apache/gluten/metrics/BatchScanMetricsUpdater.scala
+++
b/gluten-data/src/main/scala/org/apache/gluten/metrics/BatchScanMetricsUpdater.scala
@@ -17,7 +17,7 @@
package org.apache.gluten.metrics
import org.apache.spark.sql.execution.metric.SQLMetric
-import org.apache.spark.sql.utils.OASPackageBridge.InputMetricsWrapper
+import org.apache.spark.sql.utils.SparkInputMetricsUtil.InputMetricsWrapper
class BatchScanMetricsUpdater(val metrics: Map[String, SQLMetric]) extends
MetricsUpdater {
diff --git
a/gluten-data/src/main/scala/org/apache/gluten/metrics/FileSourceScanMetricsUpdater.scala
b/gluten-data/src/main/scala/org/apache/gluten/metrics/FileSourceScanMetricsUpdater.scala
index d961c28cf..f76d97d30 100644
---
a/gluten-data/src/main/scala/org/apache/gluten/metrics/FileSourceScanMetricsUpdater.scala
+++
b/gluten-data/src/main/scala/org/apache/gluten/metrics/FileSourceScanMetricsUpdater.scala
@@ -17,7 +17,7 @@
package org.apache.gluten.metrics
import org.apache.spark.sql.execution.metric.SQLMetric
-import org.apache.spark.sql.utils.OASPackageBridge.InputMetricsWrapper
+import org.apache.spark.sql.utils.SparkInputMetricsUtil.InputMetricsWrapper
/**
* Note: "val metrics" is made transient to avoid sending driver-side metrics
to tasks, e.g.
diff --git
a/gluten-data/src/main/scala/org/apache/gluten/metrics/HiveTableScanMetricsUpdater.scala
b/gluten-data/src/main/scala/org/apache/gluten/metrics/HiveTableScanMetricsUpdater.scala
index f4adcc5cf..00ef8d2b6 100644
---
a/gluten-data/src/main/scala/org/apache/gluten/metrics/HiveTableScanMetricsUpdater.scala
+++
b/gluten-data/src/main/scala/org/apache/gluten/metrics/HiveTableScanMetricsUpdater.scala
@@ -17,7 +17,7 @@
package org.apache.gluten.metrics
import org.apache.spark.sql.execution.metric.SQLMetric
-import org.apache.spark.sql.utils.OASPackageBridge.InputMetricsWrapper
+import org.apache.spark.sql.utils.SparkInputMetricsUtil.InputMetricsWrapper
class HiveTableScanMetricsUpdater(@transient val metrics: Map[String,
SQLMetric])
extends MetricsUpdater {
diff --git
a/gluten-data/src/main/scala/org/apache/spark/storage/OASPackageBridge.scala
b/gluten-data/src/main/scala/org/apache/spark/storage/SparkInputStreamUtil.scala
similarity index 97%
rename from
gluten-data/src/main/scala/org/apache/spark/storage/OASPackageBridge.scala
rename to
gluten-data/src/main/scala/org/apache/spark/storage/SparkInputStreamUtil.scala
index cf9ba1e61..a1df83400 100644
--- a/gluten-data/src/main/scala/org/apache/spark/storage/OASPackageBridge.scala
+++
b/gluten-data/src/main/scala/org/apache/spark/storage/SparkInputStreamUtil.scala
@@ -18,7 +18,7 @@ package org.apache.spark.storage
import java.io.InputStream
-object OASPackageBridge {
+object SparkInputStreamUtil {
def unwrapBufferReleasingInputStream(in: BufferReleasingInputStream):
InputStream = {
in.delegate
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
