Fix

Author: rui-mo

velox/expression/SwitchExpr.cpp

@@ -253,12 +253,17 @@ TypePtr SwitchExpr::resolveType(const std::vector<TypePtr>& argTypes) {
   if (hasElse) {
     auto& elseClauseType = argTypes.back();
 
-    VELOX_CHECK(
+    if (elseClauseType->isDecimal()) {
+      // Regard decimals as the same type regardless of precision and scale.
+      VELOX_CHECK(expressionType->isDecimal());
+    } else {
+      VELOX_CHECK(
         *elseClauseType == *expressionType,
         "Else clause of a SWITCH statement must have the same type as 'then' clauses. "
         "Expected {}, but got {}.",
         expressionType->toString(),
         elseClauseType->toString());
+    }
   }
 
   return expressionType;

velox/functions/prestosql/aggregates/AverageAggregate.cpp

@@ -143,7 +143,7 @@ exec::AggregateRegistrationResult registerAverage(const std::string& name) {
 } // namespace
 
 void registerAverageAggregate(const std::string& prefix) {
-  registerAverage(prefix + kAvg);
+  // registerAverage(prefix + kAvg);
 }
 
 } // namespace facebook::velox::aggregate::prestosql

velox/functions/sparksql/aggregates/Register.cpp

@@ -32,6 +32,6 @@ void registerAggregateFunctions(const std::string& prefix) {
   registerBitwiseXorAggregate(prefix);
   registerBloomFilterAggAggregate(prefix + "bloom_filter_agg");
   registerAverage(prefix + "avg");
-  registerDecimalSumAggregate(prefix + "sum");
+  registerDecimalSumAggregate(prefix + "decimal_sum");
 }
 } // namespace facebook::velox::functions::aggregate::sparksql