diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2023-01-13 10:47:56 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2023-01-13 10:47:56 +0200 |
| commit | 1e04cafcba88e1801e828a5bbab7fe9fdd7ca61c (patch) | |
| tree | 6adddccee0d76b14e2821e6b4263a6dfcf6ccde6 /storage/rocksdb | |
| parent | ab36eac584a0bef4a048a3fd8ae56ff2cbfcb6cc (diff) | |
| parent | 3386b309756adba6b9633ad18c4e0575c7304cfe (diff) | |
| download | mariadb-git-1e04cafcba88e1801e828a5bbab7fe9fdd7ca61c.tar.gz | |
Merge 10.6 into 10.7
Diffstat (limited to 'storage/rocksdb')
| -rw-r--r-- | storage/rocksdb/ha_rocksdb.cc | 5 | ||||
| -rw-r--r-- | storage/rocksdb/ha_rocksdb.h | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/storage/rocksdb/ha_rocksdb.cc b/storage/rocksdb/ha_rocksdb.cc index 46bcea0e67d..7ca0266e7b7 100644 --- a/storage/rocksdb/ha_rocksdb.cc +++ b/storage/rocksdb/ha_rocksdb.cc @@ -8489,8 +8489,7 @@ int ha_rocksdb::index_read_map_impl(uchar *const buf, const uchar *const key, const key_range *end_key) { DBUG_ENTER_FUNC(); - DBUG_EXECUTE_IF("myrocks_busy_loop_on_row_read", int debug_i = 0; - while (1) { debug_i++; }); + DBUG_EXECUTE_IF("myrocks_busy_loop_on_row_read", my_sleep(50000);); int rc = 0; @@ -12160,7 +12159,6 @@ static int calculate_stats( } } - int num_sst = 0; for (const auto &it : props) { std::vector<Rdb_index_stats> sst_stats; Rdb_tbl_prop_coll::read_stats_from_tbl_props(it.second, &sst_stats); @@ -12189,7 +12187,6 @@ static int calculate_stats( stats[it1.m_gl_index_id].merge( it1, true, it_index->second->max_storage_fmt_length()); } - num_sst++; } if (include_memtables) { diff --git a/storage/rocksdb/ha_rocksdb.h b/storage/rocksdb/ha_rocksdb.h index 63bf7ffd602..2d6400231fc 100644 --- a/storage/rocksdb/ha_rocksdb.h +++ b/storage/rocksdb/ha_rocksdb.h @@ -406,7 +406,7 @@ class ha_rocksdb : public my_core::handler { void free_key_buffers(); // the buffer size should be at least 2*Rdb_key_def::INDEX_NUMBER_SIZE - rocksdb::Range get_range(const int i, uchar buf[]) const; + rocksdb::Range get_range(const int i, uchar buf[2 * 4]) const; /* Perf timers for data reads |