This is an automated email from the ASF dual-hosted git repository.
hellostephen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new f7d49d589a5 [Chore](build) fix conflict field id (#60743)
f7d49d589a5 is described below
commit f7d49d589a5e4f81846ae586f97826efa1cc4d50
Author: Pxl <[email protected]>
AuthorDate: Fri Feb 13 19:44:20 2026 +0800
[Chore](build) fix conflict field id (#60743)
### What problem does this PR solve?
This pull request makes a minor update to the `TQueryOptions` struct in
`gensrc/thrift/PaloInternalService.thrift`. The change simply reorders
the declaration of the `enable_aggregate_function_null_v2` option,
moving it a few lines down in the struct definition. No functionality is
affected.
---
gensrc/thrift/PaloInternalService.thrift | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/gensrc/thrift/PaloInternalService.thrift
b/gensrc/thrift/PaloInternalService.thrift
index fba793d5fc7..a1b9e237c6c 100644
--- a/gensrc/thrift/PaloInternalService.thrift
+++ b/gensrc/thrift/PaloInternalService.thrift
@@ -425,7 +425,6 @@ struct TQueryOptions {
184: optional i32 cte_max_recursion_depth;
185: optional bool enable_parquet_file_page_cache = true;
- 186: optional bool enable_aggregate_function_null_v2 = false;
186: optional bool enable_streaming_agg_hash_join_force_passthrough;
@@ -433,6 +432,8 @@ struct TQueryOptions {
188: optional bool enable_broadcast_join_force_passthrough;
+ 189: optional bool enable_aggregate_function_null_v2 = false;
+
195: optional bool enable_left_semi_direct_return_opt;
200: optional bool enable_adjust_conjunct_order_by_cost;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
