-
Notifications
You must be signed in to change notification settings - Fork 447
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Introduce VeloxIntermediateData to adjust type and order
- Loading branch information
1 parent
31e354f
commit d2bf5fa
Showing
3 changed files
with
151 additions
and
146 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
131 changes: 131 additions & 0 deletions
131
backends-velox/src/main/scala/io/glutenproject/utils/VeloxIntermediateData.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,131 @@ | ||
| /* | ||
| * 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 io.glutenproject.utils | ||
|
|
||
| import io.glutenproject.expression.ConverterUtils | ||
| import io.glutenproject.substrait.`type`.{TypeBuilder, TypeNode} | ||
|
|
||
| import org.apache.spark.sql.catalyst.expressions.aggregate._ | ||
| import org.apache.spark.sql.types._ | ||
|
|
||
| import scala.collection.JavaConverters._ | ||
|
|
||
| object VeloxIntermediateData { | ||
| // Agg functions with inconsistent ordering of intermediate data between Velox and Spark. | ||
| // Corr | ||
| val veloxCorrIntermediateDataOrder: Seq[String] = Seq("ck", "n", "xMk", "yMk", "xAvg", "yAvg") | ||
| // CovPopulation, CovSample | ||
| val veloxCovarIntermediateDataOrder: Seq[String] = Seq("ck", "n", "xAvg", "yAvg") | ||
|
|
||
| // Agg functions with inconsistent types of intermediate data between Velox and Spark. | ||
| // StddevSamp, StddevPop, VarianceSamp, VariancePop | ||
| val veloxVarianceIntermediateTypes: Seq[DataType] = Seq(LongType, DoubleType, DoubleType) | ||
| // CovPopulation, CovSample | ||
| val veloxCovarIntermediateTypes: Seq[DataType] = Seq(DoubleType, LongType, DoubleType, DoubleType) | ||
| // Corr | ||
| val veloxCorrIntermediateTypes: Seq[DataType] = | ||
| Seq(DoubleType, LongType, DoubleType, DoubleType, DoubleType, DoubleType) | ||
|
|
||
| /** | ||
| * Return the intermediate columns order of Velox aggregation functions, with special matching | ||
| * required for some aggregation functions where the intermediate columns order are inconsistent | ||
| * with Spark. | ||
| * @param aggFunc | ||
| * : Spark aggregation function | ||
| * @return | ||
| * the intermediate columns order of Velox aggregation functions | ||
| */ | ||
| def veloxIntermediateDataOrder(aggFunc: AggregateFunction): Seq[String] = { | ||
| aggFunc match { | ||
| case _: Corr => | ||
| veloxCorrIntermediateDataOrder | ||
| case _: CovPopulation | _: CovSample => | ||
| veloxCovarIntermediateDataOrder | ||
| case _ => | ||
| aggFunc.aggBufferAttributes.map(_.name) | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Get the compatible input types for a Velox aggregate function. | ||
| * | ||
| * @param aggregateFunc | ||
| * The input aggregate function. | ||
| * @param forMergeCompanion | ||
| * Whether this is a special case to solve mixed aggregation phases. | ||
| * @return | ||
| * The input types of a Velox aggregate function. | ||
| */ | ||
| def getInputTypes(aggregateFunc: AggregateFunction, forMergeCompanion: Boolean): Seq[DataType] = { | ||
| if (!forMergeCompanion) { | ||
| return aggregateFunc.children.map(_.dataType) | ||
| } | ||
| aggregateFunc match { | ||
| case _ @Type(veloxDataTypes: Seq[DataType]) => | ||
| Seq(StructType(veloxDataTypes.map(StructField("", _)).toArray)) | ||
| case _ => | ||
| // Not use StructType for single column agg intermediate data | ||
| aggregateFunc.aggBufferAttributes.map(_.dataType) | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Return the intermediate type node of a partial aggregation in Velox. | ||
| * | ||
| * @param aggFunc | ||
| * Spark aggregation function. | ||
| * @return | ||
| * The type of partial outputs. | ||
| */ | ||
| def getIntermediateTypeNode(aggFunc: AggregateFunction): TypeNode = { | ||
| val structTypeNodes = | ||
| aggFunc match { | ||
| case _ @Type(dataTypes: Seq[DataType]) => | ||
| dataTypes.map(ConverterUtils.getTypeNode(_, nullable = false)) | ||
| case _ => | ||
| throw new UnsupportedOperationException("Can not get velox intermediate types.") | ||
| } | ||
| TypeBuilder.makeStruct(false, structTypeNodes.asJava) | ||
| } | ||
|
|
||
| private object Type { | ||
|
|
||
| /** | ||
| * Return the intermediate types of Velox agg functions, with special matching required for some | ||
| * aggregation functions where the intermediate results are inconsistent with Spark. Only return | ||
| * if the intermediate result has multiple columns. | ||
| * @param aggFunc | ||
| * Spark aggregation function | ||
| * @return | ||
| * the intermediate types of Velox aggregation functions. | ||
| */ | ||
| def unapply(aggFunc: AggregateFunction): Option[Seq[DataType]] = { | ||
| aggFunc match { | ||
| case _: Corr => | ||
| Some(veloxCorrIntermediateTypes) | ||
| case _: Covariance => | ||
| Some(veloxCovarIntermediateTypes) | ||
| case _: StddevSamp | _: StddevPop | _: VarianceSamp | _: VariancePop => | ||
| Some(veloxVarianceIntermediateTypes) | ||
| case _ if aggFunc.aggBufferAttributes.size > 1 => | ||
| Some(aggFunc.aggBufferAttributes.map(_.dataType)) | ||
| case _ => None | ||
| } | ||
| } | ||
| } | ||
| } |
40 changes: 0 additions & 40 deletions
40
gluten-core/src/main/scala/io/glutenproject/utils/GlutenDecimalUtil.scala
This file was deleted.
Oops, something went wrong.