fix MaxSqlResultSize default value (#158)

Co-authored-by: maidoudou <[email protected]>
XiaoMi · Apr 25, 2021 · 3673706 · 3673706
1 parent 651421c
commit 3673706
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/docs/configuration.md b/docs/configuration.md
@@ -77,7 +77,7 @@ namespace的配置格式为json，包含分表、非分表、实例等配置信
 | default_slice   | string    | show语句默认的执行分片                              |
 | open_general_log   | bool    | 是否开启审计日志, [如何开启](https://github.com/XiaoMi/Gaea/issues/109)|                              |
 | max_sql_execute_time  | int | 应用端查询最大执行时间, 超时后会被自动kill, 为0默认不开启此功能 |
-| max_sql_result_size   | int | gaea从后端mysql接收结果集的最大值, 限制单分片查询行数, 默认值10000, 为0不开启|
+| max_sql_result_size   | int | gaea从后端mysql接收结果集的最大值, 限制单分片查询行数, 默认值10000, -1表示不开启|
 
 ### slice配置
 

diff --git a/proxy/server/namespace.go b/proxy/server/namespace.go
@@ -121,7 +121,7 @@ func NewNamespace(namespaceConfig *models.Namespace) (*Namespace, error) {
 	}
 
 	// init session slow sql max result size
-	if namespaceConfig.MaxSqlResultSize <= 0 {
+	if namespaceConfig.MaxSqlResultSize <= 0 && namespaceConfig.MaxSqlResultSize != -1 {
 		namespace.maxSqlResultSize = defaultMaxSqlResultSize
 	} else {
 		namespace.maxSqlResultSize = namespaceConfig.MaxSqlResultSize