diff --git a/.github/workflows/velox_be.yml.deprecated b/.github/workflows/velox_be.yml.deprecated index 85db767b927b..d095af64d7b0 100644 --- a/.github/workflows/velox_be.yml.deprecated +++ b/.github/workflows/velox_be.yml.deprecated @@ -84,8 +84,8 @@ jobs: run: | $PATH_TO_GLUTEN_TE/$OS_IMAGE_NAME/gha/gha-checkout/exec.sh ' cd /opt/gluten && \ - mvn clean install -Pspark-3.2 -Pspark-ut -Pbackends-velox -Prss -DargLine="-Dspark.test.home=/opt/spark322" -DtagsToExclude=org.apache.spark.tags.ExtendedSQLTest,io.glutenproject.tags.UDFTest,io.glutenproject.tags.SkipTestTags && \ - mvn test -Pspark-3.2 -Pbackends-velox -DtagsToExclude=None -DtagsToInclude=io.glutenproject.tags.UDFTest' + mvn clean install -Pspark-3.2 -Pspark-ut -Pbackends-velox -Prss -DargLine="-Dspark.test.home=/opt/spark322" -DtagsToExclude=org.apache.spark.tags.ExtendedSQLTest,org.apache.gluten.tags.UDFTest,org.apache.gluten.tags.SkipTestTags && \ + mvn test -Pspark-3.2 -Pbackends-velox -DtagsToExclude=None -DtagsToInclude=org.apache.gluten.tags.UDFTest' # Cpp micro benchmarks will use generated files from unit test in backends-velox module. - name: Run micro benchmarks run: | @@ -221,8 +221,8 @@ jobs: - name: Build and Run unit test for Spark 3.3.1 (other tests) run: | $PATH_TO_GLUTEN_TE/$OS_IMAGE_NAME/gha/gha-checkout/exec.sh 'cd /opt/gluten && \ - mvn clean install -Pspark-3.3 -Pbackends-velox -Prss -Piceberg -Pdelta -Pspark-ut -DargLine="-Dspark.test.home=/opt/spark331" -DtagsToExclude=org.apache.spark.tags.ExtendedSQLTest,io.glutenproject.tags.UDFTest,io.glutenproject.tags.SkipTestTags && \ - mvn test -Pspark-3.3 -Pbackends-velox -DtagsToExclude=None -DtagsToInclude=io.glutenproject.tags.UDFTest' + mvn clean install -Pspark-3.3 -Pbackends-velox -Prss -Piceberg -Pdelta -Pspark-ut -DargLine="-Dspark.test.home=/opt/spark331" -DtagsToExclude=org.apache.spark.tags.ExtendedSQLTest,org.apache.gluten.tags.UDFTest,org.apache.gluten.tags.SkipTestTags && \ + mvn test -Pspark-3.3 -Pbackends-velox -DtagsToExclude=None -DtagsToInclude=org.apache.gluten.tags.UDFTest' - name: Copy golden files from container to host if: failure() run: | @@ -304,8 +304,8 @@ jobs: - name: Build and Run unit test for Spark 3.4.2 (other tests) run: | $PATH_TO_GLUTEN_TE/$OS_IMAGE_NAME/gha/gha-checkout/exec.sh 'cd /opt/gluten && \ - mvn clean install -Pspark-3.4 -Pbackends-velox -Prss -Piceberg -Pdelta -Pspark-ut -DargLine="-Dspark.test.home=/opt/spark342" -DtagsToExclude=org.apache.spark.tags.ExtendedSQLTest,io.glutenproject.tags.UDFTest,io.glutenproject.tags.SkipTestTags && \ - mvn test -Pspark-3.4 -Pbackends-velox -DtagsToExclude=None -DtagsToInclude=io.glutenproject.tags.UDFTest' + mvn clean install -Pspark-3.4 -Pbackends-velox -Prss -Piceberg -Pdelta -Pspark-ut -DargLine="-Dspark.test.home=/opt/spark342" -DtagsToExclude=org.apache.spark.tags.ExtendedSQLTest,org.apache.gluten.tags.UDFTest,org.apache.gluten.tags.SkipTestTags && \ + mvn test -Pspark-3.4 -Pbackends-velox -DtagsToExclude=None -DtagsToInclude=org.apache.gluten.tags.UDFTest' - name: Copy golden files from container to host if: failure() run: | diff --git a/.github/workflows/velox_docker.yml b/.github/workflows/velox_docker.yml index c54a6a1e13cb..124efc53a001 100644 --- a/.github/workflows/velox_docker.yml +++ b/.github/workflows/velox_docker.yml @@ -393,8 +393,8 @@ jobs: export SPARK_SCALA_VERSION=2.12 export MAVEN_HOME=/usr/lib/maven export PATH=${PATH}:${MAVEN_HOME}/bin - mvn -ntp clean install -Pspark-3.2 -Pspark-ut -Pbackends-velox -Prss -DargLine="-Dspark.test.home=$GITHUB_WORKSPACE//shims/spark32/spark_home/" -DtagsToExclude=org.apache.spark.tags.ExtendedSQLTest,io.glutenproject.tags.UDFTest,io.glutenproject.tags.SkipTestTags && \ - mvn -ntp test -Pspark-3.2 -Pbackends-velox -DtagsToExclude=None -DtagsToInclude=io.glutenproject.tags.UDFTest + mvn -ntp clean install -Pspark-3.2 -Pspark-ut -Pbackends-velox -Prss -DargLine="-Dspark.test.home=$GITHUB_WORKSPACE//shims/spark32/spark_home/" -DtagsToExclude=org.apache.spark.tags.ExtendedSQLTest,org.apache.gluten.tags.UDFTest,org.apache.gluten.tags.SkipTestTags && \ + mvn -ntp test -Pspark-3.2 -Pbackends-velox -DtagsToExclude=None -DtagsToInclude=org.apache.gluten.tags.UDFTest - name: Upload golden files if: failure() uses: actions/upload-artifact@v4 @@ -480,8 +480,8 @@ jobs: export SPARK_SCALA_VERSION=2.12 && \ export MAVEN_HOME=/usr/lib/maven export PATH=${PATH}:${MAVEN_HOME}/bin - mvn -ntp clean install -Pspark-3.3 -Pbackends-velox -Prss -Pspark-ut -DargLine="-Dspark.test.home=$GITHUB_WORKSPACE//shims/spark33/spark_home/" -DtagsToExclude=org.apache.spark.tags.ExtendedSQLTest,io.glutenproject.tags.UDFTest,io.glutenproject.tags.SkipTestTags && \ - mvn -ntp test -Pspark-3.3 -Pbackends-velox -DtagsToExclude=None -DtagsToInclude=io.glutenproject.tags.UDFTest + mvn -ntp clean install -Pspark-3.3 -Pbackends-velox -Prss -Pspark-ut -DargLine="-Dspark.test.home=$GITHUB_WORKSPACE//shims/spark33/spark_home/" -DtagsToExclude=org.apache.spark.tags.ExtendedSQLTest,org.apache.gluten.tags.UDFTest,org.apache.gluten.tags.SkipTestTags && \ + mvn -ntp test -Pspark-3.3 -Pbackends-velox -DtagsToExclude=None -DtagsToInclude=org.apache.gluten.tags.UDFTest - name: Upload golden files if: failure() uses: actions/upload-artifact@v4 @@ -568,8 +568,8 @@ jobs: export SPARK_SCALA_VERSION=2.12 && \ export MAVEN_HOME=/usr/lib/maven export PATH=${PATH}:${MAVEN_HOME}/bin - mvn -ntp clean install -Pspark-3.4 -Pbackends-velox -Prss -Pspark-ut -DargLine="-Dspark.test.home=$GITHUB_WORKSPACE//shims/spark34/spark_home/" -DtagsToExclude=org.apache.spark.tags.ExtendedSQLTest,io.glutenproject.tags.UDFTest,io.glutenproject.tags.SkipTestTags && \ - mvn -ntp test -Pspark-3.4 -Pbackends-velox -DtagsToExclude=None -DtagsToInclude=io.glutenproject.tags.UDFTest + mvn -ntp clean install -Pspark-3.4 -Pbackends-velox -Prss -Pspark-ut -DargLine="-Dspark.test.home=$GITHUB_WORKSPACE//shims/spark34/spark_home/" -DtagsToExclude=org.apache.spark.tags.ExtendedSQLTest,org.apache.gluten.tags.UDFTest,org.apache.gluten.tags.SkipTestTags && \ + mvn -ntp test -Pspark-3.4 -Pbackends-velox -DtagsToExclude=None -DtagsToInclude=org.apache.gluten.tags.UDFTest - name: Upload golden files if: failure() uses: actions/upload-artifact@v4 diff --git a/.scalafmt.conf b/.scalafmt.conf index ce11260c4268..e65c0217fc58 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -47,7 +47,7 @@ rewrite.rules = [AvoidInfix, Imports, RedundantBraces, SortModifiers] # Imports rewrite.imports.sort = scalastyle rewrite.imports.groups = [ - ["io.glutenproject\\..*"], + ["org.apache.gluten\\..*"], ["io.substrait.spark\\..*"], ["org.apache.spark\\..*"], [".*"], diff --git a/README.md b/README.md index 76ce5fbe34a8..3de89b0a7101 100644 --- a/README.md +++ b/README.md @@ -70,7 +70,7 @@ One way is to use released jar. Here is a simple example. Currently, only centos ``` spark-shell \ --master yarn --deploy-mode client \ - --conf spark.plugins=io.glutenproject.GlutenPlugin \ + --conf spark.plugins=org.apache.gluten.GlutenPlugin \ --conf spark.memory.offHeap.enabled=true \ --conf spark.memory.offHeap.size=20g \ --conf spark.shuffle.manager=org.apache.spark.shuffle.sort.ColumnarShuffleManager \ @@ -85,7 +85,7 @@ Alternatively, you can build gluten from source, then do some configurations to export gluten_jar = /PATH/TO/GLUTEN/backends-velox/target/ spark-shell --master yarn --deploy-mode client \ - --conf spark.plugins=io.glutenproject.GlutenPlugin \ + --conf spark.plugins=org.apache.gluten.GlutenPlugin \ --conf spark.memory.offHeap.enabled=true \ --conf spark.memory.offHeap.size=20g \ --conf spark.driver.extraClassPath=${gluten_jar} \ diff --git a/backends-clickhouse/pom.xml b/backends-clickhouse/pom.xml index dd4240a3a81f..76e184f38a4e 100644 --- a/backends-clickhouse/pom.xml +++ b/backends-clickhouse/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> gluten-parent - io.glutenproject + org.apache.gluten 1.2.0-SNAPSHOT 4.0.0 @@ -15,7 +15,7 @@ - io.glutenproject + org.apache.gluten gluten-core ${project.version} compile @@ -32,7 +32,7 @@ ${custom.protobuf.version} - io.glutenproject + org.apache.gluten gluten-core ${project.version} test-jar diff --git a/backends-clickhouse/src/main/delta-20/org/apache/spark/sql/delta/commands/OptimizeTableCommandOverwrites.scala b/backends-clickhouse/src/main/delta-20/org/apache/spark/sql/delta/commands/OptimizeTableCommandOverwrites.scala index 2042dad39807..498b7ff4f86d 100644 --- a/backends-clickhouse/src/main/delta-20/org/apache/spark/sql/delta/commands/OptimizeTableCommandOverwrites.scala +++ b/backends-clickhouse/src/main/delta-20/org/apache/spark/sql/delta/commands/OptimizeTableCommandOverwrites.scala @@ -16,7 +16,7 @@ */ package org.apache.spark.sql.delta.commands -import io.glutenproject.expression.ConverterUtils +import org.apache.gluten.expression.ConverterUtils import org.apache.spark.{TaskContext, TaskOutputFileAlreadyExistException} import org.apache.spark.internal.Logging diff --git a/backends-clickhouse/src/main/delta-22/org/apache/spark/sql/delta/commands/OptimizeTableCommandOverwrites.scala b/backends-clickhouse/src/main/delta-22/org/apache/spark/sql/delta/commands/OptimizeTableCommandOverwrites.scala index 2042dad39807..498b7ff4f86d 100644 --- a/backends-clickhouse/src/main/delta-22/org/apache/spark/sql/delta/commands/OptimizeTableCommandOverwrites.scala +++ b/backends-clickhouse/src/main/delta-22/org/apache/spark/sql/delta/commands/OptimizeTableCommandOverwrites.scala @@ -16,7 +16,7 @@ */ package org.apache.spark.sql.delta.commands -import io.glutenproject.expression.ConverterUtils +import org.apache.gluten.expression.ConverterUtils import org.apache.spark.{TaskContext, TaskOutputFileAlreadyExistException} import org.apache.spark.internal.Logging diff --git a/backends-clickhouse/src/main/java/io/glutenproject/execution/ColumnarNativeIterator.java b/backends-clickhouse/src/main/java/org/apache/gluten/execution/ColumnarNativeIterator.java similarity index 93% rename from backends-clickhouse/src/main/java/io/glutenproject/execution/ColumnarNativeIterator.java rename to backends-clickhouse/src/main/java/org/apache/gluten/execution/ColumnarNativeIterator.java index a069d2df491b..2a7446711af3 100644 --- a/backends-clickhouse/src/main/java/io/glutenproject/execution/ColumnarNativeIterator.java +++ b/backends-clickhouse/src/main/java/org/apache/gluten/execution/ColumnarNativeIterator.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution; +package org.apache.gluten.execution; -import io.glutenproject.vectorized.CHColumnVector; -import io.glutenproject.vectorized.GeneralInIterator; +import org.apache.gluten.vectorized.CHColumnVector; +import org.apache.gluten.vectorized.GeneralInIterator; import org.apache.spark.sql.vectorized.ColumnarBatch; diff --git a/backends-clickhouse/src/main/java/io/glutenproject/execution/SparkRowIterator.java b/backends-clickhouse/src/main/java/org/apache/gluten/execution/SparkRowIterator.java similarity index 98% rename from backends-clickhouse/src/main/java/io/glutenproject/execution/SparkRowIterator.java rename to backends-clickhouse/src/main/java/org/apache/gluten/execution/SparkRowIterator.java index 564a3cbd8a0c..75a13346064a 100644 --- a/backends-clickhouse/src/main/java/io/glutenproject/execution/SparkRowIterator.java +++ b/backends-clickhouse/src/main/java/org/apache/gluten/execution/SparkRowIterator.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution; +package org.apache.gluten.execution; import java.nio.ByteBuffer; import java.nio.ByteOrder; diff --git a/backends-clickhouse/src/main/java/io/glutenproject/memory/alloc/CHManagedCHReservationListener.java b/backends-clickhouse/src/main/java/org/apache/gluten/memory/alloc/CHManagedCHReservationListener.java similarity index 95% rename from backends-clickhouse/src/main/java/io/glutenproject/memory/alloc/CHManagedCHReservationListener.java rename to backends-clickhouse/src/main/java/org/apache/gluten/memory/alloc/CHManagedCHReservationListener.java index dfb5ab76881c..1f560a905858 100644 --- a/backends-clickhouse/src/main/java/io/glutenproject/memory/alloc/CHManagedCHReservationListener.java +++ b/backends-clickhouse/src/main/java/org/apache/gluten/memory/alloc/CHManagedCHReservationListener.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.memory.alloc; +package org.apache.gluten.memory.alloc; -import io.glutenproject.GlutenConfig; -import io.glutenproject.memory.SimpleMemoryUsageRecorder; -import io.glutenproject.memory.memtarget.MemoryTarget; +import org.apache.gluten.GlutenConfig; +import org.apache.gluten.memory.SimpleMemoryUsageRecorder; +import org.apache.gluten.memory.memtarget.MemoryTarget; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/backends-clickhouse/src/main/java/io/glutenproject/memory/alloc/CHNativeMemoryAllocator.java b/backends-clickhouse/src/main/java/org/apache/gluten/memory/alloc/CHNativeMemoryAllocator.java similarity index 94% rename from backends-clickhouse/src/main/java/io/glutenproject/memory/alloc/CHNativeMemoryAllocator.java rename to backends-clickhouse/src/main/java/org/apache/gluten/memory/alloc/CHNativeMemoryAllocator.java index 44163d95cb7d..0df0757c8b54 100644 --- a/backends-clickhouse/src/main/java/io/glutenproject/memory/alloc/CHNativeMemoryAllocator.java +++ b/backends-clickhouse/src/main/java/org/apache/gluten/memory/alloc/CHNativeMemoryAllocator.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.memory.alloc; +package org.apache.gluten.memory.alloc; /** - * Like {@link io.glutenproject.vectorized.NativePlanEvaluator}, this along with {@link + * Like {@link org.apache.gluten.vectorized.NativePlanEvaluator}, this along with {@link * CHNativeMemoryAllocators}, as built-in toolkit for managing native memory allocations. */ public class CHNativeMemoryAllocator { diff --git a/backends-clickhouse/src/main/java/io/glutenproject/memory/alloc/CHNativeMemoryAllocatorManager.java b/backends-clickhouse/src/main/java/org/apache/gluten/memory/alloc/CHNativeMemoryAllocatorManager.java similarity index 96% rename from backends-clickhouse/src/main/java/io/glutenproject/memory/alloc/CHNativeMemoryAllocatorManager.java rename to backends-clickhouse/src/main/java/org/apache/gluten/memory/alloc/CHNativeMemoryAllocatorManager.java index 6940840eb4f4..6645748e56c2 100644 --- a/backends-clickhouse/src/main/java/io/glutenproject/memory/alloc/CHNativeMemoryAllocatorManager.java +++ b/backends-clickhouse/src/main/java/org/apache/gluten/memory/alloc/CHNativeMemoryAllocatorManager.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.memory.alloc; +package org.apache.gluten.memory.alloc; import org.apache.spark.util.TaskResource; diff --git a/backends-clickhouse/src/main/java/io/glutenproject/memory/alloc/CHNativeMemoryAllocatorManagerImpl.java b/backends-clickhouse/src/main/java/org/apache/gluten/memory/alloc/CHNativeMemoryAllocatorManagerImpl.java similarity index 97% rename from backends-clickhouse/src/main/java/io/glutenproject/memory/alloc/CHNativeMemoryAllocatorManagerImpl.java rename to backends-clickhouse/src/main/java/org/apache/gluten/memory/alloc/CHNativeMemoryAllocatorManagerImpl.java index 3666c58b5691..2c1c2547fa81 100644 --- a/backends-clickhouse/src/main/java/io/glutenproject/memory/alloc/CHNativeMemoryAllocatorManagerImpl.java +++ b/backends-clickhouse/src/main/java/org/apache/gluten/memory/alloc/CHNativeMemoryAllocatorManagerImpl.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.memory.alloc; +package org.apache.gluten.memory.alloc; public class CHNativeMemoryAllocatorManagerImpl implements CHNativeMemoryAllocatorManager { private final CHNativeMemoryAllocator managed; diff --git a/backends-clickhouse/src/main/java/io/glutenproject/memory/alloc/CHNativeMemoryAllocators.java b/backends-clickhouse/src/main/java/org/apache/gluten/memory/alloc/CHNativeMemoryAllocators.java similarity index 94% rename from backends-clickhouse/src/main/java/io/glutenproject/memory/alloc/CHNativeMemoryAllocators.java rename to backends-clickhouse/src/main/java/org/apache/gluten/memory/alloc/CHNativeMemoryAllocators.java index 2c6db59137ce..01fb7e3e2f7c 100644 --- a/backends-clickhouse/src/main/java/io/glutenproject/memory/alloc/CHNativeMemoryAllocators.java +++ b/backends-clickhouse/src/main/java/org/apache/gluten/memory/alloc/CHNativeMemoryAllocators.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.memory.alloc; +package org.apache.gluten.memory.alloc; -import io.glutenproject.memory.SimpleMemoryUsageRecorder; -import io.glutenproject.memory.memtarget.MemoryTargets; -import io.glutenproject.memory.memtarget.Spiller; +import org.apache.gluten.memory.SimpleMemoryUsageRecorder; +import org.apache.gluten.memory.memtarget.MemoryTargets; +import org.apache.gluten.memory.memtarget.Spiller; import org.apache.spark.memory.TaskMemoryManager; import org.apache.spark.util.TaskResources; diff --git a/backends-clickhouse/src/main/java/io/glutenproject/memory/alloc/CHReservationListener.java b/backends-clickhouse/src/main/java/org/apache/gluten/memory/alloc/CHReservationListener.java similarity index 97% rename from backends-clickhouse/src/main/java/io/glutenproject/memory/alloc/CHReservationListener.java rename to backends-clickhouse/src/main/java/org/apache/gluten/memory/alloc/CHReservationListener.java index 8328543d77c0..926c4426d3d5 100644 --- a/backends-clickhouse/src/main/java/io/glutenproject/memory/alloc/CHReservationListener.java +++ b/backends-clickhouse/src/main/java/org/apache/gluten/memory/alloc/CHReservationListener.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.memory.alloc; +package org.apache.gluten.memory.alloc; public interface CHReservationListener { CHReservationListener NOOP = diff --git a/backends-clickhouse/src/main/java/io/glutenproject/metrics/MetricsData.java b/backends-clickhouse/src/main/java/org/apache/gluten/metrics/MetricsData.java similarity index 98% rename from backends-clickhouse/src/main/java/io/glutenproject/metrics/MetricsData.java rename to backends-clickhouse/src/main/java/org/apache/gluten/metrics/MetricsData.java index 40c469ec3e54..fd31b2210c5d 100644 --- a/backends-clickhouse/src/main/java/io/glutenproject/metrics/MetricsData.java +++ b/backends-clickhouse/src/main/java/org/apache/gluten/metrics/MetricsData.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.metrics; +package org.apache.gluten.metrics; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/backends-clickhouse/src/main/java/io/glutenproject/metrics/MetricsProcessor.java b/backends-clickhouse/src/main/java/org/apache/gluten/metrics/MetricsProcessor.java similarity index 98% rename from backends-clickhouse/src/main/java/io/glutenproject/metrics/MetricsProcessor.java rename to backends-clickhouse/src/main/java/org/apache/gluten/metrics/MetricsProcessor.java index ff2504d20518..18da9eef8e4e 100644 --- a/backends-clickhouse/src/main/java/io/glutenproject/metrics/MetricsProcessor.java +++ b/backends-clickhouse/src/main/java/org/apache/gluten/metrics/MetricsProcessor.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.metrics; +package org.apache.gluten.metrics; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/backends-clickhouse/src/main/java/io/glutenproject/metrics/MetricsStep.java b/backends-clickhouse/src/main/java/org/apache/gluten/metrics/MetricsStep.java similarity index 98% rename from backends-clickhouse/src/main/java/io/glutenproject/metrics/MetricsStep.java rename to backends-clickhouse/src/main/java/org/apache/gluten/metrics/MetricsStep.java index d1714d825c84..f95aaa323c10 100644 --- a/backends-clickhouse/src/main/java/io/glutenproject/metrics/MetricsStep.java +++ b/backends-clickhouse/src/main/java/org/apache/gluten/metrics/MetricsStep.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.metrics; +package org.apache.gluten.metrics; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/backends-clickhouse/src/main/java/io/glutenproject/metrics/NativeMetrics.java b/backends-clickhouse/src/main/java/org/apache/gluten/metrics/NativeMetrics.java similarity index 98% rename from backends-clickhouse/src/main/java/io/glutenproject/metrics/NativeMetrics.java rename to backends-clickhouse/src/main/java/org/apache/gluten/metrics/NativeMetrics.java index 0d9160c97779..449ef7e2a9b3 100644 --- a/backends-clickhouse/src/main/java/io/glutenproject/metrics/NativeMetrics.java +++ b/backends-clickhouse/src/main/java/org/apache/gluten/metrics/NativeMetrics.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.metrics; +package org.apache.gluten.metrics; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/backends-clickhouse/src/main/java/io/glutenproject/metrics/OperatorMetrics.java b/backends-clickhouse/src/main/java/org/apache/gluten/metrics/OperatorMetrics.java similarity index 90% rename from backends-clickhouse/src/main/java/io/glutenproject/metrics/OperatorMetrics.java rename to backends-clickhouse/src/main/java/org/apache/gluten/metrics/OperatorMetrics.java index fd4018138baf..8dcb0ef74b13 100644 --- a/backends-clickhouse/src/main/java/io/glutenproject/metrics/OperatorMetrics.java +++ b/backends-clickhouse/src/main/java/org/apache/gluten/metrics/OperatorMetrics.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.metrics; +package org.apache.gluten.metrics; -import io.glutenproject.substrait.AggregationParams; -import io.glutenproject.substrait.JoinParams; +import org.apache.gluten.substrait.AggregationParams; +import org.apache.gluten.substrait.JoinParams; import java.util.List; diff --git a/backends-clickhouse/src/main/java/io/glutenproject/utils/SnowflakeIdWorker.java b/backends-clickhouse/src/main/java/org/apache/gluten/utils/SnowflakeIdWorker.java similarity index 97% rename from backends-clickhouse/src/main/java/io/glutenproject/utils/SnowflakeIdWorker.java rename to backends-clickhouse/src/main/java/org/apache/gluten/utils/SnowflakeIdWorker.java index e049e611e4da..23acaeec9e6d 100644 --- a/backends-clickhouse/src/main/java/io/glutenproject/utils/SnowflakeIdWorker.java +++ b/backends-clickhouse/src/main/java/org/apache/gluten/utils/SnowflakeIdWorker.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.utils; +package org.apache.gluten.utils; -import io.glutenproject.exception.GlutenException; +import org.apache.gluten.exception.GlutenException; import org.apache.spark.SparkEnv; import org.apache.spark.sql.execution.datasources.v2.clickhouse.ClickHouseConfig; diff --git a/backends-clickhouse/src/main/java/io/glutenproject/vectorized/BatchIterator.java b/backends-clickhouse/src/main/java/org/apache/gluten/vectorized/BatchIterator.java similarity index 96% rename from backends-clickhouse/src/main/java/io/glutenproject/vectorized/BatchIterator.java rename to backends-clickhouse/src/main/java/org/apache/gluten/vectorized/BatchIterator.java index f87948368732..5698caf02637 100644 --- a/backends-clickhouse/src/main/java/io/glutenproject/vectorized/BatchIterator.java +++ b/backends-clickhouse/src/main/java/org/apache/gluten/vectorized/BatchIterator.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.vectorized; +package org.apache.gluten.vectorized; -import io.glutenproject.metrics.IMetrics; +import org.apache.gluten.metrics.IMetrics; import org.apache.spark.sql.execution.utils.CHExecUtil; import org.apache.spark.sql.vectorized.ColumnVector; diff --git a/backends-clickhouse/src/main/java/io/glutenproject/vectorized/BlockOutputStream.java b/backends-clickhouse/src/main/java/org/apache/gluten/vectorized/BlockOutputStream.java similarity index 98% rename from backends-clickhouse/src/main/java/io/glutenproject/vectorized/BlockOutputStream.java rename to backends-clickhouse/src/main/java/org/apache/gluten/vectorized/BlockOutputStream.java index 9bdaa21ffc3a..40e2c2c56b77 100644 --- a/backends-clickhouse/src/main/java/io/glutenproject/vectorized/BlockOutputStream.java +++ b/backends-clickhouse/src/main/java/org/apache/gluten/vectorized/BlockOutputStream.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.vectorized; +package org.apache.gluten.vectorized; import org.apache.spark.sql.execution.metric.SQLMetric; import org.apache.spark.sql.vectorized.ColumnarBatch; diff --git a/backends-clickhouse/src/main/java/io/glutenproject/vectorized/BlockSplitIterator.java b/backends-clickhouse/src/main/java/org/apache/gluten/vectorized/BlockSplitIterator.java similarity index 98% rename from backends-clickhouse/src/main/java/io/glutenproject/vectorized/BlockSplitIterator.java rename to backends-clickhouse/src/main/java/org/apache/gluten/vectorized/BlockSplitIterator.java index 3c0d919f6f5e..407a0fc7ac54 100644 --- a/backends-clickhouse/src/main/java/io/glutenproject/vectorized/BlockSplitIterator.java +++ b/backends-clickhouse/src/main/java/org/apache/gluten/vectorized/BlockSplitIterator.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.vectorized; +package org.apache.gluten.vectorized; import org.apache.spark.sql.vectorized.ColumnarBatch; diff --git a/backends-clickhouse/src/main/java/io/glutenproject/vectorized/CHBlockConverterJniWrapper.java b/backends-clickhouse/src/main/java/org/apache/gluten/vectorized/CHBlockConverterJniWrapper.java similarity index 91% rename from backends-clickhouse/src/main/java/io/glutenproject/vectorized/CHBlockConverterJniWrapper.java rename to backends-clickhouse/src/main/java/org/apache/gluten/vectorized/CHBlockConverterJniWrapper.java index e4954c95f8eb..836e954f18a5 100644 --- a/backends-clickhouse/src/main/java/io/glutenproject/vectorized/CHBlockConverterJniWrapper.java +++ b/backends-clickhouse/src/main/java/org/apache/gluten/vectorized/CHBlockConverterJniWrapper.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.vectorized; +package org.apache.gluten.vectorized; -import io.glutenproject.execution.SparkRowIterator; -import io.glutenproject.row.SparkRowInfo; +import org.apache.gluten.execution.SparkRowIterator; +import org.apache.gluten.row.SparkRowInfo; public class CHBlockConverterJniWrapper { diff --git a/backends-clickhouse/src/main/java/io/glutenproject/vectorized/CHBlockWriterJniWrapper.java b/backends-clickhouse/src/main/java/org/apache/gluten/vectorized/CHBlockWriterJniWrapper.java similarity index 97% rename from backends-clickhouse/src/main/java/io/glutenproject/vectorized/CHBlockWriterJniWrapper.java rename to backends-clickhouse/src/main/java/org/apache/gluten/vectorized/CHBlockWriterJniWrapper.java index 313515c133ad..c460be84f4eb 100644 --- a/backends-clickhouse/src/main/java/io/glutenproject/vectorized/CHBlockWriterJniWrapper.java +++ b/backends-clickhouse/src/main/java/org/apache/gluten/vectorized/CHBlockWriterJniWrapper.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.vectorized; +package org.apache.gluten.vectorized; import org.apache.spark.sql.vectorized.ColumnarBatch; diff --git a/backends-clickhouse/src/main/java/io/glutenproject/vectorized/CHColumnVector.java b/backends-clickhouse/src/main/java/org/apache/gluten/vectorized/CHColumnVector.java similarity index 99% rename from backends-clickhouse/src/main/java/io/glutenproject/vectorized/CHColumnVector.java rename to backends-clickhouse/src/main/java/org/apache/gluten/vectorized/CHColumnVector.java index 0b144b50f2f8..9cbb242824a9 100644 --- a/backends-clickhouse/src/main/java/io/glutenproject/vectorized/CHColumnVector.java +++ b/backends-clickhouse/src/main/java/org/apache/gluten/vectorized/CHColumnVector.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.vectorized; +package org.apache.gluten.vectorized; import org.apache.spark.sql.types.DataType; import org.apache.spark.sql.types.Decimal; diff --git a/backends-clickhouse/src/main/java/io/glutenproject/vectorized/CHNativeBlock.java b/backends-clickhouse/src/main/java/org/apache/gluten/vectorized/CHNativeBlock.java similarity index 97% rename from backends-clickhouse/src/main/java/io/glutenproject/vectorized/CHNativeBlock.java rename to backends-clickhouse/src/main/java/org/apache/gluten/vectorized/CHNativeBlock.java index 0f23e22bb596..f84327e7d9eb 100644 --- a/backends-clickhouse/src/main/java/io/glutenproject/vectorized/CHNativeBlock.java +++ b/backends-clickhouse/src/main/java/org/apache/gluten/vectorized/CHNativeBlock.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.vectorized; +package org.apache.gluten.vectorized; -import io.glutenproject.exception.GlutenException; +import org.apache.gluten.exception.GlutenException; import org.apache.spark.sql.execution.utils.CHExecUtil; import org.apache.spark.sql.vectorized.ColumnVector; diff --git a/backends-clickhouse/src/main/java/io/glutenproject/vectorized/CHNativeExpressionEvaluator.java b/backends-clickhouse/src/main/java/org/apache/gluten/vectorized/CHNativeExpressionEvaluator.java similarity index 88% rename from backends-clickhouse/src/main/java/io/glutenproject/vectorized/CHNativeExpressionEvaluator.java rename to backends-clickhouse/src/main/java/org/apache/gluten/vectorized/CHNativeExpressionEvaluator.java index fd33db769636..0d307d23102d 100644 --- a/backends-clickhouse/src/main/java/io/glutenproject/vectorized/CHNativeExpressionEvaluator.java +++ b/backends-clickhouse/src/main/java/org/apache/gluten/vectorized/CHNativeExpressionEvaluator.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.vectorized; - -import io.glutenproject.GlutenConfig; -import io.glutenproject.backendsapi.BackendsApiManager; -import io.glutenproject.memory.alloc.CHNativeMemoryAllocators; -import io.glutenproject.substrait.expression.ExpressionBuilder; -import io.glutenproject.substrait.expression.StringMapNode; -import io.glutenproject.substrait.extensions.AdvancedExtensionNode; -import io.glutenproject.substrait.extensions.ExtensionBuilder; -import io.glutenproject.substrait.plan.PlanBuilder; +package org.apache.gluten.vectorized; + +import org.apache.gluten.GlutenConfig; +import org.apache.gluten.backendsapi.BackendsApiManager; +import org.apache.gluten.memory.alloc.CHNativeMemoryAllocators; +import org.apache.gluten.substrait.expression.ExpressionBuilder; +import org.apache.gluten.substrait.expression.StringMapNode; +import org.apache.gluten.substrait.extensions.AdvancedExtensionNode; +import org.apache.gluten.substrait.extensions.ExtensionBuilder; +import org.apache.gluten.substrait.plan.PlanBuilder; import org.apache.spark.SparkConf; import org.apache.spark.sql.internal.SQLConf; diff --git a/backends-clickhouse/src/main/java/io/glutenproject/vectorized/CHShuffleSplitterJniWrapper.java b/backends-clickhouse/src/main/java/org/apache/gluten/vectorized/CHShuffleSplitterJniWrapper.java similarity index 98% rename from backends-clickhouse/src/main/java/io/glutenproject/vectorized/CHShuffleSplitterJniWrapper.java rename to backends-clickhouse/src/main/java/org/apache/gluten/vectorized/CHShuffleSplitterJniWrapper.java index af4ab1ecfb49..800ee7d1995f 100644 --- a/backends-clickhouse/src/main/java/io/glutenproject/vectorized/CHShuffleSplitterJniWrapper.java +++ b/backends-clickhouse/src/main/java/org/apache/gluten/vectorized/CHShuffleSplitterJniWrapper.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.vectorized; +package org.apache.gluten.vectorized; import java.io.IOException; diff --git a/backends-clickhouse/src/main/java/io/glutenproject/vectorized/CHStreamReader.java b/backends-clickhouse/src/main/java/org/apache/gluten/vectorized/CHStreamReader.java similarity index 95% rename from backends-clickhouse/src/main/java/io/glutenproject/vectorized/CHStreamReader.java rename to backends-clickhouse/src/main/java/org/apache/gluten/vectorized/CHStreamReader.java index e7497c9de7e7..3151adfcebfc 100644 --- a/backends-clickhouse/src/main/java/io/glutenproject/vectorized/CHStreamReader.java +++ b/backends-clickhouse/src/main/java/org/apache/gluten/vectorized/CHStreamReader.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.vectorized; +package org.apache.gluten.vectorized; -import io.glutenproject.backendsapi.clickhouse.CHBackendSettings; +import org.apache.gluten.backendsapi.clickhouse.CHBackendSettings; import org.apache.spark.storage.CHShuffleReadStreamFactory; diff --git a/backends-clickhouse/src/main/java/io/glutenproject/vectorized/ExpressionEvaluatorJniWrapper.java b/backends-clickhouse/src/main/java/org/apache/gluten/vectorized/ExpressionEvaluatorJniWrapper.java similarity index 98% rename from backends-clickhouse/src/main/java/io/glutenproject/vectorized/ExpressionEvaluatorJniWrapper.java rename to backends-clickhouse/src/main/java/org/apache/gluten/vectorized/ExpressionEvaluatorJniWrapper.java index 2fd281b28dc3..0a008a04b559 100644 --- a/backends-clickhouse/src/main/java/io/glutenproject/vectorized/ExpressionEvaluatorJniWrapper.java +++ b/backends-clickhouse/src/main/java/org/apache/gluten/vectorized/ExpressionEvaluatorJniWrapper.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.vectorized; +package org.apache.gluten.vectorized; /** * This class is implemented in JNI. This provides the Java interface to invoke functions in JNI. diff --git a/backends-clickhouse/src/main/java/io/glutenproject/vectorized/IteratorWrapper.java b/backends-clickhouse/src/main/java/org/apache/gluten/vectorized/IteratorWrapper.java similarity index 96% rename from backends-clickhouse/src/main/java/io/glutenproject/vectorized/IteratorWrapper.java rename to backends-clickhouse/src/main/java/org/apache/gluten/vectorized/IteratorWrapper.java index 8abdac18e948..2cf6ff50f9ce 100644 --- a/backends-clickhouse/src/main/java/io/glutenproject/vectorized/IteratorWrapper.java +++ b/backends-clickhouse/src/main/java/org/apache/gluten/vectorized/IteratorWrapper.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.vectorized; +package org.apache.gluten.vectorized; import java.util.Iterator; diff --git a/backends-clickhouse/src/main/java/io/glutenproject/vectorized/LowCopyFileSegmentShuffleInputStream.java b/backends-clickhouse/src/main/java/org/apache/gluten/vectorized/LowCopyFileSegmentShuffleInputStream.java similarity index 97% rename from backends-clickhouse/src/main/java/io/glutenproject/vectorized/LowCopyFileSegmentShuffleInputStream.java rename to backends-clickhouse/src/main/java/org/apache/gluten/vectorized/LowCopyFileSegmentShuffleInputStream.java index 3b271f2b56e4..3d9157a8ef89 100644 --- a/backends-clickhouse/src/main/java/io/glutenproject/vectorized/LowCopyFileSegmentShuffleInputStream.java +++ b/backends-clickhouse/src/main/java/org/apache/gluten/vectorized/LowCopyFileSegmentShuffleInputStream.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.vectorized; +package org.apache.gluten.vectorized; -import io.glutenproject.exception.GlutenException; +import org.apache.gluten.exception.GlutenException; import io.netty.util.internal.PlatformDependent; import org.apache.spark.network.util.LimitedInputStream; diff --git a/backends-clickhouse/src/main/java/io/glutenproject/vectorized/LowCopyNettyShuffleInputStream.java b/backends-clickhouse/src/main/java/org/apache/gluten/vectorized/LowCopyNettyShuffleInputStream.java similarity index 96% rename from backends-clickhouse/src/main/java/io/glutenproject/vectorized/LowCopyNettyShuffleInputStream.java rename to backends-clickhouse/src/main/java/org/apache/gluten/vectorized/LowCopyNettyShuffleInputStream.java index 27b2c5b85e07..0eb921579916 100644 --- a/backends-clickhouse/src/main/java/io/glutenproject/vectorized/LowCopyNettyShuffleInputStream.java +++ b/backends-clickhouse/src/main/java/org/apache/gluten/vectorized/LowCopyNettyShuffleInputStream.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.vectorized; +package org.apache.gluten.vectorized; -import io.glutenproject.exception.GlutenException; +import org.apache.gluten.exception.GlutenException; import io.netty.buffer.ByteBuf; import io.netty.util.internal.PlatformDependent; diff --git a/backends-clickhouse/src/main/java/io/glutenproject/vectorized/OnHeapCopyShuffleInputStream.java b/backends-clickhouse/src/main/java/org/apache/gluten/vectorized/OnHeapCopyShuffleInputStream.java similarity index 96% rename from backends-clickhouse/src/main/java/io/glutenproject/vectorized/OnHeapCopyShuffleInputStream.java rename to backends-clickhouse/src/main/java/org/apache/gluten/vectorized/OnHeapCopyShuffleInputStream.java index 03bf6053429b..ea7a1e236c0f 100644 --- a/backends-clickhouse/src/main/java/io/glutenproject/vectorized/OnHeapCopyShuffleInputStream.java +++ b/backends-clickhouse/src/main/java/org/apache/gluten/vectorized/OnHeapCopyShuffleInputStream.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.vectorized; +package org.apache.gluten.vectorized; -import io.glutenproject.exception.GlutenException; +import org.apache.gluten.exception.GlutenException; import io.netty.util.internal.PlatformDependent; diff --git a/backends-clickhouse/src/main/java/io/glutenproject/vectorized/ShuffleInputStream.java b/backends-clickhouse/src/main/java/org/apache/gluten/vectorized/ShuffleInputStream.java similarity index 96% rename from backends-clickhouse/src/main/java/io/glutenproject/vectorized/ShuffleInputStream.java rename to backends-clickhouse/src/main/java/org/apache/gluten/vectorized/ShuffleInputStream.java index 9ce7896c10ec..3f30cc7e476a 100644 --- a/backends-clickhouse/src/main/java/io/glutenproject/vectorized/ShuffleInputStream.java +++ b/backends-clickhouse/src/main/java/org/apache/gluten/vectorized/ShuffleInputStream.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.vectorized; +package org.apache.gluten.vectorized; public interface ShuffleInputStream { diff --git a/backends-clickhouse/src/main/java/io/glutenproject/vectorized/SimpleExpressionEval.java b/backends-clickhouse/src/main/java/org/apache/gluten/vectorized/SimpleExpressionEval.java similarity index 93% rename from backends-clickhouse/src/main/java/io/glutenproject/vectorized/SimpleExpressionEval.java rename to backends-clickhouse/src/main/java/org/apache/gluten/vectorized/SimpleExpressionEval.java index 5719b194f095..b09cccb4580f 100644 --- a/backends-clickhouse/src/main/java/io/glutenproject/vectorized/SimpleExpressionEval.java +++ b/backends-clickhouse/src/main/java/org/apache/gluten/vectorized/SimpleExpressionEval.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.vectorized; +package org.apache.gluten.vectorized; -import io.glutenproject.execution.ColumnarNativeIterator; -import io.glutenproject.substrait.plan.PlanNode; +import org.apache.gluten.execution.ColumnarNativeIterator; +import org.apache.gluten.substrait.plan.PlanNode; import io.substrait.proto.Plan; import org.slf4j.Logger; diff --git a/backends-clickhouse/src/main/java/io/glutenproject/vectorized/StorageJoinBuilder.java b/backends-clickhouse/src/main/java/org/apache/gluten/vectorized/StorageJoinBuilder.java similarity index 91% rename from backends-clickhouse/src/main/java/io/glutenproject/vectorized/StorageJoinBuilder.java rename to backends-clickhouse/src/main/java/org/apache/gluten/vectorized/StorageJoinBuilder.java index 91d05a93d809..065be9de2557 100644 --- a/backends-clickhouse/src/main/java/io/glutenproject/vectorized/StorageJoinBuilder.java +++ b/backends-clickhouse/src/main/java/org/apache/gluten/vectorized/StorageJoinBuilder.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.vectorized; +package org.apache.gluten.vectorized; -import io.glutenproject.execution.BroadCastHashJoinContext; -import io.glutenproject.expression.ConverterUtils; -import io.glutenproject.expression.ConverterUtils$; -import io.glutenproject.substrait.type.TypeNode; -import io.glutenproject.utils.SubstraitUtil; +import org.apache.gluten.execution.BroadCastHashJoinContext; +import org.apache.gluten.expression.ConverterUtils; +import org.apache.gluten.expression.ConverterUtils$; +import org.apache.gluten.substrait.type.TypeNode; +import org.apache.gluten.utils.SubstraitUtil; import io.substrait.proto.NamedStruct; import io.substrait.proto.Type; diff --git a/backends-clickhouse/src/main/java/org/apache/spark/storage/CHShuffleReadStreamFactory.java b/backends-clickhouse/src/main/java/org/apache/spark/storage/CHShuffleReadStreamFactory.java index f60bafbc4785..acc68e173557 100644 --- a/backends-clickhouse/src/main/java/org/apache/spark/storage/CHShuffleReadStreamFactory.java +++ b/backends-clickhouse/src/main/java/org/apache/spark/storage/CHShuffleReadStreamFactory.java @@ -16,11 +16,11 @@ */ package org.apache.spark.storage; -import io.glutenproject.exception.GlutenException; -import io.glutenproject.vectorized.LowCopyFileSegmentShuffleInputStream; -import io.glutenproject.vectorized.LowCopyNettyShuffleInputStream; -import io.glutenproject.vectorized.OnHeapCopyShuffleInputStream; -import io.glutenproject.vectorized.ShuffleInputStream; +import org.apache.gluten.exception.GlutenException; +import org.apache.gluten.vectorized.LowCopyFileSegmentShuffleInputStream; +import org.apache.gluten.vectorized.LowCopyNettyShuffleInputStream; +import org.apache.gluten.vectorized.OnHeapCopyShuffleInputStream; +import org.apache.gluten.vectorized.ShuffleInputStream; import com.github.luben.zstd.ZstdInputStreamNoFinalizer; import com.ning.compress.lzf.LZFInputStream; diff --git a/backends-clickhouse/src/main/java/org/apache/spark/storage/CHShuffleWriteStreamFactory.java b/backends-clickhouse/src/main/java/org/apache/spark/storage/CHShuffleWriteStreamFactory.java index b8816bd464de..edec107916f5 100644 --- a/backends-clickhouse/src/main/java/org/apache/spark/storage/CHShuffleWriteStreamFactory.java +++ b/backends-clickhouse/src/main/java/org/apache/spark/storage/CHShuffleWriteStreamFactory.java @@ -16,7 +16,7 @@ */ package org.apache.spark.storage; -import io.glutenproject.exception.GlutenException; +import org.apache.gluten.exception.GlutenException; import com.github.luben.zstd.ZstdOutputStreamNoFinalizer; import com.ning.compress.lzf.LZFOutputStream; diff --git a/backends-clickhouse/src/main/resources/META-INF/services/io.glutenproject.backendsapi.Backend b/backends-clickhouse/src/main/resources/META-INF/services/io.glutenproject.backendsapi.Backend deleted file mode 100644 index 9c55de68c7da..000000000000 --- a/backends-clickhouse/src/main/resources/META-INF/services/io.glutenproject.backendsapi.Backend +++ /dev/null @@ -1 +0,0 @@ -io.glutenproject.backendsapi.clickhouse.CHBackend diff --git a/backends-clickhouse/src/main/resources/META-INF/services/org.apache.gluten.backendsapi.Backend b/backends-clickhouse/src/main/resources/META-INF/services/org.apache.gluten.backendsapi.Backend new file mode 100644 index 000000000000..bcd3cb1c03a0 --- /dev/null +++ b/backends-clickhouse/src/main/resources/META-INF/services/org.apache.gluten.backendsapi.Backend @@ -0,0 +1 @@ +org.apache.gluten.backendsapi.clickhouse.CHBackend diff --git a/backends-clickhouse/src/main/scala/io/glutenproject/backendsapi/clickhouse/CHBackend.scala b/backends-clickhouse/src/main/scala/org/apache/gluten/backendsapi/clickhouse/CHBackend.scala similarity index 96% rename from backends-clickhouse/src/main/scala/io/glutenproject/backendsapi/clickhouse/CHBackend.scala rename to backends-clickhouse/src/main/scala/org/apache/gluten/backendsapi/clickhouse/CHBackend.scala index a7c5c9980005..d85b6e26936f 100644 --- a/backends-clickhouse/src/main/scala/io/glutenproject/backendsapi/clickhouse/CHBackend.scala +++ b/backends-clickhouse/src/main/scala/org/apache/gluten/backendsapi/clickhouse/CHBackend.scala @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.backendsapi.clickhouse - -import io.glutenproject.{CH_BRANCH, CH_COMMIT, GlutenConfig} -import io.glutenproject.backendsapi._ -import io.glutenproject.expression.WindowFunctionsBuilder -import io.glutenproject.extension.ValidationResult -import io.glutenproject.substrait.rel.LocalFilesNode.ReadFileFormat -import io.glutenproject.substrait.rel.LocalFilesNode.ReadFileFormat._ +package org.apache.gluten.backendsapi.clickhouse + +import org.apache.gluten.{CH_BRANCH, CH_COMMIT, GlutenConfig} +import org.apache.gluten.backendsapi._ +import org.apache.gluten.expression.WindowFunctionsBuilder +import org.apache.gluten.extension.ValidationResult +import org.apache.gluten.substrait.rel.LocalFilesNode.ReadFileFormat +import org.apache.gluten.substrait.rel.LocalFilesNode.ReadFileFormat._ import org.apache.spark.SparkEnv import org.apache.spark.internal.Logging diff --git a/backends-clickhouse/src/main/scala/io/glutenproject/backendsapi/clickhouse/CHBroadcastApi.scala b/backends-clickhouse/src/main/scala/org/apache/gluten/backendsapi/clickhouse/CHBroadcastApi.scala similarity index 91% rename from backends-clickhouse/src/main/scala/io/glutenproject/backendsapi/clickhouse/CHBroadcastApi.scala rename to backends-clickhouse/src/main/scala/org/apache/gluten/backendsapi/clickhouse/CHBroadcastApi.scala index c5ab83ffe17e..d70ba6b8d2f1 100644 --- a/backends-clickhouse/src/main/scala/io/glutenproject/backendsapi/clickhouse/CHBroadcastApi.scala +++ b/backends-clickhouse/src/main/scala/org/apache/gluten/backendsapi/clickhouse/CHBroadcastApi.scala @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.backendsapi.clickhouse +package org.apache.gluten.backendsapi.clickhouse -import io.glutenproject.backendsapi.BroadcastApi -import io.glutenproject.execution.CHBroadcastBuildSideCache +import org.apache.gluten.backendsapi.BroadcastApi +import org.apache.gluten.execution.CHBroadcastBuildSideCache import org.apache.spark.internal.Logging import org.apache.spark.rpc.GlutenDriverEndpoint diff --git a/backends-clickhouse/src/main/scala/io/glutenproject/backendsapi/clickhouse/CHIteratorApi.scala b/backends-clickhouse/src/main/scala/org/apache/gluten/backendsapi/clickhouse/CHIteratorApi.scala similarity index 94% rename from backends-clickhouse/src/main/scala/io/glutenproject/backendsapi/clickhouse/CHIteratorApi.scala rename to backends-clickhouse/src/main/scala/org/apache/gluten/backendsapi/clickhouse/CHIteratorApi.scala index 08786a00b341..ee4db2d645c8 100644 --- a/backends-clickhouse/src/main/scala/io/glutenproject/backendsapi/clickhouse/CHIteratorApi.scala +++ b/backends-clickhouse/src/main/scala/org/apache/gluten/backendsapi/clickhouse/CHIteratorApi.scala @@ -14,18 +14,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.backendsapi.clickhouse +package org.apache.gluten.backendsapi.clickhouse -import io.glutenproject.{GlutenConfig, GlutenNumaBindingInfo} -import io.glutenproject.backendsapi.IteratorApi -import io.glutenproject.execution._ -import io.glutenproject.expression.ConverterUtils -import io.glutenproject.metrics.{GlutenTimeMetric, IMetrics, NativeMetrics} -import io.glutenproject.substrait.plan.PlanNode -import io.glutenproject.substrait.rel._ -import io.glutenproject.substrait.rel.LocalFilesNode.ReadFileFormat -import io.glutenproject.utils.LogLevelUtil -import io.glutenproject.vectorized.{CHNativeExpressionEvaluator, CloseableCHColumnBatchIterator, GeneralInIterator, GeneralOutIterator} +import org.apache.gluten.{GlutenConfig, GlutenNumaBindingInfo} +import org.apache.gluten.backendsapi.IteratorApi +import org.apache.gluten.execution._ +import org.apache.gluten.expression.ConverterUtils +import org.apache.gluten.metrics.{GlutenTimeMetric, IMetrics, NativeMetrics} +import org.apache.gluten.substrait.plan.PlanNode +import org.apache.gluten.substrait.rel._ +import org.apache.gluten.substrait.rel.LocalFilesNode.ReadFileFormat +import org.apache.gluten.utils.LogLevelUtil +import org.apache.gluten.vectorized.{CHNativeExpressionEvaluator, CloseableCHColumnBatchIterator, GeneralInIterator, GeneralOutIterator} import org.apache.spark.{InterruptibleIterator, SparkConf, SparkContext, TaskContext} import org.apache.spark.affinity.CHAffinity diff --git a/backends-clickhouse/src/main/scala/io/glutenproject/backendsapi/clickhouse/CHListenerApi.scala b/backends-clickhouse/src/main/scala/org/apache/gluten/backendsapi/clickhouse/CHListenerApi.scala similarity index 87% rename from backends-clickhouse/src/main/scala/io/glutenproject/backendsapi/clickhouse/CHListenerApi.scala rename to backends-clickhouse/src/main/scala/org/apache/gluten/backendsapi/clickhouse/CHListenerApi.scala index 5a1b529d5fd1..5901a11e4550 100644 --- a/backends-clickhouse/src/main/scala/io/glutenproject/backendsapi/clickhouse/CHListenerApi.scala +++ b/backends-clickhouse/src/main/scala/org/apache/gluten/backendsapi/clickhouse/CHListenerApi.scala @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.backendsapi.clickhouse +package org.apache.gluten.backendsapi.clickhouse -import io.glutenproject.GlutenConfig -import io.glutenproject.backendsapi.ListenerApi -import io.glutenproject.execution.CHBroadcastBuildSideCache -import io.glutenproject.execution.datasource.{GlutenOrcWriterInjects, GlutenParquetWriterInjects, GlutenRowSplitter} -import io.glutenproject.expression.UDFMappings -import io.glutenproject.vectorized.{CHNativeExpressionEvaluator, JniLibLoader} +import org.apache.gluten.GlutenConfig +import org.apache.gluten.backendsapi.ListenerApi +import org.apache.gluten.execution.CHBroadcastBuildSideCache +import org.apache.gluten.execution.datasource.{GlutenOrcWriterInjects, GlutenParquetWriterInjects, GlutenRowSplitter} +import org.apache.gluten.expression.UDFMappings +import org.apache.gluten.vectorized.{CHNativeExpressionEvaluator, JniLibLoader} import org.apache.spark.SparkConf import org.apache.spark.internal.Logging diff --git a/backends-clickhouse/src/main/scala/io/glutenproject/backendsapi/clickhouse/CHMetricsApi.scala b/backends-clickhouse/src/main/scala/org/apache/gluten/backendsapi/clickhouse/CHMetricsApi.scala similarity index 98% rename from backends-clickhouse/src/main/scala/io/glutenproject/backendsapi/clickhouse/CHMetricsApi.scala rename to backends-clickhouse/src/main/scala/org/apache/gluten/backendsapi/clickhouse/CHMetricsApi.scala index 0157b370fb6d..d41f370cfb21 100644 --- a/backends-clickhouse/src/main/scala/io/glutenproject/backendsapi/clickhouse/CHMetricsApi.scala +++ b/backends-clickhouse/src/main/scala/org/apache/gluten/backendsapi/clickhouse/CHMetricsApi.scala @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.backendsapi.clickhouse +package org.apache.gluten.backendsapi.clickhouse -import io.glutenproject.backendsapi.MetricsApi -import io.glutenproject.metrics._ -import io.glutenproject.substrait.{AggregationParams, JoinParams} -import io.glutenproject.utils.LogLevelUtil +import org.apache.gluten.backendsapi.MetricsApi +import org.apache.gluten.metrics._ +import org.apache.gluten.substrait.{AggregationParams, JoinParams} +import org.apache.gluten.utils.LogLevelUtil import org.apache.spark.SparkContext import org.apache.spark.internal.Logging diff --git a/backends-clickhouse/src/main/scala/io/glutenproject/backendsapi/clickhouse/CHSparkPlanExecApi.scala b/backends-clickhouse/src/main/scala/org/apache/gluten/backendsapi/clickhouse/CHSparkPlanExecApi.scala similarity index 97% rename from backends-clickhouse/src/main/scala/io/glutenproject/backendsapi/clickhouse/CHSparkPlanExecApi.scala rename to backends-clickhouse/src/main/scala/org/apache/gluten/backendsapi/clickhouse/CHSparkPlanExecApi.scala index eef27665f789..fdc303525651 100644 --- a/backends-clickhouse/src/main/scala/io/glutenproject/backendsapi/clickhouse/CHSparkPlanExecApi.scala +++ b/backends-clickhouse/src/main/scala/org/apache/gluten/backendsapi/clickhouse/CHSparkPlanExecApi.scala @@ -14,20 +14,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.backendsapi.clickhouse - -import io.glutenproject.GlutenConfig -import io.glutenproject.backendsapi.{BackendsApiManager, SparkPlanExecApi} -import io.glutenproject.exception.GlutenNotSupportException -import io.glutenproject.execution._ -import io.glutenproject.expression._ -import io.glutenproject.expression.ConverterUtils.FunctionConfig -import io.glutenproject.extension.{CountDistinctWithoutExpand, FallbackBroadcastHashJoin, FallbackBroadcastHashJoinPrepQueryStage} -import io.glutenproject.extension.columnar.AddTransformHintRule -import io.glutenproject.extension.columnar.MiscColumnarRules.TransformPreOverrides -import io.glutenproject.substrait.expression.{ExpressionBuilder, ExpressionNode, WindowFunctionNode} -import io.glutenproject.utils.CHJoinValidateUtil -import io.glutenproject.vectorized.CHColumnarBatchSerializer +package org.apache.gluten.backendsapi.clickhouse + +import org.apache.gluten.GlutenConfig +import org.apache.gluten.backendsapi.{BackendsApiManager, SparkPlanExecApi} +import org.apache.gluten.exception.GlutenNotSupportException +import org.apache.gluten.execution._ +import org.apache.gluten.expression._ +import org.apache.gluten.expression.ConverterUtils.FunctionConfig +import org.apache.gluten.extension.{CountDistinctWithoutExpand, FallbackBroadcastHashJoin, FallbackBroadcastHashJoinPrepQueryStage} +import org.apache.gluten.extension.columnar.AddTransformHintRule +import org.apache.gluten.extension.columnar.MiscColumnarRules.TransformPreOverrides +import org.apache.gluten.substrait.expression.{ExpressionBuilder, ExpressionNode, WindowFunctionNode} +import org.apache.gluten.utils.CHJoinValidateUtil +import org.apache.gluten.vectorized.CHColumnarBatchSerializer import org.apache.spark.{ShuffleDependency, SparkException} import org.apache.spark.rdd.RDD diff --git a/backends-clickhouse/src/main/scala/io/glutenproject/backendsapi/clickhouse/CHTransformerApi.scala b/backends-clickhouse/src/main/scala/org/apache/gluten/backendsapi/clickhouse/CHTransformerApi.scala similarity index 96% rename from backends-clickhouse/src/main/scala/io/glutenproject/backendsapi/clickhouse/CHTransformerApi.scala rename to backends-clickhouse/src/main/scala/org/apache/gluten/backendsapi/clickhouse/CHTransformerApi.scala index 88d0e5c440a9..65e6165e50f1 100644 --- a/backends-clickhouse/src/main/scala/io/glutenproject/backendsapi/clickhouse/CHTransformerApi.scala +++ b/backends-clickhouse/src/main/scala/org/apache/gluten/backendsapi/clickhouse/CHTransformerApi.scala @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.backendsapi.clickhouse +package org.apache.gluten.backendsapi.clickhouse -import io.glutenproject.backendsapi.TransformerApi -import io.glutenproject.execution.CHHashAggregateExecTransformer -import io.glutenproject.expression.ConverterUtils -import io.glutenproject.substrait.expression.{BooleanLiteralNode, ExpressionBuilder, ExpressionNode} -import io.glutenproject.utils.{CHInputPartitionsUtil, ExpressionDocUtil} +import org.apache.gluten.backendsapi.TransformerApi +import org.apache.gluten.execution.CHHashAggregateExecTransformer +import org.apache.gluten.expression.ConverterUtils +import org.apache.gluten.substrait.expression.{BooleanLiteralNode, ExpressionBuilder, ExpressionNode} +import org.apache.gluten.utils.{CHInputPartitionsUtil, ExpressionDocUtil} import org.apache.spark.internal.Logging import org.apache.spark.sql.catalyst.expressions.Attribute diff --git a/backends-clickhouse/src/main/scala/io/glutenproject/backendsapi/clickhouse/CHValidatorApi.scala b/backends-clickhouse/src/main/scala/org/apache/gluten/backendsapi/clickhouse/CHValidatorApi.scala similarity index 90% rename from backends-clickhouse/src/main/scala/io/glutenproject/backendsapi/clickhouse/CHValidatorApi.scala rename to backends-clickhouse/src/main/scala/org/apache/gluten/backendsapi/clickhouse/CHValidatorApi.scala index cbf00c08bf51..9e4cbf760974 100644 --- a/backends-clickhouse/src/main/scala/io/glutenproject/backendsapi/clickhouse/CHValidatorApi.scala +++ b/backends-clickhouse/src/main/scala/org/apache/gluten/backendsapi/clickhouse/CHValidatorApi.scala @@ -14,17 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.backendsapi.clickhouse +package org.apache.gluten.backendsapi.clickhouse -import io.glutenproject.GlutenConfig -import io.glutenproject.backendsapi.{BackendsApiManager, ValidatorApi} -import io.glutenproject.expression.ExpressionConverter -import io.glutenproject.substrait.SubstraitContext -import io.glutenproject.substrait.expression.SelectionNode -import io.glutenproject.substrait.plan.PlanNode -import io.glutenproject.utils.CHExpressionUtil -import io.glutenproject.validate.NativePlanValidationInfo -import io.glutenproject.vectorized.CHNativeExpressionEvaluator +import org.apache.gluten.GlutenConfig +import org.apache.gluten.backendsapi.{BackendsApiManager, ValidatorApi} +import org.apache.gluten.expression.ExpressionConverter +import org.apache.gluten.substrait.SubstraitContext +import org.apache.gluten.substrait.expression.SelectionNode +import org.apache.gluten.substrait.plan.PlanNode +import org.apache.gluten.utils.CHExpressionUtil +import org.apache.gluten.validate.NativePlanValidationInfo +import org.apache.gluten.vectorized.CHNativeExpressionEvaluator import org.apache.spark.internal.Logging import org.apache.spark.shuffle.utils.RangePartitionerBoundsGenerator diff --git a/backends-clickhouse/src/main/scala/io/glutenproject/execution/CHBroadcastBuildSideCache.scala b/backends-clickhouse/src/main/scala/org/apache/gluten/execution/CHBroadcastBuildSideCache.scala similarity index 95% rename from backends-clickhouse/src/main/scala/io/glutenproject/execution/CHBroadcastBuildSideCache.scala rename to backends-clickhouse/src/main/scala/org/apache/gluten/execution/CHBroadcastBuildSideCache.scala index df9733041923..f8060447b1f9 100644 --- a/backends-clickhouse/src/main/scala/io/glutenproject/execution/CHBroadcastBuildSideCache.scala +++ b/backends-clickhouse/src/main/scala/org/apache/gluten/execution/CHBroadcastBuildSideCache.scala @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution +package org.apache.gluten.execution -import io.glutenproject.backendsapi.clickhouse.CHBackendSettings -import io.glutenproject.vectorized.StorageJoinBuilder +import org.apache.gluten.backendsapi.clickhouse.CHBackendSettings +import org.apache.gluten.vectorized.StorageJoinBuilder import org.apache.spark.SparkEnv import org.apache.spark.broadcast.Broadcast diff --git a/backends-clickhouse/src/main/scala/io/glutenproject/execution/CHFilterExecTransformer.scala b/backends-clickhouse/src/main/scala/org/apache/gluten/execution/CHFilterExecTransformer.scala similarity index 98% rename from backends-clickhouse/src/main/scala/io/glutenproject/execution/CHFilterExecTransformer.scala rename to backends-clickhouse/src/main/scala/org/apache/gluten/execution/CHFilterExecTransformer.scala index 9b4d55a1d379..79ddf2942c3e 100644 --- a/backends-clickhouse/src/main/scala/io/glutenproject/execution/CHFilterExecTransformer.scala +++ b/backends-clickhouse/src/main/scala/org/apache/gluten/execution/CHFilterExecTransformer.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution +package org.apache.gluten.execution import org.apache.spark.sql.catalyst.expressions.{And, Expression} import org.apache.spark.sql.execution.SparkPlan diff --git a/backends-clickhouse/src/main/scala/io/glutenproject/execution/CHGenerateExecTransformer.scala b/backends-clickhouse/src/main/scala/org/apache/gluten/execution/CHGenerateExecTransformer.scala similarity index 90% rename from backends-clickhouse/src/main/scala/io/glutenproject/execution/CHGenerateExecTransformer.scala rename to backends-clickhouse/src/main/scala/org/apache/gluten/execution/CHGenerateExecTransformer.scala index b4d84141eab0..f1e7d305a358 100644 --- a/backends-clickhouse/src/main/scala/io/glutenproject/execution/CHGenerateExecTransformer.scala +++ b/backends-clickhouse/src/main/scala/org/apache/gluten/execution/CHGenerateExecTransformer.scala @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution +package org.apache.gluten.execution -import io.glutenproject.extension.ValidationResult -import io.glutenproject.metrics.{GenerateMetricsUpdater, MetricsUpdater} -import io.glutenproject.substrait.SubstraitContext -import io.glutenproject.substrait.expression.ExpressionNode -import io.glutenproject.substrait.rel.{RelBuilder, RelNode} +import org.apache.gluten.extension.ValidationResult +import org.apache.gluten.metrics.{GenerateMetricsUpdater, MetricsUpdater} +import org.apache.gluten.substrait.SubstraitContext +import org.apache.gluten.substrait.expression.ExpressionNode +import org.apache.gluten.substrait.rel.{RelBuilder, RelNode} import org.apache.spark.sql.catalyst.expressions._ import org.apache.spark.sql.execution.SparkPlan diff --git a/backends-clickhouse/src/main/scala/io/glutenproject/execution/CHHashAggregateExecTransformer.scala b/backends-clickhouse/src/main/scala/org/apache/gluten/execution/CHHashAggregateExecTransformer.scala similarity index 96% rename from backends-clickhouse/src/main/scala/io/glutenproject/execution/CHHashAggregateExecTransformer.scala rename to backends-clickhouse/src/main/scala/org/apache/gluten/execution/CHHashAggregateExecTransformer.scala index 8a312c456851..82c492f4c8cf 100644 --- a/backends-clickhouse/src/main/scala/io/glutenproject/execution/CHHashAggregateExecTransformer.scala +++ b/backends-clickhouse/src/main/scala/org/apache/gluten/execution/CHHashAggregateExecTransformer.scala @@ -14,17 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution - -import io.glutenproject.backendsapi.BackendsApiManager -import io.glutenproject.exception.GlutenNotSupportException -import io.glutenproject.execution.CHHashAggregateExecTransformer.getAggregateResultAttributes -import io.glutenproject.expression._ -import io.glutenproject.substrait.`type`.{TypeBuilder, TypeNode} -import io.glutenproject.substrait.{AggregationParams, SubstraitContext} -import io.glutenproject.substrait.expression.{AggregateFunctionNode, ExpressionBuilder, ExpressionNode} -import io.glutenproject.substrait.extensions.{AdvancedExtensionNode, ExtensionBuilder} -import io.glutenproject.substrait.rel.{RelBuilder, RelNode} +package org.apache.gluten.execution + +import org.apache.gluten.backendsapi.BackendsApiManager +import org.apache.gluten.exception.GlutenNotSupportException +import org.apache.gluten.execution.CHHashAggregateExecTransformer.getAggregateResultAttributes +import org.apache.gluten.expression._ +import org.apache.gluten.substrait.`type`.{TypeBuilder, TypeNode} +import org.apache.gluten.substrait.{AggregationParams, SubstraitContext} +import org.apache.gluten.substrait.expression.{AggregateFunctionNode, ExpressionBuilder, ExpressionNode} +import org.apache.gluten.substrait.extensions.{AdvancedExtensionNode, ExtensionBuilder} +import org.apache.gluten.substrait.rel.{RelBuilder, RelNode} import org.apache.spark.sql.catalyst.expressions._ import org.apache.spark.sql.catalyst.expressions.aggregate._ diff --git a/backends-clickhouse/src/main/scala/io/glutenproject/execution/CHHashJoinExecTransformer.scala b/backends-clickhouse/src/main/scala/org/apache/gluten/execution/CHHashJoinExecTransformer.scala similarity index 95% rename from backends-clickhouse/src/main/scala/io/glutenproject/execution/CHHashJoinExecTransformer.scala rename to backends-clickhouse/src/main/scala/org/apache/gluten/execution/CHHashJoinExecTransformer.scala index 3f801acd2e10..046f26043c5d 100644 --- a/backends-clickhouse/src/main/scala/io/glutenproject/execution/CHHashJoinExecTransformer.scala +++ b/backends-clickhouse/src/main/scala/org/apache/gluten/execution/CHHashJoinExecTransformer.scala @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution +package org.apache.gluten.execution -import io.glutenproject.backendsapi.clickhouse.CHIteratorApi -import io.glutenproject.extension.ValidationResult -import io.glutenproject.utils.CHJoinValidateUtil +import org.apache.gluten.backendsapi.clickhouse.CHIteratorApi +import org.apache.gluten.extension.ValidationResult +import org.apache.gluten.utils.CHJoinValidateUtil import org.apache.spark.{broadcast, SparkContext} import org.apache.spark.sql.catalyst.expressions._ diff --git a/backends-clickhouse/src/main/scala/io/glutenproject/execution/GlutenMergeTreePartition.scala b/backends-clickhouse/src/main/scala/org/apache/gluten/execution/GlutenMergeTreePartition.scala similarity index 94% rename from backends-clickhouse/src/main/scala/io/glutenproject/execution/GlutenMergeTreePartition.scala rename to backends-clickhouse/src/main/scala/org/apache/gluten/execution/GlutenMergeTreePartition.scala index be17c713e099..b28f9d01fc75 100644 --- a/backends-clickhouse/src/main/scala/io/glutenproject/execution/GlutenMergeTreePartition.scala +++ b/backends-clickhouse/src/main/scala/org/apache/gluten/execution/GlutenMergeTreePartition.scala @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution +package org.apache.gluten.execution -import io.glutenproject.substrait.plan.PlanBuilder +import org.apache.gluten.substrait.plan.PlanBuilder case class MergeTreePartSplit( name: String, diff --git a/backends-clickhouse/src/main/scala/io/glutenproject/execution/NativeFileScanColumnarRDD.scala b/backends-clickhouse/src/main/scala/org/apache/gluten/execution/NativeFileScanColumnarRDD.scala similarity index 94% rename from backends-clickhouse/src/main/scala/io/glutenproject/execution/NativeFileScanColumnarRDD.scala rename to backends-clickhouse/src/main/scala/org/apache/gluten/execution/NativeFileScanColumnarRDD.scala index 0bbc8d3814e5..624a4390d729 100644 --- a/backends-clickhouse/src/main/scala/io/glutenproject/execution/NativeFileScanColumnarRDD.scala +++ b/backends-clickhouse/src/main/scala/org/apache/gluten/execution/NativeFileScanColumnarRDD.scala @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution +package org.apache.gluten.execution -import io.glutenproject.metrics.GlutenTimeMetric -import io.glutenproject.vectorized.{CHNativeExpressionEvaluator, CloseableCHColumnBatchIterator, GeneralInIterator, GeneralOutIterator} +import org.apache.gluten.metrics.GlutenTimeMetric +import org.apache.gluten.vectorized.{CHNativeExpressionEvaluator, CloseableCHColumnBatchIterator, GeneralInIterator, GeneralOutIterator} import org.apache.spark.{Partition, SparkContext, SparkException, TaskContext} import org.apache.spark.rdd.RDD diff --git a/backends-clickhouse/src/main/scala/io/glutenproject/expression/CHExpressionTransformer.scala b/backends-clickhouse/src/main/scala/org/apache/gluten/expression/CHExpressionTransformer.scala similarity index 96% rename from backends-clickhouse/src/main/scala/io/glutenproject/expression/CHExpressionTransformer.scala rename to backends-clickhouse/src/main/scala/org/apache/gluten/expression/CHExpressionTransformer.scala index a52c67265971..7d9dbaddc073 100644 --- a/backends-clickhouse/src/main/scala/io/glutenproject/expression/CHExpressionTransformer.scala +++ b/backends-clickhouse/src/main/scala/org/apache/gluten/expression/CHExpressionTransformer.scala @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.expression +package org.apache.gluten.expression -import io.glutenproject.backendsapi.clickhouse.CHBackendSettings -import io.glutenproject.exception.GlutenNotSupportException -import io.glutenproject.expression.ConverterUtils.FunctionConfig -import io.glutenproject.substrait.expression._ +import org.apache.gluten.backendsapi.clickhouse.CHBackendSettings +import org.apache.gluten.exception.GlutenNotSupportException +import org.apache.gluten.expression.ConverterUtils.FunctionConfig +import org.apache.gluten.substrait.expression._ import org.apache.spark.sql.catalyst.expressions._ import org.apache.spark.sql.internal.SQLConf diff --git a/backends-clickhouse/src/main/scala/io/glutenproject/extension/FallbackBroadcaseHashJoinRules.scala b/backends-clickhouse/src/main/scala/org/apache/gluten/extension/FallbackBroadcaseHashJoinRules.scala similarity index 96% rename from backends-clickhouse/src/main/scala/io/glutenproject/extension/FallbackBroadcaseHashJoinRules.scala rename to backends-clickhouse/src/main/scala/org/apache/gluten/extension/FallbackBroadcaseHashJoinRules.scala index 52ec8ce47fb3..873ecb8342a6 100644 --- a/backends-clickhouse/src/main/scala/io/glutenproject/extension/FallbackBroadcaseHashJoinRules.scala +++ b/backends-clickhouse/src/main/scala/org/apache/gluten/extension/FallbackBroadcaseHashJoinRules.scala @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.extension +package org.apache.gluten.extension -import io.glutenproject.GlutenConfig -import io.glutenproject.backendsapi.BackendsApiManager -import io.glutenproject.extension.columnar._ -import io.glutenproject.extension.columnar.TransformHints.EncodeTransformableTagImplicits -import io.glutenproject.utils.PhysicalPlanSelector +import org.apache.gluten.GlutenConfig +import org.apache.gluten.backendsapi.BackendsApiManager +import org.apache.gluten.extension.columnar._ +import org.apache.gluten.extension.columnar.TransformHints.EncodeTransformableTagImplicits +import org.apache.gluten.utils.PhysicalPlanSelector import org.apache.spark.sql.SparkSession import org.apache.spark.sql.catalyst.optimizer.{BuildLeft, BuildRight} diff --git a/backends-clickhouse/src/main/scala/io/glutenproject/metrics/BatchScanMetricsUpdater.scala b/backends-clickhouse/src/main/scala/org/apache/gluten/metrics/BatchScanMetricsUpdater.scala similarity index 98% rename from backends-clickhouse/src/main/scala/io/glutenproject/metrics/BatchScanMetricsUpdater.scala rename to backends-clickhouse/src/main/scala/org/apache/gluten/metrics/BatchScanMetricsUpdater.scala index d173f171502d..2ee6e271df1d 100644 --- a/backends-clickhouse/src/main/scala/io/glutenproject/metrics/BatchScanMetricsUpdater.scala +++ b/backends-clickhouse/src/main/scala/org/apache/gluten/metrics/BatchScanMetricsUpdater.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.metrics +package org.apache.gluten.metrics import org.apache.spark.sql.execution.metric.SQLMetric import org.apache.spark.sql.utils.OASPackageBridge.InputMetricsWrapper diff --git a/backends-clickhouse/src/main/scala/io/glutenproject/metrics/ExpandMetricsUpdater.scala b/backends-clickhouse/src/main/scala/org/apache/gluten/metrics/ExpandMetricsUpdater.scala similarity index 98% rename from backends-clickhouse/src/main/scala/io/glutenproject/metrics/ExpandMetricsUpdater.scala rename to backends-clickhouse/src/main/scala/org/apache/gluten/metrics/ExpandMetricsUpdater.scala index d43cbcbc6d9f..e3eb0ceccfb9 100644 --- a/backends-clickhouse/src/main/scala/io/glutenproject/metrics/ExpandMetricsUpdater.scala +++ b/backends-clickhouse/src/main/scala/org/apache/gluten/metrics/ExpandMetricsUpdater.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.metrics +package org.apache.gluten.metrics import org.apache.spark.sql.execution.metric.SQLMetric diff --git a/backends-clickhouse/src/main/scala/io/glutenproject/metrics/FileSourceScanMetricsUpdater.scala b/backends-clickhouse/src/main/scala/org/apache/gluten/metrics/FileSourceScanMetricsUpdater.scala similarity index 99% rename from backends-clickhouse/src/main/scala/io/glutenproject/metrics/FileSourceScanMetricsUpdater.scala rename to backends-clickhouse/src/main/scala/org/apache/gluten/metrics/FileSourceScanMetricsUpdater.scala index 497e8b780810..f44c5ed1a1dd 100644 --- a/backends-clickhouse/src/main/scala/io/glutenproject/metrics/FileSourceScanMetricsUpdater.scala +++ b/backends-clickhouse/src/main/scala/org/apache/gluten/metrics/FileSourceScanMetricsUpdater.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.metrics +package org.apache.gluten.metrics import org.apache.spark.sql.execution.metric.SQLMetric import org.apache.spark.sql.utils.OASPackageBridge.InputMetricsWrapper diff --git a/backends-clickhouse/src/main/scala/io/glutenproject/metrics/FilterMetricsUpdater.scala b/backends-clickhouse/src/main/scala/org/apache/gluten/metrics/FilterMetricsUpdater.scala similarity index 98% rename from backends-clickhouse/src/main/scala/io/glutenproject/metrics/FilterMetricsUpdater.scala rename to backends-clickhouse/src/main/scala/org/apache/gluten/metrics/FilterMetricsUpdater.scala index b44a9e3820ca..d41957c8603d 100644 --- a/backends-clickhouse/src/main/scala/io/glutenproject/metrics/FilterMetricsUpdater.scala +++ b/backends-clickhouse/src/main/scala/org/apache/gluten/metrics/FilterMetricsUpdater.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.metrics +package org.apache.gluten.metrics import org.apache.spark.sql.execution.metric.SQLMetric diff --git a/backends-clickhouse/src/main/scala/io/glutenproject/metrics/GenerateMetricsUpdater.scala b/backends-clickhouse/src/main/scala/org/apache/gluten/metrics/GenerateMetricsUpdater.scala similarity index 98% rename from backends-clickhouse/src/main/scala/io/glutenproject/metrics/GenerateMetricsUpdater.scala rename to backends-clickhouse/src/main/scala/org/apache/gluten/metrics/GenerateMetricsUpdater.scala index 5f2e3f63c0ef..8fea9c761f1d 100644 --- a/backends-clickhouse/src/main/scala/io/glutenproject/metrics/GenerateMetricsUpdater.scala +++ b/backends-clickhouse/src/main/scala/org/apache/gluten/metrics/GenerateMetricsUpdater.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.metrics +package org.apache.gluten.metrics import org.apache.spark.sql.execution.metric.SQLMetric diff --git a/backends-clickhouse/src/main/scala/io/glutenproject/metrics/HashAggregateMetricsUpdater.scala b/backends-clickhouse/src/main/scala/org/apache/gluten/metrics/HashAggregateMetricsUpdater.scala similarity index 98% rename from backends-clickhouse/src/main/scala/io/glutenproject/metrics/HashAggregateMetricsUpdater.scala rename to backends-clickhouse/src/main/scala/org/apache/gluten/metrics/HashAggregateMetricsUpdater.scala index 8f6e07a9469f..e2014e5b8b84 100644 --- a/backends-clickhouse/src/main/scala/io/glutenproject/metrics/HashAggregateMetricsUpdater.scala +++ b/backends-clickhouse/src/main/scala/org/apache/gluten/metrics/HashAggregateMetricsUpdater.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.metrics +package org.apache.gluten.metrics import org.apache.spark.internal.Logging import org.apache.spark.sql.execution.metric.SQLMetric diff --git a/backends-clickhouse/src/main/scala/io/glutenproject/metrics/HashJoinMetricsUpdater.scala b/backends-clickhouse/src/main/scala/org/apache/gluten/metrics/HashJoinMetricsUpdater.scala similarity index 99% rename from backends-clickhouse/src/main/scala/io/glutenproject/metrics/HashJoinMetricsUpdater.scala rename to backends-clickhouse/src/main/scala/org/apache/gluten/metrics/HashJoinMetricsUpdater.scala index 180bcc03482b..3c35286c1c13 100644 --- a/backends-clickhouse/src/main/scala/io/glutenproject/metrics/HashJoinMetricsUpdater.scala +++ b/backends-clickhouse/src/main/scala/org/apache/gluten/metrics/HashJoinMetricsUpdater.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.metrics +package org.apache.gluten.metrics import org.apache.spark.internal.Logging import org.apache.spark.sql.execution.metric.SQLMetric diff --git a/backends-clickhouse/src/main/scala/io/glutenproject/metrics/HiveTableScanMetricsUpdater.scala b/backends-clickhouse/src/main/scala/org/apache/gluten/metrics/HiveTableScanMetricsUpdater.scala similarity index 98% rename from backends-clickhouse/src/main/scala/io/glutenproject/metrics/HiveTableScanMetricsUpdater.scala rename to backends-clickhouse/src/main/scala/org/apache/gluten/metrics/HiveTableScanMetricsUpdater.scala index 89c3198da403..85e110987b9c 100644 --- a/backends-clickhouse/src/main/scala/io/glutenproject/metrics/HiveTableScanMetricsUpdater.scala +++ b/backends-clickhouse/src/main/scala/org/apache/gluten/metrics/HiveTableScanMetricsUpdater.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.metrics +package org.apache.gluten.metrics import org.apache.spark.sql.execution.metric.SQLMetric import org.apache.spark.sql.utils.OASPackageBridge.InputMetricsWrapper diff --git a/backends-clickhouse/src/main/scala/io/glutenproject/metrics/InputIteratorMetricsUpdater.scala b/backends-clickhouse/src/main/scala/org/apache/gluten/metrics/InputIteratorMetricsUpdater.scala similarity index 98% rename from backends-clickhouse/src/main/scala/io/glutenproject/metrics/InputIteratorMetricsUpdater.scala rename to backends-clickhouse/src/main/scala/org/apache/gluten/metrics/InputIteratorMetricsUpdater.scala index 3a3477659754..462cad82f7a1 100644 --- a/backends-clickhouse/src/main/scala/io/glutenproject/metrics/InputIteratorMetricsUpdater.scala +++ b/backends-clickhouse/src/main/scala/org/apache/gluten/metrics/InputIteratorMetricsUpdater.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.metrics +package org.apache.gluten.metrics import org.apache.spark.sql.execution.metric.SQLMetric diff --git a/backends-clickhouse/src/main/scala/io/glutenproject/metrics/LimitMetricsUpdater.scala b/backends-clickhouse/src/main/scala/org/apache/gluten/metrics/LimitMetricsUpdater.scala similarity index 97% rename from backends-clickhouse/src/main/scala/io/glutenproject/metrics/LimitMetricsUpdater.scala rename to backends-clickhouse/src/main/scala/org/apache/gluten/metrics/LimitMetricsUpdater.scala index fe3009b04cc6..0b1ee8e92909 100644 --- a/backends-clickhouse/src/main/scala/io/glutenproject/metrics/LimitMetricsUpdater.scala +++ b/backends-clickhouse/src/main/scala/org/apache/gluten/metrics/LimitMetricsUpdater.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.metrics +package org.apache.gluten.metrics import org.apache.spark.sql.execution.metric.SQLMetric diff --git a/backends-clickhouse/src/main/scala/io/glutenproject/metrics/MetricsUtil.scala b/backends-clickhouse/src/main/scala/org/apache/gluten/metrics/MetricsUtil.scala similarity index 98% rename from backends-clickhouse/src/main/scala/io/glutenproject/metrics/MetricsUtil.scala rename to backends-clickhouse/src/main/scala/org/apache/gluten/metrics/MetricsUtil.scala index d72f68c3c0b6..a6dfb3dbcb1f 100644 --- a/backends-clickhouse/src/main/scala/io/glutenproject/metrics/MetricsUtil.scala +++ b/backends-clickhouse/src/main/scala/org/apache/gluten/metrics/MetricsUtil.scala @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.metrics +package org.apache.gluten.metrics -import io.glutenproject.execution._ -import io.glutenproject.substrait.{AggregationParams, JoinParams} +import org.apache.gluten.execution._ +import org.apache.gluten.substrait.{AggregationParams, JoinParams} import org.apache.spark.internal.Logging import org.apache.spark.sql.execution.SparkPlan diff --git a/backends-clickhouse/src/main/scala/io/glutenproject/metrics/ProjectMetricsUpdater.scala b/backends-clickhouse/src/main/scala/org/apache/gluten/metrics/ProjectMetricsUpdater.scala similarity index 98% rename from backends-clickhouse/src/main/scala/io/glutenproject/metrics/ProjectMetricsUpdater.scala rename to backends-clickhouse/src/main/scala/org/apache/gluten/metrics/ProjectMetricsUpdater.scala index 4bd445590e81..f307f3c7dc98 100644 --- a/backends-clickhouse/src/main/scala/io/glutenproject/metrics/ProjectMetricsUpdater.scala +++ b/backends-clickhouse/src/main/scala/org/apache/gluten/metrics/ProjectMetricsUpdater.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.metrics +package org.apache.gluten.metrics import org.apache.spark.sql.execution.metric.SQLMetric diff --git a/backends-clickhouse/src/main/scala/io/glutenproject/metrics/SortMergeJoinMetricsUpdater.scala b/backends-clickhouse/src/main/scala/org/apache/gluten/metrics/SortMergeJoinMetricsUpdater.scala similarity index 96% rename from backends-clickhouse/src/main/scala/io/glutenproject/metrics/SortMergeJoinMetricsUpdater.scala rename to backends-clickhouse/src/main/scala/org/apache/gluten/metrics/SortMergeJoinMetricsUpdater.scala index 8fd5edaf5f0f..e8ebbbd2c973 100644 --- a/backends-clickhouse/src/main/scala/io/glutenproject/metrics/SortMergeJoinMetricsUpdater.scala +++ b/backends-clickhouse/src/main/scala/org/apache/gluten/metrics/SortMergeJoinMetricsUpdater.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.metrics +package org.apache.gluten.metrics import org.apache.spark.sql.execution.metric.SQLMetric diff --git a/backends-clickhouse/src/main/scala/io/glutenproject/metrics/SortMetricsUpdater.scala b/backends-clickhouse/src/main/scala/org/apache/gluten/metrics/SortMetricsUpdater.scala similarity index 98% rename from backends-clickhouse/src/main/scala/io/glutenproject/metrics/SortMetricsUpdater.scala rename to backends-clickhouse/src/main/scala/org/apache/gluten/metrics/SortMetricsUpdater.scala index e53ba6ccfb48..bd7813a113eb 100644 --- a/backends-clickhouse/src/main/scala/io/glutenproject/metrics/SortMetricsUpdater.scala +++ b/backends-clickhouse/src/main/scala/org/apache/gluten/metrics/SortMetricsUpdater.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.metrics +package org.apache.gluten.metrics import org.apache.spark.sql.execution.metric.SQLMetric diff --git a/backends-clickhouse/src/main/scala/io/glutenproject/metrics/WindowMetricsUpdater.scala b/backends-clickhouse/src/main/scala/org/apache/gluten/metrics/WindowMetricsUpdater.scala similarity index 98% rename from backends-clickhouse/src/main/scala/io/glutenproject/metrics/WindowMetricsUpdater.scala rename to backends-clickhouse/src/main/scala/org/apache/gluten/metrics/WindowMetricsUpdater.scala index e36713c34516..1a462229b036 100644 --- a/backends-clickhouse/src/main/scala/io/glutenproject/metrics/WindowMetricsUpdater.scala +++ b/backends-clickhouse/src/main/scala/org/apache/gluten/metrics/WindowMetricsUpdater.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.metrics +package org.apache.gluten.metrics import org.apache.spark.sql.execution.metric.SQLMetric diff --git a/backends-clickhouse/src/main/scala/io/glutenproject/utils/CHExpressionUtil.scala b/backends-clickhouse/src/main/scala/org/apache/gluten/utils/CHExpressionUtil.scala similarity index 97% rename from backends-clickhouse/src/main/scala/io/glutenproject/utils/CHExpressionUtil.scala rename to backends-clickhouse/src/main/scala/org/apache/gluten/utils/CHExpressionUtil.scala index cf90dad6137d..54945fc74933 100644 --- a/backends-clickhouse/src/main/scala/io/glutenproject/utils/CHExpressionUtil.scala +++ b/backends-clickhouse/src/main/scala/org/apache/gluten/utils/CHExpressionUtil.scala @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.utils +package org.apache.gluten.utils -import io.glutenproject.expression.ExpressionNames._ -import io.glutenproject.utils.FunctionValidator._ +import org.apache.gluten.expression.ExpressionNames._ +import org.apache.gluten.utils.FunctionValidator._ import org.apache.spark.sql.catalyst.expressions._ import org.apache.spark.sql.types._ diff --git a/backends-clickhouse/src/main/scala/io/glutenproject/utils/CHInputPartitionsUtil.scala b/backends-clickhouse/src/main/scala/org/apache/gluten/utils/CHInputPartitionsUtil.scala similarity index 97% rename from backends-clickhouse/src/main/scala/io/glutenproject/utils/CHInputPartitionsUtil.scala rename to backends-clickhouse/src/main/scala/org/apache/gluten/utils/CHInputPartitionsUtil.scala index e0b6347db64f..90ab336689fe 100644 --- a/backends-clickhouse/src/main/scala/io/glutenproject/utils/CHInputPartitionsUtil.scala +++ b/backends-clickhouse/src/main/scala/org/apache/gluten/utils/CHInputPartitionsUtil.scala @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.utils +package org.apache.gluten.utils -import io.glutenproject.backendsapi.clickhouse.CHBackendSettings -import io.glutenproject.sql.shims.SparkShimLoader +import org.apache.gluten.backendsapi.clickhouse.CHBackendSettings +import org.apache.gluten.sql.shims.SparkShimLoader import org.apache.spark.internal.Logging import org.apache.spark.sql.catalyst.expressions.Attribute diff --git a/backends-clickhouse/src/main/scala/io/glutenproject/utils/CHJoinValidateUtil.scala b/backends-clickhouse/src/main/scala/org/apache/gluten/utils/CHJoinValidateUtil.scala similarity index 99% rename from backends-clickhouse/src/main/scala/io/glutenproject/utils/CHJoinValidateUtil.scala rename to backends-clickhouse/src/main/scala/org/apache/gluten/utils/CHJoinValidateUtil.scala index 526986cd8380..a2ecf5664e73 100644 --- a/backends-clickhouse/src/main/scala/io/glutenproject/utils/CHJoinValidateUtil.scala +++ b/backends-clickhouse/src/main/scala/org/apache/gluten/utils/CHJoinValidateUtil.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.utils +package org.apache.gluten.utils import org.apache.spark.internal.Logging import org.apache.spark.sql.catalyst.expressions.{AttributeSet, EqualTo, Expression, GreaterThan, GreaterThanOrEqual, In, LessThan, LessThanOrEqual, Not, Or} diff --git a/backends-clickhouse/src/main/scala/io/glutenproject/utils/ExpressionDocUtil.scala b/backends-clickhouse/src/main/scala/org/apache/gluten/utils/ExpressionDocUtil.scala similarity index 98% rename from backends-clickhouse/src/main/scala/io/glutenproject/utils/ExpressionDocUtil.scala rename to backends-clickhouse/src/main/scala/org/apache/gluten/utils/ExpressionDocUtil.scala index 353a442d0a35..1fd5fa45872d 100644 --- a/backends-clickhouse/src/main/scala/io/glutenproject/utils/ExpressionDocUtil.scala +++ b/backends-clickhouse/src/main/scala/org/apache/gluten/utils/ExpressionDocUtil.scala @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.utils +package org.apache.gluten.utils -import io.glutenproject.expression.ExpressionMappings +import org.apache.gluten.expression.ExpressionMappings import org.apache.spark.sql.catalyst.analysis.FunctionRegistry import org.apache.spark.sql.catalyst.expressions.ExpressionInfo diff --git a/backends-clickhouse/src/main/scala/io/glutenproject/utils/IteratorUtil.scala b/backends-clickhouse/src/main/scala/org/apache/gluten/utils/IteratorUtil.scala similarity index 92% rename from backends-clickhouse/src/main/scala/io/glutenproject/utils/IteratorUtil.scala rename to backends-clickhouse/src/main/scala/org/apache/gluten/utils/IteratorUtil.scala index 7f4097ad42bc..d2cc2e309cb5 100644 --- a/backends-clickhouse/src/main/scala/io/glutenproject/utils/IteratorUtil.scala +++ b/backends-clickhouse/src/main/scala/org/apache/gluten/utils/IteratorUtil.scala @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.utils +package org.apache.gluten.utils -import io.glutenproject.vectorized.{CHNativeBlock, CHStreamReader} +import org.apache.gluten.vectorized.{CHNativeBlock, CHStreamReader} import org.apache.spark.sql.vectorized.ColumnarBatch diff --git a/backends-clickhouse/src/main/scala/io/glutenproject/utils/PlanNodesUtil.scala b/backends-clickhouse/src/main/scala/org/apache/gluten/utils/PlanNodesUtil.scala similarity index 89% rename from backends-clickhouse/src/main/scala/io/glutenproject/utils/PlanNodesUtil.scala rename to backends-clickhouse/src/main/scala/org/apache/gluten/utils/PlanNodesUtil.scala index a7b6008eaa39..9dcb7ee3c41d 100644 --- a/backends-clickhouse/src/main/scala/io/glutenproject/utils/PlanNodesUtil.scala +++ b/backends-clickhouse/src/main/scala/org/apache/gluten/utils/PlanNodesUtil.scala @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.utils +package org.apache.gluten.utils -import io.glutenproject.expression.{ConverterUtils, ExpressionConverter} -import io.glutenproject.substrait.SubstraitContext -import io.glutenproject.substrait.expression.ExpressionNode -import io.glutenproject.substrait.plan.{PlanBuilder, PlanNode} -import io.glutenproject.substrait.rel.RelBuilder +import org.apache.gluten.expression.{ConverterUtils, ExpressionConverter} +import org.apache.gluten.substrait.SubstraitContext +import org.apache.gluten.substrait.expression.ExpressionNode +import org.apache.gluten.substrait.plan.{PlanBuilder, PlanNode} +import org.apache.gluten.substrait.rel.RelBuilder import org.apache.spark.sql.catalyst.expressions.{Attribute, AttributeReference, BoundReference, Expression} diff --git a/backends-clickhouse/src/main/scala/io/glutenproject/vectorized/CHColumnarBatchSerializer.scala b/backends-clickhouse/src/main/scala/org/apache/gluten/vectorized/CHColumnarBatchSerializer.scala similarity index 97% rename from backends-clickhouse/src/main/scala/io/glutenproject/vectorized/CHColumnarBatchSerializer.scala rename to backends-clickhouse/src/main/scala/org/apache/gluten/vectorized/CHColumnarBatchSerializer.scala index 3358ffa70291..f640bfd2d7f1 100644 --- a/backends-clickhouse/src/main/scala/io/glutenproject/vectorized/CHColumnarBatchSerializer.scala +++ b/backends-clickhouse/src/main/scala/org/apache/gluten/vectorized/CHColumnarBatchSerializer.scala @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.vectorized +package org.apache.gluten.vectorized -import io.glutenproject.GlutenConfig -import io.glutenproject.backendsapi.clickhouse.CHBackendSettings +import org.apache.gluten.GlutenConfig +import org.apache.gluten.backendsapi.clickhouse.CHBackendSettings import org.apache.spark.SparkEnv import org.apache.spark.internal.Logging diff --git a/backends-clickhouse/src/main/scala/io/glutenproject/vectorized/CHSplitResult.java b/backends-clickhouse/src/main/scala/org/apache/gluten/vectorized/CHSplitResult.java similarity index 98% rename from backends-clickhouse/src/main/scala/io/glutenproject/vectorized/CHSplitResult.java rename to backends-clickhouse/src/main/scala/org/apache/gluten/vectorized/CHSplitResult.java index e5bfd5fe9375..ea6f756cd5f2 100644 --- a/backends-clickhouse/src/main/scala/io/glutenproject/vectorized/CHSplitResult.java +++ b/backends-clickhouse/src/main/scala/org/apache/gluten/vectorized/CHSplitResult.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.vectorized; +package org.apache.gluten.vectorized; public class CHSplitResult extends SplitResult { private final long splitTime; diff --git a/backends-clickhouse/src/main/scala/io/glutenproject/vectorized/CloseableCHColumnBatchIterator.scala b/backends-clickhouse/src/main/scala/org/apache/gluten/vectorized/CloseableCHColumnBatchIterator.scala similarity index 96% rename from backends-clickhouse/src/main/scala/io/glutenproject/vectorized/CloseableCHColumnBatchIterator.scala rename to backends-clickhouse/src/main/scala/org/apache/gluten/vectorized/CloseableCHColumnBatchIterator.scala index aaa7d2064305..eaec46b22567 100644 --- a/backends-clickhouse/src/main/scala/io/glutenproject/vectorized/CloseableCHColumnBatchIterator.scala +++ b/backends-clickhouse/src/main/scala/org/apache/gluten/vectorized/CloseableCHColumnBatchIterator.scala @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.vectorized +package org.apache.gluten.vectorized -import io.glutenproject.metrics.GlutenTimeMetric +import org.apache.gluten.metrics.GlutenTimeMetric import org.apache.spark.TaskContext import org.apache.spark.internal.Logging diff --git a/backends-clickhouse/src/main/scala/io/glutenproject/vectorized/CloseablePartitionedBlockIterator.scala b/backends-clickhouse/src/main/scala/org/apache/gluten/vectorized/CloseablePartitionedBlockIterator.scala similarity index 97% rename from backends-clickhouse/src/main/scala/io/glutenproject/vectorized/CloseablePartitionedBlockIterator.scala rename to backends-clickhouse/src/main/scala/org/apache/gluten/vectorized/CloseablePartitionedBlockIterator.scala index 7198cc7c3c5d..64572e0c4a0c 100644 --- a/backends-clickhouse/src/main/scala/io/glutenproject/vectorized/CloseablePartitionedBlockIterator.scala +++ b/backends-clickhouse/src/main/scala/org/apache/gluten/vectorized/CloseablePartitionedBlockIterator.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.vectorized +package org.apache.gluten.vectorized import org.apache.spark.TaskContext import org.apache.spark.internal.Logging diff --git a/backends-clickhouse/src/main/scala/org/apache/spark/affinity/CHAffinity.scala b/backends-clickhouse/src/main/scala/org/apache/spark/affinity/CHAffinity.scala index f34d94d5436c..9f0c2d7c3794 100644 --- a/backends-clickhouse/src/main/scala/org/apache/spark/affinity/CHAffinity.scala +++ b/backends-clickhouse/src/main/scala/org/apache/spark/affinity/CHAffinity.scala @@ -16,9 +16,9 @@ */ package org.apache.spark.affinity -import io.glutenproject.backendsapi.clickhouse.CHBackendSettings -import io.glutenproject.execution.GlutenMergeTreePartition -import io.glutenproject.softaffinity.{AffinityManager, SoftAffinityManager} +import org.apache.gluten.backendsapi.clickhouse.CHBackendSettings +import org.apache.gluten.execution.GlutenMergeTreePartition +import org.apache.gluten.softaffinity.{AffinityManager, SoftAffinityManager} import org.apache.spark.softaffinity.Affinity diff --git a/backends-clickhouse/src/main/scala/org/apache/spark/shuffle/CHColumnarShuffleWriter.scala b/backends-clickhouse/src/main/scala/org/apache/spark/shuffle/CHColumnarShuffleWriter.scala index a434a72cfa8b..a888b2e98c35 100644 --- a/backends-clickhouse/src/main/scala/org/apache/spark/shuffle/CHColumnarShuffleWriter.scala +++ b/backends-clickhouse/src/main/scala/org/apache/spark/shuffle/CHColumnarShuffleWriter.scala @@ -16,11 +16,11 @@ */ package org.apache.spark.shuffle -import io.glutenproject.GlutenConfig -import io.glutenproject.backendsapi.clickhouse.CHBackendSettings -import io.glutenproject.memory.alloc.CHNativeMemoryAllocators -import io.glutenproject.memory.memtarget.{MemoryTarget, Spiller, Spillers} -import io.glutenproject.vectorized._ +import org.apache.gluten.GlutenConfig +import org.apache.gluten.backendsapi.clickhouse.CHBackendSettings +import org.apache.gluten.memory.alloc.CHNativeMemoryAllocators +import org.apache.gluten.memory.memtarget.{MemoryTarget, Spiller, Spillers} +import org.apache.gluten.vectorized._ import org.apache.spark.SparkEnv import org.apache.spark.internal.Logging diff --git a/backends-clickhouse/src/main/scala/org/apache/spark/shuffle/utils/RangePartitionerBoundsGenerator.scala b/backends-clickhouse/src/main/scala/org/apache/spark/shuffle/utils/RangePartitionerBoundsGenerator.scala index 84842a0b9cb3..61fbc86b36cc 100644 --- a/backends-clickhouse/src/main/scala/org/apache/spark/shuffle/utils/RangePartitionerBoundsGenerator.scala +++ b/backends-clickhouse/src/main/scala/org/apache/spark/shuffle/utils/RangePartitionerBoundsGenerator.scala @@ -16,13 +16,13 @@ */ package org.apache.spark.shuffle.utils -import io.glutenproject.backendsapi.BackendsApiManager -import io.glutenproject.execution.SortExecTransformer -import io.glutenproject.expression.ExpressionConverter -import io.glutenproject.substrait.SubstraitContext -import io.glutenproject.substrait.expression.ExpressionNode -import io.glutenproject.substrait.plan.{PlanBuilder, PlanNode} -import io.glutenproject.substrait.rel.{RelBuilder, RelNode} +import org.apache.gluten.backendsapi.BackendsApiManager +import org.apache.gluten.execution.SortExecTransformer +import org.apache.gluten.expression.ExpressionConverter +import org.apache.gluten.substrait.SubstraitContext +import org.apache.gluten.substrait.expression.ExpressionNode +import org.apache.gluten.substrait.plan.{PlanBuilder, PlanNode} +import org.apache.gluten.substrait.rel.{RelBuilder, RelNode} import org.apache.spark.RangePartitioner import org.apache.spark.rdd.{PartitionPruningRDD, RDD} diff --git a/backends-clickhouse/src/main/scala/org/apache/spark/sql/catalyst/CHAggregateFunctionRewriteRule.scala b/backends-clickhouse/src/main/scala/org/apache/spark/sql/catalyst/CHAggregateFunctionRewriteRule.scala index 623db7993231..b11e1e2bb306 100644 --- a/backends-clickhouse/src/main/scala/org/apache/spark/sql/catalyst/CHAggregateFunctionRewriteRule.scala +++ b/backends-clickhouse/src/main/scala/org/apache/spark/sql/catalyst/CHAggregateFunctionRewriteRule.scala @@ -16,7 +16,7 @@ */ package org.apache.spark.sql.catalyst -import io.glutenproject.GlutenConfig +import org.apache.gluten.GlutenConfig import org.apache.spark.sql.SparkSession import org.apache.spark.sql.catalyst.expressions.Cast diff --git a/backends-clickhouse/src/main/scala/org/apache/spark/sql/delta/ClickhouseOptimisticTransaction.scala b/backends-clickhouse/src/main/scala/org/apache/spark/sql/delta/ClickhouseOptimisticTransaction.scala index 95119f842b2a..7c27a574177a 100644 --- a/backends-clickhouse/src/main/scala/org/apache/spark/sql/delta/ClickhouseOptimisticTransaction.scala +++ b/backends-clickhouse/src/main/scala/org/apache/spark/sql/delta/ClickhouseOptimisticTransaction.scala @@ -16,7 +16,7 @@ */ package org.apache.spark.sql.delta -import io.glutenproject.execution.ColumnarToRowExecBase +import org.apache.gluten.execution.ColumnarToRowExecBase import org.apache.spark.SparkException import org.apache.spark.sql.Dataset diff --git a/backends-clickhouse/src/main/scala/org/apache/spark/sql/execution/CHColumnarToRowExec.scala b/backends-clickhouse/src/main/scala/org/apache/spark/sql/execution/CHColumnarToRowExec.scala index b4d9a84287ca..522c7d68fa68 100644 --- a/backends-clickhouse/src/main/scala/org/apache/spark/sql/execution/CHColumnarToRowExec.scala +++ b/backends-clickhouse/src/main/scala/org/apache/spark/sql/execution/CHColumnarToRowExec.scala @@ -16,10 +16,10 @@ */ package org.apache.spark.sql.execution -import io.glutenproject.execution.ColumnarToRowExecBase -import io.glutenproject.extension.ValidationResult -import io.glutenproject.metrics.GlutenTimeMetric -import io.glutenproject.vectorized.CHNativeBlock +import org.apache.gluten.execution.ColumnarToRowExecBase +import org.apache.gluten.extension.ValidationResult +import org.apache.gluten.metrics.GlutenTimeMetric +import org.apache.gluten.vectorized.CHNativeBlock import org.apache.spark.{OneToOneDependency, Partition, SparkContext, TaskContext} import org.apache.spark.broadcast.Broadcast diff --git a/backends-clickhouse/src/main/scala/org/apache/spark/sql/execution/RowToCHNativeColumnarExec.scala b/backends-clickhouse/src/main/scala/org/apache/spark/sql/execution/RowToCHNativeColumnarExec.scala index b33a87e918c7..aea368c14336 100644 --- a/backends-clickhouse/src/main/scala/org/apache/spark/sql/execution/RowToCHNativeColumnarExec.scala +++ b/backends-clickhouse/src/main/scala/org/apache/spark/sql/execution/RowToCHNativeColumnarExec.scala @@ -16,10 +16,10 @@ */ package org.apache.spark.sql.execution -import io.glutenproject.execution.{RowToColumnarExecBase, SparkRowIterator} -import io.glutenproject.expression.ConverterUtils -import io.glutenproject.metrics.GlutenTimeMetric -import io.glutenproject.vectorized.{CHBlockConverterJniWrapper, CHNativeBlock} +import org.apache.gluten.execution.{RowToColumnarExecBase, SparkRowIterator} +import org.apache.gluten.expression.ConverterUtils +import org.apache.gluten.metrics.GlutenTimeMetric +import org.apache.gluten.vectorized.{CHBlockConverterJniWrapper, CHNativeBlock} import org.apache.spark.broadcast.Broadcast import org.apache.spark.rdd.RDD diff --git a/backends-clickhouse/src/main/scala/org/apache/spark/sql/execution/datasources/utils/MergeTreePartsPartitionsUtil.scala b/backends-clickhouse/src/main/scala/org/apache/spark/sql/execution/datasources/utils/MergeTreePartsPartitionsUtil.scala index 7d202b4d164f..e6861b14503d 100644 --- a/backends-clickhouse/src/main/scala/org/apache/spark/sql/execution/datasources/utils/MergeTreePartsPartitionsUtil.scala +++ b/backends-clickhouse/src/main/scala/org/apache/spark/sql/execution/datasources/utils/MergeTreePartsPartitionsUtil.scala @@ -16,8 +16,8 @@ */ package org.apache.spark.sql.execution.datasources.utils -import io.glutenproject.execution.{GlutenMergeTreePartition, MergeTreePartSplit} -import io.glutenproject.expression.ConverterUtils +import org.apache.gluten.execution.{GlutenMergeTreePartition, MergeTreePartSplit} +import org.apache.gluten.expression.ConverterUtils import org.apache.spark.internal.Logging import org.apache.spark.sql.SparkSession diff --git a/backends-clickhouse/src/main/scala/org/apache/spark/sql/execution/datasources/v1/CHBlockStripes.java b/backends-clickhouse/src/main/scala/org/apache/spark/sql/execution/datasources/v1/CHBlockStripes.java index a11ee2785ea4..560fbd503998 100644 --- a/backends-clickhouse/src/main/scala/org/apache/spark/sql/execution/datasources/v1/CHBlockStripes.java +++ b/backends-clickhouse/src/main/scala/org/apache/spark/sql/execution/datasources/v1/CHBlockStripes.java @@ -16,9 +16,9 @@ */ package org.apache.spark.sql.execution.datasources.v1; -import io.glutenproject.row.SparkRowInfo; -import io.glutenproject.vectorized.CHBlockConverterJniWrapper; -import io.glutenproject.vectorized.CHNativeBlock; +import org.apache.gluten.row.SparkRowInfo; +import org.apache.gluten.vectorized.CHBlockConverterJniWrapper; +import org.apache.gluten.vectorized.CHNativeBlock; import org.apache.spark.sql.catalyst.InternalRow; import org.apache.spark.sql.execution.datasources.BlockStripe; import org.apache.spark.sql.execution.datasources.BlockStripes; diff --git a/backends-clickhouse/src/main/scala/org/apache/spark/sql/execution/datasources/v1/CHFormatWriterInjects.scala b/backends-clickhouse/src/main/scala/org/apache/spark/sql/execution/datasources/v1/CHFormatWriterInjects.scala index 83fa7d7cc2e5..9d4c26e5a47b 100644 --- a/backends-clickhouse/src/main/scala/org/apache/spark/sql/execution/datasources/v1/CHFormatWriterInjects.scala +++ b/backends-clickhouse/src/main/scala/org/apache/spark/sql/execution/datasources/v1/CHFormatWriterInjects.scala @@ -16,8 +16,8 @@ */ package org.apache.spark.sql.execution.datasources.v1 -import io.glutenproject.execution.datasource.GlutenRowSplitter -import io.glutenproject.vectorized.CHColumnVector +import org.apache.gluten.execution.datasource.GlutenRowSplitter +import org.apache.gluten.vectorized.CHColumnVector import org.apache.spark.sql.SparkSession import org.apache.spark.sql.catalyst.InternalRow diff --git a/backends-clickhouse/src/main/scala/org/apache/spark/sql/execution/datasources/v1/CHMergeTreeWriterInjects.scala b/backends-clickhouse/src/main/scala/org/apache/spark/sql/execution/datasources/v1/CHMergeTreeWriterInjects.scala index 6d89a4ec665f..9d98270967ee 100644 --- a/backends-clickhouse/src/main/scala/org/apache/spark/sql/execution/datasources/v1/CHMergeTreeWriterInjects.scala +++ b/backends-clickhouse/src/main/scala/org/apache/spark/sql/execution/datasources/v1/CHMergeTreeWriterInjects.scala @@ -16,12 +16,12 @@ */ package org.apache.spark.sql.execution.datasources.v1 -import io.glutenproject.expression.ConverterUtils -import io.glutenproject.substrait.`type`.ColumnTypeNode -import io.glutenproject.substrait.SubstraitContext -import io.glutenproject.substrait.extensions.ExtensionBuilder -import io.glutenproject.substrait.plan.PlanBuilder -import io.glutenproject.substrait.rel.{ExtensionTableBuilder, RelBuilder} +import org.apache.gluten.expression.ConverterUtils +import org.apache.gluten.substrait.`type`.ColumnTypeNode +import org.apache.gluten.substrait.SubstraitContext +import org.apache.gluten.substrait.extensions.ExtensionBuilder +import org.apache.gluten.substrait.plan.PlanBuilder +import org.apache.gluten.substrait.rel.{ExtensionTableBuilder, RelBuilder} import org.apache.spark.sql.SparkSession import org.apache.spark.sql.catalyst.expressions.Attribute diff --git a/backends-clickhouse/src/main/scala/org/apache/spark/sql/execution/datasources/v1/CHParquetWriterInjects.scala b/backends-clickhouse/src/main/scala/org/apache/spark/sql/execution/datasources/v1/CHParquetWriterInjects.scala index bf4e7ba94191..0adf8411464f 100644 --- a/backends-clickhouse/src/main/scala/org/apache/spark/sql/execution/datasources/v1/CHParquetWriterInjects.scala +++ b/backends-clickhouse/src/main/scala/org/apache/spark/sql/execution/datasources/v1/CHParquetWriterInjects.scala @@ -16,7 +16,7 @@ */ package org.apache.spark.sql.execution.datasources.v1 -import io.glutenproject.GlutenConfig +import org.apache.gluten.GlutenConfig import org.apache.spark.sql.internal.SQLConf diff --git a/backends-clickhouse/src/main/scala/org/apache/spark/sql/execution/datasources/v1/GlutenMergeTreeWriterInjects.scala b/backends-clickhouse/src/main/scala/org/apache/spark/sql/execution/datasources/v1/GlutenMergeTreeWriterInjects.scala index 48ba430f892c..36d8481b1a8a 100644 --- a/backends-clickhouse/src/main/scala/org/apache/spark/sql/execution/datasources/v1/GlutenMergeTreeWriterInjects.scala +++ b/backends-clickhouse/src/main/scala/org/apache/spark/sql/execution/datasources/v1/GlutenMergeTreeWriterInjects.scala @@ -16,7 +16,7 @@ */ package org.apache.spark.sql.execution.datasources.v1 -import io.glutenproject.execution.datasource.GlutenFormatWriterInjects +import org.apache.gluten.execution.datasource.GlutenFormatWriterInjects object GlutenMergeTreeWriterInjects { private var INSTANCE: GlutenFormatWriterInjects = _ diff --git a/backends-clickhouse/src/main/scala/org/apache/spark/sql/execution/datasources/v1/clickhouse/MergeTreeFileFormatDataWriter.scala b/backends-clickhouse/src/main/scala/org/apache/spark/sql/execution/datasources/v1/clickhouse/MergeTreeFileFormatDataWriter.scala index 1b16fb08c7a5..3a68ac16df80 100644 --- a/backends-clickhouse/src/main/scala/org/apache/spark/sql/execution/datasources/v1/clickhouse/MergeTreeFileFormatDataWriter.scala +++ b/backends-clickhouse/src/main/scala/org/apache/spark/sql/execution/datasources/v1/clickhouse/MergeTreeFileFormatDataWriter.scala @@ -16,7 +16,7 @@ */ package org.apache.spark.sql.execution.datasources.v1.clickhouse -import io.glutenproject.execution.datasource.GlutenRowSplitter +import org.apache.gluten.execution.datasource.GlutenRowSplitter import org.apache.spark.internal.Logging import org.apache.spark.internal.io.{FileCommitProtocol, FileNameSpec} diff --git a/backends-clickhouse/src/main/scala/org/apache/spark/sql/execution/datasources/v1/clickhouse/MergeTreeOutputWriter.scala b/backends-clickhouse/src/main/scala/org/apache/spark/sql/execution/datasources/v1/clickhouse/MergeTreeOutputWriter.scala index 219d771171ba..2ea2906c6a5a 100644 --- a/backends-clickhouse/src/main/scala/org/apache/spark/sql/execution/datasources/v1/clickhouse/MergeTreeOutputWriter.scala +++ b/backends-clickhouse/src/main/scala/org/apache/spark/sql/execution/datasources/v1/clickhouse/MergeTreeOutputWriter.scala @@ -16,7 +16,7 @@ */ package org.apache.spark.sql.execution.datasources.v1.clickhouse -import io.glutenproject.vectorized.CHColumnVector +import org.apache.gluten.vectorized.CHColumnVector import org.apache.spark.sql.catalyst.InternalRow import org.apache.spark.sql.delta.actions.AddFile diff --git a/backends-clickhouse/src/main/scala/org/apache/spark/sql/execution/datasources/v2/clickhouse/ClickHouseSparkCatalog.scala b/backends-clickhouse/src/main/scala/org/apache/spark/sql/execution/datasources/v2/clickhouse/ClickHouseSparkCatalog.scala index a8c60ce22a42..daaec00a7c7a 100644 --- a/backends-clickhouse/src/main/scala/org/apache/spark/sql/execution/datasources/v2/clickhouse/ClickHouseSparkCatalog.scala +++ b/backends-clickhouse/src/main/scala/org/apache/spark/sql/execution/datasources/v2/clickhouse/ClickHouseSparkCatalog.scala @@ -15,7 +15,7 @@ * limitations under the License. */ package org.apache.spark.sql.execution.datasources.v2.clickhouse -import io.glutenproject.sql.shims.SparkShimLoader +import org.apache.gluten.sql.shims.SparkShimLoader import org.apache.spark.sql.{AnalysisException, DataFrame, SparkSession} import org.apache.spark.sql.catalyst.TableIdentifier diff --git a/backends-clickhouse/src/main/scala/org/apache/spark/sql/execution/joins/ClickHouseBuildSideRelation.scala b/backends-clickhouse/src/main/scala/org/apache/spark/sql/execution/joins/ClickHouseBuildSideRelation.scala index affa564f3ba7..862a8b4200f3 100644 --- a/backends-clickhouse/src/main/scala/org/apache/spark/sql/execution/joins/ClickHouseBuildSideRelation.scala +++ b/backends-clickhouse/src/main/scala/org/apache/spark/sql/execution/joins/ClickHouseBuildSideRelation.scala @@ -16,9 +16,9 @@ */ package org.apache.spark.sql.execution.joins -import io.glutenproject.execution.{BroadCastHashJoinContext, ColumnarNativeIterator} -import io.glutenproject.utils.{IteratorUtil, PlanNodesUtil} -import io.glutenproject.vectorized._ +import org.apache.gluten.execution.{BroadCastHashJoinContext, ColumnarNativeIterator} +import org.apache.gluten.utils.{IteratorUtil, PlanNodesUtil} +import org.apache.gluten.vectorized._ import org.apache.spark.internal.Logging import org.apache.spark.sql.catalyst.InternalRow diff --git a/backends-clickhouse/src/main/scala/org/apache/spark/sql/execution/utils/CHExecUtil.scala b/backends-clickhouse/src/main/scala/org/apache/spark/sql/execution/utils/CHExecUtil.scala index f9e53d789e96..78fd5dd396e9 100644 --- a/backends-clickhouse/src/main/scala/org/apache/spark/sql/execution/utils/CHExecUtil.scala +++ b/backends-clickhouse/src/main/scala/org/apache/spark/sql/execution/utils/CHExecUtil.scala @@ -16,12 +16,12 @@ */ package org.apache.spark.sql.execution.utils -import io.glutenproject.GlutenConfig -import io.glutenproject.backendsapi.clickhouse.CHBackendSettings -import io.glutenproject.expression.ConverterUtils -import io.glutenproject.row.SparkRowInfo -import io.glutenproject.vectorized._ -import io.glutenproject.vectorized.BlockSplitIterator.IteratorOptions +import org.apache.gluten.GlutenConfig +import org.apache.gluten.backendsapi.clickhouse.CHBackendSettings +import org.apache.gluten.expression.ConverterUtils +import org.apache.gluten.row.SparkRowInfo +import org.apache.gluten.vectorized._ +import org.apache.gluten.vectorized.BlockSplitIterator.IteratorOptions import org.apache.spark.ShuffleDependency import org.apache.spark.internal.Logging diff --git a/backends-clickhouse/src/test/java/org/apache/spark/memory/TestTaskMemoryManagerSuite.java b/backends-clickhouse/src/test/java/org/apache/spark/memory/TestTaskMemoryManagerSuite.java index a6f0e3e76a40..b575de403bfd 100644 --- a/backends-clickhouse/src/test/java/org/apache/spark/memory/TestTaskMemoryManagerSuite.java +++ b/backends-clickhouse/src/test/java/org/apache/spark/memory/TestTaskMemoryManagerSuite.java @@ -16,11 +16,11 @@ */ package org.apache.spark.memory; -import io.glutenproject.memory.SimpleMemoryUsageRecorder; -import io.glutenproject.memory.alloc.CHManagedCHReservationListener; -import io.glutenproject.memory.alloc.CHNativeMemoryAllocator; -import io.glutenproject.memory.alloc.CHNativeMemoryAllocatorManagerImpl; -import io.glutenproject.memory.memtarget.MemoryTargets; +import org.apache.gluten.memory.SimpleMemoryUsageRecorder; +import org.apache.gluten.memory.alloc.CHManagedCHReservationListener; +import org.apache.gluten.memory.alloc.CHNativeMemoryAllocator; +import org.apache.gluten.memory.alloc.CHNativeMemoryAllocatorManagerImpl; +import org.apache.gluten.memory.memtarget.MemoryTargets; import org.apache.spark.SparkConf; import org.apache.spark.internal.config.package$; diff --git a/backends-clickhouse/src/test/scala/io/glutenproject/RunTPCHTest.scala b/backends-clickhouse/src/test/scala/org/apache/gluten/RunTPCHTest.scala similarity index 97% rename from backends-clickhouse/src/test/scala/io/glutenproject/RunTPCHTest.scala rename to backends-clickhouse/src/test/scala/org/apache/gluten/RunTPCHTest.scala index 8336ea2aae80..6dfab5bf5a91 100644 --- a/backends-clickhouse/src/test/scala/io/glutenproject/RunTPCHTest.scala +++ b/backends-clickhouse/src/test/scala/org/apache/gluten/RunTPCHTest.scala @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject +package org.apache.gluten -import io.glutenproject.benchmarks.GenTPCHTableScripts +import org.apache.gluten.benchmarks.GenTPCHTableScripts import org.apache.spark.sql.SparkSession @@ -80,7 +80,7 @@ object RunTPCHTest { // .config("spark.sql.sources.useV1SourceList", "avro") .config("spark.memory.fraction", "0.6") .config("spark.memory.storageFraction", "0.3") - .config("spark.plugins", "io.glutenproject.GlutenPlugin") + .config("spark.plugins", "org.apache.gluten.GlutenPlugin") .config( "spark.sql.catalog.spark_catalog", "org.apache.spark.sql.execution.datasources.v2.clickhouse.ClickHouseSparkCatalog") diff --git a/backends-clickhouse/src/test/scala/io/glutenproject/benchmarks/GenTPCDSDecimalTableScripts.scala b/backends-clickhouse/src/test/scala/org/apache/gluten/benchmarks/GenTPCDSDecimalTableScripts.scala similarity index 99% rename from backends-clickhouse/src/test/scala/io/glutenproject/benchmarks/GenTPCDSDecimalTableScripts.scala rename to backends-clickhouse/src/test/scala/org/apache/gluten/benchmarks/GenTPCDSDecimalTableScripts.scala index 0acfc15441b8..47f4b9917aa7 100644 --- a/backends-clickhouse/src/test/scala/io/glutenproject/benchmarks/GenTPCDSDecimalTableScripts.scala +++ b/backends-clickhouse/src/test/scala/org/apache/gluten/benchmarks/GenTPCDSDecimalTableScripts.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.benchmarks +package org.apache.gluten.benchmarks import scala.collection.mutable.ArrayBuffer diff --git a/backends-clickhouse/src/test/scala/io/glutenproject/benchmarks/GenTPCDSTableScripts.scala b/backends-clickhouse/src/test/scala/org/apache/gluten/benchmarks/GenTPCDSTableScripts.scala similarity index 99% rename from backends-clickhouse/src/test/scala/io/glutenproject/benchmarks/GenTPCDSTableScripts.scala rename to backends-clickhouse/src/test/scala/org/apache/gluten/benchmarks/GenTPCDSTableScripts.scala index 411989711402..c7fc069870c7 100644 --- a/backends-clickhouse/src/test/scala/io/glutenproject/benchmarks/GenTPCDSTableScripts.scala +++ b/backends-clickhouse/src/test/scala/org/apache/gluten/benchmarks/GenTPCDSTableScripts.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.benchmarks +package org.apache.gluten.benchmarks import org.apache.spark.sql.TPCDSSchema diff --git a/backends-clickhouse/src/test/scala/io/glutenproject/benchmarks/GenTPCHTableScripts.scala b/backends-clickhouse/src/test/scala/org/apache/gluten/benchmarks/GenTPCHTableScripts.scala similarity index 99% rename from backends-clickhouse/src/test/scala/io/glutenproject/benchmarks/GenTPCHTableScripts.scala rename to backends-clickhouse/src/test/scala/org/apache/gluten/benchmarks/GenTPCHTableScripts.scala index ee7b281d0d7e..7c22c1da0dba 100644 --- a/backends-clickhouse/src/test/scala/io/glutenproject/benchmarks/GenTPCHTableScripts.scala +++ b/backends-clickhouse/src/test/scala/org/apache/gluten/benchmarks/GenTPCHTableScripts.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.benchmarks +package org.apache.gluten.benchmarks import scala.collection.mutable.ArrayBuffer diff --git a/backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseColumnarShuffleAQESuite.scala b/backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseColumnarShuffleAQESuite.scala similarity index 99% rename from backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseColumnarShuffleAQESuite.scala rename to backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseColumnarShuffleAQESuite.scala index be2a29775117..f25b8643b707 100644 --- a/backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseColumnarShuffleAQESuite.scala +++ b/backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseColumnarShuffleAQESuite.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution +package org.apache.gluten.execution import org.apache.spark.SparkConf import org.apache.spark.sql.execution.CoalescedPartitionSpec diff --git a/backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseDSV2ColumnarShuffleSuite.scala b/backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseDSV2ColumnarShuffleSuite.scala similarity index 99% rename from backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseDSV2ColumnarShuffleSuite.scala rename to backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseDSV2ColumnarShuffleSuite.scala index 5b03c742310a..dd997832d3e3 100644 --- a/backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseDSV2ColumnarShuffleSuite.scala +++ b/backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseDSV2ColumnarShuffleSuite.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution +package org.apache.gluten.execution import org.apache.spark.SparkConf diff --git a/backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseDSV2Suite.scala b/backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseDSV2Suite.scala similarity index 99% rename from backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseDSV2Suite.scala rename to backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseDSV2Suite.scala index 91fd00fa14e7..08393ccfe774 100644 --- a/backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseDSV2Suite.scala +++ b/backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseDSV2Suite.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution +package org.apache.gluten.execution import org.apache.spark.SparkConf diff --git a/backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseDatetimeExpressionSuite.scala b/backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseDatetimeExpressionSuite.scala similarity index 99% rename from backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseDatetimeExpressionSuite.scala rename to backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseDatetimeExpressionSuite.scala index f5ee5aad11ca..295ad4f25136 100644 --- a/backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseDatetimeExpressionSuite.scala +++ b/backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseDatetimeExpressionSuite.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution +package org.apache.gluten.execution import org.apache.spark.SparkConf import org.apache.spark.sql.catalyst.util.DateTimeTestUtils diff --git a/backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseDecimalSuite.scala b/backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseDecimalSuite.scala similarity index 99% rename from backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseDecimalSuite.scala rename to backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseDecimalSuite.scala index 3e7dd0b2c0be..e5d827e26d99 100644 --- a/backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseDecimalSuite.scala +++ b/backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseDecimalSuite.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution +package org.apache.gluten.execution import org.apache.spark.SparkConf import org.apache.spark.sql.{DataFrame, Row} diff --git a/backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseFileFormatSuite.scala b/backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseFileFormatSuite.scala similarity index 99% rename from backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseFileFormatSuite.scala rename to backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseFileFormatSuite.scala index a2d4765b3f8e..c10b11290baf 100644 --- a/backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseFileFormatSuite.scala +++ b/backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseFileFormatSuite.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution +package org.apache.gluten.execution import org.apache.spark.SparkConf import org.apache.spark.sql.{functions, DataFrame, Row} diff --git a/backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseHiveTableSuite.scala b/backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseHiveTableSuite.scala similarity index 99% rename from backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseHiveTableSuite.scala rename to backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseHiveTableSuite.scala index 4e4594b1de54..4b73b601db5d 100644 --- a/backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseHiveTableSuite.scala +++ b/backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseHiveTableSuite.scala @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution +package org.apache.gluten.execution -import io.glutenproject.GlutenConfig -import io.glutenproject.utils.UTSystemParameters +import org.apache.gluten.GlutenConfig +import org.apache.gluten.utils.UTSystemParameters import org.apache.spark.SPARK_VERSION_SHORT import org.apache.spark.SparkConf @@ -96,7 +96,7 @@ class GlutenClickHouseHiveTableSuite override protected def sparkConf: SparkConf = { new SparkConf() - .set("spark.plugins", "io.glutenproject.GlutenPlugin") + .set("spark.plugins", "org.apache.gluten.GlutenPlugin") .set("spark.memory.offHeap.enabled", "true") .set("spark.memory.offHeap.size", "536870912") .set("spark.sql.catalogImplementation", "hive") diff --git a/backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseMergeTreeOptimizeSuite.scala b/backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseMergeTreeOptimizeSuite.scala similarity index 99% rename from backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseMergeTreeOptimizeSuite.scala rename to backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseMergeTreeOptimizeSuite.scala index 62a2154a6225..91533608214f 100644 --- a/backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseMergeTreeOptimizeSuite.scala +++ b/backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseMergeTreeOptimizeSuite.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution +package org.apache.gluten.execution import org.apache.spark.{SPARK_VERSION_SHORT, SparkConf} import org.apache.spark.sql.execution.adaptive.AdaptiveSparkPlanHelper diff --git a/backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseMergeTreeWriteOnHDFSSuite.scala b/backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseMergeTreeWriteOnHDFSSuite.scala similarity index 99% rename from backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseMergeTreeWriteOnHDFSSuite.scala rename to backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseMergeTreeWriteOnHDFSSuite.scala index 88fc977b7656..a1fa11a2c3ec 100644 --- a/backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseMergeTreeWriteOnHDFSSuite.scala +++ b/backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseMergeTreeWriteOnHDFSSuite.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution +package org.apache.gluten.execution import org.apache.spark.sql.SaveMode import org.apache.spark.sql.delta.catalog.ClickHouseTableV2 diff --git a/backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseMergeTreeWriteOnObjectStorageAbstractSuite.scala b/backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseMergeTreeWriteOnObjectStorageAbstractSuite.scala similarity index 99% rename from backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseMergeTreeWriteOnObjectStorageAbstractSuite.scala rename to backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseMergeTreeWriteOnObjectStorageAbstractSuite.scala index e9b938dbfa2c..24071a1cc233 100644 --- a/backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseMergeTreeWriteOnObjectStorageAbstractSuite.scala +++ b/backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseMergeTreeWriteOnObjectStorageAbstractSuite.scala @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution +package org.apache.gluten.execution -import io.glutenproject.GlutenConfig +import org.apache.gluten.GlutenConfig import org.apache.spark.sql.SparkSession diff --git a/backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseMergeTreeWriteOnS3Suite.scala b/backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseMergeTreeWriteOnS3Suite.scala similarity index 99% rename from backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseMergeTreeWriteOnS3Suite.scala rename to backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseMergeTreeWriteOnS3Suite.scala index 45eb8625a028..5ff9ce101445 100644 --- a/backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseMergeTreeWriteOnS3Suite.scala +++ b/backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseMergeTreeWriteOnS3Suite.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution +package org.apache.gluten.execution import org.apache.spark.sql.delta.catalog.ClickHouseTableV2 import org.apache.spark.sql.delta.files.TahoeFileIndex diff --git a/backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseMergeTreeWriteSuite.scala b/backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseMergeTreeWriteSuite.scala similarity index 99% rename from backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseMergeTreeWriteSuite.scala rename to backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseMergeTreeWriteSuite.scala index 0862fd41a190..6cd322396883 100644 --- a/backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseMergeTreeWriteSuite.scala +++ b/backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseMergeTreeWriteSuite.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution +package org.apache.gluten.execution import org.apache.spark.{SPARK_VERSION_SHORT, SparkConf} import org.apache.spark.sql.{DataFrame, SaveMode} diff --git a/backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseNativeExceptionSuite.scala b/backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseNativeExceptionSuite.scala similarity index 86% rename from backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseNativeExceptionSuite.scala rename to backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseNativeExceptionSuite.scala index 12c9f3fa281c..a0fac50598d8 100644 --- a/backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseNativeExceptionSuite.scala +++ b/backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseNativeExceptionSuite.scala @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution +package org.apache.gluten.execution -import io.glutenproject.GlutenConfig -import io.glutenproject.memory.alloc.{CHNativeMemoryAllocator, CHReservationListener} -import io.glutenproject.utils.UTSystemParameters +import org.apache.gluten.GlutenConfig +import org.apache.gluten.memory.alloc.{CHNativeMemoryAllocator, CHReservationListener} +import org.apache.gluten.utils.UTSystemParameters import org.apache.spark.SparkConf diff --git a/backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseNativeWriteTableSuite.scala b/backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseNativeWriteTableSuite.scala similarity index 99% rename from backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseNativeWriteTableSuite.scala rename to backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseNativeWriteTableSuite.scala index 1be7d84150fa..6b59242972d1 100644 --- a/backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseNativeWriteTableSuite.scala +++ b/backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseNativeWriteTableSuite.scala @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution +package org.apache.gluten.execution -import io.glutenproject.GlutenConfig -import io.glutenproject.execution.AllDataTypesWithComplexType.genTestData -import io.glutenproject.utils.UTSystemParameters +import org.apache.gluten.GlutenConfig +import org.apache.gluten.execution.AllDataTypesWithComplexType.genTestData +import org.apache.gluten.utils.UTSystemParameters import org.apache.spark.SparkConf import org.apache.spark.sql.SparkSession @@ -38,7 +38,7 @@ class GlutenClickHouseNativeWriteTableSuite override protected def sparkConf: SparkConf = { new SparkConf() - .set("spark.plugins", "io.glutenproject.GlutenPlugin") + .set("spark.plugins", "org.apache.gluten.GlutenPlugin") .set("spark.memory.offHeap.enabled", "true") .set("spark.memory.offHeap.size", "1073741824") .set("spark.sql.catalogImplementation", "hive") diff --git a/backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHousePreferSpillColumnarShuffleAQESuite.scala b/backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHousePreferSpillColumnarShuffleAQESuite.scala similarity index 99% rename from backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHousePreferSpillColumnarShuffleAQESuite.scala rename to backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHousePreferSpillColumnarShuffleAQESuite.scala index b7655f57d51b..1884f850718a 100644 --- a/backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHousePreferSpillColumnarShuffleAQESuite.scala +++ b/backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHousePreferSpillColumnarShuffleAQESuite.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution +package org.apache.gluten.execution import org.apache.spark.SparkConf import org.apache.spark.sql.execution.CoalescedPartitionSpec diff --git a/backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseS3SourceSuite.scala b/backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseS3SourceSuite.scala similarity index 99% rename from backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseS3SourceSuite.scala rename to backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseS3SourceSuite.scala index a1c26a4e0b41..ac33757032e1 100644 --- a/backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseS3SourceSuite.scala +++ b/backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseS3SourceSuite.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution +package org.apache.gluten.execution import org.apache.spark.SparkConf diff --git a/backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseSyntheticDataSuite.scala b/backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseSyntheticDataSuite.scala similarity index 98% rename from backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseSyntheticDataSuite.scala rename to backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseSyntheticDataSuite.scala index 63aced05e746..8db4e3b10fe2 100644 --- a/backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseSyntheticDataSuite.scala +++ b/backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseSyntheticDataSuite.scala @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution +package org.apache.gluten.execution -import io.glutenproject.GlutenConfig -import io.glutenproject.utils.UTSystemParameters +import org.apache.gluten.GlutenConfig +import org.apache.gluten.utils.UTSystemParameters import org.apache.spark.SparkConf import org.apache.spark.internal.Logging diff --git a/backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseTPCDSAbstractSuite.scala b/backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseTPCDSAbstractSuite.scala similarity index 97% rename from backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseTPCDSAbstractSuite.scala rename to backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseTPCDSAbstractSuite.scala index bfce3b4fd815..a85593c07ab7 100644 --- a/backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseTPCDSAbstractSuite.scala +++ b/backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseTPCDSAbstractSuite.scala @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution +package org.apache.gluten.execution -import io.glutenproject.GlutenConfig -import io.glutenproject.benchmarks.GenTPCDSTableScripts -import io.glutenproject.utils.UTSystemParameters +import org.apache.gluten.GlutenConfig +import org.apache.gluten.benchmarks.GenTPCDSTableScripts +import org.apache.gluten.utils.UTSystemParameters import org.apache.spark.SparkConf import org.apache.spark.internal.Logging diff --git a/backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseTPCDSParquetAQESuite.scala b/backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseTPCDSParquetAQESuite.scala similarity index 99% rename from backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseTPCDSParquetAQESuite.scala rename to backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseTPCDSParquetAQESuite.scala index 1628ddd1a126..828fb510fa45 100644 --- a/backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseTPCDSParquetAQESuite.scala +++ b/backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseTPCDSParquetAQESuite.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution +package org.apache.gluten.execution import org.apache.spark.SparkConf import org.apache.spark.sql.catalyst.expressions.DynamicPruningExpression diff --git a/backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseTPCDSParquetColumnarShuffleAQESuite.scala b/backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseTPCDSParquetColumnarShuffleAQESuite.scala similarity index 99% rename from backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseTPCDSParquetColumnarShuffleAQESuite.scala rename to backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseTPCDSParquetColumnarShuffleAQESuite.scala index cfb000b513e8..a1c609ea4237 100644 --- a/backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseTPCDSParquetColumnarShuffleAQESuite.scala +++ b/backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseTPCDSParquetColumnarShuffleAQESuite.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution +package org.apache.gluten.execution import org.apache.spark.SparkConf import org.apache.spark.sql.catalyst.expressions.DynamicPruningExpression diff --git a/backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseTPCDSParquetColumnarShuffleSuite.scala b/backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseTPCDSParquetColumnarShuffleSuite.scala similarity index 99% rename from backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseTPCDSParquetColumnarShuffleSuite.scala rename to backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseTPCDSParquetColumnarShuffleSuite.scala index a4307c4cebcd..f4c1cc3a6202 100644 --- a/backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseTPCDSParquetColumnarShuffleSuite.scala +++ b/backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseTPCDSParquetColumnarShuffleSuite.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution +package org.apache.gluten.execution import org.apache.spark.SparkConf import org.apache.spark.sql.catalyst.expressions.DynamicPruningExpression diff --git a/backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseTPCDSParquetGraceHashJoinSuite.scala b/backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseTPCDSParquetGraceHashJoinSuite.scala similarity index 99% rename from backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseTPCDSParquetGraceHashJoinSuite.scala rename to backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseTPCDSParquetGraceHashJoinSuite.scala index 22e3c1af3264..0fe04ea2aa3d 100644 --- a/backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseTPCDSParquetGraceHashJoinSuite.scala +++ b/backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseTPCDSParquetGraceHashJoinSuite.scala @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution +package org.apache.gluten.execution -import io.glutenproject.utils.FallbackUtil +import org.apache.gluten.utils.FallbackUtil import org.apache.spark.SparkConf import org.apache.spark.sql.catalyst.expressions.{DynamicPruningExpression, Not} diff --git a/backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseTPCDSParquetRFSuite.scala b/backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseTPCDSParquetRFSuite.scala similarity index 98% rename from backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseTPCDSParquetRFSuite.scala rename to backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseTPCDSParquetRFSuite.scala index 0b10179116de..77afb6e859ed 100644 --- a/backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseTPCDSParquetRFSuite.scala +++ b/backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseTPCDSParquetRFSuite.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution +package org.apache.gluten.execution import org.apache.spark.SparkConf diff --git a/backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseTPCDSParquetSuite.scala b/backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseTPCDSParquetSuite.scala similarity index 99% rename from backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseTPCDSParquetSuite.scala rename to backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseTPCDSParquetSuite.scala index ea557655ba94..27efba6482cb 100644 --- a/backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseTPCDSParquetSuite.scala +++ b/backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseTPCDSParquetSuite.scala @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution +package org.apache.gluten.execution -import io.glutenproject.utils.FallbackUtil +import org.apache.gluten.utils.FallbackUtil import org.apache.spark.SparkConf import org.apache.spark.sql.catalyst.expressions.{DynamicPruningExpression, Not} diff --git a/backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseTPCHAbstractSuite.scala b/backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseTPCHAbstractSuite.scala similarity index 99% rename from backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseTPCHAbstractSuite.scala rename to backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseTPCHAbstractSuite.scala index c8ac96c0fe91..b65b6c35be25 100644 --- a/backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseTPCHAbstractSuite.scala +++ b/backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseTPCHAbstractSuite.scala @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution +package org.apache.gluten.execution -import io.glutenproject.GlutenConfig -import io.glutenproject.utils.UTSystemParameters +import org.apache.gluten.GlutenConfig +import org.apache.gluten.utils.UTSystemParameters import org.apache.spark.SparkConf import org.apache.spark.internal.Logging diff --git a/backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseTPCHBucketSuite.scala b/backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseTPCHBucketSuite.scala similarity index 99% rename from backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseTPCHBucketSuite.scala rename to backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseTPCHBucketSuite.scala index 20ce336cde7d..2aafef67e153 100644 --- a/backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseTPCHBucketSuite.scala +++ b/backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseTPCHBucketSuite.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution +package org.apache.gluten.execution import org.apache.spark.{SPARK_VERSION_SHORT, SparkConf} import org.apache.spark.sql.{DataFrame, Row} diff --git a/backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseTPCHColumnarShuffleParquetAQESuite.scala b/backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseTPCHColumnarShuffleParquetAQESuite.scala similarity index 99% rename from backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseTPCHColumnarShuffleParquetAQESuite.scala rename to backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseTPCHColumnarShuffleParquetAQESuite.scala index 4d395dbb7b49..a992a776af34 100644 --- a/backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseTPCHColumnarShuffleParquetAQESuite.scala +++ b/backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseTPCHColumnarShuffleParquetAQESuite.scala @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution +package org.apache.gluten.execution -import io.glutenproject.extension.GlutenPlan +import org.apache.gluten.extension.GlutenPlan import org.apache.spark.SparkConf import org.apache.spark.sql.catalyst.optimizer.BuildLeft diff --git a/backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseTPCHNotNullSkipIndexSuite.scala b/backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseTPCHNotNullSkipIndexSuite.scala similarity index 99% rename from backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseTPCHNotNullSkipIndexSuite.scala rename to backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseTPCHNotNullSkipIndexSuite.scala index 73462780cf6d..52cdaf0592ad 100644 --- a/backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseTPCHNotNullSkipIndexSuite.scala +++ b/backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseTPCHNotNullSkipIndexSuite.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution +package org.apache.gluten.execution import org.apache.spark.SparkConf diff --git a/backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseTPCHNullableColumnarShuffleSuite.scala b/backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseTPCHNullableColumnarShuffleSuite.scala similarity index 99% rename from backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseTPCHNullableColumnarShuffleSuite.scala rename to backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseTPCHNullableColumnarShuffleSuite.scala index 3297f93a2a8a..245b52d37109 100644 --- a/backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseTPCHNullableColumnarShuffleSuite.scala +++ b/backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseTPCHNullableColumnarShuffleSuite.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution +package org.apache.gluten.execution import org.apache.spark.SparkConf import org.apache.spark.sql.catalyst.optimizer.BuildLeft diff --git a/backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseTPCHNullableSkipIndexSuite.scala b/backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseTPCHNullableSkipIndexSuite.scala similarity index 99% rename from backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseTPCHNullableSkipIndexSuite.scala rename to backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseTPCHNullableSkipIndexSuite.scala index 27fa79018d5f..3d44f500a879 100644 --- a/backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseTPCHNullableSkipIndexSuite.scala +++ b/backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseTPCHNullableSkipIndexSuite.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution +package org.apache.gluten.execution import org.apache.spark.SparkConf diff --git a/backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseTPCHNullableSuite.scala b/backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseTPCHNullableSuite.scala similarity index 99% rename from backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseTPCHNullableSuite.scala rename to backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseTPCHNullableSuite.scala index 42783babd124..1241f0bcdae8 100644 --- a/backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseTPCHNullableSuite.scala +++ b/backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseTPCHNullableSuite.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution +package org.apache.gluten.execution import org.apache.spark.SparkConf import org.apache.spark.sql.catalyst.optimizer.BuildLeft diff --git a/backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseTPCHParquetAQEConcurrentSuite.scala b/backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseTPCHParquetAQEConcurrentSuite.scala similarity index 98% rename from backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseTPCHParquetAQEConcurrentSuite.scala rename to backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseTPCHParquetAQEConcurrentSuite.scala index dbe7ca6d4b72..34e9658fb419 100644 --- a/backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseTPCHParquetAQEConcurrentSuite.scala +++ b/backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseTPCHParquetAQEConcurrentSuite.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution +package org.apache.gluten.execution import org.apache.spark.SparkConf import org.apache.spark.sql.DataFrame diff --git a/backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseTPCHParquetAQESuite.scala b/backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseTPCHParquetAQESuite.scala similarity index 99% rename from backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseTPCHParquetAQESuite.scala rename to backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseTPCHParquetAQESuite.scala index c90aa4a8c14c..c3e64a94146d 100644 --- a/backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseTPCHParquetAQESuite.scala +++ b/backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseTPCHParquetAQESuite.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution +package org.apache.gluten.execution import org.apache.spark.SparkConf import org.apache.spark.sql.catalyst.optimizer.BuildLeft diff --git a/backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseTPCHParquetBucketSuite.scala b/backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseTPCHParquetBucketSuite.scala similarity index 99% rename from backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseTPCHParquetBucketSuite.scala rename to backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseTPCHParquetBucketSuite.scala index 411f441e00a3..3dc7b11664b0 100644 --- a/backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseTPCHParquetBucketSuite.scala +++ b/backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseTPCHParquetBucketSuite.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution +package org.apache.gluten.execution import org.apache.spark.{SPARK_VERSION_SHORT, SparkConf} import org.apache.spark.sql.DataFrame diff --git a/backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseTPCHParquetRFSuite.scala b/backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseTPCHParquetRFSuite.scala similarity index 98% rename from backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseTPCHParquetRFSuite.scala rename to backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseTPCHParquetRFSuite.scala index 0649b817c5df..0f2e6b44c6dc 100644 --- a/backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseTPCHParquetRFSuite.scala +++ b/backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseTPCHParquetRFSuite.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution +package org.apache.gluten.execution import org.apache.spark.{SPARK_VERSION_SHORT, SparkConf} diff --git a/backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseTPCHSaltNullParquetSuite.scala b/backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseTPCHSaltNullParquetSuite.scala similarity index 99% rename from backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseTPCHSaltNullParquetSuite.scala rename to backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseTPCHSaltNullParquetSuite.scala index 098b0d9e2f8a..f68273d802d4 100644 --- a/backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseTPCHSaltNullParquetSuite.scala +++ b/backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseTPCHSaltNullParquetSuite.scala @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution +package org.apache.gluten.execution -import io.glutenproject.extension.GlutenPlan +import org.apache.gluten.extension.GlutenPlan import org.apache.spark.{SparkConf, SparkException} import org.apache.spark.sql.DataFrame diff --git a/backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseTPCHSuite.scala b/backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseTPCHSuite.scala similarity index 99% rename from backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseTPCHSuite.scala rename to backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseTPCHSuite.scala index 368a2ce852c8..6dcb83de4740 100644 --- a/backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseTPCHSuite.scala +++ b/backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseTPCHSuite.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution +package org.apache.gluten.execution import org.apache.spark.SparkConf import org.apache.spark.sql.{Row, TestUtils} diff --git a/backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseTableAfterRestart.scala b/backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseTableAfterRestart.scala similarity index 99% rename from backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseTableAfterRestart.scala rename to backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseTableAfterRestart.scala index dffc0441c0cd..c6abbd4443ff 100644 --- a/backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseTableAfterRestart.scala +++ b/backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseTableAfterRestart.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution +package org.apache.gluten.execution import org.apache.spark.{SPARK_VERSION_SHORT, SparkConf} import org.apache.spark.sql.SparkSession diff --git a/backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseWholeStageTransformerSuite.scala b/backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseWholeStageTransformerSuite.scala similarity index 95% rename from backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseWholeStageTransformerSuite.scala rename to backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseWholeStageTransformerSuite.scala index a2de7cf51e08..22fd58ab0f42 100644 --- a/backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseWholeStageTransformerSuite.scala +++ b/backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseWholeStageTransformerSuite.scala @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution +package org.apache.gluten.execution -import io.glutenproject.GlutenConfig -import io.glutenproject.utils.UTSystemParameters +import org.apache.gluten.GlutenConfig +import org.apache.gluten.utils.UTSystemParameters import org.apache.spark.SparkConf import org.apache.spark.sql.execution.datasources.v2.clickhouse.ClickHouseConfig diff --git a/backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickhouseCountDistinctSuite.scala b/backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickhouseCountDistinctSuite.scala similarity index 97% rename from backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickhouseCountDistinctSuite.scala rename to backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickhouseCountDistinctSuite.scala index 4ba9882b65df..b12f886e5d6d 100644 --- a/backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickhouseCountDistinctSuite.scala +++ b/backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickhouseCountDistinctSuite.scala @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution +package org.apache.gluten.execution -import io.glutenproject.execution.AllDataTypesWithComplexType.genTestData +import org.apache.gluten.execution.AllDataTypesWithComplexType.genTestData import org.apache.spark.SparkConf class GlutenClickhouseCountDistinctSuite extends GlutenClickHouseWholeStageTransformerSuite { diff --git a/backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickhouseFunctionSuite.scala b/backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickhouseFunctionSuite.scala similarity index 97% rename from backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickhouseFunctionSuite.scala rename to backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickhouseFunctionSuite.scala index 28e7936c345a..c90e9131a5a4 100644 --- a/backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickhouseFunctionSuite.scala +++ b/backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickhouseFunctionSuite.scala @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution +package org.apache.gluten.execution -import io.glutenproject.GlutenConfig -import io.glutenproject.utils.UTSystemParameters +import org.apache.gluten.GlutenConfig +import org.apache.gluten.utils.UTSystemParameters import org.apache.spark.SparkConf import org.apache.spark.sql.SparkSession @@ -44,7 +44,7 @@ class GlutenClickhouseFunctionSuite extends GlutenClickHouseTPCHAbstractSuite { override protected def sparkConf: SparkConf = { new SparkConf() - .set("spark.plugins", "io.glutenproject.GlutenPlugin") + .set("spark.plugins", "org.apache.gluten.GlutenPlugin") .set("spark.memory.offHeap.enabled", "true") .set("spark.memory.offHeap.size", "1073741824") .set("spark.sql.catalogImplementation", "hive") diff --git a/backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenFunctionValidateSuite.scala b/backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenFunctionValidateSuite.scala similarity index 99% rename from backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenFunctionValidateSuite.scala rename to backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenFunctionValidateSuite.scala index 1a27e68fe3c2..43081889f912 100644 --- a/backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenFunctionValidateSuite.scala +++ b/backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenFunctionValidateSuite.scala @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution +package org.apache.gluten.execution -import io.glutenproject.GlutenConfig -import io.glutenproject.utils.UTSystemParameters +import org.apache.gluten.GlutenConfig +import org.apache.gluten.utils.UTSystemParameters import org.apache.spark.{SPARK_VERSION_SHORT, SparkConf} import org.apache.spark.sql.{DataFrame, Row} diff --git a/backends-clickhouse/src/test/scala/io/glutenproject/execution/extension/CustomAggExpressionTransformer.scala b/backends-clickhouse/src/test/scala/org/apache/gluten/execution/extension/CustomAggExpressionTransformer.scala similarity index 95% rename from backends-clickhouse/src/test/scala/io/glutenproject/execution/extension/CustomAggExpressionTransformer.scala rename to backends-clickhouse/src/test/scala/org/apache/gluten/execution/extension/CustomAggExpressionTransformer.scala index 9fbc2aa3bfbc..eba3dcd4199c 100644 --- a/backends-clickhouse/src/test/scala/io/glutenproject/execution/extension/CustomAggExpressionTransformer.scala +++ b/backends-clickhouse/src/test/scala/org/apache/gluten/execution/extension/CustomAggExpressionTransformer.scala @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution.extension +package org.apache.gluten.execution.extension -import io.glutenproject.expression.Sig -import io.glutenproject.extension.ExpressionExtensionTrait +import org.apache.gluten.expression.Sig +import org.apache.gluten.extension.ExpressionExtensionTrait import org.apache.spark.sql.catalyst.expressions._ import org.apache.spark.sql.catalyst.expressions.aggregate._ diff --git a/backends-clickhouse/src/test/scala/io/glutenproject/execution/extension/GlutenCustomAggExpressionSuite.scala b/backends-clickhouse/src/test/scala/org/apache/gluten/execution/extension/GlutenCustomAggExpressionSuite.scala similarity index 93% rename from backends-clickhouse/src/test/scala/io/glutenproject/execution/extension/GlutenCustomAggExpressionSuite.scala rename to backends-clickhouse/src/test/scala/org/apache/gluten/execution/extension/GlutenCustomAggExpressionSuite.scala index c42c8741e853..3a2808e70f22 100644 --- a/backends-clickhouse/src/test/scala/io/glutenproject/execution/extension/GlutenCustomAggExpressionSuite.scala +++ b/backends-clickhouse/src/test/scala/org/apache/gluten/execution/extension/GlutenCustomAggExpressionSuite.scala @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution.extension +package org.apache.gluten.execution.extension -import io.glutenproject.execution._ -import io.glutenproject.substrait.SubstraitContext -import io.glutenproject.utils.SubstraitPlanPrinterUtil +import org.apache.gluten.execution._ +import org.apache.gluten.substrait.SubstraitContext +import org.apache.gluten.utils.SubstraitPlanPrinterUtil import org.apache.spark.SparkConf import org.apache.spark.sql.catalyst.FunctionIdentifier @@ -39,7 +39,7 @@ class GlutenCustomAggExpressionSuite extends GlutenClickHouseTPCHAbstractSuite { super.sparkConf .set( "spark.gluten.sql.columnar.extended.expressions.transformer", - "io.glutenproject.execution.extension.CustomAggExpressionTransformer") + "org.apache.gluten.execution.extension.CustomAggExpressionTransformer") } override protected def createTPCHNotNullTables(): Unit = { diff --git a/backends-clickhouse/src/test/scala/io/glutenproject/execution/metrics/GlutenClickHouseMergeTreeMetricsSuite.scala b/backends-clickhouse/src/test/scala/org/apache/gluten/execution/metrics/GlutenClickHouseMergeTreeMetricsSuite.scala similarity index 97% rename from backends-clickhouse/src/test/scala/io/glutenproject/execution/metrics/GlutenClickHouseMergeTreeMetricsSuite.scala rename to backends-clickhouse/src/test/scala/org/apache/gluten/execution/metrics/GlutenClickHouseMergeTreeMetricsSuite.scala index 61eef819e69a..7b2aa392c97a 100644 --- a/backends-clickhouse/src/test/scala/io/glutenproject/execution/metrics/GlutenClickHouseMergeTreeMetricsSuite.scala +++ b/backends-clickhouse/src/test/scala/org/apache/gluten/execution/metrics/GlutenClickHouseMergeTreeMetricsSuite.scala @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution.metrics +package org.apache.gluten.execution.metrics -import io.glutenproject.execution.{ColumnarNativeIterator, GlutenClickHouseTPCHAbstractSuite} -import io.glutenproject.vectorized.GeneralInIterator +import org.apache.gluten.execution.{ColumnarNativeIterator, GlutenClickHouseTPCHAbstractSuite} +import org.apache.gluten.vectorized.GeneralInIterator import org.apache.spark.SparkConf import org.apache.spark.sql.catalyst.expressions.Attribute diff --git a/backends-clickhouse/src/test/scala/io/glutenproject/execution/metrics/GlutenClickHouseMetricsUTUtils.scala b/backends-clickhouse/src/test/scala/org/apache/gluten/execution/metrics/GlutenClickHouseMetricsUTUtils.scala similarity index 91% rename from backends-clickhouse/src/test/scala/io/glutenproject/execution/metrics/GlutenClickHouseMetricsUTUtils.scala rename to backends-clickhouse/src/test/scala/org/apache/gluten/execution/metrics/GlutenClickHouseMetricsUTUtils.scala index 1247705cc94e..bc395ca88e9a 100644 --- a/backends-clickhouse/src/test/scala/io/glutenproject/execution/metrics/GlutenClickHouseMetricsUTUtils.scala +++ b/backends-clickhouse/src/test/scala/org/apache/gluten/execution/metrics/GlutenClickHouseMetricsUTUtils.scala @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution.metrics +package org.apache.gluten.execution.metrics -import io.glutenproject.execution.WholeStageTransformer -import io.glutenproject.memory.alloc.CHNativeMemoryAllocators -import io.glutenproject.metrics.{MetricsUtil, NativeMetrics} -import io.glutenproject.utils.SubstraitPlanPrinterUtil -import io.glutenproject.vectorized.{CHNativeExpressionEvaluator, GeneralInIterator, GeneralOutIterator} +import org.apache.gluten.execution.WholeStageTransformer +import org.apache.gluten.memory.alloc.CHNativeMemoryAllocators +import org.apache.gluten.metrics.{MetricsUtil, NativeMetrics} +import org.apache.gluten.utils.SubstraitPlanPrinterUtil +import org.apache.gluten.vectorized.{CHNativeExpressionEvaluator, GeneralInIterator, GeneralOutIterator} import org.apache.spark.sql.{DataFrame, SparkSession} import org.apache.spark.sql.catalyst.expressions.Attribute diff --git a/backends-clickhouse/src/test/scala/io/glutenproject/execution/metrics/GlutenClickHouseTPCDSMetricsSuite.scala b/backends-clickhouse/src/test/scala/org/apache/gluten/execution/metrics/GlutenClickHouseTPCDSMetricsSuite.scala similarity index 95% rename from backends-clickhouse/src/test/scala/io/glutenproject/execution/metrics/GlutenClickHouseTPCDSMetricsSuite.scala rename to backends-clickhouse/src/test/scala/org/apache/gluten/execution/metrics/GlutenClickHouseTPCDSMetricsSuite.scala index bffd4f9ed1f4..5b3d98808201 100644 --- a/backends-clickhouse/src/test/scala/io/glutenproject/execution/metrics/GlutenClickHouseTPCDSMetricsSuite.scala +++ b/backends-clickhouse/src/test/scala/org/apache/gluten/execution/metrics/GlutenClickHouseTPCDSMetricsSuite.scala @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution.metrics +package org.apache.gluten.execution.metrics -import io.glutenproject.execution.{ColumnarNativeIterator, GlutenClickHouseTPCDSAbstractSuite, WholeStageTransformer} -import io.glutenproject.extension.GlutenPlan -import io.glutenproject.vectorized.GeneralInIterator +import org.apache.gluten.execution.{ColumnarNativeIterator, GlutenClickHouseTPCDSAbstractSuite, WholeStageTransformer} +import org.apache.gluten.extension.GlutenPlan +import org.apache.gluten.vectorized.GeneralInIterator import org.apache.spark.SparkConf import org.apache.spark.sql.catalyst.expressions.Attribute diff --git a/backends-clickhouse/src/test/scala/io/glutenproject/execution/metrics/GlutenClickHouseTPCHMetricsSuite.scala b/backends-clickhouse/src/test/scala/org/apache/gluten/execution/metrics/GlutenClickHouseTPCHMetricsSuite.scala similarity index 98% rename from backends-clickhouse/src/test/scala/io/glutenproject/execution/metrics/GlutenClickHouseTPCHMetricsSuite.scala rename to backends-clickhouse/src/test/scala/org/apache/gluten/execution/metrics/GlutenClickHouseTPCHMetricsSuite.scala index 49846280ec1f..1484d4653260 100644 --- a/backends-clickhouse/src/test/scala/io/glutenproject/execution/metrics/GlutenClickHouseTPCHMetricsSuite.scala +++ b/backends-clickhouse/src/test/scala/org/apache/gluten/execution/metrics/GlutenClickHouseTPCHMetricsSuite.scala @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution.metrics +package org.apache.gluten.execution.metrics -import io.glutenproject.execution._ -import io.glutenproject.extension.GlutenPlan -import io.glutenproject.vectorized.GeneralInIterator +import org.apache.gluten.execution._ +import org.apache.gluten.extension.GlutenPlan +import org.apache.gluten.vectorized.GeneralInIterator import org.apache.spark.SparkConf import org.apache.spark.sql.catalyst.expressions.Attribute diff --git a/backends-clickhouse/src/test/scala/io/glutenproject/s3/S3AuthSuite.scala b/backends-clickhouse/src/test/scala/org/apache/gluten/s3/S3AuthSuite.scala similarity index 97% rename from backends-clickhouse/src/test/scala/io/glutenproject/s3/S3AuthSuite.scala rename to backends-clickhouse/src/test/scala/org/apache/gluten/s3/S3AuthSuite.scala index 5e2d4426c8f9..b2ac3672a1e1 100644 --- a/backends-clickhouse/src/test/scala/io/glutenproject/s3/S3AuthSuite.scala +++ b/backends-clickhouse/src/test/scala/org/apache/gluten/s3/S3AuthSuite.scala @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.s3 +package org.apache.gluten.s3 -import io.glutenproject.GlutenConfig +import org.apache.gluten.GlutenConfig import org.apache.spark.sql.SparkSession import org.apache.spark.sql.SparkSession.Builder @@ -112,7 +112,7 @@ class S3AuthSuite extends AnyFunSuite { .builder() .appName("Gluten-S3-Test") .master(s"local[1]") - .config("spark.plugins", "io.glutenproject.GlutenPlugin") + .config("spark.plugins", "org.apache.gluten.GlutenPlugin") .config(GlutenConfig.GLUTEN_LIB_PATH, libPath) .config("spark.memory.offHeap.enabled", "true") .config("spark.memory.offHeap.size", "1g") @@ -143,7 +143,7 @@ class S3AuthSuite extends AnyFunSuite { .builder() .appName("Gluten-S3-Test") .master(s"local[1]") - .config("spark.plugins", "io.glutenproject.GlutenPlugin") + .config("spark.plugins", "org.apache.gluten.GlutenPlugin") .config(GlutenConfig.GLUTEN_LIB_PATH, libPath) .config("spark.memory.offHeap.enabled", "true") .config("spark.memory.offHeap.size", "1g") @@ -181,7 +181,7 @@ class S3AuthSuite extends AnyFunSuite { .builder() .appName("Gluten-S3-Test") .master(s"local[1]") - .config("spark.plugins", "io.glutenproject.GlutenPlugin") + .config("spark.plugins", "org.apache.gluten.GlutenPlugin") .config(GlutenConfig.GLUTEN_LIB_PATH, libPath) .config("spark.memory.offHeap.enabled", "true") .config("spark.memory.offHeap.size", "1g") @@ -230,7 +230,7 @@ class S3AuthSuite extends AnyFunSuite { .builder() .appName("Gluten-S3-Test") .master(s"local[1]") - .config("spark.plugins", "io.glutenproject.GlutenPlugin") + .config("spark.plugins", "org.apache.gluten.GlutenPlugin") .config(GlutenConfig.GLUTEN_LIB_PATH, libPath) .config("spark.memory.offHeap.enabled", "true") .config("spark.memory.offHeap.size", "1g") @@ -300,7 +300,7 @@ class S3AuthSuite extends AnyFunSuite { .builder() .appName("Gluten-S3-Test") .master(s"local[1]") - .config("spark.plugins", "io.glutenproject.GlutenPlugin") + .config("spark.plugins", "org.apache.gluten.GlutenPlugin") .config(GlutenConfig.GLUTEN_LIB_PATH, libPath) .config("spark.memory.offHeap.enabled", "true") .config("spark.memory.offHeap.size", "1g") diff --git a/backends-clickhouse/src/test/scala/io/glutenproject/utils/UTSystemParameters.scala b/backends-clickhouse/src/test/scala/org/apache/gluten/utils/UTSystemParameters.scala similarity index 98% rename from backends-clickhouse/src/test/scala/io/glutenproject/utils/UTSystemParameters.scala rename to backends-clickhouse/src/test/scala/org/apache/gluten/utils/UTSystemParameters.scala index ddcc1bd056d1..81f286b52e46 100644 --- a/backends-clickhouse/src/test/scala/io/glutenproject/utils/UTSystemParameters.scala +++ b/backends-clickhouse/src/test/scala/org/apache/gluten/utils/UTSystemParameters.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.utils +package org.apache.gluten.utils object UTSystemParameters { diff --git a/backends-clickhouse/src/test/scala/org/apache/spark/affinity/MixedAffinitySuite.scala b/backends-clickhouse/src/test/scala/org/apache/spark/affinity/MixedAffinitySuite.scala index 53fcf3cbc992..4dc19e62ef82 100644 --- a/backends-clickhouse/src/test/scala/org/apache/spark/affinity/MixedAffinitySuite.scala +++ b/backends-clickhouse/src/test/scala/org/apache/spark/affinity/MixedAffinitySuite.scala @@ -16,9 +16,9 @@ */ package org.apache.spark.affinity -import io.glutenproject.execution.{GlutenMergeTreePartition, GlutenPartition, MergeTreePartSplit} -import io.glutenproject.softaffinity.AffinityManager -import io.glutenproject.substrait.plan.PlanBuilder +import org.apache.gluten.execution.{GlutenMergeTreePartition, GlutenPartition, MergeTreePartSplit} +import org.apache.gluten.softaffinity.AffinityManager +import org.apache.gluten.substrait.plan.PlanBuilder import org.apache.spark.sql.QueryTest import org.apache.spark.sql.test.SharedSparkSession diff --git a/backends-clickhouse/src/test/scala/org/apache/spark/sql/execution/RemoveTopColumnarToRow.scala b/backends-clickhouse/src/test/scala/org/apache/spark/sql/execution/RemoveTopColumnarToRow.scala index 6f0c38d15f42..122c43562b39 100644 --- a/backends-clickhouse/src/test/scala/org/apache/spark/sql/execution/RemoveTopColumnarToRow.scala +++ b/backends-clickhouse/src/test/scala/org/apache/spark/sql/execution/RemoveTopColumnarToRow.scala @@ -16,7 +16,7 @@ */ package org.apache.spark.sql.execution -import io.glutenproject.execution.ColumnarToRowExecBase +import org.apache.gluten.execution.ColumnarToRowExecBase import org.apache.spark.sql.catalyst.rules.Rule diff --git a/backends-clickhouse/src/test/scala/org/apache/spark/sql/execution/benchmarks/CHAggAndShuffleBenchmark.scala b/backends-clickhouse/src/test/scala/org/apache/spark/sql/execution/benchmarks/CHAggAndShuffleBenchmark.scala index f019222a653e..19ced951795b 100644 --- a/backends-clickhouse/src/test/scala/org/apache/spark/sql/execution/benchmarks/CHAggAndShuffleBenchmark.scala +++ b/backends-clickhouse/src/test/scala/org/apache/spark/sql/execution/benchmarks/CHAggAndShuffleBenchmark.scala @@ -16,8 +16,8 @@ */ package org.apache.spark.sql.execution.benchmarks -import io.glutenproject.execution.{FileSourceScanExecTransformer, ProjectExecTransformer, WholeStageTransformer} -import io.glutenproject.sql.shims.SparkShimLoader +import org.apache.gluten.execution.{FileSourceScanExecTransformer, ProjectExecTransformer, WholeStageTransformer} +import org.apache.gluten.sql.shims.SparkShimLoader import org.apache.spark.SparkEnv import org.apache.spark.benchmark.Benchmark diff --git a/backends-clickhouse/src/test/scala/org/apache/spark/sql/execution/benchmarks/CHHashBuildBenchmark.scala b/backends-clickhouse/src/test/scala/org/apache/spark/sql/execution/benchmarks/CHHashBuildBenchmark.scala index 3b8fcb179494..487433c469c1 100644 --- a/backends-clickhouse/src/test/scala/org/apache/spark/sql/execution/benchmarks/CHHashBuildBenchmark.scala +++ b/backends-clickhouse/src/test/scala/org/apache/spark/sql/execution/benchmarks/CHHashBuildBenchmark.scala @@ -16,8 +16,8 @@ */ package org.apache.spark.sql.execution.benchmarks -import io.glutenproject.execution.BroadCastHashJoinContext -import io.glutenproject.vectorized.StorageJoinBuilder +import org.apache.gluten.execution.BroadCastHashJoinContext +import org.apache.gluten.vectorized.StorageJoinBuilder import org.apache.spark.benchmark.Benchmark import org.apache.spark.internal.Logging diff --git a/backends-clickhouse/src/test/scala/org/apache/spark/sql/execution/benchmarks/CHParquetReadBenchmark.scala b/backends-clickhouse/src/test/scala/org/apache/spark/sql/execution/benchmarks/CHParquetReadBenchmark.scala index 3c86e6d96e50..1cc8c83835e2 100644 --- a/backends-clickhouse/src/test/scala/org/apache/spark/sql/execution/benchmarks/CHParquetReadBenchmark.scala +++ b/backends-clickhouse/src/test/scala/org/apache/spark/sql/execution/benchmarks/CHParquetReadBenchmark.scala @@ -16,13 +16,13 @@ */ package org.apache.spark.sql.execution.benchmarks -import io.glutenproject.backendsapi.BackendsApiManager -import io.glutenproject.execution.{FileSourceScanExecTransformer, WholeStageTransformContext} -import io.glutenproject.expression.ConverterUtils -import io.glutenproject.sql.shims.SparkShimLoader -import io.glutenproject.substrait.SubstraitContext -import io.glutenproject.substrait.plan.PlanBuilder -import io.glutenproject.vectorized.{CHBlockConverterJniWrapper, CHNativeBlock} +import org.apache.gluten.backendsapi.BackendsApiManager +import org.apache.gluten.execution.{FileSourceScanExecTransformer, WholeStageTransformContext} +import org.apache.gluten.expression.ConverterUtils +import org.apache.gluten.sql.shims.SparkShimLoader +import org.apache.gluten.substrait.SubstraitContext +import org.apache.gluten.substrait.plan.PlanBuilder +import org.apache.gluten.vectorized.{CHBlockConverterJniWrapper, CHNativeBlock} import org.apache.spark.benchmark.Benchmark import org.apache.spark.rdd.RDD diff --git a/backends-clickhouse/src/test/scala/org/apache/spark/sql/execution/benchmarks/CHSqlBasedBenchmark.scala b/backends-clickhouse/src/test/scala/org/apache/spark/sql/execution/benchmarks/CHSqlBasedBenchmark.scala index dea467f1ccdb..ab541901ef98 100644 --- a/backends-clickhouse/src/test/scala/org/apache/spark/sql/execution/benchmarks/CHSqlBasedBenchmark.scala +++ b/backends-clickhouse/src/test/scala/org/apache/spark/sql/execution/benchmarks/CHSqlBasedBenchmark.scala @@ -16,9 +16,9 @@ */ package org.apache.spark.sql.execution.benchmarks -import io.glutenproject.GlutenConfig -import io.glutenproject.utils.UTSystemParameters -import io.glutenproject.vectorized.JniLibLoader +import org.apache.gluten.GlutenConfig +import org.apache.gluten.utils.UTSystemParameters +import org.apache.gluten.vectorized.JniLibLoader import org.apache.spark.SparkConf import org.apache.spark.sql.delta.DeltaLog @@ -34,7 +34,7 @@ trait CHSqlBasedBenchmark extends SqlBasedBenchmark { .setAppName(appName) .setIfMissing(GlutenConfig.GLUTEN_LIB_PATH, UTSystemParameters.clickHouseLibPath) .setIfMissing("spark.master", s"local[$thrdNum]") - .set("spark.plugins", "io.glutenproject.GlutenPlugin") + .set("spark.plugins", "org.apache.gluten.GlutenPlugin") .set( "spark.sql.catalog.spark_catalog", "org.apache.spark.sql.execution.datasources.v2.clickhouse.ClickHouseSparkCatalog") diff --git a/backends-clickhouse/src/test/scala/org/apache/spark/sql/execution/benchmarks/CHStorageJoinBenchmark.scala b/backends-clickhouse/src/test/scala/org/apache/spark/sql/execution/benchmarks/CHStorageJoinBenchmark.scala index 838cc50c3e2e..194eccc50878 100644 --- a/backends-clickhouse/src/test/scala/org/apache/spark/sql/execution/benchmarks/CHStorageJoinBenchmark.scala +++ b/backends-clickhouse/src/test/scala/org/apache/spark/sql/execution/benchmarks/CHStorageJoinBenchmark.scala @@ -16,8 +16,8 @@ */ package org.apache.spark.sql.execution.benchmarks -import io.glutenproject.utils.IteratorUtil -import io.glutenproject.vectorized.{BlockOutputStream, CHBlockWriterJniWrapper, CHStreamReader} +import org.apache.gluten.utils.IteratorUtil +import org.apache.gluten.vectorized.{BlockOutputStream, CHBlockWriterJniWrapper, CHStreamReader} import org.apache.spark.benchmark.Benchmark import org.apache.spark.sql.SparkSession diff --git a/backends-clickhouse/src/test/scala/org/apache/spark/sql/gluten/parquet/GlutenParquetColumnIndexSuite.scala b/backends-clickhouse/src/test/scala/org/apache/spark/sql/gluten/parquet/GlutenParquetColumnIndexSuite.scala index 23c37b108a47..bc23728524d9 100644 --- a/backends-clickhouse/src/test/scala/org/apache/spark/sql/gluten/parquet/GlutenParquetColumnIndexSuite.scala +++ b/backends-clickhouse/src/test/scala/org/apache/spark/sql/gluten/parquet/GlutenParquetColumnIndexSuite.scala @@ -16,8 +16,8 @@ */ package org.apache.spark.sql.gluten.parquet -import io.glutenproject.execution.{FileSourceScanExecTransformer, GlutenClickHouseWholeStageTransformerSuite} -import io.glutenproject.utils.UTSystemParameters +import org.apache.gluten.execution.{FileSourceScanExecTransformer, GlutenClickHouseWholeStageTransformerSuite} +import org.apache.gluten.utils.UTSystemParameters import org.apache.spark.SparkConf import org.apache.spark.internal.Logging diff --git a/backends-clickhouse/src/test/scala/org/apache/spark/sql/gluten/parquet/GlutenParquetFilterSuite.scala b/backends-clickhouse/src/test/scala/org/apache/spark/sql/gluten/parquet/GlutenParquetFilterSuite.scala index aae927e24b9b..1022b17e4311 100644 --- a/backends-clickhouse/src/test/scala/org/apache/spark/sql/gluten/parquet/GlutenParquetFilterSuite.scala +++ b/backends-clickhouse/src/test/scala/org/apache/spark/sql/gluten/parquet/GlutenParquetFilterSuite.scala @@ -16,7 +16,7 @@ */ package org.apache.spark.sql.gluten.parquet -import io.glutenproject.execution.{FileSourceScanExecTransformer, GlutenClickHouseWholeStageTransformerSuite} +import org.apache.gluten.execution.{FileSourceScanExecTransformer, GlutenClickHouseWholeStageTransformerSuite} import org.apache.spark.SparkConf import org.apache.spark.internal.Logging diff --git a/backends-clickhouse/src/test/scala/org/apache/spark/sql/gluten/test/GlutenSQLTestUtils.scala b/backends-clickhouse/src/test/scala/org/apache/spark/sql/gluten/test/GlutenSQLTestUtils.scala index ee504b158b77..09ffb91ffb4e 100644 --- a/backends-clickhouse/src/test/scala/org/apache/spark/sql/gluten/test/GlutenSQLTestUtils.scala +++ b/backends-clickhouse/src/test/scala/org/apache/spark/sql/gluten/test/GlutenSQLTestUtils.scala @@ -16,7 +16,7 @@ */ package org.apache.spark.sql.gluten.test -import io.glutenproject.GlutenConfig +import org.apache.gluten.GlutenConfig import org.apache.spark.SparkFunSuite import org.apache.spark.sql.delta.DeltaLog diff --git a/backends-velox/pom.xml b/backends-velox/pom.xml index 01e0280ad755..1369b110a800 100755 --- a/backends-velox/pom.xml +++ b/backends-velox/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> gluten-parent - io.glutenproject + org.apache.gluten 1.2.0-SNAPSHOT 4.0.0 @@ -26,14 +26,14 @@ true - io.glutenproject.tags.UDFTest + org.apache.gluten.tags.UDFTest - io.glutenproject + org.apache.gluten gluten-core ${project.version} compile @@ -44,14 +44,14 @@ ${custom.protobuf.version} - io.glutenproject + org.apache.gluten gluten-core ${project.version} test-jar test - io.glutenproject + org.apache.gluten gluten-cbo-common ${project.version} test-jar @@ -73,13 +73,13 @@ provided - io.glutenproject + org.apache.gluten gluten-data ${project.version} compile - io.glutenproject + org.apache.gluten spark-sql-columnar-shims-common ${project.version} provided diff --git a/backends-velox/src/main/java/io/glutenproject/fs/JniFilesystem.java b/backends-velox/src/main/java/org/apache/gluten/fs/JniFilesystem.java similarity index 98% rename from backends-velox/src/main/java/io/glutenproject/fs/JniFilesystem.java rename to backends-velox/src/main/java/org/apache/gluten/fs/JniFilesystem.java index 9b2497b26414..a1403f3789bd 100644 --- a/backends-velox/src/main/java/io/glutenproject/fs/JniFilesystem.java +++ b/backends-velox/src/main/java/org/apache/gluten/fs/JniFilesystem.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.fs; +package org.apache.gluten.fs; // Mirror of C++ side gluten::JniFileSystem, only for handling calls from C++ via JNI public interface JniFilesystem { diff --git a/backends-velox/src/main/java/io/glutenproject/fs/OnHeapFileSystem.java b/backends-velox/src/main/java/org/apache/gluten/fs/OnHeapFileSystem.java similarity index 99% rename from backends-velox/src/main/java/io/glutenproject/fs/OnHeapFileSystem.java rename to backends-velox/src/main/java/org/apache/gluten/fs/OnHeapFileSystem.java index 0528542cb27b..3fee46feeb35 100644 --- a/backends-velox/src/main/java/io/glutenproject/fs/OnHeapFileSystem.java +++ b/backends-velox/src/main/java/org/apache/gluten/fs/OnHeapFileSystem.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.fs; +package org.apache.gluten.fs; import com.google.common.jimfs.Configuration; import com.google.common.jimfs.Jimfs; diff --git a/backends-velox/src/main/java/io/glutenproject/udf/UdfJniWrapper.java b/backends-velox/src/main/java/org/apache/gluten/udf/UdfJniWrapper.java similarity index 96% rename from backends-velox/src/main/java/io/glutenproject/udf/UdfJniWrapper.java rename to backends-velox/src/main/java/org/apache/gluten/udf/UdfJniWrapper.java index 83cb9a16facb..4b609769b2ab 100644 --- a/backends-velox/src/main/java/io/glutenproject/udf/UdfJniWrapper.java +++ b/backends-velox/src/main/java/org/apache/gluten/udf/UdfJniWrapper.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.udf; +package org.apache.gluten.udf; public class UdfJniWrapper { diff --git a/backends-velox/src/main/java/io/glutenproject/utils/GlutenURLDecoder.java b/backends-velox/src/main/java/org/apache/gluten/utils/GlutenURLDecoder.java similarity index 99% rename from backends-velox/src/main/java/io/glutenproject/utils/GlutenURLDecoder.java rename to backends-velox/src/main/java/org/apache/gluten/utils/GlutenURLDecoder.java index 3bc3a3e5e763..9228a2f860ae 100644 --- a/backends-velox/src/main/java/io/glutenproject/utils/GlutenURLDecoder.java +++ b/backends-velox/src/main/java/org/apache/gluten/utils/GlutenURLDecoder.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.utils; +package org.apache.gluten.utils; import java.io.*; import java.net.URLEncoder; diff --git a/backends-velox/src/main/resources/META-INF/services/io.glutenproject.backendsapi.Backend b/backends-velox/src/main/resources/META-INF/services/io.glutenproject.backendsapi.Backend deleted file mode 100644 index e73e53bae155..000000000000 --- a/backends-velox/src/main/resources/META-INF/services/io.glutenproject.backendsapi.Backend +++ /dev/null @@ -1 +0,0 @@ -io.glutenproject.backendsapi.velox.VeloxBackend diff --git a/backends-velox/src/main/resources/META-INF/services/org.apache.gluten.backendsapi.Backend b/backends-velox/src/main/resources/META-INF/services/org.apache.gluten.backendsapi.Backend new file mode 100644 index 000000000000..7cc9b395911f --- /dev/null +++ b/backends-velox/src/main/resources/META-INF/services/org.apache.gluten.backendsapi.Backend @@ -0,0 +1 @@ +org.apache.gluten.backendsapi.velox.VeloxBackend diff --git a/backends-velox/src/main/scala/io/glutenproject/backendsapi/velox/BroadcastApiImpl.scala b/backends-velox/src/main/scala/org/apache/gluten/backendsapi/velox/BroadcastApiImpl.scala similarity index 92% rename from backends-velox/src/main/scala/io/glutenproject/backendsapi/velox/BroadcastApiImpl.scala rename to backends-velox/src/main/scala/org/apache/gluten/backendsapi/velox/BroadcastApiImpl.scala index 30091f59f609..b39a0f8e0621 100644 --- a/backends-velox/src/main/scala/io/glutenproject/backendsapi/velox/BroadcastApiImpl.scala +++ b/backends-velox/src/main/scala/org/apache/gluten/backendsapi/velox/BroadcastApiImpl.scala @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.backendsapi.velox +package org.apache.gluten.backendsapi.velox -import io.glutenproject.backendsapi.BroadcastApi +import org.apache.gluten.backendsapi.BroadcastApi import java.util diff --git a/backends-velox/src/main/scala/io/glutenproject/backendsapi/velox/IteratorApiImpl.scala b/backends-velox/src/main/scala/org/apache/gluten/backendsapi/velox/IteratorApiImpl.scala similarity index 94% rename from backends-velox/src/main/scala/io/glutenproject/backendsapi/velox/IteratorApiImpl.scala rename to backends-velox/src/main/scala/org/apache/gluten/backendsapi/velox/IteratorApiImpl.scala index 84198a6f8ecc..59d2e88c736e 100644 --- a/backends-velox/src/main/scala/io/glutenproject/backendsapi/velox/IteratorApiImpl.scala +++ b/backends-velox/src/main/scala/org/apache/gluten/backendsapi/velox/IteratorApiImpl.scala @@ -14,18 +14,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.backendsapi.velox - -import io.glutenproject.GlutenNumaBindingInfo -import io.glutenproject.backendsapi.IteratorApi -import io.glutenproject.execution._ -import io.glutenproject.metrics.IMetrics -import io.glutenproject.sql.shims.SparkShimLoader -import io.glutenproject.substrait.plan.PlanNode -import io.glutenproject.substrait.rel.{LocalFilesBuilder, LocalFilesNode, SplitInfo} -import io.glutenproject.substrait.rel.LocalFilesNode.ReadFileFormat -import io.glutenproject.utils._ -import io.glutenproject.vectorized._ +package org.apache.gluten.backendsapi.velox + +import org.apache.gluten.GlutenNumaBindingInfo +import org.apache.gluten.backendsapi.IteratorApi +import org.apache.gluten.execution._ +import org.apache.gluten.metrics.IMetrics +import org.apache.gluten.sql.shims.SparkShimLoader +import org.apache.gluten.substrait.plan.PlanNode +import org.apache.gluten.substrait.rel.{LocalFilesBuilder, LocalFilesNode, SplitInfo} +import org.apache.gluten.substrait.rel.LocalFilesNode.ReadFileFormat +import org.apache.gluten.utils._ +import org.apache.gluten.vectorized._ import org.apache.spark.{SparkConf, SparkContext, TaskContext} import org.apache.spark.internal.Logging diff --git a/backends-velox/src/main/scala/io/glutenproject/backendsapi/velox/ListenerApiImpl.scala b/backends-velox/src/main/scala/org/apache/gluten/backendsapi/velox/ListenerApiImpl.scala similarity index 92% rename from backends-velox/src/main/scala/io/glutenproject/backendsapi/velox/ListenerApiImpl.scala rename to backends-velox/src/main/scala/org/apache/gluten/backendsapi/velox/ListenerApiImpl.scala index 4a7dbc187342..3cca808c6ef9 100644 --- a/backends-velox/src/main/scala/io/glutenproject/backendsapi/velox/ListenerApiImpl.scala +++ b/backends-velox/src/main/scala/org/apache/gluten/backendsapi/velox/ListenerApiImpl.scala @@ -14,17 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.backendsapi.velox - -import io.glutenproject.GlutenConfig -import io.glutenproject.backendsapi.ListenerApi -import io.glutenproject.backendsapi.velox.ListenerApiImpl.initializeNative -import io.glutenproject.exception.GlutenException -import io.glutenproject.execution.datasource.{GlutenOrcWriterInjects, GlutenParquetWriterInjects, GlutenRowSplitter} -import io.glutenproject.expression.UDFMappings -import io.glutenproject.init.NativeBackendInitializer -import io.glutenproject.utils._ -import io.glutenproject.vectorized.{JniLibLoader, JniWorkspace} +package org.apache.gluten.backendsapi.velox + +import org.apache.gluten.GlutenConfig +import org.apache.gluten.backendsapi.ListenerApi +import org.apache.gluten.backendsapi.velox.ListenerApiImpl.initializeNative +import org.apache.gluten.exception.GlutenException +import org.apache.gluten.execution.datasource.{GlutenOrcWriterInjects, GlutenParquetWriterInjects, GlutenRowSplitter} +import org.apache.gluten.expression.UDFMappings +import org.apache.gluten.init.NativeBackendInitializer +import org.apache.gluten.utils._ +import org.apache.gluten.vectorized.{JniLibLoader, JniWorkspace} import org.apache.spark.SparkConf import org.apache.spark.sql.execution.datasources.velox.{VeloxOrcWriterInjects, VeloxParquetWriterInjects, VeloxRowSplitter} diff --git a/backends-velox/src/main/scala/io/glutenproject/backendsapi/velox/MetricsApiImpl.scala b/backends-velox/src/main/scala/org/apache/gluten/backendsapi/velox/MetricsApiImpl.scala similarity index 99% rename from backends-velox/src/main/scala/io/glutenproject/backendsapi/velox/MetricsApiImpl.scala rename to backends-velox/src/main/scala/org/apache/gluten/backendsapi/velox/MetricsApiImpl.scala index 9b49b9282a07..6a34ede897e7 100644 --- a/backends-velox/src/main/scala/io/glutenproject/backendsapi/velox/MetricsApiImpl.scala +++ b/backends-velox/src/main/scala/org/apache/gluten/backendsapi/velox/MetricsApiImpl.scala @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.backendsapi.velox +package org.apache.gluten.backendsapi.velox -import io.glutenproject.backendsapi.MetricsApi -import io.glutenproject.metrics._ -import io.glutenproject.substrait.{AggregationParams, JoinParams} +import org.apache.gluten.backendsapi.MetricsApi +import org.apache.gluten.metrics._ +import org.apache.gluten.substrait.{AggregationParams, JoinParams} import org.apache.spark.SparkContext import org.apache.spark.internal.Logging diff --git a/backends-velox/src/main/scala/io/glutenproject/backendsapi/velox/SparkPlanExecApiImpl.scala b/backends-velox/src/main/scala/org/apache/gluten/backendsapi/velox/SparkPlanExecApiImpl.scala similarity index 97% rename from backends-velox/src/main/scala/io/glutenproject/backendsapi/velox/SparkPlanExecApiImpl.scala rename to backends-velox/src/main/scala/org/apache/gluten/backendsapi/velox/SparkPlanExecApiImpl.scala index d7045c4e5f07..6f6286e5c2e3 100644 --- a/backends-velox/src/main/scala/io/glutenproject/backendsapi/velox/SparkPlanExecApiImpl.scala +++ b/backends-velox/src/main/scala/org/apache/gluten/backendsapi/velox/SparkPlanExecApiImpl.scala @@ -14,18 +14,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.backendsapi.velox - -import io.glutenproject.GlutenConfig -import io.glutenproject.backendsapi.SparkPlanExecApi -import io.glutenproject.exception.GlutenNotSupportException -import io.glutenproject.execution._ -import io.glutenproject.expression._ -import io.glutenproject.expression.ConverterUtils.FunctionConfig -import io.glutenproject.extension.columnar.TransformHints -import io.glutenproject.sql.shims.SparkShimLoader -import io.glutenproject.substrait.expression.{ExpressionBuilder, ExpressionNode, IfThenNode} -import io.glutenproject.vectorized.{ColumnarBatchSerializer, ColumnarBatchSerializeResult} +package org.apache.gluten.backendsapi.velox + +import org.apache.gluten.GlutenConfig +import org.apache.gluten.backendsapi.SparkPlanExecApi +import org.apache.gluten.exception.GlutenNotSupportException +import org.apache.gluten.execution._ +import org.apache.gluten.expression._ +import org.apache.gluten.expression.ConverterUtils.FunctionConfig +import org.apache.gluten.extension.columnar.TransformHints +import org.apache.gluten.sql.shims.SparkShimLoader +import org.apache.gluten.substrait.expression.{ExpressionBuilder, ExpressionNode, IfThenNode} +import org.apache.gluten.vectorized.{ColumnarBatchSerializer, ColumnarBatchSerializeResult} import org.apache.spark.{ShuffleDependency, SparkException} import org.apache.spark.rdd.RDD diff --git a/backends-velox/src/main/scala/io/glutenproject/backendsapi/velox/TransformerApiImpl.scala b/backends-velox/src/main/scala/org/apache/gluten/backendsapi/velox/TransformerApiImpl.scala similarity index 90% rename from backends-velox/src/main/scala/io/glutenproject/backendsapi/velox/TransformerApiImpl.scala rename to backends-velox/src/main/scala/org/apache/gluten/backendsapi/velox/TransformerApiImpl.scala index 13d98e313f02..fa9103f6ffa7 100644 --- a/backends-velox/src/main/scala/io/glutenproject/backendsapi/velox/TransformerApiImpl.scala +++ b/backends-velox/src/main/scala/org/apache/gluten/backendsapi/velox/TransformerApiImpl.scala @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.backendsapi.velox +package org.apache.gluten.backendsapi.velox -import io.glutenproject.backendsapi.TransformerApi -import io.glutenproject.expression.ConverterUtils -import io.glutenproject.substrait.expression.{ExpressionBuilder, ExpressionNode} -import io.glutenproject.utils.InputPartitionsUtil -import io.glutenproject.vectorized.PlanEvaluatorJniWrapper +import org.apache.gluten.backendsapi.TransformerApi +import org.apache.gluten.expression.ConverterUtils +import org.apache.gluten.substrait.expression.{ExpressionBuilder, ExpressionNode} +import org.apache.gluten.utils.InputPartitionsUtil +import org.apache.gluten.vectorized.PlanEvaluatorJniWrapper import org.apache.spark.internal.Logging import org.apache.spark.sql.catalyst.expressions.Attribute diff --git a/backends-velox/src/main/scala/io/glutenproject/backendsapi/velox/ValidatorApiImpl.scala b/backends-velox/src/main/scala/org/apache/gluten/backendsapi/velox/ValidatorApiImpl.scala similarity index 91% rename from backends-velox/src/main/scala/io/glutenproject/backendsapi/velox/ValidatorApiImpl.scala rename to backends-velox/src/main/scala/org/apache/gluten/backendsapi/velox/ValidatorApiImpl.scala index 3acb3aebbf4e..a48bd82b78b4 100644 --- a/backends-velox/src/main/scala/io/glutenproject/backendsapi/velox/ValidatorApiImpl.scala +++ b/backends-velox/src/main/scala/org/apache/gluten/backendsapi/velox/ValidatorApiImpl.scala @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.backendsapi.velox +package org.apache.gluten.backendsapi.velox -import io.glutenproject.backendsapi.ValidatorApi -import io.glutenproject.substrait.plan.PlanNode -import io.glutenproject.validate.NativePlanValidationInfo -import io.glutenproject.vectorized.NativePlanEvaluator +import org.apache.gluten.backendsapi.ValidatorApi +import org.apache.gluten.substrait.plan.PlanNode +import org.apache.gluten.validate.NativePlanValidationInfo +import org.apache.gluten.vectorized.NativePlanEvaluator import org.apache.spark.sql.catalyst.expressions.Expression import org.apache.spark.sql.catalyst.plans.physical.Partitioning diff --git a/backends-velox/src/main/scala/io/glutenproject/backendsapi/velox/VeloxBackend.scala b/backends-velox/src/main/scala/org/apache/gluten/backendsapi/velox/VeloxBackend.scala similarity index 96% rename from backends-velox/src/main/scala/io/glutenproject/backendsapi/velox/VeloxBackend.scala rename to backends-velox/src/main/scala/org/apache/gluten/backendsapi/velox/VeloxBackend.scala index e27b8084e0bd..fc493555affa 100644 --- a/backends-velox/src/main/scala/io/glutenproject/backendsapi/velox/VeloxBackend.scala +++ b/backends-velox/src/main/scala/org/apache/gluten/backendsapi/velox/VeloxBackend.scala @@ -14,17 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.backendsapi.velox - -import io.glutenproject.{GlutenConfig, VELOX_BRANCH, VELOX_REVISION, VELOX_REVISION_TIME} -import io.glutenproject.backendsapi._ -import io.glutenproject.exception.GlutenNotSupportException -import io.glutenproject.execution.WriteFilesExecTransformer -import io.glutenproject.expression.WindowFunctionsBuilder -import io.glutenproject.extension.ValidationResult -import io.glutenproject.sql.shims.SparkShimLoader -import io.glutenproject.substrait.rel.LocalFilesNode.ReadFileFormat -import io.glutenproject.substrait.rel.LocalFilesNode.ReadFileFormat.{DwrfReadFormat, OrcReadFormat, ParquetReadFormat} +package org.apache.gluten.backendsapi.velox + +import org.apache.gluten.{GlutenConfig, VELOX_BRANCH, VELOX_REVISION, VELOX_REVISION_TIME} +import org.apache.gluten.backendsapi._ +import org.apache.gluten.exception.GlutenNotSupportException +import org.apache.gluten.execution.WriteFilesExecTransformer +import org.apache.gluten.expression.WindowFunctionsBuilder +import org.apache.gluten.extension.ValidationResult +import org.apache.gluten.sql.shims.SparkShimLoader +import org.apache.gluten.substrait.rel.LocalFilesNode.ReadFileFormat +import org.apache.gluten.substrait.rel.LocalFilesNode.ReadFileFormat.{DwrfReadFormat, OrcReadFormat, ParquetReadFormat} import org.apache.spark.sql.catalyst.catalog.BucketSpec import org.apache.spark.sql.catalyst.expressions.{Alias, CumeDist, DenseRank, Descending, Expression, Lag, Lead, Literal, MakeYMInterval, NamedExpression, NthValue, NTile, PercentRank, Rand, RangeFrame, Rank, RowNumber, SortOrder, SpecialFrameBoundary, SpecifiedWindowFrame, Uuid} diff --git a/backends-velox/src/main/scala/io/glutenproject/execution/FilterExecTransformer.scala b/backends-velox/src/main/scala/org/apache/gluten/execution/FilterExecTransformer.scala similarity index 98% rename from backends-velox/src/main/scala/io/glutenproject/execution/FilterExecTransformer.scala rename to backends-velox/src/main/scala/org/apache/gluten/execution/FilterExecTransformer.scala index 25c21edc6718..7d399308ec02 100644 --- a/backends-velox/src/main/scala/io/glutenproject/execution/FilterExecTransformer.scala +++ b/backends-velox/src/main/scala/org/apache/gluten/execution/FilterExecTransformer.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution +package org.apache.gluten.execution import org.apache.spark.sql.catalyst.expressions.{And, Expression} import org.apache.spark.sql.execution.SparkPlan diff --git a/backends-velox/src/main/scala/io/glutenproject/execution/GenerateExecTransformer.scala b/backends-velox/src/main/scala/org/apache/gluten/execution/GenerateExecTransformer.scala similarity index 92% rename from backends-velox/src/main/scala/io/glutenproject/execution/GenerateExecTransformer.scala rename to backends-velox/src/main/scala/org/apache/gluten/execution/GenerateExecTransformer.scala index b865f31041ff..08d2937b5ab7 100644 --- a/backends-velox/src/main/scala/io/glutenproject/execution/GenerateExecTransformer.scala +++ b/backends-velox/src/main/scala/org/apache/gluten/execution/GenerateExecTransformer.scala @@ -14,17 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution +package org.apache.gluten.execution -import io.glutenproject.backendsapi.BackendsApiManager -import io.glutenproject.execution.GenerateExecTransformer.supportsGenerate -import io.glutenproject.extension.ValidationResult -import io.glutenproject.metrics.{GenerateMetricsUpdater, MetricsUpdater} -import io.glutenproject.substrait.SubstraitContext -import io.glutenproject.substrait.expression.ExpressionNode -import io.glutenproject.substrait.extensions.{AdvancedExtensionNode, ExtensionBuilder} -import io.glutenproject.substrait.rel.{RelBuilder, RelNode} -import io.glutenproject.utils.PullOutProjectHelper +import org.apache.gluten.backendsapi.BackendsApiManager +import org.apache.gluten.execution.GenerateExecTransformer.supportsGenerate +import org.apache.gluten.extension.ValidationResult +import org.apache.gluten.metrics.{GenerateMetricsUpdater, MetricsUpdater} +import org.apache.gluten.substrait.SubstraitContext +import org.apache.gluten.substrait.expression.ExpressionNode +import org.apache.gluten.substrait.extensions.{AdvancedExtensionNode, ExtensionBuilder} +import org.apache.gluten.substrait.rel.{RelBuilder, RelNode} +import org.apache.gluten.utils.PullOutProjectHelper import org.apache.spark.sql.catalyst.expressions._ import org.apache.spark.sql.execution.{GenerateExec, ProjectExec, SparkPlan} diff --git a/backends-velox/src/main/scala/io/glutenproject/execution/GlutenBroadcastNestedLoopJoinExecTransformer.scala b/backends-velox/src/main/scala/org/apache/gluten/execution/GlutenBroadcastNestedLoopJoinExecTransformer.scala similarity index 98% rename from backends-velox/src/main/scala/io/glutenproject/execution/GlutenBroadcastNestedLoopJoinExecTransformer.scala rename to backends-velox/src/main/scala/org/apache/gluten/execution/GlutenBroadcastNestedLoopJoinExecTransformer.scala index 0d13f6aee1bb..3cde6b27b1fa 100644 --- a/backends-velox/src/main/scala/io/glutenproject/execution/GlutenBroadcastNestedLoopJoinExecTransformer.scala +++ b/backends-velox/src/main/scala/org/apache/gluten/execution/GlutenBroadcastNestedLoopJoinExecTransformer.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution +package org.apache.gluten.execution import org.apache.spark.sql.catalyst.expressions.Expression import org.apache.spark.sql.catalyst.optimizer.BuildSide diff --git a/backends-velox/src/main/scala/io/glutenproject/execution/HashAggregateExecTransformer.scala b/backends-velox/src/main/scala/org/apache/gluten/execution/HashAggregateExecTransformer.scala similarity index 97% rename from backends-velox/src/main/scala/io/glutenproject/execution/HashAggregateExecTransformer.scala rename to backends-velox/src/main/scala/org/apache/gluten/execution/HashAggregateExecTransformer.scala index f71509d5c36c..2a0ac1ff93df 100644 --- a/backends-velox/src/main/scala/io/glutenproject/execution/HashAggregateExecTransformer.scala +++ b/backends-velox/src/main/scala/org/apache/gluten/execution/HashAggregateExecTransformer.scala @@ -14,19 +14,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution - -import io.glutenproject.backendsapi.BackendsApiManager -import io.glutenproject.exception.GlutenNotSupportException -import io.glutenproject.expression._ -import io.glutenproject.expression.ConverterUtils.FunctionConfig -import io.glutenproject.extension.columnar.RewriteTypedImperativeAggregate -import io.glutenproject.substrait.`type`.{TypeBuilder, TypeNode} -import io.glutenproject.substrait.{AggregationParams, SubstraitContext} -import io.glutenproject.substrait.expression.{AggregateFunctionNode, ExpressionBuilder, ExpressionNode, ScalarFunctionNode} -import io.glutenproject.substrait.extensions.{AdvancedExtensionNode, ExtensionBuilder} -import io.glutenproject.substrait.rel.{RelBuilder, RelNode} -import io.glutenproject.utils.VeloxIntermediateData +package org.apache.gluten.execution + +import org.apache.gluten.backendsapi.BackendsApiManager +import org.apache.gluten.exception.GlutenNotSupportException +import org.apache.gluten.expression._ +import org.apache.gluten.expression.ConverterUtils.FunctionConfig +import org.apache.gluten.extension.columnar.RewriteTypedImperativeAggregate +import org.apache.gluten.substrait.`type`.{TypeBuilder, TypeNode} +import org.apache.gluten.substrait.{AggregationParams, SubstraitContext} +import org.apache.gluten.substrait.expression.{AggregateFunctionNode, ExpressionBuilder, ExpressionNode, ScalarFunctionNode} +import org.apache.gluten.substrait.extensions.{AdvancedExtensionNode, ExtensionBuilder} +import org.apache.gluten.substrait.rel.{RelBuilder, RelNode} +import org.apache.gluten.utils.VeloxIntermediateData import org.apache.spark.sql.catalyst.expressions._ import org.apache.spark.sql.catalyst.expressions.aggregate._ diff --git a/backends-velox/src/main/scala/io/glutenproject/execution/RowToVeloxColumnarExec.scala b/backends-velox/src/main/scala/org/apache/gluten/execution/RowToVeloxColumnarExec.scala similarity index 94% rename from backends-velox/src/main/scala/io/glutenproject/execution/RowToVeloxColumnarExec.scala rename to backends-velox/src/main/scala/org/apache/gluten/execution/RowToVeloxColumnarExec.scala index df8299e02612..05d663d05e0f 100644 --- a/backends-velox/src/main/scala/io/glutenproject/execution/RowToVeloxColumnarExec.scala +++ b/backends-velox/src/main/scala/org/apache/gluten/execution/RowToVeloxColumnarExec.scala @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution - -import io.glutenproject.backendsapi.BackendsApiManager -import io.glutenproject.columnarbatch.ColumnarBatches -import io.glutenproject.exception.GlutenException -import io.glutenproject.exec.Runtimes -import io.glutenproject.memory.arrowalloc.ArrowBufferAllocators -import io.glutenproject.memory.nmm.NativeMemoryManagers -import io.glutenproject.utils.{ArrowAbiUtil, Iterators} -import io.glutenproject.vectorized._ +package org.apache.gluten.execution + +import org.apache.gluten.backendsapi.BackendsApiManager +import org.apache.gluten.columnarbatch.ColumnarBatches +import org.apache.gluten.exception.GlutenException +import org.apache.gluten.exec.Runtimes +import org.apache.gluten.memory.arrowalloc.ArrowBufferAllocators +import org.apache.gluten.memory.nmm.NativeMemoryManagers +import org.apache.gluten.utils.{ArrowAbiUtil, Iterators} +import org.apache.gluten.vectorized._ import org.apache.spark.broadcast.Broadcast import org.apache.spark.rdd.RDD diff --git a/backends-velox/src/main/scala/io/glutenproject/execution/ShuffledHashJoinExecTransformer.scala b/backends-velox/src/main/scala/org/apache/gluten/execution/ShuffledHashJoinExecTransformer.scala similarity index 99% rename from backends-velox/src/main/scala/io/glutenproject/execution/ShuffledHashJoinExecTransformer.scala rename to backends-velox/src/main/scala/org/apache/gluten/execution/ShuffledHashJoinExecTransformer.scala index e36f29491610..c9c60772fe73 100644 --- a/backends-velox/src/main/scala/io/glutenproject/execution/ShuffledHashJoinExecTransformer.scala +++ b/backends-velox/src/main/scala/org/apache/gluten/execution/ShuffledHashJoinExecTransformer.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution +package org.apache.gluten.execution import org.apache.spark.sql.catalyst.expressions._ import org.apache.spark.sql.catalyst.optimizer.{BuildLeft, BuildRight, BuildSide} diff --git a/backends-velox/src/main/scala/io/glutenproject/execution/VeloxBroadcastBuildSideRDD.scala b/backends-velox/src/main/scala/org/apache/gluten/execution/VeloxBroadcastBuildSideRDD.scala similarity index 94% rename from backends-velox/src/main/scala/io/glutenproject/execution/VeloxBroadcastBuildSideRDD.scala rename to backends-velox/src/main/scala/org/apache/gluten/execution/VeloxBroadcastBuildSideRDD.scala index f7c3a9bc57b5..17d0522d0732 100644 --- a/backends-velox/src/main/scala/io/glutenproject/execution/VeloxBroadcastBuildSideRDD.scala +++ b/backends-velox/src/main/scala/org/apache/gluten/execution/VeloxBroadcastBuildSideRDD.scala @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution +package org.apache.gluten.execution -import io.glutenproject.utils.Iterators +import org.apache.gluten.utils.Iterators import org.apache.spark.{broadcast, SparkContext} import org.apache.spark.sql.execution.joins.BuildSideRelation diff --git a/backends-velox/src/main/scala/io/glutenproject/execution/VeloxColumnarToRowExec.scala b/backends-velox/src/main/scala/org/apache/gluten/execution/VeloxColumnarToRowExec.scala similarity index 94% rename from backends-velox/src/main/scala/io/glutenproject/execution/VeloxColumnarToRowExec.scala rename to backends-velox/src/main/scala/org/apache/gluten/execution/VeloxColumnarToRowExec.scala index 11c076ab832f..77bf49727283 100644 --- a/backends-velox/src/main/scala/io/glutenproject/execution/VeloxColumnarToRowExec.scala +++ b/backends-velox/src/main/scala/org/apache/gluten/execution/VeloxColumnarToRowExec.scala @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution - -import io.glutenproject.columnarbatch.ColumnarBatches -import io.glutenproject.exception.GlutenNotSupportException -import io.glutenproject.extension.ValidationResult -import io.glutenproject.memory.nmm.NativeMemoryManagers -import io.glutenproject.utils.Iterators -import io.glutenproject.vectorized.NativeColumnarToRowJniWrapper +package org.apache.gluten.execution + +import org.apache.gluten.columnarbatch.ColumnarBatches +import org.apache.gluten.exception.GlutenNotSupportException +import org.apache.gluten.extension.ValidationResult +import org.apache.gluten.memory.nmm.NativeMemoryManagers +import org.apache.gluten.utils.Iterators +import org.apache.gluten.vectorized.NativeColumnarToRowJniWrapper import org.apache.spark.broadcast.Broadcast import org.apache.spark.rdd.RDD diff --git a/backends-velox/src/main/scala/io/glutenproject/expression/ExpressionTransformer.scala b/backends-velox/src/main/scala/org/apache/gluten/expression/ExpressionTransformer.scala similarity index 94% rename from backends-velox/src/main/scala/io/glutenproject/expression/ExpressionTransformer.scala rename to backends-velox/src/main/scala/org/apache/gluten/expression/ExpressionTransformer.scala index cf0445d7c28b..75a2c3a62da5 100644 --- a/backends-velox/src/main/scala/io/glutenproject/expression/ExpressionTransformer.scala +++ b/backends-velox/src/main/scala/org/apache/gluten/expression/ExpressionTransformer.scala @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.expression +package org.apache.gluten.expression -import io.glutenproject.exception.GlutenNotSupportException -import io.glutenproject.expression.ConverterUtils.FunctionConfig -import io.glutenproject.expression.ExpressionConverter.replaceWithExpressionTransformer -import io.glutenproject.substrait.expression._ +import org.apache.gluten.exception.GlutenNotSupportException +import org.apache.gluten.expression.ConverterUtils.FunctionConfig +import org.apache.gluten.expression.ExpressionConverter.replaceWithExpressionTransformer +import org.apache.gluten.substrait.expression._ import org.apache.spark.sql.catalyst.expressions._ import org.apache.spark.sql.types.{IntegerType, LongType} diff --git a/backends-velox/src/main/scala/io/glutenproject/utils/DatasourceUtil.scala b/backends-velox/src/main/scala/org/apache/gluten/utils/DatasourceUtil.scala similarity index 90% rename from backends-velox/src/main/scala/io/glutenproject/utils/DatasourceUtil.scala rename to backends-velox/src/main/scala/org/apache/gluten/utils/DatasourceUtil.scala index 129a501a0eec..f61cdb8e9986 100644 --- a/backends-velox/src/main/scala/io/glutenproject/utils/DatasourceUtil.scala +++ b/backends-velox/src/main/scala/org/apache/gluten/utils/DatasourceUtil.scala @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.utils +package org.apache.gluten.utils -import io.glutenproject.datasource.DatasourceJniWrapper -import io.glutenproject.memory.arrowalloc.ArrowBufferAllocators -import io.glutenproject.memory.nmm.NativeMemoryManagers +import org.apache.gluten.datasource.DatasourceJniWrapper +import org.apache.gluten.memory.arrowalloc.ArrowBufferAllocators +import org.apache.gluten.memory.nmm.NativeMemoryManagers import org.apache.spark.sql.types.StructType import org.apache.spark.sql.utils.SparkSchemaUtil diff --git a/backends-velox/src/main/scala/io/glutenproject/utils/SharedLibraryLoader.scala b/backends-velox/src/main/scala/org/apache/gluten/utils/SharedLibraryLoader.scala similarity index 91% rename from backends-velox/src/main/scala/io/glutenproject/utils/SharedLibraryLoader.scala rename to backends-velox/src/main/scala/org/apache/gluten/utils/SharedLibraryLoader.scala index 6378a59c63de..137da83c0980 100755 --- a/backends-velox/src/main/scala/io/glutenproject/utils/SharedLibraryLoader.scala +++ b/backends-velox/src/main/scala/org/apache/gluten/utils/SharedLibraryLoader.scala @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.utils +package org.apache.gluten.utils -import io.glutenproject.vectorized.JniLibLoader +import org.apache.gluten.vectorized.JniLibLoader trait SharedLibraryLoader { def loadLib(loader: JniLibLoader): Unit diff --git a/backends-velox/src/main/scala/io/glutenproject/utils/SharedLibraryLoaderCentos7.scala b/backends-velox/src/main/scala/org/apache/gluten/utils/SharedLibraryLoaderCentos7.scala similarity index 96% rename from backends-velox/src/main/scala/io/glutenproject/utils/SharedLibraryLoaderCentos7.scala rename to backends-velox/src/main/scala/org/apache/gluten/utils/SharedLibraryLoaderCentos7.scala index 88c4564f4192..47ed2c47cbb5 100755 --- a/backends-velox/src/main/scala/io/glutenproject/utils/SharedLibraryLoaderCentos7.scala +++ b/backends-velox/src/main/scala/org/apache/gluten/utils/SharedLibraryLoaderCentos7.scala @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.utils +package org.apache.gluten.utils -import io.glutenproject.vectorized.JniLibLoader +import org.apache.gluten.vectorized.JniLibLoader class SharedLibraryLoaderCentos7 extends SharedLibraryLoader { override def loadLib(loader: JniLibLoader): Unit = { diff --git a/backends-velox/src/main/scala/io/glutenproject/utils/SharedLibraryLoaderCentos8.scala b/backends-velox/src/main/scala/org/apache/gluten/utils/SharedLibraryLoaderCentos8.scala similarity index 96% rename from backends-velox/src/main/scala/io/glutenproject/utils/SharedLibraryLoaderCentos8.scala rename to backends-velox/src/main/scala/org/apache/gluten/utils/SharedLibraryLoaderCentos8.scala index 261df8634d69..433e4616f1e9 100755 --- a/backends-velox/src/main/scala/io/glutenproject/utils/SharedLibraryLoaderCentos8.scala +++ b/backends-velox/src/main/scala/org/apache/gluten/utils/SharedLibraryLoaderCentos8.scala @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.utils +package org.apache.gluten.utils -import io.glutenproject.vectorized.JniLibLoader +import org.apache.gluten.vectorized.JniLibLoader class SharedLibraryLoaderCentos8 extends SharedLibraryLoader { override def loadLib(loader: JniLibLoader): Unit = { diff --git a/backends-velox/src/main/scala/io/glutenproject/utils/SharedLibraryLoaderDebian11.scala b/backends-velox/src/main/scala/org/apache/gluten/utils/SharedLibraryLoaderDebian11.scala similarity index 97% rename from backends-velox/src/main/scala/io/glutenproject/utils/SharedLibraryLoaderDebian11.scala rename to backends-velox/src/main/scala/org/apache/gluten/utils/SharedLibraryLoaderDebian11.scala index 940c36a0c9cd..ca7d1d22d984 100644 --- a/backends-velox/src/main/scala/io/glutenproject/utils/SharedLibraryLoaderDebian11.scala +++ b/backends-velox/src/main/scala/org/apache/gluten/utils/SharedLibraryLoaderDebian11.scala @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.utils +package org.apache.gluten.utils -import io.glutenproject.vectorized.JniLibLoader +import org.apache.gluten.vectorized.JniLibLoader class SharedLibraryLoaderDebian11 extends SharedLibraryLoader { override def loadLib(loader: JniLibLoader): Unit = { diff --git a/backends-velox/src/main/scala/io/glutenproject/utils/SharedLibraryLoaderDebian12.scala b/backends-velox/src/main/scala/org/apache/gluten/utils/SharedLibraryLoaderDebian12.scala similarity index 97% rename from backends-velox/src/main/scala/io/glutenproject/utils/SharedLibraryLoaderDebian12.scala rename to backends-velox/src/main/scala/org/apache/gluten/utils/SharedLibraryLoaderDebian12.scala index 450beef3636c..128c8eaa2aef 100644 --- a/backends-velox/src/main/scala/io/glutenproject/utils/SharedLibraryLoaderDebian12.scala +++ b/backends-velox/src/main/scala/org/apache/gluten/utils/SharedLibraryLoaderDebian12.scala @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.utils +package org.apache.gluten.utils -import io.glutenproject.vectorized.JniLibLoader +import org.apache.gluten.vectorized.JniLibLoader class SharedLibraryLoaderDebian12 extends SharedLibraryLoader { override def loadLib(loader: JniLibLoader): Unit = { diff --git a/backends-velox/src/main/scala/io/glutenproject/utils/SharedLibraryLoaderUbuntu2004.scala b/backends-velox/src/main/scala/org/apache/gluten/utils/SharedLibraryLoaderUbuntu2004.scala similarity index 97% rename from backends-velox/src/main/scala/io/glutenproject/utils/SharedLibraryLoaderUbuntu2004.scala rename to backends-velox/src/main/scala/org/apache/gluten/utils/SharedLibraryLoaderUbuntu2004.scala index d9d6684d0e5c..18f2e6cfbeb3 100755 --- a/backends-velox/src/main/scala/io/glutenproject/utils/SharedLibraryLoaderUbuntu2004.scala +++ b/backends-velox/src/main/scala/org/apache/gluten/utils/SharedLibraryLoaderUbuntu2004.scala @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.utils +package org.apache.gluten.utils -import io.glutenproject.vectorized.JniLibLoader +import org.apache.gluten.vectorized.JniLibLoader class SharedLibraryLoaderUbuntu2004 extends SharedLibraryLoader { override def loadLib(loader: JniLibLoader): Unit = { diff --git a/backends-velox/src/main/scala/io/glutenproject/utils/SharedLibraryLoaderUbuntu2204.scala b/backends-velox/src/main/scala/org/apache/gluten/utils/SharedLibraryLoaderUbuntu2204.scala similarity index 97% rename from backends-velox/src/main/scala/io/glutenproject/utils/SharedLibraryLoaderUbuntu2204.scala rename to backends-velox/src/main/scala/org/apache/gluten/utils/SharedLibraryLoaderUbuntu2204.scala index f3259dd9b239..b23105b7dce0 100755 --- a/backends-velox/src/main/scala/io/glutenproject/utils/SharedLibraryLoaderUbuntu2204.scala +++ b/backends-velox/src/main/scala/org/apache/gluten/utils/SharedLibraryLoaderUbuntu2204.scala @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.utils +package org.apache.gluten.utils -import io.glutenproject.vectorized.JniLibLoader +import org.apache.gluten.vectorized.JniLibLoader class SharedLibraryLoaderUbuntu2204 extends SharedLibraryLoader { override def loadLib(loader: JniLibLoader): Unit = { diff --git a/backends-velox/src/main/scala/io/glutenproject/utils/VeloxIntermediateData.scala b/backends-velox/src/main/scala/org/apache/gluten/utils/VeloxIntermediateData.scala similarity index 97% rename from backends-velox/src/main/scala/io/glutenproject/utils/VeloxIntermediateData.scala rename to backends-velox/src/main/scala/org/apache/gluten/utils/VeloxIntermediateData.scala index 0c3508b5d580..06d144d9c675 100644 --- a/backends-velox/src/main/scala/io/glutenproject/utils/VeloxIntermediateData.scala +++ b/backends-velox/src/main/scala/org/apache/gluten/utils/VeloxIntermediateData.scala @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.utils +package org.apache.gluten.utils -import io.glutenproject.expression.ConverterUtils -import io.glutenproject.substrait.`type`.{TypeBuilder, TypeNode} +import org.apache.gluten.expression.ConverterUtils +import org.apache.gluten.substrait.`type`.{TypeBuilder, TypeNode} import org.apache.spark.sql.catalyst.expressions.aggregate._ import org.apache.spark.sql.types._ diff --git a/backends-velox/src/main/scala/org/apache/spark/sql/catalyst/AggregateFunctionRewriteRule.scala b/backends-velox/src/main/scala/org/apache/spark/sql/catalyst/AggregateFunctionRewriteRule.scala index 75389dcfba47..c5cb1b24d4cf 100644 --- a/backends-velox/src/main/scala/org/apache/spark/sql/catalyst/AggregateFunctionRewriteRule.scala +++ b/backends-velox/src/main/scala/org/apache/spark/sql/catalyst/AggregateFunctionRewriteRule.scala @@ -16,7 +16,7 @@ */ package org.apache.spark.sql.catalyst -import io.glutenproject.GlutenConfig +import org.apache.gluten.GlutenConfig import org.apache.spark.sql.SparkSession import org.apache.spark.sql.catalyst.expressions.Literal diff --git a/backends-velox/src/main/scala/org/apache/spark/sql/catalyst/FlushableHashAggregateRule.scala b/backends-velox/src/main/scala/org/apache/spark/sql/catalyst/FlushableHashAggregateRule.scala index d4ece506d2a9..a1858e5999c4 100644 --- a/backends-velox/src/main/scala/org/apache/spark/sql/catalyst/FlushableHashAggregateRule.scala +++ b/backends-velox/src/main/scala/org/apache/spark/sql/catalyst/FlushableHashAggregateRule.scala @@ -16,7 +16,7 @@ */ package org.apache.spark.sql.catalyst -import io.glutenproject.execution.{FlushableHashAggregateExecTransformer, HashAggregateExecTransformer, ProjectExecTransformer, RegularHashAggregateExecTransformer} +import org.apache.gluten.execution.{FlushableHashAggregateExecTransformer, HashAggregateExecTransformer, ProjectExecTransformer, RegularHashAggregateExecTransformer} import org.apache.spark.sql.SparkSession import org.apache.spark.sql.catalyst.expressions.aggregate.{Partial, PartialMerge} diff --git a/backends-velox/src/main/scala/org/apache/spark/sql/execution/BroadcastUtils.scala b/backends-velox/src/main/scala/org/apache/spark/sql/execution/BroadcastUtils.scala index ad7694ea21af..6346251b6bcd 100644 --- a/backends-velox/src/main/scala/org/apache/spark/sql/execution/BroadcastUtils.scala +++ b/backends-velox/src/main/scala/org/apache/spark/sql/execution/BroadcastUtils.scala @@ -16,10 +16,10 @@ */ package org.apache.spark.sql.execution -import io.glutenproject.columnarbatch.ColumnarBatches -import io.glutenproject.memory.nmm.NativeMemoryManagers -import io.glutenproject.sql.shims.SparkShimLoader -import io.glutenproject.vectorized.{ColumnarBatchSerializeResult, ColumnarBatchSerializerJniWrapper} +import org.apache.gluten.columnarbatch.ColumnarBatches +import org.apache.gluten.memory.nmm.NativeMemoryManagers +import org.apache.gluten.sql.shims.SparkShimLoader +import org.apache.gluten.vectorized.{ColumnarBatchSerializeResult, ColumnarBatchSerializerJniWrapper} import org.apache.spark.SparkContext import org.apache.spark.broadcast.Broadcast @@ -67,7 +67,7 @@ object BroadcastUtils { val rowArray = new ArrayBuffer[InternalRow] /** - * [[io.glutenproject.execution.VeloxColumnarToRowExec.toRowIterator()]] creates a single + * [[org.apache.gluten.execution.VeloxColumnarToRowExec.toRowIterator()]] creates a single * UnsafeRow. The iterator uses this same unsafe row and keep on changing the pointer to * point to new value. If we directly call rowIterator.toArray() then all the elements in * array points to same UnsafeRow object resulting in wrong output. here we need to create diff --git a/backends-velox/src/main/scala/org/apache/spark/sql/execution/ColumnarCachedBatchSerializer.scala b/backends-velox/src/main/scala/org/apache/spark/sql/execution/ColumnarCachedBatchSerializer.scala index 66acfc5d15df..ce210b3bfc24 100644 --- a/backends-velox/src/main/scala/org/apache/spark/sql/execution/ColumnarCachedBatchSerializer.scala +++ b/backends-velox/src/main/scala/org/apache/spark/sql/execution/ColumnarCachedBatchSerializer.scala @@ -16,15 +16,15 @@ */ package org.apache.spark.sql.execution -import io.glutenproject.GlutenConfig -import io.glutenproject.backendsapi.BackendsApiManager -import io.glutenproject.columnarbatch.ColumnarBatches -import io.glutenproject.exec.Runtimes -import io.glutenproject.execution.{RowToVeloxColumnarExec, VeloxColumnarToRowExec} -import io.glutenproject.memory.arrowalloc.ArrowBufferAllocators -import io.glutenproject.memory.nmm.NativeMemoryManagers -import io.glutenproject.utils.{ArrowAbiUtil, Iterators} -import io.glutenproject.vectorized.ColumnarBatchSerializerJniWrapper +import org.apache.gluten.GlutenConfig +import org.apache.gluten.backendsapi.BackendsApiManager +import org.apache.gluten.columnarbatch.ColumnarBatches +import org.apache.gluten.exec.Runtimes +import org.apache.gluten.execution.{RowToVeloxColumnarExec, VeloxColumnarToRowExec} +import org.apache.gluten.memory.arrowalloc.ArrowBufferAllocators +import org.apache.gluten.memory.nmm.NativeMemoryManagers +import org.apache.gluten.utils.{ArrowAbiUtil, Iterators} +import org.apache.gluten.vectorized.ColumnarBatchSerializerJniWrapper import org.apache.spark.internal.Logging import org.apache.spark.rdd.RDD diff --git a/backends-velox/src/main/scala/org/apache/spark/sql/execution/VeloxColumnarWriteFilesExec.scala b/backends-velox/src/main/scala/org/apache/spark/sql/execution/VeloxColumnarWriteFilesExec.scala index 86671897683a..57fbc81042b7 100644 --- a/backends-velox/src/main/scala/org/apache/spark/sql/execution/VeloxColumnarWriteFilesExec.scala +++ b/backends-velox/src/main/scala/org/apache/spark/sql/execution/VeloxColumnarWriteFilesExec.scala @@ -16,11 +16,11 @@ */ package org.apache.spark.sql.execution -import io.glutenproject.backendsapi.BackendsApiManager -import io.glutenproject.columnarbatch.ColumnarBatches -import io.glutenproject.extension.GlutenPlan -import io.glutenproject.memory.arrowalloc.ArrowBufferAllocators -import io.glutenproject.sql.shims.SparkShimLoader +import org.apache.gluten.backendsapi.BackendsApiManager +import org.apache.gluten.columnarbatch.ColumnarBatches +import org.apache.gluten.extension.GlutenPlan +import org.apache.gluten.memory.arrowalloc.ArrowBufferAllocators +import org.apache.gluten.sql.shims.SparkShimLoader import org.apache.spark.{Partition, SparkException, TaskContext, TaskOutputFileAlreadyExistException} import org.apache.spark.internal.io.FileCommitProtocol.TaskCommitMessage diff --git a/backends-velox/src/main/scala/org/apache/spark/sql/execution/datasources/VeloxColumnarBatchIterator.scala b/backends-velox/src/main/scala/org/apache/spark/sql/execution/datasources/VeloxColumnarBatchIterator.scala index fdc6fb41fcc6..5c06b3910974 100644 --- a/backends-velox/src/main/scala/org/apache/spark/sql/execution/datasources/VeloxColumnarBatchIterator.scala +++ b/backends-velox/src/main/scala/org/apache/spark/sql/execution/datasources/VeloxColumnarBatchIterator.scala @@ -16,7 +16,7 @@ */ package org.apache.spark.sql.execution.datasources -import io.glutenproject.exception.GlutenException +import org.apache.gluten.exception.GlutenException import org.apache.spark.sql.execution.datasources.VeloxWriteQueue.EOS_BATCH import org.apache.spark.sql.vectorized.ColumnarBatch diff --git a/backends-velox/src/main/scala/org/apache/spark/sql/execution/datasources/VeloxWriteQueue.scala b/backends-velox/src/main/scala/org/apache/spark/sql/execution/datasources/VeloxWriteQueue.scala index 1aee3ed3394c..089db1da1dee 100644 --- a/backends-velox/src/main/scala/org/apache/spark/sql/execution/datasources/VeloxWriteQueue.scala +++ b/backends-velox/src/main/scala/org/apache/spark/sql/execution/datasources/VeloxWriteQueue.scala @@ -16,9 +16,9 @@ */ package org.apache.spark.sql.execution.datasources -import io.glutenproject.datasource.DatasourceJniWrapper -import io.glutenproject.utils.Iterators -import io.glutenproject.vectorized.ColumnarBatchInIterator +import org.apache.gluten.datasource.DatasourceJniWrapper +import org.apache.gluten.utils.Iterators +import org.apache.gluten.vectorized.ColumnarBatchInIterator import org.apache.spark.TaskContext import org.apache.spark.sql.execution.datasources.VeloxWriteQueue.EOS_BATCH diff --git a/backends-velox/src/main/scala/org/apache/spark/sql/execution/datasources/velox/VeloxBlockStripes.java b/backends-velox/src/main/scala/org/apache/spark/sql/execution/datasources/velox/VeloxBlockStripes.java index 65ec48db9a36..4d887e60794a 100644 --- a/backends-velox/src/main/scala/org/apache/spark/sql/execution/datasources/velox/VeloxBlockStripes.java +++ b/backends-velox/src/main/scala/org/apache/spark/sql/execution/datasources/velox/VeloxBlockStripes.java @@ -16,12 +16,12 @@ */ package org.apache.spark.sql.execution.datasources.velox; -import io.glutenproject.exec.Runtimes; +import org.apache.gluten.exec.Runtimes; import org.apache.spark.sql.catalyst.InternalRow; import org.apache.spark.sql.catalyst.expressions.UnsafeRow; import org.apache.spark.sql.execution.datasources.BlockStripe; import org.apache.spark.sql.execution.datasources.BlockStripes; -import io.glutenproject.columnarbatch.ColumnarBatches; +import org.apache.gluten.columnarbatch.ColumnarBatches; import org.apache.spark.sql.vectorized.ColumnarBatch; import org.jetbrains.annotations.NotNull; diff --git a/backends-velox/src/main/scala/org/apache/spark/sql/execution/datasources/velox/VeloxFormatWriterInjects.scala b/backends-velox/src/main/scala/org/apache/spark/sql/execution/datasources/velox/VeloxFormatWriterInjects.scala index 44f48d9865f5..97ebb932ac05 100644 --- a/backends-velox/src/main/scala/org/apache/spark/sql/execution/datasources/velox/VeloxFormatWriterInjects.scala +++ b/backends-velox/src/main/scala/org/apache/spark/sql/execution/datasources/velox/VeloxFormatWriterInjects.scala @@ -16,13 +16,13 @@ */ package org.apache.spark.sql.execution.datasources.velox -import io.glutenproject.columnarbatch.ColumnarBatches -import io.glutenproject.datasource.DatasourceJniWrapper -import io.glutenproject.exception.GlutenException -import io.glutenproject.execution.datasource.GlutenRowSplitter -import io.glutenproject.memory.arrowalloc.ArrowBufferAllocators -import io.glutenproject.memory.nmm.NativeMemoryManagers -import io.glutenproject.utils.{ArrowAbiUtil, DatasourceUtil} +import org.apache.gluten.columnarbatch.ColumnarBatches +import org.apache.gluten.datasource.DatasourceJniWrapper +import org.apache.gluten.exception.GlutenException +import org.apache.gluten.execution.datasource.GlutenRowSplitter +import org.apache.gluten.memory.arrowalloc.ArrowBufferAllocators +import org.apache.gluten.memory.nmm.NativeMemoryManagers +import org.apache.gluten.utils.{ArrowAbiUtil, DatasourceUtil} import org.apache.spark.sql.SparkSession import org.apache.spark.sql.catalyst.InternalRow diff --git a/backends-velox/src/main/scala/org/apache/spark/sql/execution/datasources/velox/VeloxParquetWriterInjects.scala b/backends-velox/src/main/scala/org/apache/spark/sql/execution/datasources/velox/VeloxParquetWriterInjects.scala index c758b62d066f..6c5a0bc9b24f 100644 --- a/backends-velox/src/main/scala/org/apache/spark/sql/execution/datasources/velox/VeloxParquetWriterInjects.scala +++ b/backends-velox/src/main/scala/org/apache/spark/sql/execution/datasources/velox/VeloxParquetWriterInjects.scala @@ -16,7 +16,7 @@ */ package org.apache.spark.sql.execution.datasources.velox -import io.glutenproject.GlutenConfig +import org.apache.gluten.GlutenConfig import org.apache.spark.sql.internal.SQLConf diff --git a/backends-velox/src/main/scala/org/apache/spark/sql/expression/UDFResolver.scala b/backends-velox/src/main/scala/org/apache/spark/sql/expression/UDFResolver.scala index 1b756ac37fdb..e97450d96014 100644 --- a/backends-velox/src/main/scala/org/apache/spark/sql/expression/UDFResolver.scala +++ b/backends-velox/src/main/scala/org/apache/spark/sql/expression/UDFResolver.scala @@ -16,13 +16,13 @@ */ package org.apache.spark.sql.expression -import io.glutenproject.backendsapi.velox.BackendSettings -import io.glutenproject.exception.GlutenException -import io.glutenproject.expression.{ConverterUtils, ExpressionTransformer, ExpressionType, Transformable} -import io.glutenproject.expression.ConverterUtils.FunctionConfig -import io.glutenproject.substrait.expression.ExpressionBuilder -import io.glutenproject.udf.UdfJniWrapper -import io.glutenproject.vectorized.JniWorkspace +import org.apache.gluten.backendsapi.velox.BackendSettings +import org.apache.gluten.exception.GlutenException +import org.apache.gluten.expression.{ConverterUtils, ExpressionTransformer, ExpressionType, Transformable} +import org.apache.gluten.expression.ConverterUtils.FunctionConfig +import org.apache.gluten.substrait.expression.ExpressionBuilder +import org.apache.gluten.udf.UdfJniWrapper +import org.apache.gluten.vectorized.JniWorkspace import org.apache.spark.{SparkConf, SparkContext, SparkEnv, SparkFiles} import org.apache.spark.deploy.SparkHadoopUtil diff --git a/backends-velox/src/test/java/io/glutenproject/fs/OnHeapFileSystemTest.java b/backends-velox/src/test/java/org/apache/gluten/fs/OnHeapFileSystemTest.java similarity index 98% rename from backends-velox/src/test/java/io/glutenproject/fs/OnHeapFileSystemTest.java rename to backends-velox/src/test/java/org/apache/gluten/fs/OnHeapFileSystemTest.java index e62016c3b06c..eaa4835de1e9 100644 --- a/backends-velox/src/test/java/io/glutenproject/fs/OnHeapFileSystemTest.java +++ b/backends-velox/src/test/java/org/apache/gluten/fs/OnHeapFileSystemTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.fs; +package org.apache.gluten.fs; import io.netty.util.internal.PlatformDependent; import org.junit.Assert; diff --git a/backends-velox/src/test/java/io/glutenproject/tags/FuzzerTest.java b/backends-velox/src/test/java/org/apache/gluten/tags/FuzzerTest.java similarity index 97% rename from backends-velox/src/test/java/io/glutenproject/tags/FuzzerTest.java rename to backends-velox/src/test/java/org/apache/gluten/tags/FuzzerTest.java index ada28718b944..8f45c9ab61c1 100644 --- a/backends-velox/src/test/java/io/glutenproject/tags/FuzzerTest.java +++ b/backends-velox/src/test/java/org/apache/gluten/tags/FuzzerTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.tags; +package org.apache.gluten.tags; import org.scalatest.TagAnnotation; diff --git a/backends-velox/src/test/java/io/glutenproject/tags/SkipTestTags.java b/backends-velox/src/test/java/org/apache/gluten/tags/SkipTestTags.java similarity index 96% rename from backends-velox/src/test/java/io/glutenproject/tags/SkipTestTags.java rename to backends-velox/src/test/java/org/apache/gluten/tags/SkipTestTags.java index 16b794cc282f..b58a17e7b142 100644 --- a/backends-velox/src/test/java/io/glutenproject/tags/SkipTestTags.java +++ b/backends-velox/src/test/java/org/apache/gluten/tags/SkipTestTags.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.tags; +package org.apache.gluten.tags; import org.scalatest.TagAnnotation; diff --git a/backends-velox/src/test/java/io/glutenproject/tags/UDFTest.java b/backends-velox/src/test/java/org/apache/gluten/tags/UDFTest.java similarity index 97% rename from backends-velox/src/test/java/io/glutenproject/tags/UDFTest.java rename to backends-velox/src/test/java/org/apache/gluten/tags/UDFTest.java index c212fa97149c..41de1636e9d7 100644 --- a/backends-velox/src/test/java/io/glutenproject/tags/UDFTest.java +++ b/backends-velox/src/test/java/org/apache/gluten/tags/UDFTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.tags; +package org.apache.gluten.tags; import org.scalatest.TagAnnotation; diff --git a/backends-velox/src/test/scala/io/glutenproject/benchmarks/NativeBenchmarkPlanGenerator.scala b/backends-velox/src/test/scala/org/apache/gluten/benchmarks/NativeBenchmarkPlanGenerator.scala similarity index 95% rename from backends-velox/src/test/scala/io/glutenproject/benchmarks/NativeBenchmarkPlanGenerator.scala rename to backends-velox/src/test/scala/org/apache/gluten/benchmarks/NativeBenchmarkPlanGenerator.scala index dafe3af3ea34..e19fe035f562 100644 --- a/backends-velox/src/test/scala/io/glutenproject/benchmarks/NativeBenchmarkPlanGenerator.scala +++ b/backends-velox/src/test/scala/org/apache/gluten/benchmarks/NativeBenchmarkPlanGenerator.scala @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.benchmarks +package org.apache.gluten.benchmarks -import io.glutenproject.GlutenConfig -import io.glutenproject.execution.{VeloxWholeStageTransformerSuite, WholeStageTransformer} +import org.apache.gluten.GlutenConfig +import org.apache.gluten.execution.{VeloxWholeStageTransformerSuite, WholeStageTransformer} import org.apache.spark.sql.DataFrame import org.apache.spark.sql.execution.adaptive.{AdaptiveSparkPlanExec, ShuffleQueryStageExec} @@ -32,7 +32,7 @@ import java.nio.file.{Files, Paths} import scala.collection.JavaConverters._ -object GenerateExample extends Tag("io.glutenproject.tags.GenerateExample") +object GenerateExample extends Tag("org.apache.gluten.tags.GenerateExample") class NativeBenchmarkPlanGenerator extends VeloxWholeStageTransformerSuite { override protected val resourcePath: String = "/tpch-data-parquet-velox" diff --git a/backends-velox/src/test/scala/io/glutenproject/benchmarks/ShuffleWriterFuzzerTest.scala b/backends-velox/src/test/scala/org/apache/gluten/benchmarks/ShuffleWriterFuzzerTest.scala similarity index 92% rename from backends-velox/src/test/scala/io/glutenproject/benchmarks/ShuffleWriterFuzzerTest.scala rename to backends-velox/src/test/scala/org/apache/gluten/benchmarks/ShuffleWriterFuzzerTest.scala index 7f863de6876c..867fb2d8b695 100644 --- a/backends-velox/src/test/scala/io/glutenproject/benchmarks/ShuffleWriterFuzzerTest.scala +++ b/backends-velox/src/test/scala/org/apache/gluten/benchmarks/ShuffleWriterFuzzerTest.scala @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.benchmarks +package org.apache.gluten.benchmarks -import io.glutenproject.benchmarks.ShuffleWriterFuzzerTest.{Failed, OOM, Successful, TestResult} -import io.glutenproject.execution.VeloxWholeStageTransformerSuite -import io.glutenproject.memory.memtarget.ThrowOnOomMemoryTarget -import io.glutenproject.tags.{FuzzerTest, SkipTestTags} +import org.apache.gluten.benchmarks.ShuffleWriterFuzzerTest.{Failed, OOM, Successful, TestResult} +import org.apache.gluten.execution.VeloxWholeStageTransformerSuite +import org.apache.gluten.memory.memtarget.ThrowOnOomMemoryTarget +import org.apache.gluten.tags.{FuzzerTest, SkipTestTags} import org.apache.spark.SparkConf @@ -52,7 +52,7 @@ class ShuffleWriterFuzzerTest extends VeloxWholeStageTransformerSuite { override protected def sparkConf: SparkConf = { super.sparkConf - .set("spark.plugins", "io.glutenproject.GlutenPlugin") + .set("spark.plugins", "org.apache.gluten.GlutenPlugin") .set("spark.shuffle.manager", "org.apache.spark.shuffle.sort.ColumnarShuffleManager") .set("spark.memory.offHeap.enabled", "true") .set("spark.memory.offHeap.size", "512MB") diff --git a/backends-velox/src/test/scala/io/glutenproject/execution/FallbackSuite.scala b/backends-velox/src/test/scala/org/apache/gluten/execution/FallbackSuite.scala similarity index 98% rename from backends-velox/src/test/scala/io/glutenproject/execution/FallbackSuite.scala rename to backends-velox/src/test/scala/org/apache/gluten/execution/FallbackSuite.scala index 69e5b614c288..91024da1c4b1 100644 --- a/backends-velox/src/test/scala/io/glutenproject/execution/FallbackSuite.scala +++ b/backends-velox/src/test/scala/org/apache/gluten/execution/FallbackSuite.scala @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution +package org.apache.gluten.execution -import io.glutenproject.GlutenConfig -import io.glutenproject.extension.GlutenPlan +import org.apache.gluten.GlutenConfig +import org.apache.gluten.extension.GlutenPlan import org.apache.spark.SparkConf import org.apache.spark.sql.execution.SparkPlan diff --git a/backends-velox/src/test/scala/io/glutenproject/execution/FunctionsValidateTest.scala b/backends-velox/src/test/scala/org/apache/gluten/execution/FunctionsValidateTest.scala similarity index 98% rename from backends-velox/src/test/scala/io/glutenproject/execution/FunctionsValidateTest.scala rename to backends-velox/src/test/scala/org/apache/gluten/execution/FunctionsValidateTest.scala index c91ca8866dab..12f66278f70a 100644 --- a/backends-velox/src/test/scala/io/glutenproject/execution/FunctionsValidateTest.scala +++ b/backends-velox/src/test/scala/org/apache/gluten/execution/FunctionsValidateTest.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution +package org.apache.gluten.execution import org.apache.spark.SparkConf import org.apache.spark.sql.Row diff --git a/backends-velox/src/test/scala/io/glutenproject/execution/ScalarFunctionsValidateSuite.scala b/backends-velox/src/test/scala/org/apache/gluten/execution/ScalarFunctionsValidateSuite.scala similarity index 99% rename from backends-velox/src/test/scala/io/glutenproject/execution/ScalarFunctionsValidateSuite.scala rename to backends-velox/src/test/scala/org/apache/gluten/execution/ScalarFunctionsValidateSuite.scala index 44169ac6dbd1..0385715475a7 100644 --- a/backends-velox/src/test/scala/io/glutenproject/execution/ScalarFunctionsValidateSuite.scala +++ b/backends-velox/src/test/scala/org/apache/gluten/execution/ScalarFunctionsValidateSuite.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution +package org.apache.gluten.execution import org.apache.spark.sql.types._ diff --git a/backends-velox/src/test/scala/io/glutenproject/execution/TestOperator.scala b/backends-velox/src/test/scala/org/apache/gluten/execution/TestOperator.scala similarity index 99% rename from backends-velox/src/test/scala/io/glutenproject/execution/TestOperator.scala rename to backends-velox/src/test/scala/org/apache/gluten/execution/TestOperator.scala index be3a50f1e75c..4f4e24ca7476 100644 --- a/backends-velox/src/test/scala/io/glutenproject/execution/TestOperator.scala +++ b/backends-velox/src/test/scala/org/apache/gluten/execution/TestOperator.scala @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution +package org.apache.gluten.execution -import io.glutenproject.GlutenConfig -import io.glutenproject.sql.shims.SparkShimLoader +import org.apache.gluten.GlutenConfig +import org.apache.gluten.sql.shims.SparkShimLoader import org.apache.spark.SparkConf import org.apache.spark.sql.{AnalysisException, Row} diff --git a/backends-velox/src/test/scala/io/glutenproject/execution/VeloxAggregateFunctionsSuite.scala b/backends-velox/src/test/scala/org/apache/gluten/execution/VeloxAggregateFunctionsSuite.scala similarity index 99% rename from backends-velox/src/test/scala/io/glutenproject/execution/VeloxAggregateFunctionsSuite.scala rename to backends-velox/src/test/scala/org/apache/gluten/execution/VeloxAggregateFunctionsSuite.scala index abeadaadf0ab..36271705c362 100644 --- a/backends-velox/src/test/scala/io/glutenproject/execution/VeloxAggregateFunctionsSuite.scala +++ b/backends-velox/src/test/scala/org/apache/gluten/execution/VeloxAggregateFunctionsSuite.scala @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution +package org.apache.gluten.execution -import io.glutenproject.GlutenConfig +import org.apache.gluten.GlutenConfig import org.apache.spark.SparkConf import org.apache.spark.sql.internal.SQLConf diff --git a/backends-velox/src/test/scala/io/glutenproject/execution/VeloxColumnarCacheSuite.scala b/backends-velox/src/test/scala/org/apache/gluten/execution/VeloxColumnarCacheSuite.scala similarity index 98% rename from backends-velox/src/test/scala/io/glutenproject/execution/VeloxColumnarCacheSuite.scala rename to backends-velox/src/test/scala/org/apache/gluten/execution/VeloxColumnarCacheSuite.scala index b1706d7d824d..bfce8653a7e4 100644 --- a/backends-velox/src/test/scala/io/glutenproject/execution/VeloxColumnarCacheSuite.scala +++ b/backends-velox/src/test/scala/org/apache/gluten/execution/VeloxColumnarCacheSuite.scala @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution +package org.apache.gluten.execution -import io.glutenproject.GlutenConfig -import io.glutenproject.utils.PlanUtil +import org.apache.gluten.GlutenConfig +import org.apache.gluten.utils.PlanUtil import org.apache.spark.SparkConf import org.apache.spark.sql.Row diff --git a/backends-velox/src/test/scala/io/glutenproject/execution/VeloxHashJoinSuite.scala b/backends-velox/src/test/scala/org/apache/gluten/execution/VeloxHashJoinSuite.scala similarity index 97% rename from backends-velox/src/test/scala/io/glutenproject/execution/VeloxHashJoinSuite.scala rename to backends-velox/src/test/scala/org/apache/gluten/execution/VeloxHashJoinSuite.scala index 459220fc70e2..3b3b8871a2fd 100644 --- a/backends-velox/src/test/scala/io/glutenproject/execution/VeloxHashJoinSuite.scala +++ b/backends-velox/src/test/scala/org/apache/gluten/execution/VeloxHashJoinSuite.scala @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution +package org.apache.gluten.execution -import io.glutenproject.sql.shims.SparkShimLoader +import org.apache.gluten.sql.shims.SparkShimLoader import org.apache.spark.SparkConf import org.apache.spark.sql.execution.InputIteratorTransformer diff --git a/backends-velox/src/test/scala/io/glutenproject/execution/VeloxLiteralSuite.scala b/backends-velox/src/test/scala/org/apache/gluten/execution/VeloxLiteralSuite.scala similarity index 99% rename from backends-velox/src/test/scala/io/glutenproject/execution/VeloxLiteralSuite.scala rename to backends-velox/src/test/scala/org/apache/gluten/execution/VeloxLiteralSuite.scala index 354c33580865..0ad26aa03e09 100644 --- a/backends-velox/src/test/scala/io/glutenproject/execution/VeloxLiteralSuite.scala +++ b/backends-velox/src/test/scala/org/apache/gluten/execution/VeloxLiteralSuite.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution +package org.apache.gluten.execution import org.apache.spark.SparkConf import org.apache.spark.sql.execution.ProjectExec diff --git a/backends-velox/src/test/scala/io/glutenproject/execution/VeloxMetricsSuite.scala b/backends-velox/src/test/scala/org/apache/gluten/execution/VeloxMetricsSuite.scala similarity index 97% rename from backends-velox/src/test/scala/io/glutenproject/execution/VeloxMetricsSuite.scala rename to backends-velox/src/test/scala/org/apache/gluten/execution/VeloxMetricsSuite.scala index 3110048eee93..ac9911bbabc4 100644 --- a/backends-velox/src/test/scala/io/glutenproject/execution/VeloxMetricsSuite.scala +++ b/backends-velox/src/test/scala/org/apache/gluten/execution/VeloxMetricsSuite.scala @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution +package org.apache.gluten.execution -import io.glutenproject.GlutenConfig -import io.glutenproject.sql.shims.SparkShimLoader +import org.apache.gluten.GlutenConfig +import org.apache.gluten.sql.shims.SparkShimLoader import org.apache.spark.sql.execution.CommandResultExec import org.apache.spark.sql.execution.adaptive.AdaptiveSparkPlanHelper diff --git a/backends-velox/src/test/scala/io/glutenproject/execution/VeloxOrcDataTypeValidationSuite.scala b/backends-velox/src/test/scala/org/apache/gluten/execution/VeloxOrcDataTypeValidationSuite.scala similarity index 99% rename from backends-velox/src/test/scala/io/glutenproject/execution/VeloxOrcDataTypeValidationSuite.scala rename to backends-velox/src/test/scala/org/apache/gluten/execution/VeloxOrcDataTypeValidationSuite.scala index 8e94397c2d38..a9a4361bb461 100644 --- a/backends-velox/src/test/scala/io/glutenproject/execution/VeloxOrcDataTypeValidationSuite.scala +++ b/backends-velox/src/test/scala/org/apache/gluten/execution/VeloxOrcDataTypeValidationSuite.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution +package org.apache.gluten.execution import org.apache.spark.SparkConf diff --git a/backends-velox/src/test/scala/io/glutenproject/execution/VeloxParquetDataTypeValidationSuite.scala b/backends-velox/src/test/scala/org/apache/gluten/execution/VeloxParquetDataTypeValidationSuite.scala similarity index 99% rename from backends-velox/src/test/scala/io/glutenproject/execution/VeloxParquetDataTypeValidationSuite.scala rename to backends-velox/src/test/scala/org/apache/gluten/execution/VeloxParquetDataTypeValidationSuite.scala index c19d350149ea..0f29d0ed234e 100644 --- a/backends-velox/src/test/scala/io/glutenproject/execution/VeloxParquetDataTypeValidationSuite.scala +++ b/backends-velox/src/test/scala/org/apache/gluten/execution/VeloxParquetDataTypeValidationSuite.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution +package org.apache.gluten.execution import org.apache.spark.SparkConf diff --git a/backends-velox/src/test/scala/io/glutenproject/execution/VeloxScanSuite.scala b/backends-velox/src/test/scala/org/apache/gluten/execution/VeloxScanSuite.scala similarity index 98% rename from backends-velox/src/test/scala/io/glutenproject/execution/VeloxScanSuite.scala rename to backends-velox/src/test/scala/org/apache/gluten/execution/VeloxScanSuite.scala index 82aa19b33817..688cca6995c0 100644 --- a/backends-velox/src/test/scala/io/glutenproject/execution/VeloxScanSuite.scala +++ b/backends-velox/src/test/scala/org/apache/gluten/execution/VeloxScanSuite.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution +package org.apache.gluten.execution import org.apache.spark.SparkConf import org.apache.spark.sql.catalyst.expressions.GreaterThan diff --git a/backends-velox/src/test/scala/io/glutenproject/execution/VeloxStringFunctionsSuite.scala b/backends-velox/src/test/scala/org/apache/gluten/execution/VeloxStringFunctionsSuite.scala similarity index 99% rename from backends-velox/src/test/scala/io/glutenproject/execution/VeloxStringFunctionsSuite.scala rename to backends-velox/src/test/scala/org/apache/gluten/execution/VeloxStringFunctionsSuite.scala index 24bc5aac62df..3950e383422f 100644 --- a/backends-velox/src/test/scala/io/glutenproject/execution/VeloxStringFunctionsSuite.scala +++ b/backends-velox/src/test/scala/org/apache/gluten/execution/VeloxStringFunctionsSuite.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution +package org.apache.gluten.execution import org.apache.spark.SparkConf import org.apache.spark.sql.Column diff --git a/backends-velox/src/test/scala/io/glutenproject/execution/VeloxTPCDSSuite.scala b/backends-velox/src/test/scala/org/apache/gluten/execution/VeloxTPCDSSuite.scala similarity index 99% rename from backends-velox/src/test/scala/io/glutenproject/execution/VeloxTPCDSSuite.scala rename to backends-velox/src/test/scala/org/apache/gluten/execution/VeloxTPCDSSuite.scala index 56f73e40c55d..96abd4cbe56c 100644 --- a/backends-velox/src/test/scala/io/glutenproject/execution/VeloxTPCDSSuite.scala +++ b/backends-velox/src/test/scala/org/apache/gluten/execution/VeloxTPCDSSuite.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution +package org.apache.gluten.execution import org.apache.spark.SparkConf import org.apache.spark.sql.DataFrame diff --git a/backends-velox/src/test/scala/io/glutenproject/execution/VeloxTPCHSuite.scala b/backends-velox/src/test/scala/org/apache/gluten/execution/VeloxTPCHSuite.scala similarity index 99% rename from backends-velox/src/test/scala/io/glutenproject/execution/VeloxTPCHSuite.scala rename to backends-velox/src/test/scala/org/apache/gluten/execution/VeloxTPCHSuite.scala index 9ac10e56e2de..8b92eb20c564 100644 --- a/backends-velox/src/test/scala/io/glutenproject/execution/VeloxTPCHSuite.scala +++ b/backends-velox/src/test/scala/org/apache/gluten/execution/VeloxTPCHSuite.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution +package org.apache.gluten.execution import org.apache.spark.SparkConf import org.apache.spark.sql.{DataFrame, Row, TestUtils} diff --git a/backends-velox/src/test/scala/io/glutenproject/execution/VeloxWholeStageTransformerSuite.scala b/backends-velox/src/test/scala/org/apache/gluten/execution/VeloxWholeStageTransformerSuite.scala similarity index 96% rename from backends-velox/src/test/scala/io/glutenproject/execution/VeloxWholeStageTransformerSuite.scala rename to backends-velox/src/test/scala/org/apache/gluten/execution/VeloxWholeStageTransformerSuite.scala index 2fa2ce0f2a5e..f393d4a75129 100644 --- a/backends-velox/src/test/scala/io/glutenproject/execution/VeloxWholeStageTransformerSuite.scala +++ b/backends-velox/src/test/scala/org/apache/gluten/execution/VeloxWholeStageTransformerSuite.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution +package org.apache.gluten.execution abstract class VeloxWholeStageTransformerSuite extends WholeStageTransformerSuite { disableFallbackCheck diff --git a/backends-velox/src/test/scala/io/glutenproject/execution/VeloxWindowExpressionSuite.scala b/backends-velox/src/test/scala/org/apache/gluten/execution/VeloxWindowExpressionSuite.scala similarity index 98% rename from backends-velox/src/test/scala/io/glutenproject/execution/VeloxWindowExpressionSuite.scala rename to backends-velox/src/test/scala/org/apache/gluten/execution/VeloxWindowExpressionSuite.scala index 304342a7cb08..4772d769e0fb 100644 --- a/backends-velox/src/test/scala/io/glutenproject/execution/VeloxWindowExpressionSuite.scala +++ b/backends-velox/src/test/scala/org/apache/gluten/execution/VeloxWindowExpressionSuite.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution +package org.apache.gluten.execution import org.apache.spark.SparkConf diff --git a/backends-velox/src/test/scala/io/glutenproject/execution/WindowFunctionsValidateSuite.scala b/backends-velox/src/test/scala/org/apache/gluten/execution/WindowFunctionsValidateSuite.scala similarity index 97% rename from backends-velox/src/test/scala/io/glutenproject/execution/WindowFunctionsValidateSuite.scala rename to backends-velox/src/test/scala/org/apache/gluten/execution/WindowFunctionsValidateSuite.scala index 9f3defd4f77b..a5871ff0dbe2 100644 --- a/backends-velox/src/test/scala/io/glutenproject/execution/WindowFunctionsValidateSuite.scala +++ b/backends-velox/src/test/scala/org/apache/gluten/execution/WindowFunctionsValidateSuite.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution +package org.apache.gluten.execution class WindowFunctionsValidateSuite extends FunctionsValidateTest { diff --git a/backends-velox/src/test/scala/io/glutenproject/expression/VeloxUdfSuite.scala b/backends-velox/src/test/scala/org/apache/gluten/expression/VeloxUdfSuite.scala similarity index 96% rename from backends-velox/src/test/scala/io/glutenproject/expression/VeloxUdfSuite.scala rename to backends-velox/src/test/scala/org/apache/gluten/expression/VeloxUdfSuite.scala index 9be82a739235..e12b3df2e637 100644 --- a/backends-velox/src/test/scala/io/glutenproject/expression/VeloxUdfSuite.scala +++ b/backends-velox/src/test/scala/org/apache/gluten/expression/VeloxUdfSuite.scala @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.expression +package org.apache.gluten.expression -import io.glutenproject.tags.{SkipTestTags, UDFTest} +import org.apache.gluten.tags.{SkipTestTags, UDFTest} import org.apache.spark.SparkConf import org.apache.spark.sql.{GlutenQueryTest, Row, SparkSession} @@ -65,7 +65,7 @@ abstract class VeloxUdfSuite extends GlutenQueryTest with SQLHelper { protected def sparkConf: SparkConf = { new SparkConf() - .set("spark.plugins", "io.glutenproject.GlutenPlugin") + .set("spark.plugins", "org.apache.gluten.GlutenPlugin") .set("spark.default.parallelism", "1") .set("spark.memory.offHeap.enabled", "true") .set("spark.memory.offHeap.size", "1024MB") diff --git a/backends-velox/src/test/scala/io/glutenproject/planner/VeloxCboSuite.scala b/backends-velox/src/test/scala/org/apache/gluten/planner/VeloxCboSuite.scala similarity index 93% rename from backends-velox/src/test/scala/io/glutenproject/planner/VeloxCboSuite.scala rename to backends-velox/src/test/scala/org/apache/gluten/planner/VeloxCboSuite.scala index 2fbc1e64256a..ea06c0367b66 100644 --- a/backends-velox/src/test/scala/io/glutenproject/planner/VeloxCboSuite.scala +++ b/backends-velox/src/test/scala/org/apache/gluten/planner/VeloxCboSuite.scala @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.planner +package org.apache.gluten.planner -import io.glutenproject.cbo.Cbo -import io.glutenproject.cbo.CboSuiteBase._ -import io.glutenproject.cbo.path.CboPath -import io.glutenproject.cbo.property.PropertySet -import io.glutenproject.cbo.rule.{CboRule, Shape, Shapes} -import io.glutenproject.planner.property.GlutenProperties.Conventions +import org.apache.gluten.cbo.Cbo +import org.apache.gluten.cbo.CboSuiteBase._ +import org.apache.gluten.cbo.path.CboPath +import org.apache.gluten.cbo.property.PropertySet +import org.apache.gluten.cbo.rule.{CboRule, Shape, Shapes} +import org.apache.gluten.planner.property.GlutenProperties.Conventions import org.apache.spark.rdd.RDD import org.apache.spark.sql.catalyst.InternalRow diff --git a/backends-velox/src/test/scala/org/apache/spark/sql/execution/VeloxParquetWriteForHiveSuite.scala b/backends-velox/src/test/scala/org/apache/spark/sql/execution/VeloxParquetWriteForHiveSuite.scala index c76818a1657c..b9644d4e827f 100644 --- a/backends-velox/src/test/scala/org/apache/spark/sql/execution/VeloxParquetWriteForHiveSuite.scala +++ b/backends-velox/src/test/scala/org/apache/spark/sql/execution/VeloxParquetWriteForHiveSuite.scala @@ -16,7 +16,7 @@ */ package org.apache.spark.sql.execution -import io.glutenproject.sql.shims.SparkShimLoader +import org.apache.gluten.sql.shims.SparkShimLoader import org.apache.spark.SparkConf import org.apache.spark.internal.config @@ -72,7 +72,7 @@ class VeloxParquetWriteForHiveSuite extends GlutenQueryTest with SQLTestUtils { protected def sparkConf: SparkConf = { defaultSparkConf - .set("spark.plugins", "io.glutenproject.GlutenPlugin") + .set("spark.plugins", "org.apache.gluten.GlutenPlugin") .set("spark.default.parallelism", "1") .set("spark.memory.offHeap.enabled", "true") .set("spark.memory.offHeap.size", "1024MB") diff --git a/backends-velox/src/test/scala/org/apache/spark/sql/execution/VeloxParquetWriteSuite.scala b/backends-velox/src/test/scala/org/apache/spark/sql/execution/VeloxParquetWriteSuite.scala index 6f938b7b918e..21144d4f4794 100644 --- a/backends-velox/src/test/scala/org/apache/spark/sql/execution/VeloxParquetWriteSuite.scala +++ b/backends-velox/src/test/scala/org/apache/spark/sql/execution/VeloxParquetWriteSuite.scala @@ -16,9 +16,9 @@ */ package org.apache.spark.sql.execution -import io.glutenproject.execution.VeloxWholeStageTransformerSuite -import io.glutenproject.sql.shims.SparkShimLoader -import io.glutenproject.utils.FallbackUtil +import org.apache.gluten.execution.VeloxWholeStageTransformerSuite +import org.apache.gluten.sql.shims.SparkShimLoader +import org.apache.gluten.utils.FallbackUtil import org.apache.spark.SparkConf diff --git a/backends-velox/src/test/scala/org/apache/spark/sql/execution/benchmark/ColumnarTableCacheBenchmark.scala b/backends-velox/src/test/scala/org/apache/spark/sql/execution/benchmark/ColumnarTableCacheBenchmark.scala index 716ab1ce9047..46fc1b662ea5 100644 --- a/backends-velox/src/test/scala/org/apache/spark/sql/execution/benchmark/ColumnarTableCacheBenchmark.scala +++ b/backends-velox/src/test/scala/org/apache/spark/sql/execution/benchmark/ColumnarTableCacheBenchmark.scala @@ -16,7 +16,7 @@ */ package org.apache.spark.sql.execution.benchmark -import io.glutenproject.GlutenConfig +import org.apache.gluten.GlutenConfig import org.apache.spark.benchmark.Benchmark import org.apache.spark.storage.StorageLevel diff --git a/backends-velox/src/test/scala/org/apache/spark/sql/execution/benchmark/StreamingAggregateBenchmark.scala b/backends-velox/src/test/scala/org/apache/spark/sql/execution/benchmark/StreamingAggregateBenchmark.scala index dc826f486ae4..7f11fd043db4 100644 --- a/backends-velox/src/test/scala/org/apache/spark/sql/execution/benchmark/StreamingAggregateBenchmark.scala +++ b/backends-velox/src/test/scala/org/apache/spark/sql/execution/benchmark/StreamingAggregateBenchmark.scala @@ -16,7 +16,7 @@ */ package org.apache.spark.sql.execution.benchmark -import io.glutenproject.GlutenConfig +import org.apache.gluten.GlutenConfig import org.apache.spark.benchmark.Benchmark import org.apache.spark.sql.internal.SQLConf diff --git a/cpp-ch/local-engine/Join/BroadCastJoinBuilder.cpp b/cpp-ch/local-engine/Join/BroadCastJoinBuilder.cpp index 58ddcde8b584..d90951241166 100644 --- a/cpp-ch/local-engine/Join/BroadCastJoinBuilder.cpp +++ b/cpp-ch/local-engine/Join/BroadCastJoinBuilder.cpp @@ -119,7 +119,7 @@ void init(JNIEnv * env) * Here, we use utility class. */ - const char * classSig = "Lio/glutenproject/execution/CHBroadcastBuildSideCache;"; + const char * classSig = "Lorg/apache/gluten/execution/CHBroadcastBuildSideCache;"; Java_CHBroadcastBuildSideCache = CreateGlobalClassReference(env, classSig); Java_get = GetStaticMethodID(env, Java_CHBroadcastBuildSideCache, "get", "(Ljava/lang/String;)J"); } diff --git a/cpp-ch/local-engine/jni/jni_error.cpp b/cpp-ch/local-engine/jni/jni_error.cpp index 953fb7b1d177..15fdf5b4cf0b 100644 --- a/cpp-ch/local-engine/jni/jni_error.cpp +++ b/cpp-ch/local-engine/jni/jni_error.cpp @@ -60,7 +60,7 @@ void JniErrorsGlobalState::destroy(JNIEnv * env) void JniErrorsGlobalState::initialize(JNIEnv * env_) { io_exception_class = CreateGlobalExceptionClassReference(env_, "Ljava/io/IOException;"); - runtime_exception_class = CreateGlobalExceptionClassReference(env_, "Lio/glutenproject/exception/GlutenException;"); + runtime_exception_class = CreateGlobalExceptionClassReference(env_, "Lorg/apache/gluten/exception/GlutenException;"); unsupportedoperation_exception_class = CreateGlobalExceptionClassReference(env_, "Ljava/lang/UnsupportedOperationException;"); illegal_access_exception_class = CreateGlobalExceptionClassReference(env_, "Ljava/lang/IllegalAccessException;"); illegal_argument_exception_class = CreateGlobalExceptionClassReference(env_, "Ljava/lang/IllegalArgumentException;"); diff --git a/cpp-ch/local-engine/libch-hide-jemalloc.map b/cpp-ch/local-engine/libch-hide-jemalloc.map index 807985fe2283..7c0d4e676ab6 100644 --- a/cpp-ch/local-engine/libch-hide-jemalloc.map +++ b/cpp-ch/local-engine/libch-hide-jemalloc.map @@ -1,6 +1,6 @@ { global: - Java_io_glutenproject*; + Java_org_apache_gluten*; Java_org_apache_spark*; JNI_OnLoad; JNI_OnUnload; diff --git a/cpp-ch/local-engine/libch.map b/cpp-ch/local-engine/libch.map index 49db17b0afd7..50c6036eb0db 100644 --- a/cpp-ch/local-engine/libch.map +++ b/cpp-ch/local-engine/libch.map @@ -1,6 +1,6 @@ { global: - Java_io_glutenproject*; + Java_org_apache_gluten*; Java_org_apache_spark*; JNI_OnLoad; JNI_OnUnload; diff --git a/cpp-ch/local-engine/local_engine_jni.cpp b/cpp-ch/local-engine/local_engine_jni.cpp index c6773038458f..10a0283c10b7 100644 --- a/cpp-ch/local-engine/local_engine_jni.cpp +++ b/cpp-ch/local-engine/local_engine_jni.cpp @@ -132,23 +132,23 @@ JNIEXPORT jint JNI_OnLoad(JavaVM * vm, void * /*reserved*/) local_engine::JniErrorsGlobalState::instance().initialize(env); - spark_row_info_class = local_engine::CreateGlobalClassReference(env, "Lio/glutenproject/row/SparkRowInfo;"); + spark_row_info_class = local_engine::CreateGlobalClassReference(env, "Lorg/apache/gluten/row/SparkRowInfo;"); spark_row_info_constructor = local_engine::GetMethodID(env, spark_row_info_class, "", "([J[JJJJ)V"); block_stripes_class = local_engine::CreateGlobalClassReference(env, "Lorg/apache/spark/sql/execution/datasources/BlockStripes;"); block_stripes_constructor = local_engine::GetMethodID(env, block_stripes_class, "", "(J[J[II)V"); - split_result_class = local_engine::CreateGlobalClassReference(env, "Lio/glutenproject/vectorized/CHSplitResult;"); + split_result_class = local_engine::CreateGlobalClassReference(env, "Lorg/apache/gluten/vectorized/CHSplitResult;"); split_result_constructor = local_engine::GetMethodID(env, split_result_class, "", "(JJJJJJ[J[JJJJ)V"); local_engine::ShuffleReader::input_stream_class - = local_engine::CreateGlobalClassReference(env, "Lio/glutenproject/vectorized/ShuffleInputStream;"); + = local_engine::CreateGlobalClassReference(env, "Lorg/apache/gluten/vectorized/ShuffleInputStream;"); local_engine::NativeSplitter::iterator_class - = local_engine::CreateGlobalClassReference(env, "Lio/glutenproject/vectorized/IteratorWrapper;"); + = local_engine::CreateGlobalClassReference(env, "Lorg/apache/gluten/vectorized/IteratorWrapper;"); local_engine::WriteBufferFromJavaOutputStream::output_stream_class = local_engine::CreateGlobalClassReference(env, "Ljava/io/OutputStream;"); local_engine::SourceFromJavaIter::serialized_record_batch_iterator_class - = local_engine::CreateGlobalClassReference(env, "Lio/glutenproject/execution/ColumnarNativeIterator;"); + = local_engine::CreateGlobalClassReference(env, "Lorg/apache/gluten/execution/ColumnarNativeIterator;"); local_engine::SourceFromJavaIter::serialized_record_batch_iterator_hasNext = local_engine::GetMethodID(env, local_engine::SourceFromJavaIter::serialized_record_batch_iterator_class, "hasNext", "()Z"); local_engine::SourceFromJavaIter::serialized_record_batch_iterator_next @@ -169,7 +169,7 @@ JNIEXPORT jint JNI_OnLoad(JavaVM * vm, void * /*reserved*/) local_engine::SparkRowToCHColumn::spark_row_interator_class - = local_engine::CreateGlobalClassReference(env, "Lio/glutenproject/execution/SparkRowIterator;"); + = local_engine::CreateGlobalClassReference(env, "Lorg/apache/gluten/execution/SparkRowIterator;"); local_engine::SparkRowToCHColumn::spark_row_interator_hasNext = local_engine::GetMethodID(env, local_engine::SparkRowToCHColumn::spark_row_interator_class, "hasNext", "()Z"); local_engine::SparkRowToCHColumn::spark_row_interator_next @@ -178,7 +178,7 @@ JNIEXPORT jint JNI_OnLoad(JavaVM * vm, void * /*reserved*/) env, local_engine::SparkRowToCHColumn::spark_row_interator_class, "nextBatch", "()Ljava/nio/ByteBuffer;"); local_engine::ReservationListenerWrapper::reservation_listener_class - = local_engine::CreateGlobalClassReference(env, "Lio/glutenproject/memory/alloc/CHReservationListener;"); + = local_engine::CreateGlobalClassReference(env, "Lorg/apache/gluten/memory/alloc/CHReservationListener;"); local_engine::ReservationListenerWrapper::reservation_listener_reserve = local_engine::GetMethodID(env, local_engine::ReservationListenerWrapper::reservation_listener_class, "reserve", "(J)J"); local_engine::ReservationListenerWrapper::reservation_listener_reserve_or_throw @@ -186,7 +186,7 @@ JNIEXPORT jint JNI_OnLoad(JavaVM * vm, void * /*reserved*/) local_engine::ReservationListenerWrapper::reservation_listener_unreserve = local_engine::GetMethodID(env, local_engine::ReservationListenerWrapper::reservation_listener_class, "unreserve", "(J)J"); - native_metrics_class = local_engine::CreateGlobalClassReference(env, "Lio/glutenproject/metrics/NativeMetrics;"); + native_metrics_class = local_engine::CreateGlobalClassReference(env, "Lorg/apache/gluten/metrics/NativeMetrics;"); native_metrics_constructor = local_engine::GetMethodID(env, native_metrics_class, "", "(Ljava/lang/String;)V"); local_engine::BroadCastJoinBuilder::init(env); @@ -217,7 +217,7 @@ JNIEXPORT void JNI_OnUnload(JavaVM * vm, void * /*reserved*/) env->DeleteGlobalRef(native_metrics_class); } -JNIEXPORT void Java_io_glutenproject_vectorized_ExpressionEvaluatorJniWrapper_nativeInitNative(JNIEnv * env, jobject, jbyteArray conf_plan) +JNIEXPORT void Java_org_apache_gluten_vectorized_ExpressionEvaluatorJniWrapper_nativeInitNative(JNIEnv * env, jobject, jbyteArray conf_plan) { LOCAL_ENGINE_JNI_METHOD_START jsize plan_buf_size = env->GetArrayLength(conf_plan); @@ -229,14 +229,14 @@ JNIEXPORT void Java_io_glutenproject_vectorized_ExpressionEvaluatorJniWrapper_na LOCAL_ENGINE_JNI_METHOD_END(env, ) } -JNIEXPORT void Java_io_glutenproject_vectorized_ExpressionEvaluatorJniWrapper_nativeFinalizeNative(JNIEnv * env) +JNIEXPORT void Java_org_apache_gluten_vectorized_ExpressionEvaluatorJniWrapper_nativeFinalizeNative(JNIEnv * env) { LOCAL_ENGINE_JNI_METHOD_START local_engine::BackendFinalizerUtil::finalizeSessionally(); LOCAL_ENGINE_JNI_METHOD_END(env, ) } -JNIEXPORT jlong Java_io_glutenproject_vectorized_ExpressionEvaluatorJniWrapper_nativeCreateKernelWithIterator( +JNIEXPORT jlong Java_org_apache_gluten_vectorized_ExpressionEvaluatorJniWrapper_nativeCreateKernelWithIterator( JNIEnv * env, jobject /*obj*/, jlong allocator_id, @@ -289,7 +289,7 @@ JNIEXPORT jlong Java_io_glutenproject_vectorized_ExpressionEvaluatorJniWrapper_n LOCAL_ENGINE_JNI_METHOD_END(env, -1) } -JNIEXPORT jboolean Java_io_glutenproject_row_RowIterator_nativeHasNext(JNIEnv * env, jobject /*obj*/, jlong executor_address) +JNIEXPORT jboolean Java_org_apache_gluten_row_RowIterator_nativeHasNext(JNIEnv * env, jobject /*obj*/, jlong executor_address) { LOCAL_ENGINE_JNI_METHOD_START local_engine::LocalExecutor * executor = reinterpret_cast(executor_address); @@ -297,7 +297,7 @@ JNIEXPORT jboolean Java_io_glutenproject_row_RowIterator_nativeHasNext(JNIEnv * LOCAL_ENGINE_JNI_METHOD_END(env, false) } -JNIEXPORT jobject Java_io_glutenproject_row_RowIterator_nativeNext(JNIEnv * env, jobject /*obj*/, jlong executor_address) +JNIEXPORT jobject Java_org_apache_gluten_row_RowIterator_nativeNext(JNIEnv * env, jobject /*obj*/, jlong executor_address) { LOCAL_ENGINE_JNI_METHOD_START local_engine::LocalExecutor * executor = reinterpret_cast(executor_address); @@ -319,7 +319,7 @@ JNIEXPORT jobject Java_io_glutenproject_row_RowIterator_nativeNext(JNIEnv * env, LOCAL_ENGINE_JNI_METHOD_END(env, nullptr) } -JNIEXPORT void Java_io_glutenproject_row_RowIterator_nativeClose(JNIEnv * env, jobject /*obj*/, jlong executor_address) +JNIEXPORT void Java_org_apache_gluten_row_RowIterator_nativeClose(JNIEnv * env, jobject /*obj*/, jlong executor_address) { LOCAL_ENGINE_JNI_METHOD_START local_engine::LocalExecutor * executor = reinterpret_cast(executor_address); @@ -328,7 +328,7 @@ JNIEXPORT void Java_io_glutenproject_row_RowIterator_nativeClose(JNIEnv * env, j } // Columnar Iterator -JNIEXPORT jboolean Java_io_glutenproject_vectorized_BatchIterator_nativeHasNext(JNIEnv * env, jobject /*obj*/, jlong executor_address) +JNIEXPORT jboolean Java_org_apache_gluten_vectorized_BatchIterator_nativeHasNext(JNIEnv * env, jobject /*obj*/, jlong executor_address) { LOCAL_ENGINE_JNI_METHOD_START local_engine::LocalExecutor * executor = reinterpret_cast(executor_address); @@ -336,7 +336,7 @@ JNIEXPORT jboolean Java_io_glutenproject_vectorized_BatchIterator_nativeHasNext( LOCAL_ENGINE_JNI_METHOD_END(env, false) } -JNIEXPORT jlong Java_io_glutenproject_vectorized_BatchIterator_nativeCHNext(JNIEnv * env, jobject /*obj*/, jlong executor_address) +JNIEXPORT jlong Java_org_apache_gluten_vectorized_BatchIterator_nativeCHNext(JNIEnv * env, jobject /*obj*/, jlong executor_address) { LOCAL_ENGINE_JNI_METHOD_START local_engine::LocalExecutor * executor = reinterpret_cast(executor_address); @@ -346,7 +346,7 @@ JNIEXPORT jlong Java_io_glutenproject_vectorized_BatchIterator_nativeCHNext(JNIE LOCAL_ENGINE_JNI_METHOD_END(env, -1) } -JNIEXPORT void Java_io_glutenproject_vectorized_BatchIterator_nativeClose(JNIEnv * env, jobject /*obj*/, jlong executor_address) +JNIEXPORT void Java_org_apache_gluten_vectorized_BatchIterator_nativeClose(JNIEnv * env, jobject /*obj*/, jlong executor_address) { LOCAL_ENGINE_JNI_METHOD_START local_engine::LocalExecutor * executor = reinterpret_cast(executor_address); @@ -354,7 +354,7 @@ JNIEXPORT void Java_io_glutenproject_vectorized_BatchIterator_nativeClose(JNIEnv LOCAL_ENGINE_JNI_METHOD_END(env, ) } -JNIEXPORT jobject Java_io_glutenproject_vectorized_BatchIterator_nativeFetchMetrics(JNIEnv * env, jobject /*obj*/, jlong executor_address) +JNIEXPORT jobject Java_org_apache_gluten_vectorized_BatchIterator_nativeFetchMetrics(JNIEnv * env, jobject /*obj*/, jlong executor_address) { LOCAL_ENGINE_JNI_METHOD_START /// Collect metrics only if optimizations are disabled, otherwise coredump would happen. @@ -368,22 +368,22 @@ JNIEXPORT jobject Java_io_glutenproject_vectorized_BatchIterator_nativeFetchMetr } JNIEXPORT void -Java_io_glutenproject_vectorized_ExpressionEvaluatorJniWrapper_nativeSetJavaTmpDir(JNIEnv * /*env*/, jobject /*obj*/, jstring /*dir*/) +Java_org_apache_gluten_vectorized_ExpressionEvaluatorJniWrapper_nativeSetJavaTmpDir(JNIEnv * /*env*/, jobject /*obj*/, jstring /*dir*/) { } JNIEXPORT void -Java_io_glutenproject_vectorized_ExpressionEvaluatorJniWrapper_nativeSetBatchSize(JNIEnv * /*env*/, jobject /*obj*/, jint /*batch_size*/) +Java_org_apache_gluten_vectorized_ExpressionEvaluatorJniWrapper_nativeSetBatchSize(JNIEnv * /*env*/, jobject /*obj*/, jint /*batch_size*/) { } -JNIEXPORT void Java_io_glutenproject_vectorized_ExpressionEvaluatorJniWrapper_nativeSetMetricsTime( +JNIEXPORT void Java_org_apache_gluten_vectorized_ExpressionEvaluatorJniWrapper_nativeSetMetricsTime( JNIEnv * /*env*/, jobject /*obj*/, jboolean /*setMetricsTime*/) { } JNIEXPORT jboolean -Java_io_glutenproject_vectorized_CHColumnVector_nativeHasNull(JNIEnv * env, jobject obj, jlong block_address, jint column_position) +Java_org_apache_gluten_vectorized_CHColumnVector_nativeHasNull(JNIEnv * env, jobject obj, jlong block_address, jint column_position) { LOCAL_ENGINE_JNI_METHOD_START DB::Block * block = reinterpret_cast(block_address); @@ -402,7 +402,7 @@ Java_io_glutenproject_vectorized_CHColumnVector_nativeHasNull(JNIEnv * env, jobj } JNIEXPORT jint -Java_io_glutenproject_vectorized_CHColumnVector_nativeNumNulls(JNIEnv * env, jobject obj, jlong block_address, jint column_position) +Java_org_apache_gluten_vectorized_CHColumnVector_nativeNumNulls(JNIEnv * env, jobject obj, jlong block_address, jint column_position) { LOCAL_ENGINE_JNI_METHOD_START auto col = getColumnFromColumnVector(env, obj, block_address, column_position); @@ -418,7 +418,7 @@ Java_io_glutenproject_vectorized_CHColumnVector_nativeNumNulls(JNIEnv * env, job LOCAL_ENGINE_JNI_METHOD_END(env, -1) } -JNIEXPORT jboolean Java_io_glutenproject_vectorized_CHColumnVector_nativeIsNullAt( +JNIEXPORT jboolean Java_org_apache_gluten_vectorized_CHColumnVector_nativeIsNullAt( JNIEnv * env, jobject obj, jint row_id, jlong block_address, jint column_position) { LOCAL_ENGINE_JNI_METHOD_START @@ -427,7 +427,7 @@ JNIEXPORT jboolean Java_io_glutenproject_vectorized_CHColumnVector_nativeIsNullA LOCAL_ENGINE_JNI_METHOD_END(env, false) } -JNIEXPORT jboolean Java_io_glutenproject_vectorized_CHColumnVector_nativeGetBoolean( +JNIEXPORT jboolean Java_org_apache_gluten_vectorized_CHColumnVector_nativeGetBoolean( JNIEnv * env, jobject obj, jint row_id, jlong block_address, jint column_position) { LOCAL_ENGINE_JNI_METHOD_START @@ -439,7 +439,7 @@ JNIEXPORT jboolean Java_io_glutenproject_vectorized_CHColumnVector_nativeGetBool LOCAL_ENGINE_JNI_METHOD_END(env, false) } -JNIEXPORT jbyte Java_io_glutenproject_vectorized_CHColumnVector_nativeGetByte( +JNIEXPORT jbyte Java_org_apache_gluten_vectorized_CHColumnVector_nativeGetByte( JNIEnv * env, jobject obj, jint row_id, jlong block_address, jint column_position) { LOCAL_ENGINE_JNI_METHOD_START @@ -451,7 +451,7 @@ JNIEXPORT jbyte Java_io_glutenproject_vectorized_CHColumnVector_nativeGetByte( LOCAL_ENGINE_JNI_METHOD_END(env, 0) } -JNIEXPORT jshort Java_io_glutenproject_vectorized_CHColumnVector_nativeGetShort( +JNIEXPORT jshort Java_org_apache_gluten_vectorized_CHColumnVector_nativeGetShort( JNIEnv * env, jobject obj, jint row_id, jlong block_address, jint column_position) { LOCAL_ENGINE_JNI_METHOD_START @@ -463,7 +463,7 @@ JNIEXPORT jshort Java_io_glutenproject_vectorized_CHColumnVector_nativeGetShort( LOCAL_ENGINE_JNI_METHOD_END(env, -1) } -JNIEXPORT jint Java_io_glutenproject_vectorized_CHColumnVector_nativeGetInt( +JNIEXPORT jint Java_org_apache_gluten_vectorized_CHColumnVector_nativeGetInt( JNIEnv * env, jobject obj, jint row_id, jlong block_address, jint column_position) { LOCAL_ENGINE_JNI_METHOD_START @@ -478,7 +478,7 @@ JNIEXPORT jint Java_io_glutenproject_vectorized_CHColumnVector_nativeGetInt( LOCAL_ENGINE_JNI_METHOD_END(env, -1) } -JNIEXPORT jlong Java_io_glutenproject_vectorized_CHColumnVector_nativeGetLong( +JNIEXPORT jlong Java_org_apache_gluten_vectorized_CHColumnVector_nativeGetLong( JNIEnv * env, jobject obj, jint row_id, jlong block_address, jint column_position) { LOCAL_ENGINE_JNI_METHOD_START @@ -490,7 +490,7 @@ JNIEXPORT jlong Java_io_glutenproject_vectorized_CHColumnVector_nativeGetLong( LOCAL_ENGINE_JNI_METHOD_END(env, -1) } -JNIEXPORT jfloat Java_io_glutenproject_vectorized_CHColumnVector_nativeGetFloat( +JNIEXPORT jfloat Java_org_apache_gluten_vectorized_CHColumnVector_nativeGetFloat( JNIEnv * env, jobject obj, jint row_id, jlong block_address, jint column_position) { LOCAL_ENGINE_JNI_METHOD_START @@ -502,7 +502,7 @@ JNIEXPORT jfloat Java_io_glutenproject_vectorized_CHColumnVector_nativeGetFloat( LOCAL_ENGINE_JNI_METHOD_END(env, 0.0) } -JNIEXPORT jdouble Java_io_glutenproject_vectorized_CHColumnVector_nativeGetDouble( +JNIEXPORT jdouble Java_org_apache_gluten_vectorized_CHColumnVector_nativeGetDouble( JNIEnv * env, jobject obj, jint row_id, jlong block_address, jint column_position) { LOCAL_ENGINE_JNI_METHOD_START @@ -514,7 +514,7 @@ JNIEXPORT jdouble Java_io_glutenproject_vectorized_CHColumnVector_nativeGetDoubl LOCAL_ENGINE_JNI_METHOD_END(env, 0.0) } -JNIEXPORT jstring Java_io_glutenproject_vectorized_CHColumnVector_nativeGetString( +JNIEXPORT jstring Java_org_apache_gluten_vectorized_CHColumnVector_nativeGetString( JNIEnv * env, jobject obj, jint row_id, jlong block_address, jint column_position) { LOCAL_ENGINE_JNI_METHOD_START @@ -529,11 +529,11 @@ JNIEXPORT jstring Java_io_glutenproject_vectorized_CHColumnVector_nativeGetStrin } // native block -JNIEXPORT void Java_io_glutenproject_vectorized_CHNativeBlock_nativeClose(JNIEnv * /*env*/, jobject /*obj*/, jlong /*block_address*/) +JNIEXPORT void Java_org_apache_gluten_vectorized_CHNativeBlock_nativeClose(JNIEnv * /*env*/, jobject /*obj*/, jlong /*block_address*/) { } -JNIEXPORT jint Java_io_glutenproject_vectorized_CHNativeBlock_nativeNumRows(JNIEnv * env, jobject /*obj*/, jlong block_address) +JNIEXPORT jint Java_org_apache_gluten_vectorized_CHNativeBlock_nativeNumRows(JNIEnv * env, jobject /*obj*/, jlong block_address) { LOCAL_ENGINE_JNI_METHOD_START DB::Block * block = reinterpret_cast(block_address); @@ -541,7 +541,7 @@ JNIEXPORT jint Java_io_glutenproject_vectorized_CHNativeBlock_nativeNumRows(JNIE LOCAL_ENGINE_JNI_METHOD_END(env, -1) } -JNIEXPORT jint Java_io_glutenproject_vectorized_CHNativeBlock_nativeNumColumns(JNIEnv * env, jobject /*obj*/, jlong block_address) +JNIEXPORT jint Java_org_apache_gluten_vectorized_CHNativeBlock_nativeNumColumns(JNIEnv * env, jobject /*obj*/, jlong block_address) { LOCAL_ENGINE_JNI_METHOD_START auto * block = reinterpret_cast(block_address); @@ -550,7 +550,7 @@ JNIEXPORT jint Java_io_glutenproject_vectorized_CHNativeBlock_nativeNumColumns(J } JNIEXPORT jbyteArray -Java_io_glutenproject_vectorized_CHNativeBlock_nativeColumnType(JNIEnv * env, jobject /*obj*/, jlong block_address, jint position) +Java_org_apache_gluten_vectorized_CHNativeBlock_nativeColumnType(JNIEnv * env, jobject /*obj*/, jlong block_address, jint position) { LOCAL_ENGINE_JNI_METHOD_START auto * block = reinterpret_cast(block_address); @@ -561,7 +561,7 @@ Java_io_glutenproject_vectorized_CHNativeBlock_nativeColumnType(JNIEnv * env, jo LOCAL_ENGINE_JNI_METHOD_END(env, local_engine::stringTojbyteArray(env, "")) } -JNIEXPORT jlong Java_io_glutenproject_vectorized_CHNativeBlock_nativeTotalBytes(JNIEnv * env, jobject /*obj*/, jlong block_address) +JNIEXPORT jlong Java_org_apache_gluten_vectorized_CHNativeBlock_nativeTotalBytes(JNIEnv * env, jobject /*obj*/, jlong block_address) { LOCAL_ENGINE_JNI_METHOD_START auto * block = reinterpret_cast(block_address); @@ -569,7 +569,7 @@ JNIEXPORT jlong Java_io_glutenproject_vectorized_CHNativeBlock_nativeTotalBytes( LOCAL_ENGINE_JNI_METHOD_END(env, -1) } -JNIEXPORT jlong Java_io_glutenproject_vectorized_CHStreamReader_createNativeShuffleReader( +JNIEXPORT jlong Java_org_apache_gluten_vectorized_CHStreamReader_createNativeShuffleReader( JNIEnv * env, jclass /*clazz*/, jobject input_stream, jboolean compressed, jlong max_shuffle_read_rows, jlong max_shuffle_read_bytes) { LOCAL_ENGINE_JNI_METHOD_START @@ -581,7 +581,7 @@ JNIEXPORT jlong Java_io_glutenproject_vectorized_CHStreamReader_createNativeShuf LOCAL_ENGINE_JNI_METHOD_END(env, -1) } -JNIEXPORT jlong Java_io_glutenproject_vectorized_CHStreamReader_nativeNext(JNIEnv * env, jobject /*obj*/, jlong shuffle_reader) +JNIEXPORT jlong Java_org_apache_gluten_vectorized_CHStreamReader_nativeNext(JNIEnv * env, jobject /*obj*/, jlong shuffle_reader) { LOCAL_ENGINE_JNI_METHOD_START local_engine::ShuffleReader * reader = reinterpret_cast(shuffle_reader); @@ -590,7 +590,7 @@ JNIEXPORT jlong Java_io_glutenproject_vectorized_CHStreamReader_nativeNext(JNIEn LOCAL_ENGINE_JNI_METHOD_END(env, -1) } -JNIEXPORT void Java_io_glutenproject_vectorized_CHStreamReader_nativeClose(JNIEnv * env, jobject /*obj*/, jlong shuffle_reader) +JNIEXPORT void Java_org_apache_gluten_vectorized_CHStreamReader_nativeClose(JNIEnv * env, jobject /*obj*/, jlong shuffle_reader) { LOCAL_ENGINE_JNI_METHOD_START local_engine::ShuffleReader * reader = reinterpret_cast(shuffle_reader); @@ -598,7 +598,7 @@ JNIEXPORT void Java_io_glutenproject_vectorized_CHStreamReader_nativeClose(JNIEn LOCAL_ENGINE_JNI_METHOD_END(env, ) } -JNIEXPORT jlong Java_io_glutenproject_vectorized_CHCoalesceOperator_createNativeOperator(JNIEnv * env, jobject /*obj*/, jint buf_size) +JNIEXPORT jlong Java_org_apache_gluten_vectorized_CHCoalesceOperator_createNativeOperator(JNIEnv * env, jobject /*obj*/, jint buf_size) { LOCAL_ENGINE_JNI_METHOD_START local_engine::BlockCoalesceOperator * instance = new local_engine::BlockCoalesceOperator(buf_size); @@ -606,7 +606,7 @@ JNIEXPORT jlong Java_io_glutenproject_vectorized_CHCoalesceOperator_createNative LOCAL_ENGINE_JNI_METHOD_END(env, -1) } -JNIEXPORT void Java_io_glutenproject_vectorized_CHCoalesceOperator_nativeMergeBlock( +JNIEXPORT void Java_org_apache_gluten_vectorized_CHCoalesceOperator_nativeMergeBlock( JNIEnv * env, jobject /*obj*/, jlong instance_address, jlong block_address) { LOCAL_ENGINE_JNI_METHOD_START @@ -617,7 +617,7 @@ JNIEXPORT void Java_io_glutenproject_vectorized_CHCoalesceOperator_nativeMergeBl LOCAL_ENGINE_JNI_METHOD_END(env, ) } -JNIEXPORT jboolean Java_io_glutenproject_vectorized_CHCoalesceOperator_nativeIsFull(JNIEnv * env, jobject /*obj*/, jlong instance_address) +JNIEXPORT jboolean Java_org_apache_gluten_vectorized_CHCoalesceOperator_nativeIsFull(JNIEnv * env, jobject /*obj*/, jlong instance_address) { LOCAL_ENGINE_JNI_METHOD_START local_engine::BlockCoalesceOperator * instance = reinterpret_cast(instance_address); @@ -626,7 +626,7 @@ JNIEXPORT jboolean Java_io_glutenproject_vectorized_CHCoalesceOperator_nativeIsF LOCAL_ENGINE_JNI_METHOD_END(env, false) } -JNIEXPORT jlong Java_io_glutenproject_vectorized_CHCoalesceOperator_nativeRelease(JNIEnv * env, jobject /*obj*/, jlong instance_address) +JNIEXPORT jlong Java_org_apache_gluten_vectorized_CHCoalesceOperator_nativeRelease(JNIEnv * env, jobject /*obj*/, jlong instance_address) { LOCAL_ENGINE_JNI_METHOD_START local_engine::BlockCoalesceOperator * instance = reinterpret_cast(instance_address); @@ -636,7 +636,7 @@ JNIEXPORT jlong Java_io_glutenproject_vectorized_CHCoalesceOperator_nativeReleas LOCAL_ENGINE_JNI_METHOD_END(env, -1) } -JNIEXPORT void Java_io_glutenproject_vectorized_CHCoalesceOperator_nativeClose(JNIEnv * env, jobject /*obj*/, jlong instance_address) +JNIEXPORT void Java_org_apache_gluten_vectorized_CHCoalesceOperator_nativeClose(JNIEnv * env, jobject /*obj*/, jlong instance_address) { LOCAL_ENGINE_JNI_METHOD_START local_engine::BlockCoalesceOperator * instance = reinterpret_cast(instance_address); @@ -645,7 +645,7 @@ JNIEXPORT void Java_io_glutenproject_vectorized_CHCoalesceOperator_nativeClose(J } // Splitter Jni Wrapper -JNIEXPORT jlong Java_io_glutenproject_vectorized_CHShuffleSplitterJniWrapper_nativeMake( +JNIEXPORT jlong Java_org_apache_gluten_vectorized_CHShuffleSplitterJniWrapper_nativeMake( JNIEnv * env, jobject, jstring short_name, @@ -718,7 +718,7 @@ JNIEXPORT jlong Java_io_glutenproject_vectorized_CHShuffleSplitterJniWrapper_nat LOCAL_ENGINE_JNI_METHOD_END(env, -1) } -JNIEXPORT jlong Java_io_glutenproject_vectorized_CHShuffleSplitterJniWrapper_nativeMakeForRSS( +JNIEXPORT jlong Java_org_apache_gluten_vectorized_CHShuffleSplitterJniWrapper_nativeMakeForRSS( JNIEnv * env, jobject, jstring short_name, @@ -776,7 +776,7 @@ JNIEXPORT jlong Java_io_glutenproject_vectorized_CHShuffleSplitterJniWrapper_nat LOCAL_ENGINE_JNI_METHOD_END(env, -1) } -JNIEXPORT void Java_io_glutenproject_vectorized_CHShuffleSplitterJniWrapper_split(JNIEnv * env, jobject, jlong splitterId, jlong block) +JNIEXPORT void Java_org_apache_gluten_vectorized_CHShuffleSplitterJniWrapper_split(JNIEnv * env, jobject, jlong splitterId, jlong block) { LOCAL_ENGINE_JNI_METHOD_START local_engine::SplitterHolder * splitter = reinterpret_cast(splitterId); @@ -785,7 +785,7 @@ JNIEXPORT void Java_io_glutenproject_vectorized_CHShuffleSplitterJniWrapper_spli LOCAL_ENGINE_JNI_METHOD_END(env, ) } -JNIEXPORT jlong Java_io_glutenproject_vectorized_CHShuffleSplitterJniWrapper_evict(JNIEnv * env, jobject, jlong splitterId) +JNIEXPORT jlong Java_org_apache_gluten_vectorized_CHShuffleSplitterJniWrapper_evict(JNIEnv * env, jobject, jlong splitterId) { LOCAL_ENGINE_JNI_METHOD_START local_engine::SplitterHolder * splitter = reinterpret_cast(splitterId); @@ -794,7 +794,7 @@ JNIEXPORT jlong Java_io_glutenproject_vectorized_CHShuffleSplitterJniWrapper_evi LOCAL_ENGINE_JNI_METHOD_END(env, 0) } -JNIEXPORT jobject Java_io_glutenproject_vectorized_CHShuffleSplitterJniWrapper_stop(JNIEnv * env, jobject, jlong splitterId) +JNIEXPORT jobject Java_org_apache_gluten_vectorized_CHShuffleSplitterJniWrapper_stop(JNIEnv * env, jobject, jlong splitterId) { LOCAL_ENGINE_JNI_METHOD_START @@ -830,7 +830,7 @@ JNIEXPORT jobject Java_io_glutenproject_vectorized_CHShuffleSplitterJniWrapper_s LOCAL_ENGINE_JNI_METHOD_END(env, nullptr) } -JNIEXPORT void Java_io_glutenproject_vectorized_CHShuffleSplitterJniWrapper_close(JNIEnv * env, jobject, jlong splitterId) +JNIEXPORT void Java_org_apache_gluten_vectorized_CHShuffleSplitterJniWrapper_close(JNIEnv * env, jobject, jlong splitterId) { LOCAL_ENGINE_JNI_METHOD_START local_engine::SplitterHolder * splitter = reinterpret_cast(splitterId); @@ -840,7 +840,7 @@ JNIEXPORT void Java_io_glutenproject_vectorized_CHShuffleSplitterJniWrapper_clos // CHBlockConverterJniWrapper JNIEXPORT jobject -Java_io_glutenproject_vectorized_CHBlockConverterJniWrapper_convertColumnarToRow(JNIEnv * env, jclass, jlong block_address, jintArray masks) +Java_org_apache_gluten_vectorized_CHBlockConverterJniWrapper_convertColumnarToRow(JNIEnv * env, jclass, jlong block_address, jintArray masks) { LOCAL_ENGINE_JNI_METHOD_START local_engine::CHColumnToSparkRow converter; @@ -876,7 +876,7 @@ Java_io_glutenproject_vectorized_CHBlockConverterJniWrapper_convertColumnarToRow LOCAL_ENGINE_JNI_METHOD_END(env, nullptr) } -JNIEXPORT void Java_io_glutenproject_vectorized_CHBlockConverterJniWrapper_freeMemory(JNIEnv * env, jclass, jlong address, jlong size) +JNIEXPORT void Java_org_apache_gluten_vectorized_CHBlockConverterJniWrapper_freeMemory(JNIEnv * env, jclass, jlong address, jlong size) { LOCAL_ENGINE_JNI_METHOD_START local_engine::CHColumnToSparkRow converter; @@ -884,7 +884,7 @@ JNIEXPORT void Java_io_glutenproject_vectorized_CHBlockConverterJniWrapper_freeM LOCAL_ENGINE_JNI_METHOD_END(env, ) } -JNIEXPORT jlong Java_io_glutenproject_vectorized_CHBlockConverterJniWrapper_convertSparkRowsToCHColumn( +JNIEXPORT jlong Java_org_apache_gluten_vectorized_CHBlockConverterJniWrapper_convertSparkRowsToCHColumn( JNIEnv * env, jclass, jobject java_iter, jobjectArray names, jobjectArray types) { LOCAL_ENGINE_JNI_METHOD_START @@ -915,7 +915,7 @@ JNIEXPORT jlong Java_io_glutenproject_vectorized_CHBlockConverterJniWrapper_conv LOCAL_ENGINE_JNI_METHOD_END(env, -1) } -JNIEXPORT void Java_io_glutenproject_vectorized_CHBlockConverterJniWrapper_freeBlock(JNIEnv * env, jclass, jlong block_address) +JNIEXPORT void Java_org_apache_gluten_vectorized_CHBlockConverterJniWrapper_freeBlock(JNIEnv * env, jclass, jlong block_address) { LOCAL_ENGINE_JNI_METHOD_START local_engine::SparkRowToCHColumn converter; @@ -923,7 +923,7 @@ JNIEXPORT void Java_io_glutenproject_vectorized_CHBlockConverterJniWrapper_freeB LOCAL_ENGINE_JNI_METHOD_END(env, ) } -JNIEXPORT jlong Java_io_glutenproject_vectorized_CHBlockWriterJniWrapper_nativeCreateInstance(JNIEnv * env, jobject) +JNIEXPORT jlong Java_org_apache_gluten_vectorized_CHBlockWriterJniWrapper_nativeCreateInstance(JNIEnv * env, jobject) { LOCAL_ENGINE_JNI_METHOD_START auto * writer = new local_engine::NativeWriterInMemory(); @@ -932,7 +932,7 @@ JNIEXPORT jlong Java_io_glutenproject_vectorized_CHBlockWriterJniWrapper_nativeC } JNIEXPORT void -Java_io_glutenproject_vectorized_CHBlockWriterJniWrapper_nativeWrite(JNIEnv * env, jobject, jlong instance, jlong block_address) +Java_org_apache_gluten_vectorized_CHBlockWriterJniWrapper_nativeWrite(JNIEnv * env, jobject, jlong instance, jlong block_address) { LOCAL_ENGINE_JNI_METHOD_START auto * writer = reinterpret_cast(instance); @@ -941,7 +941,7 @@ Java_io_glutenproject_vectorized_CHBlockWriterJniWrapper_nativeWrite(JNIEnv * en LOCAL_ENGINE_JNI_METHOD_END(env, ) } -JNIEXPORT jint Java_io_glutenproject_vectorized_CHBlockWriterJniWrapper_nativeResultSize(JNIEnv * env, jobject, jlong instance) +JNIEXPORT jint Java_org_apache_gluten_vectorized_CHBlockWriterJniWrapper_nativeResultSize(JNIEnv * env, jobject, jlong instance) { LOCAL_ENGINE_JNI_METHOD_START auto * writer = reinterpret_cast(instance); @@ -950,7 +950,7 @@ JNIEXPORT jint Java_io_glutenproject_vectorized_CHBlockWriterJniWrapper_nativeRe } JNIEXPORT void -Java_io_glutenproject_vectorized_CHBlockWriterJniWrapper_nativeCollect(JNIEnv * env, jobject, jlong instance, jbyteArray result) +Java_org_apache_gluten_vectorized_CHBlockWriterJniWrapper_nativeCollect(JNIEnv * env, jobject, jlong instance, jbyteArray result) { LOCAL_ENGINE_JNI_METHOD_START auto * writer = reinterpret_cast(instance); @@ -959,7 +959,7 @@ Java_io_glutenproject_vectorized_CHBlockWriterJniWrapper_nativeCollect(JNIEnv * LOCAL_ENGINE_JNI_METHOD_END(env, ) } -JNIEXPORT void Java_io_glutenproject_vectorized_CHBlockWriterJniWrapper_nativeClose(JNIEnv * env, jobject, jlong instance) +JNIEXPORT void Java_org_apache_gluten_vectorized_CHBlockWriterJniWrapper_nativeClose(JNIEnv * env, jobject, jlong instance) { LOCAL_ENGINE_JNI_METHOD_START auto * writer = reinterpret_cast(instance); @@ -1213,7 +1213,7 @@ JNIEXPORT jobject Java_org_apache_spark_sql_execution_datasources_CHDatasourceJn LOCAL_ENGINE_JNI_METHOD_END(env, nullptr) } -JNIEXPORT jlong Java_io_glutenproject_vectorized_StorageJoinBuilder_nativeBuild( +JNIEXPORT jlong Java_org_apache_gluten_vectorized_StorageJoinBuilder_nativeBuild( JNIEnv * env, jclass, jstring key, jbyteArray in, jlong row_count_, jstring join_key_, jint join_type_, jbyteArray named_struct) { LOCAL_ENGINE_JNI_METHOD_START @@ -1235,7 +1235,7 @@ JNIEXPORT jlong Java_io_glutenproject_vectorized_StorageJoinBuilder_nativeBuild( LOCAL_ENGINE_JNI_METHOD_END(env, 0) } -JNIEXPORT jlong Java_io_glutenproject_vectorized_StorageJoinBuilder_nativeCloneBuildHashTable(JNIEnv * env, jclass, jlong instance) +JNIEXPORT jlong Java_org_apache_gluten_vectorized_StorageJoinBuilder_nativeCloneBuildHashTable(JNIEnv * env, jclass, jlong instance) { LOCAL_ENGINE_JNI_METHOD_START auto * cloned @@ -1245,7 +1245,7 @@ JNIEXPORT jlong Java_io_glutenproject_vectorized_StorageJoinBuilder_nativeCloneB } JNIEXPORT void -Java_io_glutenproject_vectorized_StorageJoinBuilder_nativeCleanBuildHashTable(JNIEnv * env, jclass, jstring hash_table_id_, jlong instance) +Java_org_apache_gluten_vectorized_StorageJoinBuilder_nativeCleanBuildHashTable(JNIEnv * env, jclass, jstring hash_table_id_, jlong instance) { LOCAL_ENGINE_JNI_METHOD_START auto hash_table_id = jstring2string(env, hash_table_id_); @@ -1254,7 +1254,7 @@ Java_io_glutenproject_vectorized_StorageJoinBuilder_nativeCleanBuildHashTable(JN } // BlockSplitIterator -JNIEXPORT jlong Java_io_glutenproject_vectorized_BlockSplitIterator_nativeCreate( +JNIEXPORT jlong Java_org_apache_gluten_vectorized_BlockSplitIterator_nativeCreate( JNIEnv * env, jobject, jobject in, @@ -1283,7 +1283,7 @@ JNIEXPORT jlong Java_io_glutenproject_vectorized_BlockSplitIterator_nativeCreate LOCAL_ENGINE_JNI_METHOD_END(env, -1) } -JNIEXPORT void Java_io_glutenproject_vectorized_BlockSplitIterator_nativeClose(JNIEnv * env, jobject, jlong instance) +JNIEXPORT void Java_org_apache_gluten_vectorized_BlockSplitIterator_nativeClose(JNIEnv * env, jobject, jlong instance) { LOCAL_ENGINE_JNI_METHOD_START local_engine::NativeSplitter::Holder * splitter = reinterpret_cast(instance); @@ -1291,7 +1291,7 @@ JNIEXPORT void Java_io_glutenproject_vectorized_BlockSplitIterator_nativeClose(J LOCAL_ENGINE_JNI_METHOD_END(env, ) } -JNIEXPORT jboolean Java_io_glutenproject_vectorized_BlockSplitIterator_nativeHasNext(JNIEnv * env, jobject, jlong instance) +JNIEXPORT jboolean Java_org_apache_gluten_vectorized_BlockSplitIterator_nativeHasNext(JNIEnv * env, jobject, jlong instance) { LOCAL_ENGINE_JNI_METHOD_START local_engine::NativeSplitter::Holder * splitter = reinterpret_cast(instance); @@ -1299,7 +1299,7 @@ JNIEXPORT jboolean Java_io_glutenproject_vectorized_BlockSplitIterator_nativeHas LOCAL_ENGINE_JNI_METHOD_END(env, false) } -JNIEXPORT jlong Java_io_glutenproject_vectorized_BlockSplitIterator_nativeNext(JNIEnv * env, jobject, jlong instance) +JNIEXPORT jlong Java_org_apache_gluten_vectorized_BlockSplitIterator_nativeNext(JNIEnv * env, jobject, jlong instance) { LOCAL_ENGINE_JNI_METHOD_START local_engine::NativeSplitter::Holder * splitter = reinterpret_cast(instance); @@ -1307,7 +1307,7 @@ JNIEXPORT jlong Java_io_glutenproject_vectorized_BlockSplitIterator_nativeNext(J LOCAL_ENGINE_JNI_METHOD_END(env, false) } -JNIEXPORT jint Java_io_glutenproject_vectorized_BlockSplitIterator_nativeNextPartitionId(JNIEnv * env, jobject, jlong instance) +JNIEXPORT jint Java_org_apache_gluten_vectorized_BlockSplitIterator_nativeNextPartitionId(JNIEnv * env, jobject, jlong instance) { LOCAL_ENGINE_JNI_METHOD_START local_engine::NativeSplitter::Holder * splitter = reinterpret_cast(instance); @@ -1315,7 +1315,7 @@ JNIEXPORT jint Java_io_glutenproject_vectorized_BlockSplitIterator_nativeNextPar LOCAL_ENGINE_JNI_METHOD_END(env, -1) } -JNIEXPORT jlong Java_io_glutenproject_vectorized_BlockOutputStream_nativeCreate( +JNIEXPORT jlong Java_org_apache_gluten_vectorized_BlockOutputStream_nativeCreate( JNIEnv * env, jobject, jobject output_stream, jbyteArray buffer, jstring codec, jboolean compressed, jint customize_buffer_size) { LOCAL_ENGINE_JNI_METHOD_START @@ -1325,7 +1325,7 @@ JNIEXPORT jlong Java_io_glutenproject_vectorized_BlockOutputStream_nativeCreate( LOCAL_ENGINE_JNI_METHOD_END(env, -1) } -JNIEXPORT void Java_io_glutenproject_vectorized_BlockOutputStream_nativeClose(JNIEnv * env, jobject, jlong instance) +JNIEXPORT void Java_org_apache_gluten_vectorized_BlockOutputStream_nativeClose(JNIEnv * env, jobject, jlong instance) { LOCAL_ENGINE_JNI_METHOD_START local_engine::ShuffleWriter * writer = reinterpret_cast(instance); @@ -1334,7 +1334,7 @@ JNIEXPORT void Java_io_glutenproject_vectorized_BlockOutputStream_nativeClose(JN LOCAL_ENGINE_JNI_METHOD_END(env, ) } -JNIEXPORT void Java_io_glutenproject_vectorized_BlockOutputStream_nativeWrite(JNIEnv * env, jobject, jlong instance, jlong block_address) +JNIEXPORT void Java_org_apache_gluten_vectorized_BlockOutputStream_nativeWrite(JNIEnv * env, jobject, jlong instance, jlong block_address) { LOCAL_ENGINE_JNI_METHOD_START local_engine::ShuffleWriter * writer = reinterpret_cast(instance); @@ -1343,7 +1343,7 @@ JNIEXPORT void Java_io_glutenproject_vectorized_BlockOutputStream_nativeWrite(JN LOCAL_ENGINE_JNI_METHOD_END(env, ) } -JNIEXPORT void Java_io_glutenproject_vectorized_BlockOutputStream_nativeFlush(JNIEnv * env, jobject, jlong instance) +JNIEXPORT void Java_org_apache_gluten_vectorized_BlockOutputStream_nativeFlush(JNIEnv * env, jobject, jlong instance) { LOCAL_ENGINE_JNI_METHOD_START local_engine::ShuffleWriter * writer = reinterpret_cast(instance); @@ -1352,7 +1352,7 @@ JNIEXPORT void Java_io_glutenproject_vectorized_BlockOutputStream_nativeFlush(JN } JNIEXPORT jlong -Java_io_glutenproject_vectorized_SimpleExpressionEval_createNativeInstance(JNIEnv * env, jclass, jobject input, jbyteArray plan) +Java_org_apache_gluten_vectorized_SimpleExpressionEval_createNativeInstance(JNIEnv * env, jclass, jobject input, jbyteArray plan) { LOCAL_ENGINE_JNI_METHOD_START auto context = DB::Context::createCopy(local_engine::SerializedPlanParser::global_context); @@ -1371,7 +1371,7 @@ Java_io_glutenproject_vectorized_SimpleExpressionEval_createNativeInstance(JNIEn LOCAL_ENGINE_JNI_METHOD_END(env, -1) } -JNIEXPORT void Java_io_glutenproject_vectorized_SimpleExpressionEval_nativeClose(JNIEnv * env, jclass, jlong instance) +JNIEXPORT void Java_org_apache_gluten_vectorized_SimpleExpressionEval_nativeClose(JNIEnv * env, jclass, jlong instance) { LOCAL_ENGINE_JNI_METHOD_START local_engine::LocalExecutor * executor = reinterpret_cast(instance); @@ -1379,7 +1379,7 @@ JNIEXPORT void Java_io_glutenproject_vectorized_SimpleExpressionEval_nativeClose LOCAL_ENGINE_JNI_METHOD_END(env, ) } -JNIEXPORT jboolean Java_io_glutenproject_vectorized_SimpleExpressionEval_nativeHasNext(JNIEnv * env, jclass, jlong instance) +JNIEXPORT jboolean Java_org_apache_gluten_vectorized_SimpleExpressionEval_nativeHasNext(JNIEnv * env, jclass, jlong instance) { LOCAL_ENGINE_JNI_METHOD_START local_engine::LocalExecutor * executor = reinterpret_cast(instance); @@ -1387,7 +1387,7 @@ JNIEXPORT jboolean Java_io_glutenproject_vectorized_SimpleExpressionEval_nativeH LOCAL_ENGINE_JNI_METHOD_END(env, false) } -JNIEXPORT jlong Java_io_glutenproject_vectorized_SimpleExpressionEval_nativeNext(JNIEnv * env, jclass, jlong instance) +JNIEXPORT jlong Java_org_apache_gluten_vectorized_SimpleExpressionEval_nativeNext(JNIEnv * env, jclass, jlong instance) { LOCAL_ENGINE_JNI_METHOD_START local_engine::LocalExecutor * executor = reinterpret_cast(instance); @@ -1395,12 +1395,12 @@ JNIEXPORT jlong Java_io_glutenproject_vectorized_SimpleExpressionEval_nativeNext LOCAL_ENGINE_JNI_METHOD_END(env, -1) } -JNIEXPORT jlong Java_io_glutenproject_memory_alloc_CHNativeMemoryAllocator_getDefaultAllocator(JNIEnv *, jclass) +JNIEXPORT jlong Java_org_apache_gluten_memory_alloc_CHNativeMemoryAllocator_getDefaultAllocator(JNIEnv *, jclass) { return -1; } -JNIEXPORT jlong Java_io_glutenproject_memory_alloc_CHNativeMemoryAllocator_createListenableAllocator(JNIEnv * env, jclass, jobject listener) +JNIEXPORT jlong Java_org_apache_gluten_memory_alloc_CHNativeMemoryAllocator_createListenableAllocator(JNIEnv * env, jclass, jobject listener) { LOCAL_ENGINE_JNI_METHOD_START auto listener_wrapper = std::make_shared(env->NewGlobalRef(listener)); @@ -1408,14 +1408,14 @@ JNIEXPORT jlong Java_io_glutenproject_memory_alloc_CHNativeMemoryAllocator_creat LOCAL_ENGINE_JNI_METHOD_END(env, -1) } -JNIEXPORT void Java_io_glutenproject_memory_alloc_CHNativeMemoryAllocator_releaseAllocator(JNIEnv * env, jclass, jlong allocator_id) +JNIEXPORT void Java_org_apache_gluten_memory_alloc_CHNativeMemoryAllocator_releaseAllocator(JNIEnv * env, jclass, jlong allocator_id) { LOCAL_ENGINE_JNI_METHOD_START local_engine::releaseAllocator(allocator_id); LOCAL_ENGINE_JNI_METHOD_END(env, ) } -JNIEXPORT jlong Java_io_glutenproject_memory_alloc_CHNativeMemoryAllocator_bytesAllocated(JNIEnv * env, jclass, jlong allocator_id) +JNIEXPORT jlong Java_org_apache_gluten_memory_alloc_CHNativeMemoryAllocator_bytesAllocated(JNIEnv * env, jclass, jlong allocator_id) { LOCAL_ENGINE_JNI_METHOD_START return local_engine::allocatorMemoryUsage(allocator_id); diff --git a/cpp/core/CMakeLists.txt b/cpp/core/CMakeLists.txt index d2a21afb3d7b..7e3e1ca00f4a 100644 --- a/cpp/core/CMakeLists.txt +++ b/cpp/core/CMakeLists.txt @@ -46,7 +46,7 @@ set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMake" ${CMAKE_MODULE_PATH}) set(SUBSTRAIT_PROTO_SRC_DIR ${GLUTEN_HOME}/gluten-core/src/main/resources/substrait/proto) message(STATUS "Set Substrait Proto Directory in ${SUBSTRAIT_PROTO_SRC_DIR}") -set(GLUTEN_PROTO_SRC_DIR ${GLUTEN_HOME}/gluten-core/src/main/resources/io/glutenproject/proto) +set(GLUTEN_PROTO_SRC_DIR ${GLUTEN_HOME}/gluten-core/src/main/resources/org/apache/gluten/proto) message(STATUS "Set Gluten Proto Directory in ${GLUTEN_PROTO_SRC_DIR}") find_program(CCACHE_FOUND ccache) diff --git a/cpp/core/jni/JniCommon.cc b/cpp/core/jni/JniCommon.cc index 3d3ad6d4ed43..328a7b7722f9 100644 --- a/cpp/core/jni/JniCommon.cc +++ b/cpp/core/jni/JniCommon.cc @@ -38,7 +38,7 @@ jmethodID gluten::JniCommonState::runtimeAwareCtxHandle() { } void gluten::JniCommonState::initialize(JNIEnv* env) { - runtimeAwareClass_ = createGlobalClassReference(env, "Lio/glutenproject/exec/RuntimeAware;"); + runtimeAwareClass_ = createGlobalClassReference(env, "Lorg/apache/gluten/exec/RuntimeAware;"); runtimeAwareCtxHandle_ = getMethodIdOrError(env, runtimeAwareClass_, "handle", "()J"); JavaVM* vm; if (env->GetJavaVM(&vm) != JNI_OK) { diff --git a/cpp/core/jni/JniCommon.h b/cpp/core/jni/JniCommon.h index b53a1fa66e90..ad21d442c1a5 100644 --- a/cpp/core/jni/JniCommon.h +++ b/cpp/core/jni/JniCommon.h @@ -45,7 +45,7 @@ static inline void checkException(JNIEnv* env) { if (env->ExceptionCheck()) { jthrowable t = env->ExceptionOccurred(); env->ExceptionClear(); - jclass describerClass = env->FindClass("io/glutenproject/exception/JniExceptionDescriber"); + jclass describerClass = env->FindClass("org/apache/gluten/exception/JniExceptionDescriber"); jmethodID describeMethod = env->GetStaticMethodID(describerClass, "describe", "(Ljava/lang/Throwable;)Ljava/lang/String;"); std::string description = diff --git a/cpp/core/jni/JniWrapper.cc b/cpp/core/jni/JniWrapper.cc index 39080d0ca328..51e1da6529ac 100644 --- a/cpp/core/jni/JniWrapper.cc +++ b/cpp/core/jni/JniWrapper.cc @@ -236,26 +236,26 @@ jint JNI_OnLoad(JavaVM* vm, void* reserved) { byteArrayClass = createGlobalClassReferenceOrError(env, "[B"); - jniByteInputStreamClass = createGlobalClassReferenceOrError(env, "Lio/glutenproject/vectorized/JniByteInputStream;"); + jniByteInputStreamClass = createGlobalClassReferenceOrError(env, "Lorg/apache/gluten/vectorized/JniByteInputStream;"); jniByteInputStreamRead = getMethodIdOrError(env, jniByteInputStreamClass, "read", "(JJ)J"); jniByteInputStreamTell = getMethodIdOrError(env, jniByteInputStreamClass, "tell", "()J"); jniByteInputStreamClose = getMethodIdOrError(env, jniByteInputStreamClass, "close", "()V"); - splitResultClass = createGlobalClassReferenceOrError(env, "Lio/glutenproject/vectorized/GlutenSplitResult;"); + splitResultClass = createGlobalClassReferenceOrError(env, "Lorg/apache/gluten/vectorized/GlutenSplitResult;"); splitResultConstructor = getMethodIdOrError(env, splitResultClass, "", "(JJJJJJJ[J[J)V"); columnarBatchSerializeResultClass = - createGlobalClassReferenceOrError(env, "Lio/glutenproject/vectorized/ColumnarBatchSerializeResult;"); + createGlobalClassReferenceOrError(env, "Lorg/apache/gluten/vectorized/ColumnarBatchSerializeResult;"); columnarBatchSerializeResultConstructor = getMethodIdOrError(env, columnarBatchSerializeResultClass, "", "(J[B)V"); - metricsBuilderClass = createGlobalClassReferenceOrError(env, "Lio/glutenproject/metrics/Metrics;"); + metricsBuilderClass = createGlobalClassReferenceOrError(env, "Lorg/apache/gluten/metrics/Metrics;"); metricsBuilderConstructor = getMethodIdOrError( env, metricsBuilderClass, "", "([J[J[J[J[J[J[J[J[J[JJ[J[J[J[J[J[J[J[J[J[J[J[J[J[J[J[J[J[J[J[J)V"); serializedColumnarBatchIteratorClass = - createGlobalClassReferenceOrError(env, "Lio/glutenproject/vectorized/ColumnarBatchInIterator;"); + createGlobalClassReferenceOrError(env, "Lorg/apache/gluten/vectorized/ColumnarBatchInIterator;"); serializedColumnarBatchIteratorHasNext = getMethodIdOrError(env, serializedColumnarBatchIteratorClass, "hasNext", "()Z"); @@ -263,19 +263,19 @@ jint JNI_OnLoad(JavaVM* vm, void* reserved) { serializedColumnarBatchIteratorNext = getMethodIdOrError(env, serializedColumnarBatchIteratorClass, "next", "()J"); nativeColumnarToRowInfoClass = - createGlobalClassReferenceOrError(env, "Lio/glutenproject/vectorized/NativeColumnarToRowInfo;"); + createGlobalClassReferenceOrError(env, "Lorg/apache/gluten/vectorized/NativeColumnarToRowInfo;"); nativeColumnarToRowInfoConstructor = getMethodIdOrError(env, nativeColumnarToRowInfoClass, "", "([I[IJ)V"); javaReservationListenerClass = createGlobalClassReference( env, - "Lio/glutenproject/memory/nmm/" + "Lorg/apache/gluten/memory/nmm/" "ReservationListener;"); reserveMemoryMethod = getMethodIdOrError(env, javaReservationListenerClass, "reserve", "(J)J"); unreserveMemoryMethod = getMethodIdOrError(env, javaReservationListenerClass, "unreserve", "(J)J"); shuffleReaderMetricsClass = - createGlobalClassReferenceOrError(env, "Lio/glutenproject/vectorized/ShuffleReaderMetrics;"); + createGlobalClassReferenceOrError(env, "Lorg/apache/gluten/vectorized/ShuffleReaderMetrics;"); shuffleReaderMetricsSetDecompressTime = getMethodIdOrError(env, shuffleReaderMetricsClass, "setDecompressTime", "(J)V"); shuffleReaderMetricsSetIpcTime = getMethodIdOrError(env, shuffleReaderMetricsClass, "setIpcTime", "(J)V"); @@ -305,7 +305,7 @@ void JNI_OnUnload(JavaVM* vm, void* reserved) { gluten::getJniCommonState()->close(); } -JNIEXPORT jlong JNICALL Java_io_glutenproject_exec_RuntimeJniWrapper_createRuntime( // NOLINT +JNIEXPORT jlong JNICALL Java_org_apache_gluten_exec_RuntimeJniWrapper_createRuntime( // NOLINT JNIEnv* env, jclass, jstring jbackendType, @@ -319,7 +319,7 @@ JNIEXPORT jlong JNICALL Java_io_glutenproject_exec_RuntimeJniWrapper_createRunti JNI_METHOD_END(kInvalidResourceHandle) } -JNIEXPORT void JNICALL Java_io_glutenproject_exec_RuntimeJniWrapper_releaseRuntime( // NOLINT +JNIEXPORT void JNICALL Java_org_apache_gluten_exec_RuntimeJniWrapper_releaseRuntime( // NOLINT JNIEnv* env, jclass, jlong ctxHandle) { @@ -330,7 +330,7 @@ JNIEXPORT void JNICALL Java_io_glutenproject_exec_RuntimeJniWrapper_releaseRunti JNI_METHOD_END() } -JNIEXPORT jstring JNICALL Java_io_glutenproject_vectorized_PlanEvaluatorJniWrapper_nativePlanString( // NOLINT +JNIEXPORT jstring JNICALL Java_org_apache_gluten_vectorized_PlanEvaluatorJniWrapper_nativePlanString( // NOLINT JNIEnv* env, jobject wrapper, jbyteArray planArray, @@ -349,7 +349,7 @@ JNIEXPORT jstring JNICALL Java_io_glutenproject_vectorized_PlanEvaluatorJniWrapp JNI_METHOD_END(nullptr) } -JNIEXPORT void JNICALL Java_io_glutenproject_vectorized_PlanEvaluatorJniWrapper_injectWriteFilesTempPath( // NOLINT +JNIEXPORT void JNICALL Java_org_apache_gluten_vectorized_PlanEvaluatorJniWrapper_injectWriteFilesTempPath( // NOLINT JNIEnv* env, jobject wrapper, jbyteArray path) { @@ -365,7 +365,7 @@ JNIEXPORT void JNICALL Java_io_glutenproject_vectorized_PlanEvaluatorJniWrapper_ } JNIEXPORT jlong JNICALL -Java_io_glutenproject_vectorized_PlanEvaluatorJniWrapper_nativeCreateKernelWithIterator( // NOLINT +Java_org_apache_gluten_vectorized_PlanEvaluatorJniWrapper_nativeCreateKernelWithIterator( // NOLINT JNIEnv* env, jobject wrapper, jlong memoryManagerHandle, @@ -440,7 +440,7 @@ Java_io_glutenproject_vectorized_PlanEvaluatorJniWrapper_nativeCreateKernelWithI JNI_METHOD_END(kInvalidResourceHandle) } -JNIEXPORT jboolean JNICALL Java_io_glutenproject_vectorized_ColumnarBatchOutIterator_nativeHasNext( // NOLINT +JNIEXPORT jboolean JNICALL Java_org_apache_gluten_vectorized_ColumnarBatchOutIterator_nativeHasNext( // NOLINT JNIEnv* env, jobject wrapper, jlong iterHandle) { @@ -456,7 +456,7 @@ JNIEXPORT jboolean JNICALL Java_io_glutenproject_vectorized_ColumnarBatchOutIter JNI_METHOD_END(false) } -JNIEXPORT jlong JNICALL Java_io_glutenproject_vectorized_ColumnarBatchOutIterator_nativeNext( // NOLINT +JNIEXPORT jlong JNICALL Java_org_apache_gluten_vectorized_ColumnarBatchOutIterator_nativeNext( // NOLINT JNIEnv* env, jobject wrapper, jlong iterHandle) { @@ -476,7 +476,7 @@ JNIEXPORT jlong JNICALL Java_io_glutenproject_vectorized_ColumnarBatchOutIterato JNI_METHOD_END(kInvalidResourceHandle) } -JNIEXPORT jobject JNICALL Java_io_glutenproject_vectorized_ColumnarBatchOutIterator_nativeFetchMetrics( // NOLINT +JNIEXPORT jobject JNICALL Java_org_apache_gluten_vectorized_ColumnarBatchOutIterator_nativeFetchMetrics( // NOLINT JNIEnv* env, jobject wrapper, jlong iterHandle) { @@ -536,7 +536,7 @@ JNIEXPORT jobject JNICALL Java_io_glutenproject_vectorized_ColumnarBatchOutItera JNI_METHOD_END(nullptr) } -JNIEXPORT jlong JNICALL Java_io_glutenproject_vectorized_ColumnarBatchOutIterator_nativeSpill( // NOLINT +JNIEXPORT jlong JNICALL Java_org_apache_gluten_vectorized_ColumnarBatchOutIterator_nativeSpill( // NOLINT JNIEnv* env, jobject wrapper, jlong iterHandle, @@ -549,7 +549,7 @@ JNIEXPORT jlong JNICALL Java_io_glutenproject_vectorized_ColumnarBatchOutIterato JNI_METHOD_END(kInvalidResourceHandle) } -JNIEXPORT void JNICALL Java_io_glutenproject_vectorized_ColumnarBatchOutIterator_nativeClose( // NOLINT +JNIEXPORT void JNICALL Java_org_apache_gluten_vectorized_ColumnarBatchOutIterator_nativeClose( // NOLINT JNIEnv* env, jobject wrapper, jlong iterHandle) { @@ -561,7 +561,7 @@ JNIEXPORT void JNICALL Java_io_glutenproject_vectorized_ColumnarBatchOutIterator } JNIEXPORT jlong JNICALL -Java_io_glutenproject_vectorized_NativeColumnarToRowJniWrapper_nativeColumnarToRowInit( // NOLINT +Java_org_apache_gluten_vectorized_NativeColumnarToRowJniWrapper_nativeColumnarToRowInit( // NOLINT JNIEnv* env, jobject wrapper, jlong memoryManagerHandle) { @@ -575,7 +575,7 @@ Java_io_glutenproject_vectorized_NativeColumnarToRowJniWrapper_nativeColumnarToR } JNIEXPORT jobject JNICALL -Java_io_glutenproject_vectorized_NativeColumnarToRowJniWrapper_nativeColumnarToRowConvert( // NOLINT +Java_org_apache_gluten_vectorized_NativeColumnarToRowJniWrapper_nativeColumnarToRowConvert( // NOLINT JNIEnv* env, jobject wrapper, jlong batchHandle, @@ -605,7 +605,7 @@ Java_io_glutenproject_vectorized_NativeColumnarToRowJniWrapper_nativeColumnarToR JNI_METHOD_END(nullptr) } -JNIEXPORT void JNICALL Java_io_glutenproject_vectorized_NativeColumnarToRowJniWrapper_nativeClose( // NOLINT +JNIEXPORT void JNICALL Java_org_apache_gluten_vectorized_NativeColumnarToRowJniWrapper_nativeClose( // NOLINT JNIEnv* env, jobject wrapper, jlong c2rHandle) { @@ -616,7 +616,7 @@ JNIEXPORT void JNICALL Java_io_glutenproject_vectorized_NativeColumnarToRowJniWr JNI_METHOD_END() } -JNIEXPORT jlong JNICALL Java_io_glutenproject_vectorized_NativeRowToColumnarJniWrapper_init( // NOLINT +JNIEXPORT jlong JNICALL Java_org_apache_gluten_vectorized_NativeRowToColumnarJniWrapper_init( // NOLINT JNIEnv* env, jobject wrapper, jlong cSchema, @@ -631,7 +631,7 @@ JNIEXPORT jlong JNICALL Java_io_glutenproject_vectorized_NativeRowToColumnarJniW } JNIEXPORT jlong JNICALL -Java_io_glutenproject_vectorized_NativeRowToColumnarJniWrapper_nativeConvertRowToColumnar( // NOLINT +Java_org_apache_gluten_vectorized_NativeRowToColumnarJniWrapper_nativeConvertRowToColumnar( // NOLINT JNIEnv* env, jobject wrapper, jlong r2cHandle, @@ -653,7 +653,7 @@ Java_io_glutenproject_vectorized_NativeRowToColumnarJniWrapper_nativeConvertRowT JNI_METHOD_END(kInvalidResourceHandle) } -JNIEXPORT void JNICALL Java_io_glutenproject_vectorized_NativeRowToColumnarJniWrapper_close( // NOLINT +JNIEXPORT void JNICALL Java_org_apache_gluten_vectorized_NativeRowToColumnarJniWrapper_close( // NOLINT JNIEnv* env, jobject wrapper, jlong r2cHandle) { @@ -664,7 +664,7 @@ JNIEXPORT void JNICALL Java_io_glutenproject_vectorized_NativeRowToColumnarJniWr JNI_METHOD_END() } -JNIEXPORT jstring JNICALL Java_io_glutenproject_columnarbatch_ColumnarBatchJniWrapper_getType( // NOLINT +JNIEXPORT jstring JNICALL Java_org_apache_gluten_columnarbatch_ColumnarBatchJniWrapper_getType( // NOLINT JNIEnv* env, jobject wrapper, jlong batchHandle) { @@ -675,7 +675,7 @@ JNIEXPORT jstring JNICALL Java_io_glutenproject_columnarbatch_ColumnarBatchJniWr JNI_METHOD_END(nullptr) } -JNIEXPORT jlong JNICALL Java_io_glutenproject_columnarbatch_ColumnarBatchJniWrapper_numBytes( // NOLINT +JNIEXPORT jlong JNICALL Java_org_apache_gluten_columnarbatch_ColumnarBatchJniWrapper_numBytes( // NOLINT JNIEnv* env, jobject wrapper, jlong batchHandle) { @@ -686,7 +686,7 @@ JNIEXPORT jlong JNICALL Java_io_glutenproject_columnarbatch_ColumnarBatchJniWrap JNI_METHOD_END(kInvalidResourceHandle) } -JNIEXPORT jlong JNICALL Java_io_glutenproject_columnarbatch_ColumnarBatchJniWrapper_numColumns( // NOLINT +JNIEXPORT jlong JNICALL Java_org_apache_gluten_columnarbatch_ColumnarBatchJniWrapper_numColumns( // NOLINT JNIEnv* env, jobject wrapper, jlong batchHandle) { @@ -697,7 +697,7 @@ JNIEXPORT jlong JNICALL Java_io_glutenproject_columnarbatch_ColumnarBatchJniWrap JNI_METHOD_END(kInvalidResourceHandle) } -JNIEXPORT jlong JNICALL Java_io_glutenproject_columnarbatch_ColumnarBatchJniWrapper_numRows( // NOLINT +JNIEXPORT jlong JNICALL Java_org_apache_gluten_columnarbatch_ColumnarBatchJniWrapper_numRows( // NOLINT JNIEnv* env, jobject wrapper, jlong batchHandle) { @@ -708,7 +708,7 @@ JNIEXPORT jlong JNICALL Java_io_glutenproject_columnarbatch_ColumnarBatchJniWrap JNI_METHOD_END(kInvalidResourceHandle) } -JNIEXPORT jlong JNICALL Java_io_glutenproject_columnarbatch_ColumnarBatchJniWrapper_compose( // NOLINT +JNIEXPORT jlong JNICALL Java_org_apache_gluten_columnarbatch_ColumnarBatchJniWrapper_compose( // NOLINT JNIEnv* env, jobject wrapper, jlongArray batchHandles) { @@ -729,7 +729,7 @@ JNIEXPORT jlong JNICALL Java_io_glutenproject_columnarbatch_ColumnarBatchJniWrap JNI_METHOD_END(kInvalidResourceHandle) } -JNIEXPORT void JNICALL Java_io_glutenproject_columnarbatch_ColumnarBatchJniWrapper_exportToArrow( // NOLINT +JNIEXPORT void JNICALL Java_org_apache_gluten_columnarbatch_ColumnarBatchJniWrapper_exportToArrow( // NOLINT JNIEnv* env, jobject wrapper, jlong batchHandle, @@ -745,7 +745,7 @@ JNIEXPORT void JNICALL Java_io_glutenproject_columnarbatch_ColumnarBatchJniWrapp JNI_METHOD_END() } -JNIEXPORT jlong JNICALL Java_io_glutenproject_columnarbatch_ColumnarBatchJniWrapper_createWithArrowArray( // NOLINT +JNIEXPORT jlong JNICALL Java_org_apache_gluten_columnarbatch_ColumnarBatchJniWrapper_createWithArrowArray( // NOLINT JNIEnv* env, jobject wrapper, jlong cSchema, @@ -765,7 +765,7 @@ JNIEXPORT jlong JNICALL Java_io_glutenproject_columnarbatch_ColumnarBatchJniWrap JNI_METHOD_END(kInvalidResourceHandle) } -JNIEXPORT jlong JNICALL Java_io_glutenproject_columnarbatch_ColumnarBatchJniWrapper_getForEmptySchema( // NOLINT +JNIEXPORT jlong JNICALL Java_org_apache_gluten_columnarbatch_ColumnarBatchJniWrapper_getForEmptySchema( // NOLINT JNIEnv* env, jobject wrapper, jint numRows) { @@ -775,7 +775,7 @@ JNIEXPORT jlong JNICALL Java_io_glutenproject_columnarbatch_ColumnarBatchJniWrap JNI_METHOD_END(kInvalidResourceHandle) } -JNIEXPORT jlong JNICALL Java_io_glutenproject_columnarbatch_ColumnarBatchJniWrapper_select( // NOLINT +JNIEXPORT jlong JNICALL Java_org_apache_gluten_columnarbatch_ColumnarBatchJniWrapper_select( // NOLINT JNIEnv* env, jobject wrapper, jlong memoryManagerHandle, @@ -797,7 +797,7 @@ JNIEXPORT jlong JNICALL Java_io_glutenproject_columnarbatch_ColumnarBatchJniWrap JNI_METHOD_END(kInvalidResourceHandle) } -JNIEXPORT void JNICALL Java_io_glutenproject_columnarbatch_ColumnarBatchJniWrapper_close( // NOLINT +JNIEXPORT void JNICALL Java_org_apache_gluten_columnarbatch_ColumnarBatchJniWrapper_close( // NOLINT JNIEnv* env, jobject wrapper, jlong batchHandle) { @@ -808,7 +808,7 @@ JNIEXPORT void JNICALL Java_io_glutenproject_columnarbatch_ColumnarBatchJniWrapp } // Shuffle -JNIEXPORT jlong JNICALL Java_io_glutenproject_vectorized_ShuffleWriterJniWrapper_nativeMake( // NOLINT +JNIEXPORT jlong JNICALL Java_org_apache_gluten_vectorized_ShuffleWriterJniWrapper_nativeMake( // NOLINT JNIEnv* env, jobject wrapper, jstring partitioningNameJstr, @@ -924,7 +924,7 @@ JNIEXPORT jlong JNICALL Java_io_glutenproject_vectorized_ShuffleWriterJniWrapper JNI_METHOD_END(kInvalidResourceHandle) } -JNIEXPORT jlong JNICALL Java_io_glutenproject_vectorized_ShuffleWriterJniWrapper_nativeEvict( // NOLINT +JNIEXPORT jlong JNICALL Java_org_apache_gluten_vectorized_ShuffleWriterJniWrapper_nativeEvict( // NOLINT JNIEnv* env, jobject wrapper, jlong shuffleWriterHandle, @@ -945,7 +945,7 @@ JNIEXPORT jlong JNICALL Java_io_glutenproject_vectorized_ShuffleWriterJniWrapper JNI_METHOD_END(kInvalidResourceHandle) } -JNIEXPORT jlong JNICALL Java_io_glutenproject_vectorized_ShuffleWriterJniWrapper_split( // NOLINT +JNIEXPORT jlong JNICALL Java_org_apache_gluten_vectorized_ShuffleWriterJniWrapper_split( // NOLINT JNIEnv* env, jobject wrapper, jlong shuffleWriterHandle, @@ -969,7 +969,7 @@ JNIEXPORT jlong JNICALL Java_io_glutenproject_vectorized_ShuffleWriterJniWrapper JNI_METHOD_END(kInvalidResourceHandle) } -JNIEXPORT jobject JNICALL Java_io_glutenproject_vectorized_ShuffleWriterJniWrapper_stop( // NOLINT +JNIEXPORT jobject JNICALL Java_org_apache_gluten_vectorized_ShuffleWriterJniWrapper_stop( // NOLINT JNIEnv* env, jobject wrapper, jlong shuffleWriterHandle) { @@ -1011,7 +1011,7 @@ JNIEXPORT jobject JNICALL Java_io_glutenproject_vectorized_ShuffleWriterJniWrapp JNI_METHOD_END(nullptr) } -JNIEXPORT void JNICALL Java_io_glutenproject_vectorized_ShuffleWriterJniWrapper_close( // NOLINT +JNIEXPORT void JNICALL Java_org_apache_gluten_vectorized_ShuffleWriterJniWrapper_close( // NOLINT JNIEnv* env, jobject wrapper, jlong shuffleWriterHandle) { @@ -1022,7 +1022,7 @@ JNIEXPORT void JNICALL Java_io_glutenproject_vectorized_ShuffleWriterJniWrapper_ JNI_METHOD_END() } -JNIEXPORT void JNICALL Java_io_glutenproject_vectorized_OnHeapJniByteInputStream_memCopyFromHeap( // NOLINT +JNIEXPORT void JNICALL Java_org_apache_gluten_vectorized_OnHeapJniByteInputStream_memCopyFromHeap( // NOLINT JNIEnv* env, jobject, jbyteArray source, @@ -1034,7 +1034,7 @@ JNIEXPORT void JNICALL Java_io_glutenproject_vectorized_OnHeapJniByteInputStream JNI_METHOD_END() } -JNIEXPORT jlong JNICALL Java_io_glutenproject_vectorized_ShuffleReaderJniWrapper_make( // NOLINT +JNIEXPORT jlong JNICALL Java_org_apache_gluten_vectorized_ShuffleReaderJniWrapper_make( // NOLINT JNIEnv* env, jobject wrapper, jlong cSchema, @@ -1061,7 +1061,7 @@ JNIEXPORT jlong JNICALL Java_io_glutenproject_vectorized_ShuffleReaderJniWrapper JNI_METHOD_END(kInvalidResourceHandle) } -JNIEXPORT jlong JNICALL Java_io_glutenproject_vectorized_ShuffleReaderJniWrapper_readStream( // NOLINT +JNIEXPORT jlong JNICALL Java_org_apache_gluten_vectorized_ShuffleReaderJniWrapper_readStream( // NOLINT JNIEnv* env, jobject wrapper, jlong shuffleReaderHandle, @@ -1076,7 +1076,7 @@ JNIEXPORT jlong JNICALL Java_io_glutenproject_vectorized_ShuffleReaderJniWrapper JNI_METHOD_END(kInvalidResourceHandle) } -JNIEXPORT void JNICALL Java_io_glutenproject_vectorized_ShuffleReaderJniWrapper_populateMetrics( // NOLINT +JNIEXPORT void JNICALL Java_org_apache_gluten_vectorized_ShuffleReaderJniWrapper_populateMetrics( // NOLINT JNIEnv* env, jobject wrapper, jlong shuffleReaderHandle, @@ -1093,7 +1093,7 @@ JNIEXPORT void JNICALL Java_io_glutenproject_vectorized_ShuffleReaderJniWrapper_ JNI_METHOD_END() } -JNIEXPORT void JNICALL Java_io_glutenproject_vectorized_ShuffleReaderJniWrapper_close( // NOLINT +JNIEXPORT void JNICALL Java_org_apache_gluten_vectorized_ShuffleReaderJniWrapper_close( // NOLINT JNIEnv* env, jobject wrapper, jlong shuffleReaderHandle) { @@ -1106,7 +1106,7 @@ JNIEXPORT void JNICALL Java_io_glutenproject_vectorized_ShuffleReaderJniWrapper_ JNI_METHOD_END() } -JNIEXPORT jlong JNICALL Java_io_glutenproject_datasource_DatasourceJniWrapper_nativeInitDatasource( // NOLINT +JNIEXPORT jlong JNICALL Java_org_apache_gluten_datasource_DatasourceJniWrapper_nativeInitDatasource( // NOLINT JNIEnv* env, jobject wrapper, jstring filePath, @@ -1137,7 +1137,7 @@ JNIEXPORT jlong JNICALL Java_io_glutenproject_datasource_DatasourceJniWrapper_na JNI_METHOD_END(kInvalidResourceHandle) } -JNIEXPORT void JNICALL Java_io_glutenproject_datasource_DatasourceJniWrapper_inspectSchema( // NOLINT +JNIEXPORT void JNICALL Java_org_apache_gluten_datasource_DatasourceJniWrapper_inspectSchema( // NOLINT JNIEnv* env, jobject wrapper, jlong dsHandle, @@ -1150,7 +1150,7 @@ JNIEXPORT void JNICALL Java_io_glutenproject_datasource_DatasourceJniWrapper_ins JNI_METHOD_END() } -JNIEXPORT void JNICALL Java_io_glutenproject_datasource_DatasourceJniWrapper_close( // NOLINT +JNIEXPORT void JNICALL Java_org_apache_gluten_datasource_DatasourceJniWrapper_close( // NOLINT JNIEnv* env, jobject wrapper, jlong dsHandle) { @@ -1163,7 +1163,7 @@ JNIEXPORT void JNICALL Java_io_glutenproject_datasource_DatasourceJniWrapper_clo JNI_METHOD_END() } -JNIEXPORT void JNICALL Java_io_glutenproject_datasource_DatasourceJniWrapper_write( // NOLINT +JNIEXPORT void JNICALL Java_org_apache_gluten_datasource_DatasourceJniWrapper_write( // NOLINT JNIEnv* env, jobject wrapper, jlong dsHandle, @@ -1183,7 +1183,7 @@ JNIEXPORT void JNICALL Java_io_glutenproject_datasource_DatasourceJniWrapper_wri } JNIEXPORT jobject JNICALL -Java_io_glutenproject_datasource_DatasourceJniWrapper_splitBlockByPartitionAndBucket( // NOLINT +Java_org_apache_gluten_datasource_DatasourceJniWrapper_splitBlockByPartitionAndBucket( // NOLINT JNIEnv* env, jobject wrapper, jlong batchHandle, @@ -1228,7 +1228,7 @@ Java_io_glutenproject_datasource_DatasourceJniWrapper_splitBlockByPartitionAndBu JNI_METHOD_END(nullptr) } -JNIEXPORT jlong JNICALL Java_io_glutenproject_memory_alloc_NativeMemoryAllocator_getAllocator( // NOLINT +JNIEXPORT jlong JNICALL Java_org_apache_gluten_memory_alloc_NativeMemoryAllocator_getAllocator( // NOLINT JNIEnv* env, jclass, jstring jTypeName) { @@ -1246,7 +1246,7 @@ JNIEXPORT jlong JNICALL Java_io_glutenproject_memory_alloc_NativeMemoryAllocator JNI_METHOD_END(kInvalidResourceHandle) } -JNIEXPORT void JNICALL Java_io_glutenproject_memory_alloc_NativeMemoryAllocator_releaseAllocator( // NOLINT +JNIEXPORT void JNICALL Java_org_apache_gluten_memory_alloc_NativeMemoryAllocator_releaseAllocator( // NOLINT JNIEnv* env, jclass, jlong allocatorId) { @@ -1255,7 +1255,7 @@ JNIEXPORT void JNICALL Java_io_glutenproject_memory_alloc_NativeMemoryAllocator_ JNI_METHOD_END() } -JNIEXPORT jlong JNICALL Java_io_glutenproject_memory_alloc_NativeMemoryAllocator_bytesAllocated( // NOLINT +JNIEXPORT jlong JNICALL Java_org_apache_gluten_memory_alloc_NativeMemoryAllocator_bytesAllocated( // NOLINT JNIEnv* env, jclass, jlong allocatorId) { @@ -1268,7 +1268,7 @@ JNIEXPORT jlong JNICALL Java_io_glutenproject_memory_alloc_NativeMemoryAllocator JNI_METHOD_END(kInvalidResourceHandle) } -JNIEXPORT jlong JNICALL Java_io_glutenproject_memory_nmm_NativeMemoryManager_create( // NOLINT +JNIEXPORT jlong JNICALL Java_org_apache_gluten_memory_nmm_NativeMemoryManager_create( // NOLINT JNIEnv* env, jclass, jstring jbackendType, @@ -1303,7 +1303,7 @@ JNIEXPORT jlong JNICALL Java_io_glutenproject_memory_nmm_NativeMemoryManager_cre JNI_METHOD_END(kInvalidResourceHandle) } -JNIEXPORT jbyteArray JNICALL Java_io_glutenproject_memory_nmm_NativeMemoryManager_collectMemoryUsage( // NOLINT +JNIEXPORT jbyteArray JNICALL Java_org_apache_gluten_memory_nmm_NativeMemoryManager_collectMemoryUsage( // NOLINT JNIEnv* env, jclass, jlong memoryManagerHandle) { @@ -1322,7 +1322,7 @@ JNIEXPORT jbyteArray JNICALL Java_io_glutenproject_memory_nmm_NativeMemoryManage JNI_METHOD_END(nullptr) } -JNIEXPORT jlong JNICALL Java_io_glutenproject_memory_nmm_NativeMemoryManager_shrink( // NOLINT +JNIEXPORT jlong JNICALL Java_org_apache_gluten_memory_nmm_NativeMemoryManager_shrink( // NOLINT JNIEnv* env, jclass, jlong memoryManagerHandle, @@ -1333,7 +1333,7 @@ JNIEXPORT jlong JNICALL Java_io_glutenproject_memory_nmm_NativeMemoryManager_shr JNI_METHOD_END(kInvalidResourceHandle) } -JNIEXPORT void JNICALL Java_io_glutenproject_memory_nmm_NativeMemoryManager_hold( // NOLINT +JNIEXPORT void JNICALL Java_org_apache_gluten_memory_nmm_NativeMemoryManager_hold( // NOLINT JNIEnv* env, jclass, jlong memoryManagerHandle) { @@ -1343,7 +1343,7 @@ JNIEXPORT void JNICALL Java_io_glutenproject_memory_nmm_NativeMemoryManager_hold JNI_METHOD_END() } -JNIEXPORT void JNICALL Java_io_glutenproject_memory_nmm_NativeMemoryManager_release( // NOLINT +JNIEXPORT void JNICALL Java_org_apache_gluten_memory_nmm_NativeMemoryManager_release( // NOLINT JNIEnv* env, jclass, jlong memoryManagerHandle) { @@ -1353,7 +1353,7 @@ JNIEXPORT void JNICALL Java_io_glutenproject_memory_nmm_NativeMemoryManager_rele JNI_METHOD_END() } -JNIEXPORT jobject JNICALL Java_io_glutenproject_vectorized_ColumnarBatchSerializerJniWrapper_serialize( // NOLINT +JNIEXPORT jobject JNICALL Java_org_apache_gluten_vectorized_ColumnarBatchSerializerJniWrapper_serialize( // NOLINT JNIEnv* env, jobject wrapper, jlongArray handles, @@ -1388,7 +1388,7 @@ JNIEXPORT jobject JNICALL Java_io_glutenproject_vectorized_ColumnarBatchSerializ JNI_METHOD_END(nullptr) } -JNIEXPORT jlong JNICALL Java_io_glutenproject_vectorized_ColumnarBatchSerializerJniWrapper_init( // NOLINT +JNIEXPORT jlong JNICALL Java_org_apache_gluten_vectorized_ColumnarBatchSerializerJniWrapper_init( // NOLINT JNIEnv* env, jobject wrapper, jlong cSchema, @@ -1403,7 +1403,7 @@ JNIEXPORT jlong JNICALL Java_io_glutenproject_vectorized_ColumnarBatchSerializer JNI_METHOD_END(kInvalidResourceHandle) } -JNIEXPORT jlong JNICALL Java_io_glutenproject_vectorized_ColumnarBatchSerializerJniWrapper_deserialize( // NOLINT +JNIEXPORT jlong JNICALL Java_org_apache_gluten_vectorized_ColumnarBatchSerializerJniWrapper_deserialize( // NOLINT JNIEnv* env, jobject wrapper, jlong serializerHandle, @@ -1420,7 +1420,7 @@ JNIEXPORT jlong JNICALL Java_io_glutenproject_vectorized_ColumnarBatchSerializer JNI_METHOD_END(kInvalidResourceHandle) } -JNIEXPORT void JNICALL Java_io_glutenproject_vectorized_ColumnarBatchSerializerJniWrapper_close( // NOLINT +JNIEXPORT void JNICALL Java_org_apache_gluten_vectorized_ColumnarBatchSerializerJniWrapper_close( // NOLINT JNIEnv* env, jobject wrapper, jlong serializerHandle) { diff --git a/cpp/velox/jni/JniFileSystem.cc b/cpp/velox/jni/JniFileSystem.cc index db7eaa1d7cf9..8bf791c234e8 100644 --- a/cpp/velox/jni/JniFileSystem.cc +++ b/cpp/velox/jni/JniFileSystem.cc @@ -399,18 +399,21 @@ void gluten::initVeloxJniFileSystem(JNIEnv* env) { } // classes - jniFileSystemClass = createGlobalClassReferenceOrError(env, "Lio/glutenproject/fs/JniFilesystem;"); - jniReadFileClass = createGlobalClassReferenceOrError(env, "Lio/glutenproject/fs/JniFilesystem$ReadFile;"); - jniWriteFileClass = createGlobalClassReferenceOrError(env, "Lio/glutenproject/fs/JniFilesystem$WriteFile;"); + jniFileSystemClass = createGlobalClassReferenceOrError(env, "Lorg/apache/gluten/fs/JniFilesystem;"); + jniReadFileClass = createGlobalClassReferenceOrError(env, "Lorg/apache/gluten/fs/JniFilesystem$ReadFile;"); + jniWriteFileClass = createGlobalClassReferenceOrError(env, "Lorg/apache/gluten/fs/JniFilesystem$WriteFile;"); // methods in JniFilesystem jniGetFileSystem = - getStaticMethodIdOrError(env, jniFileSystemClass, "getFileSystem", "()Lio/glutenproject/fs/JniFilesystem;"); + getStaticMethodIdOrError(env, jniFileSystemClass, "getFileSystem", "()Lorg/apache/gluten/fs/JniFilesystem;"); jniIsCapableForNewFile = getStaticMethodIdOrError(env, jniFileSystemClass, "isCapableForNewFile", "(J)Z"); jniFileSystemOpenFileForRead = getMethodIdOrError( - env, jniFileSystemClass, "openFileForRead", "(Ljava/lang/String;)Lio/glutenproject/fs/JniFilesystem$ReadFile;"); + env, jniFileSystemClass, "openFileForRead", "(Ljava/lang/String;)Lorg/apache/gluten/fs/JniFilesystem$ReadFile;"); jniFileSystemOpenFileForWrite = getMethodIdOrError( - env, jniFileSystemClass, "openFileForWrite", "(Ljava/lang/String;)Lio/glutenproject/fs/JniFilesystem$WriteFile;"); + env, + jniFileSystemClass, + "openFileForWrite", + "(Ljava/lang/String;)Lorg/apache/gluten/fs/JniFilesystem$WriteFile;"); jniFileSystemRemove = getMethodIdOrError(env, jniFileSystemClass, "remove", "(Ljava/lang/String;)V"); jniFileSystemRename = getMethodIdOrError(env, jniFileSystemClass, "rename", "(Ljava/lang/String;Ljava/lang/String;Z)V"); diff --git a/cpp/velox/jni/VeloxJniWrapper.cc b/cpp/velox/jni/VeloxJniWrapper.cc index e73fe7eb0149..2ce6b7526e6a 100644 --- a/cpp/velox/jni/VeloxJniWrapper.cc +++ b/cpp/velox/jni/VeloxJniWrapper.cc @@ -65,7 +65,7 @@ void JNI_OnUnload(JavaVM* vm, void*) { google::ShutdownGoogleLogging(); } -JNIEXPORT void JNICALL Java_io_glutenproject_init_NativeBackendInitializer_initialize( // NOLINT +JNIEXPORT void JNICALL Java_org_apache_gluten_init_NativeBackendInitializer_initialize( // NOLINT JNIEnv* env, jclass, jbyteArray conf) { @@ -76,7 +76,7 @@ JNIEXPORT void JNICALL Java_io_glutenproject_init_NativeBackendInitializer_initi JNI_METHOD_END() } -JNIEXPORT void JNICALL Java_io_glutenproject_udf_UdfJniWrapper_getFunctionSignatures( // NOLINT +JNIEXPORT void JNICALL Java_org_apache_gluten_udf_UdfJniWrapper_getFunctionSignatures( // NOLINT JNIEnv* env, jclass) { JNI_METHOD_START @@ -85,7 +85,7 @@ JNIEXPORT void JNICALL Java_io_glutenproject_udf_UdfJniWrapper_getFunctionSignat } JNIEXPORT jobject JNICALL -Java_io_glutenproject_vectorized_PlanEvaluatorJniWrapper_nativeValidateWithFailureReason( // NOLINT +Java_org_apache_gluten_vectorized_PlanEvaluatorJniWrapper_nativeValidateWithFailureReason( // NOLINT JNIEnv* env, jobject wrapper, jbyteArray planArray) { @@ -117,7 +117,7 @@ Java_io_glutenproject_vectorized_PlanEvaluatorJniWrapper_nativeValidateWithFailu velox::core::ExecCtx execCtx(pool, &queryCtx); gluten::SubstraitToVeloxPlanValidator planValidator(pool, &execCtx); - jclass infoCls = env->FindClass("Lio/glutenproject/validate/NativePlanValidationInfo;"); + jclass infoCls = env->FindClass("Lorg/apache/gluten/validate/NativePlanValidationInfo;"); if (infoCls == nullptr) { std::string errorMessage = "Unable to CreateGlobalClassReferenceOrError for NativePlanValidationInfo"; throw gluten::GlutenException(errorMessage); diff --git a/cpp/velox/symbols.map b/cpp/velox/symbols.map index 553a779e81fa..42518c387986 100644 --- a/cpp/velox/symbols.map +++ b/cpp/velox/symbols.map @@ -5,8 +5,8 @@ *facebook::velox::*; }; - Java_io_gluten*; + Java_org_apache_gluten*; local: # Hide symbols of static dependencies *; -}; \ No newline at end of file +}; diff --git a/docs/Configuration.md b/docs/Configuration.md index e1f8a8fccf1b..b98cb1d82507 100644 --- a/docs/Configuration.md +++ b/docs/Configuration.md @@ -19,7 +19,7 @@ You can add these configurations into spark-defaults.conf to enable or disable t | spark.memory.offHeap.size | To set up how much memory to be used for Java OffHeap.
Please notice Gluten Plugin will leverage this setting to allocate memory space for native usage even offHeap is disabled.
The value is based on your system and it is recommended to set it larger if you are facing Out of Memory issue in Gluten Plugin | 30G | | spark.sql.sources.useV1SourceList | Choose to use V1 source | avro | | spark.sql.join.preferSortMergeJoin | To turn off preferSortMergeJoin in Spark | false | -| spark.plugins | To load Gluten's components by Spark's plug-in loader | io.glutenproject.GlutenPlugin | +| spark.plugins | To load Gluten's components by Spark's plug-in loader | org.apache.gluten.GlutenPlugin | | spark.shuffle.manager | To turn on Gluten Columnar Shuffle Plugin | org.apache.spark.shuffle.sort.ColumnarShuffleManager | | spark.gluten.enabled | Enable Gluten, default is true. Just an experimental property. Recommend to enable/disable Gluten through the setting for `spark.plugins`. | true | | spark.gluten.sql.advanced.cbo.enabled | Experimental: Enables Gluten's advanced CBO features during physical planning. E.g, More efficient fallback strategy, etc. The option can be turned on and off individually despite vanilla Spark's CBO settings. Note, Gluten's query optimizer may still adopt a subset of its advanced CBO capabilities even this option is off. Enabling it would cause Gluten consider using CBO for optimization more aggressively. Note, this feature is still in development and may not bring performance profits. | false | @@ -93,7 +93,7 @@ The following configurations are related to Velox settings. ``` ##### Columnar Process Configuration -spark.plugins io.glutenproject.GlutenPlugin +spark.plugins org.apache.gluten.GlutenPlugin spark.shuffle.manager org.apache.spark.shuffle.sort.ColumnarShuffleManager spark.driver.extraClassPath ${GLUTEN_HOME}/package/target/gluten-XXX.jar spark.executor.extraClassPath ${GLUTEN_HOME}/package/target/gluten-XXX.jar diff --git a/docs/developers/HowTo.md b/docs/developers/HowTo.md index 338b49b984aa..ff036a060b06 100644 --- a/docs/developers/HowTo.md +++ b/docs/developers/HowTo.md @@ -56,7 +56,7 @@ ${GLUTEN_HOME}/dev/builddeps-veloxbe.sh --build_tests=ON --build_benchmarks=ON - cd ${GLUTEN_HOME} mvn clean package -Pspark-3.2 -Pbackends-velox -Prss mvn test -Pspark-3.2 -Pbackends-velox -Prss -pl backends-velox \ --am -DtagsToInclude="io.glutenproject.tags.GenerateExample" \ +-am -DtagsToInclude="org.apache.gluten.tags.GenerateExample" \ -Dtest=none -DfailIfNoTests=false \ -Dexec.skip ``` diff --git a/docs/developers/MicroBenchmarks.md b/docs/developers/MicroBenchmarks.md index 62a2f09e9d98..f6c95d593337 100644 --- a/docs/developers/MicroBenchmarks.md +++ b/docs/developers/MicroBenchmarks.md @@ -38,7 +38,7 @@ cd /path/to/gluten/ # Run test to generate input data files. If you are using spark 3.3, replace -Pspark-3.2 with -Pspark-3.3 mvn test -Pspark-3.2 -Pbackends-velox -Prss -pl backends-velox -am \ --DtagsToInclude="io.glutenproject.tags.GenerateExample" -Dtest=none -DfailIfNoTests=false -Dexec.skip +-DtagsToInclude="org.apache.gluten.tags.GenerateExample" -Dtest=none -DfailIfNoTests=false -Dexec.skip ``` The generated example files are placed in gluten/backends-velox: diff --git a/docs/developers/NewToGluten.md b/docs/developers/NewToGluten.md index 1160d72c89d6..49ba43bcc9b3 100644 --- a/docs/developers/NewToGluten.md +++ b/docs/developers/NewToGluten.md @@ -380,7 +380,7 @@ We can run gluten + velox on clean machine by one command (supported OS: Ubuntu2 ``` spark-shell --name run_gluten \ --master yarn --deploy-mode client \ - --conf spark.plugins=io.glutenproject.GlutenPlugin \ + --conf spark.plugins=org.apache.gluten.GlutenPlugin \ --conf spark.memory.offHeap.enabled=true \ --conf spark.memory.offHeap.size=20g \ --jars https://github.com/apache/incubator-gluten/releases/download/v1.1.1/gluten-velox-bundle-spark3.2_2.12-1.1.1.jar \ diff --git a/docs/get-started/ClickHouse.md b/docs/get-started/ClickHouse.md index 4167af2eed2b..4352a99e55f9 100644 --- a/docs/get-started/ClickHouse.md +++ b/docs/get-started/ClickHouse.md @@ -190,7 +190,7 @@ cd spark-3.2.2-bin-hadoop2.7 --conf spark.sql.columnVector.offheap.enabled=true \ --conf spark.memory.offHeap.enabled=true \ --conf spark.memory.offHeap.size=6442450944 \ - --conf spark.plugins=io.glutenproject.GlutenPlugin \ + --conf spark.plugins=org.apache.gluten.GlutenPlugin \ --conf spark.gluten.sql.columnar.columnarToRow=true \ --conf spark.executorEnv.LD_PRELOAD=/path_to_clickhouse_library/libch.so\ --conf spark.gluten.sql.columnar.libpath=/path_to_clickhouse_library/libch.so \ @@ -371,7 +371,7 @@ cd spark-3.2.2-bin-hadoop2.7 --conf spark.sql.columnVector.offheap.enabled=true \ --conf spark.memory.offHeap.enabled=true \ --conf spark.memory.offHeap.size=6442450944 \ - --conf spark.plugins=io.glutenproject.GlutenPlugin \ + --conf spark.plugins=org.apache.gluten.GlutenPlugin \ --conf spark.gluten.sql.columnar.columnarToRow=true \ --conf spark.executorEnv.LD_PRELOAD=/path_to_clickhouse_library/libch.so\ --conf spark.gluten.sql.columnar.libpath=/path_to_clickhouse_library/libch.so \ @@ -454,7 +454,7 @@ $spark_cmd \ --conf spark.gluten.sql.columnar.forceShuffledHashJoin=true \ --conf spark.gluten.sql.columnar.backend.ch.runtime_config.hdfs.libhdfs3_conf=$hdfs_conf \ --conf spark.gluten.sql.columnar.backend.ch.runtime_config.logger.level=debug \ - --conf spark.plugins=io.glutenproject.GlutenPlugin \ + --conf spark.plugins=org.apache.gluten.GlutenPlugin \ --conf spark.executorEnv.LD_PRELOAD=$LD_PRELOAD \ --conf spark.hadoop.input.connect.timeout=600000 \ --conf spark.hadoop.input.read.timeout=600000 \ @@ -563,7 +563,7 @@ cd spark-3.2.2-bin-hadoop2.7 --conf spark.memory.offHeap.size=42949672960 \ --conf spark.serializer=org.apache.spark.serializer.JavaSerializer \ --conf spark.sql.sources.ignoreDataLocality=true \ - --conf spark.plugins=io.glutenproject.GlutenPlugin \ + --conf spark.plugins=org.apache.gluten.GlutenPlugin \ --conf spark.gluten.sql.columnar.columnarToRow=true \ --conf spark.gluten.sql.columnar.libpath=/path_to_clickhouse_library/libch.so \ --conf spark.gluten.sql.columnar.iterator=true \ diff --git a/docs/get-started/Velox.md b/docs/get-started/Velox.md index d6508f369d08..92381a74cde7 100644 --- a/docs/get-started/Velox.md +++ b/docs/get-started/Velox.md @@ -762,7 +762,7 @@ Below script shows an example about how to run the testing, you should modify th export GLUTEN_JAR = /PATH/TO/GLUTEN/package/target/ cat tpch_parquet.scala | spark-shell --name tpch_powertest_velox \ --master yarn --deploy-mode client \ - --conf spark.plugins=io.glutenproject.GlutenPlugin \ + --conf spark.plugins=org.apache.gluten.GlutenPlugin \ --conf spark.driver.extraClassPath=${GLUTEN_JAR} \ --conf spark.executor.extraClassPath=${GLUTEN_JAR} \ --conf spark.memory.offHeap.enabled=true \ diff --git a/ep/build-clickhouse/src/resources/conf/gluten.properties b/ep/build-clickhouse/src/resources/conf/gluten.properties index e3070e24d45a..ff613e821258 100644 --- a/ep/build-clickhouse/src/resources/conf/gluten.properties +++ b/ep/build-clickhouse/src/resources/conf/gluten.properties @@ -10,7 +10,7 @@ spark.locality.wait.process=0 spark.sql.columnVector.offheap.enabled=true spark.memory.offHeap.enabled=true spark.memory.offHeap.size=6442450944 -spark.plugins=io.glutenproject.GlutenPlugin +spark.plugins=org.apache.gluten.GlutenPlugin spark.gluten.sql.columnar.columnarToRow=true spark.gluten.sql.columnar.iterator=true spark.gluten.sql.columnar.loadarrow=false diff --git a/gluten-cbo/common/pom.xml b/gluten-cbo/common/pom.xml index 7888ced36bb4..a5a023a860d7 100644 --- a/gluten-cbo/common/pom.xml +++ b/gluten-cbo/common/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - io.glutenproject + org.apache.gluten gluten-cbo 1.2.0-SNAPSHOT diff --git a/gluten-cbo/common/src/main/scala/io/glutenproject/cbo/Cbo.scala b/gluten-cbo/common/src/main/scala/org/apache/gluten/cbo/Cbo.scala similarity index 98% rename from gluten-cbo/common/src/main/scala/io/glutenproject/cbo/Cbo.scala rename to gluten-cbo/common/src/main/scala/org/apache/gluten/cbo/Cbo.scala index 0a723dbf3193..372e390cf2ff 100644 --- a/gluten-cbo/common/src/main/scala/io/glutenproject/cbo/Cbo.scala +++ b/gluten-cbo/common/src/main/scala/org/apache/gluten/cbo/Cbo.scala @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.cbo +package org.apache.gluten.cbo -import io.glutenproject.cbo.property.PropertySet -import io.glutenproject.cbo.rule.CboRule +import org.apache.gluten.cbo.property.PropertySet +import org.apache.gluten.cbo.rule.CboRule import scala.collection.mutable diff --git a/gluten-cbo/common/src/main/scala/io/glutenproject/cbo/CboCluster.scala b/gluten-cbo/common/src/main/scala/org/apache/gluten/cbo/CboCluster.scala similarity index 95% rename from gluten-cbo/common/src/main/scala/io/glutenproject/cbo/CboCluster.scala rename to gluten-cbo/common/src/main/scala/org/apache/gluten/cbo/CboCluster.scala index d55aa3513f5a..4a3d318ccf16 100644 --- a/gluten-cbo/common/src/main/scala/io/glutenproject/cbo/CboCluster.scala +++ b/gluten-cbo/common/src/main/scala/org/apache/gluten/cbo/CboCluster.scala @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.cbo +package org.apache.gluten.cbo -import io.glutenproject.cbo.memo.MemoTable -import io.glutenproject.cbo.property.PropertySet +import org.apache.gluten.cbo.memo.MemoTable +import org.apache.gluten.cbo.property.PropertySet import scala.collection.mutable diff --git a/gluten-cbo/common/src/main/scala/io/glutenproject/cbo/CboConfig.scala b/gluten-cbo/common/src/main/scala/org/apache/gluten/cbo/CboConfig.scala similarity index 93% rename from gluten-cbo/common/src/main/scala/io/glutenproject/cbo/CboConfig.scala rename to gluten-cbo/common/src/main/scala/org/apache/gluten/cbo/CboConfig.scala index cc6fe3792319..25775ae45dd6 100644 --- a/gluten-cbo/common/src/main/scala/io/glutenproject/cbo/CboConfig.scala +++ b/gluten-cbo/common/src/main/scala/org/apache/gluten/cbo/CboConfig.scala @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.cbo +package org.apache.gluten.cbo -import io.glutenproject.cbo.CboConfig._ +import org.apache.gluten.cbo.CboConfig._ case class CboConfig( plannerType: PlannerType = PlannerType.Dp diff --git a/gluten-cbo/common/src/main/scala/io/glutenproject/cbo/CboExplain.scala b/gluten-cbo/common/src/main/scala/org/apache/gluten/cbo/CboExplain.scala similarity index 96% rename from gluten-cbo/common/src/main/scala/io/glutenproject/cbo/CboExplain.scala rename to gluten-cbo/common/src/main/scala/org/apache/gluten/cbo/CboExplain.scala index 8a2f908789a9..763ad1ddcc9f 100644 --- a/gluten-cbo/common/src/main/scala/io/glutenproject/cbo/CboExplain.scala +++ b/gluten-cbo/common/src/main/scala/org/apache/gluten/cbo/CboExplain.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.cbo +package org.apache.gluten.cbo trait CboExplain[T <: AnyRef] { def describeNode(node: T): String diff --git a/gluten-cbo/common/src/main/scala/io/glutenproject/cbo/CboGroup.scala b/gluten-cbo/common/src/main/scala/org/apache/gluten/cbo/CboGroup.scala similarity index 93% rename from gluten-cbo/common/src/main/scala/io/glutenproject/cbo/CboGroup.scala rename to gluten-cbo/common/src/main/scala/org/apache/gluten/cbo/CboGroup.scala index c83475da93a2..300798e58207 100644 --- a/gluten-cbo/common/src/main/scala/io/glutenproject/cbo/CboGroup.scala +++ b/gluten-cbo/common/src/main/scala/org/apache/gluten/cbo/CboGroup.scala @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.cbo +package org.apache.gluten.cbo -import io.glutenproject.cbo.memo.MemoStore -import io.glutenproject.cbo.property.PropertySet +import org.apache.gluten.cbo.memo.MemoStore +import org.apache.gluten.cbo.property.PropertySet trait CboGroup[T <: AnyRef] { def id(): Int diff --git a/gluten-cbo/common/src/main/scala/io/glutenproject/cbo/CboNode.scala b/gluten-cbo/common/src/main/scala/org/apache/gluten/cbo/CboNode.scala similarity index 98% rename from gluten-cbo/common/src/main/scala/io/glutenproject/cbo/CboNode.scala rename to gluten-cbo/common/src/main/scala/org/apache/gluten/cbo/CboNode.scala index e5d4985c2590..90bfb5edba4f 100644 --- a/gluten-cbo/common/src/main/scala/io/glutenproject/cbo/CboNode.scala +++ b/gluten-cbo/common/src/main/scala/org/apache/gluten/cbo/CboNode.scala @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.cbo +package org.apache.gluten.cbo -import io.glutenproject.cbo.property.PropertySet +import org.apache.gluten.cbo.property.PropertySet trait CboNode[T <: AnyRef] { def cbo(): Cbo[T] diff --git a/gluten-cbo/common/src/main/scala/io/glutenproject/cbo/CboPlanner.scala b/gluten-cbo/common/src/main/scala/org/apache/gluten/cbo/CboPlanner.scala similarity index 92% rename from gluten-cbo/common/src/main/scala/io/glutenproject/cbo/CboPlanner.scala rename to gluten-cbo/common/src/main/scala/org/apache/gluten/cbo/CboPlanner.scala index fe2edb2b4639..04d7e33745c0 100644 --- a/gluten-cbo/common/src/main/scala/io/glutenproject/cbo/CboPlanner.scala +++ b/gluten-cbo/common/src/main/scala/org/apache/gluten/cbo/CboPlanner.scala @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.cbo - -import io.glutenproject.cbo.CboConfig.PlannerType -import io.glutenproject.cbo.dp.DpPlanner -import io.glutenproject.cbo.exaustive.ExhaustivePlanner -import io.glutenproject.cbo.memo.MemoState -import io.glutenproject.cbo.path.CboPath -import io.glutenproject.cbo.property.PropertySet -import io.glutenproject.cbo.vis.GraphvizVisualizer +package org.apache.gluten.cbo + +import org.apache.gluten.cbo.CboConfig.PlannerType +import org.apache.gluten.cbo.dp.DpPlanner +import org.apache.gluten.cbo.exaustive.ExhaustivePlanner +import org.apache.gluten.cbo.memo.MemoState +import org.apache.gluten.cbo.path.CboPath +import org.apache.gluten.cbo.property.PropertySet +import org.apache.gluten.cbo.vis.GraphvizVisualizer import scala.collection.mutable diff --git a/gluten-cbo/common/src/main/scala/io/glutenproject/cbo/CostModel.scala b/gluten-cbo/common/src/main/scala/org/apache/gluten/cbo/CostModel.scala similarity index 96% rename from gluten-cbo/common/src/main/scala/io/glutenproject/cbo/CostModel.scala rename to gluten-cbo/common/src/main/scala/org/apache/gluten/cbo/CostModel.scala index 74d7c8c66376..fc209f25352a 100644 --- a/gluten-cbo/common/src/main/scala/io/glutenproject/cbo/CostModel.scala +++ b/gluten-cbo/common/src/main/scala/org/apache/gluten/cbo/CostModel.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.cbo +package org.apache.gluten.cbo trait Cost diff --git a/gluten-cbo/common/src/main/scala/io/glutenproject/cbo/MetadataModel.scala b/gluten-cbo/common/src/main/scala/org/apache/gluten/cbo/MetadataModel.scala similarity index 97% rename from gluten-cbo/common/src/main/scala/io/glutenproject/cbo/MetadataModel.scala rename to gluten-cbo/common/src/main/scala/org/apache/gluten/cbo/MetadataModel.scala index aea5cb154b12..3bf7498663f5 100644 --- a/gluten-cbo/common/src/main/scala/io/glutenproject/cbo/MetadataModel.scala +++ b/gluten-cbo/common/src/main/scala/org/apache/gluten/cbo/MetadataModel.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.cbo +package org.apache.gluten.cbo /** * Metadata defines the common traits among nodes in one single cluster. E.g. Schema, statistics. diff --git a/gluten-cbo/common/src/main/scala/io/glutenproject/cbo/PlanModel.scala b/gluten-cbo/common/src/main/scala/org/apache/gluten/cbo/PlanModel.scala similarity index 93% rename from gluten-cbo/common/src/main/scala/io/glutenproject/cbo/PlanModel.scala rename to gluten-cbo/common/src/main/scala/org/apache/gluten/cbo/PlanModel.scala index e51a644df525..9388ee8b67cd 100644 --- a/gluten-cbo/common/src/main/scala/io/glutenproject/cbo/PlanModel.scala +++ b/gluten-cbo/common/src/main/scala/org/apache/gluten/cbo/PlanModel.scala @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.cbo +package org.apache.gluten.cbo -import io.glutenproject.cbo.property.PropertySet +import org.apache.gluten.cbo.property.PropertySet trait PlanModel[T <: AnyRef] { // Trivial tree operations. diff --git a/gluten-cbo/common/src/main/scala/io/glutenproject/cbo/PropertyModel.scala b/gluten-cbo/common/src/main/scala/org/apache/gluten/cbo/PropertyModel.scala similarity index 95% rename from gluten-cbo/common/src/main/scala/io/glutenproject/cbo/PropertyModel.scala rename to gluten-cbo/common/src/main/scala/org/apache/gluten/cbo/PropertyModel.scala index a260d8dd41cc..a89cb1286116 100644 --- a/gluten-cbo/common/src/main/scala/io/glutenproject/cbo/PropertyModel.scala +++ b/gluten-cbo/common/src/main/scala/org/apache/gluten/cbo/PropertyModel.scala @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.cbo +package org.apache.gluten.cbo -import io.glutenproject.cbo.rule.CboRule +import org.apache.gluten.cbo.rule.CboRule // TODO Use class tags to restrict runtime user-defined class types. diff --git a/gluten-cbo/common/src/main/scala/io/glutenproject/cbo/best/BestFinder.scala b/gluten-cbo/common/src/main/scala/org/apache/gluten/cbo/best/BestFinder.scala similarity index 91% rename from gluten-cbo/common/src/main/scala/io/glutenproject/cbo/best/BestFinder.scala rename to gluten-cbo/common/src/main/scala/org/apache/gluten/cbo/best/BestFinder.scala index c7e39c538409..bb8abf2839bc 100644 --- a/gluten-cbo/common/src/main/scala/io/glutenproject/cbo/best/BestFinder.scala +++ b/gluten-cbo/common/src/main/scala/org/apache/gluten/cbo/best/BestFinder.scala @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.cbo.best +package org.apache.gluten.cbo.best -import io.glutenproject.cbo._ -import io.glutenproject.cbo.Best.KnownCostPath -import io.glutenproject.cbo.dp.DpGroupAlgo -import io.glutenproject.cbo.memo.MemoState +import org.apache.gluten.cbo._ +import org.apache.gluten.cbo.Best.KnownCostPath +import org.apache.gluten.cbo.dp.DpGroupAlgo +import org.apache.gluten.cbo.memo.MemoState import scala.collection.mutable diff --git a/gluten-cbo/common/src/main/scala/io/glutenproject/cbo/best/GroupBasedBestFinder.scala b/gluten-cbo/common/src/main/scala/org/apache/gluten/cbo/best/GroupBasedBestFinder.scala similarity index 92% rename from gluten-cbo/common/src/main/scala/io/glutenproject/cbo/best/GroupBasedBestFinder.scala rename to gluten-cbo/common/src/main/scala/org/apache/gluten/cbo/best/GroupBasedBestFinder.scala index 1666d93fbd32..a2bd60532de6 100644 --- a/gluten-cbo/common/src/main/scala/io/glutenproject/cbo/best/GroupBasedBestFinder.scala +++ b/gluten-cbo/common/src/main/scala/org/apache/gluten/cbo/best/GroupBasedBestFinder.scala @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.cbo.best +package org.apache.gluten.cbo.best -import io.glutenproject.cbo._ -import io.glutenproject.cbo.Best.{BestNotFoundException, KnownCostPath} -import io.glutenproject.cbo.best.BestFinder.KnownCostGroup -import io.glutenproject.cbo.dp.{DpGroupAlgo, DpGroupAlgoDef} -import io.glutenproject.cbo.memo.MemoState -import io.glutenproject.cbo.path.{CboPath, PathKeySet} +import org.apache.gluten.cbo._ +import org.apache.gluten.cbo.Best.{BestNotFoundException, KnownCostPath} +import org.apache.gluten.cbo.best.BestFinder.KnownCostGroup +import org.apache.gluten.cbo.dp.{DpGroupAlgo, DpGroupAlgoDef} +import org.apache.gluten.cbo.memo.MemoState +import org.apache.gluten.cbo.path.{CboPath, PathKeySet} // The best path's each sub-path is considered optimal in its own group. private class GroupBasedBestFinder[T <: AnyRef]( diff --git a/gluten-cbo/common/src/main/scala/io/glutenproject/cbo/dp/DpClusterAlgo.scala b/gluten-cbo/common/src/main/scala/org/apache/gluten/cbo/dp/DpClusterAlgo.scala similarity index 95% rename from gluten-cbo/common/src/main/scala/io/glutenproject/cbo/dp/DpClusterAlgo.scala rename to gluten-cbo/common/src/main/scala/org/apache/gluten/cbo/dp/DpClusterAlgo.scala index fa4d3d06c98a..2403dadf0bde 100644 --- a/gluten-cbo/common/src/main/scala/io/glutenproject/cbo/dp/DpClusterAlgo.scala +++ b/gluten-cbo/common/src/main/scala/org/apache/gluten/cbo/dp/DpClusterAlgo.scala @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.cbo.dp +package org.apache.gluten.cbo.dp -import io.glutenproject.cbo.{CboClusterKey, InClusterNode} -import io.glutenproject.cbo.dp.DpZipperAlgo.Solution -import io.glutenproject.cbo.memo.MemoTable +import org.apache.gluten.cbo.{CboClusterKey, InClusterNode} +import org.apache.gluten.cbo.dp.DpZipperAlgo.Solution +import org.apache.gluten.cbo.memo.MemoTable // Dynamic programming algorithm to solve problem against a single CBO cluster that can be // broken down to sub problems for sub clusters. diff --git a/gluten-cbo/common/src/main/scala/io/glutenproject/cbo/dp/DpGroupAlgo.scala b/gluten-cbo/common/src/main/scala/org/apache/gluten/cbo/dp/DpGroupAlgo.scala similarity index 95% rename from gluten-cbo/common/src/main/scala/io/glutenproject/cbo/dp/DpGroupAlgo.scala rename to gluten-cbo/common/src/main/scala/org/apache/gluten/cbo/dp/DpGroupAlgo.scala index e85bc1c63d3c..7711fd67535d 100644 --- a/gluten-cbo/common/src/main/scala/io/glutenproject/cbo/dp/DpGroupAlgo.scala +++ b/gluten-cbo/common/src/main/scala/org/apache/gluten/cbo/dp/DpGroupAlgo.scala @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.cbo.dp +package org.apache.gluten.cbo.dp -import io.glutenproject.cbo.{CboGroup, InGroupNode} -import io.glutenproject.cbo.dp.DpZipperAlgo.Solution -import io.glutenproject.cbo.memo.MemoState +import org.apache.gluten.cbo.{CboGroup, InGroupNode} +import org.apache.gluten.cbo.dp.DpZipperAlgo.Solution +import org.apache.gluten.cbo.memo.MemoState // Dynamic programming algorithm to solve problem against a single CBO group that can be // broken down to sub problems for sub groups. diff --git a/gluten-cbo/common/src/main/scala/io/glutenproject/cbo/dp/DpPlanner.scala b/gluten-cbo/common/src/main/scala/org/apache/gluten/cbo/dp/DpPlanner.scala similarity index 93% rename from gluten-cbo/common/src/main/scala/io/glutenproject/cbo/dp/DpPlanner.scala rename to gluten-cbo/common/src/main/scala/org/apache/gluten/cbo/dp/DpPlanner.scala index 86eba84ee9cf..827c185f476d 100644 --- a/gluten-cbo/common/src/main/scala/io/glutenproject/cbo/dp/DpPlanner.scala +++ b/gluten-cbo/common/src/main/scala/org/apache/gluten/cbo/dp/DpPlanner.scala @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.cbo.dp - -import io.glutenproject.cbo._ -import io.glutenproject.cbo.Best.KnownCostPath -import io.glutenproject.cbo.best.BestFinder -import io.glutenproject.cbo.dp.DpZipperAlgo.Adjustment.Panel -import io.glutenproject.cbo.memo.{Memo, MemoTable} -import io.glutenproject.cbo.path.{CboPath, PathFinder} -import io.glutenproject.cbo.property.PropertySet -import io.glutenproject.cbo.rule.{EnforcerRuleSet, RuleApplier, Shape} +package org.apache.gluten.cbo.dp + +import org.apache.gluten.cbo._ +import org.apache.gluten.cbo.Best.KnownCostPath +import org.apache.gluten.cbo.best.BestFinder +import org.apache.gluten.cbo.dp.DpZipperAlgo.Adjustment.Panel +import org.apache.gluten.cbo.memo.{Memo, MemoTable} +import org.apache.gluten.cbo.path.{CboPath, PathFinder} +import org.apache.gluten.cbo.property.PropertySet +import org.apache.gluten.cbo.rule.{EnforcerRuleSet, RuleApplier, Shape} // TODO: Branch and bound pruning. private class DpPlanner[T <: AnyRef] private ( diff --git a/gluten-cbo/common/src/main/scala/io/glutenproject/cbo/dp/DpZipperAlgo.scala b/gluten-cbo/common/src/main/scala/org/apache/gluten/cbo/dp/DpZipperAlgo.scala similarity index 99% rename from gluten-cbo/common/src/main/scala/io/glutenproject/cbo/dp/DpZipperAlgo.scala rename to gluten-cbo/common/src/main/scala/org/apache/gluten/cbo/dp/DpZipperAlgo.scala index b1b0cd23111f..e8ac2b6d1261 100644 --- a/gluten-cbo/common/src/main/scala/io/glutenproject/cbo/dp/DpZipperAlgo.scala +++ b/gluten-cbo/common/src/main/scala/org/apache/gluten/cbo/dp/DpZipperAlgo.scala @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.cbo.dp +package org.apache.gluten.cbo.dp -import io.glutenproject.cbo.util.CycleDetector +import org.apache.gluten.cbo.util.CycleDetector import scala.collection.mutable diff --git a/gluten-cbo/common/src/main/scala/io/glutenproject/cbo/exaustive/ExhaustivePlanner.scala b/gluten-cbo/common/src/main/scala/org/apache/gluten/cbo/exaustive/ExhaustivePlanner.scala similarity index 90% rename from gluten-cbo/common/src/main/scala/io/glutenproject/cbo/exaustive/ExhaustivePlanner.scala rename to gluten-cbo/common/src/main/scala/org/apache/gluten/cbo/exaustive/ExhaustivePlanner.scala index 29666fb40ed1..47e0f062a8d9 100644 --- a/gluten-cbo/common/src/main/scala/io/glutenproject/cbo/exaustive/ExhaustivePlanner.scala +++ b/gluten-cbo/common/src/main/scala/org/apache/gluten/cbo/exaustive/ExhaustivePlanner.scala @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.cbo.exaustive +package org.apache.gluten.cbo.exaustive -import io.glutenproject.cbo._ -import io.glutenproject.cbo.Best.KnownCostPath -import io.glutenproject.cbo.best.BestFinder -import io.glutenproject.cbo.exaustive.ExhaustivePlanner.ExhaustiveExplorer -import io.glutenproject.cbo.memo.{Memo, MemoState} -import io.glutenproject.cbo.path._ -import io.glutenproject.cbo.property.PropertySet -import io.glutenproject.cbo.rule.{EnforcerRuleSet, RuleApplier, Shape} +import org.apache.gluten.cbo._ +import org.apache.gluten.cbo.Best.KnownCostPath +import org.apache.gluten.cbo.best.BestFinder +import org.apache.gluten.cbo.exaustive.ExhaustivePlanner.ExhaustiveExplorer +import org.apache.gluten.cbo.memo.{Memo, MemoState} +import org.apache.gluten.cbo.path._ +import org.apache.gluten.cbo.property.PropertySet +import org.apache.gluten.cbo.rule.{EnforcerRuleSet, RuleApplier, Shape} private class ExhaustivePlanner[T <: AnyRef] private ( cbo: Cbo[T], diff --git a/gluten-cbo/common/src/main/scala/io/glutenproject/cbo/memo/ForwardMemoTable.scala b/gluten-cbo/common/src/main/scala/org/apache/gluten/cbo/memo/ForwardMemoTable.scala similarity index 96% rename from gluten-cbo/common/src/main/scala/io/glutenproject/cbo/memo/ForwardMemoTable.scala rename to gluten-cbo/common/src/main/scala/org/apache/gluten/cbo/memo/ForwardMemoTable.scala index a5186150ab8a..cd6f4cfe7422 100644 --- a/gluten-cbo/common/src/main/scala/io/glutenproject/cbo/memo/ForwardMemoTable.scala +++ b/gluten-cbo/common/src/main/scala/org/apache/gluten/cbo/memo/ForwardMemoTable.scala @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.cbo.memo +package org.apache.gluten.cbo.memo -import io.glutenproject.cbo._ -import io.glutenproject.cbo.CboCluster.MutableCboCluster -import io.glutenproject.cbo.memo.MemoTable.Probe -import io.glutenproject.cbo.property.PropertySet -import io.glutenproject.cbo.util.IndexDisjointSet +import org.apache.gluten.cbo._ +import org.apache.gluten.cbo.CboCluster.MutableCboCluster +import org.apache.gluten.cbo.memo.MemoTable.Probe +import org.apache.gluten.cbo.property.PropertySet +import org.apache.gluten.cbo.util.IndexDisjointSet import scala.collection.mutable diff --git a/gluten-cbo/common/src/main/scala/io/glutenproject/cbo/memo/Memo.scala b/gluten-cbo/common/src/main/scala/org/apache/gluten/cbo/memo/Memo.scala similarity index 96% rename from gluten-cbo/common/src/main/scala/io/glutenproject/cbo/memo/Memo.scala rename to gluten-cbo/common/src/main/scala/org/apache/gluten/cbo/memo/Memo.scala index 8907ab84a4fe..620f2015b686 100644 --- a/gluten-cbo/common/src/main/scala/io/glutenproject/cbo/memo/Memo.scala +++ b/gluten-cbo/common/src/main/scala/org/apache/gluten/cbo/memo/Memo.scala @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.cbo.memo +package org.apache.gluten.cbo.memo -import io.glutenproject.cbo._ -import io.glutenproject.cbo.CboCluster.ImmutableCboCluster -import io.glutenproject.cbo.property.PropertySet -import io.glutenproject.cbo.util.CanonicalNodeMap -import io.glutenproject.cbo.vis.GraphvizVisualizer +import org.apache.gluten.cbo._ +import org.apache.gluten.cbo.CboCluster.ImmutableCboCluster +import org.apache.gluten.cbo.property.PropertySet +import org.apache.gluten.cbo.util.CanonicalNodeMap +import org.apache.gluten.cbo.vis.GraphvizVisualizer trait MemoLike[T <: AnyRef] { def memorize(node: T, constraintSet: PropertySet[T]): CboGroup[T] diff --git a/gluten-cbo/common/src/main/scala/io/glutenproject/cbo/memo/MemoTable.scala b/gluten-cbo/common/src/main/scala/org/apache/gluten/cbo/memo/MemoTable.scala similarity index 93% rename from gluten-cbo/common/src/main/scala/io/glutenproject/cbo/memo/MemoTable.scala rename to gluten-cbo/common/src/main/scala/org/apache/gluten/cbo/memo/MemoTable.scala index 894abfba2c94..127e313a7913 100644 --- a/gluten-cbo/common/src/main/scala/io/glutenproject/cbo/memo/MemoTable.scala +++ b/gluten-cbo/common/src/main/scala/org/apache/gluten/cbo/memo/MemoTable.scala @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.cbo.memo +package org.apache.gluten.cbo.memo -import io.glutenproject.cbo._ -import io.glutenproject.cbo.CboCluster.ImmutableCboCluster -import io.glutenproject.cbo.property.PropertySet +import org.apache.gluten.cbo._ +import org.apache.gluten.cbo.CboCluster.ImmutableCboCluster +import org.apache.gluten.cbo.property.PropertySet sealed trait MemoTable[T <: AnyRef] extends MemoStore[T] { import MemoTable._ diff --git a/gluten-cbo/common/src/main/scala/io/glutenproject/cbo/path/CboPath.scala b/gluten-cbo/common/src/main/scala/org/apache/gluten/cbo/path/CboPath.scala similarity index 98% rename from gluten-cbo/common/src/main/scala/io/glutenproject/cbo/path/CboPath.scala rename to gluten-cbo/common/src/main/scala/org/apache/gluten/cbo/path/CboPath.scala index 5b623bd4a5ee..36bce1ecacbb 100644 --- a/gluten-cbo/common/src/main/scala/io/glutenproject/cbo/path/CboPath.scala +++ b/gluten-cbo/common/src/main/scala/org/apache/gluten/cbo/path/CboPath.scala @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.cbo.path +package org.apache.gluten.cbo.path -import io.glutenproject.cbo._ -import io.glutenproject.cbo.memo.MemoStore +import org.apache.gluten.cbo._ +import org.apache.gluten.cbo.memo.MemoStore trait CboPath[T <: AnyRef] { def cbo(): Cbo[T] diff --git a/gluten-cbo/common/src/main/scala/io/glutenproject/cbo/path/OutputFilter.scala b/gluten-cbo/common/src/main/scala/org/apache/gluten/cbo/path/OutputFilter.scala similarity index 94% rename from gluten-cbo/common/src/main/scala/io/glutenproject/cbo/path/OutputFilter.scala rename to gluten-cbo/common/src/main/scala/org/apache/gluten/cbo/path/OutputFilter.scala index f6bc818c2b27..2937e9d8c90e 100644 --- a/gluten-cbo/common/src/main/scala/io/glutenproject/cbo/path/OutputFilter.scala +++ b/gluten-cbo/common/src/main/scala/org/apache/gluten/cbo/path/OutputFilter.scala @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.cbo.path +package org.apache.gluten.cbo.path -import io.glutenproject.cbo.{CanonicalNode, GroupNode} -import io.glutenproject.cbo.path.FilterWizard.FilterAction -import io.glutenproject.cbo.path.OutputWizard.OutputAction -import io.glutenproject.cbo.util.CycleDetector +import org.apache.gluten.cbo.{CanonicalNode, GroupNode} +import org.apache.gluten.cbo.path.FilterWizard.FilterAction +import org.apache.gluten.cbo.path.OutputWizard.OutputAction +import org.apache.gluten.cbo.util.CycleDetector trait FilterWizard[T <: AnyRef] { import FilterWizard._ diff --git a/gluten-cbo/common/src/main/scala/io/glutenproject/cbo/path/OutputWizard.scala b/gluten-cbo/common/src/main/scala/org/apache/gluten/cbo/path/OutputWizard.scala similarity index 98% rename from gluten-cbo/common/src/main/scala/io/glutenproject/cbo/path/OutputWizard.scala rename to gluten-cbo/common/src/main/scala/org/apache/gluten/cbo/path/OutputWizard.scala index 5ac2bb881111..cc6310c509d9 100644 --- a/gluten-cbo/common/src/main/scala/io/glutenproject/cbo/path/OutputWizard.scala +++ b/gluten-cbo/common/src/main/scala/org/apache/gluten/cbo/path/OutputWizard.scala @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.cbo.path +package org.apache.gluten.cbo.path -import io.glutenproject.cbo.{CanonicalNode, Cbo, CboGroup, GroupNode} -import io.glutenproject.cbo.path.OutputWizard.{OutputAction, PathDrain} +import org.apache.gluten.cbo.{CanonicalNode, Cbo, CboGroup, GroupNode} +import org.apache.gluten.cbo.path.OutputWizard.{OutputAction, PathDrain} import scala.collection.{mutable, Seq} diff --git a/gluten-cbo/common/src/main/scala/io/glutenproject/cbo/path/PathFinder.scala b/gluten-cbo/common/src/main/scala/org/apache/gluten/cbo/path/PathFinder.scala similarity index 97% rename from gluten-cbo/common/src/main/scala/io/glutenproject/cbo/path/PathFinder.scala rename to gluten-cbo/common/src/main/scala/org/apache/gluten/cbo/path/PathFinder.scala index 86494dacfc92..2eeb6f65944b 100644 --- a/gluten-cbo/common/src/main/scala/io/glutenproject/cbo/path/PathFinder.scala +++ b/gluten-cbo/common/src/main/scala/org/apache/gluten/cbo/path/PathFinder.scala @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.cbo.path +package org.apache.gluten.cbo.path -import io.glutenproject.cbo.{CanonicalNode, Cbo, GroupNode} -import io.glutenproject.cbo.memo.MemoStore +import org.apache.gluten.cbo.{CanonicalNode, Cbo, GroupNode} +import org.apache.gluten.cbo.memo.MemoStore import scala.collection.mutable diff --git a/gluten-cbo/common/src/main/scala/io/glutenproject/cbo/path/PathKey.scala b/gluten-cbo/common/src/main/scala/org/apache/gluten/cbo/path/PathKey.scala similarity index 98% rename from gluten-cbo/common/src/main/scala/io/glutenproject/cbo/path/PathKey.scala rename to gluten-cbo/common/src/main/scala/org/apache/gluten/cbo/path/PathKey.scala index bde983b3acf3..082431aeabf5 100644 --- a/gluten-cbo/common/src/main/scala/io/glutenproject/cbo/path/PathKey.scala +++ b/gluten-cbo/common/src/main/scala/org/apache/gluten/cbo/path/PathKey.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.cbo.path +package org.apache.gluten.cbo.path import java.util.concurrent.atomic.AtomicLong diff --git a/gluten-cbo/common/src/main/scala/io/glutenproject/cbo/path/PathMask.scala b/gluten-cbo/common/src/main/scala/org/apache/gluten/cbo/path/PathMask.scala similarity index 99% rename from gluten-cbo/common/src/main/scala/io/glutenproject/cbo/path/PathMask.scala rename to gluten-cbo/common/src/main/scala/org/apache/gluten/cbo/path/PathMask.scala index cff370d2724d..ebbedbee34c1 100644 --- a/gluten-cbo/common/src/main/scala/io/glutenproject/cbo/path/PathMask.scala +++ b/gluten-cbo/common/src/main/scala/org/apache/gluten/cbo/path/PathMask.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.cbo.path +package org.apache.gluten.cbo.path import scala.collection.mutable diff --git a/gluten-cbo/common/src/main/scala/io/glutenproject/cbo/path/Pattern.scala b/gluten-cbo/common/src/main/scala/org/apache/gluten/cbo/path/Pattern.scala similarity index 97% rename from gluten-cbo/common/src/main/scala/io/glutenproject/cbo/path/Pattern.scala rename to gluten-cbo/common/src/main/scala/org/apache/gluten/cbo/path/Pattern.scala index 772ea5dcb101..ad84441f3cb0 100644 --- a/gluten-cbo/common/src/main/scala/io/glutenproject/cbo/path/Pattern.scala +++ b/gluten-cbo/common/src/main/scala/org/apache/gluten/cbo/path/Pattern.scala @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.cbo.path +package org.apache.gluten.cbo.path -import io.glutenproject.cbo.CanonicalNode -import io.glutenproject.cbo.path.CboPath.PathNode +import org.apache.gluten.cbo.CanonicalNode +import org.apache.gluten.cbo.path.CboPath.PathNode trait Pattern[T <: AnyRef] { def matches(path: CboPath[T], depth: Int): Boolean diff --git a/gluten-cbo/common/src/main/scala/io/glutenproject/cbo/property/PropertySet.scala b/gluten-cbo/common/src/main/scala/org/apache/gluten/cbo/property/PropertySet.scala similarity index 96% rename from gluten-cbo/common/src/main/scala/io/glutenproject/cbo/property/PropertySet.scala rename to gluten-cbo/common/src/main/scala/org/apache/gluten/cbo/property/PropertySet.scala index 6acb038090ec..8d7c297ea193 100644 --- a/gluten-cbo/common/src/main/scala/io/glutenproject/cbo/property/PropertySet.scala +++ b/gluten-cbo/common/src/main/scala/org/apache/gluten/cbo/property/PropertySet.scala @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.cbo.property +package org.apache.gluten.cbo.property -import io.glutenproject.cbo.{Property, PropertyDef} +import org.apache.gluten.cbo.{Property, PropertyDef} trait PropertySet[T <: AnyRef] { def get[P <: Property[T]](property: PropertyDef[T, P]): P diff --git a/gluten-cbo/common/src/main/scala/io/glutenproject/cbo/rule/CboRule.scala b/gluten-cbo/common/src/main/scala/org/apache/gluten/cbo/rule/CboRule.scala similarity index 97% rename from gluten-cbo/common/src/main/scala/io/glutenproject/cbo/rule/CboRule.scala rename to gluten-cbo/common/src/main/scala/org/apache/gluten/cbo/rule/CboRule.scala index 0ccd7aee576b..1ddb783f1959 100644 --- a/gluten-cbo/common/src/main/scala/io/glutenproject/cbo/rule/CboRule.scala +++ b/gluten-cbo/common/src/main/scala/org/apache/gluten/cbo/rule/CboRule.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.cbo.rule +package org.apache.gluten.cbo.rule trait CboRule[T <: AnyRef] { def shift(node: T): Iterable[T] diff --git a/gluten-cbo/common/src/main/scala/io/glutenproject/cbo/rule/EnforcerRule.scala b/gluten-cbo/common/src/main/scala/org/apache/gluten/cbo/rule/EnforcerRule.scala similarity index 93% rename from gluten-cbo/common/src/main/scala/io/glutenproject/cbo/rule/EnforcerRule.scala rename to gluten-cbo/common/src/main/scala/org/apache/gluten/cbo/rule/EnforcerRule.scala index 17e7eef38da3..370469d5731d 100644 --- a/gluten-cbo/common/src/main/scala/io/glutenproject/cbo/rule/EnforcerRule.scala +++ b/gluten-cbo/common/src/main/scala/org/apache/gluten/cbo/rule/EnforcerRule.scala @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.cbo.rule +package org.apache.gluten.cbo.rule -import io.glutenproject.cbo.{Cbo, EnforcerRuleFactory, Property, PropertyDef} -import io.glutenproject.cbo.memo.Closure -import io.glutenproject.cbo.property.PropertySet +import org.apache.gluten.cbo.{Cbo, EnforcerRuleFactory, Property, PropertyDef} +import org.apache.gluten.cbo.memo.Closure +import org.apache.gluten.cbo.property.PropertySet import scala.collection.mutable diff --git a/gluten-cbo/common/src/main/scala/io/glutenproject/cbo/rule/RuleApplier.scala b/gluten-cbo/common/src/main/scala/org/apache/gluten/cbo/rule/RuleApplier.scala similarity index 94% rename from gluten-cbo/common/src/main/scala/io/glutenproject/cbo/rule/RuleApplier.scala rename to gluten-cbo/common/src/main/scala/org/apache/gluten/cbo/rule/RuleApplier.scala index 4df1deac41a7..64e214b3e5af 100644 --- a/gluten-cbo/common/src/main/scala/io/glutenproject/cbo/rule/RuleApplier.scala +++ b/gluten-cbo/common/src/main/scala/org/apache/gluten/cbo/rule/RuleApplier.scala @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.cbo.rule +package org.apache.gluten.cbo.rule -import io.glutenproject.cbo._ -import io.glutenproject.cbo.memo.Closure -import io.glutenproject.cbo.path.CboPath -import io.glutenproject.cbo.util.CanonicalNodeMap +import org.apache.gluten.cbo._ +import org.apache.gluten.cbo.memo.Closure +import org.apache.gluten.cbo.path.CboPath +import org.apache.gluten.cbo.util.CanonicalNodeMap import scala.collection.mutable diff --git a/gluten-cbo/common/src/main/scala/io/glutenproject/cbo/rule/Shape.scala b/gluten-cbo/common/src/main/scala/org/apache/gluten/cbo/rule/Shape.scala similarity index 94% rename from gluten-cbo/common/src/main/scala/io/glutenproject/cbo/rule/Shape.scala rename to gluten-cbo/common/src/main/scala/org/apache/gluten/cbo/rule/Shape.scala index fc1bd3118159..c0077b3bdde4 100644 --- a/gluten-cbo/common/src/main/scala/io/glutenproject/cbo/rule/Shape.scala +++ b/gluten-cbo/common/src/main/scala/org/apache/gluten/cbo/rule/Shape.scala @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.cbo.rule +package org.apache.gluten.cbo.rule -import io.glutenproject.cbo.path.{CboPath, OutputWizard, OutputWizards} +import org.apache.gluten.cbo.path.{CboPath, OutputWizard, OutputWizards} // Shape is an abstraction for all inputs the rule can accept. // Shape can be specification on pattern, height, or mask diff --git a/gluten-cbo/common/src/main/scala/io/glutenproject/cbo/util/CycleDetector.scala b/gluten-cbo/common/src/main/scala/org/apache/gluten/cbo/util/CycleDetector.scala similarity index 98% rename from gluten-cbo/common/src/main/scala/io/glutenproject/cbo/util/CycleDetector.scala rename to gluten-cbo/common/src/main/scala/org/apache/gluten/cbo/util/CycleDetector.scala index add1265d49af..429c1bc598ac 100644 --- a/gluten-cbo/common/src/main/scala/io/glutenproject/cbo/util/CycleDetector.scala +++ b/gluten-cbo/common/src/main/scala/org/apache/gluten/cbo/util/CycleDetector.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.cbo.util +package org.apache.gluten.cbo.util trait CycleDetector[T <: Any] { def append(obj: T): CycleDetector[T] diff --git a/gluten-cbo/common/src/main/scala/io/glutenproject/cbo/util/IndexDisjointSet.scala b/gluten-cbo/common/src/main/scala/org/apache/gluten/cbo/util/IndexDisjointSet.scala similarity index 98% rename from gluten-cbo/common/src/main/scala/io/glutenproject/cbo/util/IndexDisjointSet.scala rename to gluten-cbo/common/src/main/scala/org/apache/gluten/cbo/util/IndexDisjointSet.scala index 64e83d0dc741..387a0ff395ad 100644 --- a/gluten-cbo/common/src/main/scala/io/glutenproject/cbo/util/IndexDisjointSet.scala +++ b/gluten-cbo/common/src/main/scala/org/apache/gluten/cbo/util/IndexDisjointSet.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.cbo.util +package org.apache.gluten.cbo.util import scala.collection.mutable diff --git a/gluten-cbo/common/src/main/scala/io/glutenproject/cbo/util/NodeMap.scala b/gluten-cbo/common/src/main/scala/org/apache/gluten/cbo/util/NodeMap.scala similarity index 95% rename from gluten-cbo/common/src/main/scala/io/glutenproject/cbo/util/NodeMap.scala rename to gluten-cbo/common/src/main/scala/org/apache/gluten/cbo/util/NodeMap.scala index 8e8e483e6c7d..1b9e1d816730 100644 --- a/gluten-cbo/common/src/main/scala/io/glutenproject/cbo/util/NodeMap.scala +++ b/gluten-cbo/common/src/main/scala/org/apache/gluten/cbo/util/NodeMap.scala @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.cbo.util +package org.apache.gluten.cbo.util -import io.glutenproject.cbo.{CanonicalNode, Cbo} +import org.apache.gluten.cbo.{CanonicalNode, Cbo} import scala.collection.mutable diff --git a/gluten-cbo/common/src/main/scala/io/glutenproject/cbo/vis/GraphvizVisualizer.scala b/gluten-cbo/common/src/main/scala/org/apache/gluten/cbo/vis/GraphvizVisualizer.scala similarity index 97% rename from gluten-cbo/common/src/main/scala/io/glutenproject/cbo/vis/GraphvizVisualizer.scala rename to gluten-cbo/common/src/main/scala/org/apache/gluten/cbo/vis/GraphvizVisualizer.scala index bdaf70e5da09..940c986107fb 100644 --- a/gluten-cbo/common/src/main/scala/io/glutenproject/cbo/vis/GraphvizVisualizer.scala +++ b/gluten-cbo/common/src/main/scala/org/apache/gluten/cbo/vis/GraphvizVisualizer.scala @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.cbo.vis +package org.apache.gluten.cbo.vis -import io.glutenproject.cbo._ -import io.glutenproject.cbo.best.BestFinder -import io.glutenproject.cbo.memo.MemoState -import io.glutenproject.cbo.path._ +import org.apache.gluten.cbo._ +import org.apache.gluten.cbo.best.BestFinder +import org.apache.gluten.cbo.memo.MemoState +import org.apache.gluten.cbo.path._ import scala.collection.mutable diff --git a/gluten-cbo/common/src/test/scala/io/glutenproject/cbo/CboMetadataSuite.scala b/gluten-cbo/common/src/test/scala/org/apache/gluten/cbo/CboMetadataSuite.scala similarity index 97% rename from gluten-cbo/common/src/test/scala/io/glutenproject/cbo/CboMetadataSuite.scala rename to gluten-cbo/common/src/test/scala/org/apache/gluten/cbo/CboMetadataSuite.scala index 8d2d49b44379..ce5d20b93e16 100644 --- a/gluten-cbo/common/src/test/scala/io/glutenproject/cbo/CboMetadataSuite.scala +++ b/gluten-cbo/common/src/test/scala/org/apache/gluten/cbo/CboMetadataSuite.scala @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.cbo +package org.apache.gluten.cbo -import io.glutenproject.cbo.CboConfig.PlannerType -import io.glutenproject.cbo.CboSuiteBase._ -import io.glutenproject.cbo.rule.{CboRule, Shape, Shapes} +import org.apache.gluten.cbo.CboConfig.PlannerType +import org.apache.gluten.cbo.CboSuiteBase._ +import org.apache.gluten.cbo.rule.{CboRule, Shape, Shapes} import org.scalatest.funsuite.AnyFunSuite diff --git a/gluten-cbo/common/src/test/scala/io/glutenproject/cbo/CboOperationSuite.scala b/gluten-cbo/common/src/test/scala/org/apache/gluten/cbo/CboOperationSuite.scala similarity index 98% rename from gluten-cbo/common/src/test/scala/io/glutenproject/cbo/CboOperationSuite.scala rename to gluten-cbo/common/src/test/scala/org/apache/gluten/cbo/CboOperationSuite.scala index 497b88e3bffc..4f53e067a6ed 100644 --- a/gluten-cbo/common/src/test/scala/io/glutenproject/cbo/CboOperationSuite.scala +++ b/gluten-cbo/common/src/test/scala/org/apache/gluten/cbo/CboOperationSuite.scala @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.cbo +package org.apache.gluten.cbo -import io.glutenproject.cbo.CboSuiteBase._ -import io.glutenproject.cbo.path.CboPath -import io.glutenproject.cbo.property.PropertySet -import io.glutenproject.cbo.rule.{CboRule, Shape, Shapes} +import org.apache.gluten.cbo.CboSuiteBase._ +import org.apache.gluten.cbo.path.CboPath +import org.apache.gluten.cbo.property.PropertySet +import org.apache.gluten.cbo.rule.{CboRule, Shape, Shapes} import org.scalatest.funsuite.AnyFunSuite diff --git a/gluten-cbo/common/src/test/scala/io/glutenproject/cbo/CboPropertySuite.scala b/gluten-cbo/common/src/test/scala/org/apache/gluten/cbo/CboPropertySuite.scala similarity index 98% rename from gluten-cbo/common/src/test/scala/io/glutenproject/cbo/CboPropertySuite.scala rename to gluten-cbo/common/src/test/scala/org/apache/gluten/cbo/CboPropertySuite.scala index 4f25ff2d2292..d9e4adc6b3c2 100644 --- a/gluten-cbo/common/src/test/scala/io/glutenproject/cbo/CboPropertySuite.scala +++ b/gluten-cbo/common/src/test/scala/org/apache/gluten/cbo/CboPropertySuite.scala @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.cbo +package org.apache.gluten.cbo -import io.glutenproject.cbo.Best.BestNotFoundException -import io.glutenproject.cbo.CboConfig.PlannerType -import io.glutenproject.cbo.CboSuiteBase._ -import io.glutenproject.cbo.property.PropertySet -import io.glutenproject.cbo.rule.{CboRule, Shape, Shapes} +import org.apache.gluten.cbo.Best.BestNotFoundException +import org.apache.gluten.cbo.CboConfig.PlannerType +import org.apache.gluten.cbo.CboSuiteBase._ +import org.apache.gluten.cbo.property.PropertySet +import org.apache.gluten.cbo.rule.{CboRule, Shape, Shapes} import org.scalatest.funsuite.AnyFunSuite diff --git a/gluten-cbo/common/src/test/scala/io/glutenproject/cbo/CboSuite.scala b/gluten-cbo/common/src/test/scala/org/apache/gluten/cbo/CboSuite.scala similarity index 98% rename from gluten-cbo/common/src/test/scala/io/glutenproject/cbo/CboSuite.scala rename to gluten-cbo/common/src/test/scala/org/apache/gluten/cbo/CboSuite.scala index b1a9fc11db88..a981d9942e98 100644 --- a/gluten-cbo/common/src/test/scala/io/glutenproject/cbo/CboSuite.scala +++ b/gluten-cbo/common/src/test/scala/org/apache/gluten/cbo/CboSuite.scala @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.cbo +package org.apache.gluten.cbo -import io.glutenproject.cbo.CboConfig.PlannerType -import io.glutenproject.cbo.CboSuiteBase._ -import io.glutenproject.cbo.memo.Memo -import io.glutenproject.cbo.rule.{CboRule, Shape, Shapes} +import org.apache.gluten.cbo.CboConfig.PlannerType +import org.apache.gluten.cbo.CboSuiteBase._ +import org.apache.gluten.cbo.memo.Memo +import org.apache.gluten.cbo.rule.{CboRule, Shape, Shapes} import org.scalatest.funsuite.AnyFunSuite diff --git a/gluten-cbo/common/src/test/scala/io/glutenproject/cbo/CboSuiteBase.scala b/gluten-cbo/common/src/test/scala/org/apache/gluten/cbo/CboSuiteBase.scala similarity index 97% rename from gluten-cbo/common/src/test/scala/io/glutenproject/cbo/CboSuiteBase.scala rename to gluten-cbo/common/src/test/scala/org/apache/gluten/cbo/CboSuiteBase.scala index 292e97da0b8f..12276daa898b 100644 --- a/gluten-cbo/common/src/test/scala/io/glutenproject/cbo/CboSuiteBase.scala +++ b/gluten-cbo/common/src/test/scala/org/apache/gluten/cbo/CboSuiteBase.scala @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.cbo +package org.apache.gluten.cbo -import io.glutenproject.cbo.memo.{MemoLike, MemoState} -import io.glutenproject.cbo.path.{CboPath, PathFinder} -import io.glutenproject.cbo.property.PropertySet +import org.apache.gluten.cbo.memo.{MemoLike, MemoState} +import org.apache.gluten.cbo.path.{CboPath, PathFinder} +import org.apache.gluten.cbo.property.PropertySet object CboSuiteBase { trait TestNode { diff --git a/gluten-cbo/common/src/test/scala/io/glutenproject/cbo/mock/MockCboPath.scala b/gluten-cbo/common/src/test/scala/org/apache/gluten/cbo/mock/MockCboPath.scala similarity index 90% rename from gluten-cbo/common/src/test/scala/io/glutenproject/cbo/mock/MockCboPath.scala rename to gluten-cbo/common/src/test/scala/org/apache/gluten/cbo/mock/MockCboPath.scala index f9bdc7b00065..1c3026658f5e 100644 --- a/gluten-cbo/common/src/test/scala/io/glutenproject/cbo/mock/MockCboPath.scala +++ b/gluten-cbo/common/src/test/scala/org/apache/gluten/cbo/mock/MockCboPath.scala @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.cbo.mock +package org.apache.gluten.cbo.mock -import io.glutenproject.cbo.{CanonicalNode, Cbo} -import io.glutenproject.cbo.memo.Memo -import io.glutenproject.cbo.path.{CboPath, PathKeySet} +import org.apache.gluten.cbo.{CanonicalNode, Cbo} +import org.apache.gluten.cbo.memo.Memo +import org.apache.gluten.cbo.path.{CboPath, PathKeySet} object MockCboPath { def mock[T <: AnyRef](cbo: Cbo[T], node: T): CboPath[T] = { diff --git a/gluten-cbo/common/src/test/scala/io/glutenproject/cbo/mock/MockMemoState.scala b/gluten-cbo/common/src/test/scala/org/apache/gluten/cbo/mock/MockMemoState.scala similarity index 94% rename from gluten-cbo/common/src/test/scala/io/glutenproject/cbo/mock/MockMemoState.scala rename to gluten-cbo/common/src/test/scala/org/apache/gluten/cbo/mock/MockMemoState.scala index 638f256db182..ef902c1bb783 100644 --- a/gluten-cbo/common/src/test/scala/io/glutenproject/cbo/mock/MockMemoState.scala +++ b/gluten-cbo/common/src/test/scala/org/apache/gluten/cbo/mock/MockMemoState.scala @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.cbo.mock +package org.apache.gluten.cbo.mock -import io.glutenproject.cbo._ -import io.glutenproject.cbo.CboSuiteBase._ -import io.glutenproject.cbo.memo.{MemoState, MemoStore} -import io.glutenproject.cbo.property.PropertySet -import io.glutenproject.cbo.vis.GraphvizVisualizer +import org.apache.gluten.cbo._ +import org.apache.gluten.cbo.CboSuiteBase._ +import org.apache.gluten.cbo.memo.{MemoState, MemoStore} +import org.apache.gluten.cbo.property.PropertySet +import org.apache.gluten.cbo.vis.GraphvizVisualizer import scala.collection.mutable diff --git a/gluten-cbo/common/src/test/scala/io/glutenproject/cbo/path/CboPathSuite.scala b/gluten-cbo/common/src/test/scala/org/apache/gluten/cbo/path/CboPathSuite.scala similarity index 94% rename from gluten-cbo/common/src/test/scala/io/glutenproject/cbo/path/CboPathSuite.scala rename to gluten-cbo/common/src/test/scala/org/apache/gluten/cbo/path/CboPathSuite.scala index 4bc1014de990..501b2b2fa6bc 100644 --- a/gluten-cbo/common/src/test/scala/io/glutenproject/cbo/path/CboPathSuite.scala +++ b/gluten-cbo/common/src/test/scala/org/apache/gluten/cbo/path/CboPathSuite.scala @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.cbo.path +package org.apache.gluten.cbo.path -import io.glutenproject.cbo.Cbo -import io.glutenproject.cbo.CboSuiteBase._ -import io.glutenproject.cbo.mock.MockCboPath -import io.glutenproject.cbo.rule.CboRule +import org.apache.gluten.cbo.Cbo +import org.apache.gluten.cbo.CboSuiteBase._ +import org.apache.gluten.cbo.mock.MockCboPath +import org.apache.gluten.cbo.rule.CboRule import org.scalatest.funsuite.AnyFunSuite diff --git a/gluten-cbo/common/src/test/scala/io/glutenproject/cbo/path/PathFinderSuite.scala b/gluten-cbo/common/src/test/scala/org/apache/gluten/cbo/path/PathFinderSuite.scala similarity index 97% rename from gluten-cbo/common/src/test/scala/io/glutenproject/cbo/path/PathFinderSuite.scala rename to gluten-cbo/common/src/test/scala/org/apache/gluten/cbo/path/PathFinderSuite.scala index 8ed2ef58e9b6..4684cc24a0a9 100644 --- a/gluten-cbo/common/src/test/scala/io/glutenproject/cbo/path/PathFinderSuite.scala +++ b/gluten-cbo/common/src/test/scala/org/apache/gluten/cbo/path/PathFinderSuite.scala @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.cbo.path +package org.apache.gluten.cbo.path -import io.glutenproject.cbo.{CanonicalNode, Cbo} -import io.glutenproject.cbo.CboSuiteBase._ -import io.glutenproject.cbo.mock.MockMemoState -import io.glutenproject.cbo.rule.CboRule +import org.apache.gluten.cbo.{CanonicalNode, Cbo} +import org.apache.gluten.cbo.CboSuiteBase._ +import org.apache.gluten.cbo.mock.MockMemoState +import org.apache.gluten.cbo.rule.CboRule import org.scalatest.funsuite.AnyFunSuite diff --git a/gluten-cbo/common/src/test/scala/io/glutenproject/cbo/path/PathMaskSuite.scala b/gluten-cbo/common/src/test/scala/org/apache/gluten/cbo/path/PathMaskSuite.scala similarity index 99% rename from gluten-cbo/common/src/test/scala/io/glutenproject/cbo/path/PathMaskSuite.scala rename to gluten-cbo/common/src/test/scala/org/apache/gluten/cbo/path/PathMaskSuite.scala index 310435daad0a..647b8e3d2779 100644 --- a/gluten-cbo/common/src/test/scala/io/glutenproject/cbo/path/PathMaskSuite.scala +++ b/gluten-cbo/common/src/test/scala/org/apache/gluten/cbo/path/PathMaskSuite.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.cbo.path +package org.apache.gluten.cbo.path import org.scalatest.funsuite.AnyFunSuite diff --git a/gluten-cbo/common/src/test/scala/io/glutenproject/cbo/path/WizardSuite.scala b/gluten-cbo/common/src/test/scala/org/apache/gluten/cbo/path/WizardSuite.scala similarity index 98% rename from gluten-cbo/common/src/test/scala/io/glutenproject/cbo/path/WizardSuite.scala rename to gluten-cbo/common/src/test/scala/org/apache/gluten/cbo/path/WizardSuite.scala index e0f6df835f7e..bab612efb5eb 100644 --- a/gluten-cbo/common/src/test/scala/io/glutenproject/cbo/path/WizardSuite.scala +++ b/gluten-cbo/common/src/test/scala/org/apache/gluten/cbo/path/WizardSuite.scala @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.cbo.path +package org.apache.gluten.cbo.path -import io.glutenproject.cbo.Cbo -import io.glutenproject.cbo.CboSuiteBase._ -import io.glutenproject.cbo.mock.MockMemoState -import io.glutenproject.cbo.rule.CboRule +import org.apache.gluten.cbo.Cbo +import org.apache.gluten.cbo.CboSuiteBase._ +import org.apache.gluten.cbo.mock.MockMemoState +import org.apache.gluten.cbo.rule.CboRule import org.scalatest.funsuite.AnyFunSuite diff --git a/gluten-cbo/common/src/test/scala/io/glutenproject/cbo/rule/PatternSuite.scala b/gluten-cbo/common/src/test/scala/org/apache/gluten/cbo/rule/PatternSuite.scala similarity index 96% rename from gluten-cbo/common/src/test/scala/io/glutenproject/cbo/rule/PatternSuite.scala rename to gluten-cbo/common/src/test/scala/org/apache/gluten/cbo/rule/PatternSuite.scala index f787aa18a974..ca4359219d63 100644 --- a/gluten-cbo/common/src/test/scala/io/glutenproject/cbo/rule/PatternSuite.scala +++ b/gluten-cbo/common/src/test/scala/org/apache/gluten/cbo/rule/PatternSuite.scala @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.cbo.rule +package org.apache.gluten.cbo.rule -import io.glutenproject.cbo.Cbo -import io.glutenproject.cbo.CboSuiteBase._ -import io.glutenproject.cbo.mock.MockCboPath -import io.glutenproject.cbo.path.{CboPath, Pattern} +import org.apache.gluten.cbo.Cbo +import org.apache.gluten.cbo.CboSuiteBase._ +import org.apache.gluten.cbo.mock.MockCboPath +import org.apache.gluten.cbo.path.{CboPath, Pattern} import org.scalatest.funsuite.AnyFunSuite diff --git a/gluten-cbo/common/src/test/scala/io/glutenproject/cbo/specific/CyclicSearchSpaceSuite.scala b/gluten-cbo/common/src/test/scala/org/apache/gluten/cbo/specific/CyclicSearchSpaceSuite.scala similarity index 95% rename from gluten-cbo/common/src/test/scala/io/glutenproject/cbo/specific/CyclicSearchSpaceSuite.scala rename to gluten-cbo/common/src/test/scala/org/apache/gluten/cbo/specific/CyclicSearchSpaceSuite.scala index 572b6e2d7a80..57169e9aadeb 100644 --- a/gluten-cbo/common/src/test/scala/io/glutenproject/cbo/specific/CyclicSearchSpaceSuite.scala +++ b/gluten-cbo/common/src/test/scala/org/apache/gluten/cbo/specific/CyclicSearchSpaceSuite.scala @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.cbo.specific - -import io.glutenproject.cbo._ -import io.glutenproject.cbo.CboSuiteBase._ -import io.glutenproject.cbo.best.BestFinder -import io.glutenproject.cbo.memo.MemoState -import io.glutenproject.cbo.mock.MockMemoState -import io.glutenproject.cbo.path.{CboPath, PathFinder} -import io.glutenproject.cbo.rule.CboRule +package org.apache.gluten.cbo.specific + +import org.apache.gluten.cbo._ +import org.apache.gluten.cbo.CboSuiteBase._ +import org.apache.gluten.cbo.best.BestFinder +import org.apache.gluten.cbo.memo.MemoState +import org.apache.gluten.cbo.mock.MockMemoState +import org.apache.gluten.cbo.path.{CboPath, PathFinder} +import org.apache.gluten.cbo.rule.CboRule import org.scalatest.funsuite.AnyFunSuite diff --git a/gluten-cbo/common/src/test/scala/io/glutenproject/cbo/specific/DistributedSuite.scala b/gluten-cbo/common/src/test/scala/org/apache/gluten/cbo/specific/DistributedSuite.scala similarity index 98% rename from gluten-cbo/common/src/test/scala/io/glutenproject/cbo/specific/DistributedSuite.scala rename to gluten-cbo/common/src/test/scala/org/apache/gluten/cbo/specific/DistributedSuite.scala index 733c04a5d4eb..ad49286085a2 100644 --- a/gluten-cbo/common/src/test/scala/io/glutenproject/cbo/specific/DistributedSuite.scala +++ b/gluten-cbo/common/src/test/scala/org/apache/gluten/cbo/specific/DistributedSuite.scala @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.cbo.specific +package org.apache.gluten.cbo.specific -import io.glutenproject.cbo._ -import io.glutenproject.cbo.CboConfig.PlannerType -import io.glutenproject.cbo.CboSuiteBase._ -import io.glutenproject.cbo.property.PropertySet -import io.glutenproject.cbo.rule.{CboRule, Shape, Shapes} +import org.apache.gluten.cbo._ +import org.apache.gluten.cbo.CboConfig.PlannerType +import org.apache.gluten.cbo.CboSuiteBase._ +import org.apache.gluten.cbo.property.PropertySet +import org.apache.gluten.cbo.rule.{CboRule, Shape, Shapes} import org.scalatest.funsuite.AnyFunSuite diff --git a/gluten-cbo/common/src/test/scala/io/glutenproject/cbo/specific/JoinReorderSuite.scala b/gluten-cbo/common/src/test/scala/org/apache/gluten/cbo/specific/JoinReorderSuite.scala similarity index 98% rename from gluten-cbo/common/src/test/scala/io/glutenproject/cbo/specific/JoinReorderSuite.scala rename to gluten-cbo/common/src/test/scala/org/apache/gluten/cbo/specific/JoinReorderSuite.scala index 456004f4c591..1a15e57f0cae 100644 --- a/gluten-cbo/common/src/test/scala/io/glutenproject/cbo/specific/JoinReorderSuite.scala +++ b/gluten-cbo/common/src/test/scala/org/apache/gluten/cbo/specific/JoinReorderSuite.scala @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.cbo.specific +package org.apache.gluten.cbo.specific -import io.glutenproject.cbo.{Cbo, CboConfig} -import io.glutenproject.cbo.CboConfig.PlannerType -import io.glutenproject.cbo.CboSuiteBase._ -import io.glutenproject.cbo.rule.{CboRule, Shape, Shapes} +import org.apache.gluten.cbo.{Cbo, CboConfig} +import org.apache.gluten.cbo.CboConfig.PlannerType +import org.apache.gluten.cbo.CboSuiteBase._ +import org.apache.gluten.cbo.rule.{CboRule, Shape, Shapes} import org.scalatest.funsuite.AnyFunSuite diff --git a/gluten-cbo/common/src/test/scala/io/glutenproject/cbo/util/IndexDisjointSetSuite.scala b/gluten-cbo/common/src/test/scala/org/apache/gluten/cbo/util/IndexDisjointSetSuite.scala similarity index 98% rename from gluten-cbo/common/src/test/scala/io/glutenproject/cbo/util/IndexDisjointSetSuite.scala rename to gluten-cbo/common/src/test/scala/org/apache/gluten/cbo/util/IndexDisjointSetSuite.scala index ca14a1815441..df576cc2fb7c 100644 --- a/gluten-cbo/common/src/test/scala/io/glutenproject/cbo/util/IndexDisjointSetSuite.scala +++ b/gluten-cbo/common/src/test/scala/org/apache/gluten/cbo/util/IndexDisjointSetSuite.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.cbo.util +package org.apache.gluten.cbo.util import org.scalatest.funsuite.AnyFunSuite diff --git a/gluten-cbo/planner/pom.xml b/gluten-cbo/planner/pom.xml index 2054e8537ecf..003bf4e9c944 100644 --- a/gluten-cbo/planner/pom.xml +++ b/gluten-cbo/planner/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - io.glutenproject + org.apache.gluten gluten-cbo 1.2.0-SNAPSHOT @@ -12,7 +12,7 @@ - io.glutenproject + org.apache.gluten gluten-cbo-common ${project.version} diff --git a/gluten-cbo/planner/src/main/scala/io/glutenproject/planner/.gitkeep b/gluten-cbo/planner/src/main/scala/org/apache/gluten/planner/.gitkeep similarity index 100% rename from gluten-cbo/planner/src/main/scala/io/glutenproject/planner/.gitkeep rename to gluten-cbo/planner/src/main/scala/org/apache/gluten/planner/.gitkeep diff --git a/gluten-cbo/planner/src/test/scala/io/glutenproject/planner/.gitkeep b/gluten-cbo/planner/src/test/scala/org/apache/gluten/planner/.gitkeep similarity index 100% rename from gluten-cbo/planner/src/test/scala/io/glutenproject/planner/.gitkeep rename to gluten-cbo/planner/src/test/scala/org/apache/gluten/planner/.gitkeep diff --git a/gluten-cbo/pom.xml b/gluten-cbo/pom.xml index 5d32c7b4fb69..c9bb570b7e67 100644 --- a/gluten-cbo/pom.xml +++ b/gluten-cbo/pom.xml @@ -15,7 +15,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - io.glutenproject + org.apache.gluten gluten-parent 1.2.0-SNAPSHOT diff --git a/gluten-celeborn/clickhouse/pom.xml b/gluten-celeborn/clickhouse/pom.xml index b44d0963c504..d22a37c81d28 100755 --- a/gluten-celeborn/clickhouse/pom.xml +++ b/gluten-celeborn/clickhouse/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> gluten-celeborn - io.glutenproject + org.apache.gluten 1.2.0-SNAPSHOT ../pom.xml @@ -16,27 +16,27 @@ - io.glutenproject + org.apache.gluten backends-clickhouse ${project.version} provided - io.glutenproject + org.apache.gluten backends-clickhouse ${project.version} test-jar test - io.glutenproject + org.apache.gluten gluten-core ${project.version} test-jar test - io.glutenproject + org.apache.gluten gluten-celeborn-common ${project.version} compile diff --git a/gluten-celeborn/clickhouse/src/main/scala/org/apache/spark/shuffle/CHCelebornColumnarBatchSerializer.scala b/gluten-celeborn/clickhouse/src/main/scala/org/apache/spark/shuffle/CHCelebornColumnarBatchSerializer.scala index 44dee8477edf..39aefb01c2ae 100644 --- a/gluten-celeborn/clickhouse/src/main/scala/org/apache/spark/shuffle/CHCelebornColumnarBatchSerializer.scala +++ b/gluten-celeborn/clickhouse/src/main/scala/org/apache/spark/shuffle/CHCelebornColumnarBatchSerializer.scala @@ -16,10 +16,10 @@ */ package org.apache.spark.shuffle -import io.glutenproject.GlutenConfig -import io.glutenproject.backendsapi.clickhouse.CHBackendSettings -import io.glutenproject.vectorized.BlockOutputStream -import io.glutenproject.vectorized.CHStreamReader +import org.apache.gluten.GlutenConfig +import org.apache.gluten.backendsapi.clickhouse.CHBackendSettings +import org.apache.gluten.vectorized.BlockOutputStream +import org.apache.gluten.vectorized.CHStreamReader import org.apache.spark.SparkEnv import org.apache.spark.internal.Logging diff --git a/gluten-celeborn/clickhouse/src/main/scala/org/apache/spark/shuffle/CHCelebornHashBasedColumnarShuffleWriter.scala b/gluten-celeborn/clickhouse/src/main/scala/org/apache/spark/shuffle/CHCelebornHashBasedColumnarShuffleWriter.scala index 6e794fa5003a..75efa355302d 100644 --- a/gluten-celeborn/clickhouse/src/main/scala/org/apache/spark/shuffle/CHCelebornHashBasedColumnarShuffleWriter.scala +++ b/gluten-celeborn/clickhouse/src/main/scala/org/apache/spark/shuffle/CHCelebornHashBasedColumnarShuffleWriter.scala @@ -16,13 +16,13 @@ */ package org.apache.spark.shuffle -import io.glutenproject.GlutenConfig -import io.glutenproject.backendsapi.clickhouse.CHBackendSettings -import io.glutenproject.memory.alloc.CHNativeMemoryAllocators -import io.glutenproject.memory.memtarget.MemoryTarget -import io.glutenproject.memory.memtarget.Spiller -import io.glutenproject.memory.memtarget.Spillers -import io.glutenproject.vectorized._ +import org.apache.gluten.GlutenConfig +import org.apache.gluten.backendsapi.clickhouse.CHBackendSettings +import org.apache.gluten.memory.alloc.CHNativeMemoryAllocators +import org.apache.gluten.memory.memtarget.MemoryTarget +import org.apache.gluten.memory.memtarget.Spiller +import org.apache.gluten.memory.memtarget.Spillers +import org.apache.gluten.vectorized._ import org.apache.spark._ import org.apache.spark.scheduler.MapStatus diff --git a/gluten-celeborn/clickhouse/src/main/scala/org/apache/spark/shuffle/CHCelebornHashBasedColumnarShuffleWriterFactory.scala b/gluten-celeborn/clickhouse/src/main/scala/org/apache/spark/shuffle/CHCelebornHashBasedColumnarShuffleWriterFactory.scala index 240b38aa0b79..a64b394ee57f 100644 --- a/gluten-celeborn/clickhouse/src/main/scala/org/apache/spark/shuffle/CHCelebornHashBasedColumnarShuffleWriterFactory.scala +++ b/gluten-celeborn/clickhouse/src/main/scala/org/apache/spark/shuffle/CHCelebornHashBasedColumnarShuffleWriterFactory.scala @@ -16,7 +16,7 @@ */ package org.apache.spark.shuffle -import io.glutenproject.backendsapi.clickhouse.CHBackend +import org.apache.gluten.backendsapi.clickhouse.CHBackend import org.apache.spark.TaskContext import org.apache.spark.shuffle.celeborn.CelebornShuffleHandle diff --git a/gluten-celeborn/clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseRSSColumnarShuffleAQESuite.scala b/gluten-celeborn/clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseRSSColumnarShuffleAQESuite.scala similarity index 99% rename from gluten-celeborn/clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseRSSColumnarShuffleAQESuite.scala rename to gluten-celeborn/clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseRSSColumnarShuffleAQESuite.scala index 4b4b62135f76..c3d71ba53088 100644 --- a/gluten-celeborn/clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseRSSColumnarShuffleAQESuite.scala +++ b/gluten-celeborn/clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseRSSColumnarShuffleAQESuite.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution +package org.apache.gluten.execution import org.apache.spark.SparkConf import org.apache.spark.sql.execution.CoalescedPartitionSpec diff --git a/gluten-celeborn/common/pom.xml b/gluten-celeborn/common/pom.xml index 27d220cae3ee..2f274a7bf8e1 100755 --- a/gluten-celeborn/common/pom.xml +++ b/gluten-celeborn/common/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> gluten-celeborn - io.glutenproject + org.apache.gluten 1.2.0-SNAPSHOT ../pom.xml diff --git a/gluten-celeborn/common/src/main/java/org/apache/spark/shuffle/gluten/celeborn/CelebornShuffleManager.java b/gluten-celeborn/common/src/main/java/org/apache/spark/shuffle/gluten/celeborn/CelebornShuffleManager.java index 93681c50f768..15b109a65a38 100644 --- a/gluten-celeborn/common/src/main/java/org/apache/spark/shuffle/gluten/celeborn/CelebornShuffleManager.java +++ b/gluten-celeborn/common/src/main/java/org/apache/spark/shuffle/gluten/celeborn/CelebornShuffleManager.java @@ -16,8 +16,8 @@ */ package org.apache.spark.shuffle.gluten.celeborn; -import io.glutenproject.backendsapi.BackendsApiManager; -import io.glutenproject.exception.GlutenException; +import org.apache.gluten.backendsapi.BackendsApiManager; +import org.apache.gluten.exception.GlutenException; import com.google.common.base.Preconditions; import com.google.common.collect.Iterators; diff --git a/gluten-celeborn/common/src/main/scala/org/apache/spark/shuffle/CelebornHashBasedColumnarShuffleWriter.scala b/gluten-celeborn/common/src/main/scala/org/apache/spark/shuffle/CelebornHashBasedColumnarShuffleWriter.scala index 205652875537..399a65f717fc 100644 --- a/gluten-celeborn/common/src/main/scala/org/apache/spark/shuffle/CelebornHashBasedColumnarShuffleWriter.scala +++ b/gluten-celeborn/common/src/main/scala/org/apache/spark/shuffle/CelebornHashBasedColumnarShuffleWriter.scala @@ -16,7 +16,7 @@ */ package org.apache.spark.shuffle -import io.glutenproject.GlutenConfig +import org.apache.gluten.GlutenConfig import org.apache.spark._ import org.apache.spark.internal.Logging diff --git a/gluten-celeborn/package/pom.xml b/gluten-celeborn/package/pom.xml index 0e082422fa40..b982eecd0424 100644 --- a/gluten-celeborn/package/pom.xml +++ b/gluten-celeborn/package/pom.xml @@ -4,7 +4,7 @@ 4.0.0 gluten-celeborn - io.glutenproject + org.apache.gluten 1.2.0-SNAPSHOT ../pom.xml @@ -18,7 +18,7 @@ backends-velox - io.glutenproject + org.apache.gluten gluten-celeborn-velox ${project.version} @@ -28,7 +28,7 @@ backends-clickhouse - io.glutenproject + org.apache.gluten gluten-celeborn-clickhouse ${project.version} diff --git a/gluten-celeborn/pom.xml b/gluten-celeborn/pom.xml index 3a1f86c8ea9a..480946af0bc8 100755 --- a/gluten-celeborn/pom.xml +++ b/gluten-celeborn/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> gluten-parent - io.glutenproject + org.apache.gluten 1.2.0-SNAPSHOT ../pom.xml @@ -16,7 +16,7 @@ - io.glutenproject + org.apache.gluten gluten-core ${project.version} provided diff --git a/gluten-celeborn/velox/pom.xml b/gluten-celeborn/velox/pom.xml index ffa6b4f56d27..61498ecafb4c 100755 --- a/gluten-celeborn/velox/pom.xml +++ b/gluten-celeborn/velox/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> gluten-celeborn - io.glutenproject + org.apache.gluten 1.2.0-SNAPSHOT ../pom.xml @@ -16,19 +16,19 @@ - io.glutenproject + org.apache.gluten backends-velox ${project.version} provided - io.glutenproject + org.apache.gluten gluten-data ${project.version} provided - io.glutenproject + org.apache.gluten gluten-celeborn-common ${project.version} compile diff --git a/gluten-celeborn/velox/src/main/scala/org/apache/spark/shuffle/VeloxCelebornColumnarBatchSerializer.scala b/gluten-celeborn/velox/src/main/scala/org/apache/spark/shuffle/VeloxCelebornColumnarBatchSerializer.scala index f96913fdcc87..c5bd8874853a 100644 --- a/gluten-celeborn/velox/src/main/scala/org/apache/spark/shuffle/VeloxCelebornColumnarBatchSerializer.scala +++ b/gluten-celeborn/velox/src/main/scala/org/apache/spark/shuffle/VeloxCelebornColumnarBatchSerializer.scala @@ -16,12 +16,12 @@ */ package org.apache.spark.shuffle -import io.glutenproject.GlutenConfig -import io.glutenproject.exec.Runtimes -import io.glutenproject.memory.arrowalloc.ArrowBufferAllocators -import io.glutenproject.memory.nmm.NativeMemoryManagers -import io.glutenproject.utils.ArrowAbiUtil -import io.glutenproject.vectorized._ +import org.apache.gluten.GlutenConfig +import org.apache.gluten.exec.Runtimes +import org.apache.gluten.memory.arrowalloc.ArrowBufferAllocators +import org.apache.gluten.memory.nmm.NativeMemoryManagers +import org.apache.gluten.utils.ArrowAbiUtil +import org.apache.gluten.vectorized._ import org.apache.spark.SparkEnv import org.apache.spark.internal.Logging diff --git a/gluten-celeborn/velox/src/main/scala/org/apache/spark/shuffle/VeloxCelebornHashBasedColumnarShuffleWriter.scala b/gluten-celeborn/velox/src/main/scala/org/apache/spark/shuffle/VeloxCelebornHashBasedColumnarShuffleWriter.scala index 2662c9acd5ac..75d5148cd366 100644 --- a/gluten-celeborn/velox/src/main/scala/org/apache/spark/shuffle/VeloxCelebornHashBasedColumnarShuffleWriter.scala +++ b/gluten-celeborn/velox/src/main/scala/org/apache/spark/shuffle/VeloxCelebornHashBasedColumnarShuffleWriter.scala @@ -16,13 +16,13 @@ */ package org.apache.spark.shuffle -import io.glutenproject.GlutenConfig -import io.glutenproject.columnarbatch.ColumnarBatches -import io.glutenproject.memory.memtarget.MemoryTarget -import io.glutenproject.memory.memtarget.Spiller -import io.glutenproject.memory.memtarget.Spillers -import io.glutenproject.memory.nmm.NativeMemoryManagers -import io.glutenproject.vectorized._ +import org.apache.gluten.GlutenConfig +import org.apache.gluten.columnarbatch.ColumnarBatches +import org.apache.gluten.memory.memtarget.MemoryTarget +import org.apache.gluten.memory.memtarget.Spiller +import org.apache.gluten.memory.memtarget.Spillers +import org.apache.gluten.memory.nmm.NativeMemoryManagers +import org.apache.gluten.vectorized._ import org.apache.spark._ import org.apache.spark.memory.SparkMemoryUtil diff --git a/gluten-celeborn/velox/src/main/scala/org/apache/spark/shuffle/VeloxCelebornHashBasedColumnarShuffleWriterFactory.scala b/gluten-celeborn/velox/src/main/scala/org/apache/spark/shuffle/VeloxCelebornHashBasedColumnarShuffleWriterFactory.scala index fe4a9b9381a4..c318f57a2309 100644 --- a/gluten-celeborn/velox/src/main/scala/org/apache/spark/shuffle/VeloxCelebornHashBasedColumnarShuffleWriterFactory.scala +++ b/gluten-celeborn/velox/src/main/scala/org/apache/spark/shuffle/VeloxCelebornHashBasedColumnarShuffleWriterFactory.scala @@ -16,7 +16,7 @@ */ package org.apache.spark.shuffle -import io.glutenproject.backendsapi.velox.VeloxBackend +import org.apache.gluten.backendsapi.velox.VeloxBackend import org.apache.spark.TaskContext import org.apache.spark.shuffle.celeborn.CelebornShuffleHandle diff --git a/gluten-core/pom.xml b/gluten-core/pom.xml index e6206e948711..836d7a51eee9 100644 --- a/gluten-core/pom.xml +++ b/gluten-core/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> gluten-parent - io.glutenproject + org.apache.gluten 1.2.0-SNAPSHOT 4.0.0 @@ -20,7 +20,7 @@ - io.glutenproject + org.apache.gluten gluten-ui ${project.version} @@ -29,13 +29,13 @@ caffeine - io.glutenproject + org.apache.gluten ${sparkshim.artifactId} ${project.version} compile - io.glutenproject + org.apache.gluten gluten-cbo-common ${project.version} compile @@ -180,7 +180,7 @@ - io.glutenproject + org.apache.gluten spark-sql-columnar-shims-common ${project.version} compile @@ -316,7 +316,7 @@ com.google.protobuf:protoc:${protobuf.version}:exe:${os.detected.classifier} - src/main/resources/io/glutenproject/proto + src/main/resources/org/apache/gluten/proto false diff --git a/gluten-core/src/main/java/io/glutenproject/exception/GlutenException.java b/gluten-core/src/main/java/org/apache/gluten/exception/GlutenException.java similarity index 97% rename from gluten-core/src/main/java/io/glutenproject/exception/GlutenException.java rename to gluten-core/src/main/java/org/apache/gluten/exception/GlutenException.java index a8db91237844..147e69719789 100644 --- a/gluten-core/src/main/java/io/glutenproject/exception/GlutenException.java +++ b/gluten-core/src/main/java/org/apache/gluten/exception/GlutenException.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.exception; +package org.apache.gluten.exception; import java.util.concurrent.Callable; diff --git a/gluten-core/src/main/java/io/glutenproject/exception/GlutenNotSupportException.java b/gluten-core/src/main/java/org/apache/gluten/exception/GlutenNotSupportException.java similarity index 97% rename from gluten-core/src/main/java/io/glutenproject/exception/GlutenNotSupportException.java rename to gluten-core/src/main/java/org/apache/gluten/exception/GlutenNotSupportException.java index 7b5067affc94..db130997509e 100644 --- a/gluten-core/src/main/java/io/glutenproject/exception/GlutenNotSupportException.java +++ b/gluten-core/src/main/java/org/apache/gluten/exception/GlutenNotSupportException.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.exception; +package org.apache.gluten.exception; /** * Generally, this exception should be thrown if Gluten doesn't support an operation, but vanilla diff --git a/gluten-core/src/main/java/io/glutenproject/memory/MemoryUsageRecorder.java b/gluten-core/src/main/java/org/apache/gluten/memory/MemoryUsageRecorder.java similarity index 96% rename from gluten-core/src/main/java/io/glutenproject/memory/MemoryUsageRecorder.java rename to gluten-core/src/main/java/org/apache/gluten/memory/MemoryUsageRecorder.java index bc24f18f744d..9013494a46c3 100644 --- a/gluten-core/src/main/java/io/glutenproject/memory/MemoryUsageRecorder.java +++ b/gluten-core/src/main/java/org/apache/gluten/memory/MemoryUsageRecorder.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.memory; +package org.apache.gluten.memory; public interface MemoryUsageRecorder extends MemoryUsageStatsBuilder { void inc(long bytes); diff --git a/gluten-core/src/main/java/io/glutenproject/memory/MemoryUsageStatsBuilder.java b/gluten-core/src/main/java/org/apache/gluten/memory/MemoryUsageStatsBuilder.java similarity index 91% rename from gluten-core/src/main/java/io/glutenproject/memory/MemoryUsageStatsBuilder.java rename to gluten-core/src/main/java/org/apache/gluten/memory/MemoryUsageStatsBuilder.java index d990f5218a54..2190677423e8 100644 --- a/gluten-core/src/main/java/io/glutenproject/memory/MemoryUsageStatsBuilder.java +++ b/gluten-core/src/main/java/org/apache/gluten/memory/MemoryUsageStatsBuilder.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.memory; +package org.apache.gluten.memory; -import io.glutenproject.proto.MemoryUsageStats; +import org.apache.gluten.proto.MemoryUsageStats; public interface MemoryUsageStatsBuilder { // Implementation should be idempotent diff --git a/gluten-core/src/main/java/io/glutenproject/memory/SimpleMemoryUsageRecorder.java b/gluten-core/src/main/java/org/apache/gluten/memory/SimpleMemoryUsageRecorder.java similarity index 95% rename from gluten-core/src/main/java/io/glutenproject/memory/SimpleMemoryUsageRecorder.java rename to gluten-core/src/main/java/org/apache/gluten/memory/SimpleMemoryUsageRecorder.java index a86c0359b33e..16b260469f5f 100644 --- a/gluten-core/src/main/java/io/glutenproject/memory/SimpleMemoryUsageRecorder.java +++ b/gluten-core/src/main/java/org/apache/gluten/memory/SimpleMemoryUsageRecorder.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.memory; +package org.apache.gluten.memory; -import io.glutenproject.proto.MemoryUsageStats; +import org.apache.gluten.proto.MemoryUsageStats; import java.util.Collections; import java.util.Map; diff --git a/gluten-core/src/main/java/io/glutenproject/memory/memtarget/KnownNameAndStats.java b/gluten-core/src/main/java/org/apache/gluten/memory/memtarget/KnownNameAndStats.java similarity index 92% rename from gluten-core/src/main/java/io/glutenproject/memory/memtarget/KnownNameAndStats.java rename to gluten-core/src/main/java/org/apache/gluten/memory/memtarget/KnownNameAndStats.java index 631102d6f456..fe9dbe20a99a 100644 --- a/gluten-core/src/main/java/io/glutenproject/memory/memtarget/KnownNameAndStats.java +++ b/gluten-core/src/main/java/org/apache/gluten/memory/memtarget/KnownNameAndStats.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.memory.memtarget; +package org.apache.gluten.memory.memtarget; -import io.glutenproject.proto.MemoryUsageStats; +import org.apache.gluten.proto.MemoryUsageStats; /** * The implementation provides a String name and {@link MemoryUsageStats}. diff --git a/gluten-core/src/main/java/io/glutenproject/memory/memtarget/LoggingMemoryTarget.java b/gluten-core/src/main/java/org/apache/gluten/memory/memtarget/LoggingMemoryTarget.java similarity index 97% rename from gluten-core/src/main/java/io/glutenproject/memory/memtarget/LoggingMemoryTarget.java rename to gluten-core/src/main/java/org/apache/gluten/memory/memtarget/LoggingMemoryTarget.java index ea1fb338bec2..06fcec9aec65 100644 --- a/gluten-core/src/main/java/io/glutenproject/memory/memtarget/LoggingMemoryTarget.java +++ b/gluten-core/src/main/java/org/apache/gluten/memory/memtarget/LoggingMemoryTarget.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.memory.memtarget; +package org.apache.gluten.memory.memtarget; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/gluten-core/src/main/java/io/glutenproject/memory/memtarget/MemoryTarget.java b/gluten-core/src/main/java/org/apache/gluten/memory/memtarget/MemoryTarget.java similarity index 96% rename from gluten-core/src/main/java/io/glutenproject/memory/memtarget/MemoryTarget.java rename to gluten-core/src/main/java/org/apache/gluten/memory/memtarget/MemoryTarget.java index 65e16d1f5421..93a67f5f9870 100644 --- a/gluten-core/src/main/java/io/glutenproject/memory/memtarget/MemoryTarget.java +++ b/gluten-core/src/main/java/org/apache/gluten/memory/memtarget/MemoryTarget.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.memory.memtarget; +package org.apache.gluten.memory.memtarget; // The naming convention "borrow" and "repay" are for preventing collisions with // other APIs. diff --git a/gluten-core/src/main/java/io/glutenproject/memory/memtarget/MemoryTargetUtil.java b/gluten-core/src/main/java/org/apache/gluten/memory/memtarget/MemoryTargetUtil.java similarity index 96% rename from gluten-core/src/main/java/io/glutenproject/memory/memtarget/MemoryTargetUtil.java rename to gluten-core/src/main/java/org/apache/gluten/memory/memtarget/MemoryTargetUtil.java index 2225f6627f4d..ef54025959d2 100644 --- a/gluten-core/src/main/java/io/glutenproject/memory/memtarget/MemoryTargetUtil.java +++ b/gluten-core/src/main/java/org/apache/gluten/memory/memtarget/MemoryTargetUtil.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.memory.memtarget; +package org.apache.gluten.memory.memtarget; import java.util.Map; import java.util.Optional; diff --git a/gluten-core/src/main/java/io/glutenproject/memory/memtarget/MemoryTargetVisitor.java b/gluten-core/src/main/java/org/apache/gluten/memory/memtarget/MemoryTargetVisitor.java similarity index 86% rename from gluten-core/src/main/java/io/glutenproject/memory/memtarget/MemoryTargetVisitor.java rename to gluten-core/src/main/java/org/apache/gluten/memory/memtarget/MemoryTargetVisitor.java index 007a900a8964..caff2605d923 100644 --- a/gluten-core/src/main/java/io/glutenproject/memory/memtarget/MemoryTargetVisitor.java +++ b/gluten-core/src/main/java/org/apache/gluten/memory/memtarget/MemoryTargetVisitor.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.memory.memtarget; +package org.apache.gluten.memory.memtarget; -import io.glutenproject.memory.memtarget.spark.RegularMemoryConsumer; -import io.glutenproject.memory.memtarget.spark.TreeMemoryConsumer; +import org.apache.gluten.memory.memtarget.spark.RegularMemoryConsumer; +import org.apache.gluten.memory.memtarget.spark.TreeMemoryConsumer; public interface MemoryTargetVisitor { T visit(OverAcquire overAcquire); diff --git a/gluten-core/src/main/java/io/glutenproject/memory/memtarget/MemoryTargets.java b/gluten-core/src/main/java/org/apache/gluten/memory/memtarget/MemoryTargets.java similarity index 89% rename from gluten-core/src/main/java/io/glutenproject/memory/memtarget/MemoryTargets.java rename to gluten-core/src/main/java/org/apache/gluten/memory/memtarget/MemoryTargets.java index 0b6315d80d23..ccb4beee8475 100644 --- a/gluten-core/src/main/java/io/glutenproject/memory/memtarget/MemoryTargets.java +++ b/gluten-core/src/main/java/org/apache/gluten/memory/memtarget/MemoryTargets.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.memory.memtarget; +package org.apache.gluten.memory.memtarget; -import io.glutenproject.GlutenConfig; -import io.glutenproject.memory.MemoryUsageStatsBuilder; -import io.glutenproject.memory.memtarget.spark.TreeMemoryConsumers; +import org.apache.gluten.GlutenConfig; +import org.apache.gluten.memory.MemoryUsageStatsBuilder; +import org.apache.gluten.memory.memtarget.spark.TreeMemoryConsumers; import org.apache.spark.memory.TaskMemoryManager; diff --git a/gluten-core/src/main/java/io/glutenproject/memory/memtarget/NoopMemoryTarget.java b/gluten-core/src/main/java/org/apache/gluten/memory/memtarget/NoopMemoryTarget.java similarity index 91% rename from gluten-core/src/main/java/io/glutenproject/memory/memtarget/NoopMemoryTarget.java rename to gluten-core/src/main/java/org/apache/gluten/memory/memtarget/NoopMemoryTarget.java index a89c2e47b37e..82c9fb227f70 100644 --- a/gluten-core/src/main/java/io/glutenproject/memory/memtarget/NoopMemoryTarget.java +++ b/gluten-core/src/main/java/org/apache/gluten/memory/memtarget/NoopMemoryTarget.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.memory.memtarget; +package org.apache.gluten.memory.memtarget; -import io.glutenproject.memory.SimpleMemoryUsageRecorder; -import io.glutenproject.proto.MemoryUsageStats; +import org.apache.gluten.memory.SimpleMemoryUsageRecorder; +import org.apache.gluten.proto.MemoryUsageStats; public class NoopMemoryTarget implements MemoryTarget, KnownNameAndStats { private final SimpleMemoryUsageRecorder recorder = new SimpleMemoryUsageRecorder(); diff --git a/gluten-core/src/main/java/io/glutenproject/memory/memtarget/OverAcquire.java b/gluten-core/src/main/java/org/apache/gluten/memory/memtarget/OverAcquire.java similarity index 98% rename from gluten-core/src/main/java/io/glutenproject/memory/memtarget/OverAcquire.java rename to gluten-core/src/main/java/org/apache/gluten/memory/memtarget/OverAcquire.java index 0ee28586211d..ac82161ba7a5 100644 --- a/gluten-core/src/main/java/io/glutenproject/memory/memtarget/OverAcquire.java +++ b/gluten-core/src/main/java/org/apache/gluten/memory/memtarget/OverAcquire.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.memory.memtarget; +package org.apache.gluten.memory.memtarget; import com.google.common.base.Preconditions; diff --git a/gluten-core/src/main/java/io/glutenproject/memory/memtarget/Spiller.java b/gluten-core/src/main/java/org/apache/gluten/memory/memtarget/Spiller.java similarity index 95% rename from gluten-core/src/main/java/io/glutenproject/memory/memtarget/Spiller.java rename to gluten-core/src/main/java/org/apache/gluten/memory/memtarget/Spiller.java index e2b8d3c985ed..0e0457a7c7e7 100644 --- a/gluten-core/src/main/java/io/glutenproject/memory/memtarget/Spiller.java +++ b/gluten-core/src/main/java/org/apache/gluten/memory/memtarget/Spiller.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.memory.memtarget; +package org.apache.gluten.memory.memtarget; import java.util.Set; diff --git a/gluten-core/src/main/java/io/glutenproject/memory/memtarget/Spillers.java b/gluten-core/src/main/java/org/apache/gluten/memory/memtarget/Spillers.java similarity index 98% rename from gluten-core/src/main/java/io/glutenproject/memory/memtarget/Spillers.java rename to gluten-core/src/main/java/org/apache/gluten/memory/memtarget/Spillers.java index ffd7d6cf71b7..6032b9494bc8 100644 --- a/gluten-core/src/main/java/io/glutenproject/memory/memtarget/Spillers.java +++ b/gluten-core/src/main/java/org/apache/gluten/memory/memtarget/Spillers.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.memory.memtarget; +package org.apache.gluten.memory.memtarget; import java.util.Arrays; import java.util.Collections; diff --git a/gluten-core/src/main/java/io/glutenproject/memory/memtarget/ThrowOnOomMemoryTarget.java b/gluten-core/src/main/java/org/apache/gluten/memory/memtarget/ThrowOnOomMemoryTarget.java similarity index 98% rename from gluten-core/src/main/java/io/glutenproject/memory/memtarget/ThrowOnOomMemoryTarget.java rename to gluten-core/src/main/java/org/apache/gluten/memory/memtarget/ThrowOnOomMemoryTarget.java index 3cb211bdab61..6621f3b1683f 100644 --- a/gluten-core/src/main/java/io/glutenproject/memory/memtarget/ThrowOnOomMemoryTarget.java +++ b/gluten-core/src/main/java/org/apache/gluten/memory/memtarget/ThrowOnOomMemoryTarget.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.memory.memtarget; +package org.apache.gluten.memory.memtarget; -import io.glutenproject.GlutenConfig$; +import org.apache.gluten.GlutenConfig$; import org.apache.spark.memory.SparkMemoryUtil; import org.apache.spark.sql.internal.SQLConf; diff --git a/gluten-core/src/main/java/io/glutenproject/memory/memtarget/TreeMemoryTarget.java b/gluten-core/src/main/java/org/apache/gluten/memory/memtarget/TreeMemoryTarget.java similarity index 88% rename from gluten-core/src/main/java/io/glutenproject/memory/memtarget/TreeMemoryTarget.java rename to gluten-core/src/main/java/org/apache/gluten/memory/memtarget/TreeMemoryTarget.java index 92b0d344080d..37d44fd7a675 100644 --- a/gluten-core/src/main/java/io/glutenproject/memory/memtarget/TreeMemoryTarget.java +++ b/gluten-core/src/main/java/org/apache/gluten/memory/memtarget/TreeMemoryTarget.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.memory.memtarget; +package org.apache.gluten.memory.memtarget; -import io.glutenproject.memory.MemoryUsageStatsBuilder; -import io.glutenproject.memory.memtarget.spark.TreeMemoryConsumer; +import org.apache.gluten.memory.MemoryUsageStatsBuilder; +import org.apache.gluten.memory.memtarget.spark.TreeMemoryConsumer; import java.util.List; import java.util.Map; diff --git a/gluten-core/src/main/java/io/glutenproject/memory/memtarget/TreeMemoryTargets.java b/gluten-core/src/main/java/org/apache/gluten/memory/memtarget/TreeMemoryTargets.java similarity index 97% rename from gluten-core/src/main/java/io/glutenproject/memory/memtarget/TreeMemoryTargets.java rename to gluten-core/src/main/java/org/apache/gluten/memory/memtarget/TreeMemoryTargets.java index 2cd9e295cebd..9566e11a50c5 100644 --- a/gluten-core/src/main/java/io/glutenproject/memory/memtarget/TreeMemoryTargets.java +++ b/gluten-core/src/main/java/org/apache/gluten/memory/memtarget/TreeMemoryTargets.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.memory.memtarget; +package org.apache.gluten.memory.memtarget; -import io.glutenproject.memory.MemoryUsageStatsBuilder; -import io.glutenproject.memory.SimpleMemoryUsageRecorder; -import io.glutenproject.proto.MemoryUsageStats; +import org.apache.gluten.memory.MemoryUsageStatsBuilder; +import org.apache.gluten.memory.SimpleMemoryUsageRecorder; +import org.apache.gluten.proto.MemoryUsageStats; import com.google.common.base.Preconditions; import org.apache.spark.util.Utils; diff --git a/gluten-core/src/main/java/io/glutenproject/memory/memtarget/spark/RegularMemoryConsumer.java b/gluten-core/src/main/java/org/apache/gluten/memory/memtarget/spark/RegularMemoryConsumer.java similarity index 88% rename from gluten-core/src/main/java/io/glutenproject/memory/memtarget/spark/RegularMemoryConsumer.java rename to gluten-core/src/main/java/org/apache/gluten/memory/memtarget/spark/RegularMemoryConsumer.java index 2dcd6ed0d55c..3028547c007a 100644 --- a/gluten-core/src/main/java/io/glutenproject/memory/memtarget/spark/RegularMemoryConsumer.java +++ b/gluten-core/src/main/java/org/apache/gluten/memory/memtarget/spark/RegularMemoryConsumer.java @@ -14,17 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.memory.memtarget.spark; +package org.apache.gluten.memory.memtarget.spark; -import io.glutenproject.memory.MemoryUsageRecorder; -import io.glutenproject.memory.MemoryUsageStatsBuilder; -import io.glutenproject.memory.SimpleMemoryUsageRecorder; -import io.glutenproject.memory.memtarget.KnownNameAndStats; -import io.glutenproject.memory.memtarget.MemoryTarget; -import io.glutenproject.memory.memtarget.MemoryTargetUtil; -import io.glutenproject.memory.memtarget.MemoryTargetVisitor; -import io.glutenproject.memory.memtarget.Spiller; -import io.glutenproject.proto.MemoryUsageStats; +import org.apache.gluten.memory.MemoryUsageRecorder; +import org.apache.gluten.memory.MemoryUsageStatsBuilder; +import org.apache.gluten.memory.SimpleMemoryUsageRecorder; +import org.apache.gluten.memory.memtarget.KnownNameAndStats; +import org.apache.gluten.memory.memtarget.MemoryTarget; +import org.apache.gluten.memory.memtarget.MemoryTargetUtil; +import org.apache.gluten.memory.memtarget.MemoryTargetVisitor; +import org.apache.gluten.memory.memtarget.Spiller; +import org.apache.gluten.proto.MemoryUsageStats; import com.google.common.base.Preconditions; import org.apache.spark.memory.MemoryConsumer; diff --git a/gluten-core/src/main/java/io/glutenproject/memory/memtarget/spark/TreeMemoryConsumer.java b/gluten-core/src/main/java/org/apache/gluten/memory/memtarget/spark/TreeMemoryConsumer.java similarity index 88% rename from gluten-core/src/main/java/io/glutenproject/memory/memtarget/spark/TreeMemoryConsumer.java rename to gluten-core/src/main/java/org/apache/gluten/memory/memtarget/spark/TreeMemoryConsumer.java index 31a42941f850..f86295b0697f 100644 --- a/gluten-core/src/main/java/io/glutenproject/memory/memtarget/spark/TreeMemoryConsumer.java +++ b/gluten-core/src/main/java/org/apache/gluten/memory/memtarget/spark/TreeMemoryConsumer.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.memory.memtarget.spark; +package org.apache.gluten.memory.memtarget.spark; -import io.glutenproject.memory.MemoryUsageStatsBuilder; -import io.glutenproject.memory.SimpleMemoryUsageRecorder; -import io.glutenproject.memory.memtarget.MemoryTargetUtil; -import io.glutenproject.memory.memtarget.MemoryTargetVisitor; -import io.glutenproject.memory.memtarget.Spiller; -import io.glutenproject.memory.memtarget.TreeMemoryTarget; -import io.glutenproject.memory.memtarget.TreeMemoryTargets; -import io.glutenproject.proto.MemoryUsageStats; +import org.apache.gluten.memory.MemoryUsageStatsBuilder; +import org.apache.gluten.memory.SimpleMemoryUsageRecorder; +import org.apache.gluten.memory.memtarget.MemoryTargetUtil; +import org.apache.gluten.memory.memtarget.MemoryTargetVisitor; +import org.apache.gluten.memory.memtarget.Spiller; +import org.apache.gluten.memory.memtarget.TreeMemoryTarget; +import org.apache.gluten.memory.memtarget.TreeMemoryTargets; +import org.apache.gluten.proto.MemoryUsageStats; import com.google.common.base.Preconditions; import org.apache.spark.memory.MemoryConsumer; @@ -49,7 +49,7 @@ * registered as a Spark memory consumer. * *

Typically used by utility class {@link - * io.glutenproject.memory.memtarget.spark.TreeMemoryConsumers}. + * org.apache.gluten.memory.memtarget.spark.TreeMemoryConsumers}. */ public class TreeMemoryConsumer extends MemoryConsumer implements TreeMemoryTarget { diff --git a/gluten-core/src/main/java/io/glutenproject/memory/memtarget/spark/TreeMemoryConsumers.java b/gluten-core/src/main/java/org/apache/gluten/memory/memtarget/spark/TreeMemoryConsumers.java similarity index 92% rename from gluten-core/src/main/java/io/glutenproject/memory/memtarget/spark/TreeMemoryConsumers.java rename to gluten-core/src/main/java/org/apache/gluten/memory/memtarget/spark/TreeMemoryConsumers.java index 5f72f9c492f1..46257d80e7dd 100644 --- a/gluten-core/src/main/java/io/glutenproject/memory/memtarget/spark/TreeMemoryConsumers.java +++ b/gluten-core/src/main/java/org/apache/gluten/memory/memtarget/spark/TreeMemoryConsumers.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.memory.memtarget.spark; +package org.apache.gluten.memory.memtarget.spark; -import io.glutenproject.GlutenConfig; -import io.glutenproject.memory.MemoryUsageStatsBuilder; -import io.glutenproject.memory.memtarget.Spiller; -import io.glutenproject.memory.memtarget.TreeMemoryTarget; +import org.apache.gluten.GlutenConfig; +import org.apache.gluten.memory.MemoryUsageStatsBuilder; +import org.apache.gluten.memory.memtarget.Spiller; +import org.apache.gluten.memory.memtarget.TreeMemoryTarget; import org.apache.commons.collections.map.ReferenceMap; import org.apache.spark.memory.TaskMemoryManager; diff --git a/gluten-core/src/main/java/io/glutenproject/metrics/IMetrics.java b/gluten-core/src/main/java/org/apache/gluten/metrics/IMetrics.java similarity index 95% rename from gluten-core/src/main/java/io/glutenproject/metrics/IMetrics.java rename to gluten-core/src/main/java/org/apache/gluten/metrics/IMetrics.java index 8cec234fb58c..942640579405 100644 --- a/gluten-core/src/main/java/io/glutenproject/metrics/IMetrics.java +++ b/gluten-core/src/main/java/org/apache/gluten/metrics/IMetrics.java @@ -14,6 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.metrics; +package org.apache.gluten.metrics; public interface IMetrics {} diff --git a/gluten-core/src/main/java/io/glutenproject/metrics/IOperatorMetrics.java b/gluten-core/src/main/java/org/apache/gluten/metrics/IOperatorMetrics.java similarity index 95% rename from gluten-core/src/main/java/io/glutenproject/metrics/IOperatorMetrics.java rename to gluten-core/src/main/java/org/apache/gluten/metrics/IOperatorMetrics.java index d8ee2ce2198e..304d2676062e 100644 --- a/gluten-core/src/main/java/io/glutenproject/metrics/IOperatorMetrics.java +++ b/gluten-core/src/main/java/org/apache/gluten/metrics/IOperatorMetrics.java @@ -14,6 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.metrics; +package org.apache.gluten.metrics; public interface IOperatorMetrics {} diff --git a/gluten-core/src/main/java/io/glutenproject/row/SparkRowInfo.java b/gluten-core/src/main/java/org/apache/gluten/row/SparkRowInfo.java similarity index 97% rename from gluten-core/src/main/java/io/glutenproject/row/SparkRowInfo.java rename to gluten-core/src/main/java/org/apache/gluten/row/SparkRowInfo.java index 2f706fa72dd8..6de91d24ff0c 100644 --- a/gluten-core/src/main/java/io/glutenproject/row/SparkRowInfo.java +++ b/gluten-core/src/main/java/org/apache/gluten/row/SparkRowInfo.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.row; +package org.apache.gluten.row; public class SparkRowInfo { public long[] offsets; diff --git a/gluten-core/src/main/java/io/glutenproject/substrait/ddlplan/DllNode.java b/gluten-core/src/main/java/org/apache/gluten/substrait/ddlplan/DllNode.java similarity index 96% rename from gluten-core/src/main/java/io/glutenproject/substrait/ddlplan/DllNode.java rename to gluten-core/src/main/java/org/apache/gluten/substrait/ddlplan/DllNode.java index fd28f4dbc31a..e5878e0e3387 100644 --- a/gluten-core/src/main/java/io/glutenproject/substrait/ddlplan/DllNode.java +++ b/gluten-core/src/main/java/org/apache/gluten/substrait/ddlplan/DllNode.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.substrait.ddlplan; +package org.apache.gluten.substrait.ddlplan; import io.substrait.proto.Dll; diff --git a/gluten-core/src/main/java/io/glutenproject/substrait/ddlplan/DllPlanNode.java b/gluten-core/src/main/java/org/apache/gluten/substrait/ddlplan/DllPlanNode.java similarity index 95% rename from gluten-core/src/main/java/io/glutenproject/substrait/ddlplan/DllPlanNode.java rename to gluten-core/src/main/java/org/apache/gluten/substrait/ddlplan/DllPlanNode.java index 6b302e495ff1..80c57eaa8cb1 100644 --- a/gluten-core/src/main/java/io/glutenproject/substrait/ddlplan/DllPlanNode.java +++ b/gluten-core/src/main/java/org/apache/gluten/substrait/ddlplan/DllPlanNode.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.substrait.ddlplan; +package org.apache.gluten.substrait.ddlplan; import io.substrait.proto.DllPlan; diff --git a/gluten-core/src/main/java/io/glutenproject/substrait/ddlplan/DllTransformContext.scala b/gluten-core/src/main/java/org/apache/gluten/substrait/ddlplan/DllTransformContext.scala similarity index 92% rename from gluten-core/src/main/java/io/glutenproject/substrait/ddlplan/DllTransformContext.scala rename to gluten-core/src/main/java/org/apache/gluten/substrait/ddlplan/DllTransformContext.scala index 3b860093108b..d63bb839f986 100644 --- a/gluten-core/src/main/java/io/glutenproject/substrait/ddlplan/DllTransformContext.scala +++ b/gluten-core/src/main/java/org/apache/gluten/substrait/ddlplan/DllTransformContext.scala @@ -15,9 +15,9 @@ * limitations under the License. */ -package io.glutenproject.substrait.ddlplan +package org.apache.gluten.substrait.ddlplan -import io.glutenproject.substrait.SubstraitContext +import org.apache.gluten.substrait.SubstraitContext import org.apache.spark.sql.catalyst.expressions.Attribute diff --git a/gluten-core/src/main/java/io/glutenproject/substrait/ddlplan/InsertOutputBuilder.java b/gluten-core/src/main/java/org/apache/gluten/substrait/ddlplan/InsertOutputBuilder.java similarity index 96% rename from gluten-core/src/main/java/io/glutenproject/substrait/ddlplan/InsertOutputBuilder.java rename to gluten-core/src/main/java/org/apache/gluten/substrait/ddlplan/InsertOutputBuilder.java index fb7e332bd14f..75146de0c58a 100644 --- a/gluten-core/src/main/java/io/glutenproject/substrait/ddlplan/InsertOutputBuilder.java +++ b/gluten-core/src/main/java/org/apache/gluten/substrait/ddlplan/InsertOutputBuilder.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.substrait.ddlplan; +package org.apache.gluten.substrait.ddlplan; public class InsertOutputBuilder { private InsertOutputBuilder() {} diff --git a/gluten-core/src/main/java/io/glutenproject/substrait/ddlplan/InsertOutputNode.java b/gluten-core/src/main/java/org/apache/gluten/substrait/ddlplan/InsertOutputNode.java similarity index 97% rename from gluten-core/src/main/java/io/glutenproject/substrait/ddlplan/InsertOutputNode.java rename to gluten-core/src/main/java/org/apache/gluten/substrait/ddlplan/InsertOutputNode.java index 36b21023a39c..c5804e4e2a10 100644 --- a/gluten-core/src/main/java/io/glutenproject/substrait/ddlplan/InsertOutputNode.java +++ b/gluten-core/src/main/java/org/apache/gluten/substrait/ddlplan/InsertOutputNode.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.substrait.ddlplan; +package org.apache.gluten.substrait.ddlplan; import com.google.protobuf.Any; import com.google.protobuf.ByteString; diff --git a/gluten-core/src/main/java/io/glutenproject/substrait/ddlplan/InsertPlanNode.java b/gluten-core/src/main/java/org/apache/gluten/substrait/ddlplan/InsertPlanNode.java similarity index 91% rename from gluten-core/src/main/java/io/glutenproject/substrait/ddlplan/InsertPlanNode.java rename to gluten-core/src/main/java/org/apache/gluten/substrait/ddlplan/InsertPlanNode.java index 73f7d6a1e3ec..c6afa65780c2 100644 --- a/gluten-core/src/main/java/io/glutenproject/substrait/ddlplan/InsertPlanNode.java +++ b/gluten-core/src/main/java/org/apache/gluten/substrait/ddlplan/InsertPlanNode.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.substrait.ddlplan; +package org.apache.gluten.substrait.ddlplan; -import io.glutenproject.substrait.SubstraitContext; -import io.glutenproject.substrait.plan.PlanNode; +import org.apache.gluten.substrait.SubstraitContext; +import org.apache.gluten.substrait.plan.PlanNode; import io.substrait.proto.DllPlan; import io.substrait.proto.InsertPlan; diff --git a/gluten-core/src/main/java/io/glutenproject/substrait/derivation/BinaryOPNode.java b/gluten-core/src/main/java/org/apache/gluten/substrait/derivation/BinaryOPNode.java similarity index 97% rename from gluten-core/src/main/java/io/glutenproject/substrait/derivation/BinaryOPNode.java rename to gluten-core/src/main/java/org/apache/gluten/substrait/derivation/BinaryOPNode.java index 497191ff8134..596be721cf4e 100644 --- a/gluten-core/src/main/java/io/glutenproject/substrait/derivation/BinaryOPNode.java +++ b/gluten-core/src/main/java/org/apache/gluten/substrait/derivation/BinaryOPNode.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.substrait.derivation; +package org.apache.gluten.substrait.derivation; import io.substrait.proto.DerivationExpression; diff --git a/gluten-core/src/main/java/io/glutenproject/substrait/derivation/DerivationExpressionBuilder.java b/gluten-core/src/main/java/org/apache/gluten/substrait/derivation/DerivationExpressionBuilder.java similarity index 96% rename from gluten-core/src/main/java/io/glutenproject/substrait/derivation/DerivationExpressionBuilder.java rename to gluten-core/src/main/java/org/apache/gluten/substrait/derivation/DerivationExpressionBuilder.java index 40c557553256..c01ea659b536 100644 --- a/gluten-core/src/main/java/io/glutenproject/substrait/derivation/DerivationExpressionBuilder.java +++ b/gluten-core/src/main/java/org/apache/gluten/substrait/derivation/DerivationExpressionBuilder.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.substrait.derivation; +package org.apache.gluten.substrait.derivation; public class DerivationExpressionBuilder { private DerivationExpressionBuilder() {} diff --git a/gluten-core/src/main/java/io/glutenproject/substrait/derivation/DerivationExpressionNode.java b/gluten-core/src/main/java/org/apache/gluten/substrait/derivation/DerivationExpressionNode.java similarity index 95% rename from gluten-core/src/main/java/io/glutenproject/substrait/derivation/DerivationExpressionNode.java rename to gluten-core/src/main/java/org/apache/gluten/substrait/derivation/DerivationExpressionNode.java index 2492086da29d..7290645e2ca5 100644 --- a/gluten-core/src/main/java/io/glutenproject/substrait/derivation/DerivationExpressionNode.java +++ b/gluten-core/src/main/java/org/apache/gluten/substrait/derivation/DerivationExpressionNode.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.substrait.derivation; +package org.apache.gluten.substrait.derivation; import io.substrait.proto.DerivationExpression; diff --git a/gluten-core/src/main/java/io/glutenproject/substrait/derivation/DerivationFP64TypeNode.java b/gluten-core/src/main/java/org/apache/gluten/substrait/derivation/DerivationFP64TypeNode.java similarity index 97% rename from gluten-core/src/main/java/io/glutenproject/substrait/derivation/DerivationFP64TypeNode.java rename to gluten-core/src/main/java/org/apache/gluten/substrait/derivation/DerivationFP64TypeNode.java index 6ddfeffb5bf6..218ecb6f711e 100644 --- a/gluten-core/src/main/java/io/glutenproject/substrait/derivation/DerivationFP64TypeNode.java +++ b/gluten-core/src/main/java/org/apache/gluten/substrait/derivation/DerivationFP64TypeNode.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.substrait.derivation; +package org.apache.gluten.substrait.derivation; import io.substrait.proto.DerivationExpression; import io.substrait.proto.Type; diff --git a/gluten-core/src/main/java/io/glutenproject/substrait/expression/AggregateFunctionNode.java b/gluten-core/src/main/java/org/apache/gluten/substrait/expression/AggregateFunctionNode.java similarity index 96% rename from gluten-core/src/main/java/io/glutenproject/substrait/expression/AggregateFunctionNode.java rename to gluten-core/src/main/java/org/apache/gluten/substrait/expression/AggregateFunctionNode.java index ac1500fbb90d..600f1570452d 100644 --- a/gluten-core/src/main/java/io/glutenproject/substrait/expression/AggregateFunctionNode.java +++ b/gluten-core/src/main/java/org/apache/gluten/substrait/expression/AggregateFunctionNode.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.substrait.expression; +package org.apache.gluten.substrait.expression; -import io.glutenproject.substrait.type.TypeNode; +import org.apache.gluten.substrait.type.TypeNode; import io.substrait.proto.AggregateFunction; import io.substrait.proto.AggregationPhase; diff --git a/gluten-core/src/main/java/io/glutenproject/substrait/expression/BinaryLiteralNode.java b/gluten-core/src/main/java/org/apache/gluten/substrait/expression/BinaryLiteralNode.java similarity index 89% rename from gluten-core/src/main/java/io/glutenproject/substrait/expression/BinaryLiteralNode.java rename to gluten-core/src/main/java/org/apache/gluten/substrait/expression/BinaryLiteralNode.java index 64e1fac4164b..864aeb741a15 100644 --- a/gluten-core/src/main/java/io/glutenproject/substrait/expression/BinaryLiteralNode.java +++ b/gluten-core/src/main/java/org/apache/gluten/substrait/expression/BinaryLiteralNode.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.substrait.expression; +package org.apache.gluten.substrait.expression; -import io.glutenproject.substrait.type.BinaryTypeNode; -import io.glutenproject.substrait.type.TypeNode; +import org.apache.gluten.substrait.type.BinaryTypeNode; +import org.apache.gluten.substrait.type.TypeNode; import com.google.protobuf.ByteString; import io.substrait.proto.Expression.Literal.Builder; diff --git a/gluten-core/src/main/java/io/glutenproject/substrait/expression/BooleanLiteralNode.java b/gluten-core/src/main/java/org/apache/gluten/substrait/expression/BooleanLiteralNode.java similarity index 89% rename from gluten-core/src/main/java/io/glutenproject/substrait/expression/BooleanLiteralNode.java rename to gluten-core/src/main/java/org/apache/gluten/substrait/expression/BooleanLiteralNode.java index 53c073b3032c..dcee247b9df1 100644 --- a/gluten-core/src/main/java/io/glutenproject/substrait/expression/BooleanLiteralNode.java +++ b/gluten-core/src/main/java/org/apache/gluten/substrait/expression/BooleanLiteralNode.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.substrait.expression; +package org.apache.gluten.substrait.expression; -import io.glutenproject.substrait.type.BooleanTypeNode; -import io.glutenproject.substrait.type.TypeNode; +import org.apache.gluten.substrait.type.BooleanTypeNode; +import org.apache.gluten.substrait.type.TypeNode; import io.substrait.proto.Expression.Literal.Builder; diff --git a/gluten-core/src/main/java/io/glutenproject/substrait/expression/ByteLiteralNode.java b/gluten-core/src/main/java/org/apache/gluten/substrait/expression/ByteLiteralNode.java similarity index 89% rename from gluten-core/src/main/java/io/glutenproject/substrait/expression/ByteLiteralNode.java rename to gluten-core/src/main/java/org/apache/gluten/substrait/expression/ByteLiteralNode.java index ba35a3a65006..7042ea9ca145 100644 --- a/gluten-core/src/main/java/io/glutenproject/substrait/expression/ByteLiteralNode.java +++ b/gluten-core/src/main/java/org/apache/gluten/substrait/expression/ByteLiteralNode.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.substrait.expression; +package org.apache.gluten.substrait.expression; -import io.glutenproject.substrait.type.I8TypeNode; -import io.glutenproject.substrait.type.TypeNode; +import org.apache.gluten.substrait.type.I8TypeNode; +import org.apache.gluten.substrait.type.TypeNode; import io.substrait.proto.Expression.Literal.Builder; diff --git a/gluten-core/src/main/java/io/glutenproject/substrait/expression/CastNode.java b/gluten-core/src/main/java/org/apache/gluten/substrait/expression/CastNode.java similarity index 94% rename from gluten-core/src/main/java/io/glutenproject/substrait/expression/CastNode.java rename to gluten-core/src/main/java/org/apache/gluten/substrait/expression/CastNode.java index 00253b3b08b5..1acbcf6acaa3 100644 --- a/gluten-core/src/main/java/io/glutenproject/substrait/expression/CastNode.java +++ b/gluten-core/src/main/java/org/apache/gluten/substrait/expression/CastNode.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.substrait.expression; +package org.apache.gluten.substrait.expression; -import io.glutenproject.substrait.type.TypeNode; +import org.apache.gluten.substrait.type.TypeNode; import io.substrait.proto.Expression; diff --git a/gluten-core/src/main/java/io/glutenproject/substrait/expression/DateLiteralNode.java b/gluten-core/src/main/java/org/apache/gluten/substrait/expression/DateLiteralNode.java similarity index 89% rename from gluten-core/src/main/java/io/glutenproject/substrait/expression/DateLiteralNode.java rename to gluten-core/src/main/java/org/apache/gluten/substrait/expression/DateLiteralNode.java index e591b48117e3..2c79f816124e 100644 --- a/gluten-core/src/main/java/io/glutenproject/substrait/expression/DateLiteralNode.java +++ b/gluten-core/src/main/java/org/apache/gluten/substrait/expression/DateLiteralNode.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.substrait.expression; +package org.apache.gluten.substrait.expression; -import io.glutenproject.substrait.type.DateTypeNode; -import io.glutenproject.substrait.type.TypeNode; +import org.apache.gluten.substrait.type.DateTypeNode; +import org.apache.gluten.substrait.type.TypeNode; import io.substrait.proto.Expression.Literal.Builder; diff --git a/gluten-core/src/main/java/io/glutenproject/substrait/expression/DecimalLiteralNode.java b/gluten-core/src/main/java/org/apache/gluten/substrait/expression/DecimalLiteralNode.java similarity index 96% rename from gluten-core/src/main/java/io/glutenproject/substrait/expression/DecimalLiteralNode.java rename to gluten-core/src/main/java/org/apache/gluten/substrait/expression/DecimalLiteralNode.java index a70ea92e1611..cc2e7a84dca8 100644 --- a/gluten-core/src/main/java/io/glutenproject/substrait/expression/DecimalLiteralNode.java +++ b/gluten-core/src/main/java/org/apache/gluten/substrait/expression/DecimalLiteralNode.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.substrait.expression; +package org.apache.gluten.substrait.expression; -import io.glutenproject.substrait.type.TypeBuilder; -import io.glutenproject.substrait.type.TypeNode; +import org.apache.gluten.substrait.type.TypeBuilder; +import org.apache.gluten.substrait.type.TypeNode; import com.google.protobuf.ByteString; import io.substrait.proto.Expression; diff --git a/gluten-core/src/main/java/io/glutenproject/substrait/expression/DoubleLiteralNode.java b/gluten-core/src/main/java/org/apache/gluten/substrait/expression/DoubleLiteralNode.java similarity index 89% rename from gluten-core/src/main/java/io/glutenproject/substrait/expression/DoubleLiteralNode.java rename to gluten-core/src/main/java/org/apache/gluten/substrait/expression/DoubleLiteralNode.java index e16f7075ab76..f36fc54859bd 100644 --- a/gluten-core/src/main/java/io/glutenproject/substrait/expression/DoubleLiteralNode.java +++ b/gluten-core/src/main/java/org/apache/gluten/substrait/expression/DoubleLiteralNode.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.substrait.expression; +package org.apache.gluten.substrait.expression; -import io.glutenproject.substrait.type.FP64TypeNode; -import io.glutenproject.substrait.type.TypeNode; +import org.apache.gluten.substrait.type.FP64TypeNode; +import org.apache.gluten.substrait.type.TypeNode; import io.substrait.proto.Expression.Literal.Builder; diff --git a/gluten-core/src/main/java/io/glutenproject/substrait/expression/ExpressionBuilder.java b/gluten-core/src/main/java/org/apache/gluten/substrait/expression/ExpressionBuilder.java similarity index 98% rename from gluten-core/src/main/java/io/glutenproject/substrait/expression/ExpressionBuilder.java rename to gluten-core/src/main/java/org/apache/gluten/substrait/expression/ExpressionBuilder.java index 6197ded9e5ac..8345ce04bcbe 100644 --- a/gluten-core/src/main/java/io/glutenproject/substrait/expression/ExpressionBuilder.java +++ b/gluten-core/src/main/java/org/apache/gluten/substrait/expression/ExpressionBuilder.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.substrait.expression; +package org.apache.gluten.substrait.expression; -import io.glutenproject.expression.ConverterUtils; -import io.glutenproject.substrait.type.*; +import org.apache.gluten.expression.ConverterUtils; +import org.apache.gluten.substrait.type.*; import org.apache.spark.sql.catalyst.InternalRow; import org.apache.spark.sql.catalyst.util.ArrayData; diff --git a/gluten-core/src/main/java/io/glutenproject/substrait/expression/ExpressionNode.java b/gluten-core/src/main/java/org/apache/gluten/substrait/expression/ExpressionNode.java similarity index 95% rename from gluten-core/src/main/java/io/glutenproject/substrait/expression/ExpressionNode.java rename to gluten-core/src/main/java/org/apache/gluten/substrait/expression/ExpressionNode.java index 2bd65e8ce31b..e0d248e79a5a 100644 --- a/gluten-core/src/main/java/io/glutenproject/substrait/expression/ExpressionNode.java +++ b/gluten-core/src/main/java/org/apache/gluten/substrait/expression/ExpressionNode.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.substrait.expression; +package org.apache.gluten.substrait.expression; import io.substrait.proto.Expression; diff --git a/gluten-core/src/main/java/io/glutenproject/substrait/expression/FloatLiteralNode.java b/gluten-core/src/main/java/org/apache/gluten/substrait/expression/FloatLiteralNode.java similarity index 89% rename from gluten-core/src/main/java/io/glutenproject/substrait/expression/FloatLiteralNode.java rename to gluten-core/src/main/java/org/apache/gluten/substrait/expression/FloatLiteralNode.java index 7a1a876f1d18..5f1b5b0a66c1 100644 --- a/gluten-core/src/main/java/io/glutenproject/substrait/expression/FloatLiteralNode.java +++ b/gluten-core/src/main/java/org/apache/gluten/substrait/expression/FloatLiteralNode.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.substrait.expression; +package org.apache.gluten.substrait.expression; -import io.glutenproject.substrait.type.FP32TypeNode; -import io.glutenproject.substrait.type.TypeNode; +import org.apache.gluten.substrait.type.FP32TypeNode; +import org.apache.gluten.substrait.type.TypeNode; import io.substrait.proto.Expression.Literal.Builder; diff --git a/gluten-core/src/main/java/io/glutenproject/substrait/expression/IfThenNode.java b/gluten-core/src/main/java/org/apache/gluten/substrait/expression/IfThenNode.java similarity index 97% rename from gluten-core/src/main/java/io/glutenproject/substrait/expression/IfThenNode.java rename to gluten-core/src/main/java/org/apache/gluten/substrait/expression/IfThenNode.java index 40133ccf6af5..3ea85ba8c96f 100644 --- a/gluten-core/src/main/java/io/glutenproject/substrait/expression/IfThenNode.java +++ b/gluten-core/src/main/java/org/apache/gluten/substrait/expression/IfThenNode.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.substrait.expression; +package org.apache.gluten.substrait.expression; import io.substrait.proto.Expression; diff --git a/gluten-core/src/main/java/io/glutenproject/substrait/expression/IntLiteralNode.java b/gluten-core/src/main/java/org/apache/gluten/substrait/expression/IntLiteralNode.java similarity index 89% rename from gluten-core/src/main/java/io/glutenproject/substrait/expression/IntLiteralNode.java rename to gluten-core/src/main/java/org/apache/gluten/substrait/expression/IntLiteralNode.java index c851ba34f940..79ef659b1217 100644 --- a/gluten-core/src/main/java/io/glutenproject/substrait/expression/IntLiteralNode.java +++ b/gluten-core/src/main/java/org/apache/gluten/substrait/expression/IntLiteralNode.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.substrait.expression; +package org.apache.gluten.substrait.expression; -import io.glutenproject.substrait.type.I32TypeNode; -import io.glutenproject.substrait.type.TypeNode; +import org.apache.gluten.substrait.type.I32TypeNode; +import org.apache.gluten.substrait.type.TypeNode; import io.substrait.proto.Expression.Literal.Builder; diff --git a/gluten-core/src/main/java/io/glutenproject/substrait/expression/ListLiteralNode.java b/gluten-core/src/main/java/org/apache/gluten/substrait/expression/ListLiteralNode.java similarity index 93% rename from gluten-core/src/main/java/io/glutenproject/substrait/expression/ListLiteralNode.java rename to gluten-core/src/main/java/org/apache/gluten/substrait/expression/ListLiteralNode.java index 29c486fa22d2..13d0c7948352 100644 --- a/gluten-core/src/main/java/io/glutenproject/substrait/expression/ListLiteralNode.java +++ b/gluten-core/src/main/java/org/apache/gluten/substrait/expression/ListLiteralNode.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.substrait.expression; +package org.apache.gluten.substrait.expression; -import io.glutenproject.substrait.type.ListNode; -import io.glutenproject.substrait.type.TypeNode; +import org.apache.gluten.substrait.type.ListNode; +import org.apache.gluten.substrait.type.TypeNode; import io.substrait.proto.Expression; import io.substrait.proto.Expression.Literal.Builder; diff --git a/gluten-core/src/main/java/io/glutenproject/substrait/expression/LiteralNode.java b/gluten-core/src/main/java/org/apache/gluten/substrait/expression/LiteralNode.java similarity index 93% rename from gluten-core/src/main/java/io/glutenproject/substrait/expression/LiteralNode.java rename to gluten-core/src/main/java/org/apache/gluten/substrait/expression/LiteralNode.java index c872f2d0f699..5363bbe2ec78 100644 --- a/gluten-core/src/main/java/io/glutenproject/substrait/expression/LiteralNode.java +++ b/gluten-core/src/main/java/org/apache/gluten/substrait/expression/LiteralNode.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.substrait.expression; +package org.apache.gluten.substrait.expression; -import io.glutenproject.substrait.type.TypeNode; +import org.apache.gluten.substrait.type.TypeNode; import io.substrait.proto.Expression; diff --git a/gluten-core/src/main/java/io/glutenproject/substrait/expression/LiteralNodeWithValue.java b/gluten-core/src/main/java/org/apache/gluten/substrait/expression/LiteralNodeWithValue.java similarity index 94% rename from gluten-core/src/main/java/io/glutenproject/substrait/expression/LiteralNodeWithValue.java rename to gluten-core/src/main/java/org/apache/gluten/substrait/expression/LiteralNodeWithValue.java index bfce65177933..d452d17e6f27 100644 --- a/gluten-core/src/main/java/io/glutenproject/substrait/expression/LiteralNodeWithValue.java +++ b/gluten-core/src/main/java/org/apache/gluten/substrait/expression/LiteralNodeWithValue.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.substrait.expression; +package org.apache.gluten.substrait.expression; -import io.glutenproject.substrait.type.*; +import org.apache.gluten.substrait.type.*; import io.substrait.proto.Expression; diff --git a/gluten-core/src/main/java/io/glutenproject/substrait/expression/LongLiteralNode.java b/gluten-core/src/main/java/org/apache/gluten/substrait/expression/LongLiteralNode.java similarity index 89% rename from gluten-core/src/main/java/io/glutenproject/substrait/expression/LongLiteralNode.java rename to gluten-core/src/main/java/org/apache/gluten/substrait/expression/LongLiteralNode.java index 936eb81cb260..334e09912d1c 100644 --- a/gluten-core/src/main/java/io/glutenproject/substrait/expression/LongLiteralNode.java +++ b/gluten-core/src/main/java/org/apache/gluten/substrait/expression/LongLiteralNode.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.substrait.expression; +package org.apache.gluten.substrait.expression; -import io.glutenproject.substrait.type.I64TypeNode; -import io.glutenproject.substrait.type.TypeNode; +import org.apache.gluten.substrait.type.I64TypeNode; +import org.apache.gluten.substrait.type.TypeNode; import io.substrait.proto.Expression.Literal.Builder; diff --git a/gluten-core/src/main/java/io/glutenproject/substrait/expression/MapLiteralNode.java b/gluten-core/src/main/java/org/apache/gluten/substrait/expression/MapLiteralNode.java similarity index 94% rename from gluten-core/src/main/java/io/glutenproject/substrait/expression/MapLiteralNode.java rename to gluten-core/src/main/java/org/apache/gluten/substrait/expression/MapLiteralNode.java index 1e2f7c6baa19..ea0b8bee3e3e 100644 --- a/gluten-core/src/main/java/io/glutenproject/substrait/expression/MapLiteralNode.java +++ b/gluten-core/src/main/java/org/apache/gluten/substrait/expression/MapLiteralNode.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.substrait.expression; +package org.apache.gluten.substrait.expression; -import io.glutenproject.substrait.type.MapNode; -import io.glutenproject.substrait.type.TypeNode; +import org.apache.gluten.substrait.type.MapNode; +import org.apache.gluten.substrait.type.TypeNode; import io.substrait.proto.Expression; import io.substrait.proto.Expression.Literal.Builder; diff --git a/gluten-core/src/main/java/io/glutenproject/substrait/expression/NullLiteralNode.java b/gluten-core/src/main/java/org/apache/gluten/substrait/expression/NullLiteralNode.java similarity index 92% rename from gluten-core/src/main/java/io/glutenproject/substrait/expression/NullLiteralNode.java rename to gluten-core/src/main/java/org/apache/gluten/substrait/expression/NullLiteralNode.java index 9c5b57f35e71..5eba55ddd27a 100644 --- a/gluten-core/src/main/java/io/glutenproject/substrait/expression/NullLiteralNode.java +++ b/gluten-core/src/main/java/org/apache/gluten/substrait/expression/NullLiteralNode.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.substrait.expression; +package org.apache.gluten.substrait.expression; -import io.glutenproject.substrait.type.TypeNode; +import org.apache.gluten.substrait.type.TypeNode; import io.substrait.proto.Expression; diff --git a/gluten-core/src/main/java/io/glutenproject/substrait/expression/ScalarFunctionNode.java b/gluten-core/src/main/java/org/apache/gluten/substrait/expression/ScalarFunctionNode.java similarity index 95% rename from gluten-core/src/main/java/io/glutenproject/substrait/expression/ScalarFunctionNode.java rename to gluten-core/src/main/java/org/apache/gluten/substrait/expression/ScalarFunctionNode.java index c5adedda1f8b..fa24dad880c4 100644 --- a/gluten-core/src/main/java/io/glutenproject/substrait/expression/ScalarFunctionNode.java +++ b/gluten-core/src/main/java/org/apache/gluten/substrait/expression/ScalarFunctionNode.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.substrait.expression; +package org.apache.gluten.substrait.expression; -import io.glutenproject.substrait.type.TypeNode; +import org.apache.gluten.substrait.type.TypeNode; import io.substrait.proto.Expression; import io.substrait.proto.FunctionArgument; diff --git a/gluten-core/src/main/java/io/glutenproject/substrait/expression/SelectionNode.java b/gluten-core/src/main/java/org/apache/gluten/substrait/expression/SelectionNode.java similarity index 98% rename from gluten-core/src/main/java/io/glutenproject/substrait/expression/SelectionNode.java rename to gluten-core/src/main/java/org/apache/gluten/substrait/expression/SelectionNode.java index 7dc5e53cb15c..e3a95bccc333 100644 --- a/gluten-core/src/main/java/io/glutenproject/substrait/expression/SelectionNode.java +++ b/gluten-core/src/main/java/org/apache/gluten/substrait/expression/SelectionNode.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.substrait.expression; +package org.apache.gluten.substrait.expression; import io.substrait.proto.Expression; diff --git a/gluten-core/src/main/java/io/glutenproject/substrait/expression/ShortLiteralNode.java b/gluten-core/src/main/java/org/apache/gluten/substrait/expression/ShortLiteralNode.java similarity index 89% rename from gluten-core/src/main/java/io/glutenproject/substrait/expression/ShortLiteralNode.java rename to gluten-core/src/main/java/org/apache/gluten/substrait/expression/ShortLiteralNode.java index 0dc6dfc8ebc6..c352a1106197 100644 --- a/gluten-core/src/main/java/io/glutenproject/substrait/expression/ShortLiteralNode.java +++ b/gluten-core/src/main/java/org/apache/gluten/substrait/expression/ShortLiteralNode.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.substrait.expression; +package org.apache.gluten.substrait.expression; -import io.glutenproject.substrait.type.I16TypeNode; -import io.glutenproject.substrait.type.TypeNode; +import org.apache.gluten.substrait.type.I16TypeNode; +import org.apache.gluten.substrait.type.TypeNode; import io.substrait.proto.Expression.Literal.Builder; diff --git a/gluten-core/src/main/java/io/glutenproject/substrait/expression/SingularOrListNode.java b/gluten-core/src/main/java/org/apache/gluten/substrait/expression/SingularOrListNode.java similarity index 97% rename from gluten-core/src/main/java/io/glutenproject/substrait/expression/SingularOrListNode.java rename to gluten-core/src/main/java/org/apache/gluten/substrait/expression/SingularOrListNode.java index 9e8f50ce8752..c55791a08535 100644 --- a/gluten-core/src/main/java/io/glutenproject/substrait/expression/SingularOrListNode.java +++ b/gluten-core/src/main/java/org/apache/gluten/substrait/expression/SingularOrListNode.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.substrait.expression; +package org.apache.gluten.substrait.expression; import io.substrait.proto.Expression; diff --git a/gluten-core/src/main/java/io/glutenproject/substrait/expression/StringLiteralNode.java b/gluten-core/src/main/java/org/apache/gluten/substrait/expression/StringLiteralNode.java similarity index 89% rename from gluten-core/src/main/java/io/glutenproject/substrait/expression/StringLiteralNode.java rename to gluten-core/src/main/java/org/apache/gluten/substrait/expression/StringLiteralNode.java index 74422a4d26b3..c17ecc5bb3e0 100644 --- a/gluten-core/src/main/java/io/glutenproject/substrait/expression/StringLiteralNode.java +++ b/gluten-core/src/main/java/org/apache/gluten/substrait/expression/StringLiteralNode.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.substrait.expression; +package org.apache.gluten.substrait.expression; -import io.glutenproject.substrait.type.StringTypeNode; -import io.glutenproject.substrait.type.TypeNode; +import org.apache.gluten.substrait.type.StringTypeNode; +import org.apache.gluten.substrait.type.TypeNode; import io.substrait.proto.Expression.Literal.Builder; diff --git a/gluten-core/src/main/java/io/glutenproject/substrait/expression/StringMapNode.java b/gluten-core/src/main/java/org/apache/gluten/substrait/expression/StringMapNode.java similarity index 97% rename from gluten-core/src/main/java/io/glutenproject/substrait/expression/StringMapNode.java rename to gluten-core/src/main/java/org/apache/gluten/substrait/expression/StringMapNode.java index b9ad7120320a..9b69e3a79851 100644 --- a/gluten-core/src/main/java/io/glutenproject/substrait/expression/StringMapNode.java +++ b/gluten-core/src/main/java/org/apache/gluten/substrait/expression/StringMapNode.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.substrait.expression; +package org.apache.gluten.substrait.expression; import io.substrait.proto.Expression; diff --git a/gluten-core/src/main/java/io/glutenproject/substrait/expression/StructLiteralNode.java b/gluten-core/src/main/java/org/apache/gluten/substrait/expression/StructLiteralNode.java similarity index 97% rename from gluten-core/src/main/java/io/glutenproject/substrait/expression/StructLiteralNode.java rename to gluten-core/src/main/java/org/apache/gluten/substrait/expression/StructLiteralNode.java index 0fd54e6757b0..0912b53d2c99 100644 --- a/gluten-core/src/main/java/io/glutenproject/substrait/expression/StructLiteralNode.java +++ b/gluten-core/src/main/java/org/apache/gluten/substrait/expression/StructLiteralNode.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.substrait.expression; +package org.apache.gluten.substrait.expression; -import io.glutenproject.substrait.type.*; +import org.apache.gluten.substrait.type.*; import io.substrait.proto.Expression; import io.substrait.proto.Expression.Literal.Builder; diff --git a/gluten-core/src/main/java/io/glutenproject/substrait/expression/TimestampLiteralNode.java b/gluten-core/src/main/java/org/apache/gluten/substrait/expression/TimestampLiteralNode.java similarity index 88% rename from gluten-core/src/main/java/io/glutenproject/substrait/expression/TimestampLiteralNode.java rename to gluten-core/src/main/java/org/apache/gluten/substrait/expression/TimestampLiteralNode.java index 22fe38c9aefe..ec253edbc4a3 100644 --- a/gluten-core/src/main/java/io/glutenproject/substrait/expression/TimestampLiteralNode.java +++ b/gluten-core/src/main/java/org/apache/gluten/substrait/expression/TimestampLiteralNode.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.substrait.expression; +package org.apache.gluten.substrait.expression; -import io.glutenproject.substrait.type.TimestampTypeNode; -import io.glutenproject.substrait.type.TypeNode; +import org.apache.gluten.substrait.type.TimestampTypeNode; +import org.apache.gluten.substrait.type.TypeNode; import io.substrait.proto.Expression.Literal.Builder; diff --git a/gluten-core/src/main/java/io/glutenproject/substrait/expression/WindowFunctionNode.java b/gluten-core/src/main/java/org/apache/gluten/substrait/expression/WindowFunctionNode.java similarity index 98% rename from gluten-core/src/main/java/io/glutenproject/substrait/expression/WindowFunctionNode.java rename to gluten-core/src/main/java/org/apache/gluten/substrait/expression/WindowFunctionNode.java index 8d69e31adb1a..67d0d6e575ff 100644 --- a/gluten-core/src/main/java/io/glutenproject/substrait/expression/WindowFunctionNode.java +++ b/gluten-core/src/main/java/org/apache/gluten/substrait/expression/WindowFunctionNode.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.substrait.expression; +package org.apache.gluten.substrait.expression; -import io.glutenproject.substrait.type.TypeNode; +import org.apache.gluten.substrait.type.TypeNode; import io.substrait.proto.Expression; import io.substrait.proto.FunctionArgument; diff --git a/gluten-core/src/main/java/io/glutenproject/substrait/extensions/AdvancedExtensionNode.java b/gluten-core/src/main/java/org/apache/gluten/substrait/extensions/AdvancedExtensionNode.java similarity index 97% rename from gluten-core/src/main/java/io/glutenproject/substrait/extensions/AdvancedExtensionNode.java rename to gluten-core/src/main/java/org/apache/gluten/substrait/extensions/AdvancedExtensionNode.java index ea72bc6c722f..f313888d4ffb 100644 --- a/gluten-core/src/main/java/io/glutenproject/substrait/extensions/AdvancedExtensionNode.java +++ b/gluten-core/src/main/java/org/apache/gluten/substrait/extensions/AdvancedExtensionNode.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.substrait.extensions; +package org.apache.gluten.substrait.extensions; import com.google.protobuf.Any; import io.substrait.proto.AdvancedExtension; diff --git a/gluten-core/src/main/java/io/glutenproject/substrait/extensions/ExtensionBuilder.java b/gluten-core/src/main/java/org/apache/gluten/substrait/extensions/ExtensionBuilder.java similarity index 96% rename from gluten-core/src/main/java/io/glutenproject/substrait/extensions/ExtensionBuilder.java rename to gluten-core/src/main/java/org/apache/gluten/substrait/extensions/ExtensionBuilder.java index 056892e0721e..215116a57d11 100644 --- a/gluten-core/src/main/java/io/glutenproject/substrait/extensions/ExtensionBuilder.java +++ b/gluten-core/src/main/java/org/apache/gluten/substrait/extensions/ExtensionBuilder.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.substrait.extensions; +package org.apache.gluten.substrait.extensions; import com.google.protobuf.Any; diff --git a/gluten-core/src/main/java/io/glutenproject/substrait/extensions/FunctionMappingNode.java b/gluten-core/src/main/java/org/apache/gluten/substrait/extensions/FunctionMappingNode.java similarity index 97% rename from gluten-core/src/main/java/io/glutenproject/substrait/extensions/FunctionMappingNode.java rename to gluten-core/src/main/java/org/apache/gluten/substrait/extensions/FunctionMappingNode.java index 62f84483012d..71ce48a876c7 100644 --- a/gluten-core/src/main/java/io/glutenproject/substrait/extensions/FunctionMappingNode.java +++ b/gluten-core/src/main/java/org/apache/gluten/substrait/extensions/FunctionMappingNode.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.substrait.extensions; +package org.apache.gluten.substrait.extensions; import io.substrait.proto.SimpleExtensionDeclaration; diff --git a/gluten-core/src/main/java/io/glutenproject/substrait/plan/PlanBuilder.java b/gluten-core/src/main/java/org/apache/gluten/substrait/plan/PlanBuilder.java similarity index 88% rename from gluten-core/src/main/java/io/glutenproject/substrait/plan/PlanBuilder.java rename to gluten-core/src/main/java/org/apache/gluten/substrait/plan/PlanBuilder.java index 5ea68926088c..f55393de8951 100644 --- a/gluten-core/src/main/java/io/glutenproject/substrait/plan/PlanBuilder.java +++ b/gluten-core/src/main/java/org/apache/gluten/substrait/plan/PlanBuilder.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.substrait.plan; +package org.apache.gluten.substrait.plan; -import io.glutenproject.substrait.SubstraitContext; -import io.glutenproject.substrait.extensions.AdvancedExtensionNode; -import io.glutenproject.substrait.extensions.ExtensionBuilder; -import io.glutenproject.substrait.extensions.FunctionMappingNode; -import io.glutenproject.substrait.rel.RelNode; -import io.glutenproject.substrait.type.TypeNode; +import org.apache.gluten.substrait.SubstraitContext; +import org.apache.gluten.substrait.extensions.AdvancedExtensionNode; +import org.apache.gluten.substrait.extensions.ExtensionBuilder; +import org.apache.gluten.substrait.extensions.FunctionMappingNode; +import org.apache.gluten.substrait.rel.RelNode; +import org.apache.gluten.substrait.type.TypeNode; import java.util.ArrayList; import java.util.List; diff --git a/gluten-core/src/main/java/io/glutenproject/substrait/plan/PlanNode.java b/gluten-core/src/main/java/org/apache/gluten/substrait/plan/PlanNode.java similarity index 91% rename from gluten-core/src/main/java/io/glutenproject/substrait/plan/PlanNode.java rename to gluten-core/src/main/java/org/apache/gluten/substrait/plan/PlanNode.java index 498dfe7b0f50..87273729194f 100644 --- a/gluten-core/src/main/java/io/glutenproject/substrait/plan/PlanNode.java +++ b/gluten-core/src/main/java/org/apache/gluten/substrait/plan/PlanNode.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.substrait.plan; +package org.apache.gluten.substrait.plan; -import io.glutenproject.substrait.extensions.AdvancedExtensionNode; -import io.glutenproject.substrait.extensions.FunctionMappingNode; -import io.glutenproject.substrait.rel.RelNode; -import io.glutenproject.substrait.type.TypeNode; +import org.apache.gluten.substrait.extensions.AdvancedExtensionNode; +import org.apache.gluten.substrait.extensions.FunctionMappingNode; +import org.apache.gluten.substrait.rel.RelNode; +import org.apache.gluten.substrait.type.TypeNode; import io.substrait.proto.Plan; import io.substrait.proto.PlanRel; diff --git a/gluten-core/src/main/java/io/glutenproject/substrait/rel/AggregateRelNode.java b/gluten-core/src/main/java/org/apache/gluten/substrait/rel/AggregateRelNode.java similarity index 93% rename from gluten-core/src/main/java/io/glutenproject/substrait/rel/AggregateRelNode.java rename to gluten-core/src/main/java/org/apache/gluten/substrait/rel/AggregateRelNode.java index 8db80f9ebc61..b75df46d639f 100644 --- a/gluten-core/src/main/java/io/glutenproject/substrait/rel/AggregateRelNode.java +++ b/gluten-core/src/main/java/org/apache/gluten/substrait/rel/AggregateRelNode.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.substrait.rel; +package org.apache.gluten.substrait.rel; -import io.glutenproject.substrait.expression.AggregateFunctionNode; -import io.glutenproject.substrait.expression.ExpressionNode; -import io.glutenproject.substrait.extensions.AdvancedExtensionNode; +import org.apache.gluten.substrait.expression.AggregateFunctionNode; +import org.apache.gluten.substrait.expression.ExpressionNode; +import org.apache.gluten.substrait.extensions.AdvancedExtensionNode; import io.substrait.proto.AggregateRel; import io.substrait.proto.Rel; diff --git a/gluten-core/src/main/java/io/glutenproject/substrait/rel/CrossRelNode.java b/gluten-core/src/main/java/org/apache/gluten/substrait/rel/CrossRelNode.java similarity index 93% rename from gluten-core/src/main/java/io/glutenproject/substrait/rel/CrossRelNode.java rename to gluten-core/src/main/java/org/apache/gluten/substrait/rel/CrossRelNode.java index 34a20ee18e59..338a10b4d6c3 100644 --- a/gluten-core/src/main/java/io/glutenproject/substrait/rel/CrossRelNode.java +++ b/gluten-core/src/main/java/org/apache/gluten/substrait/rel/CrossRelNode.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.substrait.rel; +package org.apache.gluten.substrait.rel; -import io.glutenproject.substrait.expression.ExpressionNode; -import io.glutenproject.substrait.extensions.AdvancedExtensionNode; +import org.apache.gluten.substrait.expression.ExpressionNode; +import org.apache.gluten.substrait.extensions.AdvancedExtensionNode; import io.substrait.proto.CrossRel; import io.substrait.proto.Rel; diff --git a/gluten-core/src/main/java/io/glutenproject/substrait/rel/ExpandRelNode.java b/gluten-core/src/main/java/org/apache/gluten/substrait/rel/ExpandRelNode.java similarity index 94% rename from gluten-core/src/main/java/io/glutenproject/substrait/rel/ExpandRelNode.java rename to gluten-core/src/main/java/org/apache/gluten/substrait/rel/ExpandRelNode.java index 49f714b8a7f6..25d007e5641f 100644 --- a/gluten-core/src/main/java/io/glutenproject/substrait/rel/ExpandRelNode.java +++ b/gluten-core/src/main/java/org/apache/gluten/substrait/rel/ExpandRelNode.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.substrait.rel; +package org.apache.gluten.substrait.rel; -import io.glutenproject.substrait.expression.ExpressionNode; -import io.glutenproject.substrait.extensions.AdvancedExtensionNode; +import org.apache.gluten.substrait.expression.ExpressionNode; +import org.apache.gluten.substrait.extensions.AdvancedExtensionNode; import io.substrait.proto.ExpandRel; import io.substrait.proto.Rel; diff --git a/gluten-core/src/main/java/io/glutenproject/substrait/rel/ExtensionTableBuilder.java b/gluten-core/src/main/java/org/apache/gluten/substrait/rel/ExtensionTableBuilder.java similarity index 97% rename from gluten-core/src/main/java/io/glutenproject/substrait/rel/ExtensionTableBuilder.java rename to gluten-core/src/main/java/org/apache/gluten/substrait/rel/ExtensionTableBuilder.java index 086d475b0f77..41765ec69dc3 100644 --- a/gluten-core/src/main/java/io/glutenproject/substrait/rel/ExtensionTableBuilder.java +++ b/gluten-core/src/main/java/org/apache/gluten/substrait/rel/ExtensionTableBuilder.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.substrait.rel; +package org.apache.gluten.substrait.rel; import java.util.List; import java.util.Map; diff --git a/gluten-core/src/main/java/io/glutenproject/substrait/rel/ExtensionTableNode.java b/gluten-core/src/main/java/org/apache/gluten/substrait/rel/ExtensionTableNode.java similarity index 98% rename from gluten-core/src/main/java/io/glutenproject/substrait/rel/ExtensionTableNode.java rename to gluten-core/src/main/java/org/apache/gluten/substrait/rel/ExtensionTableNode.java index 583ca9549a42..99bff401798f 100644 --- a/gluten-core/src/main/java/io/glutenproject/substrait/rel/ExtensionTableNode.java +++ b/gluten-core/src/main/java/org/apache/gluten/substrait/rel/ExtensionTableNode.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.substrait.rel; +package org.apache.gluten.substrait.rel; -import io.glutenproject.backendsapi.BackendsApiManager; +import org.apache.gluten.backendsapi.BackendsApiManager; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.protobuf.StringValue; diff --git a/gluten-core/src/main/java/io/glutenproject/substrait/rel/FetchRelNode.java b/gluten-core/src/main/java/org/apache/gluten/substrait/rel/FetchRelNode.java similarity index 95% rename from gluten-core/src/main/java/io/glutenproject/substrait/rel/FetchRelNode.java rename to gluten-core/src/main/java/org/apache/gluten/substrait/rel/FetchRelNode.java index 192a73853d22..3c8b991c5b5e 100644 --- a/gluten-core/src/main/java/io/glutenproject/substrait/rel/FetchRelNode.java +++ b/gluten-core/src/main/java/org/apache/gluten/substrait/rel/FetchRelNode.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.substrait.rel; +package org.apache.gluten.substrait.rel; -import io.glutenproject.substrait.extensions.AdvancedExtensionNode; +import org.apache.gluten.substrait.extensions.AdvancedExtensionNode; import io.substrait.proto.FetchRel; import io.substrait.proto.Rel; diff --git a/gluten-core/src/main/java/io/glutenproject/substrait/rel/FilterRelNode.java b/gluten-core/src/main/java/org/apache/gluten/substrait/rel/FilterRelNode.java similarity index 92% rename from gluten-core/src/main/java/io/glutenproject/substrait/rel/FilterRelNode.java rename to gluten-core/src/main/java/org/apache/gluten/substrait/rel/FilterRelNode.java index 4def40fbfa9c..356b12b292ae 100644 --- a/gluten-core/src/main/java/io/glutenproject/substrait/rel/FilterRelNode.java +++ b/gluten-core/src/main/java/org/apache/gluten/substrait/rel/FilterRelNode.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.substrait.rel; +package org.apache.gluten.substrait.rel; -import io.glutenproject.substrait.expression.ExpressionNode; -import io.glutenproject.substrait.extensions.AdvancedExtensionNode; +import org.apache.gluten.substrait.expression.ExpressionNode; +import org.apache.gluten.substrait.extensions.AdvancedExtensionNode; import io.substrait.proto.FilterRel; import io.substrait.proto.Rel; diff --git a/gluten-core/src/main/java/io/glutenproject/substrait/rel/GenerateRelNode.java b/gluten-core/src/main/java/org/apache/gluten/substrait/rel/GenerateRelNode.java similarity index 93% rename from gluten-core/src/main/java/io/glutenproject/substrait/rel/GenerateRelNode.java rename to gluten-core/src/main/java/org/apache/gluten/substrait/rel/GenerateRelNode.java index 4a53b2bd08f7..dbe1f62ab10d 100644 --- a/gluten-core/src/main/java/io/glutenproject/substrait/rel/GenerateRelNode.java +++ b/gluten-core/src/main/java/org/apache/gluten/substrait/rel/GenerateRelNode.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.substrait.rel; +package org.apache.gluten.substrait.rel; -import io.glutenproject.substrait.expression.ExpressionNode; -import io.glutenproject.substrait.extensions.AdvancedExtensionNode; +import org.apache.gluten.substrait.expression.ExpressionNode; +import org.apache.gluten.substrait.extensions.AdvancedExtensionNode; import io.substrait.proto.GenerateRel; import io.substrait.proto.Rel; diff --git a/gluten-core/src/main/java/io/glutenproject/substrait/rel/InputIteratorRelNode.java b/gluten-core/src/main/java/org/apache/gluten/substrait/rel/InputIteratorRelNode.java similarity index 93% rename from gluten-core/src/main/java/io/glutenproject/substrait/rel/InputIteratorRelNode.java rename to gluten-core/src/main/java/org/apache/gluten/substrait/rel/InputIteratorRelNode.java index 7286aa9bd5b3..55b0e313be5b 100644 --- a/gluten-core/src/main/java/io/glutenproject/substrait/rel/InputIteratorRelNode.java +++ b/gluten-core/src/main/java/org/apache/gluten/substrait/rel/InputIteratorRelNode.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.substrait.rel; +package org.apache.gluten.substrait.rel; -import io.glutenproject.expression.ConverterUtils; -import io.glutenproject.substrait.type.TypeNode; +import org.apache.gluten.expression.ConverterUtils; +import org.apache.gluten.substrait.type.TypeNode; import io.substrait.proto.*; diff --git a/gluten-core/src/main/java/io/glutenproject/substrait/rel/JoinRelNode.java b/gluten-core/src/main/java/org/apache/gluten/substrait/rel/JoinRelNode.java similarity index 93% rename from gluten-core/src/main/java/io/glutenproject/substrait/rel/JoinRelNode.java rename to gluten-core/src/main/java/org/apache/gluten/substrait/rel/JoinRelNode.java index 0752172ddb25..714340cdf670 100644 --- a/gluten-core/src/main/java/io/glutenproject/substrait/rel/JoinRelNode.java +++ b/gluten-core/src/main/java/org/apache/gluten/substrait/rel/JoinRelNode.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.substrait.rel; +package org.apache.gluten.substrait.rel; -import io.glutenproject.substrait.expression.ExpressionNode; -import io.glutenproject.substrait.extensions.AdvancedExtensionNode; +import org.apache.gluten.substrait.expression.ExpressionNode; +import org.apache.gluten.substrait.extensions.AdvancedExtensionNode; import io.substrait.proto.JoinRel; import io.substrait.proto.Rel; diff --git a/gluten-core/src/main/java/io/glutenproject/substrait/rel/LocalFilesBuilder.java b/gluten-core/src/main/java/org/apache/gluten/substrait/rel/LocalFilesBuilder.java similarity index 97% rename from gluten-core/src/main/java/io/glutenproject/substrait/rel/LocalFilesBuilder.java rename to gluten-core/src/main/java/org/apache/gluten/substrait/rel/LocalFilesBuilder.java index 1f6eaabce18f..94acc83367f5 100644 --- a/gluten-core/src/main/java/io/glutenproject/substrait/rel/LocalFilesBuilder.java +++ b/gluten-core/src/main/java/org/apache/gluten/substrait/rel/LocalFilesBuilder.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.substrait.rel; +package org.apache.gluten.substrait.rel; import java.util.List; import java.util.Map; diff --git a/gluten-core/src/main/java/io/glutenproject/substrait/rel/LocalFilesNode.java b/gluten-core/src/main/java/org/apache/gluten/substrait/rel/LocalFilesNode.java similarity index 98% rename from gluten-core/src/main/java/io/glutenproject/substrait/rel/LocalFilesNode.java rename to gluten-core/src/main/java/org/apache/gluten/substrait/rel/LocalFilesNode.java index 2a48667093e7..428266b73d47 100644 --- a/gluten-core/src/main/java/io/glutenproject/substrait/rel/LocalFilesNode.java +++ b/gluten-core/src/main/java/org/apache/gluten/substrait/rel/LocalFilesNode.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.substrait.rel; +package org.apache.gluten.substrait.rel; -import io.glutenproject.GlutenConfig; -import io.glutenproject.expression.ConverterUtils; +import org.apache.gluten.GlutenConfig; +import org.apache.gluten.expression.ConverterUtils; import io.substrait.proto.NamedStruct; import io.substrait.proto.ReadRel; diff --git a/gluten-core/src/main/java/io/glutenproject/substrait/rel/ProjectRelNode.java b/gluten-core/src/main/java/org/apache/gluten/substrait/rel/ProjectRelNode.java similarity index 94% rename from gluten-core/src/main/java/io/glutenproject/substrait/rel/ProjectRelNode.java rename to gluten-core/src/main/java/org/apache/gluten/substrait/rel/ProjectRelNode.java index ee88390c74ed..d1cccd159582 100644 --- a/gluten-core/src/main/java/io/glutenproject/substrait/rel/ProjectRelNode.java +++ b/gluten-core/src/main/java/org/apache/gluten/substrait/rel/ProjectRelNode.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.substrait.rel; +package org.apache.gluten.substrait.rel; -import io.glutenproject.substrait.expression.ExpressionNode; -import io.glutenproject.substrait.extensions.AdvancedExtensionNode; +import org.apache.gluten.substrait.expression.ExpressionNode; +import org.apache.gluten.substrait.extensions.AdvancedExtensionNode; import io.substrait.proto.ProjectRel; import io.substrait.proto.Rel; diff --git a/gluten-core/src/main/java/io/glutenproject/substrait/rel/ReadRelNode.java b/gluten-core/src/main/java/org/apache/gluten/substrait/rel/ReadRelNode.java similarity index 91% rename from gluten-core/src/main/java/io/glutenproject/substrait/rel/ReadRelNode.java rename to gluten-core/src/main/java/org/apache/gluten/substrait/rel/ReadRelNode.java index 28f98c28f236..834ed6cf682f 100644 --- a/gluten-core/src/main/java/io/glutenproject/substrait/rel/ReadRelNode.java +++ b/gluten-core/src/main/java/org/apache/gluten/substrait/rel/ReadRelNode.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.substrait.rel; +package org.apache.gluten.substrait.rel; -import io.glutenproject.substrait.expression.ExpressionNode; -import io.glutenproject.substrait.extensions.AdvancedExtensionNode; -import io.glutenproject.substrait.type.ColumnTypeNode; -import io.glutenproject.substrait.type.TypeNode; +import org.apache.gluten.substrait.expression.ExpressionNode; +import org.apache.gluten.substrait.extensions.AdvancedExtensionNode; +import org.apache.gluten.substrait.type.ColumnTypeNode; +import org.apache.gluten.substrait.type.TypeNode; import io.substrait.proto.NamedStruct; import io.substrait.proto.ReadRel; diff --git a/gluten-core/src/main/java/io/glutenproject/substrait/rel/RelBuilder.java b/gluten-core/src/main/java/org/apache/gluten/substrait/rel/RelBuilder.java similarity index 94% rename from gluten-core/src/main/java/io/glutenproject/substrait/rel/RelBuilder.java rename to gluten-core/src/main/java/org/apache/gluten/substrait/rel/RelBuilder.java index e78e017c584b..29ceecd57e17 100644 --- a/gluten-core/src/main/java/io/glutenproject/substrait/rel/RelBuilder.java +++ b/gluten-core/src/main/java/org/apache/gluten/substrait/rel/RelBuilder.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.substrait.rel; +package org.apache.gluten.substrait.rel; -import io.glutenproject.expression.ConverterUtils; -import io.glutenproject.substrait.SubstraitContext; -import io.glutenproject.substrait.expression.AggregateFunctionNode; -import io.glutenproject.substrait.expression.ExpressionNode; -import io.glutenproject.substrait.expression.WindowFunctionNode; -import io.glutenproject.substrait.extensions.AdvancedExtensionNode; -import io.glutenproject.substrait.type.ColumnTypeNode; -import io.glutenproject.substrait.type.TypeNode; +import org.apache.gluten.expression.ConverterUtils; +import org.apache.gluten.substrait.SubstraitContext; +import org.apache.gluten.substrait.expression.AggregateFunctionNode; +import org.apache.gluten.substrait.expression.ExpressionNode; +import org.apache.gluten.substrait.expression.WindowFunctionNode; +import org.apache.gluten.substrait.extensions.AdvancedExtensionNode; +import org.apache.gluten.substrait.type.ColumnTypeNode; +import org.apache.gluten.substrait.type.TypeNode; import io.substrait.proto.CrossRel; import io.substrait.proto.JoinRel; diff --git a/gluten-core/src/main/java/io/glutenproject/substrait/rel/RelNode.java b/gluten-core/src/main/java/org/apache/gluten/substrait/rel/RelNode.java similarity index 96% rename from gluten-core/src/main/java/io/glutenproject/substrait/rel/RelNode.java rename to gluten-core/src/main/java/org/apache/gluten/substrait/rel/RelNode.java index 7b3799208470..3dacd947c0f4 100644 --- a/gluten-core/src/main/java/io/glutenproject/substrait/rel/RelNode.java +++ b/gluten-core/src/main/java/org/apache/gluten/substrait/rel/RelNode.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.substrait.rel; +package org.apache.gluten.substrait.rel; import io.substrait.proto.Rel; diff --git a/gluten-core/src/main/java/io/glutenproject/substrait/rel/SortRelNode.java b/gluten-core/src/main/java/org/apache/gluten/substrait/rel/SortRelNode.java similarity index 95% rename from gluten-core/src/main/java/io/glutenproject/substrait/rel/SortRelNode.java rename to gluten-core/src/main/java/org/apache/gluten/substrait/rel/SortRelNode.java index fb2b8b128e04..90a541fa6f8b 100644 --- a/gluten-core/src/main/java/io/glutenproject/substrait/rel/SortRelNode.java +++ b/gluten-core/src/main/java/org/apache/gluten/substrait/rel/SortRelNode.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.substrait.rel; +package org.apache.gluten.substrait.rel; -import io.glutenproject.substrait.extensions.AdvancedExtensionNode; +import org.apache.gluten.substrait.extensions.AdvancedExtensionNode; import io.substrait.proto.Rel; import io.substrait.proto.RelCommon; diff --git a/gluten-core/src/main/java/io/glutenproject/substrait/rel/SplitInfo.java b/gluten-core/src/main/java/org/apache/gluten/substrait/rel/SplitInfo.java similarity index 91% rename from gluten-core/src/main/java/io/glutenproject/substrait/rel/SplitInfo.java rename to gluten-core/src/main/java/org/apache/gluten/substrait/rel/SplitInfo.java index 42125a253979..6e2eeff7d8a4 100644 --- a/gluten-core/src/main/java/io/glutenproject/substrait/rel/SplitInfo.java +++ b/gluten-core/src/main/java/org/apache/gluten/substrait/rel/SplitInfo.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.substrait.rel; +package org.apache.gluten.substrait.rel; import com.google.protobuf.MessageOrBuilder; @@ -24,7 +24,7 @@ /** * A serializable representation of a read split for native engine, including the file path and * other information of the scan table. It is returned by {@link - * io.glutenproject.execution.BasicScanExecTransformer#getSplitInfos()}. + * org.apache.gluten.execution.BasicScanExecTransformer#getSplitInfos()}. */ public interface SplitInfo extends Serializable { /** The preferred locations where the table files returned by this read split can run faster. */ diff --git a/gluten-core/src/main/java/io/glutenproject/substrait/rel/WindowRelNode.java b/gluten-core/src/main/java/org/apache/gluten/substrait/rel/WindowRelNode.java similarity index 93% rename from gluten-core/src/main/java/io/glutenproject/substrait/rel/WindowRelNode.java rename to gluten-core/src/main/java/org/apache/gluten/substrait/rel/WindowRelNode.java index f120c37c73f4..415bbc350fac 100644 --- a/gluten-core/src/main/java/io/glutenproject/substrait/rel/WindowRelNode.java +++ b/gluten-core/src/main/java/org/apache/gluten/substrait/rel/WindowRelNode.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.substrait.rel; +package org.apache.gluten.substrait.rel; -import io.glutenproject.substrait.expression.ExpressionNode; -import io.glutenproject.substrait.expression.WindowFunctionNode; -import io.glutenproject.substrait.extensions.AdvancedExtensionNode; +import org.apache.gluten.substrait.expression.ExpressionNode; +import org.apache.gluten.substrait.expression.WindowFunctionNode; +import org.apache.gluten.substrait.extensions.AdvancedExtensionNode; import io.substrait.proto.Rel; import io.substrait.proto.RelCommon; diff --git a/gluten-core/src/main/java/io/glutenproject/substrait/rel/WriteRelNode.java b/gluten-core/src/main/java/org/apache/gluten/substrait/rel/WriteRelNode.java similarity index 93% rename from gluten-core/src/main/java/io/glutenproject/substrait/rel/WriteRelNode.java rename to gluten-core/src/main/java/org/apache/gluten/substrait/rel/WriteRelNode.java index 6b9c5e4e9dc9..38d34fbe0c6f 100644 --- a/gluten-core/src/main/java/io/glutenproject/substrait/rel/WriteRelNode.java +++ b/gluten-core/src/main/java/org/apache/gluten/substrait/rel/WriteRelNode.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.substrait.rel; +package org.apache.gluten.substrait.rel; -import io.glutenproject.substrait.extensions.AdvancedExtensionNode; -import io.glutenproject.substrait.type.ColumnTypeNode; -import io.glutenproject.substrait.type.TypeNode; +import org.apache.gluten.substrait.extensions.AdvancedExtensionNode; +import org.apache.gluten.substrait.type.ColumnTypeNode; +import org.apache.gluten.substrait.type.TypeNode; import io.substrait.proto.NamedObjectWrite; import io.substrait.proto.NamedStruct; diff --git a/gluten-core/src/main/java/io/glutenproject/substrait/type/BinaryTypeNode.java b/gluten-core/src/main/java/org/apache/gluten/substrait/type/BinaryTypeNode.java similarity index 97% rename from gluten-core/src/main/java/io/glutenproject/substrait/type/BinaryTypeNode.java rename to gluten-core/src/main/java/org/apache/gluten/substrait/type/BinaryTypeNode.java index e683cf188eb7..bbd5cd154180 100644 --- a/gluten-core/src/main/java/io/glutenproject/substrait/type/BinaryTypeNode.java +++ b/gluten-core/src/main/java/org/apache/gluten/substrait/type/BinaryTypeNode.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.substrait.type; +package org.apache.gluten.substrait.type; import io.substrait.proto.Type; diff --git a/gluten-core/src/main/java/io/glutenproject/substrait/type/BooleanTypeNode.java b/gluten-core/src/main/java/org/apache/gluten/substrait/type/BooleanTypeNode.java similarity index 97% rename from gluten-core/src/main/java/io/glutenproject/substrait/type/BooleanTypeNode.java rename to gluten-core/src/main/java/org/apache/gluten/substrait/type/BooleanTypeNode.java index b4e496463b16..6ae3bd50e08a 100644 --- a/gluten-core/src/main/java/io/glutenproject/substrait/type/BooleanTypeNode.java +++ b/gluten-core/src/main/java/org/apache/gluten/substrait/type/BooleanTypeNode.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.substrait.type; +package org.apache.gluten.substrait.type; import io.substrait.proto.Type; diff --git a/gluten-core/src/main/java/io/glutenproject/substrait/type/ColumnTypeNode.java b/gluten-core/src/main/java/org/apache/gluten/substrait/type/ColumnTypeNode.java similarity index 96% rename from gluten-core/src/main/java/io/glutenproject/substrait/type/ColumnTypeNode.java rename to gluten-core/src/main/java/org/apache/gluten/substrait/type/ColumnTypeNode.java index fd315617ae53..d9588997925f 100644 --- a/gluten-core/src/main/java/io/glutenproject/substrait/type/ColumnTypeNode.java +++ b/gluten-core/src/main/java/org/apache/gluten/substrait/type/ColumnTypeNode.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.substrait.type; +package org.apache.gluten.substrait.type; import io.substrait.proto.NamedStruct.ColumnType; diff --git a/gluten-core/src/main/java/io/glutenproject/substrait/type/DateTypeNode.java b/gluten-core/src/main/java/org/apache/gluten/substrait/type/DateTypeNode.java similarity index 97% rename from gluten-core/src/main/java/io/glutenproject/substrait/type/DateTypeNode.java rename to gluten-core/src/main/java/org/apache/gluten/substrait/type/DateTypeNode.java index 6d5d5080f884..7ae6b9602cd5 100644 --- a/gluten-core/src/main/java/io/glutenproject/substrait/type/DateTypeNode.java +++ b/gluten-core/src/main/java/org/apache/gluten/substrait/type/DateTypeNode.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.substrait.type; +package org.apache.gluten.substrait.type; import io.substrait.proto.Type; diff --git a/gluten-core/src/main/java/io/glutenproject/substrait/type/DecimalTypeNode.java b/gluten-core/src/main/java/org/apache/gluten/substrait/type/DecimalTypeNode.java similarity index 97% rename from gluten-core/src/main/java/io/glutenproject/substrait/type/DecimalTypeNode.java rename to gluten-core/src/main/java/org/apache/gluten/substrait/type/DecimalTypeNode.java index df8a0c19b67f..57f983fd598a 100644 --- a/gluten-core/src/main/java/io/glutenproject/substrait/type/DecimalTypeNode.java +++ b/gluten-core/src/main/java/org/apache/gluten/substrait/type/DecimalTypeNode.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.substrait.type; +package org.apache.gluten.substrait.type; import io.substrait.proto.Type; diff --git a/gluten-core/src/main/java/io/glutenproject/substrait/type/FP32TypeNode.java b/gluten-core/src/main/java/org/apache/gluten/substrait/type/FP32TypeNode.java similarity index 97% rename from gluten-core/src/main/java/io/glutenproject/substrait/type/FP32TypeNode.java rename to gluten-core/src/main/java/org/apache/gluten/substrait/type/FP32TypeNode.java index 264e88f9df39..c51b41096876 100644 --- a/gluten-core/src/main/java/io/glutenproject/substrait/type/FP32TypeNode.java +++ b/gluten-core/src/main/java/org/apache/gluten/substrait/type/FP32TypeNode.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.substrait.type; +package org.apache.gluten.substrait.type; import io.substrait.proto.Type; diff --git a/gluten-core/src/main/java/io/glutenproject/substrait/type/FP64TypeNode.java b/gluten-core/src/main/java/org/apache/gluten/substrait/type/FP64TypeNode.java similarity index 97% rename from gluten-core/src/main/java/io/glutenproject/substrait/type/FP64TypeNode.java rename to gluten-core/src/main/java/org/apache/gluten/substrait/type/FP64TypeNode.java index 020e98af7350..39bd7f6e8a86 100644 --- a/gluten-core/src/main/java/io/glutenproject/substrait/type/FP64TypeNode.java +++ b/gluten-core/src/main/java/org/apache/gluten/substrait/type/FP64TypeNode.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.substrait.type; +package org.apache.gluten.substrait.type; import io.substrait.proto.Type; diff --git a/gluten-core/src/main/java/io/glutenproject/substrait/type/FixedBinaryTypeNode.java b/gluten-core/src/main/java/org/apache/gluten/substrait/type/FixedBinaryTypeNode.java similarity index 97% rename from gluten-core/src/main/java/io/glutenproject/substrait/type/FixedBinaryTypeNode.java rename to gluten-core/src/main/java/org/apache/gluten/substrait/type/FixedBinaryTypeNode.java index c442ae23c9ce..86889eee3d40 100644 --- a/gluten-core/src/main/java/io/glutenproject/substrait/type/FixedBinaryTypeNode.java +++ b/gluten-core/src/main/java/org/apache/gluten/substrait/type/FixedBinaryTypeNode.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.substrait.type; +package org.apache.gluten.substrait.type; import io.substrait.proto.Type; diff --git a/gluten-core/src/main/java/io/glutenproject/substrait/type/FixedCharTypeNode.java b/gluten-core/src/main/java/org/apache/gluten/substrait/type/FixedCharTypeNode.java similarity index 97% rename from gluten-core/src/main/java/io/glutenproject/substrait/type/FixedCharTypeNode.java rename to gluten-core/src/main/java/org/apache/gluten/substrait/type/FixedCharTypeNode.java index fa91b3ad8fc2..1e671651bfda 100644 --- a/gluten-core/src/main/java/io/glutenproject/substrait/type/FixedCharTypeNode.java +++ b/gluten-core/src/main/java/org/apache/gluten/substrait/type/FixedCharTypeNode.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.substrait.type; +package org.apache.gluten.substrait.type; import io.substrait.proto.Type; diff --git a/gluten-core/src/main/java/io/glutenproject/substrait/type/I16TypeNode.java b/gluten-core/src/main/java/org/apache/gluten/substrait/type/I16TypeNode.java similarity index 97% rename from gluten-core/src/main/java/io/glutenproject/substrait/type/I16TypeNode.java rename to gluten-core/src/main/java/org/apache/gluten/substrait/type/I16TypeNode.java index 67af04ff7650..7acaf9c6bfeb 100644 --- a/gluten-core/src/main/java/io/glutenproject/substrait/type/I16TypeNode.java +++ b/gluten-core/src/main/java/org/apache/gluten/substrait/type/I16TypeNode.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.substrait.type; +package org.apache.gluten.substrait.type; import io.substrait.proto.Type; diff --git a/gluten-core/src/main/java/io/glutenproject/substrait/type/I32TypeNode.java b/gluten-core/src/main/java/org/apache/gluten/substrait/type/I32TypeNode.java similarity index 97% rename from gluten-core/src/main/java/io/glutenproject/substrait/type/I32TypeNode.java rename to gluten-core/src/main/java/org/apache/gluten/substrait/type/I32TypeNode.java index cbfaf87414b9..d8ae29d5397c 100644 --- a/gluten-core/src/main/java/io/glutenproject/substrait/type/I32TypeNode.java +++ b/gluten-core/src/main/java/org/apache/gluten/substrait/type/I32TypeNode.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.substrait.type; +package org.apache.gluten.substrait.type; import io.substrait.proto.Type; diff --git a/gluten-core/src/main/java/io/glutenproject/substrait/type/I64TypeNode.java b/gluten-core/src/main/java/org/apache/gluten/substrait/type/I64TypeNode.java similarity index 97% rename from gluten-core/src/main/java/io/glutenproject/substrait/type/I64TypeNode.java rename to gluten-core/src/main/java/org/apache/gluten/substrait/type/I64TypeNode.java index 3aeea187d8c0..0042772fd97d 100644 --- a/gluten-core/src/main/java/io/glutenproject/substrait/type/I64TypeNode.java +++ b/gluten-core/src/main/java/org/apache/gluten/substrait/type/I64TypeNode.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.substrait.type; +package org.apache.gluten.substrait.type; import io.substrait.proto.Type; diff --git a/gluten-core/src/main/java/io/glutenproject/substrait/type/I8TypeNode.java b/gluten-core/src/main/java/org/apache/gluten/substrait/type/I8TypeNode.java similarity index 97% rename from gluten-core/src/main/java/io/glutenproject/substrait/type/I8TypeNode.java rename to gluten-core/src/main/java/org/apache/gluten/substrait/type/I8TypeNode.java index 7bb6307c4ba6..a3de677ee024 100644 --- a/gluten-core/src/main/java/io/glutenproject/substrait/type/I8TypeNode.java +++ b/gluten-core/src/main/java/org/apache/gluten/substrait/type/I8TypeNode.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.substrait.type; +package org.apache.gluten.substrait.type; import io.substrait.proto.Type; diff --git a/gluten-core/src/main/java/io/glutenproject/substrait/type/IntervalYearTypeNode.java b/gluten-core/src/main/java/org/apache/gluten/substrait/type/IntervalYearTypeNode.java similarity index 97% rename from gluten-core/src/main/java/io/glutenproject/substrait/type/IntervalYearTypeNode.java rename to gluten-core/src/main/java/org/apache/gluten/substrait/type/IntervalYearTypeNode.java index 30538fc3163a..384f9e77368a 100644 --- a/gluten-core/src/main/java/io/glutenproject/substrait/type/IntervalYearTypeNode.java +++ b/gluten-core/src/main/java/org/apache/gluten/substrait/type/IntervalYearTypeNode.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.substrait.type; +package org.apache.gluten.substrait.type; import io.substrait.proto.Type; diff --git a/gluten-core/src/main/java/io/glutenproject/substrait/type/ListNode.java b/gluten-core/src/main/java/org/apache/gluten/substrait/type/ListNode.java similarity index 97% rename from gluten-core/src/main/java/io/glutenproject/substrait/type/ListNode.java rename to gluten-core/src/main/java/org/apache/gluten/substrait/type/ListNode.java index 28ae34fa065d..4713e0daa83f 100644 --- a/gluten-core/src/main/java/io/glutenproject/substrait/type/ListNode.java +++ b/gluten-core/src/main/java/org/apache/gluten/substrait/type/ListNode.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.substrait.type; +package org.apache.gluten.substrait.type; import io.substrait.proto.Type; diff --git a/gluten-core/src/main/java/io/glutenproject/substrait/type/MapNode.java b/gluten-core/src/main/java/org/apache/gluten/substrait/type/MapNode.java similarity index 98% rename from gluten-core/src/main/java/io/glutenproject/substrait/type/MapNode.java rename to gluten-core/src/main/java/org/apache/gluten/substrait/type/MapNode.java index 76c4c76734cc..bdef11eeded5 100644 --- a/gluten-core/src/main/java/io/glutenproject/substrait/type/MapNode.java +++ b/gluten-core/src/main/java/org/apache/gluten/substrait/type/MapNode.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.substrait.type; +package org.apache.gluten.substrait.type; import io.substrait.proto.Type; diff --git a/gluten-core/src/main/java/io/glutenproject/substrait/type/NothingNode.java b/gluten-core/src/main/java/org/apache/gluten/substrait/type/NothingNode.java similarity index 96% rename from gluten-core/src/main/java/io/glutenproject/substrait/type/NothingNode.java rename to gluten-core/src/main/java/org/apache/gluten/substrait/type/NothingNode.java index d6d37eaf0645..7aa9953cb9eb 100644 --- a/gluten-core/src/main/java/io/glutenproject/substrait/type/NothingNode.java +++ b/gluten-core/src/main/java/org/apache/gluten/substrait/type/NothingNode.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.substrait.type; +package org.apache.gluten.substrait.type; import io.substrait.proto.Type; diff --git a/gluten-core/src/main/java/io/glutenproject/substrait/type/StringTypeNode.java b/gluten-core/src/main/java/org/apache/gluten/substrait/type/StringTypeNode.java similarity index 97% rename from gluten-core/src/main/java/io/glutenproject/substrait/type/StringTypeNode.java rename to gluten-core/src/main/java/org/apache/gluten/substrait/type/StringTypeNode.java index 42b97699f3a3..83e029e73182 100644 --- a/gluten-core/src/main/java/io/glutenproject/substrait/type/StringTypeNode.java +++ b/gluten-core/src/main/java/org/apache/gluten/substrait/type/StringTypeNode.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.substrait.type; +package org.apache.gluten.substrait.type; import io.substrait.proto.Type; diff --git a/gluten-core/src/main/java/io/glutenproject/substrait/type/StructNode.java b/gluten-core/src/main/java/org/apache/gluten/substrait/type/StructNode.java similarity index 97% rename from gluten-core/src/main/java/io/glutenproject/substrait/type/StructNode.java rename to gluten-core/src/main/java/org/apache/gluten/substrait/type/StructNode.java index ff7c0922d822..6faeb4d02b27 100644 --- a/gluten-core/src/main/java/io/glutenproject/substrait/type/StructNode.java +++ b/gluten-core/src/main/java/org/apache/gluten/substrait/type/StructNode.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.substrait.type; +package org.apache.gluten.substrait.type; import io.substrait.proto.Type; diff --git a/gluten-core/src/main/java/io/glutenproject/substrait/type/TimestampTypeNode.java b/gluten-core/src/main/java/org/apache/gluten/substrait/type/TimestampTypeNode.java similarity index 97% rename from gluten-core/src/main/java/io/glutenproject/substrait/type/TimestampTypeNode.java rename to gluten-core/src/main/java/org/apache/gluten/substrait/type/TimestampTypeNode.java index 875ff445f611..15919fcdee5f 100644 --- a/gluten-core/src/main/java/io/glutenproject/substrait/type/TimestampTypeNode.java +++ b/gluten-core/src/main/java/org/apache/gluten/substrait/type/TimestampTypeNode.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.substrait.type; +package org.apache.gluten.substrait.type; import io.substrait.proto.Type; diff --git a/gluten-core/src/main/java/io/glutenproject/substrait/type/TypeBuilder.java b/gluten-core/src/main/java/org/apache/gluten/substrait/type/TypeBuilder.java similarity index 98% rename from gluten-core/src/main/java/io/glutenproject/substrait/type/TypeBuilder.java rename to gluten-core/src/main/java/org/apache/gluten/substrait/type/TypeBuilder.java index 8393b1d9aad1..28cb10be27d6 100644 --- a/gluten-core/src/main/java/io/glutenproject/substrait/type/TypeBuilder.java +++ b/gluten-core/src/main/java/org/apache/gluten/substrait/type/TypeBuilder.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.substrait.type; +package org.apache.gluten.substrait.type; import java.util.List; diff --git a/gluten-core/src/main/java/io/glutenproject/substrait/type/TypeNode.java b/gluten-core/src/main/java/org/apache/gluten/substrait/type/TypeNode.java similarity index 95% rename from gluten-core/src/main/java/io/glutenproject/substrait/type/TypeNode.java rename to gluten-core/src/main/java/org/apache/gluten/substrait/type/TypeNode.java index 9e94c01f8f0a..a631122e0a56 100644 --- a/gluten-core/src/main/java/io/glutenproject/substrait/type/TypeNode.java +++ b/gluten-core/src/main/java/org/apache/gluten/substrait/type/TypeNode.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.substrait.type; +package org.apache.gluten.substrait.type; import io.substrait.proto.Type; diff --git a/gluten-core/src/main/java/io/glutenproject/test/TestStats.java b/gluten-core/src/main/java/org/apache/gluten/test/TestStats.java similarity index 99% rename from gluten-core/src/main/java/io/glutenproject/test/TestStats.java rename to gluten-core/src/main/java/org/apache/gluten/test/TestStats.java index 5cb34097e1de..598ab556fa3f 100644 --- a/gluten-core/src/main/java/io/glutenproject/test/TestStats.java +++ b/gluten-core/src/main/java/org/apache/gluten/test/TestStats.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.test; +package org.apache.gluten.test; import java.util.*; diff --git a/gluten-core/src/main/java/io/glutenproject/validate/NativePlanValidationInfo.java b/gluten-core/src/main/java/org/apache/gluten/validate/NativePlanValidationInfo.java similarity index 97% rename from gluten-core/src/main/java/io/glutenproject/validate/NativePlanValidationInfo.java rename to gluten-core/src/main/java/org/apache/gluten/validate/NativePlanValidationInfo.java index fbe7e9bdbf29..12f050c660f4 100644 --- a/gluten-core/src/main/java/io/glutenproject/validate/NativePlanValidationInfo.java +++ b/gluten-core/src/main/java/org/apache/gluten/validate/NativePlanValidationInfo.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.validate; +package org.apache.gluten.validate; import java.util.Vector; diff --git a/gluten-core/src/main/java/io/glutenproject/vectorized/GeneralInIterator.java b/gluten-core/src/main/java/org/apache/gluten/vectorized/GeneralInIterator.java similarity index 97% rename from gluten-core/src/main/java/io/glutenproject/vectorized/GeneralInIterator.java rename to gluten-core/src/main/java/org/apache/gluten/vectorized/GeneralInIterator.java index 853330168b86..a9e6e7ff139f 100644 --- a/gluten-core/src/main/java/io/glutenproject/vectorized/GeneralInIterator.java +++ b/gluten-core/src/main/java/org/apache/gluten/vectorized/GeneralInIterator.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.vectorized; +package org.apache.gluten.vectorized; import org.apache.spark.sql.vectorized.ColumnarBatch; diff --git a/gluten-core/src/main/java/io/glutenproject/vectorized/GeneralOutIterator.java b/gluten-core/src/main/java/org/apache/gluten/vectorized/GeneralOutIterator.java similarity index 93% rename from gluten-core/src/main/java/io/glutenproject/vectorized/GeneralOutIterator.java rename to gluten-core/src/main/java/org/apache/gluten/vectorized/GeneralOutIterator.java index 28b857ef2a42..b82b0179295d 100644 --- a/gluten-core/src/main/java/io/glutenproject/vectorized/GeneralOutIterator.java +++ b/gluten-core/src/main/java/org/apache/gluten/vectorized/GeneralOutIterator.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.vectorized; +package org.apache.gluten.vectorized; -import io.glutenproject.exception.GlutenException; -import io.glutenproject.metrics.IMetrics; +import org.apache.gluten.exception.GlutenException; +import org.apache.gluten.metrics.IMetrics; import org.apache.spark.sql.vectorized.ColumnarBatch; diff --git a/gluten-core/src/main/java/io/glutenproject/vectorized/JniLibLoader.java b/gluten-core/src/main/java/org/apache/gluten/vectorized/JniLibLoader.java similarity index 99% rename from gluten-core/src/main/java/io/glutenproject/vectorized/JniLibLoader.java rename to gluten-core/src/main/java/org/apache/gluten/vectorized/JniLibLoader.java index 3e6e58fb4a2c..31e6b0493d0b 100644 --- a/gluten-core/src/main/java/io/glutenproject/vectorized/JniLibLoader.java +++ b/gluten-core/src/main/java/org/apache/gluten/vectorized/JniLibLoader.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.vectorized; +package org.apache.gluten.vectorized; -import io.glutenproject.exception.GlutenException; +import org.apache.gluten.exception.GlutenException; import org.apache.spark.util.GlutenShutdownManager; import org.slf4j.Logger; diff --git a/gluten-core/src/main/java/io/glutenproject/vectorized/JniResourceHelper.java b/gluten-core/src/main/java/org/apache/gluten/vectorized/JniResourceHelper.java similarity index 98% rename from gluten-core/src/main/java/io/glutenproject/vectorized/JniResourceHelper.java rename to gluten-core/src/main/java/org/apache/gluten/vectorized/JniResourceHelper.java index 0e05cf53c010..58917ae9ae2f 100644 --- a/gluten-core/src/main/java/io/glutenproject/vectorized/JniResourceHelper.java +++ b/gluten-core/src/main/java/org/apache/gluten/vectorized/JniResourceHelper.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.vectorized; +package org.apache.gluten.vectorized; -import io.glutenproject.exception.GlutenException; +import org.apache.gluten.exception.GlutenException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/gluten-core/src/main/java/io/glutenproject/vectorized/JniWorkspace.java b/gluten-core/src/main/java/org/apache/gluten/vectorized/JniWorkspace.java similarity index 98% rename from gluten-core/src/main/java/io/glutenproject/vectorized/JniWorkspace.java rename to gluten-core/src/main/java/org/apache/gluten/vectorized/JniWorkspace.java index 0938c8948b6c..84edfba187ef 100644 --- a/gluten-core/src/main/java/io/glutenproject/vectorized/JniWorkspace.java +++ b/gluten-core/src/main/java/org/apache/gluten/vectorized/JniWorkspace.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.vectorized; +package org.apache.gluten.vectorized; -import io.glutenproject.exception.GlutenException; +import org.apache.gluten.exception.GlutenException; import com.google.common.base.Preconditions; import org.apache.commons.io.FileUtils; diff --git a/gluten-core/src/main/java/io/glutenproject/vectorized/NativePartitioning.java b/gluten-core/src/main/java/org/apache/gluten/vectorized/NativePartitioning.java similarity index 98% rename from gluten-core/src/main/java/io/glutenproject/vectorized/NativePartitioning.java rename to gluten-core/src/main/java/org/apache/gluten/vectorized/NativePartitioning.java index 18184ba832f9..cb91169a972d 100644 --- a/gluten-core/src/main/java/io/glutenproject/vectorized/NativePartitioning.java +++ b/gluten-core/src/main/java/org/apache/gluten/vectorized/NativePartitioning.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.vectorized; +package org.apache.gluten.vectorized; import java.io.Serializable; diff --git a/gluten-core/src/main/java/io/glutenproject/vectorized/SplitResult.java b/gluten-core/src/main/java/org/apache/gluten/vectorized/SplitResult.java similarity index 98% rename from gluten-core/src/main/java/io/glutenproject/vectorized/SplitResult.java rename to gluten-core/src/main/java/org/apache/gluten/vectorized/SplitResult.java index 3515071386d8..4cdd02ae7c94 100644 --- a/gluten-core/src/main/java/io/glutenproject/vectorized/SplitResult.java +++ b/gluten-core/src/main/java/org/apache/gluten/vectorized/SplitResult.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.vectorized; +package org.apache.gluten.vectorized; /** POJO to hold native split result */ public class SplitResult { diff --git a/gluten-core/src/main/resources/io/glutenproject/proto/config.proto b/gluten-core/src/main/resources/org/apache/gluten/proto/config.proto similarity index 77% rename from gluten-core/src/main/resources/io/glutenproject/proto/config.proto rename to gluten-core/src/main/resources/org/apache/gluten/proto/config.proto index e05ac0c9143e..0ee4788d28a1 100644 --- a/gluten-core/src/main/resources/io/glutenproject/proto/config.proto +++ b/gluten-core/src/main/resources/org/apache/gluten/proto/config.proto @@ -3,7 +3,7 @@ syntax = "proto3"; package gluten; -option java_package = "io.glutenproject.proto"; +option java_package = "org.apache.gluten.proto"; option java_multiple_files = true; message ConfigMap { diff --git a/gluten-core/src/main/resources/io/glutenproject/proto/memory.proto b/gluten-core/src/main/resources/org/apache/gluten/proto/memory.proto similarity index 89% rename from gluten-core/src/main/resources/io/glutenproject/proto/memory.proto rename to gluten-core/src/main/resources/org/apache/gluten/proto/memory.proto index e438db273d4e..eb28b798166f 100644 --- a/gluten-core/src/main/resources/io/glutenproject/proto/memory.proto +++ b/gluten-core/src/main/resources/org/apache/gluten/proto/memory.proto @@ -3,7 +3,7 @@ syntax = "proto3"; package gluten; -option java_package = "io.glutenproject.proto"; +option java_package = "org.apache.gluten.proto"; option java_multiple_files = true; message MemoryUsageStats { diff --git a/gluten-core/src/main/scala/io/glutenproject/GlutenPlugin.scala b/gluten-core/src/main/scala/org/apache/gluten/GlutenPlugin.scala similarity index 90% rename from gluten-core/src/main/scala/io/glutenproject/GlutenPlugin.scala rename to gluten-core/src/main/scala/org/apache/gluten/GlutenPlugin.scala index 5fa3083c27a8..5c9c56b39d3a 100644 --- a/gluten-core/src/main/scala/io/glutenproject/GlutenPlugin.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/GlutenPlugin.scala @@ -14,17 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject - -import io.glutenproject.GlutenConfig.GLUTEN_DEFAULT_SESSION_TIMEZONE_KEY -import io.glutenproject.GlutenPlugin.{GLUTEN_SESSION_EXTENSION_NAME, SPARK_SESSION_EXTS_KEY} -import io.glutenproject.backendsapi.BackendsApiManager -import io.glutenproject.events.GlutenBuildInfoEvent -import io.glutenproject.exception.GlutenException -import io.glutenproject.expression.ExpressionMappings -import io.glutenproject.extension.{ColumnarOverrides, OthersExtensionOverrides, QueryStagePrepOverrides, StrategyOverrides} -import io.glutenproject.test.TestStats -import io.glutenproject.utils.TaskListener +package org.apache.gluten + +import org.apache.gluten.GlutenConfig.GLUTEN_DEFAULT_SESSION_TIMEZONE_KEY +import org.apache.gluten.GlutenPlugin.{GLUTEN_SESSION_EXTENSION_NAME, SPARK_SESSION_EXTS_KEY} +import org.apache.gluten.backendsapi.BackendsApiManager +import org.apache.gluten.events.GlutenBuildInfoEvent +import org.apache.gluten.exception.GlutenException +import org.apache.gluten.expression.ExpressionMappings +import org.apache.gluten.extension.{ColumnarOverrides, OthersExtensionOverrides, QueryStagePrepOverrides, StrategyOverrides} +import org.apache.gluten.test.TestStats +import org.apache.gluten.utils.TaskListener import org.apache.spark.{SparkConf, SparkContext, TaskFailedReason} import org.apache.spark.api.plugin.{DriverPlugin, ExecutorPlugin, PluginContext, SparkPlugin} @@ -54,7 +54,7 @@ class GlutenPlugin extends SparkPlugin { } } -private[glutenproject] class GlutenDriverPlugin extends DriverPlugin with Logging { +private[gluten] class GlutenDriverPlugin extends DriverPlugin with Logging { private var _sc: Option[SparkContext] = None override def init(sc: SparkContext, pluginContext: PluginContext): util.Map[String, String] = { @@ -194,7 +194,7 @@ private[glutenproject] class GlutenDriverPlugin extends DriverPlugin with Loggin } } -private[glutenproject] class GlutenExecutorPlugin extends ExecutorPlugin { +private[gluten] class GlutenExecutorPlugin extends ExecutorPlugin { private var executorEndpoint: GlutenExecutorEndpoint = _ private val taskListeners: Seq[TaskListener] = Array(TaskResources) @@ -238,13 +238,13 @@ private[glutenproject] class GlutenExecutorPlugin extends ExecutorPlugin { } } -private[glutenproject] class GlutenSessionExtensions extends (SparkSessionExtensions => Unit) { +private[gluten] class GlutenSessionExtensions extends (SparkSessionExtensions => Unit) { override def apply(exts: SparkSessionExtensions): Unit = { GlutenPlugin.DEFAULT_INJECTORS.foreach(injector => injector.inject(exts)) } } -private[glutenproject] class SparkConfImplicits(conf: SparkConf) { +private[gluten] class SparkConfImplicits(conf: SparkConf) { def enableGlutenPlugin(): SparkConf = { if (conf.contains(GlutenPlugin.SPARK_SQL_PLUGINS_KEY)) { throw new IllegalArgumentException( @@ -255,12 +255,12 @@ private[glutenproject] class SparkConfImplicits(conf: SparkConf) { } } -private[glutenproject] trait GlutenSparkExtensionsInjector { +private[gluten] trait GlutenSparkExtensionsInjector { def inject(extensions: SparkSessionExtensions) } -private[glutenproject] object GlutenPlugin { - // To enable GlutenPlugin in production, set "spark.plugins=io.glutenproject.GlutenPlugin" +private[gluten] object GlutenPlugin { + // To enable GlutenPlugin in production, set "spark.plugins=org.apache.gluten.GlutenPlugin" val SPARK_SQL_PLUGINS_KEY: String = "spark.plugins" val GLUTEN_PLUGIN_NAME: String = Objects.requireNonNull(classOf[GlutenPlugin].getCanonicalName) val SPARK_SESSION_EXTS_KEY: String = StaticSQLConf.SPARK_SESSION_EXTENSIONS.key diff --git a/gluten-core/src/main/scala/io/glutenproject/backendsapi/Backend.scala b/gluten-core/src/main/scala/org/apache/gluten/backendsapi/Backend.scala similarity index 97% rename from gluten-core/src/main/scala/io/glutenproject/backendsapi/Backend.scala rename to gluten-core/src/main/scala/org/apache/gluten/backendsapi/Backend.scala index 09799cdb138e..6ad78e10536f 100644 --- a/gluten-core/src/main/scala/io/glutenproject/backendsapi/Backend.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/backendsapi/Backend.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.backendsapi +package org.apache.gluten.backendsapi trait Backend { def name(): String diff --git a/gluten-core/src/main/scala/io/glutenproject/backendsapi/BackendSettingsApi.scala b/gluten-core/src/main/scala/org/apache/gluten/backendsapi/BackendSettingsApi.scala similarity index 96% rename from gluten-core/src/main/scala/io/glutenproject/backendsapi/BackendSettingsApi.scala rename to gluten-core/src/main/scala/org/apache/gluten/backendsapi/BackendSettingsApi.scala index 950eed2ebf45..d090d77bc306 100644 --- a/gluten-core/src/main/scala/io/glutenproject/backendsapi/BackendSettingsApi.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/backendsapi/BackendSettingsApi.scala @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.backendsapi +package org.apache.gluten.backendsapi -import io.glutenproject.GlutenConfig -import io.glutenproject.extension.ValidationResult -import io.glutenproject.substrait.rel.LocalFilesNode.ReadFileFormat +import org.apache.gluten.GlutenConfig +import org.apache.gluten.extension.ValidationResult +import org.apache.gluten.substrait.rel.LocalFilesNode.ReadFileFormat import org.apache.spark.SparkConf import org.apache.spark.sql.catalyst.catalog.BucketSpec diff --git a/gluten-core/src/main/scala/io/glutenproject/backendsapi/BackendsApiManager.scala b/gluten-core/src/main/scala/org/apache/gluten/backendsapi/BackendsApiManager.scala similarity index 98% rename from gluten-core/src/main/scala/io/glutenproject/backendsapi/BackendsApiManager.scala rename to gluten-core/src/main/scala/org/apache/gluten/backendsapi/BackendsApiManager.scala index 867343bd311e..1d9690d17842 100644 --- a/gluten-core/src/main/scala/io/glutenproject/backendsapi/BackendsApiManager.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/backendsapi/BackendsApiManager.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.backendsapi +package org.apache.gluten.backendsapi import java.util.ServiceLoader diff --git a/gluten-core/src/main/scala/io/glutenproject/backendsapi/BroadcastApi.scala b/gluten-core/src/main/scala/org/apache/gluten/backendsapi/BroadcastApi.scala similarity index 97% rename from gluten-core/src/main/scala/io/glutenproject/backendsapi/BroadcastApi.scala rename to gluten-core/src/main/scala/org/apache/gluten/backendsapi/BroadcastApi.scala index da31056d308b..8b8b0d649a77 100644 --- a/gluten-core/src/main/scala/io/glutenproject/backendsapi/BroadcastApi.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/backendsapi/BroadcastApi.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.backendsapi +package org.apache.gluten.backendsapi trait BroadcastApi { diff --git a/gluten-core/src/main/scala/io/glutenproject/backendsapi/IteratorApi.scala b/gluten-core/src/main/scala/org/apache/gluten/backendsapi/IteratorApi.scala similarity index 88% rename from gluten-core/src/main/scala/io/glutenproject/backendsapi/IteratorApi.scala rename to gluten-core/src/main/scala/org/apache/gluten/backendsapi/IteratorApi.scala index cd8995211985..d999948d7047 100644 --- a/gluten-core/src/main/scala/io/glutenproject/backendsapi/IteratorApi.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/backendsapi/IteratorApi.scala @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.backendsapi +package org.apache.gluten.backendsapi -import io.glutenproject.GlutenNumaBindingInfo -import io.glutenproject.execution.{BaseGlutenPartition, BasicScanExecTransformer, WholeStageTransformContext} -import io.glutenproject.metrics.IMetrics -import io.glutenproject.substrait.plan.PlanNode -import io.glutenproject.substrait.rel.LocalFilesNode.ReadFileFormat -import io.glutenproject.substrait.rel.SplitInfo +import org.apache.gluten.GlutenNumaBindingInfo +import org.apache.gluten.execution.{BaseGlutenPartition, BasicScanExecTransformer, WholeStageTransformContext} +import org.apache.gluten.metrics.IMetrics +import org.apache.gluten.substrait.plan.PlanNode +import org.apache.gluten.substrait.rel.LocalFilesNode.ReadFileFormat +import org.apache.gluten.substrait.rel.SplitInfo import org.apache.spark._ import org.apache.spark.rdd.RDD diff --git a/gluten-core/src/main/scala/io/glutenproject/backendsapi/ListenerApi.scala b/gluten-core/src/main/scala/org/apache/gluten/backendsapi/ListenerApi.scala similarity index 96% rename from gluten-core/src/main/scala/io/glutenproject/backendsapi/ListenerApi.scala rename to gluten-core/src/main/scala/org/apache/gluten/backendsapi/ListenerApi.scala index 461c16bb7f50..aaba345fc4fd 100644 --- a/gluten-core/src/main/scala/io/glutenproject/backendsapi/ListenerApi.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/backendsapi/ListenerApi.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.backendsapi +package org.apache.gluten.backendsapi import org.apache.spark.SparkConf diff --git a/gluten-core/src/main/scala/io/glutenproject/backendsapi/MetricsApi.scala b/gluten-core/src/main/scala/org/apache/gluten/backendsapi/MetricsApi.scala similarity index 96% rename from gluten-core/src/main/scala/io/glutenproject/backendsapi/MetricsApi.scala rename to gluten-core/src/main/scala/org/apache/gluten/backendsapi/MetricsApi.scala index 46f5c82b9718..8d7456494a09 100644 --- a/gluten-core/src/main/scala/io/glutenproject/backendsapi/MetricsApi.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/backendsapi/MetricsApi.scala @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.backendsapi +package org.apache.gluten.backendsapi -import io.glutenproject.metrics.{IMetrics, MetricsUpdater} -import io.glutenproject.substrait.{AggregationParams, JoinParams} +import org.apache.gluten.metrics.{IMetrics, MetricsUpdater} +import org.apache.gluten.substrait.{AggregationParams, JoinParams} import org.apache.spark.SparkContext import org.apache.spark.sql.execution.{SparkPlan, WholeStageCodegenExec} diff --git a/gluten-core/src/main/scala/io/glutenproject/backendsapi/SparkPlanExecApi.scala b/gluten-core/src/main/scala/org/apache/gluten/backendsapi/SparkPlanExecApi.scala similarity index 98% rename from gluten-core/src/main/scala/io/glutenproject/backendsapi/SparkPlanExecApi.scala rename to gluten-core/src/main/scala/org/apache/gluten/backendsapi/SparkPlanExecApi.scala index 711b496451ac..c7d17c84a2ca 100644 --- a/gluten-core/src/main/scala/io/glutenproject/backendsapi/SparkPlanExecApi.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/backendsapi/SparkPlanExecApi.scala @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.backendsapi +package org.apache.gluten.backendsapi -import io.glutenproject.exception.GlutenNotSupportException -import io.glutenproject.execution._ -import io.glutenproject.expression._ -import io.glutenproject.substrait.expression.{ExpressionBuilder, ExpressionNode, WindowFunctionNode} +import org.apache.gluten.exception.GlutenNotSupportException +import org.apache.gluten.execution._ +import org.apache.gluten.expression._ +import org.apache.gluten.substrait.expression.{ExpressionBuilder, ExpressionNode, WindowFunctionNode} import org.apache.spark.ShuffleDependency import org.apache.spark.rdd.RDD diff --git a/gluten-core/src/main/scala/io/glutenproject/backendsapi/TransformerApi.scala b/gluten-core/src/main/scala/org/apache/gluten/backendsapi/TransformerApi.scala similarity index 96% rename from gluten-core/src/main/scala/io/glutenproject/backendsapi/TransformerApi.scala rename to gluten-core/src/main/scala/org/apache/gluten/backendsapi/TransformerApi.scala index 68184bc729c6..f5a1b269993a 100644 --- a/gluten-core/src/main/scala/io/glutenproject/backendsapi/TransformerApi.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/backendsapi/TransformerApi.scala @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.backendsapi +package org.apache.gluten.backendsapi -import io.glutenproject.substrait.expression.ExpressionNode +import org.apache.gluten.substrait.expression.ExpressionNode import org.apache.spark.sql.catalyst.expressions.Attribute import org.apache.spark.sql.connector.read.InputPartition diff --git a/gluten-core/src/main/scala/io/glutenproject/backendsapi/ValidatorApi.scala b/gluten-core/src/main/scala/org/apache/gluten/backendsapi/ValidatorApi.scala similarity index 94% rename from gluten-core/src/main/scala/io/glutenproject/backendsapi/ValidatorApi.scala rename to gluten-core/src/main/scala/org/apache/gluten/backendsapi/ValidatorApi.scala index 04d80e42e3e2..9e938a508cff 100644 --- a/gluten-core/src/main/scala/io/glutenproject/backendsapi/ValidatorApi.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/backendsapi/ValidatorApi.scala @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.backendsapi +package org.apache.gluten.backendsapi -import io.glutenproject.substrait.plan.PlanNode -import io.glutenproject.validate.NativePlanValidationInfo +import org.apache.gluten.substrait.plan.PlanNode +import org.apache.gluten.validate.NativePlanValidationInfo import org.apache.spark.sql.catalyst.expressions.Expression import org.apache.spark.sql.catalyst.plans.physical.Partitioning diff --git a/gluten-core/src/main/scala/io/glutenproject/execution/BaseDataSource.scala b/gluten-core/src/main/scala/org/apache/gluten/execution/BaseDataSource.scala similarity index 97% rename from gluten-core/src/main/scala/io/glutenproject/execution/BaseDataSource.scala rename to gluten-core/src/main/scala/org/apache/gluten/execution/BaseDataSource.scala index bd5f4e2940eb..b34abd490301 100644 --- a/gluten-core/src/main/scala/io/glutenproject/execution/BaseDataSource.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/execution/BaseDataSource.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution +package org.apache.gluten.execution import org.apache.spark.sql.connector.read.InputPartition import org.apache.spark.sql.types.StructType diff --git a/gluten-core/src/main/scala/io/glutenproject/execution/BasicPhysicalOperatorTransformer.scala b/gluten-core/src/main/scala/org/apache/gluten/execution/BasicPhysicalOperatorTransformer.scala similarity index 96% rename from gluten-core/src/main/scala/io/glutenproject/execution/BasicPhysicalOperatorTransformer.scala rename to gluten-core/src/main/scala/org/apache/gluten/execution/BasicPhysicalOperatorTransformer.scala index 3a32b5eb8ae6..fe2b74012929 100644 --- a/gluten-core/src/main/scala/io/glutenproject/execution/BasicPhysicalOperatorTransformer.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/execution/BasicPhysicalOperatorTransformer.scala @@ -14,17 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution - -import io.glutenproject.backendsapi.BackendsApiManager -import io.glutenproject.exception.GlutenNotSupportException -import io.glutenproject.expression.{ConverterUtils, ExpressionConverter, ExpressionTransformer} -import io.glutenproject.extension.{GlutenPlan, ValidationResult} -import io.glutenproject.metrics.MetricsUpdater -import io.glutenproject.substrait.`type`.TypeBuilder -import io.glutenproject.substrait.SubstraitContext -import io.glutenproject.substrait.extensions.ExtensionBuilder -import io.glutenproject.substrait.rel.{RelBuilder, RelNode} +package org.apache.gluten.execution + +import org.apache.gluten.backendsapi.BackendsApiManager +import org.apache.gluten.exception.GlutenNotSupportException +import org.apache.gluten.expression.{ConverterUtils, ExpressionConverter, ExpressionTransformer} +import org.apache.gluten.extension.{GlutenPlan, ValidationResult} +import org.apache.gluten.metrics.MetricsUpdater +import org.apache.gluten.substrait.`type`.TypeBuilder +import org.apache.gluten.substrait.SubstraitContext +import org.apache.gluten.substrait.extensions.ExtensionBuilder +import org.apache.gluten.substrait.rel.{RelBuilder, RelNode} import org.apache.spark.internal.Logging import org.apache.spark.rdd.RDD diff --git a/gluten-core/src/main/scala/io/glutenproject/execution/BasicScanExecTransformer.scala b/gluten-core/src/main/scala/org/apache/gluten/execution/BasicScanExecTransformer.scala similarity index 91% rename from gluten-core/src/main/scala/io/glutenproject/execution/BasicScanExecTransformer.scala rename to gluten-core/src/main/scala/org/apache/gluten/execution/BasicScanExecTransformer.scala index 30b5b4cd544c..6ec01af469a2 100644 --- a/gluten-core/src/main/scala/io/glutenproject/execution/BasicScanExecTransformer.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/execution/BasicScanExecTransformer.scala @@ -14,17 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution - -import io.glutenproject.backendsapi.BackendsApiManager -import io.glutenproject.expression.{ConverterUtils, ExpressionConverter} -import io.glutenproject.extension.ValidationResult -import io.glutenproject.substrait.`type`.ColumnTypeNode -import io.glutenproject.substrait.SubstraitContext -import io.glutenproject.substrait.extensions.ExtensionBuilder -import io.glutenproject.substrait.plan.PlanBuilder -import io.glutenproject.substrait.rel.{RelBuilder, SplitInfo} -import io.glutenproject.substrait.rel.LocalFilesNode.ReadFileFormat +package org.apache.gluten.execution + +import org.apache.gluten.backendsapi.BackendsApiManager +import org.apache.gluten.expression.{ConverterUtils, ExpressionConverter} +import org.apache.gluten.extension.ValidationResult +import org.apache.gluten.substrait.`type`.ColumnTypeNode +import org.apache.gluten.substrait.SubstraitContext +import org.apache.gluten.substrait.extensions.ExtensionBuilder +import org.apache.gluten.substrait.plan.PlanBuilder +import org.apache.gluten.substrait.rel.{RelBuilder, SplitInfo} +import org.apache.gluten.substrait.rel.LocalFilesNode.ReadFileFormat import org.apache.spark.rdd.RDD import org.apache.spark.sql.catalyst.expressions._ diff --git a/gluten-core/src/main/scala/io/glutenproject/execution/BatchScanExecTransformer.scala b/gluten-core/src/main/scala/org/apache/gluten/execution/BatchScanExecTransformer.scala similarity index 94% rename from gluten-core/src/main/scala/io/glutenproject/execution/BatchScanExecTransformer.scala rename to gluten-core/src/main/scala/org/apache/gluten/execution/BatchScanExecTransformer.scala index fb88b2076706..3aeeffae1791 100644 --- a/gluten-core/src/main/scala/io/glutenproject/execution/BatchScanExecTransformer.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/execution/BatchScanExecTransformer.scala @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution +package org.apache.gluten.execution -import io.glutenproject.backendsapi.BackendsApiManager -import io.glutenproject.exception.GlutenNotSupportException -import io.glutenproject.extension.ValidationResult -import io.glutenproject.metrics.MetricsUpdater -import io.glutenproject.substrait.rel.LocalFilesNode.ReadFileFormat +import org.apache.gluten.backendsapi.BackendsApiManager +import org.apache.gluten.exception.GlutenNotSupportException +import org.apache.gluten.extension.ValidationResult +import org.apache.gluten.metrics.MetricsUpdater +import org.apache.gluten.substrait.rel.LocalFilesNode.ReadFileFormat import org.apache.spark.rdd.RDD import org.apache.spark.sql.catalyst.InternalRow diff --git a/gluten-core/src/main/scala/io/glutenproject/execution/BroadcastBuildSideRDD.scala b/gluten-core/src/main/scala/org/apache/gluten/execution/BroadcastBuildSideRDD.scala similarity index 97% rename from gluten-core/src/main/scala/io/glutenproject/execution/BroadcastBuildSideRDD.scala rename to gluten-core/src/main/scala/org/apache/gluten/execution/BroadcastBuildSideRDD.scala index 9996d492fc3e..c1fc63117a30 100644 --- a/gluten-core/src/main/scala/io/glutenproject/execution/BroadcastBuildSideRDD.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/execution/BroadcastBuildSideRDD.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution +package org.apache.gluten.execution import org.apache.spark._ import org.apache.spark.rdd.RDD diff --git a/gluten-core/src/main/scala/io/glutenproject/execution/BroadcastNestedLoopJoinExecTransformer.scala b/gluten-core/src/main/scala/org/apache/gluten/execution/BroadcastNestedLoopJoinExecTransformer.scala similarity index 95% rename from gluten-core/src/main/scala/io/glutenproject/execution/BroadcastNestedLoopJoinExecTransformer.scala rename to gluten-core/src/main/scala/org/apache/gluten/execution/BroadcastNestedLoopJoinExecTransformer.scala index c77b62b8091a..19a2ec8541e2 100644 --- a/gluten-core/src/main/scala/io/glutenproject/execution/BroadcastNestedLoopJoinExecTransformer.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/execution/BroadcastNestedLoopJoinExecTransformer.scala @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution +package org.apache.gluten.execution -import io.glutenproject.backendsapi.BackendsApiManager -import io.glutenproject.extension.ValidationResult -import io.glutenproject.metrics.MetricsUpdater -import io.glutenproject.substrait.SubstraitContext -import io.glutenproject.utils.SubstraitUtil +import org.apache.gluten.backendsapi.BackendsApiManager +import org.apache.gluten.extension.ValidationResult +import org.apache.gluten.metrics.MetricsUpdater +import org.apache.gluten.substrait.SubstraitContext +import org.apache.gluten.utils.SubstraitUtil import org.apache.spark.rdd.RDD import org.apache.spark.sql.catalyst.expressions.{Attribute, Expression} diff --git a/gluten-core/src/main/scala/io/glutenproject/execution/CartesianProductExecTransformer.scala b/gluten-core/src/main/scala/org/apache/gluten/execution/CartesianProductExecTransformer.scala similarity index 95% rename from gluten-core/src/main/scala/io/glutenproject/execution/CartesianProductExecTransformer.scala rename to gluten-core/src/main/scala/org/apache/gluten/execution/CartesianProductExecTransformer.scala index 7470ae005dd6..c5a4a0eb81e8 100644 --- a/gluten-core/src/main/scala/io/glutenproject/execution/CartesianProductExecTransformer.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/execution/CartesianProductExecTransformer.scala @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution - -import io.glutenproject.backendsapi.BackendsApiManager -import io.glutenproject.expression.ExpressionConverter -import io.glutenproject.extension.{GlutenPlan, ValidationResult} -import io.glutenproject.metrics.MetricsUpdater -import io.glutenproject.substrait.SubstraitContext -import io.glutenproject.substrait.rel.RelBuilder -import io.glutenproject.utils.SubstraitUtil +package org.apache.gluten.execution + +import org.apache.gluten.backendsapi.BackendsApiManager +import org.apache.gluten.expression.ExpressionConverter +import org.apache.gluten.extension.{GlutenPlan, ValidationResult} +import org.apache.gluten.metrics.MetricsUpdater +import org.apache.gluten.substrait.SubstraitContext +import org.apache.gluten.substrait.rel.RelBuilder +import org.apache.gluten.utils.SubstraitUtil import org.apache.spark.{Dependency, NarrowDependency, Partition, SparkContext, TaskContext} import org.apache.spark.rdd.RDD diff --git a/gluten-core/src/main/scala/io/glutenproject/execution/CoalesceExecTransformer.scala b/gluten-core/src/main/scala/org/apache/gluten/execution/CoalesceExecTransformer.scala similarity index 96% rename from gluten-core/src/main/scala/io/glutenproject/execution/CoalesceExecTransformer.scala rename to gluten-core/src/main/scala/org/apache/gluten/execution/CoalesceExecTransformer.scala index 5ffdaf19d3e6..8f30805beeed 100644 --- a/gluten-core/src/main/scala/io/glutenproject/execution/CoalesceExecTransformer.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/execution/CoalesceExecTransformer.scala @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution +package org.apache.gluten.execution -import io.glutenproject.extension.{GlutenPlan, ValidationResult} +import org.apache.gluten.extension.{GlutenPlan, ValidationResult} import org.apache.spark.{Partition, SparkContext, TaskContext} import org.apache.spark.rdd.RDD diff --git a/gluten-core/src/main/scala/io/glutenproject/execution/ColumnarToRowExecBase.scala b/gluten-core/src/main/scala/org/apache/gluten/execution/ColumnarToRowExecBase.scala similarity index 93% rename from gluten-core/src/main/scala/io/glutenproject/execution/ColumnarToRowExecBase.scala rename to gluten-core/src/main/scala/org/apache/gluten/execution/ColumnarToRowExecBase.scala index ded7992c7f46..6d3fa2dac609 100644 --- a/gluten-core/src/main/scala/io/glutenproject/execution/ColumnarToRowExecBase.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/execution/ColumnarToRowExecBase.scala @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution +package org.apache.gluten.execution -import io.glutenproject.backendsapi.BackendsApiManager -import io.glutenproject.extension.GlutenPlan +import org.apache.gluten.backendsapi.BackendsApiManager +import org.apache.gluten.extension.GlutenPlan import org.apache.spark.broadcast.Broadcast import org.apache.spark.rdd.RDD diff --git a/gluten-core/src/main/scala/io/glutenproject/execution/DataSourceScanTransformerRegister.scala b/gluten-core/src/main/scala/org/apache/gluten/execution/DataSourceScanTransformerRegister.scala similarity index 98% rename from gluten-core/src/main/scala/io/glutenproject/execution/DataSourceScanTransformerRegister.scala rename to gluten-core/src/main/scala/org/apache/gluten/execution/DataSourceScanTransformerRegister.scala index 28382c948b31..b899790c3472 100644 --- a/gluten-core/src/main/scala/io/glutenproject/execution/DataSourceScanTransformerRegister.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/execution/DataSourceScanTransformerRegister.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution +package org.apache.gluten.execution import org.apache.spark.sql.catalyst.expressions.Expression import org.apache.spark.sql.execution.FileSourceScanExec diff --git a/gluten-core/src/main/scala/io/glutenproject/execution/DatasourceScanTransformer.scala b/gluten-core/src/main/scala/org/apache/gluten/execution/DatasourceScanTransformer.scala similarity index 96% rename from gluten-core/src/main/scala/io/glutenproject/execution/DatasourceScanTransformer.scala rename to gluten-core/src/main/scala/org/apache/gluten/execution/DatasourceScanTransformer.scala index e4c73436afb7..1861e32e011a 100644 --- a/gluten-core/src/main/scala/io/glutenproject/execution/DatasourceScanTransformer.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/execution/DatasourceScanTransformer.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution +package org.apache.gluten.execution import org.apache.spark.sql.catalyst.TableIdentifier import org.apache.spark.sql.sources.BaseRelation diff --git a/gluten-core/src/main/scala/io/glutenproject/execution/ExpandExecTransformer.scala b/gluten-core/src/main/scala/org/apache/gluten/execution/ExpandExecTransformer.scala similarity index 89% rename from gluten-core/src/main/scala/io/glutenproject/execution/ExpandExecTransformer.scala rename to gluten-core/src/main/scala/org/apache/gluten/execution/ExpandExecTransformer.scala index daa195b68c58..aa98d88b29a8 100644 --- a/gluten-core/src/main/scala/io/glutenproject/execution/ExpandExecTransformer.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/execution/ExpandExecTransformer.scala @@ -14,17 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution - -import io.glutenproject.backendsapi.BackendsApiManager -import io.glutenproject.expression.{ConverterUtils, ExpressionConverter} -import io.glutenproject.extension.ValidationResult -import io.glutenproject.metrics.MetricsUpdater -import io.glutenproject.substrait.`type`.{TypeBuilder, TypeNode} -import io.glutenproject.substrait.SubstraitContext -import io.glutenproject.substrait.expression.ExpressionNode -import io.glutenproject.substrait.extensions.ExtensionBuilder -import io.glutenproject.substrait.rel.{RelBuilder, RelNode} +package org.apache.gluten.execution + +import org.apache.gluten.backendsapi.BackendsApiManager +import org.apache.gluten.expression.{ConverterUtils, ExpressionConverter} +import org.apache.gluten.extension.ValidationResult +import org.apache.gluten.metrics.MetricsUpdater +import org.apache.gluten.substrait.`type`.{TypeBuilder, TypeNode} +import org.apache.gluten.substrait.SubstraitContext +import org.apache.gluten.substrait.expression.ExpressionNode +import org.apache.gluten.substrait.extensions.ExtensionBuilder +import org.apache.gluten.substrait.rel.{RelBuilder, RelNode} import org.apache.spark.sql.catalyst.expressions._ import org.apache.spark.sql.catalyst.plans.physical.{Partitioning, UnknownPartitioning} diff --git a/gluten-core/src/main/scala/io/glutenproject/execution/FileSourceScanExecTransformer.scala b/gluten-core/src/main/scala/org/apache/gluten/execution/FileSourceScanExecTransformer.scala similarity index 96% rename from gluten-core/src/main/scala/io/glutenproject/execution/FileSourceScanExecTransformer.scala rename to gluten-core/src/main/scala/org/apache/gluten/execution/FileSourceScanExecTransformer.scala index 2c8bee43ff1e..af7d1ed72fa2 100644 --- a/gluten-core/src/main/scala/io/glutenproject/execution/FileSourceScanExecTransformer.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/execution/FileSourceScanExecTransformer.scala @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution +package org.apache.gluten.execution -import io.glutenproject.backendsapi.BackendsApiManager -import io.glutenproject.extension.ValidationResult -import io.glutenproject.metrics.MetricsUpdater -import io.glutenproject.substrait.rel.LocalFilesNode.ReadFileFormat +import org.apache.gluten.backendsapi.BackendsApiManager +import org.apache.gluten.extension.ValidationResult +import org.apache.gluten.metrics.MetricsUpdater +import org.apache.gluten.substrait.rel.LocalFilesNode.ReadFileFormat import org.apache.spark.rdd.RDD import org.apache.spark.sql.catalyst.TableIdentifier diff --git a/gluten-core/src/main/scala/io/glutenproject/execution/GenerateExecTransformerBase.scala b/gluten-core/src/main/scala/org/apache/gluten/execution/GenerateExecTransformerBase.scala similarity index 85% rename from gluten-core/src/main/scala/io/glutenproject/execution/GenerateExecTransformerBase.scala rename to gluten-core/src/main/scala/org/apache/gluten/execution/GenerateExecTransformerBase.scala index f3e31346cd11..d5978216f98c 100644 --- a/gluten-core/src/main/scala/io/glutenproject/execution/GenerateExecTransformerBase.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/execution/GenerateExecTransformerBase.scala @@ -14,17 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution +package org.apache.gluten.execution -import io.glutenproject.backendsapi.BackendsApiManager -import io.glutenproject.exception.GlutenException -import io.glutenproject.expression.{ConverterUtils, ExpressionConverter} -import io.glutenproject.extension.ValidationResult -import io.glutenproject.substrait.`type`.TypeBuilder -import io.glutenproject.substrait.SubstraitContext -import io.glutenproject.substrait.expression.{ExpressionBuilder, ExpressionNode} -import io.glutenproject.substrait.extensions.{AdvancedExtensionNode, ExtensionBuilder} -import io.glutenproject.substrait.rel.RelNode +import org.apache.gluten.backendsapi.BackendsApiManager +import org.apache.gluten.exception.GlutenException +import org.apache.gluten.expression.{ConverterUtils, ExpressionConverter} +import org.apache.gluten.extension.ValidationResult +import org.apache.gluten.substrait.`type`.TypeBuilder +import org.apache.gluten.substrait.SubstraitContext +import org.apache.gluten.substrait.expression.{ExpressionBuilder, ExpressionNode} +import org.apache.gluten.substrait.extensions.{AdvancedExtensionNode, ExtensionBuilder} +import org.apache.gluten.substrait.rel.RelNode import org.apache.spark.sql.catalyst.expressions._ import org.apache.spark.sql.execution.SparkPlan diff --git a/gluten-core/src/main/scala/io/glutenproject/execution/GlutenWholeStageColumnarRDD.scala b/gluten-core/src/main/scala/org/apache/gluten/execution/GlutenWholeStageColumnarRDD.scala similarity index 96% rename from gluten-core/src/main/scala/io/glutenproject/execution/GlutenWholeStageColumnarRDD.scala rename to gluten-core/src/main/scala/org/apache/gluten/execution/GlutenWholeStageColumnarRDD.scala index d29bc02aa0d7..da59f8ec9157 100644 --- a/gluten-core/src/main/scala/io/glutenproject/execution/GlutenWholeStageColumnarRDD.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/execution/GlutenWholeStageColumnarRDD.scala @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution +package org.apache.gluten.execution -import io.glutenproject.GlutenConfig -import io.glutenproject.backendsapi.BackendsApiManager -import io.glutenproject.metrics.{GlutenTimeMetric, IMetrics} +import org.apache.gluten.GlutenConfig +import org.apache.gluten.backendsapi.BackendsApiManager +import org.apache.gluten.metrics.{GlutenTimeMetric, IMetrics} import org.apache.spark.{Partition, SparkContext, SparkException, TaskContext} import org.apache.spark.rdd.RDD diff --git a/gluten-core/src/main/scala/io/glutenproject/execution/HashAggregateExecBaseTransformer.scala b/gluten-core/src/main/scala/org/apache/gluten/execution/HashAggregateExecBaseTransformer.scala similarity index 94% rename from gluten-core/src/main/scala/io/glutenproject/execution/HashAggregateExecBaseTransformer.scala rename to gluten-core/src/main/scala/org/apache/gluten/execution/HashAggregateExecBaseTransformer.scala index e18823391d11..baf88c727b01 100644 --- a/gluten-core/src/main/scala/io/glutenproject/execution/HashAggregateExecBaseTransformer.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/execution/HashAggregateExecBaseTransformer.scala @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution - -import io.glutenproject.GlutenConfig -import io.glutenproject.backendsapi.BackendsApiManager -import io.glutenproject.exception.GlutenNotSupportException -import io.glutenproject.expression._ -import io.glutenproject.extension.ValidationResult -import io.glutenproject.metrics.MetricsUpdater -import io.glutenproject.substrait.{AggregationParams, SubstraitContext} -import io.glutenproject.substrait.rel.RelNode +package org.apache.gluten.execution + +import org.apache.gluten.GlutenConfig +import org.apache.gluten.backendsapi.BackendsApiManager +import org.apache.gluten.exception.GlutenNotSupportException +import org.apache.gluten.expression._ +import org.apache.gluten.extension.ValidationResult +import org.apache.gluten.metrics.MetricsUpdater +import org.apache.gluten.substrait.{AggregationParams, SubstraitContext} +import org.apache.gluten.substrait.rel.RelNode import org.apache.spark.sql.catalyst.expressions._ import org.apache.spark.sql.catalyst.expressions.aggregate._ diff --git a/gluten-core/src/main/scala/io/glutenproject/execution/JoinExecTransformer.scala b/gluten-core/src/main/scala/org/apache/gluten/execution/JoinExecTransformer.scala similarity index 96% rename from gluten-core/src/main/scala/io/glutenproject/execution/JoinExecTransformer.scala rename to gluten-core/src/main/scala/org/apache/gluten/execution/JoinExecTransformer.scala index a4f7de8111d5..e47ad8c7b1bd 100644 --- a/gluten-core/src/main/scala/io/glutenproject/execution/JoinExecTransformer.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/execution/JoinExecTransformer.scala @@ -14,17 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution - -import io.glutenproject.backendsapi.BackendsApiManager -import io.glutenproject.expression._ -import io.glutenproject.extension.ValidationResult -import io.glutenproject.metrics.MetricsUpdater -import io.glutenproject.sql.shims.SparkShimLoader -import io.glutenproject.substrait.`type`.TypeBuilder -import io.glutenproject.substrait.{JoinParams, SubstraitContext} -import io.glutenproject.substrait.expression.{ExpressionBuilder, ExpressionNode} -import io.glutenproject.utils.SubstraitUtil +package org.apache.gluten.execution + +import org.apache.gluten.backendsapi.BackendsApiManager +import org.apache.gluten.expression._ +import org.apache.gluten.extension.ValidationResult +import org.apache.gluten.metrics.MetricsUpdater +import org.apache.gluten.sql.shims.SparkShimLoader +import org.apache.gluten.substrait.`type`.TypeBuilder +import org.apache.gluten.substrait.{JoinParams, SubstraitContext} +import org.apache.gluten.substrait.expression.{ExpressionBuilder, ExpressionNode} +import org.apache.gluten.utils.SubstraitUtil import org.apache.spark.rdd.RDD import org.apache.spark.sql.catalyst.expressions._ diff --git a/gluten-core/src/main/scala/io/glutenproject/execution/JoinUtils.scala b/gluten-core/src/main/scala/org/apache/gluten/execution/JoinUtils.scala similarity index 95% rename from gluten-core/src/main/scala/io/glutenproject/execution/JoinUtils.scala rename to gluten-core/src/main/scala/org/apache/gluten/execution/JoinUtils.scala index c122442c6f1f..eb2c0bfd7229 100644 --- a/gluten-core/src/main/scala/io/glutenproject/execution/JoinUtils.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/execution/JoinUtils.scala @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution +package org.apache.gluten.execution -import io.glutenproject.backendsapi.BackendsApiManager -import io.glutenproject.expression.{AttributeReferenceTransformer, ConverterUtils, ExpressionConverter} -import io.glutenproject.substrait.`type`.TypeBuilder -import io.glutenproject.substrait.SubstraitContext -import io.glutenproject.substrait.expression.{ExpressionBuilder, ExpressionNode} -import io.glutenproject.substrait.extensions.{AdvancedExtensionNode, ExtensionBuilder} -import io.glutenproject.substrait.rel.{RelBuilder, RelNode} +import org.apache.gluten.backendsapi.BackendsApiManager +import org.apache.gluten.expression.{AttributeReferenceTransformer, ConverterUtils, ExpressionConverter} +import org.apache.gluten.substrait.`type`.TypeBuilder +import org.apache.gluten.substrait.SubstraitContext +import org.apache.gluten.substrait.expression.{ExpressionBuilder, ExpressionNode} +import org.apache.gluten.substrait.extensions.{AdvancedExtensionNode, ExtensionBuilder} +import org.apache.gluten.substrait.rel.{RelBuilder, RelNode} import org.apache.spark.sql.catalyst.expressions.{Attribute, AttributeReference, Expression} import org.apache.spark.sql.catalyst.plans._ diff --git a/gluten-core/src/main/scala/io/glutenproject/execution/LimitTransformer.scala b/gluten-core/src/main/scala/org/apache/gluten/execution/LimitTransformer.scala similarity index 87% rename from gluten-core/src/main/scala/io/glutenproject/execution/LimitTransformer.scala rename to gluten-core/src/main/scala/org/apache/gluten/execution/LimitTransformer.scala index 028ea854553d..6c4e63d78403 100644 --- a/gluten-core/src/main/scala/io/glutenproject/execution/LimitTransformer.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/execution/LimitTransformer.scala @@ -14,17 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution +package org.apache.gluten.execution -import io.glutenproject.backendsapi.BackendsApiManager -import io.glutenproject.expression.ConverterUtils -import io.glutenproject.extension.ValidationResult -import io.glutenproject.extension.columnar.TransformHints -import io.glutenproject.metrics.MetricsUpdater -import io.glutenproject.substrait.`type`.TypeBuilder -import io.glutenproject.substrait.SubstraitContext -import io.glutenproject.substrait.extensions.ExtensionBuilder -import io.glutenproject.substrait.rel.{RelBuilder, RelNode} +import org.apache.gluten.backendsapi.BackendsApiManager +import org.apache.gluten.expression.ConverterUtils +import org.apache.gluten.extension.ValidationResult +import org.apache.gluten.extension.columnar.TransformHints +import org.apache.gluten.metrics.MetricsUpdater +import org.apache.gluten.substrait.`type`.TypeBuilder +import org.apache.gluten.substrait.SubstraitContext +import org.apache.gluten.substrait.extensions.ExtensionBuilder +import org.apache.gluten.substrait.rel.{RelBuilder, RelNode} import org.apache.spark.sql.catalyst.expressions.Attribute import org.apache.spark.sql.execution.{SortExec, SparkPlan} diff --git a/gluten-core/src/main/scala/io/glutenproject/execution/RowToColumnarExecBase.scala b/gluten-core/src/main/scala/org/apache/gluten/execution/RowToColumnarExecBase.scala similarity index 94% rename from gluten-core/src/main/scala/io/glutenproject/execution/RowToColumnarExecBase.scala rename to gluten-core/src/main/scala/org/apache/gluten/execution/RowToColumnarExecBase.scala index 14d5d98676e3..f4dd160b58b4 100644 --- a/gluten-core/src/main/scala/io/glutenproject/execution/RowToColumnarExecBase.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/execution/RowToColumnarExecBase.scala @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution +package org.apache.gluten.execution -import io.glutenproject.backendsapi.BackendsApiManager -import io.glutenproject.extension.GlutenPlan +import org.apache.gluten.backendsapi.BackendsApiManager +import org.apache.gluten.extension.GlutenPlan import org.apache.spark.broadcast import org.apache.spark.rdd.RDD diff --git a/gluten-core/src/main/scala/io/glutenproject/execution/ScanTransformerFactory.scala b/gluten-core/src/main/scala/org/apache/gluten/execution/ScanTransformerFactory.scala similarity index 95% rename from gluten-core/src/main/scala/io/glutenproject/execution/ScanTransformerFactory.scala rename to gluten-core/src/main/scala/org/apache/gluten/execution/ScanTransformerFactory.scala index c0122186a138..fc2b8f506492 100644 --- a/gluten-core/src/main/scala/io/glutenproject/execution/ScanTransformerFactory.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/execution/ScanTransformerFactory.scala @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution +package org.apache.gluten.execution -import io.glutenproject.exception.GlutenNotSupportException -import io.glutenproject.expression.ExpressionConverter -import io.glutenproject.extension.columnar.TransformHints -import io.glutenproject.sql.shims.SparkShimLoader +import org.apache.gluten.exception.GlutenNotSupportException +import org.apache.gluten.expression.ExpressionConverter +import org.apache.gluten.extension.columnar.TransformHints +import org.apache.gluten.sql.shims.SparkShimLoader import org.apache.spark.sql.catalyst.expressions.Expression import org.apache.spark.sql.connector.read.Scan diff --git a/gluten-core/src/main/scala/io/glutenproject/execution/SortExecTransformer.scala b/gluten-core/src/main/scala/org/apache/gluten/execution/SortExecTransformer.scala similarity index 90% rename from gluten-core/src/main/scala/io/glutenproject/execution/SortExecTransformer.scala rename to gluten-core/src/main/scala/org/apache/gluten/execution/SortExecTransformer.scala index ab2aad1e9be8..9e4a20d40ad4 100644 --- a/gluten-core/src/main/scala/io/glutenproject/execution/SortExecTransformer.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/execution/SortExecTransformer.scala @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution - -import io.glutenproject.backendsapi.BackendsApiManager -import io.glutenproject.expression.{ConverterUtils, ExpressionConverter} -import io.glutenproject.extension.ValidationResult -import io.glutenproject.metrics.MetricsUpdater -import io.glutenproject.substrait.`type`.TypeBuilder -import io.glutenproject.substrait.SubstraitContext -import io.glutenproject.substrait.extensions.ExtensionBuilder -import io.glutenproject.substrait.rel.{RelBuilder, RelNode} +package org.apache.gluten.execution + +import org.apache.gluten.backendsapi.BackendsApiManager +import org.apache.gluten.expression.{ConverterUtils, ExpressionConverter} +import org.apache.gluten.extension.ValidationResult +import org.apache.gluten.metrics.MetricsUpdater +import org.apache.gluten.substrait.`type`.TypeBuilder +import org.apache.gluten.substrait.SubstraitContext +import org.apache.gluten.substrait.extensions.ExtensionBuilder +import org.apache.gluten.substrait.rel.{RelBuilder, RelNode} import org.apache.spark.sql.catalyst.expressions._ import org.apache.spark.sql.catalyst.plans.physical._ diff --git a/gluten-core/src/main/scala/io/glutenproject/execution/SortMergeJoinExecTransformer.scala b/gluten-core/src/main/scala/org/apache/gluten/execution/SortMergeJoinExecTransformer.scala similarity index 97% rename from gluten-core/src/main/scala/io/glutenproject/execution/SortMergeJoinExecTransformer.scala rename to gluten-core/src/main/scala/org/apache/gluten/execution/SortMergeJoinExecTransformer.scala index 6fca12bf54d3..ffc0073261c4 100644 --- a/gluten-core/src/main/scala/io/glutenproject/execution/SortMergeJoinExecTransformer.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/execution/SortMergeJoinExecTransformer.scala @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution +package org.apache.gluten.execution -import io.glutenproject.backendsapi.BackendsApiManager -import io.glutenproject.extension.ValidationResult -import io.glutenproject.metrics.MetricsUpdater -import io.glutenproject.substrait.{JoinParams, SubstraitContext} +import org.apache.gluten.backendsapi.BackendsApiManager +import org.apache.gluten.extension.ValidationResult +import org.apache.gluten.metrics.MetricsUpdater +import org.apache.gluten.substrait.{JoinParams, SubstraitContext} import org.apache.spark.rdd.RDD import org.apache.spark.sql.catalyst.expressions._ diff --git a/gluten-core/src/main/scala/io/glutenproject/execution/TakeOrderedAndProjectExecTransformer.scala b/gluten-core/src/main/scala/org/apache/gluten/execution/TakeOrderedAndProjectExecTransformer.scala similarity index 98% rename from gluten-core/src/main/scala/io/glutenproject/execution/TakeOrderedAndProjectExecTransformer.scala rename to gluten-core/src/main/scala/org/apache/gluten/execution/TakeOrderedAndProjectExecTransformer.scala index f7b1fe2f4167..9806a1dba95f 100644 --- a/gluten-core/src/main/scala/io/glutenproject/execution/TakeOrderedAndProjectExecTransformer.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/execution/TakeOrderedAndProjectExecTransformer.scala @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution +package org.apache.gluten.execution -import io.glutenproject.extension.{GlutenPlan, ValidationResult} +import org.apache.gluten.extension.{GlutenPlan, ValidationResult} import org.apache.spark.rdd.RDD import org.apache.spark.sql.catalyst.InternalRow diff --git a/gluten-core/src/main/scala/io/glutenproject/execution/WholeStageTransformer.scala b/gluten-core/src/main/scala/org/apache/gluten/execution/WholeStageTransformer.scala similarity index 95% rename from gluten-core/src/main/scala/io/glutenproject/execution/WholeStageTransformer.scala rename to gluten-core/src/main/scala/org/apache/gluten/execution/WholeStageTransformer.scala index b4409d98d4d5..277750b1a9df 100644 --- a/gluten-core/src/main/scala/io/glutenproject/execution/WholeStageTransformer.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/execution/WholeStageTransformer.scala @@ -14,19 +14,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution - -import io.glutenproject.{GlutenConfig, GlutenNumaBindingInfo} -import io.glutenproject.backendsapi.BackendsApiManager -import io.glutenproject.exception.GlutenException -import io.glutenproject.expression._ -import io.glutenproject.extension.GlutenPlan -import io.glutenproject.metrics.{GlutenTimeMetric, MetricsUpdater, NoopMetricsUpdater} -import io.glutenproject.substrait.`type`.{TypeBuilder, TypeNode} -import io.glutenproject.substrait.SubstraitContext -import io.glutenproject.substrait.plan.{PlanBuilder, PlanNode} -import io.glutenproject.substrait.rel.{RelNode, SplitInfo} -import io.glutenproject.utils.SubstraitPlanPrinterUtil +package org.apache.gluten.execution + +import org.apache.gluten.{GlutenConfig, GlutenNumaBindingInfo} +import org.apache.gluten.backendsapi.BackendsApiManager +import org.apache.gluten.exception.GlutenException +import org.apache.gluten.expression._ +import org.apache.gluten.extension.GlutenPlan +import org.apache.gluten.metrics.{GlutenTimeMetric, MetricsUpdater, NoopMetricsUpdater} +import org.apache.gluten.substrait.`type`.{TypeBuilder, TypeNode} +import org.apache.gluten.substrait.SubstraitContext +import org.apache.gluten.substrait.plan.{PlanBuilder, PlanNode} +import org.apache.gluten.substrait.rel.{RelNode, SplitInfo} +import org.apache.gluten.utils.SubstraitPlanPrinterUtil import org.apache.spark._ import org.apache.spark.rdd.RDD diff --git a/gluten-core/src/main/scala/io/glutenproject/execution/WholeStageZippedPartitionsRDD.scala b/gluten-core/src/main/scala/org/apache/gluten/execution/WholeStageZippedPartitionsRDD.scala similarity index 90% rename from gluten-core/src/main/scala/io/glutenproject/execution/WholeStageZippedPartitionsRDD.scala rename to gluten-core/src/main/scala/org/apache/gluten/execution/WholeStageZippedPartitionsRDD.scala index 9a11326c5271..32cf23d437a8 100644 --- a/gluten-core/src/main/scala/io/glutenproject/execution/WholeStageZippedPartitionsRDD.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/execution/WholeStageZippedPartitionsRDD.scala @@ -14,18 +14,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution +package org.apache.gluten.execution -import io.glutenproject.GlutenNumaBindingInfo -import io.glutenproject.backendsapi.BackendsApiManager -import io.glutenproject.metrics.{GlutenTimeMetric, IMetrics} +import org.apache.gluten.GlutenNumaBindingInfo +import org.apache.gluten.backendsapi.BackendsApiManager +import org.apache.gluten.metrics.{GlutenTimeMetric, IMetrics} import org.apache.spark.{Partition, SparkConf, SparkContext, TaskContext} import org.apache.spark.rdd.RDD import org.apache.spark.sql.execution.metric.SQLMetric import org.apache.spark.sql.vectorized.ColumnarBatch -private[glutenproject] class ZippedPartitionsPartition( +private[gluten] class ZippedPartitionsPartition( override val index: Int, val inputColumnarRDDPartitions: Seq[Partition]) extends Partition {} diff --git a/gluten-core/src/main/scala/io/glutenproject/execution/WindowExecTransformer.scala b/gluten-core/src/main/scala/org/apache/gluten/execution/WindowExecTransformer.scala similarity index 92% rename from gluten-core/src/main/scala/io/glutenproject/execution/WindowExecTransformer.scala rename to gluten-core/src/main/scala/org/apache/gluten/execution/WindowExecTransformer.scala index e4053b7a5194..d7c3d3dd56a4 100644 --- a/gluten-core/src/main/scala/io/glutenproject/execution/WindowExecTransformer.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/execution/WindowExecTransformer.scala @@ -14,18 +14,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution - -import io.glutenproject.GlutenConfig -import io.glutenproject.backendsapi.BackendsApiManager -import io.glutenproject.expression._ -import io.glutenproject.extension.ValidationResult -import io.glutenproject.metrics.MetricsUpdater -import io.glutenproject.substrait.`type`.TypeBuilder -import io.glutenproject.substrait.SubstraitContext -import io.glutenproject.substrait.expression.WindowFunctionNode -import io.glutenproject.substrait.extensions.ExtensionBuilder -import io.glutenproject.substrait.rel.{RelBuilder, RelNode} +package org.apache.gluten.execution + +import org.apache.gluten.GlutenConfig +import org.apache.gluten.backendsapi.BackendsApiManager +import org.apache.gluten.expression._ +import org.apache.gluten.extension.ValidationResult +import org.apache.gluten.metrics.MetricsUpdater +import org.apache.gluten.substrait.`type`.TypeBuilder +import org.apache.gluten.substrait.SubstraitContext +import org.apache.gluten.substrait.expression.WindowFunctionNode +import org.apache.gluten.substrait.extensions.ExtensionBuilder +import org.apache.gluten.substrait.rel.{RelBuilder, RelNode} import org.apache.spark.sql.catalyst.expressions._ import org.apache.spark.sql.catalyst.plans.physical.{AllTuples, ClusteredDistribution, Distribution, Partitioning} diff --git a/gluten-core/src/main/scala/io/glutenproject/execution/WriteFilesExecTransformer.scala b/gluten-core/src/main/scala/org/apache/gluten/execution/WriteFilesExecTransformer.scala similarity index 93% rename from gluten-core/src/main/scala/io/glutenproject/execution/WriteFilesExecTransformer.scala rename to gluten-core/src/main/scala/org/apache/gluten/execution/WriteFilesExecTransformer.scala index 08c199c2e233..7df4afa8a6c1 100644 --- a/gluten-core/src/main/scala/io/glutenproject/execution/WriteFilesExecTransformer.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/execution/WriteFilesExecTransformer.scala @@ -14,17 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution - -import io.glutenproject.GlutenConfig -import io.glutenproject.backendsapi.BackendsApiManager -import io.glutenproject.expression.ConverterUtils -import io.glutenproject.extension.ValidationResult -import io.glutenproject.metrics.MetricsUpdater -import io.glutenproject.substrait.`type`.{ColumnTypeNode, TypeBuilder} -import io.glutenproject.substrait.SubstraitContext -import io.glutenproject.substrait.extensions.ExtensionBuilder -import io.glutenproject.substrait.rel.{RelBuilder, RelNode} +package org.apache.gluten.execution + +import org.apache.gluten.GlutenConfig +import org.apache.gluten.backendsapi.BackendsApiManager +import org.apache.gluten.expression.ConverterUtils +import org.apache.gluten.extension.ValidationResult +import org.apache.gluten.metrics.MetricsUpdater +import org.apache.gluten.substrait.`type`.{ColumnTypeNode, TypeBuilder} +import org.apache.gluten.substrait.SubstraitContext +import org.apache.gluten.substrait.extensions.ExtensionBuilder +import org.apache.gluten.substrait.rel.{RelBuilder, RelNode} import org.apache.spark.sql.catalyst.catalog.BucketSpec import org.apache.spark.sql.catalyst.catalog.CatalogTypes.TablePartitionSpec diff --git a/gluten-core/src/main/scala/io/glutenproject/expression/AggregateFunctionsBuilder.scala b/gluten-core/src/main/scala/org/apache/gluten/expression/AggregateFunctionsBuilder.scala similarity index 91% rename from gluten-core/src/main/scala/io/glutenproject/expression/AggregateFunctionsBuilder.scala rename to gluten-core/src/main/scala/org/apache/gluten/expression/AggregateFunctionsBuilder.scala index fd9d341f37b4..f83ab1262b17 100644 --- a/gluten-core/src/main/scala/io/glutenproject/expression/AggregateFunctionsBuilder.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/expression/AggregateFunctionsBuilder.scala @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.expression +package org.apache.gluten.expression -import io.glutenproject.backendsapi.BackendsApiManager -import io.glutenproject.exception.GlutenNotSupportException -import io.glutenproject.expression.ConverterUtils.FunctionConfig -import io.glutenproject.substrait.expression.ExpressionBuilder +import org.apache.gluten.backendsapi.BackendsApiManager +import org.apache.gluten.exception.GlutenNotSupportException +import org.apache.gluten.expression.ConverterUtils.FunctionConfig +import org.apache.gluten.substrait.expression.ExpressionBuilder import org.apache.spark.sql.catalyst.expressions.aggregate._ import org.apache.spark.sql.types.DataType diff --git a/gluten-core/src/main/scala/io/glutenproject/expression/ArrayExpressionTransformer.scala b/gluten-core/src/main/scala/org/apache/gluten/expression/ArrayExpressionTransformer.scala similarity index 92% rename from gluten-core/src/main/scala/io/glutenproject/expression/ArrayExpressionTransformer.scala rename to gluten-core/src/main/scala/org/apache/gluten/expression/ArrayExpressionTransformer.scala index b79ba85d360b..85a1f58fba20 100644 --- a/gluten-core/src/main/scala/io/glutenproject/expression/ArrayExpressionTransformer.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/expression/ArrayExpressionTransformer.scala @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.expression +package org.apache.gluten.expression -import io.glutenproject.backendsapi.BackendsApiManager -import io.glutenproject.exception.GlutenNotSupportException -import io.glutenproject.expression.ConverterUtils.FunctionConfig -import io.glutenproject.substrait.expression.{ExpressionBuilder, ExpressionNode} +import org.apache.gluten.backendsapi.BackendsApiManager +import org.apache.gluten.exception.GlutenNotSupportException +import org.apache.gluten.expression.ConverterUtils.FunctionConfig +import org.apache.gluten.substrait.expression.{ExpressionBuilder, ExpressionNode} import org.apache.spark.sql.catalyst.expressions._ import org.apache.spark.sql.types._ diff --git a/gluten-core/src/main/scala/io/glutenproject/expression/BoundReferenceTransformer.scala b/gluten-core/src/main/scala/org/apache/gluten/expression/BoundReferenceTransformer.scala similarity index 90% rename from gluten-core/src/main/scala/io/glutenproject/expression/BoundReferenceTransformer.scala rename to gluten-core/src/main/scala/org/apache/gluten/expression/BoundReferenceTransformer.scala index 2d7b33023edb..2cfced13b7b0 100644 --- a/gluten-core/src/main/scala/io/glutenproject/expression/BoundReferenceTransformer.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/expression/BoundReferenceTransformer.scala @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.expression +package org.apache.gluten.expression -import io.glutenproject.substrait.expression.{ExpressionBuilder, ExpressionNode} +import org.apache.gluten.substrait.expression.{ExpressionBuilder, ExpressionNode} import org.apache.spark.sql.types._ diff --git a/gluten-core/src/main/scala/io/glutenproject/expression/ConditionalTransformer.scala b/gluten-core/src/main/scala/org/apache/gluten/expression/ConditionalTransformer.scala similarity index 94% rename from gluten-core/src/main/scala/io/glutenproject/expression/ConditionalTransformer.scala rename to gluten-core/src/main/scala/org/apache/gluten/expression/ConditionalTransformer.scala index ab5336c9fbb2..18a46d7cad63 100644 --- a/gluten-core/src/main/scala/io/glutenproject/expression/ConditionalTransformer.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/expression/ConditionalTransformer.scala @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.expression +package org.apache.gluten.expression -import io.glutenproject.substrait.expression.{ExpressionBuilder, ExpressionNode, IfThenNode} +import org.apache.gluten.substrait.expression.{ExpressionBuilder, ExpressionNode, IfThenNode} import org.apache.spark.sql.catalyst.expressions._ diff --git a/gluten-core/src/main/scala/io/glutenproject/expression/ConverterUtils.scala b/gluten-core/src/main/scala/org/apache/gluten/expression/ConverterUtils.scala similarity index 98% rename from gluten-core/src/main/scala/io/glutenproject/expression/ConverterUtils.scala rename to gluten-core/src/main/scala/org/apache/gluten/expression/ConverterUtils.scala index 169a9dd0e527..a944de3d3cef 100644 --- a/gluten-core/src/main/scala/io/glutenproject/expression/ConverterUtils.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/expression/ConverterUtils.scala @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.expression +package org.apache.gluten.expression -import io.glutenproject.backendsapi.BackendsApiManager -import io.glutenproject.exception.GlutenNotSupportException -import io.glutenproject.substrait.`type`._ -import io.glutenproject.utils.SubstraitPlanPrinterUtil +import org.apache.gluten.backendsapi.BackendsApiManager +import org.apache.gluten.exception.GlutenNotSupportException +import org.apache.gluten.substrait.`type`._ +import org.apache.gluten.utils.SubstraitPlanPrinterUtil import org.apache.spark.internal.Logging import org.apache.spark.sql.catalyst.expressions._ diff --git a/gluten-core/src/main/scala/io/glutenproject/expression/DateTimeExpressionsTransformer.scala b/gluten-core/src/main/scala/org/apache/gluten/expression/DateTimeExpressionsTransformer.scala similarity index 96% rename from gluten-core/src/main/scala/io/glutenproject/expression/DateTimeExpressionsTransformer.scala rename to gluten-core/src/main/scala/org/apache/gluten/expression/DateTimeExpressionsTransformer.scala index 213df7f253a8..797dc81d3f69 100644 --- a/gluten-core/src/main/scala/io/glutenproject/expression/DateTimeExpressionsTransformer.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/expression/DateTimeExpressionsTransformer.scala @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.expression +package org.apache.gluten.expression -import io.glutenproject.backendsapi.BackendsApiManager -import io.glutenproject.exception.GlutenNotSupportException -import io.glutenproject.expression.ConverterUtils.FunctionConfig -import io.glutenproject.substrait.expression.{ExpressionBuilder, ExpressionNode} +import org.apache.gluten.backendsapi.BackendsApiManager +import org.apache.gluten.exception.GlutenNotSupportException +import org.apache.gluten.expression.ConverterUtils.FunctionConfig +import org.apache.gluten.substrait.expression.{ExpressionBuilder, ExpressionNode} import org.apache.spark.sql.catalyst.expressions._ import org.apache.spark.sql.types._ diff --git a/gluten-core/src/main/scala/io/glutenproject/expression/DecimalRoundTransformer.scala b/gluten-core/src/main/scala/org/apache/gluten/expression/DecimalRoundTransformer.scala similarity index 92% rename from gluten-core/src/main/scala/io/glutenproject/expression/DecimalRoundTransformer.scala rename to gluten-core/src/main/scala/org/apache/gluten/expression/DecimalRoundTransformer.scala index 8d326f177d83..60e64cd95739 100644 --- a/gluten-core/src/main/scala/io/glutenproject/expression/DecimalRoundTransformer.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/expression/DecimalRoundTransformer.scala @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.expression +package org.apache.gluten.expression -import io.glutenproject.exception.GlutenNotSupportException -import io.glutenproject.expression.ConverterUtils.FunctionConfig -import io.glutenproject.substrait.expression.{ExpressionBuilder, ExpressionNode} +import org.apache.gluten.exception.GlutenNotSupportException +import org.apache.gluten.expression.ConverterUtils.FunctionConfig +import org.apache.gluten.substrait.expression.{ExpressionBuilder, ExpressionNode} import org.apache.spark.sql.catalyst.expressions._ import org.apache.spark.sql.types.{DataType, DecimalType} diff --git a/gluten-core/src/main/scala/io/glutenproject/expression/ExpressionConverter.scala b/gluten-core/src/main/scala/org/apache/gluten/expression/ExpressionConverter.scala similarity index 98% rename from gluten-core/src/main/scala/io/glutenproject/expression/ExpressionConverter.scala rename to gluten-core/src/main/scala/org/apache/gluten/expression/ExpressionConverter.scala index dc86ecb5222d..d3ac729bc0ab 100644 --- a/gluten-core/src/main/scala/io/glutenproject/expression/ExpressionConverter.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/expression/ExpressionConverter.scala @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.expression +package org.apache.gluten.expression -import io.glutenproject.GlutenConfig -import io.glutenproject.backendsapi.BackendsApiManager -import io.glutenproject.exception.GlutenNotSupportException -import io.glutenproject.execution.{ColumnarToRowExecBase, WholeStageTransformer} -import io.glutenproject.sql.shims.SparkShimLoader -import io.glutenproject.test.TestStats -import io.glutenproject.utils.{DecimalArithmeticUtil, PlanUtil} +import org.apache.gluten.GlutenConfig +import org.apache.gluten.backendsapi.BackendsApiManager +import org.apache.gluten.exception.GlutenNotSupportException +import org.apache.gluten.execution.{ColumnarToRowExecBase, WholeStageTransformer} +import org.apache.gluten.sql.shims.SparkShimLoader +import org.apache.gluten.test.TestStats +import org.apache.gluten.utils.{DecimalArithmeticUtil, PlanUtil} import org.apache.spark.internal.Logging import org.apache.spark.sql.catalyst.{InternalRow, SQLConfHelper} diff --git a/gluten-core/src/main/scala/io/glutenproject/expression/ExpressionMappings.scala b/gluten-core/src/main/scala/org/apache/gluten/expression/ExpressionMappings.scala similarity index 97% rename from gluten-core/src/main/scala/io/glutenproject/expression/ExpressionMappings.scala rename to gluten-core/src/main/scala/org/apache/gluten/expression/ExpressionMappings.scala index b3b1ab12b656..46803a93e7d5 100644 --- a/gluten-core/src/main/scala/io/glutenproject/expression/ExpressionMappings.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/expression/ExpressionMappings.scala @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.expression +package org.apache.gluten.expression -import io.glutenproject.GlutenConfig -import io.glutenproject.backendsapi.BackendsApiManager -import io.glutenproject.expression.ExpressionNames._ -import io.glutenproject.extension.ExpressionExtensionTrait -import io.glutenproject.sql.shims.SparkShimLoader +import org.apache.gluten.GlutenConfig +import org.apache.gluten.backendsapi.BackendsApiManager +import org.apache.gluten.expression.ExpressionNames._ +import org.apache.gluten.extension.ExpressionExtensionTrait +import org.apache.gluten.sql.shims.SparkShimLoader import org.apache.spark.sql.catalyst.expressions._ import org.apache.spark.sql.catalyst.expressions.aggregate._ diff --git a/gluten-core/src/main/scala/io/glutenproject/expression/ExpressionTransformer.scala b/gluten-core/src/main/scala/org/apache/gluten/expression/ExpressionTransformer.scala similarity index 90% rename from gluten-core/src/main/scala/io/glutenproject/expression/ExpressionTransformer.scala rename to gluten-core/src/main/scala/org/apache/gluten/expression/ExpressionTransformer.scala index 47da1b9b9b21..65badcbaea44 100644 --- a/gluten-core/src/main/scala/io/glutenproject/expression/ExpressionTransformer.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/expression/ExpressionTransformer.scala @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.expression +package org.apache.gluten.expression -import io.glutenproject.substrait.expression.ExpressionNode +import org.apache.gluten.substrait.expression.ExpressionNode trait ExpressionTransformer { def doTransform(args: java.lang.Object): ExpressionNode diff --git a/gluten-core/src/main/scala/io/glutenproject/expression/ExpressionUtils.scala b/gluten-core/src/main/scala/org/apache/gluten/expression/ExpressionUtils.scala similarity index 97% rename from gluten-core/src/main/scala/io/glutenproject/expression/ExpressionUtils.scala rename to gluten-core/src/main/scala/org/apache/gluten/expression/ExpressionUtils.scala index 24dc75a28f86..c0920cd5010a 100644 --- a/gluten-core/src/main/scala/io/glutenproject/expression/ExpressionUtils.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/expression/ExpressionUtils.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.expression +package org.apache.gluten.expression import org.apache.spark.sql.catalyst.expressions.{Expression, LeafExpression} diff --git a/gluten-core/src/main/scala/io/glutenproject/expression/GenericExpressionTransformer.scala b/gluten-core/src/main/scala/org/apache/gluten/expression/GenericExpressionTransformer.scala similarity index 90% rename from gluten-core/src/main/scala/io/glutenproject/expression/GenericExpressionTransformer.scala rename to gluten-core/src/main/scala/org/apache/gluten/expression/GenericExpressionTransformer.scala index 568b66690396..62afcad2838a 100644 --- a/gluten-core/src/main/scala/io/glutenproject/expression/GenericExpressionTransformer.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/expression/GenericExpressionTransformer.scala @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.expression +package org.apache.gluten.expression -import io.glutenproject.expression.ConverterUtils.FunctionConfig -import io.glutenproject.substrait.expression.{ExpressionBuilder, ExpressionNode} +import org.apache.gluten.expression.ConverterUtils.FunctionConfig +import org.apache.gluten.substrait.expression.{ExpressionBuilder, ExpressionNode} import org.apache.spark.sql.catalyst.expressions._ diff --git a/gluten-core/src/main/scala/io/glutenproject/expression/HashExpressionTransformer.scala b/gluten-core/src/main/scala/org/apache/gluten/expression/HashExpressionTransformer.scala similarity index 90% rename from gluten-core/src/main/scala/io/glutenproject/expression/HashExpressionTransformer.scala rename to gluten-core/src/main/scala/org/apache/gluten/expression/HashExpressionTransformer.scala index a8987bb706c1..d813f8250696 100644 --- a/gluten-core/src/main/scala/io/glutenproject/expression/HashExpressionTransformer.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/expression/HashExpressionTransformer.scala @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.expression +package org.apache.gluten.expression -import io.glutenproject.expression.ConverterUtils.FunctionConfig -import io.glutenproject.substrait.expression.{ExpressionBuilder, ExpressionNode} +import org.apache.gluten.expression.ConverterUtils.FunctionConfig +import org.apache.gluten.substrait.expression.{ExpressionBuilder, ExpressionNode} import org.apache.spark.sql.catalyst.expressions._ diff --git a/gluten-core/src/main/scala/io/glutenproject/expression/JsonTupleExpressionTransformer.scala b/gluten-core/src/main/scala/org/apache/gluten/expression/JsonTupleExpressionTransformer.scala similarity index 89% rename from gluten-core/src/main/scala/io/glutenproject/expression/JsonTupleExpressionTransformer.scala rename to gluten-core/src/main/scala/org/apache/gluten/expression/JsonTupleExpressionTransformer.scala index 722886e29f87..25e3e12a53de 100644 --- a/gluten-core/src/main/scala/io/glutenproject/expression/JsonTupleExpressionTransformer.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/expression/JsonTupleExpressionTransformer.scala @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.expression +package org.apache.gluten.expression -import io.glutenproject.expression.ConverterUtils.FunctionConfig -import io.glutenproject.substrait.`type`.ListNode -import io.glutenproject.substrait.expression.{ExpressionBuilder, ExpressionNode} +import org.apache.gluten.expression.ConverterUtils.FunctionConfig +import org.apache.gluten.substrait.`type`.ListNode +import org.apache.gluten.substrait.expression.{ExpressionBuilder, ExpressionNode} import org.apache.spark.sql.catalyst.expressions.Expression diff --git a/gluten-core/src/main/scala/io/glutenproject/expression/LambdaFunctionTransformer.scala b/gluten-core/src/main/scala/org/apache/gluten/expression/LambdaFunctionTransformer.scala similarity index 91% rename from gluten-core/src/main/scala/io/glutenproject/expression/LambdaFunctionTransformer.scala rename to gluten-core/src/main/scala/org/apache/gluten/expression/LambdaFunctionTransformer.scala index f93af31805f2..492de2b76a4a 100644 --- a/gluten-core/src/main/scala/io/glutenproject/expression/LambdaFunctionTransformer.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/expression/LambdaFunctionTransformer.scala @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.expression +package org.apache.gluten.expression -import io.glutenproject.exception.GlutenNotSupportException -import io.glutenproject.substrait.expression.{ExpressionBuilder, ExpressionNode} +import org.apache.gluten.exception.GlutenNotSupportException +import org.apache.gluten.substrait.expression.{ExpressionBuilder, ExpressionNode} import org.apache.spark.sql.catalyst.expressions.LambdaFunction diff --git a/gluten-core/src/main/scala/io/glutenproject/expression/LiteralTransformer.scala b/gluten-core/src/main/scala/org/apache/gluten/expression/LiteralTransformer.scala similarity index 90% rename from gluten-core/src/main/scala/io/glutenproject/expression/LiteralTransformer.scala rename to gluten-core/src/main/scala/org/apache/gluten/expression/LiteralTransformer.scala index 874b07e91fd6..05787858e825 100644 --- a/gluten-core/src/main/scala/io/glutenproject/expression/LiteralTransformer.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/expression/LiteralTransformer.scala @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.expression +package org.apache.gluten.expression -import io.glutenproject.substrait.expression.{ExpressionBuilder, ExpressionNode} +import org.apache.gluten.substrait.expression.{ExpressionBuilder, ExpressionNode} import org.apache.spark.sql.catalyst.expressions._ diff --git a/gluten-core/src/main/scala/io/glutenproject/expression/MapExpressionTransformer.scala b/gluten-core/src/main/scala/org/apache/gluten/expression/MapExpressionTransformer.scala similarity index 91% rename from gluten-core/src/main/scala/io/glutenproject/expression/MapExpressionTransformer.scala rename to gluten-core/src/main/scala/org/apache/gluten/expression/MapExpressionTransformer.scala index 1b4f5c206b9a..e136f1b3a31a 100644 --- a/gluten-core/src/main/scala/io/glutenproject/expression/MapExpressionTransformer.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/expression/MapExpressionTransformer.scala @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.expression +package org.apache.gluten.expression -import io.glutenproject.backendsapi.BackendsApiManager -import io.glutenproject.exception.GlutenNotSupportException -import io.glutenproject.expression.ConverterUtils.FunctionConfig -import io.glutenproject.substrait.expression.{ExpressionBuilder, ExpressionNode} +import org.apache.gluten.backendsapi.BackendsApiManager +import org.apache.gluten.exception.GlutenNotSupportException +import org.apache.gluten.expression.ConverterUtils.FunctionConfig +import org.apache.gluten.substrait.expression.{ExpressionBuilder, ExpressionNode} import org.apache.spark.sql.catalyst.expressions._ diff --git a/gluten-core/src/main/scala/io/glutenproject/expression/NamedExpressionsTransformer.scala b/gluten-core/src/main/scala/org/apache/gluten/expression/NamedExpressionsTransformer.scala similarity index 94% rename from gluten-core/src/main/scala/io/glutenproject/expression/NamedExpressionsTransformer.scala rename to gluten-core/src/main/scala/org/apache/gluten/expression/NamedExpressionsTransformer.scala index 1cdd5250d2c0..70ad13584edd 100644 --- a/gluten-core/src/main/scala/io/glutenproject/expression/NamedExpressionsTransformer.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/expression/NamedExpressionsTransformer.scala @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.expression +package org.apache.gluten.expression -import io.glutenproject.expression.ConverterUtils.FunctionConfig -import io.glutenproject.substrait.expression.{ExpressionBuilder, ExpressionNode} +import org.apache.gluten.expression.ConverterUtils.FunctionConfig +import org.apache.gluten.substrait.expression.{ExpressionBuilder, ExpressionNode} import org.apache.spark.sql.catalyst.expressions._ import org.apache.spark.sql.types._ diff --git a/gluten-core/src/main/scala/io/glutenproject/expression/PredicateExpressionTransformer.scala b/gluten-core/src/main/scala/org/apache/gluten/expression/PredicateExpressionTransformer.scala similarity index 94% rename from gluten-core/src/main/scala/io/glutenproject/expression/PredicateExpressionTransformer.scala rename to gluten-core/src/main/scala/org/apache/gluten/expression/PredicateExpressionTransformer.scala index 3e3f2d298400..dfa4ceed6055 100644 --- a/gluten-core/src/main/scala/io/glutenproject/expression/PredicateExpressionTransformer.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/expression/PredicateExpressionTransformer.scala @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.expression +package org.apache.gluten.expression -import io.glutenproject.backendsapi.BackendsApiManager -import io.glutenproject.expression.ConverterUtils.FunctionConfig -import io.glutenproject.substrait.expression.{ExpressionBuilder, ExpressionNode} +import org.apache.gluten.backendsapi.BackendsApiManager +import org.apache.gluten.expression.ConverterUtils.FunctionConfig +import org.apache.gluten.substrait.expression.{ExpressionBuilder, ExpressionNode} import org.apache.spark.sql.catalyst.expressions._ import org.apache.spark.sql.types._ diff --git a/gluten-core/src/main/scala/io/glutenproject/expression/ScalarSubqueryTransformer.scala b/gluten-core/src/main/scala/org/apache/gluten/expression/ScalarSubqueryTransformer.scala similarity index 95% rename from gluten-core/src/main/scala/io/glutenproject/expression/ScalarSubqueryTransformer.scala rename to gluten-core/src/main/scala/org/apache/gluten/expression/ScalarSubqueryTransformer.scala index 5b9462eface8..61b1e4382e54 100644 --- a/gluten-core/src/main/scala/io/glutenproject/expression/ScalarSubqueryTransformer.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/expression/ScalarSubqueryTransformer.scala @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.expression +package org.apache.gluten.expression -import io.glutenproject.substrait.expression.{ExpressionBuilder, ExpressionNode} +import org.apache.gluten.substrait.expression.{ExpressionBuilder, ExpressionNode} import org.apache.spark.sql.catalyst.expressions._ import org.apache.spark.sql.execution.{BaseSubqueryExec, ScalarSubquery} diff --git a/gluten-core/src/main/scala/io/glutenproject/expression/StringExpressionTransformer.scala b/gluten-core/src/main/scala/org/apache/gluten/expression/StringExpressionTransformer.scala similarity index 92% rename from gluten-core/src/main/scala/io/glutenproject/expression/StringExpressionTransformer.scala rename to gluten-core/src/main/scala/org/apache/gluten/expression/StringExpressionTransformer.scala index 3fe42e8d7039..da021be24834 100644 --- a/gluten-core/src/main/scala/io/glutenproject/expression/StringExpressionTransformer.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/expression/StringExpressionTransformer.scala @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.expression +package org.apache.gluten.expression -import io.glutenproject.expression.ConverterUtils.FunctionConfig -import io.glutenproject.substrait.expression._ +import org.apache.gluten.expression.ConverterUtils.FunctionConfig +import org.apache.gluten.substrait.expression._ import org.apache.spark.sql.catalyst.expressions._ diff --git a/gluten-core/src/main/scala/io/glutenproject/expression/StructExpressionTransformer.scala b/gluten-core/src/main/scala/org/apache/gluten/expression/StructExpressionTransformer.scala similarity index 91% rename from gluten-core/src/main/scala/io/glutenproject/expression/StructExpressionTransformer.scala rename to gluten-core/src/main/scala/org/apache/gluten/expression/StructExpressionTransformer.scala index e5af5400ba88..c70395a7d7a7 100644 --- a/gluten-core/src/main/scala/io/glutenproject/expression/StructExpressionTransformer.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/expression/StructExpressionTransformer.scala @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.expression +package org.apache.gluten.expression -import io.glutenproject.expression.ConverterUtils.FunctionConfig -import io.glutenproject.substrait.expression.{ExpressionBuilder, ExpressionNode, StructLiteralNode} +import org.apache.gluten.expression.ConverterUtils.FunctionConfig +import org.apache.gluten.substrait.expression.{ExpressionBuilder, ExpressionNode, StructLiteralNode} import org.apache.spark.sql.catalyst.expressions.GetStructField import org.apache.spark.sql.types.IntegerType diff --git a/gluten-core/src/main/scala/io/glutenproject/expression/TimestampAddTransform.scala b/gluten-core/src/main/scala/org/apache/gluten/expression/TimestampAddTransform.scala similarity index 91% rename from gluten-core/src/main/scala/io/glutenproject/expression/TimestampAddTransform.scala rename to gluten-core/src/main/scala/org/apache/gluten/expression/TimestampAddTransform.scala index cc4d7bb472cf..b3b3730b741d 100644 --- a/gluten-core/src/main/scala/io/glutenproject/expression/TimestampAddTransform.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/expression/TimestampAddTransform.scala @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.expression +package org.apache.gluten.expression -import io.glutenproject.expression.ConverterUtils.FunctionConfig -import io.glutenproject.substrait.expression.{ExpressionBuilder, ExpressionNode} +import org.apache.gluten.expression.ConverterUtils.FunctionConfig +import org.apache.gluten.substrait.expression.{ExpressionBuilder, ExpressionNode} import org.apache.spark.sql.types.DataType diff --git a/gluten-core/src/main/scala/io/glutenproject/expression/TransformerState.scala b/gluten-core/src/main/scala/org/apache/gluten/expression/TransformerState.scala similarity index 96% rename from gluten-core/src/main/scala/io/glutenproject/expression/TransformerState.scala rename to gluten-core/src/main/scala/org/apache/gluten/expression/TransformerState.scala index 337becd194fb..f9f8949af578 100644 --- a/gluten-core/src/main/scala/io/glutenproject/expression/TransformerState.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/expression/TransformerState.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.expression +package org.apache.gluten.expression object TransformerState { private lazy val validationState = new ThreadLocal[Integer] { diff --git a/gluten-core/src/main/scala/io/glutenproject/expression/UDFMappings.scala b/gluten-core/src/main/scala/org/apache/gluten/expression/UDFMappings.scala similarity index 97% rename from gluten-core/src/main/scala/io/glutenproject/expression/UDFMappings.scala rename to gluten-core/src/main/scala/org/apache/gluten/expression/UDFMappings.scala index 4b6adef7c0bd..7c836252b92d 100644 --- a/gluten-core/src/main/scala/io/glutenproject/expression/UDFMappings.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/expression/UDFMappings.scala @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.expression +package org.apache.gluten.expression -import io.glutenproject.GlutenConfig +import org.apache.gluten.GlutenConfig import org.apache.spark.SparkConf import org.apache.spark.internal.Logging diff --git a/gluten-core/src/main/scala/io/glutenproject/expression/UnaryExpressionTransformer.scala b/gluten-core/src/main/scala/org/apache/gluten/expression/UnaryExpressionTransformer.scala similarity index 95% rename from gluten-core/src/main/scala/io/glutenproject/expression/UnaryExpressionTransformer.scala rename to gluten-core/src/main/scala/org/apache/gluten/expression/UnaryExpressionTransformer.scala index 1e82b9c82ba4..88df12b84d9a 100644 --- a/gluten-core/src/main/scala/io/glutenproject/expression/UnaryExpressionTransformer.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/expression/UnaryExpressionTransformer.scala @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.expression - -import io.glutenproject.backendsapi.BackendsApiManager -import io.glutenproject.exception.GlutenNotSupportException -import io.glutenproject.expression.ConverterUtils.FunctionConfig -import io.glutenproject.substrait.`type`.ListNode -import io.glutenproject.substrait.`type`.MapNode -import io.glutenproject.substrait.expression.{BooleanLiteralNode, ExpressionBuilder, ExpressionNode, IntLiteralNode} +package org.apache.gluten.expression + +import org.apache.gluten.backendsapi.BackendsApiManager +import org.apache.gluten.exception.GlutenNotSupportException +import org.apache.gluten.expression.ConverterUtils.FunctionConfig +import org.apache.gluten.substrait.`type`.ListNode +import org.apache.gluten.substrait.`type`.MapNode +import org.apache.gluten.substrait.expression.{BooleanLiteralNode, ExpressionBuilder, ExpressionNode, IntLiteralNode} import org.apache.spark.sql.catalyst.expressions._ import org.apache.spark.sql.types._ diff --git a/gluten-core/src/main/scala/io/glutenproject/expression/WindowFunctionsBuilder.scala b/gluten-core/src/main/scala/org/apache/gluten/expression/WindowFunctionsBuilder.scala similarity index 89% rename from gluten-core/src/main/scala/io/glutenproject/expression/WindowFunctionsBuilder.scala rename to gluten-core/src/main/scala/org/apache/gluten/expression/WindowFunctionsBuilder.scala index c610d9705bbb..831e3199733d 100644 --- a/gluten-core/src/main/scala/io/glutenproject/expression/WindowFunctionsBuilder.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/expression/WindowFunctionsBuilder.scala @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.expression +package org.apache.gluten.expression -import io.glutenproject.exception.GlutenNotSupportException -import io.glutenproject.expression.ConverterUtils.FunctionConfig -import io.glutenproject.expression.ExpressionNames.{LAG, LEAD} -import io.glutenproject.substrait.expression.ExpressionBuilder +import org.apache.gluten.exception.GlutenNotSupportException +import org.apache.gluten.expression.ConverterUtils.FunctionConfig +import org.apache.gluten.expression.ExpressionNames.{LAG, LEAD} +import org.apache.gluten.substrait.expression.ExpressionBuilder import org.apache.spark.sql.catalyst.expressions.{EmptyRow, Expression, Lag, Lead, WindowExpression, WindowFunction} diff --git a/gluten-core/src/main/scala/io/glutenproject/extension/ColumnarOverrides.scala b/gluten-core/src/main/scala/org/apache/gluten/extension/ColumnarOverrides.scala similarity index 96% rename from gluten-core/src/main/scala/io/glutenproject/extension/ColumnarOverrides.scala rename to gluten-core/src/main/scala/org/apache/gluten/extension/ColumnarOverrides.scala index 279ce2fb2d43..ff842839d690 100644 --- a/gluten-core/src/main/scala/io/glutenproject/extension/ColumnarOverrides.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/extension/ColumnarOverrides.scala @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.extension - -import io.glutenproject.{GlutenConfig, GlutenSparkExtensionsInjector} -import io.glutenproject.backendsapi.BackendsApiManager -import io.glutenproject.extension.columnar._ -import io.glutenproject.extension.columnar.MiscColumnarRules.{RemoveGlutenTableCacheColumnarToRow, RemoveTopmostColumnarToRow, TransformPostOverrides, TransformPreOverrides} -import io.glutenproject.extension.columnar.transform._ -import io.glutenproject.metrics.GlutenTimeMetric -import io.glutenproject.utils.{LogLevelUtil, PhysicalPlanSelector, PlanUtil} +package org.apache.gluten.extension + +import org.apache.gluten.{GlutenConfig, GlutenSparkExtensionsInjector} +import org.apache.gluten.backendsapi.BackendsApiManager +import org.apache.gluten.extension.columnar._ +import org.apache.gluten.extension.columnar.MiscColumnarRules.{RemoveGlutenTableCacheColumnarToRow, RemoveTopmostColumnarToRow, TransformPostOverrides, TransformPreOverrides} +import org.apache.gluten.extension.columnar.transform._ +import org.apache.gluten.metrics.GlutenTimeMetric +import org.apache.gluten.utils.{LogLevelUtil, PhysicalPlanSelector, PlanUtil} import org.apache.spark.broadcast.Broadcast import org.apache.spark.internal.Logging diff --git a/gluten-core/src/main/scala/io/glutenproject/extension/CommonSubexpressionEliminateRule.scala b/gluten-core/src/main/scala/org/apache/gluten/extension/CommonSubexpressionEliminateRule.scala similarity index 99% rename from gluten-core/src/main/scala/io/glutenproject/extension/CommonSubexpressionEliminateRule.scala rename to gluten-core/src/main/scala/org/apache/gluten/extension/CommonSubexpressionEliminateRule.scala index 0d162a4c16ba..8976681db260 100644 --- a/gluten-core/src/main/scala/io/glutenproject/extension/CommonSubexpressionEliminateRule.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/extension/CommonSubexpressionEliminateRule.scala @@ -16,7 +16,7 @@ */ package org.apache.spark.sql.extension -import io.glutenproject.GlutenConfig +import org.apache.gluten.GlutenConfig import org.apache.spark.internal.Logging import org.apache.spark.sql.SparkSession diff --git a/gluten-core/src/main/scala/io/glutenproject/extension/CountDistinctWithoutExpand.scala b/gluten-core/src/main/scala/org/apache/gluten/extension/CountDistinctWithoutExpand.scala similarity index 96% rename from gluten-core/src/main/scala/io/glutenproject/extension/CountDistinctWithoutExpand.scala rename to gluten-core/src/main/scala/org/apache/gluten/extension/CountDistinctWithoutExpand.scala index c7f57030fee2..43cc68eadbe5 100644 --- a/gluten-core/src/main/scala/io/glutenproject/extension/CountDistinctWithoutExpand.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/extension/CountDistinctWithoutExpand.scala @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.extension +package org.apache.gluten.extension -import io.glutenproject.GlutenConfig +import org.apache.gluten.GlutenConfig import org.apache.spark.sql.catalyst.expressions.aggregate.{AggregateExpression, Count, CountDistinct} import org.apache.spark.sql.catalyst.plans.logical.LogicalPlan diff --git a/gluten-core/src/main/scala/io/glutenproject/extension/ExpressionExtensionTrait.scala b/gluten-core/src/main/scala/org/apache/gluten/extension/ExpressionExtensionTrait.scala similarity index 94% rename from gluten-core/src/main/scala/io/glutenproject/extension/ExpressionExtensionTrait.scala rename to gluten-core/src/main/scala/org/apache/gluten/extension/ExpressionExtensionTrait.scala index 1e8e20c21f92..89bcb70641bd 100644 --- a/gluten-core/src/main/scala/io/glutenproject/extension/ExpressionExtensionTrait.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/extension/ExpressionExtensionTrait.scala @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.extension +package org.apache.gluten.extension -import io.glutenproject.exception.GlutenNotSupportException -import io.glutenproject.expression.{ExpressionTransformer, Sig} +import org.apache.gluten.exception.GlutenNotSupportException +import org.apache.gluten.expression.{ExpressionTransformer, Sig} import org.apache.spark.internal.Logging import org.apache.spark.sql.catalyst.expressions.{Attribute, Expression} diff --git a/gluten-core/src/main/scala/io/glutenproject/extension/GlutenPlan.scala b/gluten-core/src/main/scala/org/apache/gluten/extension/GlutenPlan.scala similarity index 87% rename from gluten-core/src/main/scala/io/glutenproject/extension/GlutenPlan.scala rename to gluten-core/src/main/scala/org/apache/gluten/extension/GlutenPlan.scala index cf472dc2fa6a..b5071841f45b 100644 --- a/gluten-core/src/main/scala/io/glutenproject/extension/GlutenPlan.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/extension/GlutenPlan.scala @@ -14,18 +14,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.extension +package org.apache.gluten.extension -import io.glutenproject.GlutenConfig -import io.glutenproject.backendsapi.BackendsApiManager -import io.glutenproject.exception.GlutenNotSupportException -import io.glutenproject.expression.TransformerState -import io.glutenproject.substrait.SubstraitContext -import io.glutenproject.substrait.plan.PlanBuilder -import io.glutenproject.substrait.rel.RelNode -import io.glutenproject.test.TestStats -import io.glutenproject.utils.LogLevelUtil -import io.glutenproject.validate.NativePlanValidationInfo +import org.apache.gluten.GlutenConfig +import org.apache.gluten.backendsapi.BackendsApiManager +import org.apache.gluten.exception.GlutenNotSupportException +import org.apache.gluten.expression.TransformerState +import org.apache.gluten.substrait.SubstraitContext +import org.apache.gluten.substrait.plan.PlanBuilder +import org.apache.gluten.substrait.rel.RelNode +import org.apache.gluten.test.TestStats +import org.apache.gluten.utils.LogLevelUtil +import org.apache.gluten.validate.NativePlanValidationInfo import org.apache.spark.sql.execution.SparkPlan diff --git a/gluten-core/src/main/scala/io/glutenproject/extension/OthersExtensionOverrides.scala b/gluten-core/src/main/scala/org/apache/gluten/extension/OthersExtensionOverrides.scala similarity index 91% rename from gluten-core/src/main/scala/io/glutenproject/extension/OthersExtensionOverrides.scala rename to gluten-core/src/main/scala/org/apache/gluten/extension/OthersExtensionOverrides.scala index a9de49c40480..d9f8fcd08051 100644 --- a/gluten-core/src/main/scala/io/glutenproject/extension/OthersExtensionOverrides.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/extension/OthersExtensionOverrides.scala @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.extension +package org.apache.gluten.extension -import io.glutenproject.GlutenSparkExtensionsInjector -import io.glutenproject.backendsapi.BackendsApiManager +import org.apache.gluten.GlutenSparkExtensionsInjector +import org.apache.gluten.backendsapi.BackendsApiManager import org.apache.spark.sql.SparkSessionExtensions diff --git a/gluten-core/src/main/scala/io/glutenproject/extension/QueryStagePrepOverrides.scala b/gluten-core/src/main/scala/org/apache/gluten/extension/QueryStagePrepOverrides.scala similarity index 93% rename from gluten-core/src/main/scala/io/glutenproject/extension/QueryStagePrepOverrides.scala rename to gluten-core/src/main/scala/org/apache/gluten/extension/QueryStagePrepOverrides.scala index adc4404f662c..8f9e2326ca71 100644 --- a/gluten-core/src/main/scala/io/glutenproject/extension/QueryStagePrepOverrides.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/extension/QueryStagePrepOverrides.scala @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.extension +package org.apache.gluten.extension -import io.glutenproject.GlutenSparkExtensionsInjector -import io.glutenproject.backendsapi.BackendsApiManager +import org.apache.gluten.GlutenSparkExtensionsInjector +import org.apache.gluten.backendsapi.BackendsApiManager import org.apache.spark.sql.{SparkSession, SparkSessionExtensions} import org.apache.spark.sql.catalyst.rules.Rule diff --git a/gluten-core/src/main/scala/io/glutenproject/extension/RewriteCollect.scala b/gluten-core/src/main/scala/org/apache/gluten/extension/RewriteCollect.scala similarity index 97% rename from gluten-core/src/main/scala/io/glutenproject/extension/RewriteCollect.scala rename to gluten-core/src/main/scala/org/apache/gluten/extension/RewriteCollect.scala index b7b58acc8c80..91283f3f24f4 100644 --- a/gluten-core/src/main/scala/io/glutenproject/extension/RewriteCollect.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/extension/RewriteCollect.scala @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.extension +package org.apache.gluten.extension -import io.glutenproject.backendsapi.BackendsApiManager -import io.glutenproject.utils.PullOutProjectHelper +import org.apache.gluten.backendsapi.BackendsApiManager +import org.apache.gluten.utils.PullOutProjectHelper import org.apache.spark.sql.catalyst.expressions.{And, Attribute, AttributeSet, If, IsNotNull, IsNull, Literal, NamedExpression} import org.apache.spark.sql.catalyst.expressions.aggregate.{AggregateExpression, CollectList, CollectSet, Complete, Final, Partial} diff --git a/gluten-core/src/main/scala/io/glutenproject/extension/RewriteDateTimestampComparisonRule.scala b/gluten-core/src/main/scala/org/apache/gluten/extension/RewriteDateTimestampComparisonRule.scala similarity index 99% rename from gluten-core/src/main/scala/io/glutenproject/extension/RewriteDateTimestampComparisonRule.scala rename to gluten-core/src/main/scala/org/apache/gluten/extension/RewriteDateTimestampComparisonRule.scala index 36c0bf770c09..576ccf31b208 100644 --- a/gluten-core/src/main/scala/io/glutenproject/extension/RewriteDateTimestampComparisonRule.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/extension/RewriteDateTimestampComparisonRule.scala @@ -16,7 +16,7 @@ */ package org.apache.spark.sql.extension -import io.glutenproject.GlutenConfig +import org.apache.gluten.GlutenConfig import org.apache.spark.internal.Logging import org.apache.spark.sql.SparkSession diff --git a/gluten-core/src/main/scala/io/glutenproject/extension/RewriteIn.scala b/gluten-core/src/main/scala/org/apache/gluten/extension/RewriteIn.scala similarity index 98% rename from gluten-core/src/main/scala/io/glutenproject/extension/RewriteIn.scala rename to gluten-core/src/main/scala/org/apache/gluten/extension/RewriteIn.scala index 00585378d4f8..b508f3eff8f6 100644 --- a/gluten-core/src/main/scala/io/glutenproject/extension/RewriteIn.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/extension/RewriteIn.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.extension +package org.apache.gluten.extension import org.apache.spark.sql.catalyst.expressions.{EqualTo, Expression, In, Or} import org.apache.spark.sql.catalyst.rules.Rule diff --git a/gluten-core/src/main/scala/io/glutenproject/extension/StrategyOverrides.scala b/gluten-core/src/main/scala/org/apache/gluten/extension/StrategyOverrides.scala similarity index 95% rename from gluten-core/src/main/scala/io/glutenproject/extension/StrategyOverrides.scala rename to gluten-core/src/main/scala/org/apache/gluten/extension/StrategyOverrides.scala index bec3d2130309..28ce72546dcc 100644 --- a/gluten-core/src/main/scala/io/glutenproject/extension/StrategyOverrides.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/extension/StrategyOverrides.scala @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.extension +package org.apache.gluten.extension -import io.glutenproject.{GlutenConfig, GlutenSparkExtensionsInjector} -import io.glutenproject.backendsapi.BackendsApiManager -import io.glutenproject.extension.columnar.TRANSFORM_UNSUPPORTED -import io.glutenproject.extension.columnar.TransformHints.TAG -import io.glutenproject.utils.LogicalPlanSelector +import org.apache.gluten.{GlutenConfig, GlutenSparkExtensionsInjector} +import org.apache.gluten.backendsapi.BackendsApiManager +import org.apache.gluten.extension.columnar.TRANSFORM_UNSUPPORTED +import org.apache.gluten.extension.columnar.TransformHints.TAG +import org.apache.gluten.utils.LogicalPlanSelector import org.apache.spark.sql.{SparkSession, SparkSessionExtensions, Strategy} import org.apache.spark.sql.catalyst.SQLConfHelper diff --git a/gluten-core/src/main/scala/io/glutenproject/extension/columnar/CollapseProjectExecTransformer.scala b/gluten-core/src/main/scala/org/apache/gluten/extension/columnar/CollapseProjectExecTransformer.scala similarity index 94% rename from gluten-core/src/main/scala/io/glutenproject/extension/columnar/CollapseProjectExecTransformer.scala rename to gluten-core/src/main/scala/org/apache/gluten/extension/columnar/CollapseProjectExecTransformer.scala index b3abfd7dde2e..25674fd17147 100644 --- a/gluten-core/src/main/scala/io/glutenproject/extension/columnar/CollapseProjectExecTransformer.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/extension/columnar/CollapseProjectExecTransformer.scala @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.extension.columnar +package org.apache.gluten.extension.columnar -import io.glutenproject.GlutenConfig -import io.glutenproject.execution.ProjectExecTransformer +import org.apache.gluten.GlutenConfig +import org.apache.gluten.execution.ProjectExecTransformer import org.apache.spark.sql.catalyst.expressions.{Alias, CreateNamedStruct, NamedExpression} import org.apache.spark.sql.catalyst.optimizer.CollapseProjectShim diff --git a/gluten-core/src/main/scala/io/glutenproject/extension/columnar/ColumnarTransitions.scala b/gluten-core/src/main/scala/org/apache/gluten/extension/columnar/ColumnarTransitions.scala similarity index 98% rename from gluten-core/src/main/scala/io/glutenproject/extension/columnar/ColumnarTransitions.scala rename to gluten-core/src/main/scala/org/apache/gluten/extension/columnar/ColumnarTransitions.scala index 2d82d213ab9d..b6a1bd2c41f9 100644 --- a/gluten-core/src/main/scala/io/glutenproject/extension/columnar/ColumnarTransitions.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/extension/columnar/ColumnarTransitions.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.extension.columnar +package org.apache.gluten.extension.columnar import org.apache.spark.sql.catalyst.rules.Rule import org.apache.spark.sql.execution.{ApplyColumnarRulesAndInsertTransitions, ColumnarToRowExec, ColumnarToRowTransition, RowToColumnarExec, RowToColumnarTransition, SparkPlan} diff --git a/gluten-core/src/main/scala/io/glutenproject/extension/columnar/EnsureLocalSortRequirements.scala b/gluten-core/src/main/scala/org/apache/gluten/extension/columnar/EnsureLocalSortRequirements.scala similarity index 95% rename from gluten-core/src/main/scala/io/glutenproject/extension/columnar/EnsureLocalSortRequirements.scala rename to gluten-core/src/main/scala/org/apache/gluten/extension/columnar/EnsureLocalSortRequirements.scala index 8387efb551a6..0f5fc21aff87 100644 --- a/gluten-core/src/main/scala/io/glutenproject/extension/columnar/EnsureLocalSortRequirements.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/extension/columnar/EnsureLocalSortRequirements.scala @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.extension.columnar +package org.apache.gluten.extension.columnar -import io.glutenproject.GlutenConfig -import io.glutenproject.execution.SortExecTransformer +import org.apache.gluten.GlutenConfig +import org.apache.gluten.execution.SortExecTransformer import org.apache.spark.sql.catalyst.expressions.SortOrder import org.apache.spark.sql.catalyst.rules.Rule diff --git a/gluten-core/src/main/scala/io/glutenproject/extension/columnar/EnumeratedTransform.scala b/gluten-core/src/main/scala/org/apache/gluten/extension/columnar/EnumeratedTransform.scala similarity index 83% rename from gluten-core/src/main/scala/io/glutenproject/extension/columnar/EnumeratedTransform.scala rename to gluten-core/src/main/scala/org/apache/gluten/extension/columnar/EnumeratedTransform.scala index 5cc091fbe24a..983abfe23734 100644 --- a/gluten-core/src/main/scala/io/glutenproject/extension/columnar/EnumeratedTransform.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/extension/columnar/EnumeratedTransform.scala @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.extension.columnar +package org.apache.gluten.extension.columnar -import io.glutenproject.cbo.property.PropertySet -import io.glutenproject.cbo.rule.{CboRule, Shape, Shapes} -import io.glutenproject.extension.columnar.transform.{ImplementExchange, ImplementJoin, ImplementOthers, ImplementSingleNode} -import io.glutenproject.planner.GlutenOptimization -import io.glutenproject.planner.property.GlutenProperties -import io.glutenproject.utils.LogLevelUtil +import org.apache.gluten.cbo.property.PropertySet +import org.apache.gluten.cbo.rule.{CboRule, Shape, Shapes} +import org.apache.gluten.extension.columnar.transform.{ImplementExchange, ImplementJoin, ImplementOthers, ImplementSingleNode} +import org.apache.gluten.planner.GlutenOptimization +import org.apache.gluten.planner.property.GlutenProperties +import org.apache.gluten.utils.LogLevelUtil import org.apache.spark.sql.SparkSession import org.apache.spark.sql.catalyst.rules.Rule diff --git a/gluten-core/src/main/scala/io/glutenproject/extension/columnar/ExpandFallbackPolicy.scala b/gluten-core/src/main/scala/org/apache/gluten/extension/columnar/ExpandFallbackPolicy.scala similarity index 97% rename from gluten-core/src/main/scala/io/glutenproject/extension/columnar/ExpandFallbackPolicy.scala rename to gluten-core/src/main/scala/org/apache/gluten/extension/columnar/ExpandFallbackPolicy.scala index ab2101eae0e6..471141f49299 100644 --- a/gluten-core/src/main/scala/io/glutenproject/extension/columnar/ExpandFallbackPolicy.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/extension/columnar/ExpandFallbackPolicy.scala @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.extension.columnar +package org.apache.gluten.extension.columnar -import io.glutenproject.GlutenConfig -import io.glutenproject.execution.BroadcastHashJoinExecTransformerBase -import io.glutenproject.extension.GlutenPlan -import io.glutenproject.extension.columnar.MiscColumnarRules.TransformPostOverrides -import io.glutenproject.utils.PlanUtil +import org.apache.gluten.GlutenConfig +import org.apache.gluten.execution.BroadcastHashJoinExecTransformerBase +import org.apache.gluten.extension.GlutenPlan +import org.apache.gluten.extension.columnar.MiscColumnarRules.TransformPostOverrides +import org.apache.gluten.utils.PlanUtil import org.apache.spark.rdd.RDD import org.apache.spark.sql.catalyst.InternalRow diff --git a/gluten-core/src/main/scala/io/glutenproject/extension/columnar/MergeTwoPhasesHashAggregate.scala b/gluten-core/src/main/scala/org/apache/gluten/extension/columnar/MergeTwoPhasesHashAggregate.scala similarity index 97% rename from gluten-core/src/main/scala/io/glutenproject/extension/columnar/MergeTwoPhasesHashAggregate.scala rename to gluten-core/src/main/scala/org/apache/gluten/extension/columnar/MergeTwoPhasesHashAggregate.scala index aa939e3283dc..e19cd09a01a3 100644 --- a/gluten-core/src/main/scala/io/glutenproject/extension/columnar/MergeTwoPhasesHashAggregate.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/extension/columnar/MergeTwoPhasesHashAggregate.scala @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.extension.columnar +package org.apache.gluten.extension.columnar -import io.glutenproject.GlutenConfig -import io.glutenproject.backendsapi.BackendsApiManager +import org.apache.gluten.GlutenConfig +import org.apache.gluten.backendsapi.BackendsApiManager import org.apache.spark.sql.SparkSession import org.apache.spark.sql.catalyst.expressions.aggregate.{Complete, Final, Partial} diff --git a/gluten-core/src/main/scala/io/glutenproject/extension/columnar/MiscColumnarRules.scala b/gluten-core/src/main/scala/org/apache/gluten/extension/columnar/MiscColumnarRules.scala similarity index 93% rename from gluten-core/src/main/scala/io/glutenproject/extension/columnar/MiscColumnarRules.scala rename to gluten-core/src/main/scala/org/apache/gluten/extension/columnar/MiscColumnarRules.scala index b2622f31d4d6..aa3c5414400c 100644 --- a/gluten-core/src/main/scala/io/glutenproject/extension/columnar/MiscColumnarRules.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/extension/columnar/MiscColumnarRules.scala @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.extension.columnar +package org.apache.gluten.extension.columnar -import io.glutenproject.backendsapi.BackendsApiManager -import io.glutenproject.extension.ColumnarToRowLike -import io.glutenproject.extension.columnar.transform.{ImplementAggregate, ImplementExchange, ImplementFilter, ImplementJoin, ImplementOthers, ImplementSingleNode} -import io.glutenproject.utils.{LogLevelUtil, PlanUtil} +import org.apache.gluten.backendsapi.BackendsApiManager +import org.apache.gluten.extension.ColumnarToRowLike +import org.apache.gluten.extension.columnar.transform.{ImplementAggregate, ImplementExchange, ImplementFilter, ImplementJoin, ImplementOthers, ImplementSingleNode} +import org.apache.gluten.utils.{LogLevelUtil, PlanUtil} import org.apache.spark.sql.SparkSession import org.apache.spark.sql.catalyst.rules.{PlanChangeLogger, Rule} diff --git a/gluten-core/src/main/scala/io/glutenproject/extension/columnar/PullOutPostProject.scala b/gluten-core/src/main/scala/org/apache/gluten/extension/columnar/PullOutPostProject.scala similarity index 97% rename from gluten-core/src/main/scala/io/glutenproject/extension/columnar/PullOutPostProject.scala rename to gluten-core/src/main/scala/org/apache/gluten/extension/columnar/PullOutPostProject.scala index a77e063c5780..dc2e6423cb45 100644 --- a/gluten-core/src/main/scala/io/glutenproject/extension/columnar/PullOutPostProject.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/extension/columnar/PullOutPostProject.scala @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.extension.columnar +package org.apache.gluten.extension.columnar -import io.glutenproject.backendsapi.BackendsApiManager -import io.glutenproject.utils.PullOutProjectHelper +import org.apache.gluten.backendsapi.BackendsApiManager +import org.apache.gluten.utils.PullOutProjectHelper import org.apache.spark.sql.catalyst.expressions.{Alias, Attribute, NamedExpression, WindowExpression} import org.apache.spark.sql.catalyst.rules.Rule diff --git a/gluten-core/src/main/scala/io/glutenproject/extension/columnar/PullOutPreProject.scala b/gluten-core/src/main/scala/org/apache/gluten/extension/columnar/PullOutPreProject.scala similarity index 98% rename from gluten-core/src/main/scala/io/glutenproject/extension/columnar/PullOutPreProject.scala rename to gluten-core/src/main/scala/org/apache/gluten/extension/columnar/PullOutPreProject.scala index 92d6c9fab87f..9925b82697e2 100644 --- a/gluten-core/src/main/scala/io/glutenproject/extension/columnar/PullOutPreProject.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/extension/columnar/PullOutPreProject.scala @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.extension.columnar +package org.apache.gluten.extension.columnar -import io.glutenproject.backendsapi.BackendsApiManager -import io.glutenproject.utils.PullOutProjectHelper +import org.apache.gluten.backendsapi.BackendsApiManager +import org.apache.gluten.utils.PullOutProjectHelper import org.apache.spark.sql.catalyst.expressions._ import org.apache.spark.sql.catalyst.expressions.aggregate.{AggregateExpression, Complete, Partial} diff --git a/gluten-core/src/main/scala/io/glutenproject/extension/columnar/RemoveNativeWriteFilesSortAndProject.scala b/gluten-core/src/main/scala/org/apache/gluten/extension/columnar/RemoveNativeWriteFilesSortAndProject.scala similarity index 96% rename from gluten-core/src/main/scala/io/glutenproject/extension/columnar/RemoveNativeWriteFilesSortAndProject.scala rename to gluten-core/src/main/scala/org/apache/gluten/extension/columnar/RemoveNativeWriteFilesSortAndProject.scala index d0129483f473..ce94626d999d 100644 --- a/gluten-core/src/main/scala/io/glutenproject/extension/columnar/RemoveNativeWriteFilesSortAndProject.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/extension/columnar/RemoveNativeWriteFilesSortAndProject.scala @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.extension.columnar +package org.apache.gluten.extension.columnar -import io.glutenproject.GlutenConfig -import io.glutenproject.execution.{ProjectExecTransformer, SortExecTransformer, WriteFilesExecTransformer} +import org.apache.gluten.GlutenConfig +import org.apache.gluten.execution.{ProjectExecTransformer, SortExecTransformer, WriteFilesExecTransformer} import org.apache.spark.internal.Logging import org.apache.spark.sql.catalyst.expressions.{Ascending, Attribute, AttributeMap, AttributeSet, NamedExpression, SortOrder} diff --git a/gluten-core/src/main/scala/io/glutenproject/extension/columnar/RewriteMultiChildrenCount.scala b/gluten-core/src/main/scala/org/apache/gluten/extension/columnar/RewriteMultiChildrenCount.scala similarity index 95% rename from gluten-core/src/main/scala/io/glutenproject/extension/columnar/RewriteMultiChildrenCount.scala rename to gluten-core/src/main/scala/org/apache/gluten/extension/columnar/RewriteMultiChildrenCount.scala index e5d06388c535..9657c127da20 100644 --- a/gluten-core/src/main/scala/io/glutenproject/extension/columnar/RewriteMultiChildrenCount.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/extension/columnar/RewriteMultiChildrenCount.scala @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.extension.columnar +package org.apache.gluten.extension.columnar -import io.glutenproject.backendsapi.BackendsApiManager -import io.glutenproject.utils.PullOutProjectHelper +import org.apache.gluten.backendsapi.BackendsApiManager +import org.apache.gluten.utils.PullOutProjectHelper import org.apache.spark.sql.catalyst.expressions.{If, IsNull, Literal, Or} import org.apache.spark.sql.catalyst.expressions.aggregate.{AggregateExpression, Count, Partial} diff --git a/gluten-core/src/main/scala/io/glutenproject/extension/columnar/RewriteSparkPlanRulesManager.scala b/gluten-core/src/main/scala/org/apache/gluten/extension/columnar/RewriteSparkPlanRulesManager.scala similarity index 99% rename from gluten-core/src/main/scala/io/glutenproject/extension/columnar/RewriteSparkPlanRulesManager.scala rename to gluten-core/src/main/scala/org/apache/gluten/extension/columnar/RewriteSparkPlanRulesManager.scala index b2591f048e84..7de39d5fdcf4 100644 --- a/gluten-core/src/main/scala/io/glutenproject/extension/columnar/RewriteSparkPlanRulesManager.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/extension/columnar/RewriteSparkPlanRulesManager.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.extension.columnar +package org.apache.gluten.extension.columnar import org.apache.spark.rdd.RDD import org.apache.spark.sql.catalyst.InternalRow diff --git a/gluten-core/src/main/scala/io/glutenproject/extension/columnar/RewriteTransformer.scala b/gluten-core/src/main/scala/org/apache/gluten/extension/columnar/RewriteTransformer.scala similarity index 97% rename from gluten-core/src/main/scala/io/glutenproject/extension/columnar/RewriteTransformer.scala rename to gluten-core/src/main/scala/org/apache/gluten/extension/columnar/RewriteTransformer.scala index 4b9a28b35b3d..bdd7d947240f 100644 --- a/gluten-core/src/main/scala/io/glutenproject/extension/columnar/RewriteTransformer.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/extension/columnar/RewriteTransformer.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.extension.columnar +package org.apache.gluten.extension.columnar import org.apache.spark.sql.SparkSession import org.apache.spark.sql.catalyst.rules.Rule diff --git a/gluten-core/src/main/scala/io/glutenproject/extension/columnar/RewriteTypedImperativeAggregate.scala b/gluten-core/src/main/scala/org/apache/gluten/extension/columnar/RewriteTypedImperativeAggregate.scala similarity index 94% rename from gluten-core/src/main/scala/io/glutenproject/extension/columnar/RewriteTypedImperativeAggregate.scala rename to gluten-core/src/main/scala/org/apache/gluten/extension/columnar/RewriteTypedImperativeAggregate.scala index 58f4fb7ba10b..df5341373d85 100644 --- a/gluten-core/src/main/scala/io/glutenproject/extension/columnar/RewriteTypedImperativeAggregate.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/extension/columnar/RewriteTypedImperativeAggregate.scala @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.extension.columnar +package org.apache.gluten.extension.columnar -import io.glutenproject.backendsapi.BackendsApiManager -import io.glutenproject.utils.PullOutProjectHelper +import org.apache.gluten.backendsapi.BackendsApiManager +import org.apache.gluten.utils.PullOutProjectHelper import org.apache.spark.sql.catalyst.expressions.AttributeReference import org.apache.spark.sql.catalyst.expressions.aggregate._ diff --git a/gluten-core/src/main/scala/io/glutenproject/extension/columnar/TransformHintRule.scala b/gluten-core/src/main/scala/org/apache/gluten/extension/columnar/TransformHintRule.scala similarity index 98% rename from gluten-core/src/main/scala/io/glutenproject/extension/columnar/TransformHintRule.scala rename to gluten-core/src/main/scala/org/apache/gluten/extension/columnar/TransformHintRule.scala index a8ed0b886570..aa68ce72e327 100644 --- a/gluten-core/src/main/scala/io/glutenproject/extension/columnar/TransformHintRule.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/extension/columnar/TransformHintRule.scala @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.extension.columnar +package org.apache.gluten.extension.columnar -import io.glutenproject.GlutenConfig -import io.glutenproject.backendsapi.BackendsApiManager -import io.glutenproject.exception.GlutenNotSupportException -import io.glutenproject.execution._ -import io.glutenproject.expression.ExpressionUtils.getExpressionTreeDepth -import io.glutenproject.extension.{GlutenPlan, ValidationResult} -import io.glutenproject.extension.columnar.TransformHints.EncodeTransformableTagImplicits -import io.glutenproject.sql.shims.SparkShimLoader +import org.apache.gluten.GlutenConfig +import org.apache.gluten.backendsapi.BackendsApiManager +import org.apache.gluten.exception.GlutenNotSupportException +import org.apache.gluten.execution._ +import org.apache.gluten.expression.ExpressionUtils.getExpressionTreeDepth +import org.apache.gluten.extension.{GlutenPlan, ValidationResult} +import org.apache.gluten.extension.columnar.TransformHints.EncodeTransformableTagImplicits +import org.apache.gluten.sql.shims.SparkShimLoader import org.apache.spark.api.python.EvalPythonExecTransformer import org.apache.spark.sql.SparkSession @@ -58,7 +58,7 @@ case class TRANSFORM_UNSUPPORTED(reason: Option[String], appendReasonIfExists: B object TransformHints { val TAG: TreeNodeTag[TransformHint] = - TreeNodeTag[TransformHint]("io.glutenproject.transformhint") + TreeNodeTag[TransformHint]("org.apache.gluten.transformhint") val DEBUG = false diff --git a/gluten-core/src/main/scala/io/glutenproject/extension/columnar/transform/ImplementSingleNode.scala b/gluten-core/src/main/scala/org/apache/gluten/extension/columnar/transform/ImplementSingleNode.scala similarity index 97% rename from gluten-core/src/main/scala/io/glutenproject/extension/columnar/transform/ImplementSingleNode.scala rename to gluten-core/src/main/scala/org/apache/gluten/extension/columnar/transform/ImplementSingleNode.scala index 5598014573c7..453337681f5f 100644 --- a/gluten-core/src/main/scala/io/glutenproject/extension/columnar/transform/ImplementSingleNode.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/extension/columnar/transform/ImplementSingleNode.scala @@ -14,17 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.extension.columnar.transform +package org.apache.gluten.extension.columnar.transform -import io.glutenproject.GlutenConfig -import io.glutenproject.backendsapi.BackendsApiManager -import io.glutenproject.exception.GlutenNotSupportException -import io.glutenproject.execution._ -import io.glutenproject.expression.ExpressionConverter -import io.glutenproject.extension.GlutenPlan -import io.glutenproject.extension.columnar.TransformHints -import io.glutenproject.sql.shims.SparkShimLoader -import io.glutenproject.utils.{LogLevelUtil, PlanUtil} +import org.apache.gluten.GlutenConfig +import org.apache.gluten.backendsapi.BackendsApiManager +import org.apache.gluten.exception.GlutenNotSupportException +import org.apache.gluten.execution._ +import org.apache.gluten.expression.ExpressionConverter +import org.apache.gluten.extension.GlutenPlan +import org.apache.gluten.extension.columnar.TransformHints +import org.apache.gluten.sql.shims.SparkShimLoader +import org.apache.gluten.utils.{LogLevelUtil, PlanUtil} import org.apache.spark.api.python.EvalPythonExecTransformer import org.apache.spark.internal.Logging diff --git a/gluten-core/src/main/scala/io/glutenproject/glutenproject.scala b/gluten-core/src/main/scala/org/apache/gluten/gluten.scala similarity index 97% rename from gluten-core/src/main/scala/io/glutenproject/glutenproject.scala rename to gluten-core/src/main/scala/org/apache/gluten/gluten.scala index 99987cbbadae..4659bd6b017d 100644 --- a/gluten-core/src/main/scala/io/glutenproject/glutenproject.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/gluten.scala @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io +package org.apache -import io.glutenproject.exception.GlutenException +import org.apache.gluten.exception.GlutenException import java.util.Properties import scala.util.Try -package object glutenproject { +package object gluten { protected object BuildInfo { private val buildFile = "gluten-build-info.properties" private val buildFileStream = diff --git a/gluten-core/src/main/scala/io/glutenproject/metrics/MetricsUpdater.scala b/gluten-core/src/main/scala/org/apache/gluten/metrics/MetricsUpdater.scala similarity index 97% rename from gluten-core/src/main/scala/io/glutenproject/metrics/MetricsUpdater.scala rename to gluten-core/src/main/scala/org/apache/gluten/metrics/MetricsUpdater.scala index 030241757419..0a622ba0b37d 100644 --- a/gluten-core/src/main/scala/io/glutenproject/metrics/MetricsUpdater.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/metrics/MetricsUpdater.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.metrics +package org.apache.gluten.metrics import org.apache.spark.sql.execution.metric.SQLMetric import org.apache.spark.sql.utils.OASPackageBridge.InputMetricsWrapper diff --git a/gluten-core/src/main/scala/io/glutenproject/planner/GlutenOptimization.scala b/gluten-core/src/main/scala/org/apache/gluten/planner/GlutenOptimization.scala similarity index 78% rename from gluten-core/src/main/scala/io/glutenproject/planner/GlutenOptimization.scala rename to gluten-core/src/main/scala/org/apache/gluten/planner/GlutenOptimization.scala index b0972bafa438..5205358fb1b0 100644 --- a/gluten-core/src/main/scala/io/glutenproject/planner/GlutenOptimization.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/planner/GlutenOptimization.scala @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.planner +package org.apache.gluten.planner -import io.glutenproject.cbo.{CboExplain, Optimization} -import io.glutenproject.cbo.rule.CboRule -import io.glutenproject.planner.cost.GlutenCostModel -import io.glutenproject.planner.metadata.GlutenMetadataModel -import io.glutenproject.planner.plan.GlutenPlanModel -import io.glutenproject.planner.property.GlutenPropertyModel -import io.glutenproject.planner.rule.GlutenRules +import org.apache.gluten.cbo.{CboExplain, Optimization} +import org.apache.gluten.cbo.rule.CboRule +import org.apache.gluten.planner.cost.GlutenCostModel +import org.apache.gluten.planner.metadata.GlutenMetadataModel +import org.apache.gluten.planner.plan.GlutenPlanModel +import org.apache.gluten.planner.property.GlutenPropertyModel +import org.apache.gluten.planner.rule.GlutenRules import org.apache.spark.sql.execution.SparkPlan diff --git a/gluten-core/src/main/scala/io/glutenproject/planner/cost/GlutenCost.scala b/gluten-core/src/main/scala/org/apache/gluten/planner/cost/GlutenCost.scala similarity index 92% rename from gluten-core/src/main/scala/io/glutenproject/planner/cost/GlutenCost.scala rename to gluten-core/src/main/scala/org/apache/gluten/planner/cost/GlutenCost.scala index 2d85352031e4..b3ac64caffb0 100644 --- a/gluten-core/src/main/scala/io/glutenproject/planner/cost/GlutenCost.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/planner/cost/GlutenCost.scala @@ -14,8 +14,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.planner.cost +package org.apache.gluten.planner.cost -import io.glutenproject.cbo.Cost +import org.apache.gluten.cbo.Cost case class GlutenCost(value: Long) extends Cost diff --git a/gluten-core/src/main/scala/io/glutenproject/planner/cost/GlutenCostModel.scala b/gluten-core/src/main/scala/org/apache/gluten/planner/cost/GlutenCostModel.scala similarity index 90% rename from gluten-core/src/main/scala/io/glutenproject/planner/cost/GlutenCostModel.scala rename to gluten-core/src/main/scala/org/apache/gluten/planner/cost/GlutenCostModel.scala index 013d4ed3ca6b..85ae852662dd 100644 --- a/gluten-core/src/main/scala/io/glutenproject/planner/cost/GlutenCostModel.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/planner/cost/GlutenCostModel.scala @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.planner.cost +package org.apache.gluten.planner.cost -import io.glutenproject.cbo.{Cost, CostModel} -import io.glutenproject.extension.columnar.ColumnarTransitions -import io.glutenproject.planner.plan.GlutenPlanModel.GroupLeafExec -import io.glutenproject.utils.PlanUtil +import org.apache.gluten.cbo.{Cost, CostModel} +import org.apache.gluten.extension.columnar.ColumnarTransitions +import org.apache.gluten.planner.plan.GlutenPlanModel.GroupLeafExec +import org.apache.gluten.utils.PlanUtil import org.apache.spark.sql.execution.{ColumnarToRowExec, RowToColumnarExec, SparkPlan} diff --git a/gluten-core/src/main/scala/io/glutenproject/planner/metadata/GlutenMetadata.scala b/gluten-core/src/main/scala/org/apache/gluten/planner/metadata/GlutenMetadata.scala similarity index 93% rename from gluten-core/src/main/scala/io/glutenproject/planner/metadata/GlutenMetadata.scala rename to gluten-core/src/main/scala/org/apache/gluten/planner/metadata/GlutenMetadata.scala index 458b37309957..b6136fc73abc 100644 --- a/gluten-core/src/main/scala/io/glutenproject/planner/metadata/GlutenMetadata.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/planner/metadata/GlutenMetadata.scala @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.planner.metadata +package org.apache.gluten.planner.metadata -import io.glutenproject.cbo.Metadata +import org.apache.gluten.cbo.Metadata import org.apache.spark.sql.catalyst.expressions.Attribute diff --git a/gluten-core/src/main/scala/io/glutenproject/planner/metadata/GlutenMetadataModel.scala b/gluten-core/src/main/scala/org/apache/gluten/planner/metadata/GlutenMetadataModel.scala similarity index 89% rename from gluten-core/src/main/scala/io/glutenproject/planner/metadata/GlutenMetadataModel.scala rename to gluten-core/src/main/scala/org/apache/gluten/planner/metadata/GlutenMetadataModel.scala index f7f06d942f2d..71bb445d391f 100644 --- a/gluten-core/src/main/scala/io/glutenproject/planner/metadata/GlutenMetadataModel.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/planner/metadata/GlutenMetadataModel.scala @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.planner.metadata +package org.apache.gluten.planner.metadata -import io.glutenproject.cbo.{Metadata, MetadataModel} -import io.glutenproject.planner.metadata.GlutenMetadata.Schema -import io.glutenproject.planner.plan.GlutenPlanModel.GroupLeafExec +import org.apache.gluten.cbo.{Metadata, MetadataModel} +import org.apache.gluten.planner.metadata.GlutenMetadata.Schema +import org.apache.gluten.planner.plan.GlutenPlanModel.GroupLeafExec import org.apache.spark.internal.Logging import org.apache.spark.sql.execution.SparkPlan diff --git a/gluten-core/src/main/scala/io/glutenproject/planner/plan/GlutenPlanModel.scala b/gluten-core/src/main/scala/org/apache/gluten/planner/plan/GlutenPlanModel.scala similarity index 89% rename from gluten-core/src/main/scala/io/glutenproject/planner/plan/GlutenPlanModel.scala rename to gluten-core/src/main/scala/org/apache/gluten/planner/plan/GlutenPlanModel.scala index 619d832fcec6..a1a31346d929 100644 --- a/gluten-core/src/main/scala/io/glutenproject/planner/plan/GlutenPlanModel.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/planner/plan/GlutenPlanModel.scala @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.planner.plan +package org.apache.gluten.planner.plan -import io.glutenproject.cbo.{Metadata, PlanModel} -import io.glutenproject.cbo.property.PropertySet -import io.glutenproject.planner.metadata.GlutenMetadata -import io.glutenproject.planner.property.GlutenProperties -import io.glutenproject.planner.property.GlutenProperties.Conventions +import org.apache.gluten.cbo.{Metadata, PlanModel} +import org.apache.gluten.cbo.property.PropertySet +import org.apache.gluten.planner.metadata.GlutenMetadata +import org.apache.gluten.planner.property.GlutenProperties +import org.apache.gluten.planner.property.GlutenProperties.Conventions import org.apache.spark.rdd.RDD import org.apache.spark.sql.catalyst.InternalRow diff --git a/gluten-core/src/main/scala/io/glutenproject/planner/property/GlutenPropertyModel.scala b/gluten-core/src/main/scala/org/apache/gluten/planner/property/GlutenPropertyModel.scala similarity index 90% rename from gluten-core/src/main/scala/io/glutenproject/planner/property/GlutenPropertyModel.scala rename to gluten-core/src/main/scala/org/apache/gluten/planner/property/GlutenPropertyModel.scala index bea5c3a0be44..12cea2c5c064 100644 --- a/gluten-core/src/main/scala/io/glutenproject/planner/property/GlutenPropertyModel.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/planner/property/GlutenPropertyModel.scala @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.planner.property +package org.apache.gluten.planner.property -import io.glutenproject.backendsapi.BackendsApiManager -import io.glutenproject.cbo._ -import io.glutenproject.cbo.rule.{CboRule, Shape, Shapes} -import io.glutenproject.extension.columnar.ColumnarTransitions -import io.glutenproject.planner.plan.GlutenPlanModel.GroupLeafExec -import io.glutenproject.planner.property.GlutenProperties.{Convention, CONVENTION_DEF, ConventionEnforcerRule} -import io.glutenproject.sql.shims.SparkShimLoader -import io.glutenproject.utils.PlanUtil +import org.apache.gluten.backendsapi.BackendsApiManager +import org.apache.gluten.cbo._ +import org.apache.gluten.cbo.rule.{CboRule, Shape, Shapes} +import org.apache.gluten.extension.columnar.ColumnarTransitions +import org.apache.gluten.planner.plan.GlutenPlanModel.GroupLeafExec +import org.apache.gluten.planner.property.GlutenProperties.{Convention, CONVENTION_DEF, ConventionEnforcerRule} +import org.apache.gluten.sql.shims.SparkShimLoader +import org.apache.gluten.utils.PlanUtil import org.apache.spark.sql.execution._ diff --git a/gluten-core/src/main/scala/io/glutenproject/planner/rule/GlutenRules.scala b/gluten-core/src/main/scala/org/apache/gluten/planner/rule/GlutenRules.scala similarity index 92% rename from gluten-core/src/main/scala/io/glutenproject/planner/rule/GlutenRules.scala rename to gluten-core/src/main/scala/org/apache/gluten/planner/rule/GlutenRules.scala index 9b30f25378c2..7c7386d438fb 100644 --- a/gluten-core/src/main/scala/io/glutenproject/planner/rule/GlutenRules.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/planner/rule/GlutenRules.scala @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.planner.rule +package org.apache.gluten.planner.rule -import io.glutenproject.cbo.rule.CboRule +import org.apache.gluten.cbo.rule.CboRule import org.apache.spark.sql.execution.SparkPlan diff --git a/gluten-core/src/main/scala/io/glutenproject/softaffinity/SoftAffinityManager.scala b/gluten-core/src/main/scala/org/apache/gluten/softaffinity/SoftAffinityManager.scala similarity index 97% rename from gluten-core/src/main/scala/io/glutenproject/softaffinity/SoftAffinityManager.scala rename to gluten-core/src/main/scala/org/apache/gluten/softaffinity/SoftAffinityManager.scala index ac857d4fa0f7..72d590d04c55 100644 --- a/gluten-core/src/main/scala/io/glutenproject/softaffinity/SoftAffinityManager.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/softaffinity/SoftAffinityManager.scala @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.softaffinity +package org.apache.gluten.softaffinity -import io.glutenproject.GlutenConfig -import io.glutenproject.softaffinity.strategy.SoftAffinityStrategy -import io.glutenproject.sql.shims.SparkShimLoader -import io.glutenproject.utils.LogLevelUtil +import org.apache.gluten.GlutenConfig +import org.apache.gluten.softaffinity.strategy.SoftAffinityStrategy +import org.apache.gluten.sql.shims.SparkShimLoader +import org.apache.gluten.utils.LogLevelUtil import org.apache.spark.SparkEnv import org.apache.spark.internal.Logging diff --git a/gluten-core/src/main/scala/io/glutenproject/softaffinity/scheduler/SoftAffinityListener.scala b/gluten-core/src/main/scala/org/apache/gluten/softaffinity/scheduler/SoftAffinityListener.scala similarity index 94% rename from gluten-core/src/main/scala/io/glutenproject/softaffinity/scheduler/SoftAffinityListener.scala rename to gluten-core/src/main/scala/org/apache/gluten/softaffinity/scheduler/SoftAffinityListener.scala index d51345630455..b9ffd62dcd85 100644 --- a/gluten-core/src/main/scala/io/glutenproject/softaffinity/scheduler/SoftAffinityListener.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/softaffinity/scheduler/SoftAffinityListener.scala @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.softaffinity.scheduler +package org.apache.gluten.softaffinity.scheduler -import io.glutenproject.softaffinity.SoftAffinityManager +import org.apache.gluten.softaffinity.SoftAffinityManager import org.apache.spark.internal.Logging import org.apache.spark.scheduler._ diff --git a/gluten-core/src/main/scala/io/glutenproject/softaffinity/strategy/SoftAffinityAllocationTrait.scala b/gluten-core/src/main/scala/org/apache/gluten/softaffinity/strategy/SoftAffinityAllocationTrait.scala similarity index 93% rename from gluten-core/src/main/scala/io/glutenproject/softaffinity/strategy/SoftAffinityAllocationTrait.scala rename to gluten-core/src/main/scala/org/apache/gluten/softaffinity/strategy/SoftAffinityAllocationTrait.scala index 4af4614e08d9..8191e378428f 100644 --- a/gluten-core/src/main/scala/io/glutenproject/softaffinity/strategy/SoftAffinityAllocationTrait.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/softaffinity/strategy/SoftAffinityAllocationTrait.scala @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.softaffinity.strategy +package org.apache.gluten.softaffinity.strategy -import io.glutenproject.GlutenConfig +import org.apache.gluten.GlutenConfig import org.apache.spark.SparkEnv diff --git a/gluten-core/src/main/scala/io/glutenproject/softaffinity/strategy/SoftAffinityStrategy.scala b/gluten-core/src/main/scala/org/apache/gluten/softaffinity/strategy/SoftAffinityStrategy.scala similarity index 97% rename from gluten-core/src/main/scala/io/glutenproject/softaffinity/strategy/SoftAffinityStrategy.scala rename to gluten-core/src/main/scala/org/apache/gluten/softaffinity/strategy/SoftAffinityStrategy.scala index 7e69a0feb4c1..7a45a07b4574 100644 --- a/gluten-core/src/main/scala/io/glutenproject/softaffinity/strategy/SoftAffinityStrategy.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/softaffinity/strategy/SoftAffinityStrategy.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.softaffinity.strategy +package org.apache.gluten.softaffinity.strategy import org.apache.spark.internal.Logging diff --git a/gluten-core/src/main/scala/io/glutenproject/substrait/SubstraitContext.scala b/gluten-core/src/main/scala/org/apache/gluten/substrait/SubstraitContext.scala similarity index 98% rename from gluten-core/src/main/scala/io/glutenproject/substrait/SubstraitContext.scala rename to gluten-core/src/main/scala/org/apache/gluten/substrait/SubstraitContext.scala index ee64ccf091cc..6cc35bd16c6e 100644 --- a/gluten-core/src/main/scala/io/glutenproject/substrait/SubstraitContext.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/substrait/SubstraitContext.scala @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.substrait +package org.apache.gluten.substrait -import io.glutenproject.substrait.ddlplan.InsertOutputNode +import org.apache.gluten.substrait.ddlplan.InsertOutputNode import java.lang.{Long => JLong} import java.security.InvalidParameterException diff --git a/gluten-core/src/main/scala/io/glutenproject/utils/DebugUtil.scala b/gluten-core/src/main/scala/org/apache/gluten/utils/DebugUtil.scala similarity index 95% rename from gluten-core/src/main/scala/io/glutenproject/utils/DebugUtil.scala rename to gluten-core/src/main/scala/org/apache/gluten/utils/DebugUtil.scala index 2d94609c8926..dea0a4814028 100644 --- a/gluten-core/src/main/scala/io/glutenproject/utils/DebugUtil.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/utils/DebugUtil.scala @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.utils +package org.apache.gluten.utils -import io.glutenproject.GlutenConfig +import org.apache.gluten.GlutenConfig import org.apache.spark.TaskContext diff --git a/gluten-core/src/main/scala/io/glutenproject/utils/DecimalArithmeticUtil.scala b/gluten-core/src/main/scala/org/apache/gluten/utils/DecimalArithmeticUtil.scala similarity index 97% rename from gluten-core/src/main/scala/io/glutenproject/utils/DecimalArithmeticUtil.scala rename to gluten-core/src/main/scala/org/apache/gluten/utils/DecimalArithmeticUtil.scala index 28b9f8a030b5..621dcc061ec7 100644 --- a/gluten-core/src/main/scala/io/glutenproject/utils/DecimalArithmeticUtil.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/utils/DecimalArithmeticUtil.scala @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.utils +package org.apache.gluten.utils -import io.glutenproject.backendsapi.BackendsApiManager -import io.glutenproject.exception.GlutenNotSupportException -import io.glutenproject.expression.{CheckOverflowTransformer, ChildTransformer, DecimalArithmeticExpressionTransformer, ExpressionTransformer} +import org.apache.gluten.backendsapi.BackendsApiManager +import org.apache.gluten.exception.GlutenNotSupportException +import org.apache.gluten.expression.{CheckOverflowTransformer, ChildTransformer, DecimalArithmeticExpressionTransformer, ExpressionTransformer} import org.apache.spark.sql.catalyst.analysis.DecimalPrecision import org.apache.spark.sql.catalyst.expressions.{Add, BinaryArithmetic, Cast, Divide, Expression, Literal, Multiply, Pmod, PromotePrecision, Remainder, Subtract} diff --git a/gluten-core/src/main/scala/io/glutenproject/utils/FallbackUtil.scala b/gluten-core/src/main/scala/org/apache/gluten/utils/FallbackUtil.scala similarity index 98% rename from gluten-core/src/main/scala/io/glutenproject/utils/FallbackUtil.scala rename to gluten-core/src/main/scala/org/apache/gluten/utils/FallbackUtil.scala index 7f1b2a3012c2..c40cdd675fa7 100644 --- a/gluten-core/src/main/scala/io/glutenproject/utils/FallbackUtil.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/utils/FallbackUtil.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.utils +package org.apache.gluten.utils import org.apache.spark.internal.Logging import org.apache.spark.sql.execution._ diff --git a/gluten-core/src/main/scala/io/glutenproject/utils/InputPartitionsUtil.scala b/gluten-core/src/main/scala/org/apache/gluten/utils/InputPartitionsUtil.scala similarity index 98% rename from gluten-core/src/main/scala/io/glutenproject/utils/InputPartitionsUtil.scala rename to gluten-core/src/main/scala/org/apache/gluten/utils/InputPartitionsUtil.scala index 0e95652053f9..135721ff03a7 100644 --- a/gluten-core/src/main/scala/io/glutenproject/utils/InputPartitionsUtil.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/utils/InputPartitionsUtil.scala @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.utils +package org.apache.gluten.utils -import io.glutenproject.sql.shims.SparkShimLoader +import org.apache.gluten.sql.shims.SparkShimLoader import org.apache.spark.internal.Logging import org.apache.spark.sql.catalyst.expressions.Attribute diff --git a/gluten-core/src/main/scala/io/glutenproject/utils/Iterators.scala b/gluten-core/src/main/scala/org/apache/gluten/utils/Iterators.scala similarity index 99% rename from gluten-core/src/main/scala/io/glutenproject/utils/Iterators.scala rename to gluten-core/src/main/scala/org/apache/gluten/utils/Iterators.scala index beac9d8cb7c5..81ff2dc0b177 100644 --- a/gluten-core/src/main/scala/io/glutenproject/utils/Iterators.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/utils/Iterators.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.utils +package org.apache.gluten.utils import org.apache.spark.{InterruptibleIterator, TaskContext} import org.apache.spark.sql.execution.metric.SQLMetric diff --git a/gluten-core/src/main/scala/io/glutenproject/utils/LogLevelUtil.scala b/gluten-core/src/main/scala/org/apache/gluten/utils/LogLevelUtil.scala similarity index 97% rename from gluten-core/src/main/scala/io/glutenproject/utils/LogLevelUtil.scala rename to gluten-core/src/main/scala/org/apache/gluten/utils/LogLevelUtil.scala index f5689dcf065d..cbd52b2d07f8 100644 --- a/gluten-core/src/main/scala/io/glutenproject/utils/LogLevelUtil.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/utils/LogLevelUtil.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.utils +package org.apache.gluten.utils import org.apache.spark.internal.Logging diff --git a/gluten-core/src/main/scala/io/glutenproject/utils/PlanUtil.scala b/gluten-core/src/main/scala/org/apache/gluten/utils/PlanUtil.scala similarity index 97% rename from gluten-core/src/main/scala/io/glutenproject/utils/PlanUtil.scala rename to gluten-core/src/main/scala/org/apache/gluten/utils/PlanUtil.scala index 5b99f3b4aac9..ad9d95daec0e 100644 --- a/gluten-core/src/main/scala/io/glutenproject/utils/PlanUtil.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/utils/PlanUtil.scala @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.utils +package org.apache.gluten.utils -import io.glutenproject.extension.GlutenPlan +import org.apache.gluten.extension.GlutenPlan import org.apache.spark.sql.execution._ import org.apache.spark.sql.execution.adaptive._ diff --git a/gluten-core/src/main/scala/io/glutenproject/utils/PullOutProjectHelper.scala b/gluten-core/src/main/scala/org/apache/gluten/utils/PullOutProjectHelper.scala similarity index 98% rename from gluten-core/src/main/scala/io/glutenproject/utils/PullOutProjectHelper.scala rename to gluten-core/src/main/scala/org/apache/gluten/utils/PullOutProjectHelper.scala index a36028fa0828..824694837dcb 100644 --- a/gluten-core/src/main/scala/io/glutenproject/utils/PullOutProjectHelper.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/utils/PullOutProjectHelper.scala @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.utils +package org.apache.gluten.utils -import io.glutenproject.exception.GlutenNotSupportException +import org.apache.gluten.exception.GlutenNotSupportException import org.apache.spark.sql.catalyst.expressions._ import org.apache.spark.sql.catalyst.expressions.aggregate.{AggregateExpression, AggregateFunction} diff --git a/gluten-core/src/main/scala/io/glutenproject/utils/QueryPlanSelector.scala b/gluten-core/src/main/scala/org/apache/gluten/utils/QueryPlanSelector.scala similarity index 96% rename from gluten-core/src/main/scala/io/glutenproject/utils/QueryPlanSelector.scala rename to gluten-core/src/main/scala/org/apache/gluten/utils/QueryPlanSelector.scala index f7b30be1f2f3..2cb077d50a24 100644 --- a/gluten-core/src/main/scala/io/glutenproject/utils/QueryPlanSelector.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/utils/QueryPlanSelector.scala @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.utils +package org.apache.gluten.utils -import io.glutenproject.GlutenConfig -import io.glutenproject.backendsapi.BackendsApiManager +import org.apache.gluten.GlutenConfig +import org.apache.gluten.backendsapi.BackendsApiManager import org.apache.spark.internal.Logging import org.apache.spark.sql.SparkSession diff --git a/gluten-core/src/main/scala/io/glutenproject/utils/SubstraitPlanPrinterUtil.scala b/gluten-core/src/main/scala/org/apache/gluten/utils/SubstraitPlanPrinterUtil.scala similarity index 98% rename from gluten-core/src/main/scala/io/glutenproject/utils/SubstraitPlanPrinterUtil.scala rename to gluten-core/src/main/scala/org/apache/gluten/utils/SubstraitPlanPrinterUtil.scala index 583aacba5e3f..77d5d55f618d 100644 --- a/gluten-core/src/main/scala/io/glutenproject/utils/SubstraitPlanPrinterUtil.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/utils/SubstraitPlanPrinterUtil.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.utils +package org.apache.gluten.utils import org.apache.spark.internal.Logging diff --git a/gluten-core/src/main/scala/io/glutenproject/utils/SubstraitUtil.scala b/gluten-core/src/main/scala/org/apache/gluten/utils/SubstraitUtil.scala similarity index 98% rename from gluten-core/src/main/scala/io/glutenproject/utils/SubstraitUtil.scala rename to gluten-core/src/main/scala/org/apache/gluten/utils/SubstraitUtil.scala index d4937a1bb1f6..9671c7a6bca2 100644 --- a/gluten-core/src/main/scala/io/glutenproject/utils/SubstraitUtil.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/utils/SubstraitUtil.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.utils +package org.apache.gluten.utils import org.apache.spark.sql.catalyst.plans.{FullOuter, InnerLike, JoinType, LeftAnti, LeftOuter, LeftSemi, RightOuter} diff --git a/gluten-core/src/main/scala/io/glutenproject/utils/TaskListener.scala b/gluten-core/src/main/scala/org/apache/gluten/utils/TaskListener.scala similarity index 96% rename from gluten-core/src/main/scala/io/glutenproject/utils/TaskListener.scala rename to gluten-core/src/main/scala/org/apache/gluten/utils/TaskListener.scala index 6d54a2bf46d2..3ffb3206b900 100644 --- a/gluten-core/src/main/scala/io/glutenproject/utils/TaskListener.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/utils/TaskListener.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.utils +package org.apache.gluten.utils import org.apache.spark.TaskFailedReason diff --git a/gluten-core/src/main/scala/org/apache/spark/listener/GlutenListenerFactory.scala b/gluten-core/src/main/scala/org/apache/spark/listener/GlutenListenerFactory.scala index ddd242f1578d..9413941fe598 100644 --- a/gluten-core/src/main/scala/org/apache/spark/listener/GlutenListenerFactory.scala +++ b/gluten-core/src/main/scala/org/apache/spark/listener/GlutenListenerFactory.scala @@ -16,8 +16,8 @@ */ package org.apache.spark.listener -import io.glutenproject.GlutenConfig -import io.glutenproject.softaffinity.scheduler.SoftAffinityListener +import org.apache.gluten.GlutenConfig +import org.apache.gluten.softaffinity.scheduler.SoftAffinityListener import org.apache.spark.SparkContext import org.apache.spark.rpc.GlutenDriverEndpoint diff --git a/gluten-core/src/main/scala/org/apache/spark/memory/SparkMemoryUtil.scala b/gluten-core/src/main/scala/org/apache/spark/memory/SparkMemoryUtil.scala index 4c3d65e3f191..8bf88ef7d15c 100644 --- a/gluten-core/src/main/scala/org/apache/spark/memory/SparkMemoryUtil.scala +++ b/gluten-core/src/main/scala/org/apache/spark/memory/SparkMemoryUtil.scala @@ -16,9 +16,9 @@ */ package org.apache.spark.memory -import io.glutenproject.memory.memtarget.{KnownNameAndStats, LoggingMemoryTarget, MemoryTarget, MemoryTargetVisitor, NoopMemoryTarget, OverAcquire, ThrowOnOomMemoryTarget, TreeMemoryTargets} -import io.glutenproject.memory.memtarget.spark.{RegularMemoryConsumer, TreeMemoryConsumer} -import io.glutenproject.proto.MemoryUsageStats +import org.apache.gluten.memory.memtarget.{KnownNameAndStats, LoggingMemoryTarget, MemoryTarget, MemoryTargetVisitor, NoopMemoryTarget, OverAcquire, ThrowOnOomMemoryTarget, TreeMemoryTargets} +import org.apache.gluten.memory.memtarget.spark.{RegularMemoryConsumer, TreeMemoryConsumer} +import org.apache.gluten.proto.MemoryUsageStats import org.apache.spark.SparkEnv import org.apache.spark.util.Utils diff --git a/gluten-core/src/main/scala/org/apache/spark/rpc/GlutenDriverEndpoint.scala b/gluten-core/src/main/scala/org/apache/spark/rpc/GlutenDriverEndpoint.scala index 34492be2e31e..319381f894b8 100644 --- a/gluten-core/src/main/scala/org/apache/spark/rpc/GlutenDriverEndpoint.scala +++ b/gluten-core/src/main/scala/org/apache/spark/rpc/GlutenDriverEndpoint.scala @@ -16,7 +16,7 @@ */ package org.apache.spark.rpc -import io.glutenproject.GlutenConfig +import org.apache.gluten.GlutenConfig import org.apache.spark.SparkEnv import org.apache.spark.internal.Logging diff --git a/gluten-core/src/main/scala/org/apache/spark/rpc/GlutenExecutorEndpoint.scala b/gluten-core/src/main/scala/org/apache/spark/rpc/GlutenExecutorEndpoint.scala index d54936ce3bf4..e48194232771 100644 --- a/gluten-core/src/main/scala/org/apache/spark/rpc/GlutenExecutorEndpoint.scala +++ b/gluten-core/src/main/scala/org/apache/spark/rpc/GlutenExecutorEndpoint.scala @@ -16,7 +16,7 @@ */ package org.apache.spark.rpc -import io.glutenproject.backendsapi.BackendsApiManager +import org.apache.gluten.backendsapi.BackendsApiManager import org.apache.spark.{SparkConf, SparkEnv} import org.apache.spark.internal.{config, Logging} diff --git a/gluten-core/src/main/scala/org/apache/spark/shuffle/ColumnarShuffleDependency.scala b/gluten-core/src/main/scala/org/apache/spark/shuffle/ColumnarShuffleDependency.scala index 236d4b1170f9..15f403afac3d 100644 --- a/gluten-core/src/main/scala/org/apache/spark/shuffle/ColumnarShuffleDependency.scala +++ b/gluten-core/src/main/scala/org/apache/spark/shuffle/ColumnarShuffleDependency.scala @@ -16,7 +16,7 @@ */ package org.apache.spark.shuffle -import io.glutenproject.vectorized.NativePartitioning +import org.apache.gluten.vectorized.NativePartitioning import org.apache.spark.{Aggregator, Partitioner, ShuffleDependency, SparkEnv} import org.apache.spark.rdd.RDD diff --git a/gluten-core/src/main/scala/org/apache/spark/shuffle/GlutenShuffleUtils.scala b/gluten-core/src/main/scala/org/apache/spark/shuffle/GlutenShuffleUtils.scala index 569e2d4e8764..3414544707dd 100644 --- a/gluten-core/src/main/scala/org/apache/spark/shuffle/GlutenShuffleUtils.scala +++ b/gluten-core/src/main/scala/org/apache/spark/shuffle/GlutenShuffleUtils.scala @@ -16,10 +16,10 @@ */ package org.apache.spark.shuffle -import io.glutenproject.GlutenConfig -import io.glutenproject.backendsapi.BackendsApiManager -import io.glutenproject.sql.shims.SparkShimLoader -import io.glutenproject.vectorized.NativePartitioning +import org.apache.gluten.GlutenConfig +import org.apache.gluten.backendsapi.BackendsApiManager +import org.apache.gluten.sql.shims.SparkShimLoader +import org.apache.gluten.vectorized.NativePartitioning import org.apache.spark.SparkConf import org.apache.spark.internal.config._ diff --git a/gluten-core/src/main/scala/org/apache/spark/shuffle/GlutenShuffleWriterWrapper.scala b/gluten-core/src/main/scala/org/apache/spark/shuffle/GlutenShuffleWriterWrapper.scala index 20dca68c23ef..368fa803cccd 100644 --- a/gluten-core/src/main/scala/org/apache/spark/shuffle/GlutenShuffleWriterWrapper.scala +++ b/gluten-core/src/main/scala/org/apache/spark/shuffle/GlutenShuffleWriterWrapper.scala @@ -16,7 +16,7 @@ */ package org.apache.spark.shuffle -import io.glutenproject.backendsapi.BackendsApiManager +import org.apache.gluten.backendsapi.BackendsApiManager import org.apache.spark.shuffle.sort.ColumnarShuffleHandle diff --git a/gluten-core/src/main/scala/org/apache/spark/softaffinity/SoftAffinity.scala b/gluten-core/src/main/scala/org/apache/spark/softaffinity/SoftAffinity.scala index c4370e8cbd63..86133542e269 100644 --- a/gluten-core/src/main/scala/org/apache/spark/softaffinity/SoftAffinity.scala +++ b/gluten-core/src/main/scala/org/apache/spark/softaffinity/SoftAffinity.scala @@ -16,8 +16,8 @@ */ package org.apache.spark.softaffinity -import io.glutenproject.softaffinity.{AffinityManager, SoftAffinityManager} -import io.glutenproject.utils.LogLevelUtil +import org.apache.gluten.softaffinity.{AffinityManager, SoftAffinityManager} +import org.apache.gluten.utils.LogLevelUtil import org.apache.spark.internal.Logging import org.apache.spark.scheduler.ExecutorCacheTaskLocation diff --git a/gluten-core/src/main/scala/org/apache/spark/sql/execution/ColumnarBroadcastExchangeExec.scala b/gluten-core/src/main/scala/org/apache/spark/sql/execution/ColumnarBroadcastExchangeExec.scala index b90ff4967b3e..34012ad099f4 100644 --- a/gluten-core/src/main/scala/org/apache/spark/sql/execution/ColumnarBroadcastExchangeExec.scala +++ b/gluten-core/src/main/scala/org/apache/spark/sql/execution/ColumnarBroadcastExchangeExec.scala @@ -16,10 +16,10 @@ */ package org.apache.spark.sql.execution -import io.glutenproject.backendsapi.BackendsApiManager -import io.glutenproject.extension.{GlutenPlan, ValidationResult} -import io.glutenproject.metrics.GlutenTimeMetric -import io.glutenproject.sql.shims.SparkShimLoader +import org.apache.gluten.backendsapi.BackendsApiManager +import org.apache.gluten.extension.{GlutenPlan, ValidationResult} +import org.apache.gluten.metrics.GlutenTimeMetric +import org.apache.gluten.sql.shims.SparkShimLoader import org.apache.spark.{broadcast, SparkException} import org.apache.spark.launcher.SparkLauncher diff --git a/gluten-core/src/main/scala/org/apache/spark/sql/execution/ColumnarCollapseTransformStages.scala b/gluten-core/src/main/scala/org/apache/spark/sql/execution/ColumnarCollapseTransformStages.scala index 39a3d2ccbfd8..fce07eab4ec3 100644 --- a/gluten-core/src/main/scala/org/apache/spark/sql/execution/ColumnarCollapseTransformStages.scala +++ b/gluten-core/src/main/scala/org/apache/spark/sql/execution/ColumnarCollapseTransformStages.scala @@ -16,12 +16,12 @@ */ package org.apache.spark.sql.execution -import io.glutenproject.GlutenConfig -import io.glutenproject.backendsapi.BackendsApiManager -import io.glutenproject.execution._ -import io.glutenproject.metrics.MetricsUpdater -import io.glutenproject.substrait.SubstraitContext -import io.glutenproject.substrait.rel.RelBuilder +import org.apache.gluten.GlutenConfig +import org.apache.gluten.backendsapi.BackendsApiManager +import org.apache.gluten.execution._ +import org.apache.gluten.metrics.MetricsUpdater +import org.apache.gluten.substrait.SubstraitContext +import org.apache.gluten.substrait.rel.RelBuilder import org.apache.spark.broadcast.Broadcast import org.apache.spark.rdd.RDD diff --git a/gluten-core/src/main/scala/org/apache/spark/sql/execution/ColumnarShuffleExchangeExec.scala b/gluten-core/src/main/scala/org/apache/spark/sql/execution/ColumnarShuffleExchangeExec.scala index b1fb5b83a02f..e2d47510a8e8 100644 --- a/gluten-core/src/main/scala/org/apache/spark/sql/execution/ColumnarShuffleExchangeExec.scala +++ b/gluten-core/src/main/scala/org/apache/spark/sql/execution/ColumnarShuffleExchangeExec.scala @@ -16,10 +16,10 @@ */ package org.apache.spark.sql.execution -import io.glutenproject.backendsapi.BackendsApiManager -import io.glutenproject.extension.GlutenPlan -import io.glutenproject.extension.ValidationResult -import io.glutenproject.sql.shims.SparkShimLoader +import org.apache.gluten.backendsapi.BackendsApiManager +import org.apache.gluten.extension.GlutenPlan +import org.apache.gluten.extension.ValidationResult +import org.apache.gluten.sql.shims.SparkShimLoader import org.apache.spark._ import org.apache.spark.internal.Logging diff --git a/gluten-core/src/main/scala/org/apache/spark/sql/execution/ColumnarSubqueryBroadcastExec.scala b/gluten-core/src/main/scala/org/apache/spark/sql/execution/ColumnarSubqueryBroadcastExec.scala index f2c83b183dcd..a74d428fd452 100644 --- a/gluten-core/src/main/scala/org/apache/spark/sql/execution/ColumnarSubqueryBroadcastExec.scala +++ b/gluten-core/src/main/scala/org/apache/spark/sql/execution/ColumnarSubqueryBroadcastExec.scala @@ -16,9 +16,9 @@ */ package org.apache.spark.sql.execution -import io.glutenproject.backendsapi.BackendsApiManager -import io.glutenproject.extension.GlutenPlan -import io.glutenproject.metrics.GlutenTimeMetric +import org.apache.gluten.backendsapi.BackendsApiManager +import org.apache.gluten.extension.GlutenPlan +import org.apache.gluten.metrics.GlutenTimeMetric import org.apache.spark.rdd.RDD import org.apache.spark.sql.catalyst.InternalRow diff --git a/gluten-core/src/main/scala/org/apache/spark/sql/execution/GlutenExplainUtils.scala b/gluten-core/src/main/scala/org/apache/spark/sql/execution/GlutenExplainUtils.scala index a60275b338e0..781dc6b6f717 100644 --- a/gluten-core/src/main/scala/org/apache/spark/sql/execution/GlutenExplainUtils.scala +++ b/gluten-core/src/main/scala/org/apache/spark/sql/execution/GlutenExplainUtils.scala @@ -16,9 +16,9 @@ */ package org.apache.spark.sql.execution -import io.glutenproject.execution.WholeStageTransformer -import io.glutenproject.extension.GlutenPlan -import io.glutenproject.utils.PlanUtil +import org.apache.gluten.execution.WholeStageTransformer +import org.apache.gluten.extension.GlutenPlan +import org.apache.gluten.utils.PlanUtil import org.apache.spark.sql.AnalysisException import org.apache.spark.sql.catalyst.expressions.{Expression, PlanExpression} diff --git a/gluten-core/src/main/scala/org/apache/spark/sql/execution/GlutenFallbackReporter.scala b/gluten-core/src/main/scala/org/apache/spark/sql/execution/GlutenFallbackReporter.scala index 08cb54fb747e..00b0248aee77 100644 --- a/gluten-core/src/main/scala/org/apache/spark/sql/execution/GlutenFallbackReporter.scala +++ b/gluten-core/src/main/scala/org/apache/spark/sql/execution/GlutenFallbackReporter.scala @@ -16,11 +16,11 @@ */ package org.apache.spark.sql.execution -import io.glutenproject.GlutenConfig -import io.glutenproject.events.GlutenPlanFallbackEvent -import io.glutenproject.extension.GlutenPlan -import io.glutenproject.extension.columnar.{TRANSFORM_UNSUPPORTED, TransformHints} -import io.glutenproject.utils.LogLevelUtil +import org.apache.gluten.GlutenConfig +import org.apache.gluten.events.GlutenPlanFallbackEvent +import org.apache.gluten.extension.GlutenPlan +import org.apache.gluten.extension.columnar.{TRANSFORM_UNSUPPORTED, TransformHints} +import org.apache.gluten.utils.LogLevelUtil import org.apache.spark.sql.SparkSession import org.apache.spark.sql.catalyst.rules.Rule diff --git a/gluten-core/src/main/scala/org/apache/spark/sql/execution/GlutenImplicits.scala b/gluten-core/src/main/scala/org/apache/spark/sql/execution/GlutenImplicits.scala index 986099911132..b0dc3a958e13 100644 --- a/gluten-core/src/main/scala/org/apache/spark/sql/execution/GlutenImplicits.scala +++ b/gluten-core/src/main/scala/org/apache/spark/sql/execution/GlutenImplicits.scala @@ -16,9 +16,9 @@ */ package org.apache.spark.sql.execution -import io.glutenproject.execution.WholeStageTransformer -import io.glutenproject.extension.GlutenPlan -import io.glutenproject.utils.PlanUtil +import org.apache.gluten.execution.WholeStageTransformer +import org.apache.gluten.extension.GlutenPlan +import org.apache.gluten.utils.PlanUtil import org.apache.spark.sql.{AnalysisException, Dataset} import org.apache.spark.sql.catalyst.plans.QueryPlan diff --git a/gluten-core/src/main/scala/org/apache/spark/sql/execution/datasources/GlutenFormatWriterInjectsBase.scala b/gluten-core/src/main/scala/org/apache/spark/sql/execution/datasources/GlutenFormatWriterInjectsBase.scala index 8e85d60bb699..a106e84a59bf 100644 --- a/gluten-core/src/main/scala/org/apache/spark/sql/execution/datasources/GlutenFormatWriterInjectsBase.scala +++ b/gluten-core/src/main/scala/org/apache/spark/sql/execution/datasources/GlutenFormatWriterInjectsBase.scala @@ -16,11 +16,11 @@ */ package org.apache.spark.sql.execution.datasources -import io.glutenproject.execution.{ProjectExecTransformer, SortExecTransformer, TransformSupport, WholeStageTransformer} -import io.glutenproject.execution.datasource.GlutenFormatWriterInjects -import io.glutenproject.extension.ColumnarOverrideRules -import io.glutenproject.extension.columnar.AddTransformHintRule -import io.glutenproject.extension.columnar.MiscColumnarRules.TransformPreOverrides +import org.apache.gluten.execution.{ProjectExecTransformer, SortExecTransformer, TransformSupport, WholeStageTransformer} +import org.apache.gluten.execution.datasource.GlutenFormatWriterInjects +import org.apache.gluten.extension.ColumnarOverrideRules +import org.apache.gluten.extension.columnar.AddTransformHintRule +import org.apache.gluten.extension.columnar.MiscColumnarRules.TransformPreOverrides import org.apache.spark.rdd.RDD import org.apache.spark.sql.SparkSession diff --git a/gluten-core/src/main/scala/org/apache/spark/sql/execution/datasources/GlutenWriterColumnarRules.scala b/gluten-core/src/main/scala/org/apache/spark/sql/execution/datasources/GlutenWriterColumnarRules.scala index 80ef67ad61b8..5b14eef18d74 100644 --- a/gluten-core/src/main/scala/org/apache/spark/sql/execution/datasources/GlutenWriterColumnarRules.scala +++ b/gluten-core/src/main/scala/org/apache/spark/sql/execution/datasources/GlutenWriterColumnarRules.scala @@ -16,9 +16,9 @@ */ package org.apache.spark.sql.execution.datasources -import io.glutenproject.backendsapi.BackendsApiManager -import io.glutenproject.execution.ColumnarToRowExecBase -import io.glutenproject.extension.GlutenPlan +import org.apache.gluten.backendsapi.BackendsApiManager +import org.apache.gluten.execution.ColumnarToRowExecBase +import org.apache.gluten.extension.GlutenPlan import org.apache.spark.rdd.RDD import org.apache.spark.sql.SparkSession diff --git a/gluten-core/src/main/scala/org/apache/spark/sql/execution/python/EvalPythonExecTransformer.scala b/gluten-core/src/main/scala/org/apache/spark/sql/execution/python/EvalPythonExecTransformer.scala index 11835c095b2b..43dd2f453803 100644 --- a/gluten-core/src/main/scala/org/apache/spark/sql/execution/python/EvalPythonExecTransformer.scala +++ b/gluten-core/src/main/scala/org/apache/spark/sql/execution/python/EvalPythonExecTransformer.scala @@ -16,16 +16,16 @@ */ package org.apache.spark.api.python -import io.glutenproject.backendsapi.BackendsApiManager -import io.glutenproject.execution.{TransformContext, TransformSupport, UnaryTransformSupport} -import io.glutenproject.expression._ -import io.glutenproject.extension.ValidationResult -import io.glutenproject.metrics.MetricsUpdater -import io.glutenproject.substrait.`type`._ -import io.glutenproject.substrait.SubstraitContext -import io.glutenproject.substrait.expression._ -import io.glutenproject.substrait.extensions.ExtensionBuilder -import io.glutenproject.substrait.rel._ +import org.apache.gluten.backendsapi.BackendsApiManager +import org.apache.gluten.execution.{TransformContext, TransformSupport, UnaryTransformSupport} +import org.apache.gluten.expression._ +import org.apache.gluten.extension.ValidationResult +import org.apache.gluten.metrics.MetricsUpdater +import org.apache.gluten.substrait.`type`._ +import org.apache.gluten.substrait.SubstraitContext +import org.apache.gluten.substrait.expression._ +import org.apache.gluten.substrait.extensions.ExtensionBuilder +import org.apache.gluten.substrait.rel._ import org.apache.spark.TaskContext import org.apache.spark.sql.catalyst.InternalRow diff --git a/gluten-core/src/main/scala/org/apache/spark/sql/hive/HivePartitionConverter.scala b/gluten-core/src/main/scala/org/apache/spark/sql/hive/HivePartitionConverter.scala index f312bbe4353d..d76eca3d3c49 100644 --- a/gluten-core/src/main/scala/org/apache/spark/sql/hive/HivePartitionConverter.scala +++ b/gluten-core/src/main/scala/org/apache/spark/sql/hive/HivePartitionConverter.scala @@ -16,8 +16,8 @@ */ package org.apache.spark.sql.hive -import io.glutenproject.backendsapi.BackendsApiManager -import io.glutenproject.sql.shims.SparkShimLoader +import org.apache.gluten.backendsapi.BackendsApiManager +import org.apache.gluten.sql.shims.SparkShimLoader import org.apache.spark.sql.SparkSession import org.apache.spark.sql.catalyst.{InternalRow, SQLConfHelper} diff --git a/gluten-core/src/main/scala/org/apache/spark/sql/hive/HiveTableScanExecTransformer.scala b/gluten-core/src/main/scala/org/apache/spark/sql/hive/HiveTableScanExecTransformer.scala index 1f32ee8b401f..2952267e5a1d 100644 --- a/gluten-core/src/main/scala/org/apache/spark/sql/hive/HiveTableScanExecTransformer.scala +++ b/gluten-core/src/main/scala/org/apache/spark/sql/hive/HiveTableScanExecTransformer.scala @@ -16,11 +16,11 @@ */ package org.apache.spark.sql.hive -import io.glutenproject.backendsapi.BackendsApiManager -import io.glutenproject.execution.BasicScanExecTransformer -import io.glutenproject.extension.ValidationResult -import io.glutenproject.metrics.MetricsUpdater -import io.glutenproject.substrait.rel.LocalFilesNode.ReadFileFormat +import org.apache.gluten.backendsapi.BackendsApiManager +import org.apache.gluten.execution.BasicScanExecTransformer +import org.apache.gluten.extension.ValidationResult +import org.apache.gluten.metrics.MetricsUpdater +import org.apache.gluten.substrait.rel.LocalFilesNode.ReadFileFormat import org.apache.spark.rdd.RDD import org.apache.spark.sql.SparkSession diff --git a/gluten-core/src/main/scala/org/apache/spark/sql/hive/HiveUDFTransformer.scala b/gluten-core/src/main/scala/org/apache/spark/sql/hive/HiveUDFTransformer.scala index 5363ad13971f..5cd64cc212f8 100644 --- a/gluten-core/src/main/scala/org/apache/spark/sql/hive/HiveUDFTransformer.scala +++ b/gluten-core/src/main/scala/org/apache/spark/sql/hive/HiveUDFTransformer.scala @@ -16,8 +16,8 @@ */ package org.apache.spark.sql.hive -import io.glutenproject.exception.GlutenNotSupportException -import io.glutenproject.expression.{ExpressionConverter, ExpressionTransformer, GenericExpressionTransformer, UDFMappings} +import org.apache.gluten.exception.GlutenNotSupportException +import org.apache.gluten.expression.{ExpressionConverter, ExpressionTransformer, GenericExpressionTransformer, UDFMappings} import org.apache.spark.sql.catalyst.expressions._ diff --git a/gluten-core/src/main/scala/org/apache/spark/sql/utils/ExpressionUtil.scala b/gluten-core/src/main/scala/org/apache/spark/sql/utils/ExpressionUtil.scala index 3a08ffd7b6ab..b5c45e090f38 100644 --- a/gluten-core/src/main/scala/org/apache/spark/sql/utils/ExpressionUtil.scala +++ b/gluten-core/src/main/scala/org/apache/spark/sql/utils/ExpressionUtil.scala @@ -16,7 +16,7 @@ */ package org.apache.spark.sql.utils -import io.glutenproject.extension.{DefaultExpressionExtensionTransformer, ExpressionExtensionTrait} +import org.apache.gluten.extension.{DefaultExpressionExtensionTransformer, ExpressionExtensionTrait} import org.apache.spark.internal.Logging import org.apache.spark.util.Utils diff --git a/gluten-core/src/main/scala/org/apache/spark/util/ExecutorManager.scala b/gluten-core/src/main/scala/org/apache/spark/util/ExecutorManager.scala index 83fd51d00103..049bcf13c032 100644 --- a/gluten-core/src/main/scala/org/apache/spark/util/ExecutorManager.scala +++ b/gluten-core/src/main/scala/org/apache/spark/util/ExecutorManager.scala @@ -18,7 +18,7 @@ package org.apache.spark.util import org.apache.spark.{SparkContext, SparkEnv} -import _root_.io.glutenproject._ +import _root_.org.apache.gluten._ import java.lang.management.ManagementFactory diff --git a/gluten-core/src/main/scala/org/apache/spark/util/SparkDirectoryUtil.scala b/gluten-core/src/main/scala/org/apache/spark/util/SparkDirectoryUtil.scala index 51e73d7430c4..1d5c21736829 100644 --- a/gluten-core/src/main/scala/org/apache/spark/util/SparkDirectoryUtil.scala +++ b/gluten-core/src/main/scala/org/apache/spark/util/SparkDirectoryUtil.scala @@ -19,7 +19,7 @@ package org.apache.spark.util import org.apache.spark.SparkEnv import org.apache.spark.internal.Logging -import _root_.io.glutenproject.exception.GlutenException +import _root_.org.apache.gluten.exception.GlutenException import org.apache.commons.io.FileUtils import org.apache.commons.lang3.StringUtils diff --git a/gluten-core/src/main/scala/org/apache/spark/util/TaskResources.scala b/gluten-core/src/main/scala/org/apache/spark/util/TaskResources.scala index 82bfb6ffce34..d8079abce858 100644 --- a/gluten-core/src/main/scala/org/apache/spark/util/TaskResources.scala +++ b/gluten-core/src/main/scala/org/apache/spark/util/TaskResources.scala @@ -20,9 +20,9 @@ import org.apache.spark.{TaskContext, TaskFailedReason, TaskKilledException, Unk import org.apache.spark.internal.Logging import org.apache.spark.sql.internal.SQLConf -import _root_.io.glutenproject.memory.SimpleMemoryUsageRecorder -import _root_.io.glutenproject.sql.shims.SparkShimLoader -import _root_.io.glutenproject.utils.TaskListener +import _root_.org.apache.gluten.memory.SimpleMemoryUsageRecorder +import _root_.org.apache.gluten.sql.shims.SparkShimLoader +import _root_.org.apache.gluten.utils.TaskListener import java.util import java.util.{Collections, UUID} diff --git a/gluten-core/src/test/scala/io/glutenproject/benchmarks/RandomParquetDataGenerator.scala b/gluten-core/src/test/scala/org/apache/gluten/benchmarks/RandomParquetDataGenerator.scala similarity index 99% rename from gluten-core/src/test/scala/io/glutenproject/benchmarks/RandomParquetDataGenerator.scala rename to gluten-core/src/test/scala/org/apache/gluten/benchmarks/RandomParquetDataGenerator.scala index fbd4e25f2599..507e40fc44cd 100644 --- a/gluten-core/src/test/scala/io/glutenproject/benchmarks/RandomParquetDataGenerator.scala +++ b/gluten-core/src/test/scala/org/apache/gluten/benchmarks/RandomParquetDataGenerator.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.benchmarks +package org.apache.gluten.benchmarks import org.apache.spark.sql.{Row, SparkSession} import org.apache.spark.sql.types._ diff --git a/gluten-core/src/test/scala/io/glutenproject/execution/WholeStageTransformerSuite.scala b/gluten-core/src/test/scala/org/apache/gluten/execution/WholeStageTransformerSuite.scala similarity index 98% rename from gluten-core/src/test/scala/io/glutenproject/execution/WholeStageTransformerSuite.scala rename to gluten-core/src/test/scala/org/apache/gluten/execution/WholeStageTransformerSuite.scala index 10cefa1d260d..1fd95824b1e2 100644 --- a/gluten-core/src/test/scala/io/glutenproject/execution/WholeStageTransformerSuite.scala +++ b/gluten-core/src/test/scala/org/apache/gluten/execution/WholeStageTransformerSuite.scala @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution +package org.apache.gluten.execution -import io.glutenproject.utils.{Arm, FallbackUtil} +import org.apache.gluten.utils.{Arm, FallbackUtil} import org.apache.spark.SparkConf import org.apache.spark.internal.Logging @@ -91,7 +91,7 @@ abstract class WholeStageTransformerSuite override protected def sparkConf: SparkConf = { super.sparkConf - .set("spark.plugins", "io.glutenproject.GlutenPlugin") + .set("spark.plugins", "org.apache.gluten.GlutenPlugin") .set("spark.default.parallelism", "1") .set("spark.memory.offHeap.enabled", "true") .set("spark.memory.offHeap.size", "1024MB") diff --git a/gluten-core/src/test/scala/io/glutenproject/utils/IteratorSuite.scala b/gluten-core/src/test/scala/org/apache/gluten/utils/IteratorSuite.scala similarity index 99% rename from gluten-core/src/test/scala/io/glutenproject/utils/IteratorSuite.scala rename to gluten-core/src/test/scala/org/apache/gluten/utils/IteratorSuite.scala index 3f68dd1e58b9..389e2adfefd4 100644 --- a/gluten-core/src/test/scala/io/glutenproject/utils/IteratorSuite.scala +++ b/gluten-core/src/test/scala/org/apache/gluten/utils/IteratorSuite.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.utils +package org.apache.gluten.utils import org.apache.spark.util.TaskResources diff --git a/gluten-core/src/test/scala/io/glutenproject/utils/TaskResourceSuite.scala b/gluten-core/src/test/scala/org/apache/gluten/utils/TaskResourceSuite.scala similarity index 98% rename from gluten-core/src/test/scala/io/glutenproject/utils/TaskResourceSuite.scala rename to gluten-core/src/test/scala/org/apache/gluten/utils/TaskResourceSuite.scala index a618b500a7c4..898cf873c9cf 100644 --- a/gluten-core/src/test/scala/io/glutenproject/utils/TaskResourceSuite.scala +++ b/gluten-core/src/test/scala/org/apache/gluten/utils/TaskResourceSuite.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.utils +package org.apache.gluten.utils import org.apache.spark.util.{TaskResource, TaskResources} diff --git a/gluten-core/src/test/scala/org/apache/spark/softaffinity/SoftAffinitySuite.scala b/gluten-core/src/test/scala/org/apache/spark/softaffinity/SoftAffinitySuite.scala index 1c514ddfd8da..c6c4fcc5fa1f 100644 --- a/gluten-core/src/test/scala/org/apache/spark/softaffinity/SoftAffinitySuite.scala +++ b/gluten-core/src/test/scala/org/apache/spark/softaffinity/SoftAffinitySuite.scala @@ -16,12 +16,12 @@ */ package org.apache.spark.softaffinity -import io.glutenproject.GlutenConfig -import io.glutenproject.execution.GlutenPartition -import io.glutenproject.softaffinity.SoftAffinityManager -import io.glutenproject.softaffinity.scheduler.SoftAffinityListener -import io.glutenproject.sql.shims.SparkShimLoader -import io.glutenproject.substrait.plan.PlanBuilder +import org.apache.gluten.GlutenConfig +import org.apache.gluten.execution.GlutenPartition +import org.apache.gluten.softaffinity.SoftAffinityManager +import org.apache.gluten.softaffinity.scheduler.SoftAffinityListener +import org.apache.gluten.sql.shims.SparkShimLoader +import org.apache.gluten.substrait.plan.PlanBuilder import org.apache.spark.SparkConf import org.apache.spark.scheduler.{SparkListenerExecutorAdded, SparkListenerExecutorRemoved} diff --git a/gluten-core/src/test/scala/org/apache/spark/softaffinity/SoftAffinityWithRDDInfoSuite.scala b/gluten-core/src/test/scala/org/apache/spark/softaffinity/SoftAffinityWithRDDInfoSuite.scala index 1a91e91eac30..b22eb508001a 100644 --- a/gluten-core/src/test/scala/org/apache/spark/softaffinity/SoftAffinityWithRDDInfoSuite.scala +++ b/gluten-core/src/test/scala/org/apache/spark/softaffinity/SoftAffinityWithRDDInfoSuite.scala @@ -16,12 +16,12 @@ */ package org.apache.spark.softaffinity -import io.glutenproject.GlutenConfig -import io.glutenproject.execution.GlutenPartition -import io.glutenproject.softaffinity.SoftAffinityManager -import io.glutenproject.softaffinity.scheduler.SoftAffinityListener -import io.glutenproject.sql.shims.SparkShimLoader -import io.glutenproject.substrait.plan.PlanBuilder +import org.apache.gluten.GlutenConfig +import org.apache.gluten.execution.GlutenPartition +import org.apache.gluten.softaffinity.SoftAffinityManager +import org.apache.gluten.softaffinity.scheduler.SoftAffinityListener +import org.apache.gluten.sql.shims.SparkShimLoader +import org.apache.gluten.substrait.plan.PlanBuilder import org.apache.spark.SparkConf import org.apache.spark.scheduler.{SparkListenerExecutorAdded, SparkListenerExecutorRemoved, SparkListenerStageCompleted, SparkListenerStageSubmitted, SparkListenerTaskEnd, StageInfo, TaskInfo, TaskLocality} diff --git a/gluten-core/src/test/scala/org/apache/spark/sql/GlutenQueryTest.scala b/gluten-core/src/test/scala/org/apache/spark/sql/GlutenQueryTest.scala index dc3de5f35ac2..ae83a56d1df8 100644 --- a/gluten-core/src/test/scala/org/apache/spark/sql/GlutenQueryTest.scala +++ b/gluten-core/src/test/scala/org/apache/spark/sql/GlutenQueryTest.scala @@ -20,7 +20,7 @@ package org.apache.spark.sql * Why we need a GlutenQueryTest when we already have QueryTest? * 1. We need to modify the way org.apache.spark.sql.CHQueryTest#compare compares double */ -import io.glutenproject.sql.shims.SparkShimLoader +import org.apache.gluten.sql.shims.SparkShimLoader import org.apache.spark.SPARK_VERSION_SHORT import org.apache.spark.rpc.GlutenDriverEndpoint diff --git a/gluten-core/src/test/scala/org/apache/spark/sql/TestUtils.scala b/gluten-core/src/test/scala/org/apache/spark/sql/TestUtils.scala index cabde70dfbf7..a679c2272879 100644 --- a/gluten-core/src/test/scala/org/apache/spark/sql/TestUtils.scala +++ b/gluten-core/src/test/scala/org/apache/spark/sql/TestUtils.scala @@ -16,7 +16,7 @@ */ package org.apache.spark.sql -import io.glutenproject.exception.GlutenException +import org.apache.gluten.exception.GlutenException import org.apache.spark.sql.test.SQLTestUtils diff --git a/gluten-data/pom.xml b/gluten-data/pom.xml index 3bd9db35fe2e..951f53ee83d3 100644 --- a/gluten-data/pom.xml +++ b/gluten-data/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> gluten-parent - io.glutenproject + org.apache.gluten 1.2.0-SNAPSHOT ../pom.xml @@ -46,7 +46,7 @@ - io.glutenproject + org.apache.gluten gluten-core ${project.version} compile @@ -63,7 +63,7 @@ provided - io.glutenproject + org.apache.gluten gluten-core ${project.version} test-jar diff --git a/gluten-data/src/main/java/io/glutenproject/columnarbatch/ColumnarBatchJniWrapper.java b/gluten-data/src/main/java/org/apache/gluten/columnarbatch/ColumnarBatchJniWrapper.java similarity index 92% rename from gluten-data/src/main/java/io/glutenproject/columnarbatch/ColumnarBatchJniWrapper.java rename to gluten-data/src/main/java/org/apache/gluten/columnarbatch/ColumnarBatchJniWrapper.java index 08468df15c56..4f042b893832 100644 --- a/gluten-data/src/main/java/io/glutenproject/columnarbatch/ColumnarBatchJniWrapper.java +++ b/gluten-data/src/main/java/org/apache/gluten/columnarbatch/ColumnarBatchJniWrapper.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.columnarbatch; +package org.apache.gluten.columnarbatch; -import io.glutenproject.exec.Runtime; -import io.glutenproject.exec.RuntimeAware; -import io.glutenproject.exec.Runtimes; +import org.apache.gluten.exec.Runtime; +import org.apache.gluten.exec.RuntimeAware; +import org.apache.gluten.exec.Runtimes; public class ColumnarBatchJniWrapper implements RuntimeAware { private final Runtime runtime; diff --git a/gluten-data/src/main/java/io/glutenproject/columnarbatch/ColumnarBatches.java b/gluten-data/src/main/java/org/apache/gluten/columnarbatch/ColumnarBatches.java similarity index 96% rename from gluten-data/src/main/java/io/glutenproject/columnarbatch/ColumnarBatches.java rename to gluten-data/src/main/java/org/apache/gluten/columnarbatch/ColumnarBatches.java index 897df1785b2b..85ef875d69a2 100644 --- a/gluten-data/src/main/java/io/glutenproject/columnarbatch/ColumnarBatches.java +++ b/gluten-data/src/main/java/org/apache/gluten/columnarbatch/ColumnarBatches.java @@ -14,17 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.columnarbatch; - -import io.glutenproject.exception.GlutenException; -import io.glutenproject.exec.Runtime; -import io.glutenproject.exec.Runtimes; -import io.glutenproject.memory.arrowalloc.ArrowBufferAllocators; -import io.glutenproject.memory.nmm.NativeMemoryManager; -import io.glutenproject.utils.ArrowAbiUtil; -import io.glutenproject.utils.ArrowUtil; -import io.glutenproject.utils.ImplicitClass; -import io.glutenproject.vectorized.ArrowWritableColumnVector; +package org.apache.gluten.columnarbatch; + +import org.apache.gluten.exception.GlutenException; +import org.apache.gluten.exec.Runtime; +import org.apache.gluten.exec.Runtimes; +import org.apache.gluten.memory.arrowalloc.ArrowBufferAllocators; +import org.apache.gluten.memory.nmm.NativeMemoryManager; +import org.apache.gluten.utils.ArrowAbiUtil; +import org.apache.gluten.utils.ArrowUtil; +import org.apache.gluten.utils.ImplicitClass; +import org.apache.gluten.vectorized.ArrowWritableColumnVector; import com.google.common.base.Preconditions; import org.apache.arrow.c.ArrowArray; diff --git a/gluten-data/src/main/java/io/glutenproject/columnarbatch/IndicatorVector.java b/gluten-data/src/main/java/org/apache/gluten/columnarbatch/IndicatorVector.java similarity index 98% rename from gluten-data/src/main/java/io/glutenproject/columnarbatch/IndicatorVector.java rename to gluten-data/src/main/java/org/apache/gluten/columnarbatch/IndicatorVector.java index 32c1f902755f..d15412bec7e5 100644 --- a/gluten-data/src/main/java/io/glutenproject/columnarbatch/IndicatorVector.java +++ b/gluten-data/src/main/java/org/apache/gluten/columnarbatch/IndicatorVector.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.columnarbatch; +package org.apache.gluten.columnarbatch; -import io.glutenproject.exec.Runtime; +import org.apache.gluten.exec.Runtime; import org.apache.spark.sql.types.DataTypes; import org.apache.spark.sql.types.Decimal; diff --git a/gluten-data/src/main/java/io/glutenproject/columnarbatch/PlaceholderVector.java b/gluten-data/src/main/java/org/apache/gluten/columnarbatch/PlaceholderVector.java similarity index 98% rename from gluten-data/src/main/java/io/glutenproject/columnarbatch/PlaceholderVector.java rename to gluten-data/src/main/java/org/apache/gluten/columnarbatch/PlaceholderVector.java index 3e0f8ee3ed37..e9f28f66f27f 100644 --- a/gluten-data/src/main/java/io/glutenproject/columnarbatch/PlaceholderVector.java +++ b/gluten-data/src/main/java/org/apache/gluten/columnarbatch/PlaceholderVector.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.columnarbatch; +package org.apache.gluten.columnarbatch; import org.apache.spark.sql.types.DataTypes; import org.apache.spark.sql.types.Decimal; diff --git a/gluten-data/src/main/java/io/glutenproject/datasource/DatasourceJniWrapper.java b/gluten-data/src/main/java/org/apache/gluten/datasource/DatasourceJniWrapper.java similarity index 88% rename from gluten-data/src/main/java/io/glutenproject/datasource/DatasourceJniWrapper.java rename to gluten-data/src/main/java/org/apache/gluten/datasource/DatasourceJniWrapper.java index 86bf7da98e13..46d12c1deee9 100644 --- a/gluten-data/src/main/java/io/glutenproject/datasource/DatasourceJniWrapper.java +++ b/gluten-data/src/main/java/org/apache/gluten/datasource/DatasourceJniWrapper.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.datasource; +package org.apache.gluten.datasource; -import io.glutenproject.exec.Runtime; -import io.glutenproject.exec.RuntimeAware; -import io.glutenproject.exec.Runtimes; -import io.glutenproject.init.JniUtils; -import io.glutenproject.vectorized.ColumnarBatchInIterator; +import org.apache.gluten.exec.Runtime; +import org.apache.gluten.exec.RuntimeAware; +import org.apache.gluten.exec.Runtimes; +import org.apache.gluten.init.JniUtils; +import org.apache.gluten.vectorized.ColumnarBatchInIterator; import org.apache.spark.sql.execution.datasources.BlockStripes; diff --git a/gluten-data/src/main/java/io/glutenproject/exception/JniExceptionDescriber.java b/gluten-data/src/main/java/org/apache/gluten/exception/JniExceptionDescriber.java similarity index 96% rename from gluten-data/src/main/java/io/glutenproject/exception/JniExceptionDescriber.java rename to gluten-data/src/main/java/org/apache/gluten/exception/JniExceptionDescriber.java index e3de599d96f9..5c9f86738000 100644 --- a/gluten-data/src/main/java/io/glutenproject/exception/JniExceptionDescriber.java +++ b/gluten-data/src/main/java/org/apache/gluten/exception/JniExceptionDescriber.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.exception; +package org.apache.gluten.exception; import java.io.PrintWriter; import java.io.StringWriter; diff --git a/gluten-data/src/main/java/io/glutenproject/exec/RuntimeAware.java b/gluten-data/src/main/java/org/apache/gluten/exec/RuntimeAware.java similarity index 96% rename from gluten-data/src/main/java/io/glutenproject/exec/RuntimeAware.java rename to gluten-data/src/main/java/org/apache/gluten/exec/RuntimeAware.java index 89b4533af6e4..8a3f15b4085c 100644 --- a/gluten-data/src/main/java/io/glutenproject/exec/RuntimeAware.java +++ b/gluten-data/src/main/java/org/apache/gluten/exec/RuntimeAware.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.exec; +package org.apache.gluten.exec; /** * This defines the base abstraction for the contextual objects that can be transmitted to C++ side diff --git a/gluten-data/src/main/java/io/glutenproject/exec/RuntimeJniWrapper.java b/gluten-data/src/main/java/org/apache/gluten/exec/RuntimeJniWrapper.java similarity index 96% rename from gluten-data/src/main/java/io/glutenproject/exec/RuntimeJniWrapper.java rename to gluten-data/src/main/java/org/apache/gluten/exec/RuntimeJniWrapper.java index d74292bca9dc..14ec87dcf6ca 100644 --- a/gluten-data/src/main/java/io/glutenproject/exec/RuntimeJniWrapper.java +++ b/gluten-data/src/main/java/org/apache/gluten/exec/RuntimeJniWrapper.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.exec; +package org.apache.gluten.exec; public class RuntimeJniWrapper { diff --git a/gluten-data/src/main/java/io/glutenproject/init/JniUtils.java b/gluten-data/src/main/java/org/apache/gluten/init/JniUtils.java similarity index 93% rename from gluten-data/src/main/java/io/glutenproject/init/JniUtils.java rename to gluten-data/src/main/java/org/apache/gluten/init/JniUtils.java index ed2c239abf21..55cf96aaa6ca 100644 --- a/gluten-data/src/main/java/io/glutenproject/init/JniUtils.java +++ b/gluten-data/src/main/java/org/apache/gluten/init/JniUtils.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.init; +package org.apache.gluten.init; -import io.glutenproject.proto.ConfigMap; +import org.apache.gluten.proto.ConfigMap; import java.util.Map; diff --git a/gluten-data/src/main/java/io/glutenproject/init/NativeBackendInitializer.java b/gluten-data/src/main/java/org/apache/gluten/init/NativeBackendInitializer.java similarity index 93% rename from gluten-data/src/main/java/io/glutenproject/init/NativeBackendInitializer.java rename to gluten-data/src/main/java/org/apache/gluten/init/NativeBackendInitializer.java index 54eac4fe9c87..a97af505b632 100644 --- a/gluten-data/src/main/java/io/glutenproject/init/NativeBackendInitializer.java +++ b/gluten-data/src/main/java/org/apache/gluten/init/NativeBackendInitializer.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.init; +package org.apache.gluten.init; -import io.glutenproject.GlutenConfig; -import io.glutenproject.backendsapi.BackendsApiManager; +import org.apache.gluten.GlutenConfig; +import org.apache.gluten.backendsapi.BackendsApiManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/gluten-data/src/main/java/io/glutenproject/memory/alloc/NativeMemoryAllocator.java b/gluten-data/src/main/java/org/apache/gluten/memory/alloc/NativeMemoryAllocator.java similarity index 97% rename from gluten-data/src/main/java/io/glutenproject/memory/alloc/NativeMemoryAllocator.java rename to gluten-data/src/main/java/org/apache/gluten/memory/alloc/NativeMemoryAllocator.java index 0f95efc9d387..6860d68e3c1b 100644 --- a/gluten-data/src/main/java/io/glutenproject/memory/alloc/NativeMemoryAllocator.java +++ b/gluten-data/src/main/java/org/apache/gluten/memory/alloc/NativeMemoryAllocator.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.memory.alloc; +package org.apache.gluten.memory.alloc; /** * This along with {@link NativeMemoryAllocators}, as built-in toolkit for managing native memory diff --git a/gluten-data/src/main/java/io/glutenproject/memory/alloc/NativeMemoryAllocators.java b/gluten-data/src/main/java/org/apache/gluten/memory/alloc/NativeMemoryAllocators.java similarity index 98% rename from gluten-data/src/main/java/io/glutenproject/memory/alloc/NativeMemoryAllocators.java rename to gluten-data/src/main/java/org/apache/gluten/memory/alloc/NativeMemoryAllocators.java index 4ef0591e6c48..e60766ac1f95 100644 --- a/gluten-data/src/main/java/io/glutenproject/memory/alloc/NativeMemoryAllocators.java +++ b/gluten-data/src/main/java/org/apache/gluten/memory/alloc/NativeMemoryAllocators.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.memory.alloc; +package org.apache.gluten.memory.alloc; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/gluten-data/src/main/java/io/glutenproject/memory/arrowalloc/ArrowBufferAllocators.java b/gluten-data/src/main/java/org/apache/gluten/memory/arrowalloc/ArrowBufferAllocators.java similarity index 97% rename from gluten-data/src/main/java/io/glutenproject/memory/arrowalloc/ArrowBufferAllocators.java rename to gluten-data/src/main/java/org/apache/gluten/memory/arrowalloc/ArrowBufferAllocators.java index 4cd4e6278228..fcac26d6ebb1 100644 --- a/gluten-data/src/main/java/io/glutenproject/memory/arrowalloc/ArrowBufferAllocators.java +++ b/gluten-data/src/main/java/org/apache/gluten/memory/arrowalloc/ArrowBufferAllocators.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.memory.arrowalloc; +package org.apache.gluten.memory.arrowalloc; -import io.glutenproject.memory.memtarget.MemoryTargets; +import org.apache.gluten.memory.memtarget.MemoryTargets; import org.apache.arrow.memory.AllocationListener; import org.apache.arrow.memory.BufferAllocator; diff --git a/gluten-data/src/main/java/io/glutenproject/memory/arrowalloc/ManagedAllocationListener.java b/gluten-data/src/main/java/org/apache/gluten/memory/arrowalloc/ManagedAllocationListener.java similarity index 94% rename from gluten-data/src/main/java/io/glutenproject/memory/arrowalloc/ManagedAllocationListener.java rename to gluten-data/src/main/java/org/apache/gluten/memory/arrowalloc/ManagedAllocationListener.java index 320eae7767a2..ded2af60bd3a 100644 --- a/gluten-data/src/main/java/io/glutenproject/memory/arrowalloc/ManagedAllocationListener.java +++ b/gluten-data/src/main/java/org/apache/gluten/memory/arrowalloc/ManagedAllocationListener.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.memory.arrowalloc; +package org.apache.gluten.memory.arrowalloc; -import io.glutenproject.GlutenConfig; -import io.glutenproject.memory.SimpleMemoryUsageRecorder; -import io.glutenproject.memory.memtarget.MemoryTarget; +import org.apache.gluten.GlutenConfig; +import org.apache.gluten.memory.SimpleMemoryUsageRecorder; +import org.apache.gluten.memory.memtarget.MemoryTarget; import org.apache.arrow.memory.AllocationListener; import org.slf4j.Logger; diff --git a/gluten-data/src/main/java/io/glutenproject/memory/nmm/ManagedReservationListener.java b/gluten-data/src/main/java/org/apache/gluten/memory/nmm/ManagedReservationListener.java similarity index 92% rename from gluten-data/src/main/java/io/glutenproject/memory/nmm/ManagedReservationListener.java rename to gluten-data/src/main/java/org/apache/gluten/memory/nmm/ManagedReservationListener.java index 9043ced725a7..88e793320920 100644 --- a/gluten-data/src/main/java/io/glutenproject/memory/nmm/ManagedReservationListener.java +++ b/gluten-data/src/main/java/org/apache/gluten/memory/nmm/ManagedReservationListener.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.memory.nmm; +package org.apache.gluten.memory.nmm; -import io.glutenproject.memory.SimpleMemoryUsageRecorder; -import io.glutenproject.memory.memtarget.MemoryTarget; +import org.apache.gluten.memory.SimpleMemoryUsageRecorder; +import org.apache.gluten.memory.memtarget.MemoryTarget; import com.google.common.base.Preconditions; import org.slf4j.Logger; diff --git a/gluten-data/src/main/java/io/glutenproject/memory/nmm/NativeMemoryManager.java b/gluten-data/src/main/java/org/apache/gluten/memory/nmm/NativeMemoryManager.java similarity index 93% rename from gluten-data/src/main/java/io/glutenproject/memory/nmm/NativeMemoryManager.java rename to gluten-data/src/main/java/org/apache/gluten/memory/nmm/NativeMemoryManager.java index 589e71056228..95e9843bea0b 100644 --- a/gluten-data/src/main/java/io/glutenproject/memory/nmm/NativeMemoryManager.java +++ b/gluten-data/src/main/java/org/apache/gluten/memory/nmm/NativeMemoryManager.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.memory.nmm; +package org.apache.gluten.memory.nmm; -import io.glutenproject.GlutenConfig; -import io.glutenproject.backendsapi.BackendsApiManager; -import io.glutenproject.memory.alloc.NativeMemoryAllocators; -import io.glutenproject.memory.memtarget.KnownNameAndStats; -import io.glutenproject.proto.MemoryUsageStats; +import org.apache.gluten.GlutenConfig; +import org.apache.gluten.backendsapi.BackendsApiManager; +import org.apache.gluten.memory.alloc.NativeMemoryAllocators; +import org.apache.gluten.memory.memtarget.KnownNameAndStats; +import org.apache.gluten.proto.MemoryUsageStats; import com.google.protobuf.InvalidProtocolBufferException; import org.apache.spark.memory.SparkMemoryUtil; diff --git a/gluten-data/src/main/java/io/glutenproject/memory/nmm/NativeMemoryManagers.java b/gluten-data/src/main/java/org/apache/gluten/memory/nmm/NativeMemoryManagers.java similarity index 94% rename from gluten-data/src/main/java/io/glutenproject/memory/nmm/NativeMemoryManagers.java rename to gluten-data/src/main/java/org/apache/gluten/memory/nmm/NativeMemoryManagers.java index fb6cc8840d45..928f869ba4e1 100644 --- a/gluten-data/src/main/java/io/glutenproject/memory/nmm/NativeMemoryManagers.java +++ b/gluten-data/src/main/java/org/apache/gluten/memory/nmm/NativeMemoryManagers.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.memory.nmm; +package org.apache.gluten.memory.nmm; -import io.glutenproject.GlutenConfig; -import io.glutenproject.memory.MemoryUsageRecorder; -import io.glutenproject.memory.memtarget.MemoryTarget; -import io.glutenproject.memory.memtarget.MemoryTargets; -import io.glutenproject.memory.memtarget.Spiller; -import io.glutenproject.memory.memtarget.Spillers; -import io.glutenproject.proto.MemoryUsageStats; +import org.apache.gluten.GlutenConfig; +import org.apache.gluten.memory.MemoryUsageRecorder; +import org.apache.gluten.memory.memtarget.MemoryTarget; +import org.apache.gluten.memory.memtarget.MemoryTargets; +import org.apache.gluten.memory.memtarget.Spiller; +import org.apache.gluten.memory.memtarget.Spillers; +import org.apache.gluten.proto.MemoryUsageStats; import org.apache.spark.memory.TaskMemoryManager; import org.apache.spark.util.TaskResources; diff --git a/gluten-data/src/main/java/io/glutenproject/memory/nmm/ReservationListener.java b/gluten-data/src/main/java/org/apache/gluten/memory/nmm/ReservationListener.java similarity index 86% rename from gluten-data/src/main/java/io/glutenproject/memory/nmm/ReservationListener.java rename to gluten-data/src/main/java/org/apache/gluten/memory/nmm/ReservationListener.java index f52ce36e0780..f423bc8fb4e4 100644 --- a/gluten-data/src/main/java/io/glutenproject/memory/nmm/ReservationListener.java +++ b/gluten-data/src/main/java/org/apache/gluten/memory/nmm/ReservationListener.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.memory.nmm; +package org.apache.gluten.memory.nmm; -import io.glutenproject.memory.SimpleMemoryUsageRecorder; -import io.glutenproject.memory.memtarget.NoopMemoryTarget; +import org.apache.gluten.memory.SimpleMemoryUsageRecorder; +import org.apache.gluten.memory.memtarget.NoopMemoryTarget; public interface ReservationListener { ReservationListener NOOP = diff --git a/gluten-data/src/main/java/io/glutenproject/metrics/Metrics.java b/gluten-data/src/main/java/org/apache/gluten/metrics/Metrics.java similarity index 98% rename from gluten-data/src/main/java/io/glutenproject/metrics/Metrics.java rename to gluten-data/src/main/java/org/apache/gluten/metrics/Metrics.java index d1d9ca0d9f36..4e91823e5a21 100644 --- a/gluten-data/src/main/java/io/glutenproject/metrics/Metrics.java +++ b/gluten-data/src/main/java/org/apache/gluten/metrics/Metrics.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.metrics; +package org.apache.gluten.metrics; -import io.glutenproject.exception.GlutenException; +import org.apache.gluten.exception.GlutenException; public class Metrics implements IMetrics { public long[] inputRows; diff --git a/gluten-data/src/main/java/io/glutenproject/metrics/OperatorMetrics.java b/gluten-data/src/main/java/org/apache/gluten/metrics/OperatorMetrics.java similarity index 99% rename from gluten-data/src/main/java/io/glutenproject/metrics/OperatorMetrics.java rename to gluten-data/src/main/java/org/apache/gluten/metrics/OperatorMetrics.java index 6cb32d4a4954..cb155afed356 100644 --- a/gluten-data/src/main/java/io/glutenproject/metrics/OperatorMetrics.java +++ b/gluten-data/src/main/java/org/apache/gluten/metrics/OperatorMetrics.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.metrics; +package org.apache.gluten.metrics; public class OperatorMetrics implements IOperatorMetrics { public long inputRows; diff --git a/gluten-data/src/main/java/io/glutenproject/vectorized/ArrowColumnVector.java b/gluten-data/src/main/java/org/apache/gluten/vectorized/ArrowColumnVector.java similarity index 99% rename from gluten-data/src/main/java/io/glutenproject/vectorized/ArrowColumnVector.java rename to gluten-data/src/main/java/org/apache/gluten/vectorized/ArrowColumnVector.java index f87a0c5c27ad..0ecaabef55c6 100644 --- a/gluten-data/src/main/java/io/glutenproject/vectorized/ArrowColumnVector.java +++ b/gluten-data/src/main/java/org/apache/gluten/vectorized/ArrowColumnVector.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.vectorized; +package org.apache.gluten.vectorized; import org.apache.arrow.vector.*; import org.apache.arrow.vector.complex.ListVector; diff --git a/gluten-data/src/main/java/io/glutenproject/vectorized/ArrowWritableColumnVector.java b/gluten-data/src/main/java/org/apache/gluten/vectorized/ArrowWritableColumnVector.java similarity index 99% rename from gluten-data/src/main/java/io/glutenproject/vectorized/ArrowWritableColumnVector.java rename to gluten-data/src/main/java/org/apache/gluten/vectorized/ArrowWritableColumnVector.java index 22b30d047f62..3b1049fca527 100644 --- a/gluten-data/src/main/java/io/glutenproject/vectorized/ArrowWritableColumnVector.java +++ b/gluten-data/src/main/java/org/apache/gluten/vectorized/ArrowWritableColumnVector.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.vectorized; +package org.apache.gluten.vectorized; -import io.glutenproject.memory.arrowalloc.ArrowBufferAllocators; +import org.apache.gluten.memory.arrowalloc.ArrowBufferAllocators; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.vector.BigIntVector; diff --git a/gluten-data/src/main/java/io/glutenproject/vectorized/ColumnarBatchInIterator.java b/gluten-data/src/main/java/org/apache/gluten/vectorized/ColumnarBatchInIterator.java similarity index 87% rename from gluten-data/src/main/java/io/glutenproject/vectorized/ColumnarBatchInIterator.java rename to gluten-data/src/main/java/org/apache/gluten/vectorized/ColumnarBatchInIterator.java index 7bbbad7049c6..85b24166ebf5 100644 --- a/gluten-data/src/main/java/io/glutenproject/vectorized/ColumnarBatchInIterator.java +++ b/gluten-data/src/main/java/org/apache/gluten/vectorized/ColumnarBatchInIterator.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.vectorized; +package org.apache.gluten.vectorized; -import io.glutenproject.columnarbatch.ColumnarBatchJniWrapper; -import io.glutenproject.columnarbatch.ColumnarBatches; -import io.glutenproject.memory.arrowalloc.ArrowBufferAllocators; +import org.apache.gluten.columnarbatch.ColumnarBatchJniWrapper; +import org.apache.gluten.columnarbatch.ColumnarBatches; +import org.apache.gluten.memory.arrowalloc.ArrowBufferAllocators; import org.apache.spark.sql.vectorized.ColumnarBatch; diff --git a/gluten-data/src/main/java/io/glutenproject/vectorized/ColumnarBatchOutIterator.java b/gluten-data/src/main/java/org/apache/gluten/vectorized/ColumnarBatchOutIterator.java similarity index 90% rename from gluten-data/src/main/java/io/glutenproject/vectorized/ColumnarBatchOutIterator.java rename to gluten-data/src/main/java/org/apache/gluten/vectorized/ColumnarBatchOutIterator.java index a6428d1fd871..82b398439cde 100644 --- a/gluten-data/src/main/java/io/glutenproject/vectorized/ColumnarBatchOutIterator.java +++ b/gluten-data/src/main/java/org/apache/gluten/vectorized/ColumnarBatchOutIterator.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.vectorized; +package org.apache.gluten.vectorized; -import io.glutenproject.columnarbatch.ColumnarBatches; -import io.glutenproject.exec.Runtime; -import io.glutenproject.exec.RuntimeAware; -import io.glutenproject.memory.nmm.NativeMemoryManager; -import io.glutenproject.metrics.IMetrics; +import org.apache.gluten.columnarbatch.ColumnarBatches; +import org.apache.gluten.exec.Runtime; +import org.apache.gluten.exec.RuntimeAware; +import org.apache.gluten.memory.nmm.NativeMemoryManager; +import org.apache.gluten.metrics.IMetrics; import org.apache.spark.sql.vectorized.ColumnarBatch; diff --git a/gluten-data/src/main/java/io/glutenproject/vectorized/ColumnarBatchSerializeResult.java b/gluten-data/src/main/java/org/apache/gluten/vectorized/ColumnarBatchSerializeResult.java similarity index 97% rename from gluten-data/src/main/java/io/glutenproject/vectorized/ColumnarBatchSerializeResult.java rename to gluten-data/src/main/java/org/apache/gluten/vectorized/ColumnarBatchSerializeResult.java index a5feefee0e4d..4f681fb85951 100644 --- a/gluten-data/src/main/java/io/glutenproject/vectorized/ColumnarBatchSerializeResult.java +++ b/gluten-data/src/main/java/org/apache/gluten/vectorized/ColumnarBatchSerializeResult.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.vectorized; +package org.apache.gluten.vectorized; import java.io.Serializable; diff --git a/gluten-data/src/main/java/io/glutenproject/vectorized/ColumnarBatchSerializerJniWrapper.java b/gluten-data/src/main/java/org/apache/gluten/vectorized/ColumnarBatchSerializerJniWrapper.java similarity index 91% rename from gluten-data/src/main/java/io/glutenproject/vectorized/ColumnarBatchSerializerJniWrapper.java rename to gluten-data/src/main/java/org/apache/gluten/vectorized/ColumnarBatchSerializerJniWrapper.java index cfb8edaf0dce..59f31689e107 100644 --- a/gluten-data/src/main/java/io/glutenproject/vectorized/ColumnarBatchSerializerJniWrapper.java +++ b/gluten-data/src/main/java/org/apache/gluten/vectorized/ColumnarBatchSerializerJniWrapper.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.vectorized; +package org.apache.gluten.vectorized; -import io.glutenproject.exec.Runtime; -import io.glutenproject.exec.RuntimeAware; -import io.glutenproject.exec.Runtimes; +import org.apache.gluten.exec.Runtime; +import org.apache.gluten.exec.RuntimeAware; +import org.apache.gluten.exec.Runtimes; public class ColumnarBatchSerializerJniWrapper implements RuntimeAware { private final Runtime runtime; diff --git a/gluten-data/src/main/java/io/glutenproject/vectorized/GlutenSplitResult.java b/gluten-data/src/main/java/org/apache/gluten/vectorized/GlutenSplitResult.java similarity index 97% rename from gluten-data/src/main/java/io/glutenproject/vectorized/GlutenSplitResult.java rename to gluten-data/src/main/java/org/apache/gluten/vectorized/GlutenSplitResult.java index fc2a48ed1f9c..c760aed1eead 100644 --- a/gluten-data/src/main/java/io/glutenproject/vectorized/GlutenSplitResult.java +++ b/gluten-data/src/main/java/org/apache/gluten/vectorized/GlutenSplitResult.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.vectorized; +package org.apache.gluten.vectorized; public class GlutenSplitResult extends SplitResult { private final long splitBufferSize; diff --git a/gluten-data/src/main/java/io/glutenproject/vectorized/JniByteInputStream.java b/gluten-data/src/main/java/org/apache/gluten/vectorized/JniByteInputStream.java similarity index 96% rename from gluten-data/src/main/java/io/glutenproject/vectorized/JniByteInputStream.java rename to gluten-data/src/main/java/org/apache/gluten/vectorized/JniByteInputStream.java index 4004a07d5de3..6c93cd3ec188 100644 --- a/gluten-data/src/main/java/io/glutenproject/vectorized/JniByteInputStream.java +++ b/gluten-data/src/main/java/org/apache/gluten/vectorized/JniByteInputStream.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.vectorized; +package org.apache.gluten.vectorized; /** For being called from C++ code only. */ public interface JniByteInputStream { diff --git a/gluten-data/src/main/java/io/glutenproject/vectorized/JniByteInputStreams.java b/gluten-data/src/main/java/org/apache/gluten/vectorized/JniByteInputStreams.java similarity index 96% rename from gluten-data/src/main/java/io/glutenproject/vectorized/JniByteInputStreams.java rename to gluten-data/src/main/java/org/apache/gluten/vectorized/JniByteInputStreams.java index 9c8d259a9ca1..5c404b0407b6 100644 --- a/gluten-data/src/main/java/io/glutenproject/vectorized/JniByteInputStreams.java +++ b/gluten-data/src/main/java/org/apache/gluten/vectorized/JniByteInputStreams.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.vectorized; +package org.apache.gluten.vectorized; -import io.glutenproject.exception.GlutenException; +import org.apache.gluten.exception.GlutenException; import org.apache.spark.storage.BufferReleasingInputStream; import org.slf4j.Logger; diff --git a/gluten-data/src/main/java/io/glutenproject/vectorized/LowCopyFileSegmentJniByteInputStream.java b/gluten-data/src/main/java/org/apache/gluten/vectorized/LowCopyFileSegmentJniByteInputStream.java similarity index 97% rename from gluten-data/src/main/java/io/glutenproject/vectorized/LowCopyFileSegmentJniByteInputStream.java rename to gluten-data/src/main/java/org/apache/gluten/vectorized/LowCopyFileSegmentJniByteInputStream.java index 212d1c048b2e..95a2bfa2f4ca 100644 --- a/gluten-data/src/main/java/io/glutenproject/vectorized/LowCopyFileSegmentJniByteInputStream.java +++ b/gluten-data/src/main/java/org/apache/gluten/vectorized/LowCopyFileSegmentJniByteInputStream.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.vectorized; +package org.apache.gluten.vectorized; -import io.glutenproject.exception.GlutenException; +import org.apache.gluten.exception.GlutenException; import io.netty.util.internal.PlatformDependent; import org.apache.spark.network.util.LimitedInputStream; diff --git a/gluten-data/src/main/java/io/glutenproject/vectorized/LowCopyNettyJniByteInputStream.java b/gluten-data/src/main/java/org/apache/gluten/vectorized/LowCopyNettyJniByteInputStream.java similarity index 97% rename from gluten-data/src/main/java/io/glutenproject/vectorized/LowCopyNettyJniByteInputStream.java rename to gluten-data/src/main/java/org/apache/gluten/vectorized/LowCopyNettyJniByteInputStream.java index cda8e4f73a08..ebdcb2aefb41 100644 --- a/gluten-data/src/main/java/io/glutenproject/vectorized/LowCopyNettyJniByteInputStream.java +++ b/gluten-data/src/main/java/org/apache/gluten/vectorized/LowCopyNettyJniByteInputStream.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.vectorized; +package org.apache.gluten.vectorized; -import io.glutenproject.exception.GlutenException; +import org.apache.gluten.exception.GlutenException; import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBufInputStream; diff --git a/gluten-data/src/main/java/io/glutenproject/vectorized/NativeColumnarToRowInfo.java b/gluten-data/src/main/java/org/apache/gluten/vectorized/NativeColumnarToRowInfo.java similarity index 96% rename from gluten-data/src/main/java/io/glutenproject/vectorized/NativeColumnarToRowInfo.java rename to gluten-data/src/main/java/org/apache/gluten/vectorized/NativeColumnarToRowInfo.java index b115bb610e98..9a3c566abe5d 100644 --- a/gluten-data/src/main/java/io/glutenproject/vectorized/NativeColumnarToRowInfo.java +++ b/gluten-data/src/main/java/org/apache/gluten/vectorized/NativeColumnarToRowInfo.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.vectorized; +package org.apache.gluten.vectorized; public class NativeColumnarToRowInfo { public int[] offsets; diff --git a/gluten-data/src/main/java/io/glutenproject/vectorized/NativeColumnarToRowJniWrapper.java b/gluten-data/src/main/java/org/apache/gluten/vectorized/NativeColumnarToRowJniWrapper.java similarity index 90% rename from gluten-data/src/main/java/io/glutenproject/vectorized/NativeColumnarToRowJniWrapper.java rename to gluten-data/src/main/java/org/apache/gluten/vectorized/NativeColumnarToRowJniWrapper.java index e64154befaff..7ae2fafb31b4 100644 --- a/gluten-data/src/main/java/io/glutenproject/vectorized/NativeColumnarToRowJniWrapper.java +++ b/gluten-data/src/main/java/org/apache/gluten/vectorized/NativeColumnarToRowJniWrapper.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.vectorized; +package org.apache.gluten.vectorized; -import io.glutenproject.exec.Runtime; -import io.glutenproject.exec.RuntimeAware; -import io.glutenproject.exec.Runtimes; +import org.apache.gluten.exec.Runtime; +import org.apache.gluten.exec.RuntimeAware; +import org.apache.gluten.exec.Runtimes; public class NativeColumnarToRowJniWrapper implements RuntimeAware { private final Runtime runtime; diff --git a/gluten-data/src/main/java/io/glutenproject/vectorized/NativePlanEvaluator.java b/gluten-data/src/main/java/org/apache/gluten/vectorized/NativePlanEvaluator.java similarity index 88% rename from gluten-data/src/main/java/io/glutenproject/vectorized/NativePlanEvaluator.java rename to gluten-data/src/main/java/org/apache/gluten/vectorized/NativePlanEvaluator.java index 7dc6884aaa34..e817c844d48f 100644 --- a/gluten-data/src/main/java/io/glutenproject/vectorized/NativePlanEvaluator.java +++ b/gluten-data/src/main/java/org/apache/gluten/vectorized/NativePlanEvaluator.java @@ -14,18 +14,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.vectorized; +package org.apache.gluten.vectorized; -import io.glutenproject.backendsapi.BackendsApiManager; -import io.glutenproject.exec.Runtime; -import io.glutenproject.exec.Runtimes; -import io.glutenproject.memory.memtarget.MemoryTarget; -import io.glutenproject.memory.memtarget.Spiller; -import io.glutenproject.memory.memtarget.Spillers; -import io.glutenproject.memory.nmm.NativeMemoryManager; -import io.glutenproject.memory.nmm.NativeMemoryManagers; -import io.glutenproject.utils.DebugUtil; -import io.glutenproject.validate.NativePlanValidationInfo; +import org.apache.gluten.backendsapi.BackendsApiManager; +import org.apache.gluten.exec.Runtime; +import org.apache.gluten.exec.Runtimes; +import org.apache.gluten.memory.memtarget.MemoryTarget; +import org.apache.gluten.memory.memtarget.Spiller; +import org.apache.gluten.memory.memtarget.Spillers; +import org.apache.gluten.memory.nmm.NativeMemoryManager; +import org.apache.gluten.memory.nmm.NativeMemoryManagers; +import org.apache.gluten.utils.DebugUtil; +import org.apache.gluten.validate.NativePlanValidationInfo; import org.apache.spark.TaskContext; import org.apache.spark.util.SparkDirectoryUtil; diff --git a/gluten-data/src/main/java/io/glutenproject/vectorized/NativeRowToColumnarJniWrapper.java b/gluten-data/src/main/java/org/apache/gluten/vectorized/NativeRowToColumnarJniWrapper.java similarity index 89% rename from gluten-data/src/main/java/io/glutenproject/vectorized/NativeRowToColumnarJniWrapper.java rename to gluten-data/src/main/java/org/apache/gluten/vectorized/NativeRowToColumnarJniWrapper.java index fa2200e0bafc..b43c92b99142 100644 --- a/gluten-data/src/main/java/io/glutenproject/vectorized/NativeRowToColumnarJniWrapper.java +++ b/gluten-data/src/main/java/org/apache/gluten/vectorized/NativeRowToColumnarJniWrapper.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.vectorized; +package org.apache.gluten.vectorized; -import io.glutenproject.exec.Runtime; -import io.glutenproject.exec.RuntimeAware; -import io.glutenproject.exec.Runtimes; +import org.apache.gluten.exec.Runtime; +import org.apache.gluten.exec.RuntimeAware; +import org.apache.gluten.exec.Runtimes; public class NativeRowToColumnarJniWrapper implements RuntimeAware { private final Runtime runtime; diff --git a/gluten-data/src/main/java/io/glutenproject/vectorized/OnHeapJniByteInputStream.java b/gluten-data/src/main/java/org/apache/gluten/vectorized/OnHeapJniByteInputStream.java similarity index 95% rename from gluten-data/src/main/java/io/glutenproject/vectorized/OnHeapJniByteInputStream.java rename to gluten-data/src/main/java/org/apache/gluten/vectorized/OnHeapJniByteInputStream.java index 520edf5ab757..3947dbdeb4ef 100644 --- a/gluten-data/src/main/java/io/glutenproject/vectorized/OnHeapJniByteInputStream.java +++ b/gluten-data/src/main/java/org/apache/gluten/vectorized/OnHeapJniByteInputStream.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.vectorized; +package org.apache.gluten.vectorized; -import io.glutenproject.exception.GlutenException; +import org.apache.gluten.exception.GlutenException; import java.io.IOException; import java.io.InputStream; diff --git a/gluten-data/src/main/java/io/glutenproject/vectorized/PlanEvaluatorJniWrapper.java b/gluten-data/src/main/java/org/apache/gluten/vectorized/PlanEvaluatorJniWrapper.java similarity index 91% rename from gluten-data/src/main/java/io/glutenproject/vectorized/PlanEvaluatorJniWrapper.java rename to gluten-data/src/main/java/org/apache/gluten/vectorized/PlanEvaluatorJniWrapper.java index d492aac625e9..5e8ae392af8d 100644 --- a/gluten-data/src/main/java/io/glutenproject/vectorized/PlanEvaluatorJniWrapper.java +++ b/gluten-data/src/main/java/org/apache/gluten/vectorized/PlanEvaluatorJniWrapper.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.vectorized; +package org.apache.gluten.vectorized; -import io.glutenproject.exec.Runtime; -import io.glutenproject.exec.RuntimeAware; -import io.glutenproject.exec.Runtimes; -import io.glutenproject.validate.NativePlanValidationInfo; +import org.apache.gluten.exec.Runtime; +import org.apache.gluten.exec.RuntimeAware; +import org.apache.gluten.exec.Runtimes; +import org.apache.gluten.validate.NativePlanValidationInfo; /** * This class is implemented in JNI. This provides the Java interface to invoke functions in JNI. diff --git a/gluten-data/src/main/java/io/glutenproject/vectorized/ShuffleReaderJniWrapper.java b/gluten-data/src/main/java/org/apache/gluten/vectorized/ShuffleReaderJniWrapper.java similarity index 90% rename from gluten-data/src/main/java/io/glutenproject/vectorized/ShuffleReaderJniWrapper.java rename to gluten-data/src/main/java/org/apache/gluten/vectorized/ShuffleReaderJniWrapper.java index 2e84009a3c0e..411907ae3430 100644 --- a/gluten-data/src/main/java/io/glutenproject/vectorized/ShuffleReaderJniWrapper.java +++ b/gluten-data/src/main/java/org/apache/gluten/vectorized/ShuffleReaderJniWrapper.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.vectorized; +package org.apache.gluten.vectorized; -import io.glutenproject.exec.Runtime; -import io.glutenproject.exec.RuntimeAware; -import io.glutenproject.exec.Runtimes; +import org.apache.gluten.exec.Runtime; +import org.apache.gluten.exec.RuntimeAware; +import org.apache.gluten.exec.Runtimes; public class ShuffleReaderJniWrapper implements RuntimeAware { private final Runtime runtime; diff --git a/gluten-data/src/main/java/io/glutenproject/vectorized/ShuffleReaderMetrics.java b/gluten-data/src/main/java/org/apache/gluten/vectorized/ShuffleReaderMetrics.java similarity index 97% rename from gluten-data/src/main/java/io/glutenproject/vectorized/ShuffleReaderMetrics.java rename to gluten-data/src/main/java/org/apache/gluten/vectorized/ShuffleReaderMetrics.java index 333b39996166..c4548365d2e7 100644 --- a/gluten-data/src/main/java/io/glutenproject/vectorized/ShuffleReaderMetrics.java +++ b/gluten-data/src/main/java/org/apache/gluten/vectorized/ShuffleReaderMetrics.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.vectorized; +package org.apache.gluten.vectorized; public class ShuffleReaderMetrics { private long decompressTime; diff --git a/gluten-data/src/main/java/io/glutenproject/vectorized/ShuffleWriterJniWrapper.java b/gluten-data/src/main/java/org/apache/gluten/vectorized/ShuffleWriterJniWrapper.java similarity index 97% rename from gluten-data/src/main/java/io/glutenproject/vectorized/ShuffleWriterJniWrapper.java rename to gluten-data/src/main/java/org/apache/gluten/vectorized/ShuffleWriterJniWrapper.java index 6f49f6025e37..243c90599f5e 100644 --- a/gluten-data/src/main/java/io/glutenproject/vectorized/ShuffleWriterJniWrapper.java +++ b/gluten-data/src/main/java/org/apache/gluten/vectorized/ShuffleWriterJniWrapper.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.vectorized; +package org.apache.gluten.vectorized; -import io.glutenproject.exec.Runtime; -import io.glutenproject.exec.RuntimeAware; -import io.glutenproject.exec.Runtimes; +import org.apache.gluten.exec.Runtime; +import org.apache.gluten.exec.RuntimeAware; +import org.apache.gluten.exec.Runtimes; import java.io.IOException; diff --git a/gluten-data/src/main/scala/io/glutenproject/exec/Runtime.scala b/gluten-data/src/main/scala/org/apache/gluten/exec/Runtime.scala similarity index 88% rename from gluten-data/src/main/scala/io/glutenproject/exec/Runtime.scala rename to gluten-data/src/main/scala/org/apache/gluten/exec/Runtime.scala index 189e258b8553..2ade10ce907e 100644 --- a/gluten-data/src/main/scala/io/glutenproject/exec/Runtime.scala +++ b/gluten-data/src/main/scala/org/apache/gluten/exec/Runtime.scala @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.exec +package org.apache.gluten.exec -import io.glutenproject.GlutenConfig -import io.glutenproject.backendsapi.BackendsApiManager -import io.glutenproject.exception.GlutenException -import io.glutenproject.init.JniUtils +import org.apache.gluten.GlutenConfig +import org.apache.gluten.backendsapi.BackendsApiManager +import org.apache.gluten.exception.GlutenException +import org.apache.gluten.init.JniUtils import org.apache.spark.sql.internal.SQLConf import org.apache.spark.util.TaskResource diff --git a/gluten-data/src/main/scala/io/glutenproject/exec/Runtimes.scala b/gluten-data/src/main/scala/org/apache/gluten/exec/Runtimes.scala similarity index 97% rename from gluten-data/src/main/scala/io/glutenproject/exec/Runtimes.scala rename to gluten-data/src/main/scala/org/apache/gluten/exec/Runtimes.scala index b53590f0ce81..e5204771ce52 100644 --- a/gluten-data/src/main/scala/io/glutenproject/exec/Runtimes.scala +++ b/gluten-data/src/main/scala/org/apache/gluten/exec/Runtimes.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.exec +package org.apache.gluten.exec import org.apache.spark.util.TaskResources diff --git a/gluten-data/src/main/scala/io/glutenproject/metrics/BatchScanMetricsUpdater.scala b/gluten-data/src/main/scala/org/apache/gluten/metrics/BatchScanMetricsUpdater.scala similarity index 98% rename from gluten-data/src/main/scala/io/glutenproject/metrics/BatchScanMetricsUpdater.scala rename to gluten-data/src/main/scala/org/apache/gluten/metrics/BatchScanMetricsUpdater.scala index 32f8cd880b9a..0d4dd7fb103d 100644 --- a/gluten-data/src/main/scala/io/glutenproject/metrics/BatchScanMetricsUpdater.scala +++ b/gluten-data/src/main/scala/org/apache/gluten/metrics/BatchScanMetricsUpdater.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.metrics +package org.apache.gluten.metrics import org.apache.spark.sql.execution.metric.SQLMetric import org.apache.spark.sql.utils.OASPackageBridge.InputMetricsWrapper diff --git a/gluten-data/src/main/scala/io/glutenproject/metrics/ExpandMetricsUpdater.scala b/gluten-data/src/main/scala/org/apache/gluten/metrics/ExpandMetricsUpdater.scala similarity index 97% rename from gluten-data/src/main/scala/io/glutenproject/metrics/ExpandMetricsUpdater.scala rename to gluten-data/src/main/scala/org/apache/gluten/metrics/ExpandMetricsUpdater.scala index e254469f8ba1..68f6b4239bd2 100644 --- a/gluten-data/src/main/scala/io/glutenproject/metrics/ExpandMetricsUpdater.scala +++ b/gluten-data/src/main/scala/org/apache/gluten/metrics/ExpandMetricsUpdater.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.metrics +package org.apache.gluten.metrics import org.apache.spark.sql.execution.metric.SQLMetric diff --git a/gluten-data/src/main/scala/io/glutenproject/metrics/FileSourceScanMetricsUpdater.scala b/gluten-data/src/main/scala/org/apache/gluten/metrics/FileSourceScanMetricsUpdater.scala similarity index 99% rename from gluten-data/src/main/scala/io/glutenproject/metrics/FileSourceScanMetricsUpdater.scala rename to gluten-data/src/main/scala/org/apache/gluten/metrics/FileSourceScanMetricsUpdater.scala index ff8b1a576f9e..d961c28cf07f 100644 --- a/gluten-data/src/main/scala/io/glutenproject/metrics/FileSourceScanMetricsUpdater.scala +++ b/gluten-data/src/main/scala/org/apache/gluten/metrics/FileSourceScanMetricsUpdater.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.metrics +package org.apache.gluten.metrics import org.apache.spark.sql.execution.metric.SQLMetric import org.apache.spark.sql.utils.OASPackageBridge.InputMetricsWrapper diff --git a/gluten-data/src/main/scala/io/glutenproject/metrics/FilterMetricsUpdater.scala b/gluten-data/src/main/scala/org/apache/gluten/metrics/FilterMetricsUpdater.scala similarity index 97% rename from gluten-data/src/main/scala/io/glutenproject/metrics/FilterMetricsUpdater.scala rename to gluten-data/src/main/scala/org/apache/gluten/metrics/FilterMetricsUpdater.scala index f29931023765..c877fdbb0785 100644 --- a/gluten-data/src/main/scala/io/glutenproject/metrics/FilterMetricsUpdater.scala +++ b/gluten-data/src/main/scala/org/apache/gluten/metrics/FilterMetricsUpdater.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.metrics +package org.apache.gluten.metrics import org.apache.spark.sql.execution.metric.SQLMetric diff --git a/gluten-data/src/main/scala/io/glutenproject/metrics/GenerateMetricsUpdater.scala b/gluten-data/src/main/scala/org/apache/gluten/metrics/GenerateMetricsUpdater.scala similarity index 97% rename from gluten-data/src/main/scala/io/glutenproject/metrics/GenerateMetricsUpdater.scala rename to gluten-data/src/main/scala/org/apache/gluten/metrics/GenerateMetricsUpdater.scala index b4b7fb83c8d7..670fd1c4ddfe 100644 --- a/gluten-data/src/main/scala/io/glutenproject/metrics/GenerateMetricsUpdater.scala +++ b/gluten-data/src/main/scala/org/apache/gluten/metrics/GenerateMetricsUpdater.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.metrics +package org.apache.gluten.metrics import org.apache.spark.sql.execution.metric.SQLMetric diff --git a/gluten-data/src/main/scala/io/glutenproject/metrics/HashAggregateMetricsUpdater.scala b/gluten-data/src/main/scala/org/apache/gluten/metrics/HashAggregateMetricsUpdater.scala similarity index 97% rename from gluten-data/src/main/scala/io/glutenproject/metrics/HashAggregateMetricsUpdater.scala rename to gluten-data/src/main/scala/org/apache/gluten/metrics/HashAggregateMetricsUpdater.scala index 82c87c335836..5337af9e6c03 100644 --- a/gluten-data/src/main/scala/io/glutenproject/metrics/HashAggregateMetricsUpdater.scala +++ b/gluten-data/src/main/scala/org/apache/gluten/metrics/HashAggregateMetricsUpdater.scala @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.metrics +package org.apache.gluten.metrics -import io.glutenproject.substrait.AggregationParams +import org.apache.gluten.substrait.AggregationParams import org.apache.spark.sql.execution.metric.SQLMetric diff --git a/gluten-data/src/main/scala/io/glutenproject/metrics/HiveTableScanMetricsUpdater.scala b/gluten-data/src/main/scala/org/apache/gluten/metrics/HiveTableScanMetricsUpdater.scala similarity index 99% rename from gluten-data/src/main/scala/io/glutenproject/metrics/HiveTableScanMetricsUpdater.scala rename to gluten-data/src/main/scala/org/apache/gluten/metrics/HiveTableScanMetricsUpdater.scala index b7a858d44bdf..f4adcc5cfca4 100644 --- a/gluten-data/src/main/scala/io/glutenproject/metrics/HiveTableScanMetricsUpdater.scala +++ b/gluten-data/src/main/scala/org/apache/gluten/metrics/HiveTableScanMetricsUpdater.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.metrics +package org.apache.gluten.metrics import org.apache.spark.sql.execution.metric.SQLMetric import org.apache.spark.sql.utils.OASPackageBridge.InputMetricsWrapper diff --git a/gluten-data/src/main/scala/io/glutenproject/metrics/InputIteratorMetricsUpdater.scala b/gluten-data/src/main/scala/org/apache/gluten/metrics/InputIteratorMetricsUpdater.scala similarity index 98% rename from gluten-data/src/main/scala/io/glutenproject/metrics/InputIteratorMetricsUpdater.scala rename to gluten-data/src/main/scala/org/apache/gluten/metrics/InputIteratorMetricsUpdater.scala index 87ca348faeeb..a9067d069e03 100644 --- a/gluten-data/src/main/scala/io/glutenproject/metrics/InputIteratorMetricsUpdater.scala +++ b/gluten-data/src/main/scala/org/apache/gluten/metrics/InputIteratorMetricsUpdater.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.metrics +package org.apache.gluten.metrics import org.apache.spark.sql.execution.metric.SQLMetric case class InputIteratorMetricsUpdater(metrics: Map[String, SQLMetric]) extends MetricsUpdater { diff --git a/gluten-data/src/main/scala/io/glutenproject/metrics/JoinMetricsUpdater.scala b/gluten-data/src/main/scala/org/apache/gluten/metrics/JoinMetricsUpdater.scala similarity index 98% rename from gluten-data/src/main/scala/io/glutenproject/metrics/JoinMetricsUpdater.scala rename to gluten-data/src/main/scala/org/apache/gluten/metrics/JoinMetricsUpdater.scala index 24b142cda99e..60be8418af54 100644 --- a/gluten-data/src/main/scala/io/glutenproject/metrics/JoinMetricsUpdater.scala +++ b/gluten-data/src/main/scala/org/apache/gluten/metrics/JoinMetricsUpdater.scala @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.metrics +package org.apache.gluten.metrics -import io.glutenproject.metrics.Metrics.SingleMetric -import io.glutenproject.substrait.JoinParams +import org.apache.gluten.metrics.Metrics.SingleMetric +import org.apache.gluten.substrait.JoinParams import org.apache.spark.sql.execution.metric.SQLMetric diff --git a/gluten-data/src/main/scala/io/glutenproject/metrics/LimitMetricsUpdater.scala b/gluten-data/src/main/scala/org/apache/gluten/metrics/LimitMetricsUpdater.scala similarity index 97% rename from gluten-data/src/main/scala/io/glutenproject/metrics/LimitMetricsUpdater.scala rename to gluten-data/src/main/scala/org/apache/gluten/metrics/LimitMetricsUpdater.scala index a3ab24637a5c..f3c1b399f693 100644 --- a/gluten-data/src/main/scala/io/glutenproject/metrics/LimitMetricsUpdater.scala +++ b/gluten-data/src/main/scala/org/apache/gluten/metrics/LimitMetricsUpdater.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.metrics +package org.apache.gluten.metrics import org.apache.spark.sql.execution.metric.SQLMetric diff --git a/gluten-data/src/main/scala/io/glutenproject/metrics/MetricsUtil.scala b/gluten-data/src/main/scala/org/apache/gluten/metrics/MetricsUtil.scala similarity index 98% rename from gluten-data/src/main/scala/io/glutenproject/metrics/MetricsUtil.scala rename to gluten-data/src/main/scala/org/apache/gluten/metrics/MetricsUtil.scala index fb736464863b..f11800b89c31 100644 --- a/gluten-data/src/main/scala/io/glutenproject/metrics/MetricsUtil.scala +++ b/gluten-data/src/main/scala/org/apache/gluten/metrics/MetricsUtil.scala @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.metrics +package org.apache.gluten.metrics -import io.glutenproject.execution._ -import io.glutenproject.substrait.{AggregationParams, JoinParams} +import org.apache.gluten.execution._ +import org.apache.gluten.substrait.{AggregationParams, JoinParams} import org.apache.spark.internal.Logging import org.apache.spark.sql.execution.SparkPlan diff --git a/gluten-data/src/main/scala/io/glutenproject/metrics/NestedLoopJoinMetricsUpdater.scala b/gluten-data/src/main/scala/org/apache/gluten/metrics/NestedLoopJoinMetricsUpdater.scala similarity index 97% rename from gluten-data/src/main/scala/io/glutenproject/metrics/NestedLoopJoinMetricsUpdater.scala rename to gluten-data/src/main/scala/org/apache/gluten/metrics/NestedLoopJoinMetricsUpdater.scala index 8b29e86b3c85..3b058a878354 100644 --- a/gluten-data/src/main/scala/io/glutenproject/metrics/NestedLoopJoinMetricsUpdater.scala +++ b/gluten-data/src/main/scala/org/apache/gluten/metrics/NestedLoopJoinMetricsUpdater.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.metrics +package org.apache.gluten.metrics import org.apache.spark.sql.execution.metric.SQLMetric diff --git a/gluten-data/src/main/scala/io/glutenproject/metrics/ProjectMetricsUpdater.scala b/gluten-data/src/main/scala/org/apache/gluten/metrics/ProjectMetricsUpdater.scala similarity index 97% rename from gluten-data/src/main/scala/io/glutenproject/metrics/ProjectMetricsUpdater.scala rename to gluten-data/src/main/scala/org/apache/gluten/metrics/ProjectMetricsUpdater.scala index 03b41202ead1..ff8335c861d5 100644 --- a/gluten-data/src/main/scala/io/glutenproject/metrics/ProjectMetricsUpdater.scala +++ b/gluten-data/src/main/scala/org/apache/gluten/metrics/ProjectMetricsUpdater.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.metrics +package org.apache.gluten.metrics import org.apache.spark.sql.execution.metric.SQLMetric diff --git a/gluten-data/src/main/scala/io/glutenproject/metrics/SortMetricsUpdater.scala b/gluten-data/src/main/scala/org/apache/gluten/metrics/SortMetricsUpdater.scala similarity index 98% rename from gluten-data/src/main/scala/io/glutenproject/metrics/SortMetricsUpdater.scala rename to gluten-data/src/main/scala/org/apache/gluten/metrics/SortMetricsUpdater.scala index 38414002db91..13874035086c 100644 --- a/gluten-data/src/main/scala/io/glutenproject/metrics/SortMetricsUpdater.scala +++ b/gluten-data/src/main/scala/org/apache/gluten/metrics/SortMetricsUpdater.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.metrics +package org.apache.gluten.metrics import org.apache.spark.sql.execution.metric.SQLMetric diff --git a/gluten-data/src/main/scala/io/glutenproject/metrics/WindowMetricsUpdater.scala b/gluten-data/src/main/scala/org/apache/gluten/metrics/WindowMetricsUpdater.scala similarity index 97% rename from gluten-data/src/main/scala/io/glutenproject/metrics/WindowMetricsUpdater.scala rename to gluten-data/src/main/scala/org/apache/gluten/metrics/WindowMetricsUpdater.scala index 7b962294ed1d..82a41e01030d 100644 --- a/gluten-data/src/main/scala/io/glutenproject/metrics/WindowMetricsUpdater.scala +++ b/gluten-data/src/main/scala/org/apache/gluten/metrics/WindowMetricsUpdater.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.metrics +package org.apache.gluten.metrics import org.apache.spark.sql.execution.metric.SQLMetric diff --git a/gluten-data/src/main/scala/io/glutenproject/metrics/WriteFilesMetricsUpdater.scala b/gluten-data/src/main/scala/org/apache/gluten/metrics/WriteFilesMetricsUpdater.scala similarity index 97% rename from gluten-data/src/main/scala/io/glutenproject/metrics/WriteFilesMetricsUpdater.scala rename to gluten-data/src/main/scala/org/apache/gluten/metrics/WriteFilesMetricsUpdater.scala index 934ce1b5d11b..5a04b404334f 100644 --- a/gluten-data/src/main/scala/io/glutenproject/metrics/WriteFilesMetricsUpdater.scala +++ b/gluten-data/src/main/scala/org/apache/gluten/metrics/WriteFilesMetricsUpdater.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.metrics +package org.apache.gluten.metrics import org.apache.spark.sql.execution.metric.SQLMetric diff --git a/gluten-data/src/main/scala/io/glutenproject/utils/ArrowAbiUtil.scala b/gluten-data/src/main/scala/org/apache/gluten/utils/ArrowAbiUtil.scala similarity index 96% rename from gluten-data/src/main/scala/io/glutenproject/utils/ArrowAbiUtil.scala rename to gluten-data/src/main/scala/org/apache/gluten/utils/ArrowAbiUtil.scala index 9729927daf75..442ae74bac98 100644 --- a/gluten-data/src/main/scala/io/glutenproject/utils/ArrowAbiUtil.scala +++ b/gluten-data/src/main/scala/org/apache/gluten/utils/ArrowAbiUtil.scala @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.utils +package org.apache.gluten.utils -import io.glutenproject.columnarbatch.ColumnarBatches -import io.glutenproject.exception.GlutenException -import io.glutenproject.vectorized.ArrowWritableColumnVector +import org.apache.gluten.columnarbatch.ColumnarBatches +import org.apache.gluten.exception.GlutenException +import org.apache.gluten.vectorized.ArrowWritableColumnVector import org.apache.spark.sql.utils.SparkVectorUtil import org.apache.spark.sql.vectorized.{ColumnarBatch, ColumnVector} diff --git a/gluten-data/src/main/scala/io/glutenproject/utils/ArrowUtil.scala b/gluten-data/src/main/scala/org/apache/gluten/utils/ArrowUtil.scala similarity index 97% rename from gluten-data/src/main/scala/io/glutenproject/utils/ArrowUtil.scala rename to gluten-data/src/main/scala/org/apache/gluten/utils/ArrowUtil.scala index db7a2027b237..d43486e61467 100644 --- a/gluten-data/src/main/scala/io/glutenproject/utils/ArrowUtil.scala +++ b/gluten-data/src/main/scala/org/apache/gluten/utils/ArrowUtil.scala @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.utils +package org.apache.gluten.utils -import io.glutenproject.vectorized.ArrowWritableColumnVector +import org.apache.gluten.vectorized.ArrowWritableColumnVector import org.apache.spark.internal.Logging import org.apache.spark.sql.catalyst.expressions.Attribute diff --git a/gluten-data/src/main/scala/io/glutenproject/utils/ImplicitClass.scala b/gluten-data/src/main/scala/org/apache/gluten/utils/ImplicitClass.scala similarity index 85% rename from gluten-data/src/main/scala/io/glutenproject/utils/ImplicitClass.scala rename to gluten-data/src/main/scala/org/apache/gluten/utils/ImplicitClass.scala index 0bce9763b7c8..1a5ae42777ff 100644 --- a/gluten-data/src/main/scala/io/glutenproject/utils/ImplicitClass.scala +++ b/gluten-data/src/main/scala/org/apache/gluten/utils/ImplicitClass.scala @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.utils +package org.apache.gluten.utils -import io.glutenproject.columnarbatch.ColumnarBatches -import io.glutenproject.memory.arrowalloc.ArrowBufferAllocators -import io.glutenproject.vectorized.ArrowWritableColumnVector +import org.apache.gluten.columnarbatch.ColumnarBatches +import org.apache.gluten.memory.arrowalloc.ArrowBufferAllocators +import org.apache.gluten.vectorized.ArrowWritableColumnVector import org.apache.spark.sql.vectorized.ColumnarBatch diff --git a/gluten-data/src/main/scala/io/glutenproject/vectorized/ColumnarBatchSerializer.scala b/gluten-data/src/main/scala/org/apache/gluten/vectorized/ColumnarBatchSerializer.scala similarity index 96% rename from gluten-data/src/main/scala/io/glutenproject/vectorized/ColumnarBatchSerializer.scala rename to gluten-data/src/main/scala/org/apache/gluten/vectorized/ColumnarBatchSerializer.scala index 73759cb750ec..9fbdb36377e3 100644 --- a/gluten-data/src/main/scala/io/glutenproject/vectorized/ColumnarBatchSerializer.scala +++ b/gluten-data/src/main/scala/org/apache/gluten/vectorized/ColumnarBatchSerializer.scala @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.vectorized +package org.apache.gluten.vectorized -import io.glutenproject.GlutenConfig -import io.glutenproject.exec.Runtimes -import io.glutenproject.memory.arrowalloc.ArrowBufferAllocators -import io.glutenproject.memory.nmm.NativeMemoryManagers -import io.glutenproject.utils.ArrowAbiUtil +import org.apache.gluten.GlutenConfig +import org.apache.gluten.exec.Runtimes +import org.apache.gluten.memory.arrowalloc.ArrowBufferAllocators +import org.apache.gluten.memory.nmm.NativeMemoryManagers +import org.apache.gluten.utils.ArrowAbiUtil import org.apache.spark.SparkEnv import org.apache.spark.internal.Logging diff --git a/gluten-data/src/main/scala/org/apache/spark/shuffle/ColumnarShuffleWriter.scala b/gluten-data/src/main/scala/org/apache/spark/shuffle/ColumnarShuffleWriter.scala index 99710b3f668a..f8867b255c56 100644 --- a/gluten-data/src/main/scala/org/apache/spark/shuffle/ColumnarShuffleWriter.scala +++ b/gluten-data/src/main/scala/org/apache/spark/shuffle/ColumnarShuffleWriter.scala @@ -16,13 +16,13 @@ */ package org.apache.spark.shuffle -import io.glutenproject.GlutenConfig -import io.glutenproject.columnarbatch.ColumnarBatches -import io.glutenproject.memory.memtarget.MemoryTarget -import io.glutenproject.memory.memtarget.Spiller -import io.glutenproject.memory.memtarget.Spillers -import io.glutenproject.memory.nmm.NativeMemoryManagers -import io.glutenproject.vectorized._ +import org.apache.gluten.GlutenConfig +import org.apache.gluten.columnarbatch.ColumnarBatches +import org.apache.gluten.memory.memtarget.MemoryTarget +import org.apache.gluten.memory.memtarget.Spiller +import org.apache.gluten.memory.memtarget.Spillers +import org.apache.gluten.memory.nmm.NativeMemoryManagers +import org.apache.gluten.vectorized._ import org.apache.spark._ import org.apache.spark.internal.Logging diff --git a/gluten-data/src/main/scala/org/apache/spark/sql/execution/ColumnarBuildSideRelation.scala b/gluten-data/src/main/scala/org/apache/spark/sql/execution/ColumnarBuildSideRelation.scala index a4cd37172343..c3e39d834d91 100644 --- a/gluten-data/src/main/scala/org/apache/spark/sql/execution/ColumnarBuildSideRelation.scala +++ b/gluten-data/src/main/scala/org/apache/spark/sql/execution/ColumnarBuildSideRelation.scala @@ -16,13 +16,13 @@ */ package org.apache.spark.sql.execution -import io.glutenproject.columnarbatch.ColumnarBatches -import io.glutenproject.exec.Runtimes -import io.glutenproject.memory.arrowalloc.ArrowBufferAllocators -import io.glutenproject.memory.nmm.NativeMemoryManagers -import io.glutenproject.sql.shims.SparkShimLoader -import io.glutenproject.utils.{ArrowAbiUtil, Iterators} -import io.glutenproject.vectorized.{ColumnarBatchSerializerJniWrapper, NativeColumnarToRowJniWrapper} +import org.apache.gluten.columnarbatch.ColumnarBatches +import org.apache.gluten.exec.Runtimes +import org.apache.gluten.memory.arrowalloc.ArrowBufferAllocators +import org.apache.gluten.memory.nmm.NativeMemoryManagers +import org.apache.gluten.sql.shims.SparkShimLoader +import org.apache.gluten.utils.{ArrowAbiUtil, Iterators} +import org.apache.gluten.vectorized.{ColumnarBatchSerializerJniWrapper, NativeColumnarToRowJniWrapper} import org.apache.spark.sql.catalyst.InternalRow import org.apache.spark.sql.catalyst.expressions.{Attribute, AttributeReference, BoundReference, Expression, UnsafeProjection, UnsafeRow} diff --git a/gluten-data/src/main/scala/org/apache/spark/sql/execution/utils/ExecUtil.scala b/gluten-data/src/main/scala/org/apache/spark/sql/execution/utils/ExecUtil.scala index 2ce4ffd741f8..25a2938a89aa 100644 --- a/gluten-data/src/main/scala/org/apache/spark/sql/execution/utils/ExecUtil.scala +++ b/gluten-data/src/main/scala/org/apache/spark/sql/execution/utils/ExecUtil.scala @@ -16,11 +16,11 @@ */ package org.apache.spark.sql.execution.utils -import io.glutenproject.columnarbatch.ColumnarBatches -import io.glutenproject.memory.arrowalloc.ArrowBufferAllocators -import io.glutenproject.memory.nmm.NativeMemoryManagers -import io.glutenproject.utils.Iterators -import io.glutenproject.vectorized.{ArrowWritableColumnVector, NativeColumnarToRowInfo, NativeColumnarToRowJniWrapper, NativePartitioning} +import org.apache.gluten.columnarbatch.ColumnarBatches +import org.apache.gluten.memory.arrowalloc.ArrowBufferAllocators +import org.apache.gluten.memory.nmm.NativeMemoryManagers +import org.apache.gluten.utils.Iterators +import org.apache.gluten.vectorized.{ArrowWritableColumnVector, NativeColumnarToRowInfo, NativeColumnarToRowJniWrapper, NativePartitioning} import org.apache.spark.{Partitioner, RangePartitioner, ShuffleDependency} import org.apache.spark.rdd.RDD diff --git a/gluten-data/src/main/scala/org/apache/spark/sql/utils/SparkVectorUtil.scala b/gluten-data/src/main/scala/org/apache/spark/sql/utils/SparkVectorUtil.scala index 1c49395b2836..208afd294920 100644 --- a/gluten-data/src/main/scala/org/apache/spark/sql/utils/SparkVectorUtil.scala +++ b/gluten-data/src/main/scala/org/apache/spark/sql/utils/SparkVectorUtil.scala @@ -16,9 +16,9 @@ */ package org.apache.spark.sql.utils -import io.glutenproject.columnarbatch.ColumnarBatches -import io.glutenproject.memory.arrowalloc.ArrowBufferAllocators -import io.glutenproject.vectorized.ArrowWritableColumnVector +import org.apache.gluten.columnarbatch.ColumnarBatches +import org.apache.gluten.memory.arrowalloc.ArrowBufferAllocators +import org.apache.gluten.vectorized.ArrowWritableColumnVector import org.apache.spark.sql.vectorized.ColumnarBatch diff --git a/gluten-delta/pom.xml b/gluten-delta/pom.xml index 833fba4af528..5585dc0c5abe 100755 --- a/gluten-delta/pom.xml +++ b/gluten-delta/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> gluten-parent - io.glutenproject + org.apache.gluten 1.2.0-SNAPSHOT ../pom.xml @@ -20,7 +20,7 @@ - io.glutenproject + org.apache.gluten gluten-core ${project.version} provided @@ -43,20 +43,20 @@ - io.glutenproject + org.apache.gluten gluten-core ${project.version} test-jar test - io.glutenproject + org.apache.gluten backends-velox ${project.version} test - io.glutenproject + org.apache.gluten backends-velox ${project.version} test-jar diff --git a/gluten-delta/src/main/resources/META-INF/services/io.glutenproject.execution.DataSourceScanTransformerRegister b/gluten-delta/src/main/resources/META-INF/services/io.glutenproject.execution.DataSourceScanTransformerRegister deleted file mode 100644 index 72ef14a97481..000000000000 --- a/gluten-delta/src/main/resources/META-INF/services/io.glutenproject.execution.DataSourceScanTransformerRegister +++ /dev/null @@ -1 +0,0 @@ -io.glutenproject.execution.DeltaScanTransformerProvider \ No newline at end of file diff --git a/gluten-delta/src/main/resources/META-INF/services/io.glutenproject.extension.columnar.RewriteTransformerRules b/gluten-delta/src/main/resources/META-INF/services/io.glutenproject.extension.columnar.RewriteTransformerRules deleted file mode 100644 index d4a43f34613d..000000000000 --- a/gluten-delta/src/main/resources/META-INF/services/io.glutenproject.extension.columnar.RewriteTransformerRules +++ /dev/null @@ -1 +0,0 @@ -io.glutenproject.extension.DeltaRewriteTransformerRules \ No newline at end of file diff --git a/gluten-delta/src/main/resources/META-INF/services/org.apache.gluten.execution.DataSourceScanTransformerRegister b/gluten-delta/src/main/resources/META-INF/services/org.apache.gluten.execution.DataSourceScanTransformerRegister new file mode 100644 index 000000000000..9613b83ffeab --- /dev/null +++ b/gluten-delta/src/main/resources/META-INF/services/org.apache.gluten.execution.DataSourceScanTransformerRegister @@ -0,0 +1 @@ +org.apache.gluten.execution.DeltaScanTransformerProvider \ No newline at end of file diff --git a/gluten-delta/src/main/resources/META-INF/services/org.apache.gluten.extension.columnar.RewriteTransformerRules b/gluten-delta/src/main/resources/META-INF/services/org.apache.gluten.extension.columnar.RewriteTransformerRules new file mode 100644 index 000000000000..a598d1208a76 --- /dev/null +++ b/gluten-delta/src/main/resources/META-INF/services/org.apache.gluten.extension.columnar.RewriteTransformerRules @@ -0,0 +1 @@ +org.apache.gluten.extension.DeltaRewriteTransformerRules \ No newline at end of file diff --git a/gluten-delta/src/main/scala/io/glutenproject/execution/DeltaScanTransformer.scala b/gluten-delta/src/main/scala/org/apache/gluten/execution/DeltaScanTransformer.scala similarity index 95% rename from gluten-delta/src/main/scala/io/glutenproject/execution/DeltaScanTransformer.scala rename to gluten-delta/src/main/scala/org/apache/gluten/execution/DeltaScanTransformer.scala index 70d1889f02b3..16b764146ec1 100644 --- a/gluten-delta/src/main/scala/io/glutenproject/execution/DeltaScanTransformer.scala +++ b/gluten-delta/src/main/scala/org/apache/gluten/execution/DeltaScanTransformer.scala @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution +package org.apache.gluten.execution -import io.glutenproject.extension.ValidationResult -import io.glutenproject.substrait.rel.LocalFilesNode.ReadFileFormat +import org.apache.gluten.extension.ValidationResult +import org.apache.gluten.substrait.rel.LocalFilesNode.ReadFileFormat import org.apache.spark.sql.catalyst.TableIdentifier import org.apache.spark.sql.catalyst.expressions.{Attribute, Expression} diff --git a/gluten-delta/src/main/scala/io/glutenproject/execution/DeltaScanTransformerProvider.scala b/gluten-delta/src/main/scala/org/apache/gluten/execution/DeltaScanTransformerProvider.scala similarity index 97% rename from gluten-delta/src/main/scala/io/glutenproject/execution/DeltaScanTransformerProvider.scala rename to gluten-delta/src/main/scala/org/apache/gluten/execution/DeltaScanTransformerProvider.scala index 3f00ed183bcd..a7cecde7c0db 100644 --- a/gluten-delta/src/main/scala/io/glutenproject/execution/DeltaScanTransformerProvider.scala +++ b/gluten-delta/src/main/scala/org/apache/gluten/execution/DeltaScanTransformerProvider.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution +package org.apache.gluten.execution import org.apache.spark.sql.catalyst.expressions.Expression import org.apache.spark.sql.execution.FileSourceScanExec diff --git a/gluten-delta/src/main/scala/io/glutenproject/extension/DeltaRewriteTransformerRules.scala b/gluten-delta/src/main/scala/org/apache/gluten/extension/DeltaRewriteTransformerRules.scala similarity index 94% rename from gluten-delta/src/main/scala/io/glutenproject/extension/DeltaRewriteTransformerRules.scala rename to gluten-delta/src/main/scala/org/apache/gluten/extension/DeltaRewriteTransformerRules.scala index 2d1d3916dbaa..76eb53dbd022 100644 --- a/gluten-delta/src/main/scala/io/glutenproject/extension/DeltaRewriteTransformerRules.scala +++ b/gluten-delta/src/main/scala/org/apache/gluten/extension/DeltaRewriteTransformerRules.scala @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.extension +package org.apache.gluten.extension -import io.glutenproject.execution.{DeltaScanTransformer, ProjectExecTransformer} -import io.glutenproject.extension.DeltaRewriteTransformerRules.columnMappingRule -import io.glutenproject.extension.columnar.RewriteTransformerRules +import org.apache.gluten.execution.{DeltaScanTransformer, ProjectExecTransformer} +import org.apache.gluten.extension.DeltaRewriteTransformerRules.columnMappingRule +import org.apache.gluten.extension.columnar.RewriteTransformerRules import org.apache.spark.sql.SparkSession import org.apache.spark.sql.catalyst.expressions.{Alias, Attribute, AttributeReference} @@ -37,7 +37,7 @@ class DeltaRewriteTransformerRules extends RewriteTransformerRules { object DeltaRewriteTransformerRules { private val COLUMN_MAPPING_RULE_TAG: TreeNodeTag[String] = - TreeNodeTag[String]("io.glutenproject.delta.column.mapping") + TreeNodeTag[String]("org.apache.gluten.delta.column.mapping") private def notAppliedColumnMappingRule(plan: SparkPlan): Boolean = { plan.getTagValue(COLUMN_MAPPING_RULE_TAG).isEmpty diff --git a/gluten-delta/src/test/scala/io/glutenproject/execution/VeloxDeltaSuite.scala b/gluten-delta/src/test/scala/org/apache/gluten/execution/VeloxDeltaSuite.scala similarity index 99% rename from gluten-delta/src/test/scala/io/glutenproject/execution/VeloxDeltaSuite.scala rename to gluten-delta/src/test/scala/org/apache/gluten/execution/VeloxDeltaSuite.scala index 0632d3e24385..fc483e77178d 100644 --- a/gluten-delta/src/test/scala/io/glutenproject/execution/VeloxDeltaSuite.scala +++ b/gluten-delta/src/test/scala/org/apache/gluten/execution/VeloxDeltaSuite.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution +package org.apache.gluten.execution import org.apache.spark.SparkConf import org.apache.spark.sql.Row diff --git a/gluten-delta/src/test/scala/io/glutenproject/execution/VeloxTPCHDeltaSuite.scala b/gluten-delta/src/test/scala/org/apache/gluten/execution/VeloxTPCHDeltaSuite.scala similarity index 98% rename from gluten-delta/src/test/scala/io/glutenproject/execution/VeloxTPCHDeltaSuite.scala rename to gluten-delta/src/test/scala/org/apache/gluten/execution/VeloxTPCHDeltaSuite.scala index 0a6e3083ae6b..60ea0fbcc83c 100644 --- a/gluten-delta/src/test/scala/io/glutenproject/execution/VeloxTPCHDeltaSuite.scala +++ b/gluten-delta/src/test/scala/org/apache/gluten/execution/VeloxTPCHDeltaSuite.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution +package org.apache.gluten.execution import org.apache.spark.SparkConf diff --git a/gluten-iceberg/pom.xml b/gluten-iceberg/pom.xml index b57c753fe99d..773fac30d195 100644 --- a/gluten-iceberg/pom.xml +++ b/gluten-iceberg/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> gluten-parent - io.glutenproject + org.apache.gluten 1.2.0-SNAPSHOT ../pom.xml @@ -20,7 +20,7 @@ - io.glutenproject + org.apache.gluten gluten-core ${project.version} provided @@ -44,20 +44,20 @@ - io.glutenproject + org.apache.gluten gluten-core ${project.version} test-jar test - io.glutenproject + org.apache.gluten backends-velox ${project.version} test - io.glutenproject + org.apache.gluten backends-velox ${project.version} test-jar diff --git a/gluten-iceberg/src/main/java/io/glutenproject/substrait/rel/IcebergLocalFilesBuilder.java b/gluten-iceberg/src/main/java/org/apache/gluten/substrait/rel/IcebergLocalFilesBuilder.java similarity index 97% rename from gluten-iceberg/src/main/java/io/glutenproject/substrait/rel/IcebergLocalFilesBuilder.java rename to gluten-iceberg/src/main/java/org/apache/gluten/substrait/rel/IcebergLocalFilesBuilder.java index b6ee7058035c..ae124b731ccc 100644 --- a/gluten-iceberg/src/main/java/io/glutenproject/substrait/rel/IcebergLocalFilesBuilder.java +++ b/gluten-iceberg/src/main/java/org/apache/gluten/substrait/rel/IcebergLocalFilesBuilder.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.substrait.rel; +package org.apache.gluten.substrait.rel; import org.apache.iceberg.DeleteFile; diff --git a/gluten-iceberg/src/main/java/io/glutenproject/substrait/rel/IcebergLocalFilesNode.java b/gluten-iceberg/src/main/java/org/apache/gluten/substrait/rel/IcebergLocalFilesNode.java similarity index 98% rename from gluten-iceberg/src/main/java/io/glutenproject/substrait/rel/IcebergLocalFilesNode.java rename to gluten-iceberg/src/main/java/org/apache/gluten/substrait/rel/IcebergLocalFilesNode.java index e25cd5a98942..7d065f105a43 100644 --- a/gluten-iceberg/src/main/java/io/glutenproject/substrait/rel/IcebergLocalFilesNode.java +++ b/gluten-iceberg/src/main/java/org/apache/gluten/substrait/rel/IcebergLocalFilesNode.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.substrait.rel; +package org.apache.gluten.substrait.rel; -import io.glutenproject.GlutenConfig; +import org.apache.gluten.GlutenConfig; import io.substrait.proto.ReadRel; import org.apache.iceberg.DeleteFile; diff --git a/gluten-iceberg/src/main/resources/META-INF/services/io.glutenproject.execution.DataSourceScanTransformerRegister b/gluten-iceberg/src/main/resources/META-INF/services/io.glutenproject.execution.DataSourceScanTransformerRegister deleted file mode 100644 index 658967bb99b6..000000000000 --- a/gluten-iceberg/src/main/resources/META-INF/services/io.glutenproject.execution.DataSourceScanTransformerRegister +++ /dev/null @@ -1 +0,0 @@ -io.glutenproject.execution.IcebergTransformerProvider \ No newline at end of file diff --git a/gluten-iceberg/src/main/resources/META-INF/services/org.apache.gluten.execution.DataSourceScanTransformerRegister b/gluten-iceberg/src/main/resources/META-INF/services/org.apache.gluten.execution.DataSourceScanTransformerRegister new file mode 100644 index 000000000000..904608211fc3 --- /dev/null +++ b/gluten-iceberg/src/main/resources/META-INF/services/org.apache.gluten.execution.DataSourceScanTransformerRegister @@ -0,0 +1 @@ +org.apache.gluten.execution.IcebergTransformerProvider \ No newline at end of file diff --git a/gluten-iceberg/src/main/scala/io/glutenproject/execution/IcebergScanTransformer.scala b/gluten-iceberg/src/main/scala/org/apache/gluten/execution/IcebergScanTransformer.scala similarity index 94% rename from gluten-iceberg/src/main/scala/io/glutenproject/execution/IcebergScanTransformer.scala rename to gluten-iceberg/src/main/scala/org/apache/gluten/execution/IcebergScanTransformer.scala index fdb82f23e6c8..303a9d79b953 100644 --- a/gluten-iceberg/src/main/scala/io/glutenproject/execution/IcebergScanTransformer.scala +++ b/gluten-iceberg/src/main/scala/org/apache/gluten/execution/IcebergScanTransformer.scala @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution +package org.apache.gluten.execution -import io.glutenproject.sql.shims.SparkShimLoader -import io.glutenproject.substrait.rel.LocalFilesNode.ReadFileFormat -import io.glutenproject.substrait.rel.SplitInfo +import org.apache.gluten.sql.shims.SparkShimLoader +import org.apache.gluten.substrait.rel.LocalFilesNode.ReadFileFormat +import org.apache.gluten.substrait.rel.SplitInfo import org.apache.spark.sql.catalyst.InternalRow import org.apache.spark.sql.catalyst.expressions.{AttributeReference, DynamicPruningExpression, Expression, Literal} diff --git a/gluten-iceberg/src/main/scala/io/glutenproject/execution/IcebergTransformerProvider.scala b/gluten-iceberg/src/main/scala/org/apache/gluten/execution/IcebergTransformerProvider.scala similarity index 97% rename from gluten-iceberg/src/main/scala/io/glutenproject/execution/IcebergTransformerProvider.scala rename to gluten-iceberg/src/main/scala/org/apache/gluten/execution/IcebergTransformerProvider.scala index 51508429ba87..1ebeebf00be0 100644 --- a/gluten-iceberg/src/main/scala/io/glutenproject/execution/IcebergTransformerProvider.scala +++ b/gluten-iceberg/src/main/scala/org/apache/gluten/execution/IcebergTransformerProvider.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution +package org.apache.gluten.execution import org.apache.spark.sql.catalyst.expressions.Expression import org.apache.spark.sql.execution.datasources.v2.BatchScanExec diff --git a/gluten-iceberg/src/main/scala/org/apache/iceberg/spark/source/GlutenIcebergSourceUtil.scala b/gluten-iceberg/src/main/scala/org/apache/iceberg/spark/source/GlutenIcebergSourceUtil.scala index e85c9f58a783..6c058514931b 100644 --- a/gluten-iceberg/src/main/scala/org/apache/iceberg/spark/source/GlutenIcebergSourceUtil.scala +++ b/gluten-iceberg/src/main/scala/org/apache/iceberg/spark/source/GlutenIcebergSourceUtil.scala @@ -16,8 +16,8 @@ */ package org.apache.iceberg.spark.source -import io.glutenproject.substrait.rel.{IcebergLocalFilesBuilder, SplitInfo} -import io.glutenproject.substrait.rel.LocalFilesNode.ReadFileFormat +import org.apache.gluten.substrait.rel.{IcebergLocalFilesBuilder, SplitInfo} +import org.apache.gluten.substrait.rel.LocalFilesNode.ReadFileFormat import org.apache.spark.softaffinity.SoftAffinity import org.apache.spark.sql.catalyst.catalog.ExternalCatalogUtils diff --git a/gluten-iceberg/src/test/scala/io/glutenproject/execution/VeloxIcebergSuite.scala b/gluten-iceberg/src/test/scala/org/apache/gluten/execution/VeloxIcebergSuite.scala similarity index 99% rename from gluten-iceberg/src/test/scala/io/glutenproject/execution/VeloxIcebergSuite.scala rename to gluten-iceberg/src/test/scala/org/apache/gluten/execution/VeloxIcebergSuite.scala index ec8f6304464e..5299413579a3 100644 --- a/gluten-iceberg/src/test/scala/io/glutenproject/execution/VeloxIcebergSuite.scala +++ b/gluten-iceberg/src/test/scala/org/apache/gluten/execution/VeloxIcebergSuite.scala @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution +package org.apache.gluten.execution -import io.glutenproject.GlutenConfig +import org.apache.gluten.GlutenConfig import org.apache.spark.SparkConf import org.apache.spark.sql.Row diff --git a/gluten-iceberg/src/test/scala/io/glutenproject/execution/VeloxTPCHIcebergSuite.scala b/gluten-iceberg/src/test/scala/org/apache/gluten/execution/VeloxTPCHIcebergSuite.scala similarity index 99% rename from gluten-iceberg/src/test/scala/io/glutenproject/execution/VeloxTPCHIcebergSuite.scala rename to gluten-iceberg/src/test/scala/org/apache/gluten/execution/VeloxTPCHIcebergSuite.scala index 6d4c0e566311..f4eead2a193c 100644 --- a/gluten-iceberg/src/test/scala/io/glutenproject/execution/VeloxTPCHIcebergSuite.scala +++ b/gluten-iceberg/src/test/scala/org/apache/gluten/execution/VeloxTPCHIcebergSuite.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution +package org.apache.gluten.execution import org.apache.spark.SparkConf diff --git a/gluten-ui/pom.xml b/gluten-ui/pom.xml index 7ccea38cfa37..d185bb6bf055 100644 --- a/gluten-ui/pom.xml +++ b/gluten-ui/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - io.glutenproject + org.apache.gluten gluten-parent 1.2.0-SNAPSHOT diff --git a/gluten-ui/src/main/scala/io/glutenproject/events/GlutenEvent.scala b/gluten-ui/src/main/scala/org/apache/gluten/events/GlutenEvent.scala similarity index 98% rename from gluten-ui/src/main/scala/io/glutenproject/events/GlutenEvent.scala rename to gluten-ui/src/main/scala/org/apache/gluten/events/GlutenEvent.scala index 6849d5af2a05..41bbd9935735 100644 --- a/gluten-ui/src/main/scala/io/glutenproject/events/GlutenEvent.scala +++ b/gluten-ui/src/main/scala/org/apache/gluten/events/GlutenEvent.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.events +package org.apache.gluten.events import org.apache.spark.scheduler.SparkListenerEvent diff --git a/gluten-ui/src/main/scala/org/apache/spark/sql/execution/ui/GlutenEventUtils.scala b/gluten-ui/src/main/scala/org/apache/spark/sql/execution/ui/GlutenEventUtils.scala index 50d1ac43630b..2d61f0c4b366 100644 --- a/gluten-ui/src/main/scala/org/apache/spark/sql/execution/ui/GlutenEventUtils.scala +++ b/gluten-ui/src/main/scala/org/apache/spark/sql/execution/ui/GlutenEventUtils.scala @@ -16,7 +16,7 @@ */ package org.apache.spark.sql.execution.ui -import io.glutenproject.events.GlutenEvent +import org.apache.gluten.events.GlutenEvent import org.apache.spark.SparkContext import org.apache.spark.status.ElementTrackingStore diff --git a/gluten-ui/src/main/scala/org/apache/spark/sql/execution/ui/GlutenSQLAppStatusListener.scala b/gluten-ui/src/main/scala/org/apache/spark/sql/execution/ui/GlutenSQLAppStatusListener.scala index 8ca7cc342b04..7c236b4e8881 100644 --- a/gluten-ui/src/main/scala/org/apache/spark/sql/execution/ui/GlutenSQLAppStatusListener.scala +++ b/gluten-ui/src/main/scala/org/apache/spark/sql/execution/ui/GlutenSQLAppStatusListener.scala @@ -16,7 +16,7 @@ */ package org.apache.spark.sql.execution.ui -import io.glutenproject.events.{GlutenBuildInfoEvent, GlutenPlanFallbackEvent} +import org.apache.gluten.events.{GlutenBuildInfoEvent, GlutenPlanFallbackEvent} import org.apache.spark.SparkConf import org.apache.spark.internal.Logging diff --git a/gluten-ut/common/pom.xml b/gluten-ut/common/pom.xml index 96f54435d64f..b40137bafd96 100644 --- a/gluten-ut/common/pom.xml +++ b/gluten-ut/common/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> gluten-ut - io.glutenproject + org.apache.gluten 1.2.0-SNAPSHOT ../pom.xml @@ -16,7 +16,7 @@ - io.glutenproject + org.apache.gluten spark-sql-columnar-shims-common ${project.version} provided diff --git a/gluten-ut/common/src/test/scala/io/glutenproject/utils/BackendTestSettings.scala b/gluten-ut/common/src/test/scala/org/apache/gluten/utils/BackendTestSettings.scala similarity index 97% rename from gluten-ut/common/src/test/scala/io/glutenproject/utils/BackendTestSettings.scala rename to gluten-ut/common/src/test/scala/org/apache/gluten/utils/BackendTestSettings.scala index 1117d0186afe..fe8d4678dcc8 100644 --- a/gluten-ut/common/src/test/scala/io/glutenproject/utils/BackendTestSettings.scala +++ b/gluten-ut/common/src/test/scala/org/apache/gluten/utils/BackendTestSettings.scala @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.utils +package org.apache.gluten.utils -import io.glutenproject.test.TestStats +import org.apache.gluten.test.TestStats import org.apache.spark.sql.GlutenTestConstants.GLUTEN_TEST @@ -199,13 +199,13 @@ object BackendTestSettings { if (BackendTestUtils.isCHBackendLoaded()) { // scalastyle:off classforname Class - .forName("io.glutenproject.utils.clickhouse.ClickHouseTestSettings") + .forName("org.apache.gluten.utils.clickhouse.ClickHouseTestSettings") .getDeclaredConstructor() .newInstance() .asInstanceOf[BackendTestSettings] } else if (BackendTestUtils.isVeloxBackendLoaded()) { Class - .forName("io.glutenproject.utils.velox.VeloxTestSettings") + .forName("org.apache.gluten.utils.velox.VeloxTestSettings") .getDeclaredConstructor() .newInstance() .asInstanceOf[BackendTestSettings] diff --git a/gluten-ut/common/src/test/scala/io/glutenproject/utils/BackendTestUtils.scala b/gluten-ut/common/src/test/scala/org/apache/gluten/utils/BackendTestUtils.scala similarity index 94% rename from gluten-ut/common/src/test/scala/io/glutenproject/utils/BackendTestUtils.scala rename to gluten-ut/common/src/test/scala/org/apache/gluten/utils/BackendTestUtils.scala index 7fdd0ac80d12..76353166101f 100644 --- a/gluten-ut/common/src/test/scala/io/glutenproject/utils/BackendTestUtils.scala +++ b/gluten-ut/common/src/test/scala/org/apache/gluten/utils/BackendTestUtils.scala @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.utils +package org.apache.gluten.utils -import io.glutenproject.backendsapi.BackendsApiManager +import org.apache.gluten.backendsapi.BackendsApiManager // FIXME: We mixed the use of "Utils" and "Util" in utility class naming // FIXME: The utility methods "is...BackendLoaded" stands because we rely diff --git a/gluten-ut/common/src/test/scala/io/glutenproject/utils/SQLQueryTestSettings.scala b/gluten-ut/common/src/test/scala/org/apache/gluten/utils/SQLQueryTestSettings.scala similarity index 96% rename from gluten-ut/common/src/test/scala/io/glutenproject/utils/SQLQueryTestSettings.scala rename to gluten-ut/common/src/test/scala/org/apache/gluten/utils/SQLQueryTestSettings.scala index a6636f63a965..36d21e899313 100644 --- a/gluten-ut/common/src/test/scala/io/glutenproject/utils/SQLQueryTestSettings.scala +++ b/gluten-ut/common/src/test/scala/org/apache/gluten/utils/SQLQueryTestSettings.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.utils +package org.apache.gluten.utils trait SQLQueryTestSettings { def getSupportedSQLQueryTests: Set[String] diff --git a/gluten-ut/common/src/test/scala/io/glutenproject/utils/SystemParameters.scala b/gluten-ut/common/src/test/scala/org/apache/gluten/utils/SystemParameters.scala similarity index 97% rename from gluten-ut/common/src/test/scala/io/glutenproject/utils/SystemParameters.scala rename to gluten-ut/common/src/test/scala/org/apache/gluten/utils/SystemParameters.scala index 79af0fc88b3f..71fc26227baa 100644 --- a/gluten-ut/common/src/test/scala/io/glutenproject/utils/SystemParameters.scala +++ b/gluten-ut/common/src/test/scala/org/apache/gluten/utils/SystemParameters.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.utils +package org.apache.gluten.utils object SystemParameters { diff --git a/gluten-ut/common/src/test/scala/org/apache/spark/sql/DummyFilterColmnarHelper.scala b/gluten-ut/common/src/test/scala/org/apache/spark/sql/DummyFilterColmnarHelper.scala index 7641fc27915d..80b98e3bc4d8 100644 --- a/gluten-ut/common/src/test/scala/org/apache/spark/sql/DummyFilterColmnarHelper.scala +++ b/gluten-ut/common/src/test/scala/org/apache/spark/sql/DummyFilterColmnarHelper.scala @@ -16,8 +16,8 @@ */ package org.apache.spark.sql -import io.glutenproject.GlutenConfig -import io.glutenproject.utils.{BackendTestUtils, SystemParameters} +import org.apache.gluten.GlutenConfig +import org.apache.gluten.utils.{BackendTestUtils, SystemParameters} import org.apache.spark.rdd.RDD import org.apache.spark.sql.catalyst.InternalRow @@ -84,7 +84,7 @@ object DummyFilterColmnarHelper { .config("spark.driver.memory", "1G") .config("spark.memory.offHeap.enabled", "true") .config("spark.memory.offHeap.size", "1024MB") - .config("spark.plugins", "io.glutenproject.GlutenPlugin") + .config("spark.plugins", "org.apache.gluten.GlutenPlugin") .config("spark.shuffle.manager", "org.apache.spark.shuffle.sort.ColumnarShuffleManager") .config(GlutenConfig.GLUTEN_LIB_PATH, SystemParameters.getClickHouseLibPath) .config("spark.io.compression.codec", "LZ4") @@ -96,7 +96,7 @@ object DummyFilterColmnarHelper { .config("spark.driver.memory", "1G") .config("spark.memory.offHeap.enabled", "true") .config("spark.memory.offHeap.size", "1024MB") - .config("spark.plugins", "io.glutenproject.GlutenPlugin") + .config("spark.plugins", "org.apache.gluten.GlutenPlugin") .config("spark.shuffle.manager", "org.apache.spark.shuffle.sort.ColumnarShuffleManager") } builders.foreach(builder.withExtensions) diff --git a/gluten-ut/common/src/test/scala/org/apache/spark/sql/GlutenSQLTestsBaseTrait.scala b/gluten-ut/common/src/test/scala/org/apache/spark/sql/GlutenSQLTestsBaseTrait.scala index 5cd9f3e9c9ad..956cc67d4c03 100644 --- a/gluten-ut/common/src/test/scala/org/apache/spark/sql/GlutenSQLTestsBaseTrait.scala +++ b/gluten-ut/common/src/test/scala/org/apache/spark/sql/GlutenSQLTestsBaseTrait.scala @@ -16,8 +16,8 @@ */ package org.apache.spark.sql -import io.glutenproject.GlutenConfig -import io.glutenproject.utils.{BackendTestUtils, SystemParameters} +import org.apache.gluten.GlutenConfig +import org.apache.gluten.utils.{BackendTestUtils, SystemParameters} import org.apache.spark.SparkConf import org.apache.spark.sql.GlutenTestConstants.GLUTEN_TEST @@ -106,7 +106,7 @@ object GlutenSQLTestsBaseTrait { .set("spark.sql.files.maxPartitionBytes", "134217728") .set("spark.memory.offHeap.enabled", "true") .set("spark.memory.offHeap.size", "1024MB") - .set("spark.plugins", "io.glutenproject.GlutenPlugin") + .set("spark.plugins", "org.apache.gluten.GlutenPlugin") .set("spark.shuffle.manager", "org.apache.spark.shuffle.sort.ColumnarShuffleManager") .set("spark.sql.warehouse.dir", warehouse) .set("spark.ui.enabled", "false") diff --git a/gluten-ut/common/src/test/scala/org/apache/spark/sql/GlutenSQLTestsTrait.scala b/gluten-ut/common/src/test/scala/org/apache/spark/sql/GlutenSQLTestsTrait.scala index 8433bbf8de9f..7ca91786a408 100644 --- a/gluten-ut/common/src/test/scala/org/apache/spark/sql/GlutenSQLTestsTrait.scala +++ b/gluten-ut/common/src/test/scala/org/apache/spark/sql/GlutenSQLTestsTrait.scala @@ -16,7 +16,7 @@ */ package org.apache.spark.sql -import io.glutenproject.sql.shims.SparkShimLoader +import org.apache.gluten.sql.shims.SparkShimLoader import org.apache.spark.sql.catalyst.plans.logical import org.apache.spark.sql.catalyst.util.{sideBySide, stackTraceToString} diff --git a/gluten-ut/common/src/test/scala/org/apache/spark/sql/GlutenTestsBaseTrait.scala b/gluten-ut/common/src/test/scala/org/apache/spark/sql/GlutenTestsBaseTrait.scala index a1fa64a28e10..7c6dcbbee83d 100644 --- a/gluten-ut/common/src/test/scala/org/apache/spark/sql/GlutenTestsBaseTrait.scala +++ b/gluten-ut/common/src/test/scala/org/apache/spark/sql/GlutenTestsBaseTrait.scala @@ -16,7 +16,7 @@ */ package org.apache.spark.sql -import io.glutenproject.utils.BackendTestSettings +import org.apache.gluten.utils.BackendTestSettings trait GlutenTestsBaseTrait { diff --git a/gluten-ut/common/src/test/scala/org/apache/spark/sql/GlutenTestsCommonTrait.scala b/gluten-ut/common/src/test/scala/org/apache/spark/sql/GlutenTestsCommonTrait.scala index 83113b99f5e4..a821fbda3975 100644 --- a/gluten-ut/common/src/test/scala/org/apache/spark/sql/GlutenTestsCommonTrait.scala +++ b/gluten-ut/common/src/test/scala/org/apache/spark/sql/GlutenTestsCommonTrait.scala @@ -16,7 +16,7 @@ */ package org.apache.spark.sql -import io.glutenproject.test.TestStats +import org.apache.gluten.test.TestStats import org.apache.spark.SparkFunSuite import org.apache.spark.sql.GlutenTestConstants.GLUTEN_TEST diff --git a/gluten-ut/common/src/test/scala/org/apache/spark/sql/GlutenTestsTrait.scala b/gluten-ut/common/src/test/scala/org/apache/spark/sql/GlutenTestsTrait.scala index 60aad9b2b111..494b67573a1a 100644 --- a/gluten-ut/common/src/test/scala/org/apache/spark/sql/GlutenTestsTrait.scala +++ b/gluten-ut/common/src/test/scala/org/apache/spark/sql/GlutenTestsTrait.scala @@ -16,11 +16,11 @@ */ package org.apache.spark.sql -import io.glutenproject.GlutenConfig -import io.glutenproject.backendsapi.BackendsApiManager -import io.glutenproject.execution.ProjectExecTransformer -import io.glutenproject.test.TestStats -import io.glutenproject.utils.{BackendTestUtils, SystemParameters} +import org.apache.gluten.GlutenConfig +import org.apache.gluten.backendsapi.BackendsApiManager +import org.apache.gluten.execution.ProjectExecTransformer +import org.apache.gluten.test.TestStats +import org.apache.gluten.utils.{BackendTestUtils, SystemParameters} import org.apache.spark.sql.GlutenQueryTestUtil.isNaNOrInf import org.apache.spark.sql.catalyst.{CatalystTypeConverters, InternalRow} @@ -101,7 +101,7 @@ trait GlutenTestsTrait extends GlutenTestsCommonTrait { .config("spark.sql.files.maxPartitionBytes", "134217728") .config("spark.memory.offHeap.enabled", "true") .config("spark.memory.offHeap.size", "1024MB") - .config("spark.plugins", "io.glutenproject.GlutenPlugin") + .config("spark.plugins", "org.apache.gluten.GlutenPlugin") .config("spark.shuffle.manager", "org.apache.spark.shuffle.sort.ColumnarShuffleManager") .config("spark.sql.warehouse.dir", warehouse) // Avoid the code size overflow error in Spark code generation. diff --git a/gluten-ut/pom.xml b/gluten-ut/pom.xml index f4f9b694a321..6e7fad18f811 100644 --- a/gluten-ut/pom.xml +++ b/gluten-ut/pom.xml @@ -18,7 +18,7 @@ 4.0.0 - io.glutenproject + org.apache.gluten gluten-parent 1.2.0-SNAPSHOT ../pom.xml @@ -37,7 +37,7 @@ - io.glutenproject + org.apache.gluten gluten-core ${project.version} compile diff --git a/gluten-ut/spark32/pom.xml b/gluten-ut/spark32/pom.xml index 8cbc905f7350..e026bb424129 100644 --- a/gluten-ut/spark32/pom.xml +++ b/gluten-ut/spark32/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> gluten-ut - io.glutenproject + org.apache.gluten 1.2.0-SNAPSHOT ../pom.xml @@ -16,7 +16,7 @@ - io.glutenproject + org.apache.gluten gluten-ut-common ${project.version} compile @@ -32,7 +32,7 @@ - io.glutenproject + org.apache.gluten backends-clickhouse ${project.version} test @@ -52,7 +52,7 @@ - io.glutenproject + org.apache.gluten backends-velox ${project.version} test diff --git a/gluten-ut/spark33/src/test/scala/io/glutenproject/utils/clickhouse/ClickHouseSQLQueryTestSettings.scala b/gluten-ut/spark32/src/test/scala/org/apache/gluten/utils/clickhouse/ClickHouseSQLQueryTestSettings.scala similarity index 91% rename from gluten-ut/spark33/src/test/scala/io/glutenproject/utils/clickhouse/ClickHouseSQLQueryTestSettings.scala rename to gluten-ut/spark32/src/test/scala/org/apache/gluten/utils/clickhouse/ClickHouseSQLQueryTestSettings.scala index 8fb97e282d6f..5d420ff19f89 100644 --- a/gluten-ut/spark33/src/test/scala/io/glutenproject/utils/clickhouse/ClickHouseSQLQueryTestSettings.scala +++ b/gluten-ut/spark32/src/test/scala/org/apache/gluten/utils/clickhouse/ClickHouseSQLQueryTestSettings.scala @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.utils.clickhouse +package org.apache.gluten.utils.clickhouse -import io.glutenproject.utils.SQLQueryTestSettings +import org.apache.gluten.utils.SQLQueryTestSettings object ClickHouseSQLQueryTestSettings extends SQLQueryTestSettings { override def getSupportedSQLQueryTests: Set[String] = Set() diff --git a/gluten-ut/spark32/src/test/scala/io/glutenproject/utils/clickhouse/ClickHouseTestSettings.scala b/gluten-ut/spark32/src/test/scala/org/apache/gluten/utils/clickhouse/ClickHouseTestSettings.scala similarity index 99% rename from gluten-ut/spark32/src/test/scala/io/glutenproject/utils/clickhouse/ClickHouseTestSettings.scala rename to gluten-ut/spark32/src/test/scala/org/apache/gluten/utils/clickhouse/ClickHouseTestSettings.scala index bd2cb26abf56..fbe485849330 100644 --- a/gluten-ut/spark32/src/test/scala/io/glutenproject/utils/clickhouse/ClickHouseTestSettings.scala +++ b/gluten-ut/spark32/src/test/scala/org/apache/gluten/utils/clickhouse/ClickHouseTestSettings.scala @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.utils.clickhouse +package org.apache.gluten.utils.clickhouse -import io.glutenproject.utils.{BackendTestSettings, SQLQueryTestSettings} +import org.apache.gluten.utils.{BackendTestSettings, SQLQueryTestSettings} import org.apache.spark.sql._ import org.apache.spark.sql.GlutenTestConstants.GLUTEN_TEST @@ -52,6 +52,11 @@ class ClickHouseTestSettings extends BackendTestSettings { case "GlutenDataFrameSuite" => !dfCoreDumpCases.contains(testName) case "GlutenDatasetSuite" => !dsSlowCases.contains(testName) case "GlutenSQLQuerySuite" => !sqlQuerySlowCases.contains(testName) + // Below 2 suites temporarily ignored because of gluten domain name change + case "GlutenClickHouseMergeTreeWriteOnHDFSSuite" => + false + case "GlutenClickHouseMergeTreeWriteOnS3Suite" => + false case "GlutenBroadcastJoinSuite" => false case "GlutenDataFrameWriterV2Suite" => diff --git a/gluten-ut/spark32/src/test/scala/io/glutenproject/utils/velox/VeloxSQLQueryTestSettings.scala b/gluten-ut/spark32/src/test/scala/org/apache/gluten/utils/velox/VeloxSQLQueryTestSettings.scala similarity index 98% rename from gluten-ut/spark32/src/test/scala/io/glutenproject/utils/velox/VeloxSQLQueryTestSettings.scala rename to gluten-ut/spark32/src/test/scala/org/apache/gluten/utils/velox/VeloxSQLQueryTestSettings.scala index dd63b1e4cb97..ae5c78c56594 100644 --- a/gluten-ut/spark32/src/test/scala/io/glutenproject/utils/velox/VeloxSQLQueryTestSettings.scala +++ b/gluten-ut/spark32/src/test/scala/org/apache/gluten/utils/velox/VeloxSQLQueryTestSettings.scala @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.utils.velox +package org.apache.gluten.utils.velox -import io.glutenproject.utils.SQLQueryTestSettings +import org.apache.gluten.utils.SQLQueryTestSettings object VeloxSQLQueryTestSettings extends SQLQueryTestSettings { override def getSupportedSQLQueryTests: Set[String] = SUPPORTED_SQL_QUERY_LIST diff --git a/gluten-ut/spark32/src/test/scala/io/glutenproject/utils/velox/VeloxTestSettings.scala b/gluten-ut/spark32/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala similarity index 99% rename from gluten-ut/spark32/src/test/scala/io/glutenproject/utils/velox/VeloxTestSettings.scala rename to gluten-ut/spark32/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala index d7c82cd54d64..ec0dee2afdfd 100644 --- a/gluten-ut/spark32/src/test/scala/io/glutenproject/utils/velox/VeloxTestSettings.scala +++ b/gluten-ut/spark32/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.utils.velox +package org.apache.gluten.utils.velox -import io.glutenproject.utils.{BackendTestSettings, SQLQueryTestSettings} +import org.apache.gluten.utils.{BackendTestSettings, SQLQueryTestSettings} import org.apache.spark.sql._ import org.apache.spark.sql.catalyst.expressions._ diff --git a/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/GlutenDataFrameAggregateSuite.scala b/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/GlutenDataFrameAggregateSuite.scala index 62b0b51664ef..415b9f8908c1 100644 --- a/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/GlutenDataFrameAggregateSuite.scala +++ b/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/GlutenDataFrameAggregateSuite.scala @@ -16,7 +16,7 @@ */ package org.apache.spark.sql -import io.glutenproject.execution.HashAggregateExecBaseTransformer +import org.apache.gluten.execution.HashAggregateExecBaseTransformer import org.apache.spark.sql.execution.WholeStageCodegenExec import org.apache.spark.sql.execution.aggregate.{HashAggregateExec, SortAggregateExec} diff --git a/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/GlutenDataFrameSuite.scala b/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/GlutenDataFrameSuite.scala index 06ca05c88841..50deb211d10d 100644 --- a/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/GlutenDataFrameSuite.scala +++ b/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/GlutenDataFrameSuite.scala @@ -16,7 +16,7 @@ */ package org.apache.spark.sql -import io.glutenproject.execution.{ProjectExecTransformer, WholeStageTransformer} +import org.apache.gluten.execution.{ProjectExecTransformer, WholeStageTransformer} import org.apache.spark.SparkException import org.apache.spark.sql.catalyst.expressions.{EqualTo, Expression} diff --git a/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/GlutenDynamicPartitionPruningSuite.scala b/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/GlutenDynamicPartitionPruningSuite.scala index c056a0e447a6..df43b0b5883e 100644 --- a/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/GlutenDynamicPartitionPruningSuite.scala +++ b/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/GlutenDynamicPartitionPruningSuite.scala @@ -16,9 +16,9 @@ */ package org.apache.spark.sql -import io.glutenproject.GlutenConfig -import io.glutenproject.execution.{BatchScanExecTransformer, FileSourceScanExecTransformer, FilterExecTransformerBase} -import io.glutenproject.utils.BackendTestUtils +import org.apache.gluten.GlutenConfig +import org.apache.gluten.execution.{BatchScanExecTransformer, FileSourceScanExecTransformer, FilterExecTransformerBase} +import org.apache.gluten.utils.BackendTestUtils import org.apache.spark.SparkConf import org.apache.spark.sql.GlutenTestConstants.GLUTEN_TEST @@ -639,7 +639,7 @@ class GlutenDynamicPartitionPruningV1SuiteAEOff // By default Gluten pushes more filters than vanilla Spark. // - // See also io.glutenproject.execution.FilterHandler#applyFilterPushdownToScan + // See also org.apache.gluten.execution.FilterHandler#applyFilterPushdownToScan // See also DynamicPartitionPruningSuite.scala:1362 if (BackendTestUtils.isCHBackendLoaded()) { assert(subqueryIds.size == 2, "Whole plan subquery reusing not working correctly") diff --git a/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/GlutenSQLQuerySuite.scala b/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/GlutenSQLQuerySuite.scala index bdd53d072c62..e5962ea149d7 100644 --- a/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/GlutenSQLQuerySuite.scala +++ b/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/GlutenSQLQuerySuite.scala @@ -16,7 +16,7 @@ */ package org.apache.spark.sql -import io.glutenproject.GlutenConfig +import org.apache.gluten.GlutenConfig import org.apache.spark.SparkException import org.apache.spark.sql.execution.columnar.InMemoryTableScanExec diff --git a/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/GlutenSQLQueryTestSuite.scala b/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/GlutenSQLQueryTestSuite.scala index 2fe170a4a996..4b75ce13c067 100644 --- a/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/GlutenSQLQueryTestSuite.scala +++ b/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/GlutenSQLQueryTestSuite.scala @@ -16,8 +16,8 @@ */ package org.apache.spark.sql -import io.glutenproject.GlutenConfig -import io.glutenproject.utils.{BackendTestSettings, BackendTestUtils, SystemParameters} +import org.apache.gluten.GlutenConfig +import org.apache.gluten.utils.{BackendTestSettings, BackendTestUtils, SystemParameters} import org.apache.spark.SparkConf import org.apache.spark.sql.catalyst.expressions.codegen.CodeGenerator @@ -186,7 +186,7 @@ class GlutenSQLQueryTestSuite .set("spark.sql.files.maxPartitionBytes", "134217728") .set("spark.memory.offHeap.enabled", "true") .set("spark.memory.offHeap.size", "1024MB") - .set("spark.plugins", "io.glutenproject.GlutenPlugin") + .set("spark.plugins", "org.apache.gluten.GlutenPlugin") .set("spark.shuffle.manager", "org.apache.spark.shuffle.sort.ColumnarShuffleManager") if (isCHBackend) { diff --git a/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/GlutenSparkSessionExtensionSuite.scala b/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/GlutenSparkSessionExtensionSuite.scala index 1a73f3f104b1..5e3fed736697 100644 --- a/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/GlutenSparkSessionExtensionSuite.scala +++ b/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/GlutenSparkSessionExtensionSuite.scala @@ -16,7 +16,7 @@ */ package org.apache.spark.sql -import io.glutenproject.GlutenConfig +import org.apache.gluten.GlutenConfig class GlutenSparkSessionExtensionSuite extends SparkSessionExtensionSuite diff --git a/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/GlutenSubquerySuite.scala b/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/GlutenSubquerySuite.scala index cd1b892706ce..f0e766e5ce26 100644 --- a/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/GlutenSubquerySuite.scala +++ b/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/GlutenSubquerySuite.scala @@ -16,7 +16,7 @@ */ package org.apache.spark.sql -import io.glutenproject.execution.{FileSourceScanExecTransformer, WholeStageTransformer} +import org.apache.gluten.execution.{FileSourceScanExecTransformer, WholeStageTransformer} class GlutenSubquerySuite extends SubquerySuite with GlutenSQLTestsTrait { diff --git a/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/execution/FallbackStrategiesSuite.scala b/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/execution/FallbackStrategiesSuite.scala index 6af6949ecf98..5403fe45fd4b 100644 --- a/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/execution/FallbackStrategiesSuite.scala +++ b/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/execution/FallbackStrategiesSuite.scala @@ -16,10 +16,10 @@ */ package org.apache.spark.sql.execution -import io.glutenproject.execution.BasicScanExecTransformer -import io.glutenproject.extension.{ColumnarOverrideRules, GlutenPlan} -import io.glutenproject.extension.columnar.InsertTransitions -import io.glutenproject.utils.QueryPlanSelector +import org.apache.gluten.execution.BasicScanExecTransformer +import org.apache.gluten.extension.{ColumnarOverrideRules, GlutenPlan} +import org.apache.gluten.extension.columnar.InsertTransitions +import org.apache.gluten.utils.QueryPlanSelector import org.apache.spark.rdd.RDD import org.apache.spark.sql.{GlutenSQLTestsTrait, SparkSession} diff --git a/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/execution/GlutenCoalesceShufflePartitionsSuite.scala b/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/execution/GlutenCoalesceShufflePartitionsSuite.scala index d7e5ff9bd985..000a7e2e01d8 100644 --- a/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/execution/GlutenCoalesceShufflePartitionsSuite.scala +++ b/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/execution/GlutenCoalesceShufflePartitionsSuite.scala @@ -50,7 +50,7 @@ class GlutenCoalesceShufflePartitionsSuite .set(SQLConf.ADVISORY_PARTITION_SIZE_IN_BYTES.key, targetPostShuffleInputSize.toString) .set(SQLConf.COALESCE_PARTITIONS_ENABLED.key, "true") // Gluten config - .set("spark.plugins", "io.glutenproject.GlutenPlugin") + .set("spark.plugins", "org.apache.gluten.GlutenPlugin") .set("spark.shuffle.manager", "org.apache.spark.shuffle.sort.ColumnarShuffleManager") .set("spark.memory.offHeap.enabled", "true") .set("spark.memory.offHeap.size", "5g") diff --git a/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/execution/GlutenSQLAggregateFunctionSuite.scala b/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/execution/GlutenSQLAggregateFunctionSuite.scala index 6046142243aa..77d4d70cef79 100644 --- a/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/execution/GlutenSQLAggregateFunctionSuite.scala +++ b/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/execution/GlutenSQLAggregateFunctionSuite.scala @@ -16,7 +16,7 @@ */ package org.apache.spark.sql.execution -import io.glutenproject.execution.HashAggregateExecBaseTransformer +import org.apache.gluten.execution.HashAggregateExecBaseTransformer import org.apache.spark.sql.{GlutenSQLTestsTrait, Row} diff --git a/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/execution/GlutenSQLWindowFunctionSuite.scala b/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/execution/GlutenSQLWindowFunctionSuite.scala index 2dc4c448d231..6665174207b0 100644 --- a/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/execution/GlutenSQLWindowFunctionSuite.scala +++ b/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/execution/GlutenSQLWindowFunctionSuite.scala @@ -16,7 +16,7 @@ */ package org.apache.spark.sql.execution -import io.glutenproject.execution.WindowExecTransformer +import org.apache.gluten.execution.WindowExecTransformer import org.apache.spark.sql.GlutenSQLTestsTrait import org.apache.spark.sql.Row diff --git a/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/execution/GlutenSortSuite.scala b/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/execution/GlutenSortSuite.scala index 86aa55aae072..2bfb3616bd50 100644 --- a/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/execution/GlutenSortSuite.scala +++ b/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/execution/GlutenSortSuite.scala @@ -16,7 +16,7 @@ */ package org.apache.spark.sql.execution -import io.glutenproject.execution.SortExecTransformer +import org.apache.gluten.execution.SortExecTransformer import org.apache.spark.sql.{catalyst, GlutenQueryTestUtil, GlutenSQLTestsBaseTrait, Row} import org.apache.spark.sql.catalyst.analysis.{Resolver, UnresolvedAttribute} diff --git a/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/execution/adaptive/clickhouse/ClickHouseAdaptiveQueryExecSuite.scala b/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/execution/adaptive/clickhouse/ClickHouseAdaptiveQueryExecSuite.scala index 154a684a3c56..d59a7d1ff9a4 100644 --- a/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/execution/adaptive/clickhouse/ClickHouseAdaptiveQueryExecSuite.scala +++ b/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/execution/adaptive/clickhouse/ClickHouseAdaptiveQueryExecSuite.scala @@ -16,7 +16,7 @@ */ package org.apache.spark.sql.execution.adaptive.clickhouse -import io.glutenproject.execution.{BroadcastHashJoinExecTransformerBase, ShuffledHashJoinExecTransformerBase, SortExecTransformer, SortMergeJoinExecTransformer} +import org.apache.gluten.execution.{BroadcastHashJoinExecTransformerBase, ShuffledHashJoinExecTransformerBase, SortExecTransformer, SortMergeJoinExecTransformer} import org.apache.spark.SparkConf import org.apache.spark.scheduler.{SparkListener, SparkListenerEvent} diff --git a/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/execution/adaptive/velox/VeloxAdaptiveQueryExecSuite.scala b/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/execution/adaptive/velox/VeloxAdaptiveQueryExecSuite.scala index 13ad9f4f666c..c25038ae4c1d 100644 --- a/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/execution/adaptive/velox/VeloxAdaptiveQueryExecSuite.scala +++ b/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/execution/adaptive/velox/VeloxAdaptiveQueryExecSuite.scala @@ -16,7 +16,7 @@ */ package org.apache.spark.sql.execution.adaptive.velox -import io.glutenproject.execution.{BroadcastHashJoinExecTransformerBase, ShuffledHashJoinExecTransformerBase, SortExecTransformer, SortMergeJoinExecTransformer} +import org.apache.gluten.execution.{BroadcastHashJoinExecTransformerBase, ShuffledHashJoinExecTransformerBase, SortExecTransformer, SortMergeJoinExecTransformer} import org.apache.spark.SparkConf import org.apache.spark.scheduler.{SparkListener, SparkListenerEvent} diff --git a/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/execution/benchmarks/ParquetReadBenchmark.scala b/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/execution/benchmarks/ParquetReadBenchmark.scala index 8d9d3a957584..89a0ee18a0a0 100644 --- a/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/execution/benchmarks/ParquetReadBenchmark.scala +++ b/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/execution/benchmarks/ParquetReadBenchmark.scala @@ -16,11 +16,11 @@ */ package org.apache.spark.sql.execution.benchmarks -import io.glutenproject.GlutenConfig -import io.glutenproject.backendsapi.BackendsApiManager -import io.glutenproject.execution.{FileSourceScanExecTransformer, WholeStageTransformer} -import io.glutenproject.utils.{BackendTestUtils, SystemParameters} -import io.glutenproject.vectorized.JniLibLoader +import org.apache.gluten.GlutenConfig +import org.apache.gluten.backendsapi.BackendsApiManager +import org.apache.gluten.execution.{FileSourceScanExecTransformer, WholeStageTransformer} +import org.apache.gluten.utils.{BackendTestUtils, SystemParameters} +import org.apache.gluten.vectorized.JniLibLoader import org.apache.spark.SparkConf import org.apache.spark.benchmark.Benchmark @@ -65,7 +65,7 @@ object ParquetReadBenchmark extends SqlBasedBenchmark { val conf = new SparkConf() .setAppName("ParquetReadBenchmark") .setIfMissing("spark.master", s"local[$thrdNum]") - .set("spark.plugins", "io.glutenproject.GlutenPlugin") + .set("spark.plugins", "org.apache.gluten.GlutenPlugin") .set("spark.shuffle.manager", "org.apache.spark.shuffle.sort.ColumnarShuffleManager") .set("spark.memory.offHeap.enabled", "true") .setIfMissing("spark.memory.offHeap.size", offheapSize) diff --git a/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/execution/datasources/GlutenWriterColumnarRulesSuite.scala b/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/execution/datasources/GlutenWriterColumnarRulesSuite.scala index 3cfac89c3cd2..a5d3f0e3f183 100644 --- a/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/execution/datasources/GlutenWriterColumnarRulesSuite.scala +++ b/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/execution/datasources/GlutenWriterColumnarRulesSuite.scala @@ -16,7 +16,7 @@ */ package org.apache.spark.sql.execution.datasources -import io.glutenproject.GlutenConfig +import org.apache.gluten.GlutenConfig import org.apache.spark.sql.{GlutenSQLTestsBaseTrait, SaveMode} import org.apache.spark.sql.execution.QueryExecution diff --git a/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/execution/datasources/orc/GlutenOrcV1SchemaPruningSuite.scala b/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/execution/datasources/orc/GlutenOrcV1SchemaPruningSuite.scala index 1f0bf2cd2d79..13b21c05ec23 100644 --- a/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/execution/datasources/orc/GlutenOrcV1SchemaPruningSuite.scala +++ b/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/execution/datasources/orc/GlutenOrcV1SchemaPruningSuite.scala @@ -16,7 +16,7 @@ */ package org.apache.spark.sql.execution.datasources.orc -import io.glutenproject.execution.FileSourceScanExecTransformer +import org.apache.gluten.execution.FileSourceScanExecTransformer import org.apache.spark.sql.{DataFrame, GlutenSQLTestsBaseTrait} import org.apache.spark.sql.catalyst.parser.CatalystSqlParser diff --git a/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/execution/datasources/orc/GlutenOrcV2SchemaPruningSuite.scala b/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/execution/datasources/orc/GlutenOrcV2SchemaPruningSuite.scala index 93412a8f80ed..101d6fb34242 100644 --- a/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/execution/datasources/orc/GlutenOrcV2SchemaPruningSuite.scala +++ b/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/execution/datasources/orc/GlutenOrcV2SchemaPruningSuite.scala @@ -16,7 +16,7 @@ */ package org.apache.spark.sql.execution.datasources.orc -import io.glutenproject.execution.BatchScanExecTransformer +import org.apache.gluten.execution.BatchScanExecTransformer import org.apache.spark.sql.{DataFrame, GlutenSQLTestsBaseTrait} import org.apache.spark.sql.catalyst.parser.CatalystSqlParser diff --git a/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/execution/datasources/parquet/GlutenParquetSchemaPruningSuite.scala b/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/execution/datasources/parquet/GlutenParquetSchemaPruningSuite.scala index 44c30f86831f..e56e797f09c6 100644 --- a/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/execution/datasources/parquet/GlutenParquetSchemaPruningSuite.scala +++ b/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/execution/datasources/parquet/GlutenParquetSchemaPruningSuite.scala @@ -15,7 +15,7 @@ * limitations under the License. */ package org.apache.spark.sql.execution.datasources.parquet -import io.glutenproject.execution.{BatchScanExecTransformer, FileSourceScanExecTransformer} +import org.apache.gluten.execution.{BatchScanExecTransformer, FileSourceScanExecTransformer} import org.apache.spark.SparkConf import org.apache.spark.sql.{DataFrame, GlutenSQLTestsBaseTrait} diff --git a/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/execution/joins/GlutenBroadcastJoinSuite.scala b/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/execution/joins/GlutenBroadcastJoinSuite.scala index 47ae15032384..c9ccc1afc75d 100644 --- a/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/execution/joins/GlutenBroadcastJoinSuite.scala +++ b/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/execution/joins/GlutenBroadcastJoinSuite.scala @@ -16,9 +16,9 @@ */ package org.apache.spark.sql.execution.joins -import io.glutenproject.GlutenConfig -import io.glutenproject.execution.{BroadcastHashJoinExecTransformerBase, BroadcastNestedLoopJoinExecTransformer, ColumnarToRowExecBase, WholeStageTransformer} -import io.glutenproject.utils.{BackendTestUtils, SystemParameters} +import org.apache.gluten.GlutenConfig +import org.apache.gluten.execution.{BroadcastHashJoinExecTransformerBase, BroadcastNestedLoopJoinExecTransformer, ColumnarToRowExecBase, WholeStageTransformer} +import org.apache.gluten.utils.{BackendTestUtils, SystemParameters} import org.apache.spark.sql.{GlutenTestsCommonTrait, SparkSession} import org.apache.spark.sql.catalyst.optimizer._ @@ -80,7 +80,7 @@ class GlutenBroadcastJoinSuite extends BroadcastJoinSuite with GlutenTestsCommon .config("spark.sql.files.maxPartitionBytes", "134217728") .config("spark.memory.offHeap.enabled", "true") .config("spark.memory.offHeap.size", "1024MB") - .config("spark.plugins", "io.glutenproject.GlutenPlugin") + .config("spark.plugins", "org.apache.gluten.GlutenPlugin") .config("spark.shuffle.manager", "org.apache.spark.shuffle.sort.ColumnarShuffleManager") .config("spark.sql.warehouse.dir", warehouse) // Avoid the code size overflow error in Spark code generation. diff --git a/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/extension/CustomerExpressionTransformer.scala b/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/extension/CustomerExpressionTransformer.scala index a2b15a671d38..a3720fc6235d 100644 --- a/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/extension/CustomerExpressionTransformer.scala +++ b/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/extension/CustomerExpressionTransformer.scala @@ -16,10 +16,10 @@ */ package org.apache.spark.sql.extension -import io.glutenproject.expression._ -import io.glutenproject.expression.ConverterUtils.FunctionConfig -import io.glutenproject.extension.ExpressionExtensionTrait -import io.glutenproject.substrait.expression.{ExpressionBuilder, ExpressionNode} +import org.apache.gluten.expression._ +import org.apache.gluten.expression.ConverterUtils.FunctionConfig +import org.apache.gluten.extension.ExpressionExtensionTrait +import org.apache.gluten.substrait.expression.{ExpressionBuilder, ExpressionNode} import org.apache.spark.internal.Logging import org.apache.spark.sql.catalyst.expressions.{Attribute, Expression} diff --git a/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/extension/GlutenCollapseProjectExecTransformerSuite.scala b/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/extension/GlutenCollapseProjectExecTransformerSuite.scala index 58a087c97cee..5d5f4d2701a7 100644 --- a/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/extension/GlutenCollapseProjectExecTransformerSuite.scala +++ b/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/extension/GlutenCollapseProjectExecTransformerSuite.scala @@ -16,8 +16,8 @@ */ package org.apache.spark.sql.extension -import io.glutenproject.GlutenConfig -import io.glutenproject.execution.ProjectExecTransformer +import org.apache.gluten.GlutenConfig +import org.apache.gluten.execution.ProjectExecTransformer import org.apache.spark.sql.GlutenSQLTestsTrait import org.apache.spark.sql.Row diff --git a/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/extension/GlutenCustomerExpressionTransformerSuite.scala b/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/extension/GlutenCustomerExpressionTransformerSuite.scala index 95a9e523a2a5..91344f8778ca 100644 --- a/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/extension/GlutenCustomerExpressionTransformerSuite.scala +++ b/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/extension/GlutenCustomerExpressionTransformerSuite.scala @@ -16,8 +16,8 @@ */ package org.apache.spark.sql.extension -import io.glutenproject.execution.ProjectExecTransformer -import io.glutenproject.expression.ExpressionConverter +import org.apache.gluten.execution.ProjectExecTransformer +import org.apache.gluten.expression.ExpressionConverter import org.apache.spark.SparkConf import org.apache.spark.sql.{GlutenSQLTestsTrait, Row} diff --git a/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/extension/GlutenSessionExtensionSuite.scala b/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/extension/GlutenSessionExtensionSuite.scala index 243ae2ec3051..00b4bf5821f1 100644 --- a/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/extension/GlutenSessionExtensionSuite.scala +++ b/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/extension/GlutenSessionExtensionSuite.scala @@ -16,7 +16,7 @@ */ package org.apache.spark.sql.extension -import io.glutenproject.extension.{ColumnarOverrideRules, JoinSelectionOverrides} +import org.apache.gluten.extension.{ColumnarOverrideRules, JoinSelectionOverrides} import org.apache.spark.SparkConf import org.apache.spark.sql._ diff --git a/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/extension/TestFileSourceScanExecTransformer.scala b/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/extension/TestFileSourceScanExecTransformer.scala index 439bfe3748f3..a7ad96600d8f 100644 --- a/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/extension/TestFileSourceScanExecTransformer.scala +++ b/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/extension/TestFileSourceScanExecTransformer.scala @@ -16,8 +16,8 @@ */ package org.apache.spark.sql.extension -import io.glutenproject.backendsapi.BackendsApiManager -import io.glutenproject.execution.FileSourceScanExecTransformerBase +import org.apache.gluten.backendsapi.BackendsApiManager +import org.apache.gluten.execution.FileSourceScanExecTransformerBase import org.apache.spark.sql.catalyst.TableIdentifier import org.apache.spark.sql.catalyst.expressions.{Attribute, Expression} diff --git a/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/hive/execution/GlutenHiveSQLQuerySuite.scala b/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/hive/execution/GlutenHiveSQLQuerySuite.scala index 306e5f2ac886..99ed63393da4 100644 --- a/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/hive/execution/GlutenHiveSQLQuerySuite.scala +++ b/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/hive/execution/GlutenHiveSQLQuerySuite.scala @@ -16,7 +16,7 @@ */ package org.apache.spark.sql.hive.execution -import io.glutenproject.execution.TransformSupport +import org.apache.gluten.execution.TransformSupport import org.apache.spark.SparkConf import org.apache.spark.internal.config @@ -104,7 +104,7 @@ class GlutenHiveSQLQuerySuite extends GlutenSQLTestsTrait { override def sparkConf: SparkConf = { defaultSparkConf - .set("spark.plugins", "io.glutenproject.GlutenPlugin") + .set("spark.plugins", "org.apache.gluten.GlutenPlugin") .set("spark.default.parallelism", "1") .set("spark.memory.offHeap.enabled", "true") .set("spark.memory.offHeap.size", "1024MB") diff --git a/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/statistics/SparkFunctionStatistics.scala b/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/statistics/SparkFunctionStatistics.scala index c0d2efebb17e..7a3c4d1056e7 100644 --- a/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/statistics/SparkFunctionStatistics.scala +++ b/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/statistics/SparkFunctionStatistics.scala @@ -16,9 +16,9 @@ */ package org.apache.spark.sql.statistics -import io.glutenproject.GlutenConfig -import io.glutenproject.extension.GlutenPlan -import io.glutenproject.utils.{BackendTestUtils, SystemParameters} +import org.apache.gluten.GlutenConfig +import org.apache.gluten.extension.GlutenPlan +import org.apache.gluten.utils.{BackendTestUtils, SystemParameters} import org.apache.spark.sql.{GlutenTestConstants, QueryTest, SparkSession} import org.apache.spark.sql.catalyst.analysis.FunctionRegistry @@ -53,7 +53,7 @@ class SparkFunctionStatistics extends QueryTest { .config("spark.sql.files.maxPartitionBytes", "134217728") .config("spark.memory.offHeap.enabled", "true") .config("spark.memory.offHeap.size", "1024MB") - .config("spark.plugins", "io.glutenproject.GlutenPlugin") + .config("spark.plugins", "org.apache.gluten.GlutenPlugin") .config("spark.shuffle.manager", "org.apache.spark.shuffle.sort.ColumnarShuffleManager") // Avoid the code size overflow error in Spark code generation. .config("spark.sql.codegen.wholeStage", "false") diff --git a/gluten-ut/spark33/pom.xml b/gluten-ut/spark33/pom.xml index 9abab09923ba..0f0a0703c3c5 100644 --- a/gluten-ut/spark33/pom.xml +++ b/gluten-ut/spark33/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> gluten-ut - io.glutenproject + org.apache.gluten 1.2.0-SNAPSHOT ../pom.xml @@ -16,7 +16,7 @@ - io.glutenproject + org.apache.gluten gluten-ut-common ${project.version} compile @@ -39,7 +39,7 @@ - io.glutenproject + org.apache.gluten backends-clickhouse ${project.version} test @@ -59,7 +59,7 @@ - io.glutenproject + org.apache.gluten backends-velox ${project.version} test diff --git a/gluten-ut/spark32/src/test/scala/io/glutenproject/utils/clickhouse/ClickHouseSQLQueryTestSettings.scala b/gluten-ut/spark33/src/test/scala/org/apache/gluten/utils/clickhouse/ClickHouseSQLQueryTestSettings.scala similarity index 91% rename from gluten-ut/spark32/src/test/scala/io/glutenproject/utils/clickhouse/ClickHouseSQLQueryTestSettings.scala rename to gluten-ut/spark33/src/test/scala/org/apache/gluten/utils/clickhouse/ClickHouseSQLQueryTestSettings.scala index 8fb97e282d6f..5d420ff19f89 100644 --- a/gluten-ut/spark32/src/test/scala/io/glutenproject/utils/clickhouse/ClickHouseSQLQueryTestSettings.scala +++ b/gluten-ut/spark33/src/test/scala/org/apache/gluten/utils/clickhouse/ClickHouseSQLQueryTestSettings.scala @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.utils.clickhouse +package org.apache.gluten.utils.clickhouse -import io.glutenproject.utils.SQLQueryTestSettings +import org.apache.gluten.utils.SQLQueryTestSettings object ClickHouseSQLQueryTestSettings extends SQLQueryTestSettings { override def getSupportedSQLQueryTests: Set[String] = Set() diff --git a/gluten-ut/spark33/src/test/scala/io/glutenproject/utils/clickhouse/ClickHouseTestSettings.scala b/gluten-ut/spark33/src/test/scala/org/apache/gluten/utils/clickhouse/ClickHouseTestSettings.scala similarity index 99% rename from gluten-ut/spark33/src/test/scala/io/glutenproject/utils/clickhouse/ClickHouseTestSettings.scala rename to gluten-ut/spark33/src/test/scala/org/apache/gluten/utils/clickhouse/ClickHouseTestSettings.scala index 0194518959b4..c54c01717196 100644 --- a/gluten-ut/spark33/src/test/scala/io/glutenproject/utils/clickhouse/ClickHouseTestSettings.scala +++ b/gluten-ut/spark33/src/test/scala/org/apache/gluten/utils/clickhouse/ClickHouseTestSettings.scala @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.utils.clickhouse +package org.apache.gluten.utils.clickhouse -import io.glutenproject.utils.{BackendTestSettings, SQLQueryTestSettings} +import org.apache.gluten.utils.{BackendTestSettings, SQLQueryTestSettings} import org.apache.spark.sql._ import org.apache.spark.sql.GlutenTestConstants.GLUTEN_TEST @@ -55,6 +55,11 @@ class ClickHouseTestSettings extends BackendTestSettings { case "GlutenDataFrameSuite" => !dfCoreDumpCases.contains(testName) case "GlutenDatasetSuite" => !dsSlowCases.contains(testName) case "GlutenSQLQuerySuite" => !sqlQuerySlowCases.contains(testName) + // Below 2 suites temporarily ignored because of gluten domain name change + case "GlutenClickHouseMergeTreeWriteOnHDFSSuite" => + false + case "GlutenClickHouseMergeTreeWriteOnS3Suite" => + false case "GlutenDataFrameWriterV2Suite" => false // nativeDoValidate failed due to spark conf cleanup case "GlutenDataSourceV2DataFrameSuite" => diff --git a/gluten-ut/spark33/src/test/scala/io/glutenproject/utils/velox/VeloxSQLQueryTestSettings.scala b/gluten-ut/spark33/src/test/scala/org/apache/gluten/utils/velox/VeloxSQLQueryTestSettings.scala similarity index 98% rename from gluten-ut/spark33/src/test/scala/io/glutenproject/utils/velox/VeloxSQLQueryTestSettings.scala rename to gluten-ut/spark33/src/test/scala/org/apache/gluten/utils/velox/VeloxSQLQueryTestSettings.scala index 1d00c739c48d..05afabcea1d0 100644 --- a/gluten-ut/spark33/src/test/scala/io/glutenproject/utils/velox/VeloxSQLQueryTestSettings.scala +++ b/gluten-ut/spark33/src/test/scala/org/apache/gluten/utils/velox/VeloxSQLQueryTestSettings.scala @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.utils.velox +package org.apache.gluten.utils.velox -import io.glutenproject.utils.SQLQueryTestSettings +import org.apache.gluten.utils.SQLQueryTestSettings object VeloxSQLQueryTestSettings extends SQLQueryTestSettings { override def getSupportedSQLQueryTests: Set[String] = SUPPORTED_SQL_QUERY_LIST diff --git a/gluten-ut/spark33/src/test/scala/io/glutenproject/utils/velox/VeloxTestSettings.scala b/gluten-ut/spark33/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala similarity index 99% rename from gluten-ut/spark33/src/test/scala/io/glutenproject/utils/velox/VeloxTestSettings.scala rename to gluten-ut/spark33/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala index f4010fc7fb49..7a2e77937b0d 100644 --- a/gluten-ut/spark33/src/test/scala/io/glutenproject/utils/velox/VeloxTestSettings.scala +++ b/gluten-ut/spark33/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.utils.velox +package org.apache.gluten.utils.velox -import io.glutenproject.utils.{BackendTestSettings, SQLQueryTestSettings} +import org.apache.gluten.utils.{BackendTestSettings, SQLQueryTestSettings} import org.apache.spark.sql._ import org.apache.spark.sql.catalyst.expressions.{GlutenAnsiCastSuiteWithAnsiModeOff, GlutenAnsiCastSuiteWithAnsiModeOn, GlutenArithmeticExpressionSuite, GlutenBitwiseExpressionsSuite, GlutenCastSuite, GlutenCastSuiteWithAnsiModeOn, GlutenCollectionExpressionsSuite, GlutenComplexTypeSuite, GlutenConditionalExpressionSuite, GlutenDateExpressionsSuite, GlutenDecimalExpressionSuite, GlutenHashExpressionsSuite, GlutenIntervalExpressionsSuite, GlutenLiteralExpressionSuite, GlutenMathExpressionsSuite, GlutenMiscExpressionsSuite, GlutenNondeterministicSuite, GlutenNullExpressionsSuite, GlutenPredicateSuite, GlutenRandomSuite, GlutenRegexpExpressionsSuite, GlutenSortOrderExpressionsSuite, GlutenStringExpressionsSuite, GlutenTryCastSuite} diff --git a/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/GlutenBloomFilterAggregateQuerySuite.scala b/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/GlutenBloomFilterAggregateQuerySuite.scala index ae6c80aec2d4..c12cf8217ea9 100644 --- a/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/GlutenBloomFilterAggregateQuerySuite.scala +++ b/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/GlutenBloomFilterAggregateQuerySuite.scala @@ -16,9 +16,9 @@ */ package org.apache.spark.sql -import io.glutenproject.GlutenConfig -import io.glutenproject.backendsapi.BackendsApiManager -import io.glutenproject.execution.HashAggregateExecBaseTransformer +import org.apache.gluten.GlutenConfig +import org.apache.gluten.backendsapi.BackendsApiManager +import org.apache.gluten.execution.HashAggregateExecBaseTransformer import org.apache.spark.sql.execution.adaptive.AdaptiveSparkPlanHelper import org.apache.spark.sql.internal.SQLConf diff --git a/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/GlutenCachedTableSuite.scala b/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/GlutenCachedTableSuite.scala index f74836102d7e..e146c1310db7 100644 --- a/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/GlutenCachedTableSuite.scala +++ b/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/GlutenCachedTableSuite.scala @@ -16,7 +16,7 @@ */ package org.apache.spark.sql -import io.glutenproject.GlutenConfig +import org.apache.gluten.GlutenConfig import org.apache.spark.SparkConf import org.apache.spark.sql.execution.adaptive.AdaptiveSparkPlanHelper diff --git a/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/GlutenDataFrameAggregateSuite.scala b/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/GlutenDataFrameAggregateSuite.scala index 5746ae763f2d..06dab4652ef3 100644 --- a/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/GlutenDataFrameAggregateSuite.scala +++ b/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/GlutenDataFrameAggregateSuite.scala @@ -16,7 +16,7 @@ */ package org.apache.spark.sql -import io.glutenproject.execution.HashAggregateExecBaseTransformer +import org.apache.gluten.execution.HashAggregateExecBaseTransformer import org.apache.spark.sql.GlutenTestConstants.GLUTEN_TEST import org.apache.spark.sql.execution.WholeStageCodegenExec diff --git a/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/GlutenDataFrameSuite.scala b/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/GlutenDataFrameSuite.scala index 5086743f36d9..4008f862e17d 100644 --- a/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/GlutenDataFrameSuite.scala +++ b/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/GlutenDataFrameSuite.scala @@ -16,7 +16,7 @@ */ package org.apache.spark.sql -import io.glutenproject.execution.{ProjectExecTransformer, WholeStageTransformer} +import org.apache.gluten.execution.{ProjectExecTransformer, WholeStageTransformer} import org.apache.spark.SparkException import org.apache.spark.sql.catalyst.expressions.{EqualTo, Expression} diff --git a/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/GlutenDataFrameWindowFunctionsSuite.scala b/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/GlutenDataFrameWindowFunctionsSuite.scala index 0e32f46da304..978685db87a0 100644 --- a/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/GlutenDataFrameWindowFunctionsSuite.scala +++ b/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/GlutenDataFrameWindowFunctionsSuite.scala @@ -16,7 +16,7 @@ */ package org.apache.spark.sql -import io.glutenproject.execution.WindowExecTransformer +import org.apache.gluten.execution.WindowExecTransformer import org.apache.spark.SparkConf import org.apache.spark.sql.catalyst.expressions.{AttributeReference, Expression} diff --git a/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/GlutenDynamicPartitionPruningSuite.scala b/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/GlutenDynamicPartitionPruningSuite.scala index a60eb60c19fd..766cfc012e23 100644 --- a/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/GlutenDynamicPartitionPruningSuite.scala +++ b/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/GlutenDynamicPartitionPruningSuite.scala @@ -16,9 +16,9 @@ */ package org.apache.spark.sql -import io.glutenproject.GlutenConfig -import io.glutenproject.execution.{BatchScanExecTransformer, FileSourceScanExecTransformer, FilterExecTransformerBase} -import io.glutenproject.utils.BackendTestUtils +import org.apache.gluten.GlutenConfig +import org.apache.gluten.execution.{BatchScanExecTransformer, FileSourceScanExecTransformer, FilterExecTransformerBase} +import org.apache.gluten.utils.BackendTestUtils import org.apache.spark.SparkConf import org.apache.spark.sql.GlutenTestConstants.GLUTEN_TEST @@ -644,7 +644,7 @@ class GlutenDynamicPartitionPruningV1SuiteAEOff // By default Gluten pushes more filters than vanilla Spark. // - // See also io.glutenproject.execution.FilterHandler#applyFilterPushdownToScan + // See also org.apache.gluten.execution.FilterHandler#applyFilterPushdownToScan // See also DynamicPartitionPruningSuite.scala:1362 if (BackendTestUtils.isCHBackendLoaded()) { assert(subqueryIds.size == 2, "Whole plan subquery reusing not working correctly") diff --git a/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/GlutenSQLQueryTestSuite.scala b/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/GlutenSQLQueryTestSuite.scala index b2bb4590b125..4536aa54057c 100644 --- a/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/GlutenSQLQueryTestSuite.scala +++ b/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/GlutenSQLQueryTestSuite.scala @@ -16,8 +16,8 @@ */ package org.apache.spark.sql -import io.glutenproject.GlutenConfig -import io.glutenproject.utils.{BackendTestSettings, BackendTestUtils, SystemParameters} +import org.apache.gluten.GlutenConfig +import org.apache.gluten.utils.{BackendTestSettings, BackendTestUtils, SystemParameters} import org.apache.spark.SparkConf import org.apache.spark.sql.catalyst.expressions.codegen.CodeGenerator @@ -186,7 +186,7 @@ class GlutenSQLQueryTestSuite .set("spark.sql.files.maxPartitionBytes", "134217728") .set("spark.memory.offHeap.enabled", "true") .set("spark.memory.offHeap.size", "1024MB") - .set("spark.plugins", "io.glutenproject.GlutenPlugin") + .set("spark.plugins", "org.apache.gluten.GlutenPlugin") .set("spark.shuffle.manager", "org.apache.spark.shuffle.sort.ColumnarShuffleManager") if (isCHBackend) { diff --git a/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/GlutenSparkSessionExtensionSuite.scala b/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/GlutenSparkSessionExtensionSuite.scala index 1a73f3f104b1..5e3fed736697 100644 --- a/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/GlutenSparkSessionExtensionSuite.scala +++ b/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/GlutenSparkSessionExtensionSuite.scala @@ -16,7 +16,7 @@ */ package org.apache.spark.sql -import io.glutenproject.GlutenConfig +import org.apache.gluten.GlutenConfig class GlutenSparkSessionExtensionSuite extends SparkSessionExtensionSuite diff --git a/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/GlutenStringFunctionsSuite.scala b/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/GlutenStringFunctionsSuite.scala index 469a54305e8e..c5e4fa0a4250 100644 --- a/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/GlutenStringFunctionsSuite.scala +++ b/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/GlutenStringFunctionsSuite.scala @@ -16,7 +16,7 @@ */ package org.apache.spark.sql -import io.glutenproject.utils.FallbackUtil +import org.apache.gluten.utils.FallbackUtil import org.apache.spark.sql.catalyst.expressions.ExpressionEvalHelper import org.apache.spark.sql.functions._ diff --git a/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/GlutenSubquerySuite.scala b/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/GlutenSubquerySuite.scala index cd1b892706ce..f0e766e5ce26 100644 --- a/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/GlutenSubquerySuite.scala +++ b/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/GlutenSubquerySuite.scala @@ -16,7 +16,7 @@ */ package org.apache.spark.sql -import io.glutenproject.execution.{FileSourceScanExecTransformer, WholeStageTransformer} +import org.apache.gluten.execution.{FileSourceScanExecTransformer, WholeStageTransformer} class GlutenSubquerySuite extends SubquerySuite with GlutenSQLTestsTrait { diff --git a/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/connector/GlutenKeyGroupedPartitioningSuite.scala b/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/connector/GlutenKeyGroupedPartitioningSuite.scala index 51761f2aa138..12ce843cc731 100644 --- a/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/connector/GlutenKeyGroupedPartitioningSuite.scala +++ b/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/connector/GlutenKeyGroupedPartitioningSuite.scala @@ -15,7 +15,7 @@ * limitations under the License. */ package org.apache.spark.sql.connector -import io.glutenproject.execution.SortMergeJoinExecTransformer +import org.apache.gluten.execution.SortMergeJoinExecTransformer import org.apache.spark.SparkConf import org.apache.spark.sql.GlutenSQLTestsBaseTrait diff --git a/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/execution/FallbackStrategiesSuite.scala b/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/execution/FallbackStrategiesSuite.scala index 8bdb351fac87..2158c2613b04 100644 --- a/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/execution/FallbackStrategiesSuite.scala +++ b/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/execution/FallbackStrategiesSuite.scala @@ -16,11 +16,11 @@ */ package org.apache.spark.sql.execution -import io.glutenproject.backendsapi.BackendsApiManager -import io.glutenproject.execution.BasicScanExecTransformer -import io.glutenproject.extension.{ColumnarOverrideRules, GlutenPlan} -import io.glutenproject.extension.columnar.{FallbackEmptySchemaRelation, InsertTransitions, TRANSFORM_UNSUPPORTED, TransformHints} -import io.glutenproject.utils.QueryPlanSelector +import org.apache.gluten.backendsapi.BackendsApiManager +import org.apache.gluten.execution.BasicScanExecTransformer +import org.apache.gluten.extension.{ColumnarOverrideRules, GlutenPlan} +import org.apache.gluten.extension.columnar.{FallbackEmptySchemaRelation, InsertTransitions, TRANSFORM_UNSUPPORTED, TransformHints} +import org.apache.gluten.utils.QueryPlanSelector import org.apache.spark.rdd.RDD import org.apache.spark.sql.{GlutenSQLTestsTrait, SparkSession} diff --git a/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/execution/GlutenCoalesceShufflePartitionsSuite.scala b/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/execution/GlutenCoalesceShufflePartitionsSuite.scala index 2edd4e81b92a..cea110bbad18 100644 --- a/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/execution/GlutenCoalesceShufflePartitionsSuite.scala +++ b/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/execution/GlutenCoalesceShufflePartitionsSuite.scala @@ -49,7 +49,7 @@ class GlutenCoalesceShufflePartitionsSuite .set(SQLConf.ADVISORY_PARTITION_SIZE_IN_BYTES.key, targetPostShuffleInputSize.toString) .set(SQLConf.COALESCE_PARTITIONS_ENABLED.key, "true") // Gluten config - .set("spark.plugins", "io.glutenproject.GlutenPlugin") + .set("spark.plugins", "org.apache.gluten.GlutenPlugin") .set("spark.shuffle.manager", "org.apache.spark.shuffle.sort.ColumnarShuffleManager") .set("spark.memory.offHeap.enabled", "true") .set("spark.memory.offHeap.size", "5g") diff --git a/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/execution/GlutenReplaceHashWithSortAggSuite.scala b/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/execution/GlutenReplaceHashWithSortAggSuite.scala index c83912d7feb5..026e2dde0055 100644 --- a/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/execution/GlutenReplaceHashWithSortAggSuite.scala +++ b/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/execution/GlutenReplaceHashWithSortAggSuite.scala @@ -16,8 +16,8 @@ */ package org.apache.spark.sql.execution -import io.glutenproject.backendsapi.BackendsApiManager -import io.glutenproject.execution.HashAggregateExecBaseTransformer +import org.apache.gluten.backendsapi.BackendsApiManager +import org.apache.gluten.execution.HashAggregateExecBaseTransformer import org.apache.spark.sql.{DataFrame, GlutenSQLTestsBaseTrait} import org.apache.spark.sql.execution.aggregate.{ObjectHashAggregateExec, SortAggregateExec} diff --git a/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/execution/GlutenSQLAggregateFunctionSuite.scala b/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/execution/GlutenSQLAggregateFunctionSuite.scala index 6046142243aa..77d4d70cef79 100644 --- a/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/execution/GlutenSQLAggregateFunctionSuite.scala +++ b/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/execution/GlutenSQLAggregateFunctionSuite.scala @@ -16,7 +16,7 @@ */ package org.apache.spark.sql.execution -import io.glutenproject.execution.HashAggregateExecBaseTransformer +import org.apache.gluten.execution.HashAggregateExecBaseTransformer import org.apache.spark.sql.{GlutenSQLTestsTrait, Row} diff --git a/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/execution/GlutenSQLWindowFunctionSuite.scala b/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/execution/GlutenSQLWindowFunctionSuite.scala index 2dc4c448d231..6665174207b0 100644 --- a/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/execution/GlutenSQLWindowFunctionSuite.scala +++ b/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/execution/GlutenSQLWindowFunctionSuite.scala @@ -16,7 +16,7 @@ */ package org.apache.spark.sql.execution -import io.glutenproject.execution.WindowExecTransformer +import org.apache.gluten.execution.WindowExecTransformer import org.apache.spark.sql.GlutenSQLTestsTrait import org.apache.spark.sql.Row diff --git a/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/execution/GlutenSortSuite.scala b/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/execution/GlutenSortSuite.scala index 86aa55aae072..2bfb3616bd50 100644 --- a/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/execution/GlutenSortSuite.scala +++ b/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/execution/GlutenSortSuite.scala @@ -16,7 +16,7 @@ */ package org.apache.spark.sql.execution -import io.glutenproject.execution.SortExecTransformer +import org.apache.gluten.execution.SortExecTransformer import org.apache.spark.sql.{catalyst, GlutenQueryTestUtil, GlutenSQLTestsBaseTrait, Row} import org.apache.spark.sql.catalyst.analysis.{Resolver, UnresolvedAttribute} diff --git a/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/execution/adaptive/clickhouse/ClickHouseAdaptiveQueryExecSuite.scala b/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/execution/adaptive/clickhouse/ClickHouseAdaptiveQueryExecSuite.scala index 3a0fa3988d2f..091abe11dad0 100644 --- a/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/execution/adaptive/clickhouse/ClickHouseAdaptiveQueryExecSuite.scala +++ b/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/execution/adaptive/clickhouse/ClickHouseAdaptiveQueryExecSuite.scala @@ -16,7 +16,7 @@ */ package org.apache.spark.sql.execution.adaptive.clickhouse -import io.glutenproject.execution.{BroadcastHashJoinExecTransformerBase, ShuffledHashJoinExecTransformerBase, SortExecTransformer, SortMergeJoinExecTransformer} +import org.apache.gluten.execution.{BroadcastHashJoinExecTransformerBase, ShuffledHashJoinExecTransformerBase, SortExecTransformer, SortMergeJoinExecTransformer} import org.apache.spark.SparkConf import org.apache.spark.scheduler.{SparkListener, SparkListenerEvent} diff --git a/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/execution/adaptive/velox/VeloxAdaptiveQueryExecSuite.scala b/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/execution/adaptive/velox/VeloxAdaptiveQueryExecSuite.scala index 3d9f003e5a23..729a12f56cc5 100644 --- a/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/execution/adaptive/velox/VeloxAdaptiveQueryExecSuite.scala +++ b/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/execution/adaptive/velox/VeloxAdaptiveQueryExecSuite.scala @@ -16,7 +16,7 @@ */ package org.apache.spark.sql.execution.adaptive.velox -import io.glutenproject.execution.{BroadcastHashJoinExecTransformerBase, ShuffledHashJoinExecTransformerBase, SortExecTransformer, SortMergeJoinExecTransformer} +import org.apache.gluten.execution.{BroadcastHashJoinExecTransformerBase, ShuffledHashJoinExecTransformerBase, SortExecTransformer, SortMergeJoinExecTransformer} import org.apache.spark.SparkConf import org.apache.spark.scheduler.{SparkListener, SparkListenerEvent} diff --git a/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/execution/benchmarks/ParquetReadBenchmark.scala b/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/execution/benchmarks/ParquetReadBenchmark.scala index 78c8a195eafe..d99d529241ec 100644 --- a/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/execution/benchmarks/ParquetReadBenchmark.scala +++ b/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/execution/benchmarks/ParquetReadBenchmark.scala @@ -16,11 +16,11 @@ */ package org.apache.spark.sql.execution.benchmarks -import io.glutenproject.GlutenConfig -import io.glutenproject.backendsapi.BackendsApiManager -import io.glutenproject.execution.{FileSourceScanExecTransformer, WholeStageTransformer} -import io.glutenproject.utils.{BackendTestUtils, SystemParameters} -import io.glutenproject.vectorized.JniLibLoader +import org.apache.gluten.GlutenConfig +import org.apache.gluten.backendsapi.BackendsApiManager +import org.apache.gluten.execution.{FileSourceScanExecTransformer, WholeStageTransformer} +import org.apache.gluten.utils.{BackendTestUtils, SystemParameters} +import org.apache.gluten.vectorized.JniLibLoader import org.apache.spark.SparkConf import org.apache.spark.benchmark.Benchmark @@ -65,7 +65,7 @@ object ParquetReadBenchmark extends SqlBasedBenchmark { val conf = new SparkConf() .setAppName("ParquetReadBenchmark") .setIfMissing("spark.master", s"local[$thrdNum]") - .set("spark.plugins", "io.glutenproject.GlutenPlugin") + .set("spark.plugins", "org.apache.gluten.GlutenPlugin") .set("spark.shuffle.manager", "org.apache.spark.shuffle.sort.ColumnarShuffleManager") .set("spark.memory.offHeap.enabled", "true") .setIfMissing("spark.memory.offHeap.size", offheapSize) diff --git a/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/execution/datasources/GlutenFileMetadataStructSuite.scala b/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/execution/datasources/GlutenFileMetadataStructSuite.scala index 794c0089b073..5e4d1ed8f81f 100644 --- a/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/execution/datasources/GlutenFileMetadataStructSuite.scala +++ b/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/execution/datasources/GlutenFileMetadataStructSuite.scala @@ -16,8 +16,8 @@ */ package org.apache.spark.sql.execution.datasources -import io.glutenproject.execution.{FileSourceScanExecTransformer, FilterExecTransformer} -import io.glutenproject.utils.BackendTestUtils +import org.apache.gluten.execution.{FileSourceScanExecTransformer, FilterExecTransformer} +import org.apache.gluten.utils.BackendTestUtils import org.apache.spark.sql.{Column, DataFrame, Row} import org.apache.spark.sql.GlutenSQLTestsBaseTrait diff --git a/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/execution/datasources/GlutenWriterColumnarRulesSuite.scala b/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/execution/datasources/GlutenWriterColumnarRulesSuite.scala index 3cfac89c3cd2..a5d3f0e3f183 100644 --- a/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/execution/datasources/GlutenWriterColumnarRulesSuite.scala +++ b/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/execution/datasources/GlutenWriterColumnarRulesSuite.scala @@ -16,7 +16,7 @@ */ package org.apache.spark.sql.execution.datasources -import io.glutenproject.GlutenConfig +import org.apache.gluten.GlutenConfig import org.apache.spark.sql.{GlutenSQLTestsBaseTrait, SaveMode} import org.apache.spark.sql.execution.QueryExecution diff --git a/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/execution/datasources/orc/GlutenOrcV1SchemaPruningSuite.scala b/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/execution/datasources/orc/GlutenOrcV1SchemaPruningSuite.scala index 6cc17cdc3d2c..c142d33bdc22 100644 --- a/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/execution/datasources/orc/GlutenOrcV1SchemaPruningSuite.scala +++ b/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/execution/datasources/orc/GlutenOrcV1SchemaPruningSuite.scala @@ -16,7 +16,7 @@ */ package org.apache.spark.sql.execution.datasources.orc -import io.glutenproject.execution.FileSourceScanExecTransformer +import org.apache.gluten.execution.FileSourceScanExecTransformer import org.apache.spark.sql.{DataFrame, GlutenSQLTestsBaseTrait} import org.apache.spark.sql.catalyst.parser.CatalystSqlParser diff --git a/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/execution/datasources/orc/GlutenOrcV2SchemaPruningSuite.scala b/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/execution/datasources/orc/GlutenOrcV2SchemaPruningSuite.scala index d7802e15f5ac..04a4c05b9d04 100644 --- a/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/execution/datasources/orc/GlutenOrcV2SchemaPruningSuite.scala +++ b/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/execution/datasources/orc/GlutenOrcV2SchemaPruningSuite.scala @@ -16,7 +16,7 @@ */ package org.apache.spark.sql.execution.datasources.orc -import io.glutenproject.execution.BatchScanExecTransformer +import org.apache.gluten.execution.BatchScanExecTransformer import org.apache.spark.sql.{DataFrame, GlutenSQLTestsBaseTrait} import org.apache.spark.sql.catalyst.parser.CatalystSqlParser diff --git a/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/execution/datasources/parquet/GlutenParquetSchemaPruningSuite.scala b/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/execution/datasources/parquet/GlutenParquetSchemaPruningSuite.scala index 3217d6438432..854961e48f0a 100644 --- a/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/execution/datasources/parquet/GlutenParquetSchemaPruningSuite.scala +++ b/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/execution/datasources/parquet/GlutenParquetSchemaPruningSuite.scala @@ -15,7 +15,7 @@ * limitations under the License. */ package org.apache.spark.sql.execution.datasources.parquet -import io.glutenproject.execution.{BatchScanExecTransformer, FileSourceScanExecTransformer} +import org.apache.gluten.execution.{BatchScanExecTransformer, FileSourceScanExecTransformer} import org.apache.spark.SparkConf import org.apache.spark.sql.{DataFrame, GlutenSQLTestsBaseTrait} diff --git a/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/execution/joins/GlutenBroadcastJoinSuite.scala b/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/execution/joins/GlutenBroadcastJoinSuite.scala index bd6220973523..13317444c1d3 100644 --- a/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/execution/joins/GlutenBroadcastJoinSuite.scala +++ b/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/execution/joins/GlutenBroadcastJoinSuite.scala @@ -16,8 +16,8 @@ */ package org.apache.spark.sql.execution.joins -import io.glutenproject.GlutenConfig -import io.glutenproject.utils.{BackendTestUtils, SystemParameters} +import org.apache.gluten.GlutenConfig +import org.apache.gluten.utils.{BackendTestUtils, SystemParameters} import org.apache.spark.sql.{GlutenTestsCommonTrait, SparkSession} import org.apache.spark.sql.catalyst.optimizer.{ConstantFolding, ConvertToLocalRelation, NullPropagation} @@ -49,7 +49,7 @@ class GlutenBroadcastJoinSuite extends BroadcastJoinSuite with GlutenTestsCommon .config("spark.sql.files.maxPartitionBytes", "134217728") .config("spark.memory.offHeap.enabled", "true") .config("spark.memory.offHeap.size", "1024MB") - .config("spark.plugins", "io.glutenproject.GlutenPlugin") + .config("spark.plugins", "org.apache.gluten.GlutenPlugin") .config("spark.shuffle.manager", "org.apache.spark.shuffle.sort.ColumnarShuffleManager") .config("spark.sql.warehouse.dir", warehouse) // Avoid static evaluation for literal input by spark catalyst. diff --git a/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/extension/GlutenCollapseProjectExecTransformerSuite.scala b/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/extension/GlutenCollapseProjectExecTransformerSuite.scala index 58a087c97cee..5d5f4d2701a7 100644 --- a/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/extension/GlutenCollapseProjectExecTransformerSuite.scala +++ b/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/extension/GlutenCollapseProjectExecTransformerSuite.scala @@ -16,8 +16,8 @@ */ package org.apache.spark.sql.extension -import io.glutenproject.GlutenConfig -import io.glutenproject.execution.ProjectExecTransformer +import org.apache.gluten.GlutenConfig +import org.apache.gluten.execution.ProjectExecTransformer import org.apache.spark.sql.GlutenSQLTestsTrait import org.apache.spark.sql.Row diff --git a/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/extension/GlutenSessionExtensionSuite.scala b/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/extension/GlutenSessionExtensionSuite.scala index 243ae2ec3051..00b4bf5821f1 100644 --- a/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/extension/GlutenSessionExtensionSuite.scala +++ b/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/extension/GlutenSessionExtensionSuite.scala @@ -16,7 +16,7 @@ */ package org.apache.spark.sql.extension -import io.glutenproject.extension.{ColumnarOverrideRules, JoinSelectionOverrides} +import org.apache.gluten.extension.{ColumnarOverrideRules, JoinSelectionOverrides} import org.apache.spark.SparkConf import org.apache.spark.sql._ diff --git a/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/extension/TestFileSourceScanExecTransformer.scala b/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/extension/TestFileSourceScanExecTransformer.scala index e900d3130f4c..592019f34ccf 100644 --- a/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/extension/TestFileSourceScanExecTransformer.scala +++ b/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/extension/TestFileSourceScanExecTransformer.scala @@ -16,8 +16,8 @@ */ package org.apache.spark.sql.extension -import io.glutenproject.backendsapi.BackendsApiManager -import io.glutenproject.execution.FileSourceScanExecTransformerBase +import org.apache.gluten.backendsapi.BackendsApiManager +import org.apache.gluten.execution.FileSourceScanExecTransformerBase import org.apache.spark.sql.catalyst.TableIdentifier import org.apache.spark.sql.catalyst.expressions.{Attribute, Expression} diff --git a/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/gluten/GlutenFallbackSuite.scala b/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/gluten/GlutenFallbackSuite.scala index e7c6a52d4877..2e91e6c8638b 100644 --- a/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/gluten/GlutenFallbackSuite.scala +++ b/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/gluten/GlutenFallbackSuite.scala @@ -16,10 +16,10 @@ */ package org.apache.spark.sql.gluten -import io.glutenproject.{GlutenConfig, VERSION} -import io.glutenproject.events.GlutenPlanFallbackEvent -import io.glutenproject.execution.FileSourceScanExecTransformer -import io.glutenproject.utils.BackendTestUtils +import org.apache.gluten.{GlutenConfig, VERSION} +import org.apache.gluten.events.GlutenPlanFallbackEvent +import org.apache.gluten.execution.FileSourceScanExecTransformer +import org.apache.gluten.utils.BackendTestUtils import org.apache.spark.scheduler.{SparkListener, SparkListenerEvent} import org.apache.spark.sql.{GlutenSQLTestsTrait, Row} diff --git a/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/hive/execution/GlutenHiveSQLQuerySuite.scala b/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/hive/execution/GlutenHiveSQLQuerySuite.scala index 4341d09b8d37..3b6472d2e14b 100644 --- a/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/hive/execution/GlutenHiveSQLQuerySuite.scala +++ b/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/hive/execution/GlutenHiveSQLQuerySuite.scala @@ -16,7 +16,7 @@ */ package org.apache.spark.sql.hive.execution -import io.glutenproject.execution.{FileSourceScanExecTransformer, TransformSupport} +import org.apache.gluten.execution.{FileSourceScanExecTransformer, TransformSupport} import org.apache.spark.SparkConf import org.apache.spark.internal.config @@ -97,7 +97,7 @@ class GlutenHiveSQLQuerySuite extends GlutenSQLTestsTrait { override def sparkConf: SparkConf = { defaultSparkConf - .set("spark.plugins", "io.glutenproject.GlutenPlugin") + .set("spark.plugins", "org.apache.gluten.GlutenPlugin") .set("spark.default.parallelism", "1") .set("spark.memory.offHeap.enabled", "true") .set("spark.memory.offHeap.size", "1024MB") diff --git a/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/statistics/SparkFunctionStatistics.scala b/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/statistics/SparkFunctionStatistics.scala index 21d00982fed2..40874cd69d30 100644 --- a/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/statistics/SparkFunctionStatistics.scala +++ b/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/statistics/SparkFunctionStatistics.scala @@ -16,9 +16,9 @@ */ package org.apache.spark.sql.statistics -import io.glutenproject.GlutenConfig -import io.glutenproject.extension.GlutenPlan -import io.glutenproject.utils.{BackendTestUtils, SystemParameters} +import org.apache.gluten.GlutenConfig +import org.apache.gluten.extension.GlutenPlan +import org.apache.gluten.utils.{BackendTestUtils, SystemParameters} import org.apache.spark.sql.{GlutenTestConstants, QueryTest, SparkSession} import org.apache.spark.sql.catalyst.analysis.FunctionRegistry @@ -53,7 +53,7 @@ class SparkFunctionStatistics extends QueryTest { .config("spark.sql.files.maxPartitionBytes", "134217728") .config("spark.memory.offHeap.enabled", "true") .config("spark.memory.offHeap.size", "1024MB") - .config("spark.plugins", "io.glutenproject.GlutenPlugin") + .config("spark.plugins", "org.apache.gluten.GlutenPlugin") .config("spark.shuffle.manager", "org.apache.spark.shuffle.sort.ColumnarShuffleManager") // Avoid the code size overflow error in Spark code generation. .config("spark.sql.codegen.wholeStage", "false") diff --git a/gluten-ut/spark34/pom.xml b/gluten-ut/spark34/pom.xml index 71fc63d7e1d6..d30f9644dbb4 100644 --- a/gluten-ut/spark34/pom.xml +++ b/gluten-ut/spark34/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> gluten-ut - io.glutenproject + org.apache.gluten 1.2.0-SNAPSHOT ../pom.xml @@ -16,7 +16,7 @@ - io.glutenproject + org.apache.gluten gluten-ut-common ${project.version} compile @@ -39,7 +39,7 @@ - io.glutenproject + org.apache.gluten backends-clickhouse ${project.version} test @@ -59,7 +59,7 @@ - io.glutenproject + org.apache.gluten backends-velox ${project.version} test diff --git a/gluten-ut/spark34/src/test/scala/io/glutenproject/utils/clickhouse/ClickHouseSQLQueryTestSettings.scala b/gluten-ut/spark34/src/test/scala/org/apache/gluten/utils/clickhouse/ClickHouseSQLQueryTestSettings.scala similarity index 91% rename from gluten-ut/spark34/src/test/scala/io/glutenproject/utils/clickhouse/ClickHouseSQLQueryTestSettings.scala rename to gluten-ut/spark34/src/test/scala/org/apache/gluten/utils/clickhouse/ClickHouseSQLQueryTestSettings.scala index 8fb97e282d6f..5d420ff19f89 100644 --- a/gluten-ut/spark34/src/test/scala/io/glutenproject/utils/clickhouse/ClickHouseSQLQueryTestSettings.scala +++ b/gluten-ut/spark34/src/test/scala/org/apache/gluten/utils/clickhouse/ClickHouseSQLQueryTestSettings.scala @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.utils.clickhouse +package org.apache.gluten.utils.clickhouse -import io.glutenproject.utils.SQLQueryTestSettings +import org.apache.gluten.utils.SQLQueryTestSettings object ClickHouseSQLQueryTestSettings extends SQLQueryTestSettings { override def getSupportedSQLQueryTests: Set[String] = Set() diff --git a/gluten-ut/spark34/src/test/scala/io/glutenproject/utils/clickhouse/ClickHouseTestSettings.scala b/gluten-ut/spark34/src/test/scala/org/apache/gluten/utils/clickhouse/ClickHouseTestSettings.scala similarity index 99% rename from gluten-ut/spark34/src/test/scala/io/glutenproject/utils/clickhouse/ClickHouseTestSettings.scala rename to gluten-ut/spark34/src/test/scala/org/apache/gluten/utils/clickhouse/ClickHouseTestSettings.scala index 63dd2f5476fb..31a747791986 100644 --- a/gluten-ut/spark34/src/test/scala/io/glutenproject/utils/clickhouse/ClickHouseTestSettings.scala +++ b/gluten-ut/spark34/src/test/scala/org/apache/gluten/utils/clickhouse/ClickHouseTestSettings.scala @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.utils.clickhouse +package org.apache.gluten.utils.clickhouse -import io.glutenproject.utils.{BackendTestSettings, SQLQueryTestSettings} +import org.apache.gluten.utils.{BackendTestSettings, SQLQueryTestSettings} import org.apache.spark.sql._ import org.apache.spark.sql.GlutenTestConstants.GLUTEN_TEST @@ -55,6 +55,11 @@ class ClickHouseTestSettings extends BackendTestSettings { case "GlutenDataFrameSuite" => !dfCoreDumpCases.contains(testName) case "GlutenDatasetSuite" => !dsSlowCases.contains(testName) case "GlutenSQLQuerySuite" => !sqlQuerySlowCases.contains(testName) + // Below 2 suites temporarily ignored because of gluten domain name change + case "GlutenClickHouseMergeTreeWriteOnHDFSSuite" => + false + case "GlutenClickHouseMergeTreeWriteOnS3Suite" => + false case "GlutenDataFrameWriterV2Suite" => false // nativeDoValidate failed due to spark conf cleanup case "GlutenDataSourceV2DataFrameSuite" => diff --git a/gluten-ut/spark34/src/test/scala/io/glutenproject/utils/velox/VeloxSQLQueryTestSettings.scala b/gluten-ut/spark34/src/test/scala/org/apache/gluten/utils/velox/VeloxSQLQueryTestSettings.scala similarity index 98% rename from gluten-ut/spark34/src/test/scala/io/glutenproject/utils/velox/VeloxSQLQueryTestSettings.scala rename to gluten-ut/spark34/src/test/scala/org/apache/gluten/utils/velox/VeloxSQLQueryTestSettings.scala index 1421a126066d..364da52e7b21 100644 --- a/gluten-ut/spark34/src/test/scala/io/glutenproject/utils/velox/VeloxSQLQueryTestSettings.scala +++ b/gluten-ut/spark34/src/test/scala/org/apache/gluten/utils/velox/VeloxSQLQueryTestSettings.scala @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.utils.velox +package org.apache.gluten.utils.velox -import io.glutenproject.utils.SQLQueryTestSettings +import org.apache.gluten.utils.SQLQueryTestSettings object VeloxSQLQueryTestSettings extends SQLQueryTestSettings { override def getSupportedSQLQueryTests: Set[String] = SUPPORTED_SQL_QUERY_LIST diff --git a/gluten-ut/spark34/src/test/scala/io/glutenproject/utils/velox/VeloxTestSettings.scala b/gluten-ut/spark34/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala similarity index 99% rename from gluten-ut/spark34/src/test/scala/io/glutenproject/utils/velox/VeloxTestSettings.scala rename to gluten-ut/spark34/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala index 84fc83083a2e..15c58edc3fea 100644 --- a/gluten-ut/spark34/src/test/scala/io/glutenproject/utils/velox/VeloxTestSettings.scala +++ b/gluten-ut/spark34/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.utils.velox +package org.apache.gluten.utils.velox -import io.glutenproject.utils.{BackendTestSettings, SQLQueryTestSettings} +import org.apache.gluten.utils.{BackendTestSettings, SQLQueryTestSettings} import org.apache.spark.sql._ import org.apache.spark.sql.catalyst.expressions.{GlutenArithmeticExpressionSuite, GlutenBitwiseExpressionsSuite, GlutenCastSuite, GlutenCollectionExpressionsSuite, GlutenComplexTypeSuite, GlutenConditionalExpressionSuite, GlutenDateExpressionsSuite, GlutenDecimalExpressionSuite, GlutenHashExpressionsSuite, GlutenIntervalExpressionsSuite, GlutenLiteralExpressionSuite, GlutenMathExpressionsSuite, GlutenMiscExpressionsSuite, GlutenNondeterministicSuite, GlutenNullExpressionsSuite, GlutenPredicateSuite, GlutenRandomSuite, GlutenRegexpExpressionsSuite, GlutenSortOrderExpressionsSuite, GlutenStringExpressionsSuite} diff --git a/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/GlutenBloomFilterAggregateQuerySuite.scala b/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/GlutenBloomFilterAggregateQuerySuite.scala index ae6c80aec2d4..c12cf8217ea9 100644 --- a/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/GlutenBloomFilterAggregateQuerySuite.scala +++ b/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/GlutenBloomFilterAggregateQuerySuite.scala @@ -16,9 +16,9 @@ */ package org.apache.spark.sql -import io.glutenproject.GlutenConfig -import io.glutenproject.backendsapi.BackendsApiManager -import io.glutenproject.execution.HashAggregateExecBaseTransformer +import org.apache.gluten.GlutenConfig +import org.apache.gluten.backendsapi.BackendsApiManager +import org.apache.gluten.execution.HashAggregateExecBaseTransformer import org.apache.spark.sql.execution.adaptive.AdaptiveSparkPlanHelper import org.apache.spark.sql.internal.SQLConf diff --git a/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/GlutenCachedTableSuite.scala b/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/GlutenCachedTableSuite.scala index f74836102d7e..e146c1310db7 100644 --- a/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/GlutenCachedTableSuite.scala +++ b/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/GlutenCachedTableSuite.scala @@ -16,7 +16,7 @@ */ package org.apache.spark.sql -import io.glutenproject.GlutenConfig +import org.apache.gluten.GlutenConfig import org.apache.spark.SparkConf import org.apache.spark.sql.execution.adaptive.AdaptiveSparkPlanHelper diff --git a/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/GlutenDataFrameAggregateSuite.scala b/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/GlutenDataFrameAggregateSuite.scala index 5746ae763f2d..06dab4652ef3 100644 --- a/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/GlutenDataFrameAggregateSuite.scala +++ b/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/GlutenDataFrameAggregateSuite.scala @@ -16,7 +16,7 @@ */ package org.apache.spark.sql -import io.glutenproject.execution.HashAggregateExecBaseTransformer +import org.apache.gluten.execution.HashAggregateExecBaseTransformer import org.apache.spark.sql.GlutenTestConstants.GLUTEN_TEST import org.apache.spark.sql.execution.WholeStageCodegenExec diff --git a/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/GlutenDataFrameSuite.scala b/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/GlutenDataFrameSuite.scala index 5086743f36d9..4008f862e17d 100644 --- a/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/GlutenDataFrameSuite.scala +++ b/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/GlutenDataFrameSuite.scala @@ -16,7 +16,7 @@ */ package org.apache.spark.sql -import io.glutenproject.execution.{ProjectExecTransformer, WholeStageTransformer} +import org.apache.gluten.execution.{ProjectExecTransformer, WholeStageTransformer} import org.apache.spark.SparkException import org.apache.spark.sql.catalyst.expressions.{EqualTo, Expression} diff --git a/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/GlutenDataFrameWindowFunctionsSuite.scala b/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/GlutenDataFrameWindowFunctionsSuite.scala index 0e32f46da304..978685db87a0 100644 --- a/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/GlutenDataFrameWindowFunctionsSuite.scala +++ b/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/GlutenDataFrameWindowFunctionsSuite.scala @@ -16,7 +16,7 @@ */ package org.apache.spark.sql -import io.glutenproject.execution.WindowExecTransformer +import org.apache.gluten.execution.WindowExecTransformer import org.apache.spark.SparkConf import org.apache.spark.sql.catalyst.expressions.{AttributeReference, Expression} diff --git a/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/GlutenDynamicPartitionPruningSuite.scala b/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/GlutenDynamicPartitionPruningSuite.scala index fb98c2775bb0..d51b83ea28ef 100644 --- a/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/GlutenDynamicPartitionPruningSuite.scala +++ b/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/GlutenDynamicPartitionPruningSuite.scala @@ -16,8 +16,8 @@ */ package org.apache.spark.sql -import io.glutenproject.GlutenConfig -import io.glutenproject.execution.{BatchScanExecTransformer, FileSourceScanExecTransformer, FilterExecTransformerBase} +import org.apache.gluten.GlutenConfig +import org.apache.gluten.execution.{BatchScanExecTransformer, FileSourceScanExecTransformer, FilterExecTransformerBase} import org.apache.spark.SparkConf import org.apache.spark.sql.GlutenTestConstants.GLUTEN_TEST @@ -725,7 +725,7 @@ class GlutenDynamicPartitionPruningV1SuiteAEOff // By default Gluten pushes more filters than vanilla Spark. // - // See also io.glutenproject.execution.FilterHandler#applyFilterPushdownToScan + // See also org.apache.gluten.execution.FilterHandler#applyFilterPushdownToScan // See also DynamicPartitionPruningSuite.scala:1362 assert(subqueryIds.size == 3, "Whole plan subquery reusing not working correctly") assert(reusedSubqueryIds.size == 2, "Whole plan subquery reusing not working correctly") diff --git a/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/GlutenFileBasedDataSourceSuite.scala b/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/GlutenFileBasedDataSourceSuite.scala index 8a1dfe3781ba..cc2b0b62ca34 100644 --- a/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/GlutenFileBasedDataSourceSuite.scala +++ b/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/GlutenFileBasedDataSourceSuite.scala @@ -16,7 +16,7 @@ */ package org.apache.spark.sql -import io.glutenproject.execution.BatchScanExecTransformer +import org.apache.gluten.execution.BatchScanExecTransformer import org.apache.spark.{SparkConf, SparkException} import org.apache.spark.scheduler.{SparkListener, SparkListenerTaskEnd} diff --git a/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/GlutenSQLQueryTestSuite.scala b/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/GlutenSQLQueryTestSuite.scala index 51ec84bed76e..0ea1f13ec2ef 100644 --- a/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/GlutenSQLQueryTestSuite.scala +++ b/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/GlutenSQLQueryTestSuite.scala @@ -16,8 +16,8 @@ */ package org.apache.spark.sql -import io.glutenproject.GlutenConfig -import io.glutenproject.utils.{BackendTestSettings, BackendTestUtils, SystemParameters} +import org.apache.gluten.GlutenConfig +import org.apache.gluten.utils.{BackendTestSettings, BackendTestUtils, SystemParameters} import org.apache.spark.SparkConf import org.apache.spark.sql.catalyst.expressions.codegen.CodeGenerator @@ -188,7 +188,7 @@ class GlutenSQLQueryTestSuite .set("spark.sql.files.maxPartitionBytes", "134217728") .set("spark.memory.offHeap.enabled", "true") .set("spark.memory.offHeap.size", "1024MB") - .set("spark.plugins", "io.glutenproject.GlutenPlugin") + .set("spark.plugins", "org.apache.gluten.GlutenPlugin") .set("spark.shuffle.manager", "org.apache.spark.shuffle.sort.ColumnarShuffleManager") if (isCHBackend) { diff --git a/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/GlutenSparkSessionExtensionSuite.scala b/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/GlutenSparkSessionExtensionSuite.scala index 1a73f3f104b1..5e3fed736697 100644 --- a/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/GlutenSparkSessionExtensionSuite.scala +++ b/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/GlutenSparkSessionExtensionSuite.scala @@ -16,7 +16,7 @@ */ package org.apache.spark.sql -import io.glutenproject.GlutenConfig +import org.apache.gluten.GlutenConfig class GlutenSparkSessionExtensionSuite extends SparkSessionExtensionSuite diff --git a/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/GlutenStringFunctionsSuite.scala b/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/GlutenStringFunctionsSuite.scala index 469a54305e8e..c5e4fa0a4250 100644 --- a/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/GlutenStringFunctionsSuite.scala +++ b/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/GlutenStringFunctionsSuite.scala @@ -16,7 +16,7 @@ */ package org.apache.spark.sql -import io.glutenproject.utils.FallbackUtil +import org.apache.gluten.utils.FallbackUtil import org.apache.spark.sql.catalyst.expressions.ExpressionEvalHelper import org.apache.spark.sql.functions._ diff --git a/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/GlutenSubquerySuite.scala b/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/GlutenSubquerySuite.scala index cd1b892706ce..f0e766e5ce26 100644 --- a/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/GlutenSubquerySuite.scala +++ b/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/GlutenSubquerySuite.scala @@ -16,7 +16,7 @@ */ package org.apache.spark.sql -import io.glutenproject.execution.{FileSourceScanExecTransformer, WholeStageTransformer} +import org.apache.gluten.execution.{FileSourceScanExecTransformer, WholeStageTransformer} class GlutenSubquerySuite extends SubquerySuite with GlutenSQLTestsTrait { diff --git a/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/connector/GlutenDataSourceV2Suite.scala b/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/connector/GlutenDataSourceV2Suite.scala index b4a5a87b4d77..803c407ca8e7 100644 --- a/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/connector/GlutenDataSourceV2Suite.scala +++ b/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/connector/GlutenDataSourceV2Suite.scala @@ -16,7 +16,7 @@ */ package org.apache.spark.sql.connector -import io.glutenproject.execution.SortExecTransformer +import org.apache.gluten.execution.SortExecTransformer import org.apache.spark.sql.{GlutenSQLTestsBaseTrait, Row} import org.apache.spark.sql.execution.ColumnarShuffleExchangeExec diff --git a/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/connector/GlutenKeyGroupedPartitioningSuite.scala b/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/connector/GlutenKeyGroupedPartitioningSuite.scala index 3721fa50dc7b..78d4be44fb07 100644 --- a/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/connector/GlutenKeyGroupedPartitioningSuite.scala +++ b/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/connector/GlutenKeyGroupedPartitioningSuite.scala @@ -16,7 +16,7 @@ */ package org.apache.spark.sql.connector -import io.glutenproject.execution.SortMergeJoinExecTransformer +import org.apache.gluten.execution.SortMergeJoinExecTransformer import org.apache.spark.SparkConf import org.apache.spark.sql.{GlutenSQLTestsBaseTrait, Row} diff --git a/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/execution/FallbackStrategiesSuite.scala b/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/execution/FallbackStrategiesSuite.scala index 56190a5918f7..4517387590f7 100644 --- a/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/execution/FallbackStrategiesSuite.scala +++ b/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/execution/FallbackStrategiesSuite.scala @@ -16,11 +16,11 @@ */ package org.apache.spark.sql.execution -import io.glutenproject.backendsapi.BackendsApiManager -import io.glutenproject.execution.BasicScanExecTransformer -import io.glutenproject.extension.{ColumnarOverrideRules, GlutenPlan} -import io.glutenproject.extension.columnar.{FallbackEmptySchemaRelation, InsertTransitions, TRANSFORM_UNSUPPORTED, TransformHints} -import io.glutenproject.utils.QueryPlanSelector +import org.apache.gluten.backendsapi.BackendsApiManager +import org.apache.gluten.execution.BasicScanExecTransformer +import org.apache.gluten.extension.{ColumnarOverrideRules, GlutenPlan} +import org.apache.gluten.extension.columnar.{FallbackEmptySchemaRelation, InsertTransitions, TRANSFORM_UNSUPPORTED, TransformHints} +import org.apache.gluten.utils.QueryPlanSelector import org.apache.spark.rdd.RDD import org.apache.spark.sql.{GlutenSQLTestsTrait, SparkSession} diff --git a/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/execution/GlutenCoalesceShufflePartitionsSuite.scala b/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/execution/GlutenCoalesceShufflePartitionsSuite.scala index 4f4785f381ac..8e5c71735aca 100644 --- a/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/execution/GlutenCoalesceShufflePartitionsSuite.scala +++ b/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/execution/GlutenCoalesceShufflePartitionsSuite.scala @@ -49,7 +49,7 @@ class GlutenCoalesceShufflePartitionsSuite .set(SQLConf.ADVISORY_PARTITION_SIZE_IN_BYTES.key, targetPostShuffleInputSize.toString) .set(SQLConf.COALESCE_PARTITIONS_ENABLED.key, "true") // Gluten config - .set("spark.plugins", "io.glutenproject.GlutenPlugin") + .set("spark.plugins", "org.apache.gluten.GlutenPlugin") .set("spark.shuffle.manager", "org.apache.spark.shuffle.sort.ColumnarShuffleManager") .set("spark.memory.offHeap.enabled", "true") .set("spark.memory.offHeap.size", "5g") diff --git a/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/execution/GlutenReplaceHashWithSortAggSuite.scala b/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/execution/GlutenReplaceHashWithSortAggSuite.scala index f0898beb3ae3..8d795bbffea0 100644 --- a/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/execution/GlutenReplaceHashWithSortAggSuite.scala +++ b/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/execution/GlutenReplaceHashWithSortAggSuite.scala @@ -16,7 +16,7 @@ */ package org.apache.spark.sql.execution -import io.glutenproject.execution.HashAggregateExecBaseTransformer +import org.apache.gluten.execution.HashAggregateExecBaseTransformer import org.apache.spark.sql.{DataFrame, GlutenSQLTestsBaseTrait} import org.apache.spark.sql.execution.aggregate.{ObjectHashAggregateExec, SortAggregateExec} diff --git a/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/execution/GlutenSQLAggregateFunctionSuite.scala b/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/execution/GlutenSQLAggregateFunctionSuite.scala index 6046142243aa..77d4d70cef79 100644 --- a/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/execution/GlutenSQLAggregateFunctionSuite.scala +++ b/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/execution/GlutenSQLAggregateFunctionSuite.scala @@ -16,7 +16,7 @@ */ package org.apache.spark.sql.execution -import io.glutenproject.execution.HashAggregateExecBaseTransformer +import org.apache.gluten.execution.HashAggregateExecBaseTransformer import org.apache.spark.sql.{GlutenSQLTestsTrait, Row} diff --git a/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/execution/GlutenSQLWindowFunctionSuite.scala b/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/execution/GlutenSQLWindowFunctionSuite.scala index 2dc4c448d231..6665174207b0 100644 --- a/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/execution/GlutenSQLWindowFunctionSuite.scala +++ b/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/execution/GlutenSQLWindowFunctionSuite.scala @@ -16,7 +16,7 @@ */ package org.apache.spark.sql.execution -import io.glutenproject.execution.WindowExecTransformer +import org.apache.gluten.execution.WindowExecTransformer import org.apache.spark.sql.GlutenSQLTestsTrait import org.apache.spark.sql.Row diff --git a/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/execution/GlutenSortSuite.scala b/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/execution/GlutenSortSuite.scala index eaf5f66d9e2a..1831cd40b740 100644 --- a/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/execution/GlutenSortSuite.scala +++ b/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/execution/GlutenSortSuite.scala @@ -16,7 +16,7 @@ */ package org.apache.spark.sql.execution -import io.glutenproject.execution.SortExecTransformer +import org.apache.gluten.execution.SortExecTransformer import org.apache.spark.sql.{catalyst, GlutenQueryTestUtil, GlutenSQLTestsBaseTrait, Row} import org.apache.spark.sql.catalyst.analysis.{Resolver, UnresolvedAttribute} diff --git a/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/execution/adaptive/clickhouse/ClickHouseAdaptiveQueryExecSuite.scala b/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/execution/adaptive/clickhouse/ClickHouseAdaptiveQueryExecSuite.scala index 7882d9674bbf..49d47fa65b1f 100644 --- a/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/execution/adaptive/clickhouse/ClickHouseAdaptiveQueryExecSuite.scala +++ b/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/execution/adaptive/clickhouse/ClickHouseAdaptiveQueryExecSuite.scala @@ -16,7 +16,7 @@ */ package org.apache.spark.sql.execution.adaptive.clickhouse -import io.glutenproject.execution.{BroadcastHashJoinExecTransformerBase, ShuffledHashJoinExecTransformerBase, SortExecTransformer, SortMergeJoinExecTransformer} +import org.apache.gluten.execution.{BroadcastHashJoinExecTransformerBase, ShuffledHashJoinExecTransformerBase, SortExecTransformer, SortMergeJoinExecTransformer} import org.apache.spark.SparkConf import org.apache.spark.scheduler.{SparkListener, SparkListenerEvent} diff --git a/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/execution/adaptive/velox/VeloxAdaptiveQueryExecSuite.scala b/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/execution/adaptive/velox/VeloxAdaptiveQueryExecSuite.scala index 3d9f003e5a23..729a12f56cc5 100644 --- a/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/execution/adaptive/velox/VeloxAdaptiveQueryExecSuite.scala +++ b/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/execution/adaptive/velox/VeloxAdaptiveQueryExecSuite.scala @@ -16,7 +16,7 @@ */ package org.apache.spark.sql.execution.adaptive.velox -import io.glutenproject.execution.{BroadcastHashJoinExecTransformerBase, ShuffledHashJoinExecTransformerBase, SortExecTransformer, SortMergeJoinExecTransformer} +import org.apache.gluten.execution.{BroadcastHashJoinExecTransformerBase, ShuffledHashJoinExecTransformerBase, SortExecTransformer, SortMergeJoinExecTransformer} import org.apache.spark.SparkConf import org.apache.spark.scheduler.{SparkListener, SparkListenerEvent} diff --git a/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/execution/benchmarks/ParquetReadBenchmark.scala b/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/execution/benchmarks/ParquetReadBenchmark.scala index 78c8a195eafe..d99d529241ec 100644 --- a/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/execution/benchmarks/ParquetReadBenchmark.scala +++ b/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/execution/benchmarks/ParquetReadBenchmark.scala @@ -16,11 +16,11 @@ */ package org.apache.spark.sql.execution.benchmarks -import io.glutenproject.GlutenConfig -import io.glutenproject.backendsapi.BackendsApiManager -import io.glutenproject.execution.{FileSourceScanExecTransformer, WholeStageTransformer} -import io.glutenproject.utils.{BackendTestUtils, SystemParameters} -import io.glutenproject.vectorized.JniLibLoader +import org.apache.gluten.GlutenConfig +import org.apache.gluten.backendsapi.BackendsApiManager +import org.apache.gluten.execution.{FileSourceScanExecTransformer, WholeStageTransformer} +import org.apache.gluten.utils.{BackendTestUtils, SystemParameters} +import org.apache.gluten.vectorized.JniLibLoader import org.apache.spark.SparkConf import org.apache.spark.benchmark.Benchmark @@ -65,7 +65,7 @@ object ParquetReadBenchmark extends SqlBasedBenchmark { val conf = new SparkConf() .setAppName("ParquetReadBenchmark") .setIfMissing("spark.master", s"local[$thrdNum]") - .set("spark.plugins", "io.glutenproject.GlutenPlugin") + .set("spark.plugins", "org.apache.gluten.GlutenPlugin") .set("spark.shuffle.manager", "org.apache.spark.shuffle.sort.ColumnarShuffleManager") .set("spark.memory.offHeap.enabled", "true") .setIfMissing("spark.memory.offHeap.size", offheapSize) diff --git a/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/execution/datasources/GlutenFileMetadataStructSuite.scala b/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/execution/datasources/GlutenFileMetadataStructSuite.scala index 794c0089b073..5e4d1ed8f81f 100644 --- a/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/execution/datasources/GlutenFileMetadataStructSuite.scala +++ b/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/execution/datasources/GlutenFileMetadataStructSuite.scala @@ -16,8 +16,8 @@ */ package org.apache.spark.sql.execution.datasources -import io.glutenproject.execution.{FileSourceScanExecTransformer, FilterExecTransformer} -import io.glutenproject.utils.BackendTestUtils +import org.apache.gluten.execution.{FileSourceScanExecTransformer, FilterExecTransformer} +import org.apache.gluten.utils.BackendTestUtils import org.apache.spark.sql.{Column, DataFrame, Row} import org.apache.spark.sql.GlutenSQLTestsBaseTrait diff --git a/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/execution/datasources/GlutenV1WriteCommandSuite.scala b/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/execution/datasources/GlutenV1WriteCommandSuite.scala index 56bde703e828..7799252ba531 100644 --- a/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/execution/datasources/GlutenV1WriteCommandSuite.scala +++ b/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/execution/datasources/GlutenV1WriteCommandSuite.scala @@ -16,7 +16,7 @@ */ package org.apache.spark.sql.execution.datasources -import io.glutenproject.execution.SortExecTransformer +import org.apache.gluten.execution.SortExecTransformer import org.apache.spark.sql.GlutenSQLTestsBaseTrait import org.apache.spark.sql.catalyst.expressions.{Ascending, AttributeReference, NullsFirst, SortOrder} diff --git a/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/execution/datasources/csv/GlutenCSVSuite.scala b/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/execution/datasources/csv/GlutenCSVSuite.scala index 1d18003683f1..74de5f466268 100644 --- a/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/execution/datasources/csv/GlutenCSVSuite.scala +++ b/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/execution/datasources/csv/GlutenCSVSuite.scala @@ -16,7 +16,7 @@ */ package org.apache.spark.sql.execution.datasources.csv -import io.glutenproject.exception.GlutenException +import org.apache.gluten.exception.GlutenException import org.apache.spark.{SparkConf, SparkException} import org.apache.spark.sql.{GlutenSQLTestsBaseTrait, Row} diff --git a/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/execution/datasources/orc/GlutenOrcV1SchemaPruningSuite.scala b/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/execution/datasources/orc/GlutenOrcV1SchemaPruningSuite.scala index 6cc17cdc3d2c..c142d33bdc22 100644 --- a/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/execution/datasources/orc/GlutenOrcV1SchemaPruningSuite.scala +++ b/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/execution/datasources/orc/GlutenOrcV1SchemaPruningSuite.scala @@ -16,7 +16,7 @@ */ package org.apache.spark.sql.execution.datasources.orc -import io.glutenproject.execution.FileSourceScanExecTransformer +import org.apache.gluten.execution.FileSourceScanExecTransformer import org.apache.spark.sql.{DataFrame, GlutenSQLTestsBaseTrait} import org.apache.spark.sql.catalyst.parser.CatalystSqlParser diff --git a/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/execution/datasources/orc/GlutenOrcV2SchemaPruningSuite.scala b/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/execution/datasources/orc/GlutenOrcV2SchemaPruningSuite.scala index 16b0f882710c..000103b9039b 100644 --- a/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/execution/datasources/orc/GlutenOrcV2SchemaPruningSuite.scala +++ b/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/execution/datasources/orc/GlutenOrcV2SchemaPruningSuite.scala @@ -16,7 +16,7 @@ */ package org.apache.spark.sql.execution.datasources.orc -import io.glutenproject.execution.BatchScanExecTransformer +import org.apache.gluten.execution.BatchScanExecTransformer import org.apache.spark.sql.{DataFrame, GlutenSQLTestsBaseTrait} import org.apache.spark.sql.catalyst.parser.CatalystSqlParser diff --git a/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/execution/datasources/parquet/GlutenParquetSchemaPruningSuite.scala b/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/execution/datasources/parquet/GlutenParquetSchemaPruningSuite.scala index 3217d6438432..854961e48f0a 100644 --- a/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/execution/datasources/parquet/GlutenParquetSchemaPruningSuite.scala +++ b/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/execution/datasources/parquet/GlutenParquetSchemaPruningSuite.scala @@ -15,7 +15,7 @@ * limitations under the License. */ package org.apache.spark.sql.execution.datasources.parquet -import io.glutenproject.execution.{BatchScanExecTransformer, FileSourceScanExecTransformer} +import org.apache.gluten.execution.{BatchScanExecTransformer, FileSourceScanExecTransformer} import org.apache.spark.SparkConf import org.apache.spark.sql.{DataFrame, GlutenSQLTestsBaseTrait} diff --git a/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/execution/joins/GlutenBroadcastJoinSuite.scala b/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/execution/joins/GlutenBroadcastJoinSuite.scala index bd6220973523..13317444c1d3 100644 --- a/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/execution/joins/GlutenBroadcastJoinSuite.scala +++ b/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/execution/joins/GlutenBroadcastJoinSuite.scala @@ -16,8 +16,8 @@ */ package org.apache.spark.sql.execution.joins -import io.glutenproject.GlutenConfig -import io.glutenproject.utils.{BackendTestUtils, SystemParameters} +import org.apache.gluten.GlutenConfig +import org.apache.gluten.utils.{BackendTestUtils, SystemParameters} import org.apache.spark.sql.{GlutenTestsCommonTrait, SparkSession} import org.apache.spark.sql.catalyst.optimizer.{ConstantFolding, ConvertToLocalRelation, NullPropagation} @@ -49,7 +49,7 @@ class GlutenBroadcastJoinSuite extends BroadcastJoinSuite with GlutenTestsCommon .config("spark.sql.files.maxPartitionBytes", "134217728") .config("spark.memory.offHeap.enabled", "true") .config("spark.memory.offHeap.size", "1024MB") - .config("spark.plugins", "io.glutenproject.GlutenPlugin") + .config("spark.plugins", "org.apache.gluten.GlutenPlugin") .config("spark.shuffle.manager", "org.apache.spark.shuffle.sort.ColumnarShuffleManager") .config("spark.sql.warehouse.dir", warehouse) // Avoid static evaluation for literal input by spark catalyst. diff --git a/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/extension/GlutenCollapseProjectExecTransformerSuite.scala b/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/extension/GlutenCollapseProjectExecTransformerSuite.scala index 58a087c97cee..5d5f4d2701a7 100644 --- a/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/extension/GlutenCollapseProjectExecTransformerSuite.scala +++ b/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/extension/GlutenCollapseProjectExecTransformerSuite.scala @@ -16,8 +16,8 @@ */ package org.apache.spark.sql.extension -import io.glutenproject.GlutenConfig -import io.glutenproject.execution.ProjectExecTransformer +import org.apache.gluten.GlutenConfig +import org.apache.gluten.execution.ProjectExecTransformer import org.apache.spark.sql.GlutenSQLTestsTrait import org.apache.spark.sql.Row diff --git a/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/extension/GlutenSessionExtensionSuite.scala b/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/extension/GlutenSessionExtensionSuite.scala index 243ae2ec3051..00b4bf5821f1 100644 --- a/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/extension/GlutenSessionExtensionSuite.scala +++ b/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/extension/GlutenSessionExtensionSuite.scala @@ -16,7 +16,7 @@ */ package org.apache.spark.sql.extension -import io.glutenproject.extension.{ColumnarOverrideRules, JoinSelectionOverrides} +import org.apache.gluten.extension.{ColumnarOverrideRules, JoinSelectionOverrides} import org.apache.spark.SparkConf import org.apache.spark.sql._ diff --git a/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/extension/TestFileSourceScanExecTransformer.scala b/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/extension/TestFileSourceScanExecTransformer.scala index e900d3130f4c..592019f34ccf 100644 --- a/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/extension/TestFileSourceScanExecTransformer.scala +++ b/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/extension/TestFileSourceScanExecTransformer.scala @@ -16,8 +16,8 @@ */ package org.apache.spark.sql.extension -import io.glutenproject.backendsapi.BackendsApiManager -import io.glutenproject.execution.FileSourceScanExecTransformerBase +import org.apache.gluten.backendsapi.BackendsApiManager +import org.apache.gluten.execution.FileSourceScanExecTransformerBase import org.apache.spark.sql.catalyst.TableIdentifier import org.apache.spark.sql.catalyst.expressions.{Attribute, Expression} diff --git a/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/gluten/GlutenFallbackSuite.scala b/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/gluten/GlutenFallbackSuite.scala index 20cc4b37c877..54f236b7b016 100644 --- a/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/gluten/GlutenFallbackSuite.scala +++ b/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/gluten/GlutenFallbackSuite.scala @@ -16,10 +16,10 @@ */ package org.apache.spark.sql.gluten -import io.glutenproject.{GlutenConfig, VERSION} -import io.glutenproject.events.GlutenPlanFallbackEvent -import io.glutenproject.execution.FileSourceScanExecTransformer -import io.glutenproject.utils.BackendTestUtils +import org.apache.gluten.{GlutenConfig, VERSION} +import org.apache.gluten.events.GlutenPlanFallbackEvent +import org.apache.gluten.execution.FileSourceScanExecTransformer +import org.apache.gluten.utils.BackendTestUtils import org.apache.spark.scheduler.{SparkListener, SparkListenerEvent} import org.apache.spark.sql.{GlutenSQLTestsTrait, Row} diff --git a/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/hive/execution/GlutenHiveSQLQuerySuite.scala b/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/hive/execution/GlutenHiveSQLQuerySuite.scala index 07f0c02af354..dfcd9075c2c6 100644 --- a/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/hive/execution/GlutenHiveSQLQuerySuite.scala +++ b/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/hive/execution/GlutenHiveSQLQuerySuite.scala @@ -16,7 +16,7 @@ */ package org.apache.spark.sql.hive.execution -import io.glutenproject.execution.TransformSupport +import org.apache.gluten.execution.TransformSupport import org.apache.spark.SparkConf import org.apache.spark.internal.config @@ -96,7 +96,7 @@ class GlutenHiveSQLQuerySuite extends GlutenSQLTestsTrait { override def sparkConf: SparkConf = { defaultSparkConf - .set("spark.plugins", "io.glutenproject.GlutenPlugin") + .set("spark.plugins", "org.apache.gluten.GlutenPlugin") .set("spark.default.parallelism", "1") .set("spark.memory.offHeap.enabled", "true") .set("spark.memory.offHeap.size", "1024MB") diff --git a/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/sources/GlutenInsertSuite.scala b/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/sources/GlutenInsertSuite.scala index bb9b08e8e969..cf6f35288d31 100644 --- a/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/sources/GlutenInsertSuite.scala +++ b/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/sources/GlutenInsertSuite.scala @@ -16,8 +16,8 @@ */ package org.apache.spark.sql.sources -import io.glutenproject.execution.SortExecTransformer -import io.glutenproject.extension.GlutenPlan +import org.apache.gluten.execution.SortExecTransformer +import org.apache.gluten.extension.GlutenPlan import org.apache.spark.SparkConf import org.apache.spark.executor.OutputMetrics diff --git a/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/statistics/SparkFunctionStatistics.scala b/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/statistics/SparkFunctionStatistics.scala index 15703f32b57b..e5e122c9065d 100644 --- a/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/statistics/SparkFunctionStatistics.scala +++ b/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/statistics/SparkFunctionStatistics.scala @@ -16,9 +16,9 @@ */ package org.apache.spark.sql.statistics -import io.glutenproject.GlutenConfig -import io.glutenproject.extension.GlutenPlan -import io.glutenproject.utils.{BackendTestUtils, SystemParameters} +import org.apache.gluten.GlutenConfig +import org.apache.gluten.extension.GlutenPlan +import org.apache.gluten.utils.{BackendTestUtils, SystemParameters} import org.apache.spark.sql.{GlutenTestConstants, QueryTest, SparkSession} import org.apache.spark.sql.catalyst.optimizer.{ConstantFolding, ConvertToLocalRelation, NullPropagation} @@ -52,7 +52,7 @@ class SparkFunctionStatistics extends QueryTest { .config("spark.sql.files.maxPartitionBytes", "134217728") .config("spark.memory.offHeap.enabled", "true") .config("spark.memory.offHeap.size", "1024MB") - .config("spark.plugins", "io.glutenproject.GlutenPlugin") + .config("spark.plugins", "org.apache.gluten.GlutenPlugin") .config("spark.shuffle.manager", "org.apache.spark.shuffle.sort.ColumnarShuffleManager") // Avoid the code size overflow error in Spark code generation. .config("spark.sql.codegen.wholeStage", "false") diff --git a/gluten-ut/test/pom.xml b/gluten-ut/test/pom.xml index 63a6c71228f2..7e09041203a4 100644 --- a/gluten-ut/test/pom.xml +++ b/gluten-ut/test/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> gluten-ut - io.glutenproject + org.apache.gluten 1.2.0-SNAPSHOT ../pom.xml @@ -16,7 +16,7 @@ - io.glutenproject + org.apache.gluten gluten-ut-common ${project.version} compile @@ -30,7 +30,7 @@ tests - io.glutenproject + org.apache.gluten gluten-core ${project.version} test-jar @@ -46,7 +46,7 @@ - io.glutenproject + org.apache.gluten backends-clickhouse ${project.version} test @@ -66,7 +66,7 @@ - io.glutenproject + org.apache.gluten backends-velox ${project.version} test diff --git a/gluten-ut/test/src/test/scala/io/glutenproject/expressions/GlutenExpressionMappingSuite.scala b/gluten-ut/test/src/test/scala/org/apache/gluten/expressions/GlutenExpressionMappingSuite.scala similarity index 92% rename from gluten-ut/test/src/test/scala/io/glutenproject/expressions/GlutenExpressionMappingSuite.scala rename to gluten-ut/test/src/test/scala/org/apache/gluten/expressions/GlutenExpressionMappingSuite.scala index 81e234c0ed30..39e18b0d5104 100644 --- a/gluten-ut/test/src/test/scala/io/glutenproject/expressions/GlutenExpressionMappingSuite.scala +++ b/gluten-ut/test/src/test/scala/org/apache/gluten/expressions/GlutenExpressionMappingSuite.scala @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.expressions +package org.apache.gluten.expressions -import io.glutenproject.GlutenConfig -import io.glutenproject.execution.ProjectExecTransformer -import io.glutenproject.expression.ExpressionMappings -import io.glutenproject.utils.{BackendTestUtils, SystemParameters} +import org.apache.gluten.GlutenConfig +import org.apache.gluten.execution.ProjectExecTransformer +import org.apache.gluten.expression.ExpressionMappings +import org.apache.gluten.utils.{BackendTestUtils, SystemParameters} import org.apache.spark.SparkConf import org.apache.spark.sql.{GlutenQueryTest, Row} @@ -34,7 +34,7 @@ class GlutenExpressionMappingSuite override protected def sparkConf: SparkConf = { val conf = super.sparkConf - .set("spark.plugins", "io.glutenproject.GlutenPlugin") + .set("spark.plugins", "org.apache.gluten.GlutenPlugin") .set("spark.default.parallelism", "1") .set("spark.memory.offHeap.enabled", "true") .set("spark.memory.offHeap.size", "1024MB") diff --git a/package/pom.xml b/package/pom.xml index 2cd8494fcf0c..678f13b6783d 100644 --- a/package/pom.xml +++ b/package/pom.xml @@ -18,7 +18,7 @@ 4.0.0 - io.glutenproject + org.apache.gluten gluten-parent 1.2.0-SNAPSHOT ../pom.xml @@ -26,7 +26,7 @@ - io.glutenproject + org.apache.gluten gluten-core ${project.version} compile @@ -64,7 +64,7 @@ backends-velox - io.glutenproject + org.apache.gluten backends-velox ${project.version} @@ -74,7 +74,7 @@ rss - io.glutenproject + org.apache.gluten gluten-celeborn-package ${project.version} diff --git a/pom.xml b/pom.xml index c606538e90cf..3a6065dd0eeb 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - io.glutenproject + org.apache.gluten gluten-parent 1.2.0-SNAPSHOT pom @@ -68,7 +68,7 @@ 4.13.1 - io.glutenproject.shaded + org.apache.gluten.shaded 3.23.4 @@ -724,7 +724,7 @@ - io.glutenproject,io.substrait.spark,,javax,java,scala,\# + org.apache.gluten,io.substrait.spark,,javax,java,scala,\# diff --git a/shims/common/pom.xml b/shims/common/pom.xml index 32b21669ef2f..adb4112ff2c4 100644 --- a/shims/common/pom.xml +++ b/shims/common/pom.xml @@ -18,7 +18,7 @@ 4.0.0 - io.glutenproject + org.apache.gluten spark-sql-columnar-shims 1.2.0-SNAPSHOT ../pom.xml diff --git a/shims/common/src/main/scala/io/glutenproject/GlutenConfig.scala b/shims/common/src/main/scala/org/apache/gluten/GlutenConfig.scala similarity index 99% rename from shims/common/src/main/scala/io/glutenproject/GlutenConfig.scala rename to shims/common/src/main/scala/org/apache/gluten/GlutenConfig.scala index 4c53c0e1c77b..3fe3f5fa77c6 100644 --- a/shims/common/src/main/scala/io/glutenproject/GlutenConfig.scala +++ b/shims/common/src/main/scala/org/apache/gluten/GlutenConfig.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject +package org.apache.gluten import org.apache.spark.internal.Logging import org.apache.spark.network.util.ByteUnit diff --git a/shims/common/src/main/scala/io/glutenproject/execution/datasource/GlutenFormatWriterInjects.scala b/shims/common/src/main/scala/org/apache/gluten/execution/datasource/GlutenFormatWriterInjects.scala similarity index 98% rename from shims/common/src/main/scala/io/glutenproject/execution/datasource/GlutenFormatWriterInjects.scala rename to shims/common/src/main/scala/org/apache/gluten/execution/datasource/GlutenFormatWriterInjects.scala index 3dd2bfababa3..6d1859f3d0ff 100644 --- a/shims/common/src/main/scala/io/glutenproject/execution/datasource/GlutenFormatWriterInjects.scala +++ b/shims/common/src/main/scala/org/apache/gluten/execution/datasource/GlutenFormatWriterInjects.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution.datasource +package org.apache.gluten.execution.datasource import org.apache.spark.rdd.RDD import org.apache.spark.sql.SparkSession diff --git a/shims/common/src/main/scala/io/glutenproject/execution/datasource/GlutenOrcWriterInjects.scala b/shims/common/src/main/scala/org/apache/gluten/execution/datasource/GlutenOrcWriterInjects.scala similarity index 96% rename from shims/common/src/main/scala/io/glutenproject/execution/datasource/GlutenOrcWriterInjects.scala rename to shims/common/src/main/scala/org/apache/gluten/execution/datasource/GlutenOrcWriterInjects.scala index f53693dc53f3..193cb23a5d64 100644 --- a/shims/common/src/main/scala/io/glutenproject/execution/datasource/GlutenOrcWriterInjects.scala +++ b/shims/common/src/main/scala/org/apache/gluten/execution/datasource/GlutenOrcWriterInjects.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution.datasource +package org.apache.gluten.execution.datasource object GlutenOrcWriterInjects { diff --git a/shims/common/src/main/scala/io/glutenproject/execution/datasource/GlutenParquetWriterInjects.scala b/shims/common/src/main/scala/org/apache/gluten/execution/datasource/GlutenParquetWriterInjects.scala similarity index 95% rename from shims/common/src/main/scala/io/glutenproject/execution/datasource/GlutenParquetWriterInjects.scala rename to shims/common/src/main/scala/org/apache/gluten/execution/datasource/GlutenParquetWriterInjects.scala index 4ff0b10216ce..8144a80b521f 100644 --- a/shims/common/src/main/scala/io/glutenproject/execution/datasource/GlutenParquetWriterInjects.scala +++ b/shims/common/src/main/scala/org/apache/gluten/execution/datasource/GlutenParquetWriterInjects.scala @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution.datasource +package org.apache.gluten.execution.datasource -import io.glutenproject.GlutenConfig +import org.apache.gluten.GlutenConfig import org.apache.spark.rdd.RDD import org.apache.spark.sql.SparkSession diff --git a/shims/common/src/main/scala/io/glutenproject/expression/ExpressionNames.scala b/shims/common/src/main/scala/org/apache/gluten/expression/ExpressionNames.scala similarity index 99% rename from shims/common/src/main/scala/io/glutenproject/expression/ExpressionNames.scala rename to shims/common/src/main/scala/org/apache/gluten/expression/ExpressionNames.scala index 64b7c5f1f56e..a9ac8207e295 100644 --- a/shims/common/src/main/scala/io/glutenproject/expression/ExpressionNames.scala +++ b/shims/common/src/main/scala/org/apache/gluten/expression/ExpressionNames.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.expression +package org.apache.gluten.expression object ExpressionNames { diff --git a/shims/common/src/main/scala/io/glutenproject/expression/Sig.scala b/shims/common/src/main/scala/org/apache/gluten/expression/Sig.scala similarity index 96% rename from shims/common/src/main/scala/io/glutenproject/expression/Sig.scala rename to shims/common/src/main/scala/org/apache/gluten/expression/Sig.scala index 9c727a4901f0..f037cf41423f 100644 --- a/shims/common/src/main/scala/io/glutenproject/expression/Sig.scala +++ b/shims/common/src/main/scala/org/apache/gluten/expression/Sig.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.expression +package org.apache.gluten.expression import org.apache.spark.sql.catalyst.expressions.Expression diff --git a/shims/common/src/main/scala/io/glutenproject/metrics/GlutenTimeMetric.scala b/shims/common/src/main/scala/org/apache/gluten/metrics/GlutenTimeMetric.scala similarity index 96% rename from shims/common/src/main/scala/io/glutenproject/metrics/GlutenTimeMetric.scala rename to shims/common/src/main/scala/org/apache/gluten/metrics/GlutenTimeMetric.scala index 824d8d92170f..37e824ea60e4 100644 --- a/shims/common/src/main/scala/io/glutenproject/metrics/GlutenTimeMetric.scala +++ b/shims/common/src/main/scala/org/apache/gluten/metrics/GlutenTimeMetric.scala @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.metrics +package org.apache.gluten.metrics -import io.glutenproject.utils.Arm +import org.apache.gluten.utils.Arm import org.apache.spark.sql.execution.metric.SQLMetric diff --git a/shims/common/src/main/scala/io/glutenproject/sql/shims/SparkShimLoader.scala b/shims/common/src/main/scala/org/apache/gluten/sql/shims/SparkShimLoader.scala similarity index 98% rename from shims/common/src/main/scala/io/glutenproject/sql/shims/SparkShimLoader.scala rename to shims/common/src/main/scala/org/apache/gluten/sql/shims/SparkShimLoader.scala index e0ff60f54df5..a9ca2e08dc16 100644 --- a/shims/common/src/main/scala/io/glutenproject/sql/shims/SparkShimLoader.scala +++ b/shims/common/src/main/scala/org/apache/gluten/sql/shims/SparkShimLoader.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.sql.shims +package org.apache.gluten.sql.shims import org.apache.spark.SPARK_VERSION_SHORT import org.apache.spark.internal.Logging diff --git a/shims/common/src/main/scala/io/glutenproject/sql/shims/SparkShimProvider.scala b/shims/common/src/main/scala/org/apache/gluten/sql/shims/SparkShimProvider.scala similarity index 97% rename from shims/common/src/main/scala/io/glutenproject/sql/shims/SparkShimProvider.scala rename to shims/common/src/main/scala/org/apache/gluten/sql/shims/SparkShimProvider.scala index 8ff79e52f649..0ca087cba686 100644 --- a/shims/common/src/main/scala/io/glutenproject/sql/shims/SparkShimProvider.scala +++ b/shims/common/src/main/scala/org/apache/gluten/sql/shims/SparkShimProvider.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.sql.shims +package org.apache.gluten.sql.shims import org.apache.spark.internal.Logging diff --git a/shims/common/src/main/scala/io/glutenproject/sql/shims/SparkShims.scala b/shims/common/src/main/scala/org/apache/gluten/sql/shims/SparkShims.scala similarity index 99% rename from shims/common/src/main/scala/io/glutenproject/sql/shims/SparkShims.scala rename to shims/common/src/main/scala/org/apache/gluten/sql/shims/SparkShims.scala index 7d71346a7b77..852a02c47dec 100644 --- a/shims/common/src/main/scala/io/glutenproject/sql/shims/SparkShims.scala +++ b/shims/common/src/main/scala/org/apache/gluten/sql/shims/SparkShims.scala @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.sql.shims +package org.apache.gluten.sql.shims -import io.glutenproject.expression.Sig +import org.apache.gluten.expression.Sig import org.apache.spark.{SparkContext, TaskContext} import org.apache.spark.broadcast.Broadcast diff --git a/shims/common/src/main/scala/io/glutenproject/utils/Arm.scala b/shims/common/src/main/scala/org/apache/gluten/utils/Arm.scala similarity index 97% rename from shims/common/src/main/scala/io/glutenproject/utils/Arm.scala rename to shims/common/src/main/scala/org/apache/gluten/utils/Arm.scala index 5a6a5dd22912..17be5a62f464 100644 --- a/shims/common/src/main/scala/io/glutenproject/utils/Arm.scala +++ b/shims/common/src/main/scala/org/apache/gluten/utils/Arm.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.utils +package org.apache.gluten.utils /** Implementation of the automatic-resource-management pattern */ object Arm { diff --git a/shims/pom.xml b/shims/pom.xml index e84f12f958dc..bf155ce48895 100644 --- a/shims/pom.xml +++ b/shims/pom.xml @@ -18,7 +18,7 @@ 4.0.0 - io.glutenproject + org.apache.gluten gluten-parent 1.2.0-SNAPSHOT ../pom.xml diff --git a/shims/spark32/pom.xml b/shims/spark32/pom.xml index 0cfc12c7b25d..4ee8889cf9a9 100644 --- a/shims/spark32/pom.xml +++ b/shims/spark32/pom.xml @@ -18,7 +18,7 @@ 4.0.0 - io.glutenproject + org.apache.gluten spark-sql-columnar-shims 1.2.0-SNAPSHOT ../pom.xml @@ -30,7 +30,7 @@ - io.glutenproject + org.apache.gluten ${project.prefix}-shims-common ${project.version} compile diff --git a/shims/spark32/src/main/resources/META-INF/services/io.glutenproject.sql.shims.SparkShimProvider b/shims/spark32/src/main/resources/META-INF/services/io.glutenproject.sql.shims.SparkShimProvider deleted file mode 100644 index 251f36340759..000000000000 --- a/shims/spark32/src/main/resources/META-INF/services/io.glutenproject.sql.shims.SparkShimProvider +++ /dev/null @@ -1 +0,0 @@ -io.glutenproject.sql.shims.spark32.SparkShimProvider diff --git a/shims/spark32/src/main/resources/META-INF/services/org.apache.gluten.sql.shims.SparkShimProvider b/shims/spark32/src/main/resources/META-INF/services/org.apache.gluten.sql.shims.SparkShimProvider new file mode 100644 index 000000000000..58404736710a --- /dev/null +++ b/shims/spark32/src/main/resources/META-INF/services/org.apache.gluten.sql.shims.SparkShimProvider @@ -0,0 +1 @@ +org.apache.gluten.sql.shims.spark32.SparkShimProvider diff --git a/shims/spark32/src/main/scala/io/glutenproject/execution/GenerateTreeStringShim.scala b/shims/spark32/src/main/scala/org/apache/gluten/execution/GenerateTreeStringShim.scala similarity index 98% rename from shims/spark32/src/main/scala/io/glutenproject/execution/GenerateTreeStringShim.scala rename to shims/spark32/src/main/scala/org/apache/gluten/execution/GenerateTreeStringShim.scala index d06728bc7dfa..3e42244bd8c6 100644 --- a/shims/spark32/src/main/scala/io/glutenproject/execution/GenerateTreeStringShim.scala +++ b/shims/spark32/src/main/scala/org/apache/gluten/execution/GenerateTreeStringShim.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution +package org.apache.gluten.execution import org.apache.spark.sql.execution.{SparkPlan, UnaryExecNode} diff --git a/shims/spark32/src/main/scala/io/glutenproject/sql/shims/spark32/Spark32Shims.scala b/shims/spark32/src/main/scala/org/apache/gluten/sql/shims/spark32/Spark32Shims.scala similarity index 96% rename from shims/spark32/src/main/scala/io/glutenproject/sql/shims/spark32/Spark32Shims.scala rename to shims/spark32/src/main/scala/org/apache/gluten/sql/shims/spark32/Spark32Shims.scala index 5731ff957261..3fec47419cd9 100644 --- a/shims/spark32/src/main/scala/io/glutenproject/sql/shims/spark32/Spark32Shims.scala +++ b/shims/spark32/src/main/scala/org/apache/gluten/sql/shims/spark32/Spark32Shims.scala @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.sql.shims.spark32 +package org.apache.gluten.sql.shims.spark32 -import io.glutenproject.execution.datasource.GlutenParquetWriterInjects -import io.glutenproject.expression.{ExpressionNames, Sig} -import io.glutenproject.sql.shims.{ShimDescriptor, SparkShims} +import org.apache.gluten.execution.datasource.GlutenParquetWriterInjects +import org.apache.gluten.expression.{ExpressionNames, Sig} +import org.apache.gluten.sql.shims.{ShimDescriptor, SparkShims} import org.apache.spark.{ShuffleUtils, SparkContext, TaskContext, TaskContextUtils} import org.apache.spark.scheduler.TaskInfo diff --git a/shims/spark32/src/main/scala/io/glutenproject/sql/shims/spark32/SparkShimProvider.scala b/shims/spark32/src/main/scala/org/apache/gluten/sql/shims/spark32/SparkShimProvider.scala similarity index 83% rename from shims/spark32/src/main/scala/io/glutenproject/sql/shims/spark32/SparkShimProvider.scala rename to shims/spark32/src/main/scala/org/apache/gluten/sql/shims/spark32/SparkShimProvider.scala index 2d0b5d0196e6..cc7ccc4662db 100644 --- a/shims/spark32/src/main/scala/io/glutenproject/sql/shims/spark32/SparkShimProvider.scala +++ b/shims/spark32/src/main/scala/org/apache/gluten/sql/shims/spark32/SparkShimProvider.scala @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.sql.shims.spark32 +package org.apache.gluten.sql.shims.spark32 -import io.glutenproject.sql.shims.{SparkShimDescriptor, SparkShims} -import io.glutenproject.sql.shims.spark32.SparkShimProvider.DESCRIPTOR +import org.apache.gluten.sql.shims.{SparkShimDescriptor, SparkShims} +import org.apache.gluten.sql.shims.spark32.SparkShimProvider.DESCRIPTOR object SparkShimProvider { val DESCRIPTOR = SparkShimDescriptor(3, 2, 2) } -class SparkShimProvider extends io.glutenproject.sql.shims.SparkShimProvider { +class SparkShimProvider extends org.apache.gluten.sql.shims.SparkShimProvider { def createShim: SparkShims = { new Spark32Shims() } diff --git a/shims/spark32/src/main/scala/org/apache/spark/sql/execution/FileSourceScanExecShim.scala b/shims/spark32/src/main/scala/org/apache/spark/sql/execution/FileSourceScanExecShim.scala index e27f4bc28893..2c9e952cd841 100644 --- a/shims/spark32/src/main/scala/org/apache/spark/sql/execution/FileSourceScanExecShim.scala +++ b/shims/spark32/src/main/scala/org/apache/spark/sql/execution/FileSourceScanExecShim.scala @@ -16,7 +16,7 @@ */ package org.apache.spark.sql.execution -import io.glutenproject.metrics.GlutenTimeMetric +import org.apache.gluten.metrics.GlutenTimeMetric import org.apache.spark.sql.catalyst.TableIdentifier import org.apache.spark.sql.catalyst.expressions.{And, Attribute, AttributeReference, BoundReference, DynamicPruningExpression, Expression, PlanExpression, Predicate} diff --git a/shims/spark32/src/main/scala/org/apache/spark/sql/execution/datasources/FileFormatDataWriter.scala b/shims/spark32/src/main/scala/org/apache/spark/sql/execution/datasources/FileFormatDataWriter.scala index d5376f8d1b72..e5aaff691168 100644 --- a/shims/spark32/src/main/scala/org/apache/spark/sql/execution/datasources/FileFormatDataWriter.scala +++ b/shims/spark32/src/main/scala/org/apache/spark/sql/execution/datasources/FileFormatDataWriter.scala @@ -23,7 +23,7 @@ package org.apache.spark.sql.execution.datasources * we can move this class to shims-spark32, * shims-spark33, etc. */ -import io.glutenproject.execution.datasource.GlutenRowSplitter +import org.apache.gluten.execution.datasource.GlutenRowSplitter import org.apache.spark.internal.Logging import org.apache.spark.internal.io.FileCommitProtocol diff --git a/shims/spark32/src/main/scala/org/apache/spark/sql/execution/datasources/FileFormatWriter.scala b/shims/spark32/src/main/scala/org/apache/spark/sql/execution/datasources/FileFormatWriter.scala index fb57ebd982f5..a5c857103910 100644 --- a/shims/spark32/src/main/scala/org/apache/spark/sql/execution/datasources/FileFormatWriter.scala +++ b/shims/spark32/src/main/scala/org/apache/spark/sql/execution/datasources/FileFormatWriter.scala @@ -16,8 +16,8 @@ */ package org.apache.spark.sql.execution.datasources -import io.glutenproject.execution.datasource.GlutenOrcWriterInjects -import io.glutenproject.execution.datasource.GlutenParquetWriterInjects +import org.apache.gluten.execution.datasource.GlutenOrcWriterInjects +import org.apache.gluten.execution.datasource.GlutenParquetWriterInjects import org.apache.spark._ import org.apache.spark.internal.Logging diff --git a/shims/spark32/src/main/scala/org/apache/spark/sql/execution/datasources/orc/OrcFileFormat.scala b/shims/spark32/src/main/scala/org/apache/spark/sql/execution/datasources/orc/OrcFileFormat.scala index 3bed7071dc9b..34873c46b09e 100644 --- a/shims/spark32/src/main/scala/org/apache/spark/sql/execution/datasources/orc/OrcFileFormat.scala +++ b/shims/spark32/src/main/scala/org/apache/spark/sql/execution/datasources/orc/OrcFileFormat.scala @@ -16,8 +16,8 @@ */ package org.apache.spark.sql.execution.datasources.orc -import io.glutenproject.GlutenConfig -import io.glutenproject.execution.datasource.GlutenOrcWriterInjects +import org.apache.gluten.GlutenConfig +import org.apache.gluten.execution.datasource.GlutenOrcWriterInjects import org.apache.spark.TaskContext import org.apache.spark.sql.SparkSession diff --git a/shims/spark32/src/main/scala/org/apache/spark/sql/execution/datasources/parquet/ParquetFileFormat.scala b/shims/spark32/src/main/scala/org/apache/spark/sql/execution/datasources/parquet/ParquetFileFormat.scala index 09752b6e672b..c6b383136590 100644 --- a/shims/spark32/src/main/scala/org/apache/spark/sql/execution/datasources/parquet/ParquetFileFormat.scala +++ b/shims/spark32/src/main/scala/org/apache/spark/sql/execution/datasources/parquet/ParquetFileFormat.scala @@ -16,8 +16,8 @@ */ package org.apache.spark.sql.execution.datasources.parquet -import io.glutenproject.GlutenConfig -import io.glutenproject.execution.datasource.GlutenParquetWriterInjects +import org.apache.gluten.GlutenConfig +import org.apache.gluten.execution.datasource.GlutenParquetWriterInjects import org.apache.spark.TaskContext import org.apache.spark.internal.Logging diff --git a/shims/spark32/src/main/scala/org/apache/spark/sql/hive/execution/HiveFileFormat.scala b/shims/spark32/src/main/scala/org/apache/spark/sql/hive/execution/HiveFileFormat.scala index ae9094fab92b..162dd342bcf0 100644 --- a/shims/spark32/src/main/scala/org/apache/spark/sql/hive/execution/HiveFileFormat.scala +++ b/shims/spark32/src/main/scala/org/apache/spark/sql/hive/execution/HiveFileFormat.scala @@ -16,8 +16,8 @@ */ package org.apache.spark.sql.hive.execution -import io.glutenproject.execution.datasource.GlutenOrcWriterInjects -import io.glutenproject.execution.datasource.GlutenParquetWriterInjects +import org.apache.gluten.execution.datasource.GlutenOrcWriterInjects +import org.apache.gluten.execution.datasource.GlutenParquetWriterInjects import org.apache.spark.internal.Logging import org.apache.spark.internal.config.SPECULATION_ENABLED diff --git a/shims/spark32/src/test/scala/io/glutenproject/sql/shims/spark32/Spark32ShimsSuite.scala b/shims/spark32/src/test/scala/org/apache/gluten/sql/shims/spark32/Spark32ShimsSuite.scala similarity index 90% rename from shims/spark32/src/test/scala/io/glutenproject/sql/shims/spark32/Spark32ShimsSuite.scala rename to shims/spark32/src/test/scala/org/apache/gluten/sql/shims/spark32/Spark32ShimsSuite.scala index 0ca692ebc3fe..fe9796d82104 100644 --- a/shims/spark32/src/test/scala/io/glutenproject/sql/shims/spark32/Spark32ShimsSuite.scala +++ b/shims/spark32/src/test/scala/org/apache/gluten/sql/shims/spark32/Spark32ShimsSuite.scala @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.sql.shims.spark32 +package org.apache.gluten.sql.shims.spark32 -import io.glutenproject.sql.shims.{SparkShimDescriptor, SparkShimLoader, SparkShims} +import org.apache.gluten.sql.shims.{SparkShimDescriptor, SparkShimLoader, SparkShims} import org.scalatest.funsuite.AnyFunSuite diff --git a/shims/spark33/pom.xml b/shims/spark33/pom.xml index e8640dcc8df4..23e35718a4af 100644 --- a/shims/spark33/pom.xml +++ b/shims/spark33/pom.xml @@ -18,7 +18,7 @@ 4.0.0 - io.glutenproject + org.apache.gluten spark-sql-columnar-shims 1.2.0-SNAPSHOT ../pom.xml @@ -30,7 +30,7 @@ - io.glutenproject + org.apache.gluten ${project.prefix}-shims-common ${project.version} compile diff --git a/shims/spark33/src/main/resources/META-INF/services/io.glutenproject.sql.shims.SparkShimProvider b/shims/spark33/src/main/resources/META-INF/services/io.glutenproject.sql.shims.SparkShimProvider deleted file mode 100644 index 221a4a925465..000000000000 --- a/shims/spark33/src/main/resources/META-INF/services/io.glutenproject.sql.shims.SparkShimProvider +++ /dev/null @@ -1 +0,0 @@ -io.glutenproject.sql.shims.spark33.SparkShimProvider \ No newline at end of file diff --git a/shims/spark33/src/main/resources/META-INF/services/org.apache.gluten.sql.shims.SparkShimProvider b/shims/spark33/src/main/resources/META-INF/services/org.apache.gluten.sql.shims.SparkShimProvider new file mode 100644 index 000000000000..9b06666c2bf9 --- /dev/null +++ b/shims/spark33/src/main/resources/META-INF/services/org.apache.gluten.sql.shims.SparkShimProvider @@ -0,0 +1 @@ +org.apache.gluten.sql.shims.spark33.SparkShimProvider \ No newline at end of file diff --git a/shims/spark33/src/main/scala/io/glutenproject/execution/GenerateTreeStringShim.scala b/shims/spark33/src/main/scala/org/apache/gluten/execution/GenerateTreeStringShim.scala similarity index 98% rename from shims/spark33/src/main/scala/io/glutenproject/execution/GenerateTreeStringShim.scala rename to shims/spark33/src/main/scala/org/apache/gluten/execution/GenerateTreeStringShim.scala index d06728bc7dfa..3e42244bd8c6 100644 --- a/shims/spark33/src/main/scala/io/glutenproject/execution/GenerateTreeStringShim.scala +++ b/shims/spark33/src/main/scala/org/apache/gluten/execution/GenerateTreeStringShim.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution +package org.apache.gluten.execution import org.apache.spark.sql.execution.{SparkPlan, UnaryExecNode} diff --git a/shims/spark33/src/main/scala/io/glutenproject/sql/shims/spark33/Spark33Shims.scala b/shims/spark33/src/main/scala/org/apache/gluten/sql/shims/spark33/Spark33Shims.scala similarity index 96% rename from shims/spark33/src/main/scala/io/glutenproject/sql/shims/spark33/Spark33Shims.scala rename to shims/spark33/src/main/scala/org/apache/gluten/sql/shims/spark33/Spark33Shims.scala index 54799f4988b4..7423b5045133 100644 --- a/shims/spark33/src/main/scala/io/glutenproject/sql/shims/spark33/Spark33Shims.scala +++ b/shims/spark33/src/main/scala/org/apache/gluten/sql/shims/spark33/Spark33Shims.scala @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.sql.shims.spark33 +package org.apache.gluten.sql.shims.spark33 -import io.glutenproject.GlutenConfig -import io.glutenproject.execution.datasource.GlutenParquetWriterInjects -import io.glutenproject.expression.{ExpressionNames, Sig} -import io.glutenproject.expression.ExpressionNames.TIMESTAMP_ADD -import io.glutenproject.sql.shims.{ShimDescriptor, SparkShims} +import org.apache.gluten.GlutenConfig +import org.apache.gluten.execution.datasource.GlutenParquetWriterInjects +import org.apache.gluten.expression.{ExpressionNames, Sig} +import org.apache.gluten.expression.ExpressionNames.TIMESTAMP_ADD +import org.apache.gluten.sql.shims.{ShimDescriptor, SparkShims} import org.apache.spark._ import org.apache.spark.scheduler.TaskInfo diff --git a/shims/spark33/src/main/scala/io/glutenproject/sql/shims/spark33/SparkShimProvider.scala b/shims/spark33/src/main/scala/org/apache/gluten/sql/shims/spark33/SparkShimProvider.scala similarity index 83% rename from shims/spark33/src/main/scala/io/glutenproject/sql/shims/spark33/SparkShimProvider.scala rename to shims/spark33/src/main/scala/org/apache/gluten/sql/shims/spark33/SparkShimProvider.scala index 2c60fe7e3675..4ecf10f940df 100644 --- a/shims/spark33/src/main/scala/io/glutenproject/sql/shims/spark33/SparkShimProvider.scala +++ b/shims/spark33/src/main/scala/org/apache/gluten/sql/shims/spark33/SparkShimProvider.scala @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.sql.shims.spark33 +package org.apache.gluten.sql.shims.spark33 -import io.glutenproject.sql.shims.{SparkShimDescriptor, SparkShims} -import io.glutenproject.sql.shims.spark33.SparkShimProvider.DESCRIPTOR +import org.apache.gluten.sql.shims.{SparkShimDescriptor, SparkShims} +import org.apache.gluten.sql.shims.spark33.SparkShimProvider.DESCRIPTOR object SparkShimProvider { val DESCRIPTOR = SparkShimDescriptor(3, 3, 1) } -class SparkShimProvider extends io.glutenproject.sql.shims.SparkShimProvider { +class SparkShimProvider extends org.apache.gluten.sql.shims.SparkShimProvider { def createShim: SparkShims = { new Spark33Shims() } diff --git a/shims/spark33/src/main/scala/org/apache/spark/sql/execution/FileSourceScanExecShim.scala b/shims/spark33/src/main/scala/org/apache/spark/sql/execution/FileSourceScanExecShim.scala index 92f32f847d96..f0beb19cd557 100644 --- a/shims/spark33/src/main/scala/org/apache/spark/sql/execution/FileSourceScanExecShim.scala +++ b/shims/spark33/src/main/scala/org/apache/spark/sql/execution/FileSourceScanExecShim.scala @@ -16,7 +16,7 @@ */ package org.apache.spark.sql.execution -import io.glutenproject.metrics.GlutenTimeMetric +import org.apache.gluten.metrics.GlutenTimeMetric import org.apache.spark.sql.catalyst.TableIdentifier import org.apache.spark.sql.catalyst.expressions.{And, Attribute, AttributeReference, BoundReference, DynamicPruningExpression, Expression, FileSourceMetadataAttribute, PlanExpression, Predicate} diff --git a/shims/spark33/src/main/scala/org/apache/spark/sql/execution/datasources/FileFormatDataWriter.scala b/shims/spark33/src/main/scala/org/apache/spark/sql/execution/datasources/FileFormatDataWriter.scala index c9beb1fde2d8..f4215ac1368c 100644 --- a/shims/spark33/src/main/scala/org/apache/spark/sql/execution/datasources/FileFormatDataWriter.scala +++ b/shims/spark33/src/main/scala/org/apache/spark/sql/execution/datasources/FileFormatDataWriter.scala @@ -16,7 +16,7 @@ */ package org.apache.spark.sql.execution.datasources -import io.glutenproject.execution.datasource.GlutenRowSplitter +import org.apache.gluten.execution.datasource.GlutenRowSplitter import org.apache.spark.internal.Logging import org.apache.spark.internal.io.{FileCommitProtocol, FileNameSpec} diff --git a/shims/spark33/src/main/scala/org/apache/spark/sql/execution/datasources/FileFormatWriter.scala b/shims/spark33/src/main/scala/org/apache/spark/sql/execution/datasources/FileFormatWriter.scala index 0e6ea140b05e..ebf45e76e74e 100644 --- a/shims/spark33/src/main/scala/org/apache/spark/sql/execution/datasources/FileFormatWriter.scala +++ b/shims/spark33/src/main/scala/org/apache/spark/sql/execution/datasources/FileFormatWriter.scala @@ -16,8 +16,8 @@ */ package org.apache.spark.sql.execution.datasources -import io.glutenproject.execution.datasource.GlutenOrcWriterInjects -import io.glutenproject.execution.datasource.GlutenParquetWriterInjects +import org.apache.gluten.execution.datasource.GlutenOrcWriterInjects +import org.apache.gluten.execution.datasource.GlutenParquetWriterInjects import org.apache.spark._ import org.apache.spark.internal.Logging diff --git a/shims/spark33/src/main/scala/org/apache/spark/sql/execution/datasources/orc/OrcFileFormat.scala b/shims/spark33/src/main/scala/org/apache/spark/sql/execution/datasources/orc/OrcFileFormat.scala index 78042416419b..49ac28d73322 100644 --- a/shims/spark33/src/main/scala/org/apache/spark/sql/execution/datasources/orc/OrcFileFormat.scala +++ b/shims/spark33/src/main/scala/org/apache/spark/sql/execution/datasources/orc/OrcFileFormat.scala @@ -16,8 +16,8 @@ */ package org.apache.spark.sql.execution.datasources.orc -import io.glutenproject.GlutenConfig -import io.glutenproject.execution.datasource.GlutenOrcWriterInjects +import org.apache.gluten.GlutenConfig +import org.apache.gluten.execution.datasource.GlutenOrcWriterInjects import org.apache.spark.TaskContext import org.apache.spark.sql.SparkSession diff --git a/shims/spark33/src/main/scala/org/apache/spark/sql/execution/datasources/parquet/ParquetFileFormat.scala b/shims/spark33/src/main/scala/org/apache/spark/sql/execution/datasources/parquet/ParquetFileFormat.scala index ecf705192cf9..b0573f68e46d 100644 --- a/shims/spark33/src/main/scala/org/apache/spark/sql/execution/datasources/parquet/ParquetFileFormat.scala +++ b/shims/spark33/src/main/scala/org/apache/spark/sql/execution/datasources/parquet/ParquetFileFormat.scala @@ -16,8 +16,8 @@ */ package org.apache.spark.sql.execution.datasources.parquet -import io.glutenproject.GlutenConfig -import io.glutenproject.execution.datasource.GlutenParquetWriterInjects +import org.apache.gluten.GlutenConfig +import org.apache.gluten.execution.datasource.GlutenParquetWriterInjects import org.apache.spark.TaskContext import org.apache.spark.internal.Logging diff --git a/shims/spark33/src/main/scala/org/apache/spark/sql/hive/execution/HiveFileFormat.scala b/shims/spark33/src/main/scala/org/apache/spark/sql/hive/execution/HiveFileFormat.scala index e970cdb67d8a..7a824c43670d 100644 --- a/shims/spark33/src/main/scala/org/apache/spark/sql/hive/execution/HiveFileFormat.scala +++ b/shims/spark33/src/main/scala/org/apache/spark/sql/hive/execution/HiveFileFormat.scala @@ -16,8 +16,8 @@ */ package org.apache.spark.sql.hive.execution -import io.glutenproject.execution.datasource.GlutenOrcWriterInjects -import io.glutenproject.execution.datasource.GlutenParquetWriterInjects +import org.apache.gluten.execution.datasource.GlutenOrcWriterInjects +import org.apache.gluten.execution.datasource.GlutenParquetWriterInjects import org.apache.spark.internal.Logging import org.apache.spark.internal.config.SPECULATION_ENABLED diff --git a/shims/spark34/pom.xml b/shims/spark34/pom.xml index fd84dcb3c923..42d4b830dfd0 100644 --- a/shims/spark34/pom.xml +++ b/shims/spark34/pom.xml @@ -18,7 +18,7 @@ 4.0.0 - io.glutenproject + org.apache.gluten spark-sql-columnar-shims 1.2.0-SNAPSHOT ../pom.xml @@ -30,7 +30,7 @@ - io.glutenproject + org.apache.gluten ${project.prefix}-shims-common ${project.version} compile diff --git a/shims/spark34/src/main/resources/META-INF/services/io.glutenproject.sql.shims.SparkShimProvider b/shims/spark34/src/main/resources/META-INF/services/io.glutenproject.sql.shims.SparkShimProvider deleted file mode 100644 index 1566cfff8d0d..000000000000 --- a/shims/spark34/src/main/resources/META-INF/services/io.glutenproject.sql.shims.SparkShimProvider +++ /dev/null @@ -1 +0,0 @@ -io.glutenproject.sql.shims.spark34.SparkShimProvider \ No newline at end of file diff --git a/shims/spark34/src/main/resources/META-INF/services/org.apache.gluten.sql.shims.SparkShimProvider b/shims/spark34/src/main/resources/META-INF/services/org.apache.gluten.sql.shims.SparkShimProvider new file mode 100644 index 000000000000..911e410d3b0e --- /dev/null +++ b/shims/spark34/src/main/resources/META-INF/services/org.apache.gluten.sql.shims.SparkShimProvider @@ -0,0 +1 @@ +org.apache.gluten.sql.shims.spark34.SparkShimProvider \ No newline at end of file diff --git a/shims/spark34/src/main/scala/io/glutenproject/execution/GenerateTreeStringShim.scala b/shims/spark34/src/main/scala/org/apache/gluten/execution/GenerateTreeStringShim.scala similarity index 98% rename from shims/spark34/src/main/scala/io/glutenproject/execution/GenerateTreeStringShim.scala rename to shims/spark34/src/main/scala/org/apache/gluten/execution/GenerateTreeStringShim.scala index d06728bc7dfa..3e42244bd8c6 100644 --- a/shims/spark34/src/main/scala/io/glutenproject/execution/GenerateTreeStringShim.scala +++ b/shims/spark34/src/main/scala/org/apache/gluten/execution/GenerateTreeStringShim.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution +package org.apache.gluten.execution import org.apache.spark.sql.execution.{SparkPlan, UnaryExecNode} diff --git a/shims/spark34/src/main/scala/io/glutenproject/sql/shims/spark34/Spark34Shims.scala b/shims/spark34/src/main/scala/org/apache/gluten/sql/shims/spark34/Spark34Shims.scala similarity index 98% rename from shims/spark34/src/main/scala/io/glutenproject/sql/shims/spark34/Spark34Shims.scala rename to shims/spark34/src/main/scala/org/apache/gluten/sql/shims/spark34/Spark34Shims.scala index 2732c190ffc6..802d3dcf4cef 100644 --- a/shims/spark34/src/main/scala/io/glutenproject/sql/shims/spark34/Spark34Shims.scala +++ b/shims/spark34/src/main/scala/org/apache/gluten/sql/shims/spark34/Spark34Shims.scala @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.sql.shims.spark34 +package org.apache.gluten.sql.shims.spark34 -import io.glutenproject.GlutenConfig -import io.glutenproject.expression.{ExpressionNames, Sig} -import io.glutenproject.sql.shims.{ShimDescriptor, SparkShims} +import org.apache.gluten.GlutenConfig +import org.apache.gluten.expression.{ExpressionNames, Sig} +import org.apache.gluten.sql.shims.{ShimDescriptor, SparkShims} import org.apache.spark.{ShuffleUtils, SparkContext, SparkContextUtils, SparkException, TaskContext, TaskContextUtils} import org.apache.spark.broadcast.Broadcast diff --git a/shims/spark34/src/main/scala/io/glutenproject/sql/shims/spark34/SparkShimProvider.scala b/shims/spark34/src/main/scala/org/apache/gluten/sql/shims/spark34/SparkShimProvider.scala similarity index 83% rename from shims/spark34/src/main/scala/io/glutenproject/sql/shims/spark34/SparkShimProvider.scala rename to shims/spark34/src/main/scala/org/apache/gluten/sql/shims/spark34/SparkShimProvider.scala index 595ca76da142..1cd5fbdf6cb7 100644 --- a/shims/spark34/src/main/scala/io/glutenproject/sql/shims/spark34/SparkShimProvider.scala +++ b/shims/spark34/src/main/scala/org/apache/gluten/sql/shims/spark34/SparkShimProvider.scala @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.sql.shims.spark34 +package org.apache.gluten.sql.shims.spark34 -import io.glutenproject.sql.shims.{SparkShimDescriptor, SparkShims} -import io.glutenproject.sql.shims.spark34.SparkShimProvider.DESCRIPTOR +import org.apache.gluten.sql.shims.{SparkShimDescriptor, SparkShims} +import org.apache.gluten.sql.shims.spark34.SparkShimProvider.DESCRIPTOR object SparkShimProvider { val DESCRIPTOR = SparkShimDescriptor(3, 4, 2) } -class SparkShimProvider extends io.glutenproject.sql.shims.SparkShimProvider { +class SparkShimProvider extends org.apache.gluten.sql.shims.SparkShimProvider { def createShim: SparkShims = { new Spark34Shims() } diff --git a/shims/spark34/src/main/scala/org/apache/spark/sql/execution/FileSourceScanExecShim.scala b/shims/spark34/src/main/scala/org/apache/spark/sql/execution/FileSourceScanExecShim.scala index 57d1bd06a20e..3c2282358173 100644 --- a/shims/spark34/src/main/scala/org/apache/spark/sql/execution/FileSourceScanExecShim.scala +++ b/shims/spark34/src/main/scala/org/apache/spark/sql/execution/FileSourceScanExecShim.scala @@ -16,7 +16,7 @@ */ package org.apache.spark.sql.execution -import io.glutenproject.metrics.GlutenTimeMetric +import org.apache.gluten.metrics.GlutenTimeMetric import org.apache.spark.sql.catalyst.TableIdentifier import org.apache.spark.sql.catalyst.expressions.{And, Attribute, AttributeReference, BoundReference, Expression, FileSourceConstantMetadataAttribute, FileSourceGeneratedMetadataAttribute, FileSourceMetadataAttribute, PlanExpression, Predicate} diff --git a/shims/spark35/pom.xml b/shims/spark35/pom.xml index d72d2f5bbc88..f5658eee2a3f 100644 --- a/shims/spark35/pom.xml +++ b/shims/spark35/pom.xml @@ -18,7 +18,7 @@ 4.0.0 - io.glutenproject + org.apache.gluten spark-sql-columnar-shims 1.2.0-SNAPSHOT ../pom.xml @@ -30,7 +30,7 @@ - io.glutenproject + org.apache.gluten ${project.prefix}-shims-common ${project.version} compile diff --git a/shims/spark35/src/main/resources/META-INF/services/io.glutenproject.sql.shims.SparkShimProvider b/shims/spark35/src/main/resources/META-INF/services/io.glutenproject.sql.shims.SparkShimProvider deleted file mode 100644 index 44c3420dd057..000000000000 --- a/shims/spark35/src/main/resources/META-INF/services/io.glutenproject.sql.shims.SparkShimProvider +++ /dev/null @@ -1 +0,0 @@ -io.glutenproject.sql.shims.spark35.SparkShimProvider \ No newline at end of file diff --git a/shims/spark35/src/main/resources/META-INF/services/org.apache.gluten.sql.shims.SparkShimProvider b/shims/spark35/src/main/resources/META-INF/services/org.apache.gluten.sql.shims.SparkShimProvider new file mode 100644 index 000000000000..ec5253c6bd40 --- /dev/null +++ b/shims/spark35/src/main/resources/META-INF/services/org.apache.gluten.sql.shims.SparkShimProvider @@ -0,0 +1 @@ +org.apache.gluten.sql.shims.spark35.SparkShimProvider \ No newline at end of file diff --git a/shims/spark35/src/main/scala/io/glutenproject/execution/GenerateTreeStringShim.scala b/shims/spark35/src/main/scala/org/apache/gluten/execution/GenerateTreeStringShim.scala similarity index 98% rename from shims/spark35/src/main/scala/io/glutenproject/execution/GenerateTreeStringShim.scala rename to shims/spark35/src/main/scala/org/apache/gluten/execution/GenerateTreeStringShim.scala index 9d0419967057..1dc6d7f7174d 100644 --- a/shims/spark35/src/main/scala/io/glutenproject/execution/GenerateTreeStringShim.scala +++ b/shims/spark35/src/main/scala/org/apache/gluten/execution/GenerateTreeStringShim.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.execution +package org.apache.gluten.execution import org.apache.spark.sql.execution.{SparkPlan, UnaryExecNode} diff --git a/shims/spark35/src/main/scala/io/glutenproject/sql/shims/spark35/Spark35Shims.scala b/shims/spark35/src/main/scala/org/apache/gluten/sql/shims/spark35/Spark35Shims.scala similarity index 98% rename from shims/spark35/src/main/scala/io/glutenproject/sql/shims/spark35/Spark35Shims.scala rename to shims/spark35/src/main/scala/org/apache/gluten/sql/shims/spark35/Spark35Shims.scala index 1c87db39f83b..371a1982cd91 100644 --- a/shims/spark35/src/main/scala/io/glutenproject/sql/shims/spark35/Spark35Shims.scala +++ b/shims/spark35/src/main/scala/org/apache/gluten/sql/shims/spark35/Spark35Shims.scala @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.sql.shims.spark35 +package org.apache.gluten.sql.shims.spark35 -import io.glutenproject.GlutenConfig -import io.glutenproject.expression.{ExpressionNames, Sig} -import io.glutenproject.sql.shims.{ShimDescriptor, SparkShims} +import org.apache.gluten.GlutenConfig +import org.apache.gluten.expression.{ExpressionNames, Sig} +import org.apache.gluten.sql.shims.{ShimDescriptor, SparkShims} import org.apache.spark.{ShuffleUtils, SparkContext, SparkContextUtils, SparkException, TaskContext, TaskContextUtils} import org.apache.spark.broadcast.Broadcast diff --git a/shims/spark35/src/main/scala/io/glutenproject/sql/shims/spark35/SparkShimProvider.scala b/shims/spark35/src/main/scala/org/apache/gluten/sql/shims/spark35/SparkShimProvider.scala similarity index 83% rename from shims/spark35/src/main/scala/io/glutenproject/sql/shims/spark35/SparkShimProvider.scala rename to shims/spark35/src/main/scala/org/apache/gluten/sql/shims/spark35/SparkShimProvider.scala index 1cac7b913a5b..52bbf4299d44 100644 --- a/shims/spark35/src/main/scala/io/glutenproject/sql/shims/spark35/SparkShimProvider.scala +++ b/shims/spark35/src/main/scala/org/apache/gluten/sql/shims/spark35/SparkShimProvider.scala @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.sql.shims.spark35 +package org.apache.gluten.sql.shims.spark35 -import io.glutenproject.sql.shims.{SparkShimDescriptor, SparkShims} -import io.glutenproject.sql.shims.spark35.SparkShimProvider.DESCRIPTOR +import org.apache.gluten.sql.shims.{SparkShimDescriptor, SparkShims} +import org.apache.gluten.sql.shims.spark35.SparkShimProvider.DESCRIPTOR object SparkShimProvider { val DESCRIPTOR = SparkShimDescriptor(3, 5, 1) } -class SparkShimProvider extends io.glutenproject.sql.shims.SparkShimProvider { +class SparkShimProvider extends org.apache.gluten.sql.shims.SparkShimProvider { def createShim: SparkShims = { new Spark35Shims() } diff --git a/shims/spark35/src/main/scala/org/apache/spark/sql/execution/FileSourceScanExecShim.scala b/shims/spark35/src/main/scala/org/apache/spark/sql/execution/FileSourceScanExecShim.scala index efcb9dbad3b1..4d25192b4464 100644 --- a/shims/spark35/src/main/scala/org/apache/spark/sql/execution/FileSourceScanExecShim.scala +++ b/shims/spark35/src/main/scala/org/apache/spark/sql/execution/FileSourceScanExecShim.scala @@ -16,7 +16,7 @@ */ package org.apache.spark.sql.execution -import io.glutenproject.metrics.GlutenTimeMetric +import org.apache.gluten.metrics.GlutenTimeMetric import org.apache.spark.sql.catalyst.TableIdentifier import org.apache.spark.sql.catalyst.expressions.{And, Attribute, AttributeReference, BoundReference, DynamicPruningExpression, Expression, FileSourceConstantMetadataAttribute, FileSourceGeneratedMetadataAttribute, FileSourceMetadataAttribute, PlanExpression, Predicate} diff --git a/tools/gluten-it/common/pom.xml b/tools/gluten-it/common/pom.xml index 84cef4592afc..4cd4684724ad 100644 --- a/tools/gluten-it/common/pom.xml +++ b/tools/gluten-it/common/pom.xml @@ -5,7 +5,7 @@ 4.0.0 - io.glutenproject + org.apache.gluten gluten-it 1.2.0-SNAPSHOT @@ -21,7 +21,7 @@ ${scala.library.version} - io.glutenproject + org.apache.gluten gluten-package test @@ -136,13 +136,13 @@ io.trino.tpcds:tpcds io.trino.tpch:tpch com.google.guava:guava - io.glutenproject:gluten-it-common + org.apache.gluten:gluten-it-common com.google.common - io.glutenproject.it.com.google.common + org.apache.gluten.it.com.google.common com.google.common.** diff --git a/tools/gluten-it/common/src/main/java/io/glutenproject/integration/tpc/Tpc.java b/tools/gluten-it/common/src/main/java/org/apache/gluten/integration/tpc/Tpc.java similarity index 79% rename from tools/gluten-it/common/src/main/java/io/glutenproject/integration/tpc/Tpc.java rename to tools/gluten-it/common/src/main/java/org/apache/gluten/integration/tpc/Tpc.java index 904ed87c4d85..ceaf71b54672 100644 --- a/tools/gluten-it/common/src/main/java/io/glutenproject/integration/tpc/Tpc.java +++ b/tools/gluten-it/common/src/main/java/org/apache/gluten/integration/tpc/Tpc.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.integration.tpc; +package org.apache.gluten.integration.tpc; -import io.glutenproject.integration.tpc.command.DataGenOnly; -import io.glutenproject.integration.tpc.command.Parameterized; -import io.glutenproject.integration.tpc.command.Queries; -import io.glutenproject.integration.tpc.command.QueriesCompare; -import io.glutenproject.integration.tpc.command.SparkShell; +import org.apache.gluten.integration.tpc.command.DataGenOnly; +import org.apache.gluten.integration.tpc.command.Parameterized; +import org.apache.gluten.integration.tpc.command.Queries; +import org.apache.gluten.integration.tpc.command.QueriesCompare; +import org.apache.gluten.integration.tpc.command.SparkShell; import picocli.CommandLine; @CommandLine.Command(name = "gluten-it", mixinStandardHelpOptions = true, diff --git a/tools/gluten-it/common/src/main/java/io/glutenproject/integration/tpc/TpcMixin.java b/tools/gluten-it/common/src/main/java/org/apache/gluten/integration/tpc/TpcMixin.java similarity index 95% rename from tools/gluten-it/common/src/main/java/io/glutenproject/integration/tpc/TpcMixin.java rename to tools/gluten-it/common/src/main/java/org/apache/gluten/integration/tpc/TpcMixin.java index 74c74ffb68d9..15a8e66cadad 100644 --- a/tools/gluten-it/common/src/main/java/io/glutenproject/integration/tpc/TpcMixin.java +++ b/tools/gluten-it/common/src/main/java/org/apache/gluten/integration/tpc/TpcMixin.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.integration.tpc; +package org.apache.gluten.integration.tpc; -import io.glutenproject.integration.tpc.action.Action; -import io.glutenproject.integration.tpc.command.SparkRunModes; -import io.glutenproject.integration.tpc.ds.TpcdsSuite; -import io.glutenproject.integration.tpc.h.TpchSuite; +import org.apache.gluten.integration.tpc.action.Action; +import org.apache.gluten.integration.tpc.command.SparkRunModes; +import org.apache.gluten.integration.tpc.ds.TpcdsSuite; +import org.apache.gluten.integration.tpc.h.TpchSuite; import org.apache.log4j.Level; import org.apache.spark.SparkConf; import picocli.CommandLine; diff --git a/tools/gluten-it/common/src/main/java/io/glutenproject/integration/tpc/command/DataGenMixin.java b/tools/gluten-it/common/src/main/java/org/apache/gluten/integration/tpc/command/DataGenMixin.java similarity index 87% rename from tools/gluten-it/common/src/main/java/io/glutenproject/integration/tpc/command/DataGenMixin.java rename to tools/gluten-it/common/src/main/java/org/apache/gluten/integration/tpc/command/DataGenMixin.java index ab2b96ae23d0..72ca0c699673 100644 --- a/tools/gluten-it/common/src/main/java/io/glutenproject/integration/tpc/command/DataGenMixin.java +++ b/tools/gluten-it/common/src/main/java/org/apache/gluten/integration/tpc/command/DataGenMixin.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.integration.tpc.command; +package org.apache.gluten.integration.tpc.command; -import io.glutenproject.integration.tpc.action.Action; +import org.apache.gluten.integration.tpc.action.Action; import picocli.CommandLine; public class DataGenMixin { @@ -33,7 +33,7 @@ public Action[] makeActions() { if (skipDataGen) { return new Action[0]; } - return new Action[]{new io.glutenproject.integration.tpc.action.DataGenOnly(scale, genPartitionedData)}; + return new Action[]{new org.apache.gluten.integration.tpc.action.DataGenOnly(scale, genPartitionedData)}; } public double getScale() { diff --git a/tools/gluten-it/common/src/main/java/io/glutenproject/integration/tpc/command/DataGenOnly.java b/tools/gluten-it/common/src/main/java/org/apache/gluten/integration/tpc/command/DataGenOnly.java similarity index 92% rename from tools/gluten-it/common/src/main/java/io/glutenproject/integration/tpc/command/DataGenOnly.java rename to tools/gluten-it/common/src/main/java/org/apache/gluten/integration/tpc/command/DataGenOnly.java index e3b1f03f6844..11e14426fab0 100644 --- a/tools/gluten-it/common/src/main/java/io/glutenproject/integration/tpc/command/DataGenOnly.java +++ b/tools/gluten-it/common/src/main/java/org/apache/gluten/integration/tpc/command/DataGenOnly.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.integration.tpc.command; +package org.apache.gluten.integration.tpc.command; -import io.glutenproject.integration.tpc.TpcMixin; +import org.apache.gluten.integration.tpc.TpcMixin; import picocli.CommandLine; import java.util.concurrent.Callable; diff --git a/tools/gluten-it/common/src/main/java/io/glutenproject/integration/tpc/command/Parameterized.java b/tools/gluten-it/common/src/main/java/org/apache/gluten/integration/tpc/command/Parameterized.java similarity index 92% rename from tools/gluten-it/common/src/main/java/io/glutenproject/integration/tpc/command/Parameterized.java rename to tools/gluten-it/common/src/main/java/org/apache/gluten/integration/tpc/command/Parameterized.java index 52632c778bf8..7c9c6439989a 100644 --- a/tools/gluten-it/common/src/main/java/io/glutenproject/integration/tpc/command/Parameterized.java +++ b/tools/gluten-it/common/src/main/java/org/apache/gluten/integration/tpc/command/Parameterized.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.integration.tpc.command; +package org.apache.gluten.integration.tpc.command; -import io.glutenproject.integration.tpc.TpcMixin; -import io.glutenproject.integration.tpc.action.Dim; -import io.glutenproject.integration.tpc.action.DimValue; +import org.apache.gluten.integration.tpc.TpcMixin; +import org.apache.gluten.integration.tpc.action.Dim; +import org.apache.gluten.integration.tpc.action.DimValue; import org.apache.commons.lang3.ArrayUtils; import picocli.CommandLine; import scala.Tuple2; @@ -121,8 +121,8 @@ public Integer call() throws Exception { .collect(Collectors.toList())).asScala())).collect(Collectors.toList())).asScala() )).collect(Collectors.toList())).asScala(); - io.glutenproject.integration.tpc.action.Parameterized parameterized = - new io.glutenproject.integration.tpc.action.Parameterized(dataGenMixin.getScale(), this.queries, excludedQueries, iterations, warmupIterations, parsedDims, metrics); + org.apache.gluten.integration.tpc.action.Parameterized parameterized = + new org.apache.gluten.integration.tpc.action.Parameterized(dataGenMixin.getScale(), this.queries, excludedQueries, iterations, warmupIterations, parsedDims, metrics); return mixin.runActions(ArrayUtils.addAll(dataGenMixin.makeActions(), parameterized)); } } diff --git a/tools/gluten-it/common/src/main/java/io/glutenproject/integration/tpc/command/Queries.java b/tools/gluten-it/common/src/main/java/org/apache/gluten/integration/tpc/command/Queries.java similarity index 87% rename from tools/gluten-it/common/src/main/java/io/glutenproject/integration/tpc/command/Queries.java rename to tools/gluten-it/common/src/main/java/org/apache/gluten/integration/tpc/command/Queries.java index 4645045a434b..81a2bb17b5da 100644 --- a/tools/gluten-it/common/src/main/java/io/glutenproject/integration/tpc/command/Queries.java +++ b/tools/gluten-it/common/src/main/java/org/apache/gluten/integration/tpc/command/Queries.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.integration.tpc.command; +package org.apache.gluten.integration.tpc.command; -import io.glutenproject.integration.tpc.TpcMixin; +import org.apache.gluten.integration.tpc.TpcMixin; import org.apache.commons.lang3.ArrayUtils; import picocli.CommandLine; @@ -49,8 +49,8 @@ public class Queries implements Callable { @Override public Integer call() throws Exception { - io.glutenproject.integration.tpc.action.Queries queries = - new io.glutenproject.integration.tpc.action.Queries(dataGenMixin.getScale(), this.queries, this.excludedQueries, explain, iterations, randomKillTasks); + org.apache.gluten.integration.tpc.action.Queries queries = + new org.apache.gluten.integration.tpc.action.Queries(dataGenMixin.getScale(), this.queries, this.excludedQueries, explain, iterations, randomKillTasks); return mixin.runActions(ArrayUtils.addAll(dataGenMixin.makeActions(), queries)); } } diff --git a/tools/gluten-it/common/src/main/java/io/glutenproject/integration/tpc/command/QueriesCompare.java b/tools/gluten-it/common/src/main/java/org/apache/gluten/integration/tpc/command/QueriesCompare.java similarity index 86% rename from tools/gluten-it/common/src/main/java/io/glutenproject/integration/tpc/command/QueriesCompare.java rename to tools/gluten-it/common/src/main/java/org/apache/gluten/integration/tpc/command/QueriesCompare.java index d2e09bc7dc84..702de78b35dd 100644 --- a/tools/gluten-it/common/src/main/java/io/glutenproject/integration/tpc/command/QueriesCompare.java +++ b/tools/gluten-it/common/src/main/java/org/apache/gluten/integration/tpc/command/QueriesCompare.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.integration.tpc.command; +package org.apache.gluten.integration.tpc.command; -import io.glutenproject.integration.tpc.TpcMixin; +import org.apache.gluten.integration.tpc.TpcMixin; import org.apache.commons.lang3.ArrayUtils; import picocli.CommandLine; @@ -46,8 +46,8 @@ public class QueriesCompare implements Callable { @Override public Integer call() throws Exception { - io.glutenproject.integration.tpc.action.QueriesCompare queriesCompare = - new io.glutenproject.integration.tpc.action.QueriesCompare(dataGenMixin.getScale(), this.queries, this.excludedQueries, explain, iterations); + org.apache.gluten.integration.tpc.action.QueriesCompare queriesCompare = + new org.apache.gluten.integration.tpc.action.QueriesCompare(dataGenMixin.getScale(), this.queries, this.excludedQueries, explain, iterations); return mixin.runActions(ArrayUtils.addAll(dataGenMixin.makeActions(), queriesCompare)); } } diff --git a/tools/gluten-it/common/src/main/java/io/glutenproject/integration/tpc/command/SparkRunModes.java b/tools/gluten-it/common/src/main/java/org/apache/gluten/integration/tpc/command/SparkRunModes.java similarity index 99% rename from tools/gluten-it/common/src/main/java/io/glutenproject/integration/tpc/command/SparkRunModes.java rename to tools/gluten-it/common/src/main/java/org/apache/gluten/integration/tpc/command/SparkRunModes.java index 1d2ac2377cfa..987099902b03 100644 --- a/tools/gluten-it/common/src/main/java/io/glutenproject/integration/tpc/command/SparkRunModes.java +++ b/tools/gluten-it/common/src/main/java/org/apache/gluten/integration/tpc/command/SparkRunModes.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.integration.tpc.command; +package org.apache.gluten.integration.tpc.command; import org.apache.spark.launcher.SparkLauncher; import org.apache.spark.util.Utils; diff --git a/tools/gluten-it/common/src/main/java/io/glutenproject/integration/tpc/command/SparkShell.java b/tools/gluten-it/common/src/main/java/org/apache/gluten/integration/tpc/command/SparkShell.java similarity index 84% rename from tools/gluten-it/common/src/main/java/io/glutenproject/integration/tpc/command/SparkShell.java rename to tools/gluten-it/common/src/main/java/org/apache/gluten/integration/tpc/command/SparkShell.java index 805c0775cd5c..f16cedb86cb4 100644 --- a/tools/gluten-it/common/src/main/java/io/glutenproject/integration/tpc/command/SparkShell.java +++ b/tools/gluten-it/common/src/main/java/org/apache/gluten/integration/tpc/command/SparkShell.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.integration.tpc.command; +package org.apache.gluten.integration.tpc.command; -import io.glutenproject.integration.tpc.TpcMixin; +import org.apache.gluten.integration.tpc.TpcMixin; import org.apache.commons.lang3.ArrayUtils; import picocli.CommandLine; @@ -34,8 +34,8 @@ public class SparkShell implements Callable { @Override public Integer call() throws Exception { - io.glutenproject.integration.tpc.action.SparkShell sparkShell = - new io.glutenproject.integration.tpc.action.SparkShell(dataGenMixin.getScale()); + org.apache.gluten.integration.tpc.action.SparkShell sparkShell = + new org.apache.gluten.integration.tpc.action.SparkShell(dataGenMixin.getScale()); return mixin.runActions(ArrayUtils.addAll(dataGenMixin.makeActions(), sparkShell)); } } diff --git a/tools/gluten-it/common/src/main/scala/io/glutenproject/integration/stat/RamStat.scala b/tools/gluten-it/common/src/main/scala/org/apache/gluten/integration/stat/RamStat.scala similarity index 98% rename from tools/gluten-it/common/src/main/scala/io/glutenproject/integration/stat/RamStat.scala rename to tools/gluten-it/common/src/main/scala/org/apache/gluten/integration/stat/RamStat.scala index f4f8947d5314..9cc06cbcfd60 100644 --- a/tools/gluten-it/common/src/main/scala/io/glutenproject/integration/stat/RamStat.scala +++ b/tools/gluten-it/common/src/main/scala/org/apache/gluten/integration/stat/RamStat.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.integration.stat +package org.apache.gluten.integration.stat import java.io.InputStreamReader import java.lang.management.ManagementFactory diff --git a/tools/gluten-it/common/src/main/scala/io/glutenproject/integration/tpc/Constants.scala b/tools/gluten-it/common/src/main/scala/org/apache/gluten/integration/tpc/Constants.scala similarity index 96% rename from tools/gluten-it/common/src/main/scala/io/glutenproject/integration/tpc/Constants.scala rename to tools/gluten-it/common/src/main/scala/org/apache/gluten/integration/tpc/Constants.scala index 5e10d6f645ad..44a02593280a 100644 --- a/tools/gluten-it/common/src/main/scala/io/glutenproject/integration/tpc/Constants.scala +++ b/tools/gluten-it/common/src/main/scala/org/apache/gluten/integration/tpc/Constants.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.integration.tpc +package org.apache.gluten.integration.tpc import org.apache.spark.SparkConf import org.apache.spark.sql.TypeUtils @@ -29,7 +29,7 @@ object Constants { val VELOX_CONF: SparkConf = new SparkConf(false) .set("spark.gluten.sql.columnar.forceShuffledHashJoin", "true") .set("spark.sql.parquet.enableVectorizedReader", "true") - .set("spark.plugins", "io.glutenproject.GlutenPlugin") + .set("spark.plugins", "org.apache.gluten.GlutenPlugin") .set("spark.shuffle.manager", "org.apache.spark.shuffle.sort.ColumnarShuffleManager") .set("spark.sql.optimizer.runtime.bloomFilter.enabled", "true") .set("spark.sql.optimizer.runtime.bloomFilter.applicationSideScanSizeThreshold", "0") @@ -41,7 +41,7 @@ object Constants { val VELOX_WITH_CELEBORN_CONF: SparkConf = new SparkConf(false) .set("spark.gluten.sql.columnar.forceShuffledHashJoin", "true") .set("spark.sql.parquet.enableVectorizedReader", "true") - .set("spark.plugins", "io.glutenproject.GlutenPlugin") + .set("spark.plugins", "org.apache.gluten.GlutenPlugin") .set("spark.shuffle.manager", "org.apache.spark.shuffle.gluten.celeborn.CelebornShuffleManager") .set("spark.celeborn.shuffle.writer", "hash") .set("spark.celeborn.push.replicate.enabled", "false") diff --git a/tools/gluten-it/common/src/main/scala/io/glutenproject/integration/tpc/DataGen.scala b/tools/gluten-it/common/src/main/scala/org/apache/gluten/integration/tpc/DataGen.scala similarity index 98% rename from tools/gluten-it/common/src/main/scala/io/glutenproject/integration/tpc/DataGen.scala rename to tools/gluten-it/common/src/main/scala/org/apache/gluten/integration/tpc/DataGen.scala index 3848de6ece60..5c092089def7 100644 --- a/tools/gluten-it/common/src/main/scala/io/glutenproject/integration/tpc/DataGen.scala +++ b/tools/gluten-it/common/src/main/scala/org/apache/gluten/integration/tpc/DataGen.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.integration.tpc +package org.apache.gluten.integration.tpc import org.apache.spark.sql.types.{DataType, StructField, StructType} diff --git a/tools/gluten-it/common/src/main/scala/io/glutenproject/integration/tpc/ShimUtils.scala b/tools/gluten-it/common/src/main/scala/org/apache/gluten/integration/tpc/ShimUtils.scala similarity index 97% rename from tools/gluten-it/common/src/main/scala/io/glutenproject/integration/tpc/ShimUtils.scala rename to tools/gluten-it/common/src/main/scala/org/apache/gluten/integration/tpc/ShimUtils.scala index 340a23904aea..c64fa160fd29 100644 --- a/tools/gluten-it/common/src/main/scala/io/glutenproject/integration/tpc/ShimUtils.scala +++ b/tools/gluten-it/common/src/main/scala/org/apache/gluten/integration/tpc/ShimUtils.scala @@ -15,7 +15,7 @@ * limitations under the License. */ -package io.glutenproject.integration.tpc +package org.apache.gluten.integration.tpc import org.apache.spark.sql.Row import org.apache.spark.sql.catalyst.encoders.{ExpressionEncoder, RowEncoder} diff --git a/tools/gluten-it/common/src/main/scala/io/glutenproject/integration/tpc/TpcRunner.scala b/tools/gluten-it/common/src/main/scala/org/apache/gluten/integration/tpc/TpcRunner.scala similarity index 98% rename from tools/gluten-it/common/src/main/scala/io/glutenproject/integration/tpc/TpcRunner.scala rename to tools/gluten-it/common/src/main/scala/org/apache/gluten/integration/tpc/TpcRunner.scala index f15b2a994079..f198a5a0301c 100644 --- a/tools/gluten-it/common/src/main/scala/io/glutenproject/integration/tpc/TpcRunner.scala +++ b/tools/gluten-it/common/src/main/scala/org/apache/gluten/integration/tpc/TpcRunner.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.integration.tpc +package org.apache.gluten.integration.tpc import org.apache.spark.sql.{QueryRunner, RunResult, SparkSession} diff --git a/tools/gluten-it/common/src/main/scala/io/glutenproject/integration/tpc/TpcSuite.scala b/tools/gluten-it/common/src/main/scala/org/apache/gluten/integration/tpc/TpcSuite.scala similarity index 98% rename from tools/gluten-it/common/src/main/scala/io/glutenproject/integration/tpc/TpcSuite.scala rename to tools/gluten-it/common/src/main/scala/org/apache/gluten/integration/tpc/TpcSuite.scala index fa8e87fbb90c..c612e3c6ae71 100644 --- a/tools/gluten-it/common/src/main/scala/io/glutenproject/integration/tpc/TpcSuite.scala +++ b/tools/gluten-it/common/src/main/scala/org/apache/gluten/integration/tpc/TpcSuite.scala @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.integration.tpc +package org.apache.gluten.integration.tpc -import io.glutenproject.integration.tpc.action.Action +import org.apache.gluten.integration.tpc.action.Action import org.apache.spark.SparkConf import org.apache.spark.deploy.history.HistoryServerHelper diff --git a/tools/gluten-it/common/src/main/scala/io/glutenproject/integration/tpc/action/Actions.scala b/tools/gluten-it/common/src/main/scala/org/apache/gluten/integration/tpc/action/Actions.scala similarity index 89% rename from tools/gluten-it/common/src/main/scala/io/glutenproject/integration/tpc/action/Actions.scala rename to tools/gluten-it/common/src/main/scala/org/apache/gluten/integration/tpc/action/Actions.scala index a405053fab18..90713c50c566 100644 --- a/tools/gluten-it/common/src/main/scala/io/glutenproject/integration/tpc/action/Actions.scala +++ b/tools/gluten-it/common/src/main/scala/org/apache/gluten/integration/tpc/action/Actions.scala @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.integration.tpc.action +package org.apache.gluten.integration.tpc.action -import io.glutenproject.integration.tpc.TpcSuite +import org.apache.gluten.integration.tpc.TpcSuite trait Action { def execute(tpcSuite: TpcSuite): Boolean diff --git a/tools/gluten-it/common/src/main/scala/io/glutenproject/integration/tpc/action/DataGenOnly.scala b/tools/gluten-it/common/src/main/scala/org/apache/gluten/integration/tpc/action/DataGenOnly.scala similarity index 91% rename from tools/gluten-it/common/src/main/scala/io/glutenproject/integration/tpc/action/DataGenOnly.scala rename to tools/gluten-it/common/src/main/scala/org/apache/gluten/integration/tpc/action/DataGenOnly.scala index 3dad1e5a0e6b..488bb19adaef 100644 --- a/tools/gluten-it/common/src/main/scala/io/glutenproject/integration/tpc/action/DataGenOnly.scala +++ b/tools/gluten-it/common/src/main/scala/org/apache/gluten/integration/tpc/action/DataGenOnly.scala @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.integration.tpc.action +package org.apache.gluten.integration.tpc.action -import io.glutenproject.integration.tpc.TpcSuite +import org.apache.gluten.integration.tpc.TpcSuite import java.io.File diff --git a/tools/gluten-it/common/src/main/scala/io/glutenproject/integration/tpc/action/Parameterized.scala b/tools/gluten-it/common/src/main/scala/org/apache/gluten/integration/tpc/action/Parameterized.scala similarity index 98% rename from tools/gluten-it/common/src/main/scala/io/glutenproject/integration/tpc/action/Parameterized.scala rename to tools/gluten-it/common/src/main/scala/org/apache/gluten/integration/tpc/action/Parameterized.scala index cd3d97baa40e..c1a2a1085440 100644 --- a/tools/gluten-it/common/src/main/scala/io/glutenproject/integration/tpc/action/Parameterized.scala +++ b/tools/gluten-it/common/src/main/scala/org/apache/gluten/integration/tpc/action/Parameterized.scala @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.integration.tpc.action +package org.apache.gluten.integration.tpc.action -import io.glutenproject.integration.stat.RamStat -import io.glutenproject.integration.tpc.{TpcRunner, TpcSuite} +import org.apache.gluten.integration.stat.RamStat +import org.apache.gluten.integration.tpc.{TpcRunner, TpcSuite} import org.apache.spark.sql.ConfUtils.ConfImplicits._ import org.apache.spark.sql.SparkSessionSwitcher diff --git a/tools/gluten-it/common/src/main/scala/io/glutenproject/integration/tpc/action/Queries.scala b/tools/gluten-it/common/src/main/scala/org/apache/gluten/integration/tpc/action/Queries.scala similarity index 95% rename from tools/gluten-it/common/src/main/scala/io/glutenproject/integration/tpc/action/Queries.scala rename to tools/gluten-it/common/src/main/scala/org/apache/gluten/integration/tpc/action/Queries.scala index 632e6489a3af..c5e9cc9d9d2c 100644 --- a/tools/gluten-it/common/src/main/scala/io/glutenproject/integration/tpc/action/Queries.scala +++ b/tools/gluten-it/common/src/main/scala/org/apache/gluten/integration/tpc/action/Queries.scala @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.integration.tpc.action +package org.apache.gluten.integration.tpc.action -import io.glutenproject.integration.stat.RamStat -import io.glutenproject.integration.tpc.{TpcRunner, TpcSuite} +import org.apache.gluten.integration.stat.RamStat +import org.apache.gluten.integration.tpc.{TpcRunner, TpcSuite} import org.apache.commons.lang3.exception.ExceptionUtils @@ -148,7 +148,7 @@ object Queries { } private def runTpcQuery( - runner: _root_.io.glutenproject.integration.tpc.TpcRunner, + runner: _root_.org.apache.gluten.integration.tpc.TpcRunner, sessionSwitcher: _root_.org.apache.spark.sql.SparkSessionSwitcher, id: _root_.java.lang.String, desc: _root_.java.lang.String, diff --git a/tools/gluten-it/common/src/main/scala/io/glutenproject/integration/tpc/action/QueriesCompare.scala b/tools/gluten-it/common/src/main/scala/org/apache/gluten/integration/tpc/action/QueriesCompare.scala similarity index 97% rename from tools/gluten-it/common/src/main/scala/io/glutenproject/integration/tpc/action/QueriesCompare.scala rename to tools/gluten-it/common/src/main/scala/org/apache/gluten/integration/tpc/action/QueriesCompare.scala index 47ba9eb54e89..32b7c59c8be7 100644 --- a/tools/gluten-it/common/src/main/scala/io/glutenproject/integration/tpc/action/QueriesCompare.scala +++ b/tools/gluten-it/common/src/main/scala/org/apache/gluten/integration/tpc/action/QueriesCompare.scala @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.integration.tpc.action +package org.apache.gluten.integration.tpc.action -import io.glutenproject.integration.stat.RamStat -import io.glutenproject.integration.tpc.{TpcRunner, TpcSuite} +import org.apache.gluten.integration.stat.RamStat +import org.apache.gluten.integration.tpc.{TpcRunner, TpcSuite} import org.apache.spark.sql.{SparkSessionSwitcher, TestUtils} diff --git a/tools/gluten-it/common/src/main/scala/io/glutenproject/integration/tpc/action/SparkShell.scala b/tools/gluten-it/common/src/main/scala/org/apache/gluten/integration/tpc/action/SparkShell.scala similarity index 92% rename from tools/gluten-it/common/src/main/scala/io/glutenproject/integration/tpc/action/SparkShell.scala rename to tools/gluten-it/common/src/main/scala/org/apache/gluten/integration/tpc/action/SparkShell.scala index def306841c21..78e816955e2e 100644 --- a/tools/gluten-it/common/src/main/scala/io/glutenproject/integration/tpc/action/SparkShell.scala +++ b/tools/gluten-it/common/src/main/scala/org/apache/gluten/integration/tpc/action/SparkShell.scala @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.integration.tpc.action +package org.apache.gluten.integration.tpc.action -import io.glutenproject.integration.tpc.{TpcRunner, TpcSuite} +import org.apache.gluten.integration.tpc.{TpcRunner, TpcSuite} import org.apache.spark.repl.Main diff --git a/tools/gluten-it/common/src/main/scala/io/glutenproject/integration/tpc/ds/TpcdsDataGen.scala b/tools/gluten-it/common/src/main/scala/org/apache/gluten/integration/tpc/ds/TpcdsDataGen.scala similarity index 99% rename from tools/gluten-it/common/src/main/scala/io/glutenproject/integration/tpc/ds/TpcdsDataGen.scala rename to tools/gluten-it/common/src/main/scala/org/apache/gluten/integration/tpc/ds/TpcdsDataGen.scala index c93faf5db6e3..081e547477f7 100644 --- a/tools/gluten-it/common/src/main/scala/io/glutenproject/integration/tpc/ds/TpcdsDataGen.scala +++ b/tools/gluten-it/common/src/main/scala/org/apache/gluten/integration/tpc/ds/TpcdsDataGen.scala @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.integration.tpc.ds +package org.apache.gluten.integration.tpc.ds -import io.glutenproject.integration.tpc.{DataGen, ShimUtils, TypeModifier} +import org.apache.gluten.integration.tpc.{DataGen, ShimUtils, TypeModifier} import org.apache.spark.sql.{Column, Row, SaveMode, SparkSession} import org.apache.spark.sql.types._ diff --git a/tools/gluten-it/common/src/main/scala/io/glutenproject/integration/tpc/ds/TpcdsSuite.scala b/tools/gluten-it/common/src/main/scala/org/apache/gluten/integration/tpc/ds/TpcdsSuite.scala similarity index 92% rename from tools/gluten-it/common/src/main/scala/io/glutenproject/integration/tpc/ds/TpcdsSuite.scala rename to tools/gluten-it/common/src/main/scala/org/apache/gluten/integration/tpc/ds/TpcdsSuite.scala index eea983a51074..37a88d446f3e 100644 --- a/tools/gluten-it/common/src/main/scala/io/glutenproject/integration/tpc/ds/TpcdsSuite.scala +++ b/tools/gluten-it/common/src/main/scala/org/apache/gluten/integration/tpc/ds/TpcdsSuite.scala @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.integration.tpc.ds +package org.apache.gluten.integration.tpc.ds -import io.glutenproject.integration.tpc.{Constants, DataGen, TpcSuite, TypeModifier} -import io.glutenproject.integration.tpc.action.Action -import io.glutenproject.integration.tpc.ds.TpcdsSuite.{ALL_QUERY_IDS, HISTORY_WRITE_PATH, TPCDS_WRITE_PATH} +import org.apache.gluten.integration.tpc.{Constants, DataGen, TpcSuite, TypeModifier} +import org.apache.gluten.integration.tpc.action.Action +import org.apache.gluten.integration.tpc.ds.TpcdsSuite.{ALL_QUERY_IDS, HISTORY_WRITE_PATH, TPCDS_WRITE_PATH} import org.apache.spark.SparkConf diff --git a/tools/gluten-it/common/src/main/scala/io/glutenproject/integration/tpc/h/TpchDataGen.scala b/tools/gluten-it/common/src/main/scala/org/apache/gluten/integration/tpc/h/TpchDataGen.scala similarity index 98% rename from tools/gluten-it/common/src/main/scala/io/glutenproject/integration/tpc/h/TpchDataGen.scala rename to tools/gluten-it/common/src/main/scala/org/apache/gluten/integration/tpc/h/TpchDataGen.scala index b42f51143afe..18c557045d75 100644 --- a/tools/gluten-it/common/src/main/scala/io/glutenproject/integration/tpc/h/TpchDataGen.scala +++ b/tools/gluten-it/common/src/main/scala/org/apache/gluten/integration/tpc/h/TpchDataGen.scala @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.integration.tpc.h +package org.apache.gluten.integration.tpc.h -import io.glutenproject.integration.tpc.{DataGen, ShimUtils, TypeModifier} +import org.apache.gluten.integration.tpc.{DataGen, ShimUtils, TypeModifier} import org.apache.spark.sql.{Row, SaveMode, SparkSession} import org.apache.spark.sql.types._ diff --git a/tools/gluten-it/common/src/main/scala/io/glutenproject/integration/tpc/h/TpchSuite.scala b/tools/gluten-it/common/src/main/scala/org/apache/gluten/integration/tpc/h/TpchSuite.scala similarity index 91% rename from tools/gluten-it/common/src/main/scala/io/glutenproject/integration/tpc/h/TpchSuite.scala rename to tools/gluten-it/common/src/main/scala/org/apache/gluten/integration/tpc/h/TpchSuite.scala index 526075aa2258..418c7ca6a08f 100644 --- a/tools/gluten-it/common/src/main/scala/io/glutenproject/integration/tpc/h/TpchSuite.scala +++ b/tools/gluten-it/common/src/main/scala/org/apache/gluten/integration/tpc/h/TpchSuite.scala @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.integration.tpc.h +package org.apache.gluten.integration.tpc.h -import io.glutenproject.integration.tpc.{DataGen, TpcSuite, TypeModifier} -import io.glutenproject.integration.tpc.action.Action -import io.glutenproject.integration.tpc.h.TpchSuite.{HISTORY_WRITE_PATH, TPCH_WRITE_PATH} +import org.apache.gluten.integration.tpc.{DataGen, TpcSuite, TypeModifier} +import org.apache.gluten.integration.tpc.action.Action +import org.apache.gluten.integration.tpc.h.TpchSuite.{HISTORY_WRITE_PATH, TPCH_WRITE_PATH} import org.apache.spark.SparkConf diff --git a/tools/gluten-it/common/src/test/java/io/glutenproject/integration/tpc/TpcTest.java b/tools/gluten-it/common/src/test/java/org/apache/gluten/integration/tpc/TpcTest.java similarity index 95% rename from tools/gluten-it/common/src/test/java/io/glutenproject/integration/tpc/TpcTest.java rename to tools/gluten-it/common/src/test/java/org/apache/gluten/integration/tpc/TpcTest.java index 42f7f6817460..2463429afdfb 100644 --- a/tools/gluten-it/common/src/test/java/io/glutenproject/integration/tpc/TpcTest.java +++ b/tools/gluten-it/common/src/test/java/org/apache/gluten/integration/tpc/TpcTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.glutenproject.integration.tpc; +package org.apache.gluten.integration.tpc; public class TpcTest { public static void main(String[] args) { diff --git a/tools/gluten-it/package/pom.xml b/tools/gluten-it/package/pom.xml index 29c38c281f60..6852edcfe8eb 100644 --- a/tools/gluten-it/package/pom.xml +++ b/tools/gluten-it/package/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - io.glutenproject + org.apache.gluten gluten-it 1.2.0-SNAPSHOT @@ -14,7 +14,7 @@ - io.glutenproject + org.apache.gluten gluten-it-common ${gluten.version} @@ -33,7 +33,7 @@ - io.glutenproject + org.apache.gluten gluten-package runtime diff --git a/tools/gluten-it/pom.xml b/tools/gluten-it/pom.xml index 74e1da2f45d9..128bf4b26295 100644 --- a/tools/gluten-it/pom.xml +++ b/tools/gluten-it/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - io.glutenproject + org.apache.gluten gluten-it 1.2.0-SNAPSHOT pom @@ -31,12 +31,12 @@ - io.glutenproject + org.apache.gluten gluten-package ${gluten.version} - io.glutenproject + org.apache.gluten gluten-core diff --git a/tools/gluten-it/sbin/gluten-it.sh b/tools/gluten-it/sbin/gluten-it.sh index 98a2408783fd..5262df0541e3 100755 --- a/tools/gluten-it/sbin/gluten-it.sh +++ b/tools/gluten-it/sbin/gluten-it.sh @@ -47,4 +47,4 @@ $JAVA_HOME/bin/java $GLUTEN_IT_JVM_ARGS \ -Djdk.reflect.useDirectMethodHandle=false \ -Dio.netty.tryReflectionSetAccessible=true \ -cp $JAR_PATH \ - io.glutenproject.integration.tpc.Tpc $@ + org.apache.gluten.integration.tpc.Tpc $@ diff --git a/tools/gluten-te/ubuntu/tpc.sh b/tools/gluten-te/ubuntu/tpc.sh index 4a65b824a28c..1c1201692173 100755 --- a/tools/gluten-te/ubuntu/tpc.sh +++ b/tools/gluten-te/ubuntu/tpc.sh @@ -136,7 +136,7 @@ then fi JAVA_ARGS="$JAVA_ARGS $EXTRA_JAVA_OPTIONS" JAVA_ARGS="$JAVA_ARGS -cp '/opt/gluten/tools/gluten-it/package/target/lib/*'" -JAVA_ARGS="$JAVA_ARGS io.glutenproject.integration.tpc.Tpc $TPC_CMD_ARGS" +JAVA_ARGS="$JAVA_ARGS org.apache.gluten.integration.tpc.Tpc $TPC_CMD_ARGS" BASH_ARGS= if [ "$RUN_GDB" == "ON" ] diff --git a/tools/workload/tpcds/run_tpcds/run_tpcds.sh b/tools/workload/tpcds/run_tpcds/run_tpcds.sh index 7e970373910b..0354f0b90b75 100755 --- a/tools/workload/tpcds/run_tpcds/run_tpcds.sh +++ b/tools/workload/tpcds/run_tpcds/run_tpcds.sh @@ -18,7 +18,7 @@ SPARK_HOME=/PATH_TO_SPARK_HOME/ cat tpcds_parquet.scala | ${SPARK_HOME}/bin/spark-shell \ --master yarn --deploy-mode client \ - --conf spark.plugins=io.glutenproject.GlutenPlugin \ + --conf spark.plugins=org.apache.gluten.GlutenPlugin \ --conf spark.driver.extraClassPath=${GLUTEN_JAR} \ --conf spark.executor.extraClassPath=${GLUTEN_JAR} \ --conf spark.memory.offHeap.enabled=true \ diff --git a/tools/workload/tpch/gen_data/dwrf_dataset/tpch_convert_parquet_dwrf.sh b/tools/workload/tpch/gen_data/dwrf_dataset/tpch_convert_parquet_dwrf.sh index 156087d15314..2dc05c9aa7dd 100644 --- a/tools/workload/tpch/gen_data/dwrf_dataset/tpch_convert_parquet_dwrf.sh +++ b/tools/workload/tpch/gen_data/dwrf_dataset/tpch_convert_parquet_dwrf.sh @@ -27,7 +27,7 @@ cat tpch_convert_parquet_dwrf.scala | ${SPARK_HOME}/bin/spark-shell --executor-cores 8 \ --num-executors 14 \ --executor-memory 30g \ - --conf spark.plugins=io.glutenproject.GlutenPlugin \ + --conf spark.plugins=org.apache.gluten.GlutenPlugin \ --conf spark.driver.extraClassPath=${GLUTEN_JVM_JAR} \ --conf spark.executor.extraClassPath=${GLUTEN_JVM_JAR} \ --conf spark.memory.offHeap.size=30g \ diff --git a/tools/workload/tpch/run_tpch/tpch_parquet.sh b/tools/workload/tpch/run_tpch/tpch_parquet.sh index a77eeaf3c0ba..92e2070c4965 100755 --- a/tools/workload/tpch/run_tpch/tpch_parquet.sh +++ b/tools/workload/tpch/run_tpch/tpch_parquet.sh @@ -17,7 +17,7 @@ GLUTEN_JAR=/PATH_TO_GLUTEN_HOME/package/target/ SPARK_HOME=/PATH_TO_SPARK_HOME/ cat tpch_parquet.scala | ${SPARK_HOME}/bin/spark-shell \ --master yarn --deploy-mode client \ - --conf spark.plugins=io.glutenproject.GlutenPlugin \ + --conf spark.plugins=org.apache.gluten.GlutenPlugin \ --conf spark.driver.extraClassPath=${GLUTEN_JAR} \ --conf spark.executor.extraClassPath=${GLUTEN_JAR} \ --conf spark.memory.offHeap.enabled=true \