diff --git a/gluten-delta/pom.xml b/gluten-delta/pom.xml index c3985a7a8e9f..6a6b7291d756 100755 --- a/gluten-delta/pom.xml +++ b/gluten-delta/pom.xml @@ -167,21 +167,21 @@ org.apache.maven.plugins maven-resources-plugin - - - org.codehaus.mojo - build-helper-maven-plugin - add-sources + copy-resources generate-sources - add-source + copy-resources - - src/main/delta-${delta.binary.version} - + src/main/scala/org/apache/gluten/execution + + + src/main/delta-${delta.binary.version}/org/apache/gluten/execution + + + true diff --git a/gluten-delta/src/main/delta-23/org/apache/gluten/execution/DeltaFilterExecTransformer.scala b/gluten-delta/src/main/delta-23/org/apache/gluten/execution/DeltaFilterExecTransformer.scala deleted file mode 100644 index ca4665c0d0cb..000000000000 --- a/gluten-delta/src/main/delta-23/org/apache/gluten/execution/DeltaFilterExecTransformer.scala +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.gluten.execution - -import org.apache.spark.sql.catalyst.expressions.Expression -import org.apache.spark.sql.execution.SparkPlan - -case class DeltaFilterExecTransformer(condition: Expression, child: SparkPlan) - extends FilterExecTransformerBase(condition, child) { - - override protected def withNewChildInternal(newChild: SparkPlan): DeltaFilterExecTransformer = - copy(child = newChild) -} diff --git a/gluten-delta/src/main/delta-23/org/apache/gluten/execution/DeltaProjectExecTransformer.scala b/gluten-delta/src/main/delta-23/org/apache/gluten/execution/DeltaProjectExecTransformer.scala deleted file mode 100644 index 9b720b19c5ba..000000000000 --- a/gluten-delta/src/main/delta-23/org/apache/gluten/execution/DeltaProjectExecTransformer.scala +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.gluten.execution - -import org.apache.spark.sql.catalyst.expressions.NamedExpression -import org.apache.spark.sql.execution.SparkPlan - -case class DeltaProjectExecTransformer(projectList: Seq[NamedExpression], child: SparkPlan) - extends ProjectExecTransformerBase(projectList, child) { - - override protected def withNewChildInternal(newChild: SparkPlan): DeltaProjectExecTransformer = - copy(child = newChild) -} diff --git a/gluten-delta/src/main/delta-24/org/apache/gluten/execution/DeltaFilterExecTransformer.scala b/gluten-delta/src/main/delta-24/org/apache/gluten/execution/DeltaFilterExecTransformer.scala deleted file mode 100644 index ca4665c0d0cb..000000000000 --- a/gluten-delta/src/main/delta-24/org/apache/gluten/execution/DeltaFilterExecTransformer.scala +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.gluten.execution - -import org.apache.spark.sql.catalyst.expressions.Expression -import org.apache.spark.sql.execution.SparkPlan - -case class DeltaFilterExecTransformer(condition: Expression, child: SparkPlan) - extends FilterExecTransformerBase(condition, child) { - - override protected def withNewChildInternal(newChild: SparkPlan): DeltaFilterExecTransformer = - copy(child = newChild) -} diff --git a/gluten-delta/src/main/delta-24/org/apache/gluten/execution/DeltaProjectExecTransformer.scala b/gluten-delta/src/main/delta-24/org/apache/gluten/execution/DeltaProjectExecTransformer.scala deleted file mode 100644 index 9b720b19c5ba..000000000000 --- a/gluten-delta/src/main/delta-24/org/apache/gluten/execution/DeltaProjectExecTransformer.scala +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.gluten.execution - -import org.apache.spark.sql.catalyst.expressions.NamedExpression -import org.apache.spark.sql.execution.SparkPlan - -case class DeltaProjectExecTransformer(projectList: Seq[NamedExpression], child: SparkPlan) - extends ProjectExecTransformerBase(projectList, child) { - - override protected def withNewChildInternal(newChild: SparkPlan): DeltaProjectExecTransformer = - copy(child = newChild) -} diff --git a/gluten-delta/src/main/delta-20/org/apache/gluten/execution/DeltaFilterExecTransformer.scala b/gluten-delta/src/main/scala/org/apache/gluten/execution/DeltaFilterExecTransformer.scala similarity index 100% rename from gluten-delta/src/main/delta-20/org/apache/gluten/execution/DeltaFilterExecTransformer.scala rename to gluten-delta/src/main/scala/org/apache/gluten/execution/DeltaFilterExecTransformer.scala diff --git a/gluten-delta/src/main/delta-20/org/apache/gluten/execution/DeltaProjectExecTransformer.scala b/gluten-delta/src/main/scala/org/apache/gluten/execution/DeltaProjectExecTransformer.scala similarity index 100% rename from gluten-delta/src/main/delta-20/org/apache/gluten/execution/DeltaProjectExecTransformer.scala rename to gluten-delta/src/main/scala/org/apache/gluten/execution/DeltaProjectExecTransformer.scala