flag_offset

forsaken628 · forsaken628 · commit 34dd01702f0c · 2025-11-28T22:15:14.000+08:00
diff --git a/src/query/functions/src/aggregates/adaptors/aggregate_null_adaptor.rs b/src/query/functions/src/aggregates/adaptors/aggregate_null_adaptor.rs
@@ -679,5 +679,9 @@ fn get_flag(place: AggrState) -> bool {
 }
 
 fn flag_offset(place: AggrState) -> usize {
-    *place.loc.last().unwrap().as_bool().unwrap().1
+    let n = place.loc.len();
+    debug_assert!(n > 0);
+    let loc = unsafe { place.loc.get_unchecked(n - 1) };
+    debug_assert!(loc.is_bool());
+    loc.offset()
 }
diff --git a/src/query/functions/src/aggregates/adaptors/aggregate_ornull_adaptor.rs b/src/query/functions/src/aggregates/adaptors/aggregate_ornull_adaptor.rs
@@ -73,7 +73,11 @@ fn merge_flag(place: AggrState, other: bool) {
 }
 
 fn flag_offset(place: AggrState) -> usize {
-    *place.loc.last().unwrap().as_bool().unwrap().1
+    let n = place.loc.len();
+    debug_assert!(n > 0);
+    let loc = unsafe { place.loc.get_unchecked(n - 1) };
+    debug_assert!(loc.is_bool());
+    loc.offset()
 }
 
 impl AggregateFunction for AggregateFunctionOrNullAdaptor {

Original file line number	Diff line number	Diff line change
`@@ -679,5 +679,9 @@ fn get_flag(place: AggrState) -> bool {`
`679`	`679`	`}`
`680`	`680`
`681`	`681`	`fn flag_offset(place: AggrState) -> usize {`
`682`		`- *place.loc.last().unwrap().as_bool().unwrap().1`
	`682`	`+ let n = place.loc.len();`
	`683`	`+ debug_assert!(n > 0);`
	`684`	`+ let loc = unsafe { place.loc.get_unchecked(n - 1) };`
	`685`	`+ debug_assert!(loc.is_bool());`
	`686`	`+ loc.offset()`
`683`	`687`	`}`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,11 @@ fn merge_flag(place: AggrState, other: bool) {`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`fn flag_offset(place: AggrState) -> usize {`
`76`		`- *place.loc.last().unwrap().as_bool().unwrap().1`
	`76`	`+ let n = place.loc.len();`
	`77`	`+ debug_assert!(n > 0);`
	`78`	`+ let loc = unsafe { place.loc.get_unchecked(n - 1) };`
	`79`	`+ debug_assert!(loc.is_bool());`
	`80`	`+ loc.offset()`
`77`	`81`	`}`
`78`	`82`
`79`	`83`	`impl AggregateFunction for AggregateFunctionOrNullAdaptor {`