[Refactor] refactors the cache module by reorganizing cache-related files (#63759)

Signed-off-by: trueeyu <lxhhust350@qq.com>

be/src/bench/block_cache_bench.cpp

@@ -24,7 +24,7 @@
 #include <filesystem>
 #include <memory>
 
-#include "cache/starcache_engine.h"
+#include "cache/disk_cache/starcache_engine.h"
 #include "starcache/common/types.h"
 #include "util/logging.h"
 #include "util/random.h"

be/src/bench/object_cache_bench.cpp

@@ -18,9 +18,9 @@
 #include <random>
 
 #include "cache/cache_options.h"
-#include "cache/lrucache_engine.h"
-#include "cache/object_cache/page_cache.h"
-#include "cache/starcache_engine.h"
+#include "cache/disk_cache/starcache_engine.h"
+#include "cache/mem_cache/lrucache_engine.h"
+#include "cache/mem_cache/page_cache.h"
 #include "common/config.h"
 #include "runtime/current_thread.h"
 #include "runtime/exec_env.h"
@@ -105,7 +105,7 @@ std::string ObjectCacheBench::get_cache_type_str(CacheType type) {
 }
 
 void ObjectCacheBench::init_cache(CacheType cache_type) {
-    CacheOptions opt;
+    DiskCacheOptions opt;
     opt.mem_space_size = _capacity;
     opt.block_size = config::datacache_block_size;
     opt.max_flying_memory_mb = config::datacache_max_flying_memory_mb;

be/src/cache/CMakeLists.txt

@@ -23,15 +23,15 @@ set(CACHE_FILES
   mem_space_monitor.cpp
   datacache.cpp
   datacache_utils.cpp
-  lrucache_engine.cpp
-  block_cache/block_cache.cpp
-  block_cache/io_buffer.cpp
-  block_cache/block_cache_hit_rate_counter.hpp
-  object_cache/page_cache.cpp
+  mem_cache/lrucache_engine.cpp
+  mem_cache/page_cache.cpp
+  disk_cache/block_cache.cpp
+  disk_cache/io_buffer.cpp
+  disk_cache/block_cache_hit_rate_counter.hpp
 )
 
 if (${WITH_STARCACHE} STREQUAL "ON")
-    list(APPEND CACHE_FILES starcache_engine.cpp)
+    list(APPEND CACHE_FILES disk_cache/starcache_engine.cpp)
     list(APPEND CACHE_FILES peer_cache_engine.cpp)
 endif()
 

be/src/cache/datacache.cpp

@@ -16,9 +16,9 @@
 
 #include "cache/datacache_utils.h"
 #include "cache/disk_space_monitor.h"
-#include "cache/lrucache_engine.h"
+#include "cache/mem_cache/lrucache_engine.h"
+#include "cache/mem_cache/page_cache.h"
 #include "cache/mem_space_monitor.h"
-#include "cache/object_cache/page_cache.h"
 #include "common/status.h"
 #include "gutil/strings/split.h"
 #include "gutil/strings/strip.h"
@@ -27,8 +27,8 @@
 #include "util/parse_util.h"
 
 #ifdef WITH_STARCACHE
+#include "cache/disk_cache/starcache_engine.h"
 #include "cache/peer_cache_engine.h"
-#include "cache/starcache_engine.h"
 #endif
 
 namespace starrocks {

be/src/cache/datacache.h

@@ -14,9 +14,9 @@
 
 #pragma once
 
-#include "cache/block_cache/block_cache.h"
-#include "cache/local_disk_cache_engine.h"
-#include "cache/local_mem_cache_engine.h"
+#include "cache/disk_cache/block_cache.h"
+#include "cache/disk_cache/local_disk_cache_engine.h"
+#include "cache/mem_cache/local_mem_cache_engine.h"
 #include "common/status.h"
 
 namespace starrocks {

be/src/cache/datacache_utils.h

@@ -15,7 +15,7 @@
 #pragma once
 
 #include "cache/cache_metrics.h"
-#include "cache/local_disk_cache_engine.h"
+#include "cache/disk_cache/local_disk_cache_engine.h"
 #include "gen_cpp/DataCache_types.h"
 #include "storage/options.h"
 

be/src/cache/disk_cache/block_cache.cpp

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "cache/block_cache/block_cache.h"
+#include "cache/disk_cache/block_cache.h"
 
 #include <fmt/format.h>
 

be/src/cache/disk_cache/block_cache.h

@@ -16,7 +16,7 @@
 
 #include <atomic>
 
-#include "cache/local_disk_cache_engine.h"
+#include "cache/disk_cache/local_disk_cache_engine.h"
 #include "cache/remote_cache_engine.h"
 #include "common/status.h"
 

be/src/cache/disk_cache/io_buffer.cpp

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "cache/block_cache/io_buffer.h"
+#include "cache/disk_cache/io_buffer.h"
 
 #include "gutil/strings/fastmem.h"
 

be/src/cache/disk_cache/local_disk_cache_engine.h

@@ -14,9 +14,9 @@
 
 #pragma once
 
-#include "cache/block_cache/io_buffer.h"
 #include "cache/cache_options.h"
-#include "cache/object_cache/cache_types.h"
+#include "cache/disk_cache/io_buffer.h"
+#include "cache/mem_cache/cache_types.h"
 #include "common/status.h"
 
 namespace starrocks {

be/src/cache/disk_cache/starcache_engine.cpp

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "cache/starcache_engine.h"
+#include "cache/disk_cache/starcache_engine.h"
 
 #include <filesystem>
 

be/src/cache/disk_cache/starcache_engine.h

@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include "cache/local_disk_cache_engine.h"
+#include "cache/disk_cache/local_disk_cache_engine.h"
 #include "common/status.h"
 #include "starcache/star_cache.h"
 #include "starcache/time_based_cache_adaptor.h"

be/src/cache/disk_space_monitor.h

@@ -20,7 +20,7 @@
 #include <unordered_map>
 
 #include "cache/cache_options.h"
-#include "cache/local_disk_cache_engine.h"
+#include "cache/disk_cache/local_disk_cache_engine.h"
 #include "common/status.h"
 #include "fs/fs.h"
 #include "util/disk_info.h"

be/src/cache/mem_cache/local_mem_cache_engine.h

@@ -14,9 +14,9 @@
 
 #pragma once
 
-#include "cache/block_cache/io_buffer.h"
 #include "cache/cache_options.h"
-#include "cache/object_cache/cache_types.h"
+#include "cache/disk_cache/io_buffer.h"
+#include "cache/mem_cache/cache_types.h"
 #include "common/status.h"
 
 namespace starrocks {

be/src/cache/mem_cache/lrucache_engine.cpp

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "cache/lrucache_engine.h"
+#include "cache/mem_cache/lrucache_engine.h"
 
 #include <butil/fast_rand.h>
 

be/src/cache/mem_cache/lrucache_engine.h

@@ -16,7 +16,7 @@
 
 #include <atomic>
 
-#include "cache/local_mem_cache_engine.h"
+#include "cache/mem_cache/local_mem_cache_engine.h"
 #include "util/lru_cache.h"
 
 namespace starrocks {

be/src/cache/mem_cache/page_cache.cpp

@@ -32,7 +32,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-#include "cache/object_cache/page_cache.h"
+#include "cache/mem_cache/page_cache.h"
 
 #include <malloc.h>
 

be/src/cache/mem_space_monitor.cpp

@@ -14,7 +14,7 @@
 
 #include "cache/mem_space_monitor.h"
 
-#include "cache/object_cache/page_cache.h"
+#include "cache/mem_cache/page_cache.h"
 #include "common/config.h"
 #include "runtime/exec_env.h"
 #include "runtime/mem_tracker.h"

be/src/cache/remote_cache_engine.h

@@ -14,8 +14,8 @@
 
 #pragma once
 
-#include "cache/block_cache/io_buffer.h"
 #include "cache/cache_options.h"
+#include "cache/disk_cache/io_buffer.h"
 #include "common/status.h"
 
 namespace starrocks {

be/src/common/logconfig.cpp

@@ -27,7 +27,7 @@
 #include <mutex>
 
 #include "cache/datacache.h"
-#include "cache/object_cache/page_cache.h"
+#include "cache/mem_cache/page_cache.h"
 #include "common/config.h"
 #include "gutil/endian.h"
 #include "gutil/stringprintf.h"

be/src/exec/hdfs_scanner/hdfs_scanner.cpp

@@ -14,7 +14,7 @@
 
 #include "exec/hdfs_scanner/hdfs_scanner.h"
 
-#include "cache/block_cache/block_cache_hit_rate_counter.hpp"
+#include "cache/disk_cache/block_cache_hit_rate_counter.hpp"
 #include "column/column_helper.h"
 #include "column/type_traits.h"
 #include "connector/deletion_vector/deletion_vector.h"

be/src/exec/schema_scanner/schema_be_datacache_metrics_scanner.cpp

@@ -21,7 +21,7 @@
 #include "runtime/exec_env.h"
 
 #ifdef WITH_STARCACHE
-#include "cache/starcache_engine.h"
+#include "cache/disk_cache/starcache_engine.h"
 #endif
 
 namespace starrocks {

be/src/formats/parquet/file_reader.h

@@ -20,7 +20,7 @@
 #include <string>
 #include <vector>
 
-#include "cache/block_cache/block_cache.h"
+#include "cache/disk_cache/block_cache.h"
 #include "column/vectorized_fwd.h"
 #include "common/status.h"
 #include "common/statusor.h"

be/src/http/action/datacache_action.cpp

@@ -21,15 +21,15 @@
 
 #include <string>
 
-#include "cache/block_cache/block_cache_hit_rate_counter.hpp"
-#include "cache/local_disk_cache_engine.h"
+#include "cache/disk_cache/block_cache_hit_rate_counter.hpp"
+#include "cache/disk_cache/local_disk_cache_engine.h"
 #include "http/http_channel.h"
 #include "http/http_headers.h"
 #include "http/http_request.h"
 #include "http/http_status.h"
 
 #ifdef WITH_STARCACHE
-#include "cache/starcache_engine.h"
+#include "cache/disk_cache/starcache_engine.h"
 #endif
 
 namespace starrocks {

be/src/http/action/update_config_action.cpp

@@ -44,7 +44,7 @@
 #include "agent/agent_common.h"
 #include "agent/agent_server.h"
 #include "cache/datacache.h"
-#include "cache/object_cache/page_cache.h"
+#include "cache/mem_cache/page_cache.h"
 #include "common/configbase.h"
 #include "common/status.h"
 #include "exec/workgroup/scan_executor.h"

be/src/io/cache_input_stream.h

@@ -17,8 +17,8 @@
 #include <memory>
 #include <string>
 
-#include "cache/block_cache/block_cache.h"
-#include "cache/block_cache/io_buffer.h"
+#include "cache/disk_cache/block_cache.h"
+#include "cache/disk_cache/io_buffer.h"
 #include "io/shared_buffered_input_stream.h"
 
 namespace starrocks::io {

be/src/runtime/runtime_state.h

@@ -44,8 +44,8 @@
 #include <unordered_map>
 #include <vector>
 
-#include "cache/block_cache/block_cache.h"
 #include "cache/datacache_utils.h"
+#include "cache/disk_cache/block_cache.h"
 #include "cctz/time_zone.h"
 #include "common/global_types.h"
 #include "common/object_pool.h"

be/src/service/service_be/starrocks_be.cpp

@@ -21,8 +21,8 @@
 
 #include "agent/heartbeat_server.h"
 #include "backend_service.h"
-#include "cache/block_cache/block_cache.h"
 #include "cache/datacache.h"
+#include "cache/disk_cache/block_cache.h"
 #include "common/config.h"
 #include "common/daemon.h"
 #include "common/process_exit.h"
@@ -49,7 +49,7 @@
 #include "util/thrift_server.h"
 
 #ifdef WITH_STARCACHE
-#include "cache/starcache_engine.h"
+#include "cache/disk_cache/starcache_engine.h"
 #endif
 
 namespace brpc {

be/src/storage/rowset/page_handle.h

@@ -34,7 +34,7 @@
 
 #pragma once
 
-#include "cache/object_cache/page_cache.h"
+#include "cache/mem_cache/page_cache.h"
 #include "storage/rowset/page_handle_fwd.h"
 
 namespace starrocks {

be/src/storage/rowset/page_io.cpp

@@ -38,7 +38,7 @@
 #include <string>
 #include <string_view>
 
-#include "cache/object_cache/page_cache.h"
+#include "cache/mem_cache/page_cache.h"
 #include "column/column.h"
 #include "common/logging.h"
 #include "fs/fs.h"

be/src/util/system_metrics.cpp

@@ -46,7 +46,7 @@
 #ifdef USE_STAROS
 #include "fslib/star_cache_handler.h"
 #endif
-#include "cache/object_cache/page_cache.h"
+#include "cache/mem_cache/page_cache.h"
 #include "gutil/strings/split.h" // for string split
 #include "gutil/strtoint.h"      //  for atoi64
 #include "io/io_profiler.h"

be/test/CMakeLists.txt

@@ -408,7 +408,8 @@ set(EXEC_FILES
         ./service/service_be/internal_service_test.cpp
         ./service/staros_worker_test.cpp
         ./cache/datacache_utils_test.cpp
-        ./cache/block_cache/block_cache_hit_rate_counter_test.cpp
+        ./cache/disk_cache/block_cache_hit_rate_counter_test.cpp
+        ./cache/mem_cache/page_cache_test.cpp
         ./cache/peer_cache_test.cpp
         ./util/thrift_rpc_helper_test.cpp
         ./util/thrift_client_test.cpp
@@ -602,9 +603,9 @@ SET(DW_TEST_FILES
 
 if ("${WITH_STARCACHE}" STREQUAL "ON")
     list(APPEND DW_TEST_FILES ./cache/disk_space_monitor_test.cpp)
-    list(APPEND DW_TEST_FILES ./cache/lrucache_engine_test.cpp)
-    list(APPEND DW_TEST_FILES ./cache/starcache_engine_test.cpp)
-    list(APPEND DW_TEST_FILES ./cache/block_cache/block_cache_test.cpp)
+    list(APPEND DW_TEST_FILES ./cache/disk_cache/starcache_engine_test.cpp)
+    list(APPEND DW_TEST_FILES ./cache/disk_cache/block_cache_test.cpp)
+    list(APPEND DW_TEST_FILES ./cache/mem_cache/lrucache_engine_test.cpp)
     list(APPEND DW_TEST_FILES ./io/cache_input_stream_test.cpp)
 endif ()
 

be/test/cache/disk_cache/block_cache_hit_rate_counter_test.cpp

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "cache/block_cache/block_cache_hit_rate_counter.hpp"
+#include "cache/disk_cache/block_cache_hit_rate_counter.hpp"
 
 #include <gtest/gtest.h>
 

be/test/cache/disk_cache/block_cache_test.cpp

@@ -12,16 +12,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "cache/block_cache/block_cache.h"
+#include "cache/disk_cache/block_cache.h"
 
 #include <gtest/gtest.h>
 
 #include <cstring>
 #include <filesystem>
 
-#include "cache/block_cache/test_cache_utils.h"
 #include "cache/datacache_utils.h"
-#include "common/logging.h"
+#include "cache/disk_cache/test_cache_utils.h"
 #include "common/statusor.h"
 #include "fs/fs_util.h"
 #include "testutil/assert.h"
@@ -30,10 +29,6 @@ namespace starrocks {
 
 class BlockCacheTest : public ::testing::Test {
 protected:
-    static void SetUpTestCase() {}
-
-    static void TearDownTestCase() {}
-
     void SetUp() override {
         _saved_enable_auto_adjust = config::enable_datacache_disk_auto_adjust;
         config::enable_datacache_disk_auto_adjust = false;

be/test/cache/disk_cache/starcache_engine_test.cpp

@@ -12,11 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "cache/starcache_engine.h"
+#include "cache/disk_cache/starcache_engine.h"
 
 #include <gtest/gtest.h>
 
-#include "cache/block_cache/test_cache_utils.h"
+#include "cache/disk_cache/test_cache_utils.h"
 #include "fs/fs_util.h"
 #include "testutil/assert.h"
 

be/test/cache/disk_cache/test_cache_utils.h

@@ -17,9 +17,9 @@
 #include <fmt/format.h>
 #include <gtest/gtest.h>
 
-#include "cache/block_cache/block_cache.h"
+#include "cache/disk_cache/block_cache.h"
+#include "cache/disk_cache/starcache_engine.h"
 #include "cache/peer_cache_engine.h"
-#include "cache/starcache_engine.h"
 #include "common/logging.h"
 #include "testutil/assert.h"
 

be/test/cache/disk_space_monitor_test.cpp

@@ -20,8 +20,8 @@
 #include <cstring>
 #include <filesystem>
 
-#include "cache/block_cache/block_cache.h"
-#include "cache/block_cache/test_cache_utils.h"
+#include "cache/disk_cache/block_cache.h"
+#include "cache/disk_cache/test_cache_utils.h"
 #include "common/logging.h"
 #include "common/statusor.h"
 #include "fs/fs_util.h"

be/test/cache/mem_cache/lrucache_engine_test.cpp

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "cache/lrucache_engine.h"
+#include "cache/mem_cache/lrucache_engine.h"
 
 #include <gtest/gtest.h>
 

be/test/cache/mem_cache/page_cache_test.cpp

@@ -32,11 +32,11 @@
 // specific language governing permissions and limitations
 // under the License.
 
-#include "cache/object_cache/page_cache.h"
+#include "cache/mem_cache/page_cache.h"
 
 #include <gtest/gtest.h>
 
-#include "cache/lrucache_engine.h"
+#include "cache/mem_cache/lrucache_engine.h"
 #include "testutil/assert.h"
 
 namespace starrocks {
@@ -54,7 +54,7 @@ protected:
 };
 
 void StoragePageCacheTest::SetUp() {
-    CacheOptions opts{.mem_space_size = _capacity};
+    MemCacheOptions opts{.mem_space_size = _capacity};
     _lru_cache = std::make_shared<LRUCacheEngine>();
     ASSERT_OK(_lru_cache->init(opts));
     _page_cache = std::make_shared<StoragePageCache>(_lru_cache.get());
@@ -96,7 +96,7 @@ TEST_F(StoragePageCacheTest, normal) {
         PageCacheHandle handle;
 
         ObjectCacheWriteOptions opts;
-        ASSERT_OK(_page_cache->insert(key, data.get(), &opts, &handle));
+        ASSERT_OK(_page_cache->insert(key, data.get(), opts, &handle));
         ASSERT_EQ(handle.data(), data.get());
         auto* check_data = data.release();
 

be/test/cache/peer_cache_test.cpp

@@ -15,8 +15,8 @@
 #include <fmt/format.h>
 #include <gtest/gtest.h>
 
-#include "cache/block_cache/io_buffer.h"
 #include "cache/cache_options.h"
+#include "cache/disk_cache/io_buffer.h"
 #include "cache/peer_cache_engine.h"
 #include "common/statusor.h"
 

be/test/exec/hdfs_scanner/cache_select_scanner_test.cpp

@@ -18,7 +18,7 @@
 
 #include <memory>
 
-#include "cache/block_cache/block_cache.h"
+#include "cache/disk_cache/block_cache.h"
 #include "column/column_helper.h"
 #include "exec/hdfs_scanner/hdfs_scanner_orc.h"
 #include "exec/hdfs_scanner/hdfs_scanner_parquet.h"

be/test/exec/hdfs_scanner/hdfs_scanner_test.cpp

@@ -18,10 +18,10 @@
 
 #include <memory>
 
-#include "cache/block_cache/block_cache.h"
-#include "cache/block_cache/test_cache_utils.h"
 #include "cache/datacache.h"
-#include "cache/starcache_engine.h"
+#include "cache/disk_cache/block_cache.h"
+#include "cache/disk_cache/starcache_engine.h"
+#include "cache/disk_cache/test_cache_utils.h"
 #include "column/column_helper.h"
 #include "exec/hdfs_scanner/hdfs_scanner_orc.h"
 #include "exec/hdfs_scanner/hdfs_scanner_parquet.h"

be/test/formats/parquet/file_reader_test.cpp

@@ -20,10 +20,10 @@
 #include <random>
 #include <set>
 
-#include "cache/block_cache/block_cache.h"
-#include "cache/block_cache/test_cache_utils.h"
-#include "cache/lrucache_engine.h"
-#include "cache/starcache_engine.h"
+#include "cache/disk_cache/block_cache.h"
+#include "cache/disk_cache/starcache_engine.h"
+#include "cache/disk_cache/test_cache_utils.h"
+#include "cache/mem_cache/lrucache_engine.h"
 #include "column/column_helper.h"
 #include "column/fixed_length_column.h"
 #include "common/logging.h"

be/test/http/action/update_config_action_test.cpp

@@ -16,9 +16,9 @@
 
 #include <gtest/gtest.h>
 
-#include "cache/block_cache/test_cache_utils.h"
 #include "cache/datacache.h"
-#include "cache/starcache_engine.h"
+#include "cache/disk_cache/starcache_engine.h"
+#include "cache/disk_cache/test_cache_utils.h"
 #include "fs/fs_util.h"
 #include "runtime/exec_env.h"
 #include "storage/persistent_index_load_executor.h"

be/test/http/datacache_action_test.cpp

@@ -19,9 +19,9 @@
 #include <gtest/gtest.h>
 #include <rapidjson/document.h>
 
-#include "cache/block_cache/block_cache_hit_rate_counter.hpp"
-#include "cache/block_cache/test_cache_utils.h"
-#include "cache/starcache_engine.h"
+#include "cache/disk_cache/block_cache_hit_rate_counter.hpp"
+#include "cache/disk_cache/starcache_engine.h"
+#include "cache/disk_cache/test_cache_utils.h"
 #include "gen_cpp/HeartbeatService_types.h"
 #include "http/http_channel.h"
 #include "http/http_request.h"

be/test/io/cache_input_stream_test.cpp

@@ -16,9 +16,9 @@
 
 #include <gtest/gtest.h>
 
-#include "cache/block_cache/test_cache_utils.h"
 #include "cache/datacache.h"
-#include "cache/starcache_engine.h"
+#include "cache/disk_cache/starcache_engine.h"
+#include "cache/disk_cache/test_cache_utils.h"
 #include "fs/fs_util.h"
 #include "runtime/exec_env.h"
 #include "testutil/assert.h"

be/test/service/service_be/internal_service_test.cpp

@@ -19,8 +19,8 @@
 
 #include <memory>
 
-#include "cache/block_cache/test_cache_utils.h"
 #include "cache/datacache.h"
+#include "cache/disk_cache/test_cache_utils.h"
 #include "common/utils.h"
 #include "exec/tablet_sink_index_channel.h"
 #include "runtime/exec_env.h"

be/test/storage/rowset/ordinal_page_index_test.cpp

@@ -40,7 +40,7 @@
 #include <memory>
 #include <string>
 
-#include "cache/object_cache/page_cache.h"
+#include "cache/mem_cache/page_cache.h"
 #include "common/logging.h"
 #include "fs/fs_memory.h"
 #include "runtime/mem_tracker.h"

be/test/storage/rowset/page_handle_test.cpp

@@ -16,8 +16,8 @@
 
 #include <gtest/gtest.h>
 
-#include "cache/lrucache_engine.h"
-#include "cache/object_cache/page_cache.h"
+#include "cache/mem_cache/lrucache_engine.h"
+#include "cache/mem_cache/page_cache.h"
 #include "testutil/assert.h"
 
 namespace starrocks {

be/test/storage/rowset/page_io_test.cpp

@@ -16,8 +16,8 @@
 
 #include <gtest/gtest.h>
 
-#include "cache/lrucache_engine.h"
-#include "cache/object_cache/page_cache.h"
+#include "cache/mem_cache/lrucache_engine.h"
+#include "cache/mem_cache/page_cache.h"
 #include "fs/fs_memory.h"
 #include "storage/rowset/binary_plain_page.h"
 #include "storage/rowset/bitshuffle_page.h"

be/test/storage/rowset/zone_map_index_test.cpp

@@ -39,7 +39,7 @@
 #include <memory>
 #include <string>
 
-#include "cache/object_cache/page_cache.h"
+#include "cache/mem_cache/page_cache.h"
 #include "column/binary_column.h"
 #include "common/config.h"
 #include "fs/fs_memory.h"

be/test/util/starrocks_metrics_test.cpp

@@ -36,8 +36,8 @@
 
 #include <gtest/gtest.h>
 
-#include "cache/lrucache_engine.h"
-#include "cache/object_cache/page_cache.h"
+#include "cache/mem_cache/lrucache_engine.h"
+#include "cache/mem_cache/page_cache.h"
 #include "common/config.h"
 #include "testutil/assert.h"