Merge branch 'main' into 2024_12_15

apache · Dec 16, 2024 · 6f1ef57 · 6f1ef57
2 parents 0afc171 + 1b581c7
commit 6f1ef57
Show file tree

Hide file tree

Showing 112 changed files with 397 additions and 232 deletions.
diff --git a/backends-clickhouse/pom.xml b/backends-clickhouse/pom.xml
@@ -38,47 +38,6 @@
           <scope>test</scope>
         </dependency>
       </dependencies>
-      <build>
-        <resources>
-          <resource>
-            <directory>${project.basedir}/src/main-iceberg/resource</directory>
-          </resource>
-        </resources>
-        <plugins>
-          <plugin>
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>build-helper-maven-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>add-iceberg-sources</id>
-                <phase>generate-sources</phase>
-                <goals>
-                  <goal>add-source</goal>
-                </goals>
-                <configuration>
-                  <sources>
-                    <source>${project.basedir}/src/main-iceberg/scala</source>
-                    <source>${project.basedir}/src/main-iceberg/java</source>
-                  </sources>
-                </configuration>
-              </execution>
-              <execution>
-                <id>add-iceberg-test-sources</id>
-                <phase>generate-test-sources</phase>
-                <goals>
-                  <goal>add-test-source</goal>
-                </goals>
-                <configuration>
-                  <sources>
-                    <source>${project.basedir}/src/test-iceberg/scala</source>
-                    <source>${project.basedir}/src/test-iceberg/java</source>
-                  </sources>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
     </profile>
   </profiles>
 
@@ -323,11 +282,6 @@
   </dependencies>
 
   <build>
-    <resources>
-      <resource>
-        <directory>${project.basedir}/src/main/resources</directory>
-      </resource>
-    </resources>
     <outputDirectory>target/scala-${scala.binary.version}/classes</outputDirectory>
     <testOutputDirectory>target/scala-${scala.binary.version}/test-classes</testOutputDirectory>
     <plugins>
@@ -353,6 +307,27 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-enforcer-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>enforce-delta-profile</id>
+            <goals>
+              <goal>enforce</goal>
+            </goals>
+            <configuration>
+              <rules>
+                <requireActiveProfile>
+                  <!--ClickHouse backend requires -P delta to be set-->
+                  <profiles>delta</profiles>
+                  <message>"-P delta" must be set when building Gluten with ClickHouse backend.</message>
+                </requireActiveProfile>
+              </rules>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-resources-plugin</artifactId>
@@ -436,15 +411,15 @@
             <includes>
               <include>src/main/scala/**/*.scala</include>
               <include>src/test/scala/**/*.scala</include>
-              <include>src/main/delta-${delta.binary.version}/**/*.scala</include>
-              <include>src/test/delta-${delta.binary.version}/**/*.scala</include>
+              <include>src-delta-${delta.binary.version}/main/delta/**/*.scala</include>
+              <include>src-delta-${delta.binary.version}/test/delta/**/*.scala</include>
             </includes>
             <excludes>
