This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch branch-4.1
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-4.1 by this push:
new f32ced7c650 [test](inverted index) remove regression case for inverted
index cache (#65341)
f32ced7c650 is described below
commit f32ced7c650f4702c6580bfe15db3afb61610067
Author: shuke <[email protected]>
AuthorDate: Fri Jul 10 09:37:57 2026 +0800
[test](inverted index) remove regression case for inverted index cache
(#65341)
## Proposed changes
Backport master PR #58137 to branch-4.1:
- Remove unstable regression case
`fault_injection_p0/test_inverted_index_cache.groovy`.
- Register the BE UT `CacheCombinationMatrix`, which covers the
query/searcher cache hit/miss matrix.
- Keep branch-4.1's typed inverted-index reader test interface while
resolving the cherry-pick conflict.
## Root cause
The branch-4.1 x64 NonConcurrent case still runs an old debug-point
regression test that master already removed in favor of BE UT coverage.
The regression test can fail with an intentionally injected error when
the runtime path reaches
`InvertedIndexReader.handle_searcher_cache_miss`.
Failing example:
- Build: `201293`
- Occurrence: `2000000108`
- Test:
`fault_injection_p0.test_inverted_index_cache.test_inverted_index_cache`
- Error: `[INTERNAL_ERROR]handle searcher cache miss`
## Validation
- Verified commit `86b9973e2bf` / PR #58137 was not in
`origin/branch-4.1`.
- Checked no duplicate open branch-4.1 PR for this case.
- Resolved cherry-pick conflict by preserving branch-4.1's current typed
query interface.
- Ran `git diff --check origin/branch-4.1...HEAD`.
Full BE UT was not run locally.
Co-authored-by: Jack <[email protected]>
---
.../storage/segment/inverted_index_reader_test.cpp | 5 +
.../test_inverted_index_cache.groovy | 145 ---------------------
2 files changed, 5 insertions(+), 145 deletions(-)
diff --git a/be/test/storage/segment/inverted_index_reader_test.cpp
b/be/test/storage/segment/inverted_index_reader_test.cpp
index 184b679dd3d..982d2c3f141 100644
--- a/be/test/storage/segment/inverted_index_reader_test.cpp
+++ b/be/test/storage/segment/inverted_index_reader_test.cpp
@@ -4181,6 +4181,11 @@ TEST_F(InvertedIndexReaderTest, SearcherCache) {
test_searcher_cache();
}
+// Exercise the different combinations of query/searcher caches.
+TEST_F(InvertedIndexReaderTest, CacheCombinationMatrix) {
+ test_inverted_index_cache_matrix();
+}
+
// Test string index with large document set (>512 docs)
TEST_F(InvertedIndexReaderTest, StringIndexLargeDocset) {
test_string_index_large_docset();
diff --git
a/regression-test/suites/fault_injection_p0/test_inverted_index_cache.groovy
b/regression-test/suites/fault_injection_p0/test_inverted_index_cache.groovy
deleted file mode 100644
index 9371f6401cb..00000000000
--- a/regression-test/suites/fault_injection_p0/test_inverted_index_cache.groovy
+++ /dev/null
@@ -1,145 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements. See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership. The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License. You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the License for the
-// specific language governing permissions and limitations
-// under the License.
-
-suite("test_inverted_index_cache", "nonConcurrent") {
- // define a sql table
- def indexTbName = "test_inverted_index_cache"
-
- sql "DROP TABLE IF EXISTS ${indexTbName}"
- sql """
- CREATE TABLE ${indexTbName} (
- `@timestamp` int(11) NULL COMMENT "",
- `clientip` varchar(20) NULL COMMENT "",
- `request` text NULL COMMENT "",
- `status` int(11) NULL COMMENT "",
- `size` int(11) NULL COMMENT "",
- INDEX request_idx (`request`) USING INVERTED PROPERTIES("parser" =
"english", "support_phrase" = "true") COMMENT '',
- ) ENGINE=OLAP
- DUPLICATE KEY(`@timestamp`)
- COMMENT "OLAP"
- DISTRIBUTED BY RANDOM BUCKETS 1
- PROPERTIES (
- "replication_allocation" = "tag.location.default: 1",
- "disable_auto_compaction" = "true"
- );
- """
-
- def load_httplogs_data = {table_name, label, read_flag, format_flag,
file_name, ignore_failure=false,
- expected_succ_rows = -1, load_to_single_tablet =
'true' ->
-
- // load the json data
- streamLoad {
- table "${table_name}"
-
- // set http request header params
- set 'label', label + "_" + UUID.randomUUID().toString()
- set 'read_json_by_line', read_flag
- set 'format', format_flag
- file file_name // import json file
- time 10000 // limit inflight 10s
- if (expected_succ_rows >= 0) {
- set 'max_filter_ratio', '1'
- }
-
- // if declared a check callback, the default check condition will
ignore.
- // So you must check all condition
- check { result, exception, startTime, endTime ->
- if (ignore_failure && expected_succ_rows < 0) { return }
- if (exception != null) {
- throw exception
- }
- log.info("Stream load result: ${result}".toString())
- def json = parseJson(result)
- }
- }
- }
-
- load_httplogs_data.call(indexTbName, 'test_index_inlist_fault_injection',
'true', 'json', 'documents-1000.json')
- sql "sync"
-
- sql """ set enable_common_expr_pushdown = true; """
- qt_sql """ select count() from ${indexTbName} where (request match
'images'); """
-
- // query cache hit
- // searcher cache hit
- try {
- sql """ set enable_inverted_index_query_cache = true """
- sql """ set enable_inverted_index_searcher_cache = true """
-
-
GetDebugPoint().enableDebugPointForAllBEs("InvertedIndexReader.handle_query_cache_miss")
-
GetDebugPoint().enableDebugPointForAllBEs("InvertedIndexReader.handle_searcher_cache_miss")
-
- qt_sql """ select count() from ${indexTbName} where (request match
'images'); """
-
- } finally {
-
GetDebugPoint().disableDebugPointForAllBEs("InvertedIndexReader.handle_query_cache_miss")
-
GetDebugPoint().disableDebugPointForAllBEs("InvertedIndexReader.handle_searcher_cache_miss")
- }
-
- // query cache miss
- // searcher cache hit
- try {
- sql """ set enable_inverted_index_query_cache = false """
- sql """ set enable_inverted_index_searcher_cache = true """
-
-
GetDebugPoint().enableDebugPointForAllBEs("InvertedIndexReader.handle_query_cache_hit")
-
GetDebugPoint().enableDebugPointForAllBEs("InvertedIndexReader.handle_searcher_cache_miss")
-
- qt_sql """ select count() from ${indexTbName} where (request match
'images'); """
-
- } finally {
-
GetDebugPoint().disableDebugPointForAllBEs("InvertedIndexReader.handle_query_cache_hit")
-
GetDebugPoint().disableDebugPointForAllBEs("InvertedIndexReader.handle_searcher_cache_miss")
- }
-
- // query cache hit
- // searcher cache miss
- try {
- sql """ set enable_inverted_index_query_cache = true """
- sql """ set enable_inverted_index_searcher_cache = false """
-
-
GetDebugPoint().enableDebugPointForAllBEs("InvertedIndexReader.handle_query_cache_miss")
-
GetDebugPoint().enableDebugPointForAllBEs("InvertedIndexReader.handle_searcher_cache_hit")
-
- qt_sql """ select count() from ${indexTbName} where (request match
'images'); """
- qt_sql """ select count() from ${indexTbName} where (request match
'english'); """
-
- } finally {
-
GetDebugPoint().disableDebugPointForAllBEs("InvertedIndexReader.handle_query_cache_miss")
-
GetDebugPoint().disableDebugPointForAllBEs("InvertedIndexReader.handle_searcher_cache_hit")
- }
-
- // query cache miss
- // searcher cache miss
- try {
- sql """ set enable_inverted_index_query_cache = false """
- sql """ set enable_inverted_index_searcher_cache = false """
-
-
GetDebugPoint().enableDebugPointForAllBEs("InvertedIndexReader.handle_query_cache_hit")
-
GetDebugPoint().enableDebugPointForAllBEs("InvertedIndexReader.handle_searcher_cache_hit")
-
- qt_sql """ select count() from ${indexTbName} where (request match
'images'); """
- qt_sql """ select count() from ${indexTbName} where (request match
'english'); """
-
- } finally {
-
GetDebugPoint().disableDebugPointForAllBEs("InvertedIndexReader.handle_query_cache_hit")
-
GetDebugPoint().disableDebugPointForAllBEs("InvertedIndexReader.handle_searcher_cache_hit")
- }
-
- sql """ set enable_inverted_index_query_cache = true """
- sql """ set enable_inverted_index_searcher_cache = true """
-}
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
