experiments with vectorized aggregation

src/compat/compat.h

@@ -974,6 +974,7 @@ object_ownercheck(Oid classid, Oid objectid, Oid roleid)
 
 #if PG14_LT
 #define F_SUM_INT4 2108
+#define F_COUNT_ 2803
 #endif
 
 /*

src/guc.c

@@ -118,6 +118,18 @@ static const struct config_enum_entry require_vector_qual_options[] = {
 #endif
 
 DebugRequireVectorQual ts_guc_debug_require_vector_qual = RVQ_Allow;
+
+#ifdef TS_DEBUG
+static const struct config_enum_entry require_vector_agg_options[] = {
+	{ "allow", RVA_Allow, false },
+	{ "forbid", RVA_Forbid, false },
+	{ "require", RVA_Require, false },
+	{ NULL, 0, false }
+};
+#endif
+
+DebugRequireVectorAgg ts_guc_debug_require_vector_agg = RVA_Allow;
+
 bool ts_guc_debug_compression_path_info = false;
 
 static bool ts_guc_enable_hypertable_create = true;
@@ -820,6 +832,19 @@ _guc_init(void)
 							/* assign_hook= */ NULL,
 							/* show_hook= */ NULL);
 
+	DefineCustomEnumVariable(/* name= */ MAKE_EXTOPTION("debug_require_vector_agg"),
+							 /* short_desc= */
+							 "ensure that vectorized aggregation is used or not",
+							 /* long_desc= */ "this is for debugging purposes",
+							 /* valueAddr= */ (int *) &ts_guc_debug_require_vector_agg,
+							 /* bootValue= */ RVQ_Allow,
+							 /* options = */ require_vector_agg_options,
+							 /* context= */ PGC_USERSET,
+							 /* flags= */ 0,
+							 /* check_hook= */ NULL,
+							 /* assign_hook= */ NULL,
+							 /* show_hook= */ NULL);
+
 	DefineCustomEnumVariable(/* name= */ MAKE_EXTOPTION("debug_require_vector_qual"),
 							 /* short_desc= */
 							 "ensure that non-vectorized or vectorized filters are used in "

src/guc.h

@@ -87,6 +87,15 @@ extern TSDLLEXPORT bool ts_guc_debug_require_batch_sorted_merge;
 
 extern TSDLLEXPORT bool ts_guc_debug_allow_cagg_with_deprecated_funcs;
 
+typedef enum DebugRequireVectorAgg
+{
+	RVA_Allow = 0,
+	RVA_Forbid,
+	RVA_Require,
+} DebugRequireVectorAgg;
+
+extern TSDLLEXPORT DebugRequireVectorAgg ts_guc_debug_require_vector_agg;
+
 void _guc_init(void);
 
 typedef enum

src/planner/partialize.c

@@ -446,12 +446,18 @@ generate_agg_pushdown_path(PlannerInfo *root, Path *cheapest_total_path, RelOptI
 						   PathTarget *partial_grouping_target, bool can_sort, bool can_hash,
 						   double d_num_groups, GroupPathExtraData *extra_data)
 {
+	//	mybt();
+
 	/* Get subpaths */
 	List *subpaths = get_subpaths_from_append_path(cheapest_total_path, false);
 
 	/* No subpaths available or unsupported append node */
 	if (subpaths == NIL)
+	{
+		//		fprintf(stderr, "no subpaths in append path:\n");
+		//		my_print(cheapest_total_path);
 		return;
+	}
 
 	if (list_length(subpaths) < 2)
 	{
@@ -538,20 +544,24 @@ generate_agg_pushdown_path(PlannerInfo *root, Path *cheapest_total_path, RelOptI
 	/* Create new append paths */
 	if (sorted_subpaths != NIL)
 	{
-		add_path(partially_grouped_rel,
-				 copy_append_like_path(root,
-									   cheapest_total_path,
-									   sorted_subpaths,
-									   partial_grouping_target));
+		Path *sorted = copy_append_like_path(root,
+											 cheapest_total_path,
+											 sorted_subpaths,
+											 partial_grouping_target);
+		//		fprintf(stderr, "sorted!!!\n");
+		//		my_print(sorted);
+		add_path(partially_grouped_rel, sorted);
 	}
 
 	if (hashed_subpaths != NIL)
 	{
-		add_path(partially_grouped_rel,
-				 copy_append_like_path(root,
-									   cheapest_total_path,
-									   hashed_subpaths,
-									   partial_grouping_target));
+		Path *hashed = copy_append_like_path(root,
+											 cheapest_total_path,
+											 hashed_subpaths,
+											 partial_grouping_target);
+		//		fprintf(stderr, "hashed!!!\n");
+		//		my_print(hashed);
+		add_path(partially_grouped_rel, hashed);
 	}
 }
 

tsl/src/nodes/vector_agg/CMakeLists.txt

@@ -1,4 +1,7 @@
 set(SOURCES
-    ${CMAKE_CURRENT_SOURCE_DIR}/exec.c ${CMAKE_CURRENT_SOURCE_DIR}/functions.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/plan.c)
+    ${CMAKE_CURRENT_SOURCE_DIR}/exec.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/functions.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/plan.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/grouping_policy_all.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/grouping_policy_segmentby.c)
 target_sources(${TSL_LIBRARY_NAME} PRIVATE ${SOURCES})