cleanup

timescale · Oct 22, 2024 · c723a5a · c723a5a
1 parent c18ded9
commit c723a5a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 18 deletions.
diff --git a/tsl/src/nodes/vector_agg/function/agg_many_vector_helper.c b/tsl/src/nodes/vector_agg/function/agg_many_vector_helper.c
@@ -21,9 +21,11 @@ FUNCTION_NAME(many_vector_impl)(void *restrict agg_states, const uint32 *offsets
  for (int row = start_row; row < end_row; row++)
  {
  const CTYPE value = values[row];
+ FUNCTION_NAME(state) *restrict state = &states[offsets[row]];
  if (arrow_row_is_valid(filter, row))
  {
- FUNCTION_NAME(one)(&states[offsets[row]], value);
+ Assert(offsets[row] != 0);
+ FUNCTION_NAME(one)(state, value);
  }
  }
  MemoryContextSwitchTo(old);

diff --git a/tsl/src/nodes/vector_agg/hash_table_functions_impl.c b/tsl/src/nodes/vector_agg/hash_table_functions_impl.c
@@ -171,30 +171,16 @@ FUNCTION_NAME(fill_offsets)(GroupingPolicyHash *policy, DecompressBatchState *ba
  CompressedColumnValues column = batch_state->compressed_columns[g->input_offset];
  const uint64 *restrict filter = batch_state->vector_qual_result;
 
- if (filter == NULL && column.buffers[0] == NULL)
+ if (filter == NULL)
  {
  next_unused_state_index = FUNCTION_NAME(
- dispatch_type)(policy, column, filter, next_unused_state_index, start_row, end_row);
+ dispatch_type)(policy, column, NULL, next_unused_state_index, start_row, end_row);
  }
- else if (filter != NULL && column.buffers[0] == NULL)
- {
- next_unused_state_index = FUNCTION_NAME(
- dispatch_type)(policy, column, filter, next_unused_state_index, start_row, end_row);
- }
- else if (filter == NULL && column.buffers[0] != NULL)
- {
- next_unused_state_index = FUNCTION_NAME(
- dispatch_type)(policy, column, filter, next_unused_state_index, start_row, end_row);
- }
- else if (filter != NULL && column.buffers[0] != NULL)
+ else
  {
  next_unused_state_index = FUNCTION_NAME(
  dispatch_type)(policy, column, filter, next_unused_state_index, start_row, end_row);
  }
- else
- {
- Assert(false);
- }
 
  return next_unused_state_index;
 }