-              <exclude>src/main/delta-${delta.binary.version}/org/apache/spark/sql/delta/commands/*.scala</exclude>
-              <exclude>src/main/delta-${delta.binary.version}/org/apache/spark/sql/delta/commands/merge/*.scala</exclude>
-              <exclude>src/main/delta-${delta.binary.version}/org/apache/spark/sql/delta/stats/*.scala</exclude>
-              <exclude>src/main/delta-${delta.binary.version}/org/apache/spark/sql/delta/DeltaLog.scala</exclude>
-              <exclude>src/main/delta-${delta.binary.version}/org/apache/spark/sql/delta/Snapshot.scala</exclude>
+              <exclude>src-delta-${delta.binary.version}/main/delta/org/apache/spark/sql/delta/commands/*.scala</exclude>
+              <exclude>src-delta-${delta.binary.version}/main/delta/org/apache/spark/sql/delta/commands/merge/*.scala</exclude>
+              <exclude>src-delta-${delta.binary.version}/main/delta/org/apache/spark/sql/delta/stats/*.scala</exclude>
+              <exclude>src-delta-${delta.binary.version}/main/delta/org/apache/spark/sql/delta/DeltaLog.scala</exclude>
+              <exclude>src-delta-${delta.binary.version}/main/delta/org/apache/spark/sql/delta/Snapshot.scala</exclude>
             </excludes>
           </scala>
         </configuration>
@@ -484,36 +459,6 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>build-helper-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>add-sources</id>
-            <phase>generate-sources</phase>
-            <goals>
-              <goal>add-source</goal>
-            </goals>
-            <configuration>
-              <sources>
-                <source>src/main/delta-${delta.binary.version}</source>
-              </sources>
-            </configuration>
-          </execution>
-          <execution>
-          <id>add-test-sources</id>
-          <phase>generate-test-sources</phase>
-          <goals>
-            <goal>add-test-source</goal>
-          </goals>
-          <configuration>
-            <sources>
-              <source>src/test/delta-${delta.binary.version}</source>
-            </sources>
-          </configuration>
-        </execution>
-        </executions>
-      </plugin>
       <plugin>
         <groupId>org.antlr</groupId>
         <artifactId>antlr4-maven-plugin</artifactId>

diff --git a/...-20/io/delta/tables/ClickhouseTable.scala → ...ala/io/delta/tables/ClickhouseTable.scala b/...-20/io/delta/tables/ClickhouseTable.scala → ...ala/io/delta/tables/ClickhouseTable.scala
diff --git a/...en/parser/GlutenCacheFilesSqlParser.scala → ...en/parser/GlutenCacheFilesSqlParser.scala b/...en/parser/GlutenCacheFilesSqlParser.scala → ...en/parser/GlutenCacheFilesSqlParser.scala
diff --git a/...en/parser/GlutenClickhouseSqlParser.scala → ...en/parser/GlutenClickhouseSqlParser.scala b/...en/parser/GlutenClickhouseSqlParser.scala → ...en/parser/GlutenClickhouseSqlParser.scala
diff --git a/...lta/ClickhouseOptimisticTransaction.scala → ...lta/ClickhouseOptimisticTransaction.scala b/...lta/ClickhouseOptimisticTransaction.scala → ...lta/ClickhouseOptimisticTransaction.scala
diff --git a/...apache/spark/sql/delta/DeltaAdapter.scala → ...apache/spark/sql/delta/DeltaAdapter.scala b/...apache/spark/sql/delta/DeltaAdapter.scala → ...apache/spark/sql/delta/DeltaAdapter.scala
diff --git a/...org/apache/spark/sql/delta/DeltaLog.scala → ...org/apache/spark/sql/delta/DeltaLog.scala b/...org/apache/spark/sql/delta/DeltaLog.scala → ...org/apache/spark/sql/delta/DeltaLog.scala
diff --git a/...org/apache/spark/sql/delta/Snapshot.scala → ...org/apache/spark/sql/delta/Snapshot.scala b/...org/apache/spark/sql/delta/Snapshot.scala → ...org/apache/spark/sql/delta/Snapshot.scala
diff --git a/...sql/delta/catalog/ClickHouseTableV2.scala → ...sql/delta/catalog/ClickHouseTableV2.scala b/...sql/delta/catalog/ClickHouseTableV2.scala → ...sql/delta/catalog/ClickHouseTableV2.scala
diff --git a/...rk/sql/delta/commands/DeleteCommand.scala → ...rk/sql/delta/commands/DeleteCommand.scala b/...rk/sql/delta/commands/DeleteCommand.scala → ...rk/sql/delta/commands/DeleteCommand.scala
diff --git a/...sql/delta/commands/MergeIntoCommand.scala → ...sql/delta/commands/MergeIntoCommand.scala b/...sql/delta/commands/MergeIntoCommand.scala → ...sql/delta/commands/MergeIntoCommand.scala
diff --git a/...delta/commands/OptimizeTableCommand.scala → ...delta/commands/OptimizeTableCommand.scala b/...delta/commands/OptimizeTableCommand.scala → ...delta/commands/OptimizeTableCommand.scala
diff --git a/...ands/OptimizeTableCommandOverwrites.scala → ...ands/OptimizeTableCommandOverwrites.scala b/...ands/OptimizeTableCommandOverwrites.scala → ...ands/OptimizeTableCommandOverwrites.scala
diff --git a/...rk/sql/delta/commands/UpdateCommand.scala → ...rk/sql/delta/commands/UpdateCommand.scala b/...rk/sql/delta/commands/UpdateCommand.scala → ...rk/sql/delta/commands/UpdateCommand.scala
diff --git a/...rk/sql/delta/commands/VacuumCommand.scala → ...rk/sql/delta/commands/VacuumCommand.scala b/...rk/sql/delta/commands/VacuumCommand.scala → ...rk/sql/delta/commands/VacuumCommand.scala
diff --git a/...iles/MergeTreeDelayedCommitProtocol.scala → ...iles/MergeTreeDelayedCommitProtocol.scala b/...iles/MergeTreeDelayedCommitProtocol.scala → ...iles/MergeTreeDelayedCommitProtocol.scala
diff --git a/...es/CHOptimizeMetadataOnlyDeltaQuery.scala → ...es/CHOptimizeMetadataOnlyDeltaQuery.scala b/...es/CHOptimizeMetadataOnlyDeltaQuery.scala → ...es/CHOptimizeMetadataOnlyDeltaQuery.scala
diff --git a/.../sql/execution/CHDeltaColumnarWrite.scala → .../sql/execution/CHDeltaColumnarWrite.scala b/.../sql/execution/CHDeltaColumnarWrite.scala → .../sql/execution/CHDeltaColumnarWrite.scala
diff --git a/.../v2/clickhouse/ClickHouseDataSource.scala → .../v2/clickhouse/ClickHouseDataSource.scala b/.../v2/clickhouse/ClickHouseDataSource.scala → .../v2/clickhouse/ClickHouseDataSource.scala
diff --git a/...2/clickhouse/ClickHouseSparkCatalog.scala → ...2/clickhouse/ClickHouseSparkCatalog.scala b/...2/clickhouse/ClickHouseSparkCatalog.scala → ...2/clickhouse/ClickHouseSparkCatalog.scala
diff --git a/...use/source/DeltaMergeTreeFileFormat.scala → ...use/source/DeltaMergeTreeFileFormat.scala b/...use/source/DeltaMergeTreeFileFormat.scala → ...use/source/DeltaMergeTreeFileFormat.scala
diff --git a/.../spark/gluten/delta/DeltaStatsUtils.scala → .../spark/gluten/delta/DeltaStatsUtils.scala b/.../spark/gluten/delta/DeltaStatsUtils.scala → .../spark/gluten/delta/DeltaStatsUtils.scala
diff --git a/...-23/io/delta/tables/ClickhouseTable.scala → ...ala/io/delta/tables/ClickhouseTable.scala b/...-23/io/delta/tables/ClickhouseTable.scala → ...ala/io/delta/tables/ClickhouseTable.scala
diff --git a/...en/parser/GlutenCacheFilesSqlParser.scala → ...en/parser/GlutenCacheFilesSqlParser.scala b/...en/parser/GlutenCacheFilesSqlParser.scala → ...en/parser/GlutenCacheFilesSqlParser.scala
diff --git a/...en/parser/GlutenClickhouseSqlParser.scala → ...en/parser/GlutenClickhouseSqlParser.scala b/...en/parser/GlutenClickhouseSqlParser.scala → ...en/parser/GlutenClickhouseSqlParser.scala
diff --git a/...lta/ClickhouseOptimisticTransaction.scala → ...lta/ClickhouseOptimisticTransaction.scala b/...lta/ClickhouseOptimisticTransaction.scala → ...lta/ClickhouseOptimisticTransaction.scala
diff --git a/...apache/spark/sql/delta/DeltaAdapter.scala → ...apache/spark/sql/delta/DeltaAdapter.scala b/...apache/spark/sql/delta/DeltaAdapter.scala → ...apache/spark/sql/delta/DeltaAdapter.scala
diff --git a/...org/apache/spark/sql/delta/DeltaLog.scala → ...org/apache/spark/sql/delta/DeltaLog.scala b/...org/apache/spark/sql/delta/DeltaLog.scala → ...org/apache/spark/sql/delta/DeltaLog.scala
diff --git a/...org/apache/spark/sql/delta/Snapshot.scala → ...org/apache/spark/sql/delta/Snapshot.scala b/...org/apache/spark/sql/delta/Snapshot.scala → ...org/apache/spark/sql/delta/Snapshot.scala
diff --git a/...sql/delta/catalog/ClickHouseTableV2.scala → ...sql/delta/catalog/ClickHouseTableV2.scala b/...sql/delta/catalog/ClickHouseTableV2.scala → ...sql/delta/catalog/ClickHouseTableV2.scala
diff --git a/...rk/sql/delta/commands/DeleteCommand.scala → ...rk/sql/delta/commands/DeleteCommand.scala b/...rk/sql/delta/commands/DeleteCommand.scala → ...rk/sql/delta/commands/DeleteCommand.scala
diff --git a/...sql/delta/commands/MergeIntoCommand.scala → ...sql/delta/commands/MergeIntoCommand.scala b/...sql/delta/commands/MergeIntoCommand.scala → ...sql/delta/commands/MergeIntoCommand.scala
diff --git a/...delta/commands/OptimizeTableCommand.scala → ...delta/commands/OptimizeTableCommand.scala b/...delta/commands/OptimizeTableCommand.scala → ...delta/commands/OptimizeTableCommand.scala
diff --git a/...ands/OptimizeTableCommandOverwrites.scala → ...ands/OptimizeTableCommandOverwrites.scala b/...ands/OptimizeTableCommandOverwrites.scala → ...ands/OptimizeTableCommandOverwrites.scala
diff --git a/...rk/sql/delta/commands/UpdateCommand.scala → ...rk/sql/delta/commands/UpdateCommand.scala b/...rk/sql/delta/commands/UpdateCommand.scala → ...rk/sql/delta/commands/UpdateCommand.scala
diff --git a/...rk/sql/delta/commands/VacuumCommand.scala → ...rk/sql/delta/commands/VacuumCommand.scala b/...rk/sql/delta/commands/VacuumCommand.scala → ...rk/sql/delta/commands/VacuumCommand.scala
diff --git a/...iles/MergeTreeDelayedCommitProtocol.scala → ...iles/MergeTreeDelayedCommitProtocol.scala b/...iles/MergeTreeDelayedCommitProtocol.scala → ...iles/MergeTreeDelayedCommitProtocol.scala
diff --git a/...es/CHOptimizeMetadataOnlyDeltaQuery.scala → ...es/CHOptimizeMetadataOnlyDeltaQuery.scala b/...es/CHOptimizeMetadataOnlyDeltaQuery.scala → ...es/CHOptimizeMetadataOnlyDeltaQuery.scala
diff --git a/...rk/sql/delta/stats/PrepareDeltaScan.scala → ...rk/sql/delta/stats/PrepareDeltaScan.scala b/...rk/sql/delta/stats/PrepareDeltaScan.scala → ...rk/sql/delta/stats/PrepareDeltaScan.scala
diff --git a/.../sql/execution/CHDeltaColumnarWrite.scala → .../sql/execution/CHDeltaColumnarWrite.scala b/.../sql/execution/CHDeltaColumnarWrite.scala → .../sql/execution/CHDeltaColumnarWrite.scala
diff --git a/.../v2/clickhouse/ClickHouseDataSource.scala → .../v2/clickhouse/ClickHouseDataSource.scala b/.../v2/clickhouse/ClickHouseDataSource.scala → .../v2/clickhouse/ClickHouseDataSource.scala
diff --git a/...2/clickhouse/ClickHouseSparkCatalog.scala → ...2/clickhouse/ClickHouseSparkCatalog.scala b/...2/clickhouse/ClickHouseSparkCatalog.scala → ...2/clickhouse/ClickHouseSparkCatalog.scala
diff --git a/...use/source/DeltaMergeTreeFileFormat.scala → ...use/source/DeltaMergeTreeFileFormat.scala b/...use/source/DeltaMergeTreeFileFormat.scala → ...use/source/DeltaMergeTreeFileFormat.scala
diff --git a/.../spark/gluten/delta/DeltaStatsUtils.scala → .../spark/gluten/delta/DeltaStatsUtils.scala b/.../spark/gluten/delta/DeltaStatsUtils.scala → .../spark/gluten/delta/DeltaStatsUtils.scala
diff --git a/...-32/io/delta/tables/ClickhouseTable.scala → ...ala/io/delta/tables/ClickhouseTable.scala b/...-32/io/delta/tables/ClickhouseTable.scala → ...ala/io/delta/tables/ClickhouseTable.scala
diff --git a/...en/parser/GlutenCacheFilesSqlParser.scala → ...en/parser/GlutenCacheFilesSqlParser.scala b/...en/parser/GlutenCacheFilesSqlParser.scala → ...en/parser/GlutenCacheFilesSqlParser.scala
diff --git a/...en/parser/GlutenClickhouseSqlParser.scala → ...en/parser/GlutenClickhouseSqlParser.scala b/...en/parser/GlutenClickhouseSqlParser.scala → ...en/parser/GlutenClickhouseSqlParser.scala
diff --git a/...lta/ClickhouseOptimisticTransaction.scala → ...lta/ClickhouseOptimisticTransaction.scala b/...lta/ClickhouseOptimisticTransaction.scala → ...lta/ClickhouseOptimisticTransaction.scala
diff --git a/...apache/spark/sql/delta/DeltaAdapter.scala → ...apache/spark/sql/delta/DeltaAdapter.scala b/...apache/spark/sql/delta/DeltaAdapter.scala → ...apache/spark/sql/delta/DeltaAdapter.scala
diff --git a/...org/apache/spark/sql/delta/DeltaLog.scala → ...org/apache/spark/sql/delta/DeltaLog.scala b/...org/apache/spark/sql/delta/DeltaLog.scala → ...org/apache/spark/sql/delta/DeltaLog.scala
diff --git a/...org/apache/spark/sql/delta/Snapshot.scala → ...org/apache/spark/sql/delta/Snapshot.scala b/...org/apache/spark/sql/delta/Snapshot.scala → ...org/apache/spark/sql/delta/Snapshot.scala
diff --git a/...sql/delta/catalog/ClickHouseTableV2.scala → ...sql/delta/catalog/ClickHouseTableV2.scala b/...sql/delta/catalog/ClickHouseTableV2.scala → ...sql/delta/catalog/ClickHouseTableV2.scala
diff --git a/...rk/sql/delta/commands/DeleteCommand.scala → ...rk/sql/delta/commands/DeleteCommand.scala b/...rk/sql/delta/commands/DeleteCommand.scala → ...rk/sql/delta/commands/DeleteCommand.scala
diff --git a/...delta/commands/OptimizeTableCommand.scala → ...delta/commands/OptimizeTableCommand.scala b/...delta/commands/OptimizeTableCommand.scala → ...delta/commands/OptimizeTableCommand.scala
diff --git a/...ands/OptimizeTableCommandOverwrites.scala → ...ands/OptimizeTableCommandOverwrites.scala b/...ands/OptimizeTableCommandOverwrites.scala → ...ands/OptimizeTableCommandOverwrites.scala
diff --git a/...rk/sql/delta/commands/UpdateCommand.scala → ...rk/sql/delta/commands/UpdateCommand.scala b/...rk/sql/delta/commands/UpdateCommand.scala → ...rk/sql/delta/commands/UpdateCommand.scala
diff --git a/...rk/sql/delta/commands/VacuumCommand.scala → ...rk/sql/delta/commands/VacuumCommand.scala b/...rk/sql/delta/commands/VacuumCommand.scala → ...rk/sql/delta/commands/VacuumCommand.scala
diff --git a/...commands/merge/ClassicMergeExecutor.scala → ...commands/merge/ClassicMergeExecutor.scala b/...commands/merge/ClassicMergeExecutor.scala → ...commands/merge/ClassicMergeExecutor.scala
diff --git a/...iles/MergeTreeDelayedCommitProtocol.scala → ...iles/MergeTreeDelayedCommitProtocol.scala b/...iles/MergeTreeDelayedCommitProtocol.scala → ...iles/MergeTreeDelayedCommitProtocol.scala
diff --git a/...es/CHOptimizeMetadataOnlyDeltaQuery.scala → ...es/CHOptimizeMetadataOnlyDeltaQuery.scala b/...es/CHOptimizeMetadataOnlyDeltaQuery.scala → ...es/CHOptimizeMetadataOnlyDeltaQuery.scala
diff --git a/...ql/execution/FileDeltaColumnarWrite.scala → ...ql/execution/FileDeltaColumnarWrite.scala b/...ql/execution/FileDeltaColumnarWrite.scala → ...ql/execution/FileDeltaColumnarWrite.scala
diff --git a/...ecution/MergeTreeDeltaColumnarWrite.scala → ...ecution/MergeTreeDeltaColumnarWrite.scala b/...ecution/MergeTreeDeltaColumnarWrite.scala → ...ecution/MergeTreeDeltaColumnarWrite.scala
diff --git a/...house/MergeTreeFileFormatDataWriter.scala → ...house/MergeTreeFileFormatDataWriter.scala b/...house/MergeTreeFileFormatDataWriter.scala → ...house/MergeTreeFileFormatDataWriter.scala
diff --git a/...lickhouse/MergeTreeFileFormatWriter.scala → ...lickhouse/MergeTreeFileFormatWriter.scala b/...lickhouse/MergeTreeFileFormatWriter.scala → ...lickhouse/MergeTreeFileFormatWriter.scala
diff --git a/.../v2/clickhouse/ClickHouseDataSource.scala → .../v2/clickhouse/ClickHouseDataSource.scala b/.../v2/clickhouse/ClickHouseDataSource.scala → .../v2/clickhouse/ClickHouseDataSource.scala
diff --git a/...2/clickhouse/ClickHouseSparkCatalog.scala → ...2/clickhouse/ClickHouseSparkCatalog.scala b/...2/clickhouse/ClickHouseSparkCatalog.scala → ...2/clickhouse/ClickHouseSparkCatalog.scala
diff --git a/...use/source/DeltaMergeTreeFileFormat.scala → ...use/source/DeltaMergeTreeFileFormat.scala b/...use/source/DeltaMergeTreeFileFormat.scala → ...use/source/DeltaMergeTreeFileFormat.scala
diff --git a/.../spark/gluten/delta/DeltaStatsUtils.scala → .../spark/gluten/delta/DeltaStatsUtils.scala b/.../spark/gluten/delta/DeltaStatsUtils.scala → .../spark/gluten/delta/DeltaStatsUtils.scala
diff --git a/...ces/org.apache.gluten.component.Component → ...ces/org.apache.gluten.component.Component b/...ces/org.apache.gluten.component.Component → ...ces/org.apache.gluten.component.Component
diff --git a/...gluten/component/CHIcebergComponent.scala → ...gluten/component/CHIcebergComponent.scala b/...gluten/component/CHIcebergComponent.scala → ...gluten/component/CHIcebergComponent.scala
diff --git a/...tion/iceberg/ClickHouseIcebergSuite.scala → ...tion/iceberg/ClickHouseIcebergSuite.scala b/...tion/iceberg/ClickHouseIcebergSuite.scala → ...tion/iceberg/ClickHouseIcebergSuite.scala
diff --git a/backends-velox/pom.xml b/backends-velox/pom.xml
@@ -59,49 +59,7 @@
           <scope>test</scope>
         </dependency>
       </dependencies>
-      <build>
-        <resources>
-          <resource>
-            <directory>${project.basedir}/src/main-iceberg/resource</directory>
-          </resource>
-        </resources>
-        <plugins>
-          <plugin>
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>build-helper-maven-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>add-iceberg-sources</id>
-                <phase>generate-sources</phase>
-                <goals>
-                  <goal>add-source</goal>
-                </goals>
-                <configuration>
-                  <sources>
-                    <source>${project.basedir}/src/main-iceberg/scala</source>
-                    <source>${project.basedir}/src/main-iceberg/java</source>
-                  </sources>
-                </configuration>
-              </execution>
-              <execution>
-                <id>add-iceberg-test-sources</id>
-                <phase>generate-test-sources</phase>
-                <goals>
-                  <goal>add-test-source</goal>
-                </goals>
-                <configuration>
-                  <sources>
-                    <source>${project.basedir}/src/test-iceberg/scala</source>
-                    <source>${project.basedir}/src/test-iceberg/java</source>
-                  </sources>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
     </profile>
-
     <profile>
       <id>delta</id>
       <dependencies>
@@ -123,42 +81,6 @@
           <scope>provided</scope>
         </dependency>
       </dependencies>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>build-helper-maven-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>add-delta-sources</id>
-                <phase>generate-sources</phase>
-                <goals>
-                  <goal>add-source</goal>
-                </goals>
-                <configuration>
-                  <sources>
-                    <source>${project.basedir}/src/main-delta/scala</source>
-                    <source>${project.basedir}/src/main-delta/java</source>
-                  </sources>
-                </configuration>
-              </execution>
-              <execution>
-                <id>add-delta-test-sources</id>
-                <phase>generate-test-sources</phase>
-                <goals>
-                  <goal>add-test-source</goal>
-                </goals>
-                <configuration>
-                  <sources>
-                    <source>${project.basedir}/src/test-delta/scala</source>
-                    <source>${project.basedir}/src/test-delta/java</source>
-                  </sources>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
     </profile>
   </profiles>
 
@@ -317,11 +239,11 @@
   <build>
     <resources>
       <resource>
-        <directory>${cpp.releases.dir}</directory>
-        <targetPath>${platform}/${arch}</targetPath>
+        <directory>${project.basedir}/src/main/resources</directory>
       </resource>
       <resource>
-        <directory>${project.basedir}/src/main/resources</directory>
+        <directory>${cpp.releases.dir}</directory>
+        <targetPath>${platform}/${arch}</targetPath>
       </resource>
     </resources>
     <outputDirectory>target/scala-${scala.binary.version}/classes</outputDirectory>

diff --git a/...he/gluten/execution/VeloxDeltaSuite.scala → ...he/gluten/execution/VeloxDeltaSuite.scala b/...he/gluten/execution/VeloxDeltaSuite.scala → ...he/gluten/execution/VeloxDeltaSuite.scala
diff --git a/...luten/execution/VeloxTPCHDeltaSuite.scala → ...luten/execution/VeloxTPCHDeltaSuite.scala b/...luten/execution/VeloxTPCHDeltaSuite.scala → ...luten/execution/VeloxTPCHDeltaSuite.scala
diff --git a/...ces/org.apache.gluten.component.Component → ...ces/org.apache.gluten.component.Component b/...ces/org.apache.gluten.component.Component → ...ces/org.apache.gluten.component.Component
diff --git a/...ten/component/VeloxIcebergComponent.scala → ...ten/component/VeloxIcebergComponent.scala b/...ten/component/VeloxIcebergComponent.scala → ...ten/component/VeloxIcebergComponent.scala
diff --git a/.../gluten/execution/VeloxIcebergSuite.scala → .../gluten/execution/VeloxIcebergSuite.scala b/.../gluten/execution/VeloxIcebergSuite.scala → .../gluten/execution/VeloxIcebergSuite.scala
diff --git a/...ten/execution/VeloxTPCHIcebergSuite.scala → ...ten/execution/VeloxTPCHIcebergSuite.scala b/...ten/execution/VeloxTPCHIcebergSuite.scala → ...ten/execution/VeloxTPCHIcebergSuite.scala
diff --git a/cpp/velox/memory/VeloxMemoryManager.cc b/cpp/velox/memory/VeloxMemoryManager.cc
@@ -336,7 +336,8 @@ bool VeloxMemoryManager::tryDestructSafe() {
   // Velox memory manager considered safe to destruct when no alive pools.
   if (veloxMemoryManager_) {
     if (veloxMemoryManager_->numPools() > 3) {
-      GLUTEN_CHECK(false, "Unreachable code");
+      VLOG(2) << "Attempt to destruct VeloxMemoryManager failed because there are " << veloxMemoryManager_->numPools()
+              << " outstanding memory pools.";
       return false;
     }
     if (veloxMemoryManager_->numPools() == 3) {

diff --git a/gluten-core/src/main/scala/org/apache/gluten/GlutenPlugin.scala b/gluten-core/src/main/scala/org/apache/gluten/GlutenPlugin.scala
@@ -94,7 +94,7 @@ private[gluten] class GlutenDriverPlugin extends DriverPlugin with Logging {
     val glutenBuildInfo = new mutable.LinkedHashMap[String, String]()
 
     val components = Component.sorted()
-    glutenBuildInfo.put("Components", components.map(_.buildInfo().name).mkString(","))
+    glutenBuildInfo.put("Components", components.map(_.buildInfo().name).mkString(", "))
     components.foreach {
       comp =>
         val buildInfo = comp.buildInfo()

diff --git a/gluten-delta/pom.xml b/gluten-delta/pom.xml
@@ -14,10 +14,6 @@
   <packaging>jar</packaging>
   <name>Gluten DeltaLake</name>
 
-  <properties>
-    <resource.dir>${project.basedir}/src/main/resources</resource.dir>
-  </properties>
-
   <dependencies>
     <dependency>
       <groupId>org.apache.gluten</groupId>
@@ -92,11 +88,6 @@
   <build>
     <outputDirectory>target/scala-${scala.binary.version}/classes</outputDirectory>
     <testOutputDirectory>target/scala-${scala.binary.version}/test-classes</testOutputDirectory>
-    <resources>
-      <resource>
-        <directory>${resource.dir}</directory>
-      </resource>
-    </resources>
     <plugins>
       <plugin>
         <groupId>net.alchim31.maven</groupId>
@@ -123,10 +114,10 @@
               <file>${project.basedir}/../.scalafmt.conf</file>
             </scalafmt>
             <includes>
-              <include>src/main/scala/**/*.scala</include>
-              <include>src/test/scala/**/*.scala</include>
-              <include>src/main/delta-${delta.binary.version}/**/*.scala</include>
-              <include>src/test/delta-${delta.binary.version}/**/*.scala</include>
+              <include>src-delta/main/scala/**/*.scala</include>
+              <include>src-delta/test/scala/**/*.scala</include>
+              <include>src-delta-${delta.binary.version}/main/scala/**/*.scala</include>
+              <include>src-delta-${delta.binary.version}/test/scala/**/*.scala</include>
             </includes>
           </scala>
         </configuration>
