Skip to content

Commit 84dd647

Browse files
committed
Fix compilation failure in rdb_perf_context.h
Rdb_atomic_perf_counters uses my_io_perf_atomic_struct which uses atomic_stat from include/atomic_stat.h which was backported in the previous cset.
1 parent 20bd26e commit 84dd647

File tree

3 files changed

+19
-0
lines changed

3 files changed

+19
-0
lines changed

storage/rocksdb/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ SET(ROCKSDB_SOURCES
4141
rdb_sst_info.cc rdb_sst_info.h
4242
rdb_utils.cc rdb_utils.h rdb_buff.h
4343
rdb_threads.cc rdb_threads.h
44+
rdb_mariadb_port.h
4445
${ROCKSDB_LIB_SOURCES}
4546
)
4647

storage/rocksdb/rdb_mariadb_port.h

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
2+
#include "atomic_stat.h"
3+
4+
/* Struct used for IO performance counters, shared among multiple threads */
5+
struct my_io_perf_atomic_struct {
6+
atomic_stat<ulonglong> bytes;
7+
atomic_stat<ulonglong> requests;
8+
atomic_stat<ulonglong> svc_time; /*!< time to do read or write operation */
9+
atomic_stat<ulonglong> svc_time_max;
10+
atomic_stat<ulonglong> wait_time; /*!< total time in the request array */
11+
atomic_stat<ulonglong> wait_time_max;
12+
atomic_stat<ulonglong> slow_ios; /*!< requests that take too long */
13+
};
14+
typedef struct my_io_perf_atomic_struct my_io_perf_atomic_t;
15+
16+

storage/rocksdb/rdb_perf_context.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@
2525
#include "./handler.h"
2626
#include <my_global.h>
2727

28+
#include "rdb_mariadb_port.h"
29+
2830
namespace myrocks {
2931

3032
enum {

0 commit comments

Comments
 (0)