mark min, max and sum as aggregates

Author: romainfrancois

src/include/rfuns_extension.hpp

@@ -64,9 +64,9 @@ ScalarFunctionSet base_r_as_integer();
 ScalarFunctionSet base_r_as_numeric();
 
 // sum
-AggregateFunctionSet base_r_sum();
-AggregateFunctionSet base_r_min();
-AggregateFunctionSet base_r_max();
+AggregateFunctionSet base_r_aggregate_sum();
+AggregateFunctionSet base_r_aggregate_min();
+AggregateFunctionSet base_r_aggregate_max();
 
 ScalarFunctionSet binary_dispatch(ScalarFunctionSet fn) ;
 

src/minmax.cpp

@@ -142,12 +142,12 @@ AggregateFunctionSet base_r_minmax(std::string name) {
 	return set;
 }
 
-AggregateFunctionSet base_r_min() {
-	return base_r_minmax<RMinOperation>("r_base::min");
+AggregateFunctionSet base_r_aggregate_min() {
+	return base_r_minmax<RMinOperation>("r_base::aggregate::min");
 }
 
-AggregateFunctionSet base_r_max() {
-	return base_r_minmax<RMaxOperation>("r_base::max");
+AggregateFunctionSet base_r_aggregate_max() {
+	return base_r_minmax<RMaxOperation>("r_base::aggregate::max");
 }
 
 

src/rfuns_extension.cpp

@@ -37,9 +37,9 @@ static void register_rfuns(DatabaseInstance &instance) {
 	ExtensionUtil::RegisterFunction(instance, base_r_as_integer());
 	ExtensionUtil::RegisterFunction(instance, base_r_as_numeric());
 
-	ExtensionUtil::RegisterFunction(instance, base_r_sum());
-	ExtensionUtil::RegisterFunction(instance, base_r_min());
-	ExtensionUtil::RegisterFunction(instance, base_r_max());
+	ExtensionUtil::RegisterFunction(instance, base_r_aggregate_sum());
+	ExtensionUtil::RegisterFunction(instance, base_r_aggregate_min());
+	ExtensionUtil::RegisterFunction(instance, base_r_aggregate_max());
 }
 }  // namespace rfuns
 

src/sum.cpp

@@ -117,8 +117,8 @@ void add_RSum(AggregateFunctionSet& set, const LogicalType& type) {
 	));
 }
 
-AggregateFunctionSet base_r_sum() {
-	AggregateFunctionSet set("r_base::sum");
+AggregateFunctionSet base_r_aggregate_sum() {
+	AggregateFunctionSet set("r_base::aggregate::sum");
 
 	add_RSum(set, LogicalType::BOOLEAN);
 	add_RSum(set, LogicalType::INTEGER);