stuff

timescale · Nov 5, 2024 · 75b8513 · 75b8513
1 parent 794fb93
commit 75b8513
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/tsl/src/nodes/vector_agg/grouping_policy_hash.h b/tsl/src/nodes/vector_agg/grouping_policy_hash.h
@@ -236,7 +236,7 @@ typedef struct HashingConfig
 	uint32 *restrict result_key_indexes;
 } HashingConfig;
 
-static inline HashingConfig
+static pg_attribute_always_inline HashingConfig
 build_hashing_config(GroupingPolicyHash *policy, DecompressBatchState *batch_state)
 {
 	HashingConfig config = {

diff --git a/tsl/src/nodes/vector_agg/hash_table_functions_impl.c b/tsl/src/nodes/vector_agg/hash_table_functions_impl.c
@@ -30,6 +30,7 @@ typedef struct
 	uint32 key_index;
 } FUNCTION_NAME(entry);
 
+#define SH_FILLFACTOR (0.5)
 #define SH_PREFIX KEY_VARIANT
 #define SH_ELEMENT_TYPE FUNCTION_NAME(entry)
 #define SH_KEY_TYPE CTYPE
@@ -154,15 +155,15 @@ FUNCTION_NAME(fill_offsets_impl)(
  * when all the batch and key rows are valid.
  */
 #define APPLY_FOR_BATCH_FILTER(X, NAME, COND)                                                      \
-	X(NAME, (COND) && (config.batch_filter == NULL))                                               \
+	X(NAME##_nofilter, (COND) && (config.batch_filter == NULL))                                               \
 	X(NAME##_filter, (COND) && (config.batch_filter != NULL))
 
 #define APPLY_FOR_VALIDITY(X, NAME, COND)                                                          \
-	APPLY_FOR_BATCH_FILTER(X, NAME, (COND) && config.single_key.buffers[0] == NULL)                \
+	APPLY_FOR_BATCH_FILTER(X, NAME##_notnull, (COND) && config.single_key.buffers[0] == NULL)                \
 	APPLY_FOR_BATCH_FILTER(X, NAME##_nullable, (COND) && config.single_key.buffers[0] != NULL)
 
 #define APPLY_FOR_SCALARS(X, NAME, COND)                                                           \
-	APPLY_FOR_BATCH_FILTER(X, NAME, (COND) && !config.have_scalar_columns)                         \
+	APPLY_FOR_BATCH_FILTER(X, NAME##_noscalar, (COND) && !config.have_scalar_columns)                         \
 	APPLY_FOR_BATCH_FILTER(X, NAME##_scalar, (COND) && config.have_scalar_columns)
 
 #define APPLY_FOR_TYPE(X, NAME, COND)                                                              \