From c0189c078fd0f1f9c488feb02b2e8d6413f2ab60 Mon Sep 17 00:00:00 2001 From: Chen Zhao Date: Mon, 20 Oct 2025 14:58:22 +0800 Subject: [PATCH 1/4] avoid flushing small data --- 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 b823488d3c6..aec150cfcd5 160000 --- a/storage/eloq/tx_service +++ b/storage/eloq/tx_service @@ -1 +1 @@ -Subproject commit b823488d3c6e01e1bb2e11a4469e2823ba0be9a6 +Subproject commit aec150cfcd5730834716678124f315d88d4599b5 From a68250bdd532132be5a7f0a1b391ed754db62985 Mon Sep 17 00:00:00 2001 From: Chen Zhao Date: Mon, 20 Oct 2025 15:02:42 +0800 Subject: [PATCH 2/4] format --- storage/eloq/ha_eloq.cc | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/storage/eloq/ha_eloq.cc b/storage/eloq/ha_eloq.cc index 71d8157e003..b33e713f989 100644 --- a/storage/eloq/ha_eloq.cc +++ b/storage/eloq/ha_eloq.cc @@ -165,7 +165,7 @@ #define ELOQDS 1 #endif -#if (defined(DATA_STORE_TYPE_ELOQDSS_ROCKSDB_CLOUD_S3) || \ +#if (defined(DATA_STORE_TYPE_ELOQDSS_ROCKSDB_CLOUD_S3) || \ defined(DATA_STORE_TYPE_ELOQDSS_ROCKSDB_CLOUD_GCS)) #define ELOQDS_RKDB_CLOUD 1 #endif @@ -212,7 +212,7 @@ #if !defined(LOG_STATE_TYPE_RKDB_CLOUD) // Only if LOG_STATE_TYPE_RKDB_CLOUD undefined -#if ((defined(LOG_STATE_TYPE_RKDB_S3) || defined(LOG_STATE_TYPE_RKDB_GCS)) && \ +#if ((defined(LOG_STATE_TYPE_RKDB_S3) || defined(LOG_STATE_TYPE_RKDB_GCS)) && \ !defined(LOG_STATE_TYPE_RKDB)) #define LOG_STATE_TYPE_RKDB_CLOUD 1 #endif @@ -222,7 +222,7 @@ #if !defined(LOG_STATE_TYPE_RKDB_ALL) // Only if LOG_STATE_TYPE_RKDB_ALL undefined -#if (defined(LOG_STATE_TYPE_RKDB_S3) || defined(LOG_STATE_TYPE_RKDB_GCS) || \ +#if (defined(LOG_STATE_TYPE_RKDB_S3) || defined(LOG_STATE_TYPE_RKDB_GCS) || \ defined(LOG_STATE_TYPE_RKDB)) #define LOG_STATE_TYPE_RKDB_ALL 1 #endif @@ -233,7 +233,6 @@ #include "rocksdb_cloud_config.h" #endif - // Don't put this include after sql_class.h include, it will cause compile // error #if (defined(DATA_STORE_TYPE_DYNAMODB) || defined(LOG_STATE_TYPE_RKDB_S3) || \ @@ -3301,8 +3300,7 @@ static int eloq_done_func(void *p) metrics_registry= nullptr; } -#if defined(DATA_STORE_TYPE_DYNAMODB) || \ - defined(LOG_STATE_TYPE_RKDB_S3) || \ +#if defined(DATA_STORE_TYPE_DYNAMODB) || defined(LOG_STATE_TYPE_RKDB_S3) || \ defined(DATA_STORE_TYPE_ELOQDSS_ROCKSDB_CLOUD_S3) aws_deinit(); #endif From 2aff432b91c440f36b62ae8193d16b1cff3a0c23 Mon Sep 17 00:00:00 2001 From: Chen Zhao Date: Tue, 21 Oct 2025 11:07:27 +0800 Subject: [PATCH 3/4] update --- 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 aec150cfcd5..0d637f5067d 160000 --- a/storage/eloq/tx_service +++ b/storage/eloq/tx_service @@ -1 +1 @@ -Subproject commit aec150cfcd5730834716678124f315d88d4599b5 +Subproject commit 0d637f5067d3ff2786bf5c5d4b92ffcd6c9ab029 From b50400117b1fdf55bda679fe68ac19c0bd50447e Mon Sep 17 00:00:00 2001 From: Chen Zhao Date: Tue, 21 Oct 2025 11:10:52 +0800 Subject: [PATCH 4/4] update --- 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 0d637f5067d..c689ba46cd9 160000 --- a/storage/eloq/tx_service +++ b/storage/eloq/tx_service @@ -1 +1 @@ -Subproject commit 0d637f5067d3ff2786bf5c5d4b92ffcd6c9ab029 +Subproject commit c689ba46cd96d232240e2fe8b7b118fd01ddc0f5