fix conflicts

Signed-off-by: zihe.liu <[email protected]>
StarRocks · Jan 29, 2024 · eb6166d · eb6166d
1 parent f144acb
commit eb6166d
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/gensrc/thrift/InternalService.thrift b/gensrc/thrift/InternalService.thrift
@@ -238,7 +238,7 @@ struct TQueryOptions {
 
   107: optional i64 global_runtime_filter_build_max_size;
   108: optional i64 runtime_filter_rpc_http_min_size;
-  109: optional i64 big_query_profile_second_threshold;
+  109: optional i64 big_query_profile_threshold = 0;
 
   110: optional TQueryQueueOptions query_queue_options;
   112: optional bool enable_pipeline_level_shuffle;