Skip to content

Commit

Permalink
[GLUTEN-7914][CORE] Flip dependency direction for gluten-celeborn (ap…
Browse files Browse the repository at this point in the history
  • Loading branch information
zhztheplayer authored Dec 17, 2024
1 parent 0598545 commit 6b0445a
Show file tree
Hide file tree
Showing 170 changed files with 145 additions and 470 deletions.
29 changes: 29 additions & 0 deletions backends-clickhouse/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,35 @@
<name>Gluten Backends ClickHouse</name>

<profiles>
<profile>
<id>celeborn</id>
<activation>
<activeByDefault>false</activeByDefault>
</activation>
<dependencies>
<dependency>
<groupId>org.apache.gluten</groupId>
<artifactId>gluten-celeborn</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.celeborn</groupId>
<artifactId>celeborn-client-spark-${spark.major.version}-shaded_${scala.binary.version}</artifactId>
<version>${celeborn.version}</version>
<scope>provided</scope>
<exclusions>
<exclusion>
<groupId>org.apache.celeborn</groupId>
<artifactId>celeborn-client-spark-${spark.major.version}_${scala.binary.version}</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.celeborn</groupId>
<artifactId>celeborn-spark-${spark.major.version}-columnar-shuffle_${scala.binary.version}</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
</profile>
<profile>
<id>iceberg</id>
<activation>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ class GlutenClickHouseRSSColumnarMemorySortShuffleSuite
override protected val tablesPath: String = basePath + "/tpch-data-ch"
override protected val tpchQueries: String = rootPath + "queries/tpch-queries-ch"
override protected val queriesResults: String =
rootPath + "../../../../../backends-clickhouse/src/test/resources/mergetree-queries-output"
rootPath + "../../../../backends-clickhouse/src/test/resources/mergetree-queries-output"

override protected val parquetTableDataPath: String =
"../../../../../gluten-core/src/test/resources/tpch-data"
"../../../../gluten-core/src/test/resources/tpch-data"

/** Run Gluten + ClickHouse Backend with ColumnarShuffleManager */
override protected def sparkConf: SparkConf = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@ class GlutenClickHouseRSSColumnarShuffleAQESuite
override protected val tablesPath: String = basePath + "/tpch-data-ch"
override protected val tpchQueries: String = rootPath + "queries/tpch-queries-ch"
override protected val queriesResults: String =
rootPath + "../../../../../backends-clickhouse/src/test/resources/mergetree-queries-output"
rootPath + "../../../../backends-clickhouse/src/test/resources/mergetree-queries-output"

override protected val parquetTableDataPath: String =
"../../../../../gluten-core/src/test/resources/tpch-data"
"../../../../gluten-core/src/test/resources/tpch-data"

/** Run Gluten + ClickHouse Backend with ColumnarShuffleManager */
override protected def sparkConf: SparkConf = {
Expand Down
29 changes: 29 additions & 0 deletions backends-velox/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,35 @@
<tagsToExclude>org.apache.gluten.tags.UDFTest</tagsToExclude>
</properties>
</profile>
<profile>
<id>celeborn</id>
<activation>
<activeByDefault>false</activeByDefault>
</activation>
<dependencies>
<dependency>
<groupId>org.apache.gluten</groupId>
<artifactId>gluten-celeborn</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.celeborn</groupId>
<artifactId>celeborn-client-spark-${spark.major.version}-shaded_${scala.binary.version}</artifactId>
<version>${celeborn.version}</version>
<scope>provided</scope>
<exclusions>
<exclusion>
<groupId>org.apache.celeborn</groupId>
<artifactId>celeborn-client-spark-${spark.major.version}_${scala.binary.version}</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.celeborn</groupId>
<artifactId>celeborn-spark-${spark.major.version}-columnar-shuffle_${scala.binary.version}</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
</profile>
<profile>
<id>iceberg</id>
<activation>
Expand Down
260 changes: 0 additions & 260 deletions gluten-celeborn/clickhouse/pom.xml

This file was deleted.

Loading

0 comments on commit 6b0445a

Please sign in to comment.