This is an automated email from the ASF dual-hosted git repository.
maruilei pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/auron.git
The following commit(s) were added to refs/heads/master by this push:
new a5ddb76f [AURON #1358] Rename package name for hadoop-shim module
(#1359)
a5ddb76f is described below
commit a5ddb76fb0cd6f43e1f537d41d48109e4f4b9a27
Author: zhangmang <[email protected]>
AuthorDate: Fri Sep 26 18:02:15 2025 +0800
[AURON #1358] Rename package name for hadoop-shim module (#1359)
* [AURON #1358] Rename package name for hadoop-shim module
* fix style
* fix test failed
---
.../{spark/auron => auron/hadoop/fs}/FSDataInputWrapper.scala | 2 +-
.../{spark/auron => auron/hadoop/fs}/FSDataOutputWrapper.scala | 2 +-
native-engine/auron-jni-bridge/src/jni_bridge.rs | 8 ++++----
.../src/main/java/org/apache/spark/sql/auron/JniBridge.java | 8 ++++----
4 files changed, 10 insertions(+), 10 deletions(-)
diff --git
a/hadoop-shim/src/main/scala/org/apache/spark/auron/FSDataInputWrapper.scala
b/hadoop-shim/src/main/scala/org/apache/auron/hadoop/fs/FSDataInputWrapper.scala
similarity index 98%
rename from
hadoop-shim/src/main/scala/org/apache/spark/auron/FSDataInputWrapper.scala
rename to
hadoop-shim/src/main/scala/org/apache/auron/hadoop/fs/FSDataInputWrapper.scala
index b96a31c4..a479fba6 100644
--- a/hadoop-shim/src/main/scala/org/apache/spark/auron/FSDataInputWrapper.scala
+++
b/hadoop-shim/src/main/scala/org/apache/auron/hadoop/fs/FSDataInputWrapper.scala
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.auron
+package org.apache.auron.hadoop.fs
import java.io.EOFException
import java.nio.ByteBuffer
diff --git
a/hadoop-shim/src/main/scala/org/apache/spark/auron/FSDataOutputWrapper.scala
b/hadoop-shim/src/main/scala/org/apache/auron/hadoop/fs/FSDataOutputWrapper.scala
similarity index 97%
rename from
hadoop-shim/src/main/scala/org/apache/spark/auron/FSDataOutputWrapper.scala
rename to
hadoop-shim/src/main/scala/org/apache/auron/hadoop/fs/FSDataOutputWrapper.scala
index bf80b79f..7574cbbf 100644
---
a/hadoop-shim/src/main/scala/org/apache/spark/auron/FSDataOutputWrapper.scala
+++
b/hadoop-shim/src/main/scala/org/apache/auron/hadoop/fs/FSDataOutputWrapper.scala
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.auron
+package org.apache.auron.hadoop.fs
import java.io.EOFException
import java.nio.ByteBuffer
diff --git a/native-engine/auron-jni-bridge/src/jni_bridge.rs
b/native-engine/auron-jni-bridge/src/jni_bridge.rs
index cc9ed819..30dda802 100644
--- a/native-engine/auron-jni-bridge/src/jni_bridge.rs
+++ b/native-engine/auron-jni-bridge/src/jni_bridge.rs
@@ -623,13 +623,13 @@ impl<'a> JniBridge<'a> {
method_openFileAsDataInputWrapper: env.get_static_method_id(
class,
"openFileAsDataInputWrapper",
-
"(Lorg/apache/hadoop/fs/FileSystem;Ljava/lang/String;)Lorg/apache/spark/auron/FSDataInputWrapper;",
+
"(Lorg/apache/hadoop/fs/FileSystem;Ljava/lang/String;)Lorg/apache/auron/hadoop/fs/FSDataInputWrapper;",
)?,
method_openFileAsDataInputWrapper_ret: ReturnType::Object,
method_createFileAsDataOutputWrapper: env.get_static_method_id(
class,
"createFileAsDataOutputWrapper",
-
"(Lorg/apache/hadoop/fs/FileSystem;Ljava/lang/String;)Lorg/apache/spark/auron/FSDataOutputWrapper;",
+
"(Lorg/apache/hadoop/fs/FileSystem;Ljava/lang/String;)Lorg/apache/auron/hadoop/fs/FSDataOutputWrapper;",
)?,
method_createFileAsDataOutputWrapper_ret: ReturnType::Object,
method_isDriverSide_ret: ReturnType::Primitive(Primitive::Boolean),
@@ -1583,7 +1583,7 @@ pub struct AuronFSDataInputWrapper<'a> {
}
impl<'a> AuronFSDataInputWrapper<'a> {
- pub const SIG_TYPE: &'static str =
"org/apache/spark/auron/FSDataInputWrapper";
+ pub const SIG_TYPE: &'static str =
"org/apache/auron/hadoop/fs/FSDataInputWrapper";
pub fn new(env: &JNIEnv<'a>) -> JniResult<AuronFSDataInputWrapper<'a>> {
let class = get_global_jclass(env, Self::SIG_TYPE)?;
@@ -1603,7 +1603,7 @@ pub struct AuronFSDataOutputWrapper<'a> {
}
impl<'a> AuronFSDataOutputWrapper<'a> {
- pub const SIG_TYPE: &'static str =
"org/apache/spark/auron/FSDataOutputWrapper";
+ pub const SIG_TYPE: &'static str =
"org/apache/auron/hadoop/fs/FSDataOutputWrapper";
pub fn new(env: &JNIEnv<'a>) -> JniResult<AuronFSDataOutputWrapper<'a>> {
let class = get_global_jclass(env, Self::SIG_TYPE)?;
diff --git
a/spark-extension/src/main/java/org/apache/spark/sql/auron/JniBridge.java
b/spark-extension/src/main/java/org/apache/spark/sql/auron/JniBridge.java
index 3df98c5d..9a2ac12b 100644
--- a/spark-extension/src/main/java/org/apache/spark/sql/auron/JniBridge.java
+++ b/spark-extension/src/main/java/org/apache/spark/sql/auron/JniBridge.java
@@ -21,15 +21,15 @@ import java.lang.management.ManagementFactory;
import java.net.URI;
import java.util.List;
import java.util.concurrent.ConcurrentHashMap;
+import org.apache.auron.hadoop.fs.FSDataInputWrapper;
+import org.apache.auron.hadoop.fs.FSDataInputWrapper$;
+import org.apache.auron.hadoop.fs.FSDataOutputWrapper;
+import org.apache.auron.hadoop.fs.FSDataOutputWrapper$;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.spark.SparkEnv;
import org.apache.spark.TaskContext;
import org.apache.spark.TaskContext$;
-import org.apache.spark.auron.FSDataInputWrapper;
-import org.apache.spark.auron.FSDataInputWrapper$;
-import org.apache.spark.auron.FSDataOutputWrapper;
-import org.apache.spark.auron.FSDataOutputWrapper$;
import org.apache.spark.sql.auron.memory.OnHeapSpillManager;
import org.apache.spark.sql.auron.memory.OnHeapSpillManager$;
import org.apache.spark.sql.auron.util.TaskContextHelper$;
