[Doc] Fix Max Queue default (#34041)

(cherry picked from commit 5812ac2) # Conflicts: # docs/reference/System_variable.md
StarRocks · Oct 31, 2023 · 10514ae · 10514ae
1 parent c588ad4
commit 10514ae
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/docs/administration/query_queues.md b/docs/administration/query_queues.md
@@ -48,7 +48,7 @@ You can set the capacity of a query queue and the maximum timeout of queries in
 
 | **Variable**                       | **Default** | **Description**                                              |
 | ---------------------------------- | ----------- | ------------------------------------------------------------ |
-| query_queue_max_queued_queries     | 0           | The upper limit of queries in a queue. When this threshold is reached, incoming queries are rejected. It takes effect only after being set greater than `0`. |
+| query_queue_max_queued_queries     | 1024        | The upper limit of queries in a queue. When this threshold is reached, incoming queries are rejected. It takes effect only after being set greater than `0`. |
 | query_queue_pending_timeout_second | 300         | The maximum timeout of a pending query in a queue. When this threshold is reached, the corresponding query is rejected. Unit: second. |
 
 ## View query queue statistics

diff --git a/docs/reference/System_variable.md b/docs/reference/System_variable.md
@@ -501,10 +501,14 @@ The variables are described **in alphabetical order**. Variables with the `globa
 
 * streaming_preaggregation_mode
 
+<<<<<<< HEAD
   Used to specify the preaggregation mode for the first phase of GROUP BY. If the preaggregation effect in the first phase is not satisfactory, you can use the streaming mode, which performs simple data serialization before streaming data to the destination. Valid values:
   * `auto`: The system first tries local preaggregation. If the effect is not satisfactory, it switches to the streaming mode. This is the default value.
   * `force_preaggregation`: The system directly performs local preaggregation.
   * `force_streaming`: The system directly performs streaming.
+=======
+The upper limit of queries in a queue. When this threshold is reached, incoming queries are rejected. It takes effect only after being set greater than `0`. Default: `1024`.
+>>>>>>> 5812ac23fb ([Doc] Fix Max Queue default (#34041))
 
 * system_time_zone