This is an automated email from the ASF dual-hosted git repository.

chengchengjin 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 1e5a7c9a6 [VL] Fix arrow dataset csv scan IncompatibleClassChangeError 
(#6785)
1e5a7c9a6 is described below

commit 1e5a7c9a66aa58f3247d45a678be83bb6831ff77
Author: Jin Chengcheng <[email protected]>
AuthorDate: Tue Aug 13 14:39:25 2024 +0800

    [VL] Fix arrow dataset csv scan IncompatibleClassChangeError (#6785)
---
 gluten-data/pom.xml       |  6 +++---
 gluten-ut/spark32/pom.xml | 40 +---------------------------------------
 gluten-ut/spark33/pom.xml | 38 --------------------------------------
 gluten-ut/spark34/pom.xml | 38 --------------------------------------
 gluten-ut/spark35/pom.xml | 38 --------------------------------------
 gluten-ut/test/pom.xml    | 40 +---------------------------------------
 6 files changed, 5 insertions(+), 195 deletions(-)

diff --git a/gluten-data/pom.xml b/gluten-data/pom.xml
index ffb56db43..bca3143cf 100644
--- a/gluten-data/pom.xml
+++ b/gluten-data/pom.xml
@@ -87,13 +87,13 @@
     <dependency>
       <groupId>org.apache.arrow</groupId>
       <artifactId>${arrow-memory.artifact}</artifactId>
-      <version>${arrow.version}</version>
+      <version>${arrow-gluten.version}</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.arrow</groupId>
       <artifactId>arrow-memory-core</artifactId>
-      <version>${arrow.version}</version>
+      <version>${arrow-gluten.version}</version>
       <scope>compile</scope>
       <exclusions>
         <exclusion>
@@ -109,7 +109,7 @@
     <dependency>
       <groupId>org.apache.arrow</groupId>
       <artifactId>arrow-vector</artifactId>
-      <version>${arrow.version}</version>
+      <version>${arrow-gluten.version}</version>
       <exclusions>
         <exclusion>
           <groupId>io.netty</groupId>
diff --git a/gluten-ut/spark32/pom.xml b/gluten-ut/spark32/pom.xml
index 4784ac74f..4de49a556 100644
--- a/gluten-ut/spark32/pom.xml
+++ b/gluten-ut/spark32/pom.xml
@@ -57,45 +57,7 @@
           <version>${project.version}</version>
           <scope>test</scope>
         </dependency>
-        <dependency>
-          <groupId>org.apache.arrow</groupId>
-          <artifactId>arrow-vector</artifactId>
-          <version>${arrow.version}</version>
-          <exclusions>
-            <exclusion>
-              <groupId>io.netty</groupId>
-              <artifactId>netty-common</artifactId>
-            </exclusion>
-            <exclusion>
-              <groupId>io.netty</groupId>
-              <artifactId>netty-buffer</artifactId>
-            </exclusion>
-          </exclusions>
-          <scope>test</scope>
-        </dependency>
-        <dependency>
-          <groupId>org.apache.arrow</groupId>
-          <artifactId>arrow-memory-netty</artifactId>
-          <version>${arrow.version}</version>
-          <scope>test</scope>
-        </dependency>
-        <dependency>
-          <groupId>org.apache.arrow</groupId>
-          <artifactId>arrow-memory-core</artifactId>
-          <version>${arrow.version}</version>
-          <scope>test</scope>
-          <exclusions>
-            <exclusion>
-              <groupId>io.netty</groupId>
-              <artifactId>netty-common</artifactId>
-            </exclusion>
-            <exclusion>
-              <groupId>io.netty</groupId>
-              <artifactId>netty-buffer</artifactId>
-            </exclusion>
-          </exclusions>
-        </dependency>
-      </dependencies>
+     </dependencies>
       <properties>
         <clickhouse.lib.path></clickhouse.lib.path>
       </properties>
diff --git a/gluten-ut/spark33/pom.xml b/gluten-ut/spark33/pom.xml
index 079cdf2d0..9251ebc8a 100644
--- a/gluten-ut/spark33/pom.xml
+++ b/gluten-ut/spark33/pom.xml
@@ -64,44 +64,6 @@
           <version>${project.version}</version>
           <scope>test</scope>
         </dependency>
-        <dependency>
-          <groupId>org.apache.arrow</groupId>
-          <artifactId>arrow-vector</artifactId>
-          <version>${arrow.version}</version>
-          <exclusions>
-            <exclusion>
-              <groupId>io.netty</groupId>
-              <artifactId>netty-common</artifactId>
-            </exclusion>
-            <exclusion>
-              <groupId>io.netty</groupId>
-              <artifactId>netty-buffer</artifactId>
-            </exclusion>
-          </exclusions>
-          <scope>test</scope>
-        </dependency>
-        <dependency>
-          <groupId>org.apache.arrow</groupId>
-          <artifactId>arrow-memory-netty</artifactId>
-          <version>${arrow.version}</version>
-          <scope>test</scope>
-        </dependency>
-        <dependency>
-          <groupId>org.apache.arrow</groupId>
-          <artifactId>arrow-memory-core</artifactId>
-          <version>${arrow.version}</version>
-          <scope>test</scope>
-          <exclusions>
-            <exclusion>
-              <groupId>io.netty</groupId>
-              <artifactId>netty-common</artifactId>
-            </exclusion>
-            <exclusion>
-              <groupId>io.netty</groupId>
-              <artifactId>netty-buffer</artifactId>
-            </exclusion>
-          </exclusions>
-        </dependency>
       </dependencies>
       <properties>
         <clickhouse.lib.path></clickhouse.lib.path>
diff --git a/gluten-ut/spark34/pom.xml b/gluten-ut/spark34/pom.xml
index 7edd7913e..a9a2f1c8a 100644
--- a/gluten-ut/spark34/pom.xml
+++ b/gluten-ut/spark34/pom.xml
@@ -64,44 +64,6 @@
           <version>${project.version}</version>
           <scope>test</scope>
         </dependency>
-        <dependency>
-          <groupId>org.apache.arrow</groupId>
-          <artifactId>arrow-vector</artifactId>
-          <version>${arrow.version}</version>
-          <exclusions>
-            <exclusion>
-              <groupId>io.netty</groupId>
-              <artifactId>netty-common</artifactId>
-            </exclusion>
-            <exclusion>
-              <groupId>io.netty</groupId>
-              <artifactId>netty-buffer</artifactId>
-            </exclusion>
-          </exclusions>
-          <scope>test</scope>
-        </dependency>
-        <dependency>
-          <groupId>org.apache.arrow</groupId>
-          <artifactId>arrow-memory-netty</artifactId>
-          <version>${arrow.version}</version>
-          <scope>test</scope>
-        </dependency>
-        <dependency>
-          <groupId>org.apache.arrow</groupId>
-          <artifactId>arrow-memory-core</artifactId>
-          <version>${arrow.version}</version>
-          <scope>test</scope>
-          <exclusions>
-            <exclusion>
-              <groupId>io.netty</groupId>
-              <artifactId>netty-common</artifactId>
-            </exclusion>
-            <exclusion>
-              <groupId>io.netty</groupId>
-              <artifactId>netty-buffer</artifactId>
-            </exclusion>
-          </exclusions>
-        </dependency>
         <!-- log4j -->
         <dependency>
           <groupId>org.slf4j</groupId>
diff --git a/gluten-ut/spark35/pom.xml b/gluten-ut/spark35/pom.xml
index 4dcb7de6d..f86db23e2 100644
--- a/gluten-ut/spark35/pom.xml
+++ b/gluten-ut/spark35/pom.xml
@@ -98,44 +98,6 @@
           <version>${project.version}</version>
           <scope>test</scope>
         </dependency>
-        <dependency>
-          <groupId>org.apache.arrow</groupId>
-          <artifactId>arrow-vector</artifactId>
-          <version>${arrow.version}</version>
-          <exclusions>
-            <exclusion>
-              <groupId>io.netty</groupId>
-              <artifactId>netty-common</artifactId>
-            </exclusion>
-            <exclusion>
-              <groupId>io.netty</groupId>
-              <artifactId>netty-buffer</artifactId>
-            </exclusion>
-          </exclusions>
-          <scope>test</scope>
-        </dependency>
-        <dependency>
-          <groupId>org.apache.arrow</groupId>
-          <artifactId>arrow-memory-netty</artifactId>
-          <version>${arrow.version}</version>
-          <scope>test</scope>
-        </dependency>
-        <dependency>
-          <groupId>org.apache.arrow</groupId>
-          <artifactId>arrow-memory-core</artifactId>
-          <version>${arrow.version}</version>
-          <scope>test</scope>
-          <exclusions>
-            <exclusion>
-              <groupId>io.netty</groupId>
-              <artifactId>netty-common</artifactId>
-            </exclusion>
-            <exclusion>
-              <groupId>io.netty</groupId>
-              <artifactId>netty-buffer</artifactId>
-            </exclusion>
-          </exclusions>
-        </dependency>
         <!-- log4j -->
         <dependency>
           <groupId>org.slf4j</groupId>
diff --git a/gluten-ut/test/pom.xml b/gluten-ut/test/pom.xml
index 52761e988..cdac91d6f 100644
--- a/gluten-ut/test/pom.xml
+++ b/gluten-ut/test/pom.xml
@@ -70,45 +70,7 @@
           <artifactId>backends-velox</artifactId>
           <version>${project.version}</version>
           <scope>test</scope>
-        </dependency>
-        <dependency>
-          <groupId>org.apache.arrow</groupId>
-          <artifactId>arrow-vector</artifactId>
-          <version>${arrow.version}</version>
-          <exclusions>
-            <exclusion>
-              <groupId>io.netty</groupId>
-              <artifactId>netty-common</artifactId>
-            </exclusion>
-            <exclusion>
-              <groupId>io.netty</groupId>
-              <artifactId>netty-buffer</artifactId>
-            </exclusion>
-          </exclusions>
-          <scope>test</scope>
-        </dependency>
-        <dependency>
-          <groupId>org.apache.arrow</groupId>
-          <artifactId>arrow-memory-netty</artifactId>
-          <version>${arrow.version}</version>
-          <scope>test</scope>
-        </dependency>
-        <dependency>
-          <groupId>org.apache.arrow</groupId>
-          <artifactId>arrow-memory-core</artifactId>
-          <version>${arrow.version}</version>
-          <scope>test</scope>
-          <exclusions>
-            <exclusion>
-              <groupId>io.netty</groupId>
-              <artifactId>netty-common</artifactId>
-            </exclusion>
-            <exclusion>
-              <groupId>io.netty</groupId>
-              <artifactId>netty-buffer</artifactId>
-            </exclusion>
-          </exclusions>
-        </dependency>
+        </dependency>       
       </dependencies>
       <properties>
         <clickhouse.lib.path></clickhouse.lib.path>


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to