Commit 2770e800 authored by Sergei Petrunia's avatar Sergei Petrunia

MariaRocks: remove ha_statistic_increment calls

They have been replaced with increment_statistics() calls made
by handler::ha_XXX() methods.
parent 3af99862
...@@ -6246,7 +6246,6 @@ int ha_rocksdb::index_read_map_impl(uchar *buf, const uchar *key, ...@@ -6246,7 +6246,6 @@ int ha_rocksdb::index_read_map_impl(uchar *buf, const uchar *key,
int rc= 0; int rc= 0;
DBUG_ENTER("ha_rocksdb::index_read_map"); DBUG_ENTER("ha_rocksdb::index_read_map");
ha_statistic_increment(&SSV::ha_read_key_count);
const std::shared_ptr<const Rdb_key_def>& kd= m_key_descr_arr[active_index]; const std::shared_ptr<const Rdb_key_def>& kd= m_key_descr_arr[active_index];
uint actual_key_parts= kd->get_key_parts(); uint actual_key_parts= kd->get_key_parts();
bool using_full_key= is_using_full_key(keypart_map, actual_key_parts); bool using_full_key= is_using_full_key(keypart_map, actual_key_parts);
...@@ -6791,7 +6790,6 @@ int ha_rocksdb::get_row_by_rowid(uchar *buf, const char *rowid, ...@@ -6791,7 +6790,6 @@ int ha_rocksdb::get_row_by_rowid(uchar *buf, const char *rowid,
int ha_rocksdb::index_next(uchar *buf) int ha_rocksdb::index_next(uchar *buf)
{ {
bool moves_forward= true; bool moves_forward= true;
ha_statistic_increment(&SSV::ha_read_next_count);
if (m_key_descr_arr[active_index]->m_is_reverse_cf) if (m_key_descr_arr[active_index]->m_is_reverse_cf)
{ {
moves_forward= false; moves_forward= false;
...@@ -6807,7 +6805,6 @@ int ha_rocksdb::index_next(uchar *buf) ...@@ -6807,7 +6805,6 @@ int ha_rocksdb::index_next(uchar *buf)
int ha_rocksdb::index_prev(uchar *buf) int ha_rocksdb::index_prev(uchar *buf)
{ {
bool moves_forward= false; bool moves_forward= false;
ha_statistic_increment(&SSV::ha_read_prev_count);
if (m_key_descr_arr[active_index]->m_is_reverse_cf) if (m_key_descr_arr[active_index]->m_is_reverse_cf)
{ {
moves_forward= true; moves_forward= true;
...@@ -6855,7 +6852,6 @@ int ha_rocksdb::index_next_with_direction(uchar *buf, bool move_forward) ...@@ -6855,7 +6852,6 @@ int ha_rocksdb::index_next_with_direction(uchar *buf, bool move_forward)
int ha_rocksdb::index_first(uchar *buf) int ha_rocksdb::index_first(uchar *buf)
{ {
m_sk_match_prefix= nullptr; m_sk_match_prefix= nullptr;
ha_statistic_increment(&SSV::ha_read_first_count);
int rc= m_key_descr_arr[active_index]->m_is_reverse_cf ? int rc= m_key_descr_arr[active_index]->m_is_reverse_cf ?
index_last_intern(buf) : index_first_intern(buf); index_last_intern(buf) : index_first_intern(buf);
if (rc == HA_ERR_KEY_NOT_FOUND) if (rc == HA_ERR_KEY_NOT_FOUND)
...@@ -6867,7 +6863,6 @@ int ha_rocksdb::index_first(uchar *buf) ...@@ -6867,7 +6863,6 @@ int ha_rocksdb::index_first(uchar *buf)
int ha_rocksdb::index_last(uchar *buf) int ha_rocksdb::index_last(uchar *buf)
{ {
m_sk_match_prefix= nullptr; m_sk_match_prefix= nullptr;
ha_statistic_increment(&SSV::ha_read_last_count);
int rc= m_key_descr_arr[active_index]->m_is_reverse_cf ? int rc= m_key_descr_arr[active_index]->m_is_reverse_cf ?
index_first_intern(buf) : index_last_intern(buf); index_first_intern(buf) : index_last_intern(buf);
if (rc == HA_ERR_KEY_NOT_FOUND) if (rc == HA_ERR_KEY_NOT_FOUND)
...@@ -7253,7 +7248,6 @@ int ha_rocksdb::write_row(uchar *buf) ...@@ -7253,7 +7248,6 @@ int ha_rocksdb::write_row(uchar *buf)
DBUG_ENTER("ha_rocksdb::write_row"); DBUG_ENTER("ha_rocksdb::write_row");
DBUG_ASSERT(buf == table->record[0]); DBUG_ASSERT(buf == table->record[0]);
DBUG_ASSERT(m_lock_rows == RDB_LOCK_WRITE); DBUG_ASSERT(m_lock_rows == RDB_LOCK_WRITE);
ha_statistic_increment(&SSV::ha_write_count);
/* /*
Note: "buf == table->record[0]" is copied from innodb. I am not aware of Note: "buf == table->record[0]" is copied from innodb. I am not aware of
any use cases where this condition is not true. any use cases where this condition is not true.
...@@ -8022,7 +8016,6 @@ int ha_rocksdb::rnd_init(bool scan) ...@@ -8022,7 +8016,6 @@ int ha_rocksdb::rnd_init(bool scan)
int ha_rocksdb::rnd_next(uchar *buf) int ha_rocksdb::rnd_next(uchar *buf)
{ {
int rc; int rc;
ha_statistic_increment(&SSV::ha_read_rnd_next_count);
for (;;) for (;;)
{ {
rc= rnd_next_with_direction(buf, true); rc= rnd_next_with_direction(buf, true);
...@@ -8205,7 +8198,6 @@ int ha_rocksdb::delete_row(const uchar *buf) ...@@ -8205,7 +8198,6 @@ int ha_rocksdb::delete_row(const uchar *buf)
{ {
DBUG_ENTER("ha_rocksdb::delete_row"); DBUG_ENTER("ha_rocksdb::delete_row");
ha_statistic_increment(&SSV::ha_delete_count);
set_last_rowkey(buf); set_last_rowkey(buf);
rocksdb::Slice key_slice(m_last_rowkey.ptr(), m_last_rowkey.length()); rocksdb::Slice key_slice(m_last_rowkey.ptr(), m_last_rowkey.length());
...@@ -8436,7 +8428,6 @@ int ha_rocksdb::rnd_pos(uchar *buf, uchar *pos) ...@@ -8436,7 +8428,6 @@ int ha_rocksdb::rnd_pos(uchar *buf, uchar *pos)
size_t len; size_t len;
DBUG_ENTER("ha_rocksdb::rnd_pos"); DBUG_ENTER("ha_rocksdb::rnd_pos");
ha_statistic_increment(&SSV::ha_read_rnd_count);
stats.rows_requested++; stats.rows_requested++;
len= m_pk_descr->key_length(table, rocksdb::Slice((const char*)pos, len= m_pk_descr->key_length(table, rocksdb::Slice((const char*)pos,
ref_length)); ref_length));
...@@ -8507,7 +8498,6 @@ int ha_rocksdb::update_row(const uchar *old_data, uchar *new_data) ...@@ -8507,7 +8498,6 @@ int ha_rocksdb::update_row(const uchar *old_data, uchar *new_data)
*/ */
DBUG_ASSERT(new_data == table->record[0]); DBUG_ASSERT(new_data == table->record[0]);
ha_statistic_increment(&SSV::ha_update_count);
int rv; int rv;
rv= update_write_row(old_data, new_data, false); rv= update_write_row(old_data, new_data, false);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment