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

[VL] Fall back collect_set, min and max when input is complex type #5934

Merged
merged 1 commit into from
May 31, 2024
Merged

[VL] Fall back collect_set, min and max when input is complex type #5934

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 23 additions & 0 deletions backends-velox/src/test/scala/org/apache/gluten/execution/VeloxAggregateFunctionsSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@ import org.apache.gluten.extension.columnar.validator.FallbackInjects
import org.apache.spark.SparkConf
import org.apache.spark.sql.catalyst.expressions.aggregate.{Final, Partial}
import org.apache.spark.sql.execution.aggregate.BaseAggregateExec
import org.apache.spark.sql.functions._
import org.apache.spark.sql.internal.SQLConf
import org.apache.spark.sql.types._

abstract class VeloxAggregateFunctionsSuite extends VeloxWholeStageTransformerSuite {

Expand Down Expand Up @@ -1112,6 +1114,27 @@ abstract class VeloxAggregateFunctionsSuite extends VeloxWholeStageTransformerSu
}
}
}

test("complex type with null") {
val jsonStr = """{"txn":{"appId":"txnId","version":0,"lastUpdated":null}}"""
val jsonSchema = StructType(
Seq(
StructField(
"txn",
StructType(
Seq(
StructField("appId", StringType, true),
StructField("lastUpdated", LongType, true),
StructField("version", LongType, true))),
true)))
val df = spark.read.schema(jsonSchema).json(Seq(jsonStr).toDS)
df.select(collect_set(col("txn"))).collect

df.select(min(col("txn"))).collect

df.select(max(col("txn"))).collect

}
}

class VeloxAggregateFunctionsDefaultSuite extends VeloxAggregateFunctionsSuite {
Expand Down
10 changes: 10 additions & 0 deletions cpp/velox/substrait/SubstraitToVeloxPlanValidator.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1045,6 +1045,16 @@ bool SubstraitToVeloxPlanValidator::validateAggRelFunctionType(const ::substrait
LOG_VALIDATION_MSG("Validation failed for function " + funcName + " resolve type in AggregateRel.");
return false;
}
static const std::unordered_set<std::string> notSupportComplexTypeAggFuncs = {"set_agg", "min", "max"};
if (notSupportComplexTypeAggFuncs.find(baseFuncName) != notSupportComplexTypeAggFuncs.end() &&
exec::isRawInput(funcStep)) {
auto type = binder.tryResolveType(signature->argumentTypes()[0]);
if (type->isArray() || type->isMap() || type->isRow()) {
LOG_VALIDATION_MSG("Validation failed for function " + baseFuncName + " complex type is not supported.");
return false;
}
}

resolved = true;
break;
}
Expand Down
Loading