This is an automated email from the ASF dual-hosted git repository.
panxiaolei pushed a commit to branch tpc_preview6
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/tpc_preview6 by this push:
new 55b53290d52 fix conflict
55b53290d52 is described below
commit 55b53290d521914578ff9136729a1740e2761d22
Author: BiteTheDDDDt <[email protected]>
AuthorDate: Thu Jan 29 10:56:57 2026 +0800
fix conflict
---
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 dd7c0b0c453..494fbbd4ac6 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_force_passthrough;
@@ -435,6 +434,8 @@ struct TQueryOptions {
200: optional bool enable_adjust_conjunct_order_by_cost
+ 210: optional bool enable_aggregate_function_null_v2 = false;
+
// For cloud, to control if the content would be written into file cache
// In write path, to control if the content would be written into file cache.
// In read path, read from file cache or remote storage when execute query.
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
