Skip to content
Merged
Changes from all commits
Commits
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
17 changes: 4 additions & 13 deletions query/ir/codegen/DBProgramGenerator.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
#include "DBPasses.h"
#include "DBTypes.h"
#include "StorageDialect.h"
#include "StorageEnums.h"
#include "StorageTypes.h"

#include "DependencyEdge.h"
Expand Down Expand Up @@ -2122,18 +2123,8 @@ void DBProgramGenerator::generateGroupAggregate(const CypherAST* ast) {
const FunctionInvocation* invocation = funcExpr->getFunctionInvocation();
const std::string_view funcName = invocation->getSignature()->getFullName();

int64_t kind;
if (funcName == "count") {
kind = 0;
} else if (funcName == "sum") {
kind = 1;
} else if (funcName == "min") {
kind = 2;
} else if (funcName == "max") {
kind = 3;
} else if (funcName == "avg") {
kind = 4;
} else {
const std::optional<mlir::storage::GroupAggregateKind> kind = mlir::storage::symbolizeGroupAggregateKind(funcName);
if (!kind) {
throw TuringException(fmt::format("Unsupported aggregate function: {}", funcName));
}

Expand All @@ -2152,7 +2143,7 @@ void DBProgramGenerator::generateGroupAggregate(const CypherAST* ast) {
}

aggInputColumns.push_back(inputColumn);
aggKinds.push_back(kind);
aggKinds.push_back(static_cast<int64_t>(*kind));
aggFuncExprs.push_back(funcExpr);
}

Expand Down
Loading