From 5c3f848bb5e0dee85385eef60d753b053e553cb2 Mon Sep 17 00:00:00 2001 From: githubzilla Date: Tue, 23 Sep 2025 12:17:10 +0800 Subject: [PATCH 1/6] Update store_handler --- storage/eloq/store_handler | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/storage/eloq/store_handler b/storage/eloq/store_handler index e0e4ef07c3a..12155c653f1 160000 --- a/storage/eloq/store_handler +++ b/storage/eloq/store_handler @@ -1 +1 @@ -Subproject commit e0e4ef07c3a9cab621adc16c4edbf1f8935735db +Subproject commit 12155c653f1c876916ad21a2825d0e8e827c3f11 From 9ee549cc412c8a79915709be58f3ac048a5e853f Mon Sep 17 00:00:00 2001 From: githubzilla Date: Tue, 23 Sep 2025 13:12:53 +0800 Subject: [PATCH 2/6] Update tx --- storage/eloq/tx_service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/storage/eloq/tx_service b/storage/eloq/tx_service index 16f3cf1d6aa..575b5609f55 160000 --- a/storage/eloq/tx_service +++ b/storage/eloq/tx_service @@ -1 +1 @@ -Subproject commit 16f3cf1d6aabb763b1e8d2a71f0b06385a4631e3 +Subproject commit 575b5609f555e4310a5a7a227b90fcac8e1103a7 From a82b3971069b8e690e2b2b16d95a6a0fe71e2392 Mon Sep 17 00:00:00 2001 From: githubzilla Date: Tue, 23 Sep 2025 13:13:19 +0800 Subject: [PATCH 3/6] Update cmake file --- storage/eloq/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/storage/eloq/CMakeLists.txt b/storage/eloq/CMakeLists.txt index 7830ab1a697..0db6e18149c 100644 --- a/storage/eloq/CMakeLists.txt +++ b/storage/eloq/CMakeLists.txt @@ -298,6 +298,8 @@ elseif(WITH_DATA_STORE STREQUAL "ELOQDSS_ROCKSDB_CLOUD_S3" OR WITH_DATA_STORE ST store_handler/eloq_data_store_service/rocksdb_config.cpp store_handler/eloq_data_store_service/rocksdb_data_store_common.h store_handler/eloq_data_store_service/rocksdb_data_store_common.cpp + store_handler/eloq_data_store_service/purger_event_listener.cpp + store_handler/eloq_data_store_service/purger_sliding_window.cpp ) if (WITH_DATA_STORE STREQUAL "ELOQDSS_ROCKSDB_CLOUD_S3") From 32a94d35b780ba86c4d44fb187974cf42a0cbb64 Mon Sep 17 00:00:00 2001 From: githubzilla Date: Tue, 23 Sep 2025 13:17:17 +0800 Subject: [PATCH 4/6] Adjust rocksdb cloud purger periodicity period --- mysql-test/include/eloq_kv_dss.cnf | 1 + 1 file changed, 1 insertion(+) diff --git a/mysql-test/include/eloq_kv_dss.cnf b/mysql-test/include/eloq_kv_dss.cnf index ef5b3fe6f2e..11a267751b5 100644 --- a/mysql-test/include/eloq_kv_dss.cnf +++ b/mysql-test/include/eloq_kv_dss.cnf @@ -12,3 +12,4 @@ eloq_dss_rocksdb_cloud_region = ap-northeast-1 eloq_dss_config_file_path = eloq_dss_peer_node = eloq_dss_rocksdb_cloud_sst_file_cache_size = 20GB +eloq_dss_rocksdb_cloud_purger_periodicity_secs = 30 From e5a670074b0cbbc2cd9a272ac899c5ac054f6cc5 Mon Sep 17 00:00:00 2001 From: githubzilla Date: Tue, 23 Sep 2025 14:00:01 +0800 Subject: [PATCH 5/6] Update store_handler --- storage/eloq/store_handler | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/storage/eloq/store_handler b/storage/eloq/store_handler index 12155c653f1..6c5604a002e 160000 --- a/storage/eloq/store_handler +++ b/storage/eloq/store_handler @@ -1 +1 @@ -Subproject commit 12155c653f1c876916ad21a2825d0e8e827c3f11 +Subproject commit 6c5604a002e58aad45dfebd09b51ae150195b330 From 1863ea0e729dc6f0704d0ba7c9c85eba49b9f324 Mon Sep 17 00:00:00 2001 From: githubzilla Date: Tue, 23 Sep 2025 14:10:10 +0800 Subject: [PATCH 6/6] Adjust build script for purger --- storage/eloq/CMakeLists.txt | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/storage/eloq/CMakeLists.txt b/storage/eloq/CMakeLists.txt index 0db6e18149c..ee03a309894 100644 --- a/storage/eloq/CMakeLists.txt +++ b/storage/eloq/CMakeLists.txt @@ -297,16 +297,15 @@ elseif(WITH_DATA_STORE STREQUAL "ELOQDSS_ROCKSDB_CLOUD_S3" OR WITH_DATA_STORE ST store_handler/eloq_data_store_service/rocksdb_config.h store_handler/eloq_data_store_service/rocksdb_config.cpp store_handler/eloq_data_store_service/rocksdb_data_store_common.h - store_handler/eloq_data_store_service/rocksdb_data_store_common.cpp - store_handler/eloq_data_store_service/purger_event_listener.cpp - store_handler/eloq_data_store_service/purger_sliding_window.cpp - ) + store_handler/eloq_data_store_service/rocksdb_data_store_common.cpp) if (WITH_DATA_STORE STREQUAL "ELOQDSS_ROCKSDB_CLOUD_S3") SET(MYELOQ_SOURCES ${MYELOQ_SOURCES} store_handler/eloq_data_store_service/rocksdb_cloud_data_store.h store_handler/eloq_data_store_service/rocksdb_cloud_data_store.cpp + store_handler/eloq_data_store_service/purger_event_listener.cpp + store_handler/eloq_data_store_service/purger_sliding_window.cpp ) elseif (WITH_DATA_STORE STREQUAL "ELOQDSS_ROCKSDB") SET(MYELOQ_SOURCES