Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[CORE] Minor adjustment to columnar rule list, and move all columnar sub-rules to one source folder #4863

Merged
merged 8 commits into from
Mar 7, 2024
Merged

[CORE] Minor adjustment to columnar rule list, and move all columnar sub-rules to one source folder #4863

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
08d003c
Refactor
zhztheplayer Mar 6, 2024
8c282b1
Add one insert transitions rule
zhztheplayer Mar 6, 2024
5311ee0
fixup
zhztheplayer Mar 6, 2024
1a3ad53
fixup
zhztheplayer Mar 6, 2024
469f9e1
cbo fixup
zhztheplayer Mar 7, 2024
301c83c
fixup
zhztheplayer Mar 7, 2024
1800495
fixup
zhztheplayer Mar 7, 2024
75aacc9
fixup
zhztheplayer Mar 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions ...lickhouse/src/main/scala/io/glutenproject/backendsapi/clickhouse/CHSparkPlanExecApi.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,9 @@ import io.glutenproject.backendsapi.{BackendsApiManager, SparkPlanExecApi}
import io.glutenproject.execution._
import io.glutenproject.expression._
import io.glutenproject.expression.ConverterUtils.FunctionConfig
import io.glutenproject.extension.{FallbackBroadcastHashJoin, FallbackBroadcastHashJoinPrepQueryStage, TransformPreOverrides}
import io.glutenproject.extension.{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
Expand Down Expand Up @@ -54,9 +55,7 @@ import org.apache.spark.sql.execution.exchange.{BroadcastExchangeExec, ShuffleEx
import org.apache.spark.sql.execution.joins.{BuildSideRelation, ClickHouseBuildSideRelation, HashedRelationBroadcastMode}
import org.apache.spark.sql.execution.metric.SQLMetric
import org.apache.spark.sql.execution.utils.{CHExecUtil, PushDownUtil}
import org.apache.spark.sql.extension.ClickHouseAnalysis
import org.apache.spark.sql.extension.CommonSubexpressionEliminateRule
import org.apache.spark.sql.extension.RewriteDateTimestampComparisonRule
import org.apache.spark.sql.extension.{ClickHouseAnalysis, CommonSubexpressionEliminateRule, RewriteDateTimestampComparisonRule}
import org.apache.spark.sql.types.StructType
import org.apache.spark.sql.vectorized.ColumnarBatch

Expand Down
2 changes: 1 addition & 1 deletion backends-velox/src/main/scala/io/glutenproject/execution/HashAggregateExecTransformer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package io.glutenproject.execution
import io.glutenproject.backendsapi.BackendsApiManager
import io.glutenproject.expression._
import io.glutenproject.expression.ConverterUtils.FunctionConfig
import io.glutenproject.extension.RewriteTypedImperativeAggregate
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}
Expand Down
486 changes: 8 additions & 478 deletions gluten-core/src/main/scala/io/glutenproject/extension/ColumnarOverrides.scala
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ...sion/CollapseProjectExecTransformer.scala → ...mnar/CollapseProjectExecTransformer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package io.glutenproject.extension
package io.glutenproject.extension.columnar

import io.glutenproject.GlutenConfig
import io.glutenproject.execution.ProjectExecTransformer
Expand Down
2 changes: 1 addition & 1 deletion ...oject/extension/ColumnarTransitions.scala → ...ension/columnar/ColumnarTransitions.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package io.glutenproject.extension
package io.glutenproject.extension.columnar

import org.apache.spark.sql.catalyst.rules.Rule
import org.apache.spark.sql.execution.{ApplyColumnarRulesAndInsertTransitions, ColumnarToRowExec, RowToColumnarExec, SparkPlan}
Expand Down
3 changes: 1 addition & 2 deletions ...tension/EnsureLocalSortRequirements.scala → ...olumnar/EnsureLocalSortRequirements.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package io.glutenproject.extension
package io.glutenproject.extension.columnar

import io.glutenproject.GlutenConfig
import io.glutenproject.execution.SortExecTransformer
import io.glutenproject.extension.columnar.TransformHints

import org.apache.spark.sql.catalyst.expressions.SortOrder
import org.apache.spark.sql.catalyst.rules.Rule
Expand Down
5 changes: 3 additions & 2 deletions ...ject/extension/ExpandFallbackPolicy.scala → ...nsion/columnar/ExpandFallbackPolicy.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package io.glutenproject.extension
package io.glutenproject.extension.columnar

import io.glutenproject.GlutenConfig
import io.glutenproject.execution.BroadcastHashJoinExecTransformer
import io.glutenproject.extension.columnar.{TRANSFORM_UNSUPPORTED, TransformHints}
import io.glutenproject.extension.GlutenPlan
import io.glutenproject.extension.columnar.MiscColumnarRules.TransformPostOverrides
import io.glutenproject.utils.PlanUtil

import org.apache.spark.rdd.RDD
Expand Down
2 changes: 1 addition & 1 deletion ...tension/MergeTwoPhasesHashAggregate.scala → ...olumnar/MergeTwoPhasesHashAggregate.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package io.glutenproject.extension
package io.glutenproject.extension.columnar

import io.glutenproject.GlutenConfig
import io.glutenproject.backendsapi.BackendsApiManager
Expand Down
Loading
Loading