Skip to content

[native] Detect companion functions from velox function metadata #24482

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

Merged
aditi-pandit merged 1 commit into from
Feb 6, 2025
Merged

[native] Detect companion functions from velox function metadata #24482

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
29 changes: 2 additions & 27 deletions presto-native-execution/presto_cpp/main/types/FunctionMetadata.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,31 +57,6 @@ const std::vector<std::string> getFunctionNameParts(
return parts;
}

// TODO: Remove this function later and retrieve companion function information
// from velox. Approaches for this under discussion here:
// https://github.com/facebookincubator/velox/discussions/11011.
// A function name is a companion function's if the name is an existing
// aggregation function name followed by specific suffixes.
bool isCompanionFunctionName(
const std::string& name,
const std::unordered_map<std::string, exec::AggregateFunctionEntry>&
aggregateFunctions) {
auto suffixOffset = name.rfind("_partial");
if (suffixOffset == std::string::npos) {
suffixOffset = name.rfind("_merge_extract");
}
if (suffixOffset == std::string::npos) {
suffixOffset = name.rfind("_merge");
}
if (suffixOffset == std::string::npos) {
suffixOffset = name.rfind("_extract");
}
if (suffixOffset == std::string::npos) {
return false;
}
return aggregateFunctions.count(name.substr(0, suffixOffset)) > 0;
}

const protocol::AggregationFunctionMetadata getAggregationFunctionMetadata(
const std::string& name,
const AggregateFunctionSignature& signature) {
Expand Down Expand Up @@ -287,7 +262,7 @@ json getFunctionsMetadata() {
// Skip internal functions. They don't have any prefix.
if (kBlockList.count(name) != 0 ||
name.find("$internal$") != std::string::npos ||
isCompanionFunctionName(name, aggregateFunctions)) {
getScalarMetadata(name).companionFunction) {
Copy link
Copy Markdown
Contributor

@czentgr czentgr Feb 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need this change in the same PR as the velox update?
It is ok if we update velox and then make the change as a follow up.

Copy link
Copy Markdown
Contributor Author

@pramodsatya pramodsatya Feb 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @czentgr, moved the submodule update to a separate PR.

continue;
}

Expand All @@ -299,7 +274,7 @@ json getFunctionsMetadata() {

// Get metadata for all registered aggregate functions in velox.
for (const auto& entry : aggregateFunctions) {
if (!isCompanionFunctionName(entry.first, aggregateFunctions)) {
if (!aggregateFunctions.at(entry.first).metadata.companionFunction) {
const auto name = entry.first;
const auto parts = getFunctionNameParts(name);
const auto schema = parts[1];
Expand Down