This is an automated email from the ASF dual-hosted git repository.
viirya pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/datafusion-comet.git
The following commit(s) were added to refs/heads/main by this push:
new ef94c55 build: Move shim directories (#318)
ef94c55 is described below
commit ef94c554a2907b25ba99f23dbbfb0990cdf2d16c
Author: KAZUYUKI TANIMURA <[email protected]>
AuthorDate: Wed Apr 24 23:30:06 2024 -0700
build: Move shim directories (#318)
---
common/pom.xml | 18 ++++++++++++++++++
.../org/apache/comet/shims/ShimBatchReader.scala | 0
.../org/apache/comet/shims/ShimFileFormat.scala | 0
.../apache/comet/shims/ShimResolveDefaultColumns.scala | 0
pom.xml | 1 +
spark/pom.xml | 12 ++++++++++++
.../apache/comet/shims/ShimCometBatchScanExec.scala | 0
.../comet/shims/ShimCometBroadcastExchangeExec.scala | 0
.../comet/shims/ShimCometBroadcastHashJoinExec.scala | 0
.../org/apache/comet/shims/ShimCometScanExec.scala | 0
.../comet/shims/ShimCometShuffleExchangeExec.scala | 0
.../comet/shims/ShimCometSparkSessionExtensions.scala | 0
.../shims/ShimCometTakeOrderedAndProjectExec.scala | 0
.../org/apache/comet/shims/ShimQueryPlanSerde.scala | 0
.../org/apache/comet/shims/ShimSQLConf.scala | 0
15 files changed, 31 insertions(+)
diff --git a/common/pom.xml b/common/pom.xml
index 5757351..540101d 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -167,6 +167,24 @@ under the License.
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>add-shim-source</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>add-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+ <source>src/main/${shims.source}</source>
+ </sources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
<resources>
<resource>
diff --git a/common/src/main/scala/org/apache/comet/shims/ShimBatchReader.scala
b/common/src/main/spark-3.x/org/apache/comet/shims/ShimBatchReader.scala
similarity index 100%
rename from common/src/main/scala/org/apache/comet/shims/ShimBatchReader.scala
rename to common/src/main/spark-3.x/org/apache/comet/shims/ShimBatchReader.scala
diff --git a/common/src/main/scala/org/apache/comet/shims/ShimFileFormat.scala
b/common/src/main/spark-3.x/org/apache/comet/shims/ShimFileFormat.scala
similarity index 100%
rename from common/src/main/scala/org/apache/comet/shims/ShimFileFormat.scala
rename to common/src/main/spark-3.x/org/apache/comet/shims/ShimFileFormat.scala
diff --git
a/common/src/main/scala/org/apache/comet/shims/ShimResolveDefaultColumns.scala
b/common/src/main/spark-3.x/org/apache/comet/shims/ShimResolveDefaultColumns.scala
similarity index 100%
rename from
common/src/main/scala/org/apache/comet/shims/ShimResolveDefaultColumns.scala
rename to
common/src/main/spark-3.x/org/apache/comet/shims/ShimResolveDefaultColumns.scala
diff --git a/pom.xml b/pom.xml
index dd0ccc6..6d28c81 100644
--- a/pom.xml
+++ b/pom.xml
@@ -88,6 +88,7 @@ under the License.
<argLine>-ea -Xmx4g -Xss4m ${extraJavaTestArgs}</argLine>
<additional.3_3.test.source>spark-3.3-plus</additional.3_3.test.source>
<additional.3_4.test.source>spark-3.4</additional.3_4.test.source>
+ <shims.source>spark-3.x</shims.source>
</properties>
<dependencyManagement>
diff --git a/spark/pom.xml b/spark/pom.xml
index e0be7c6..66ff829 100644
--- a/spark/pom.xml
+++ b/spark/pom.xml
@@ -250,6 +250,18 @@ under the License.
</sources>
</configuration>
</execution>
+ <execution>
+ <id>add-shim-source</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>add-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+ <source>src/main/${shims.source}</source>
+ </sources>
+ </configuration>
+ </execution>
</executions>
</plugin>
</plugins>
diff --git
a/spark/src/main/scala/org/apache/comet/shims/ShimCometBatchScanExec.scala
b/spark/src/main/spark-3.x/org/apache/comet/shims/ShimCometBatchScanExec.scala
similarity index 100%
rename from
spark/src/main/scala/org/apache/comet/shims/ShimCometBatchScanExec.scala
rename to
spark/src/main/spark-3.x/org/apache/comet/shims/ShimCometBatchScanExec.scala
diff --git
a/spark/src/main/scala/org/apache/comet/shims/ShimCometBroadcastExchangeExec.scala
b/spark/src/main/spark-3.x/org/apache/comet/shims/ShimCometBroadcastExchangeExec.scala
similarity index 100%
rename from
spark/src/main/scala/org/apache/comet/shims/ShimCometBroadcastExchangeExec.scala
rename to
spark/src/main/spark-3.x/org/apache/comet/shims/ShimCometBroadcastExchangeExec.scala
diff --git
a/spark/src/main/scala/org/apache/comet/shims/ShimCometBroadcastHashJoinExec.scala
b/spark/src/main/spark-3.x/org/apache/comet/shims/ShimCometBroadcastHashJoinExec.scala
similarity index 100%
rename from
spark/src/main/scala/org/apache/comet/shims/ShimCometBroadcastHashJoinExec.scala
rename to
spark/src/main/spark-3.x/org/apache/comet/shims/ShimCometBroadcastHashJoinExec.scala
diff --git
a/spark/src/main/scala/org/apache/comet/shims/ShimCometScanExec.scala
b/spark/src/main/spark-3.x/org/apache/comet/shims/ShimCometScanExec.scala
similarity index 100%
rename from spark/src/main/scala/org/apache/comet/shims/ShimCometScanExec.scala
rename to
spark/src/main/spark-3.x/org/apache/comet/shims/ShimCometScanExec.scala
diff --git
a/spark/src/main/scala/org/apache/comet/shims/ShimCometShuffleExchangeExec.scala
b/spark/src/main/spark-3.x/org/apache/comet/shims/ShimCometShuffleExchangeExec.scala
similarity index 100%
rename from
spark/src/main/scala/org/apache/comet/shims/ShimCometShuffleExchangeExec.scala
rename to
spark/src/main/spark-3.x/org/apache/comet/shims/ShimCometShuffleExchangeExec.scala
diff --git
a/spark/src/main/scala/org/apache/comet/shims/ShimCometSparkSessionExtensions.scala
b/spark/src/main/spark-3.x/org/apache/comet/shims/ShimCometSparkSessionExtensions.scala
similarity index 100%
rename from
spark/src/main/scala/org/apache/comet/shims/ShimCometSparkSessionExtensions.scala
rename to
spark/src/main/spark-3.x/org/apache/comet/shims/ShimCometSparkSessionExtensions.scala
diff --git
a/spark/src/main/scala/org/apache/comet/shims/ShimCometTakeOrderedAndProjectExec.scala
b/spark/src/main/spark-3.x/org/apache/comet/shims/ShimCometTakeOrderedAndProjectExec.scala
similarity index 100%
rename from
spark/src/main/scala/org/apache/comet/shims/ShimCometTakeOrderedAndProjectExec.scala
rename to
spark/src/main/spark-3.x/org/apache/comet/shims/ShimCometTakeOrderedAndProjectExec.scala
diff --git
a/spark/src/main/scala/org/apache/comet/shims/ShimQueryPlanSerde.scala
b/spark/src/main/spark-3.x/org/apache/comet/shims/ShimQueryPlanSerde.scala
similarity index 100%
rename from spark/src/main/scala/org/apache/comet/shims/ShimQueryPlanSerde.scala
rename to
spark/src/main/spark-3.x/org/apache/comet/shims/ShimQueryPlanSerde.scala
diff --git a/spark/src/main/scala/org/apache/comet/shims/ShimSQLConf.scala
b/spark/src/main/spark-3.x/org/apache/comet/shims/ShimSQLConf.scala
similarity index 100%
rename from spark/src/main/scala/org/apache/comet/shims/ShimSQLConf.scala
rename to spark/src/main/spark-3.x/org/apache/comet/shims/ShimSQLConf.scala
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
