This is an automated email from the ASF dual-hosted git repository.
yiguolei 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 5f9bb5e844e [fix](inverted index) Fix Session Variable Compatibility
(#39889)
5f9bb5e844e is described below
commit 5f9bb5e844e25b1b0ea1fd4dacf0a1cf81c1f5c1
Author: zzzxl <33418555+zzzxl1...@users.noreply.github.com>
AuthorDate: Sun Aug 25 08:43:59 2024 +0800
[fix](inverted index) Fix Session Variable Compatibility (#39889)
## Proposed changes
1. Modify the conflict changes caused by
https://github.com/apache/doris/pull/38077, adjusting the correct order
to:
119: optional bool keep_carriage_return = false; // \n,\r\n split line
in CSV.
120: optional bool enable_match_without_inverted_index = true;
121: optional bool enable_fallback_on_missing_inverted_index = true;
<!--Describe your changes.-->
---
gensrc/thrift/PaloInternalService.thrift | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/gensrc/thrift/PaloInternalService.thrift
b/gensrc/thrift/PaloInternalService.thrift
index 4fd0b897e52..8dae5c14329 100644
--- a/gensrc/thrift/PaloInternalService.thrift
+++ b/gensrc/thrift/PaloInternalService.thrift
@@ -317,11 +317,10 @@ struct TQueryOptions {
118: optional TSerdeDialect serde_dialect = TSerdeDialect.DORIS;
- 119: optional bool enable_match_without_inverted_index = true;
+ 119: optional bool keep_carriage_return = false; // \n,\r\n split line in
CSV.
- 120: optional bool enable_fallback_on_missing_inverted_index = true;
-
- 121: optional bool keep_carriage_return = false; // \n,\r\n split line in
CSV.
+ 120: optional bool enable_match_without_inverted_index = true;
+ 121: optional bool enable_fallback_on_missing_inverted_index = true;
122: optional i32 runtime_bloom_filter_min_size = 1048576;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