@@ -151,28 +142,6 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-resources-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>copy-resources</id>
-            <phase>generate-sources</phase>
-            <goals>
-              <goal>copy-resources</goal>
-            </goals>
-            <configuration>
-              <outputDirectory>src/main/scala/org/apache/gluten/execution</outputDirectory>
-              <resources>
-                <resource>
-                  <directory>src/main/delta-${delta.binary.version}/org/apache/gluten/execution</directory>
-                </resource>
-              </resources>
-              <overwrite>true</overwrite>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
 </project>
diff --git a/...xecution/DeltaFilterExecTransformer.scala → ...xecution/DeltaFilterExecTransformer.scala b/...xecution/DeltaFilterExecTransformer.scala → ...xecution/DeltaFilterExecTransformer.scala
diff --git a/...ecution/DeltaProjectExecTransformer.scala → ...ecution/DeltaProjectExecTransformer.scala b/...ecution/DeltaProjectExecTransformer.scala → ...ecution/DeltaProjectExecTransformer.scala
diff --git a/...elta/src-delta-23/main/scala/org/apache/gluten/execution/DeltaFilterExecTransformer.scala b/...elta/src-delta-23/main/scala/org/apache/gluten/execution/DeltaFilterExecTransformer.scala
@@ -0,0 +1,27 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.gluten.execution
+
+import org.apache.spark.sql.catalyst.expressions.Expression
+import org.apache.spark.sql.execution.SparkPlan
+
+case class DeltaFilterExecTransformer(condition: Expression, child: SparkPlan)
+  extends FilterExecTransformerBase(condition, child) {
+
+  override protected def withNewChildInternal(newChild: SparkPlan): DeltaFilterExecTransformer =
+    copy(child = newChild)
+}
diff --git a/...lta/src-delta-23/main/scala/org/apache/gluten/execution/DeltaProjectExecTransformer.scala b/...lta/src-delta-23/main/scala/org/apache/gluten/execution/DeltaProjectExecTransformer.scala
@@ -0,0 +1,27 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.gluten.execution
+
+import org.apache.spark.sql.catalyst.expressions.NamedExpression
+import org.apache.spark.sql.execution.SparkPlan
+
+case class DeltaProjectExecTransformer(projectList: Seq[NamedExpression], child: SparkPlan)
+  extends ProjectExecTransformerBase(projectList, child) {
+
+  override protected def withNewChildInternal(newChild: SparkPlan): DeltaProjectExecTransformer =
+    copy(child = newChild)
+}