mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-17 12:27:33 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/11.5' into 11.6

Browse source
This commit is contained in:
Alexander Barkov 2024-07-10 13:30:01 +04:00
commit a2a5ba14a8
642 changed files with 14623 additions and 11276 deletions
Download patch file Download diff file Expand all files Collapse all files

1
storage/perfschema/CMakeLists.txt
View file

@ -49,7 +49,6 @@ cursor_by_thread.h
cursor_by_user.h
pfs.h
pfs_account.h
pfs_atomic.h
pfs_buffer_container.h
pfs_builtin_memory.h
pfs_column_types.h

6
storage/perfschema/cursor_by_account.h
View file

@ -43,9 +43,9 @@ class cursor_by_account : public PFS_engine_table
public:
static ha_rows get_row_count();
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
protected:
cursor_by_account(const PFS_engine_table_share *share);

6
storage/perfschema/cursor_by_host.h
View file

@ -43,9 +43,9 @@ class cursor_by_host : public PFS_engine_table
public:
static ha_rows get_row_count();
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
protected:
cursor_by_host(const PFS_engine_table_share *share);

6
storage/perfschema/cursor_by_thread.h
View file

@ -43,9 +43,9 @@ class cursor_by_thread : public PFS_engine_table
public:
static ha_rows get_row_count();
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
protected:
cursor_by_thread(const PFS_engine_table_share *share);

6
storage/perfschema/cursor_by_thread_connect_attr.h
View file

@ -62,9 +62,9 @@ class cursor_by_thread_connect_attr : public PFS_engine_table
public:
static ha_rows get_row_count();
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
protected:
cursor_by_thread_connect_attr(const PFS_engine_table_share *share);

6
storage/perfschema/cursor_by_user.h
View file

@ -43,9 +43,9 @@ class cursor_by_user : public PFS_engine_table
public:
static ha_rows get_row_count();
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
protected:
cursor_by_user(const PFS_engine_table_share *share);

62
storage/perfschema/ha_perfschema.h
View file

@ -53,10 +53,10 @@ public:
~ha_perfschema();
const char *index_type(uint) { return ""; }
const char *index_type(uint) override { return ""; }
/** Capabilities of the performance schema tables. */
ulonglong table_flags(void) const
ulonglong table_flags(void) const override
{
/*
About HA_FAST_KEY_READ:
@ -86,25 +86,25 @@ public:
Operations supported by indexes.
None, there are no indexes.
*/
ulong index_flags(uint , uint , bool ) const
ulong index_flags(uint , uint , bool ) const override
{ return 0; }
uint max_supported_record_length(void) const
uint max_supported_record_length(void) const override
{ return HA_MAX_REC_LENGTH; }
uint max_supported_keys(void) const
uint max_supported_keys(void) const override
{ return 0; }
uint max_supported_key_parts(void) const
uint max_supported_key_parts(void) const override
{ return 0; }
uint max_supported_key_length(void) const
uint max_supported_key_length(void) const override
{ return 0; }
ha_rows estimate_rows_upper_bound(void)
ha_rows estimate_rows_upper_bound(void) override
{ return HA_POS_ERROR; }
IO_AND_CPU_COST scan_time(void)
IO_AND_CPU_COST scan_time(void) override
{
return {0.0, 1.0};
}
@ -116,22 +116,22 @@ public:
@param test_if_locked unused
@return 0 on success
*/
int open(const char *name, int mode, uint test_if_locked);
int open(const char *name, int mode, uint test_if_locked) override;
/**
Close a table handle.
@sa open.
*/
int close(void);
int close(void) override;
/**
Write a row.
@param buf the row to write
@return 0 on success
*/
int write_row(const uchar *buf);
int write_row(const uchar *buf) override;
void use_hidden_primary_key();
void use_hidden_primary_key() override;
/**
Update a row.
@ -139,29 +139,29 @@ public:
@param new_data the row new values
@return 0 on success
*/
int update_row(const uchar *old_data, const uchar *new_data);
int update_row(const uchar *old_data, const uchar *new_data) override;
/**
Delete a row.
@param buf the row to delete
@return 0 on success
*/
int delete_row(const uchar *buf);
int delete_row(const uchar *buf) override;
int rnd_init(bool scan);
int rnd_init(bool scan) override;
/**
Scan end.
@sa rnd_init.
*/
int rnd_end(void);
int rnd_end(void) override;
/**
Iterator, fetch the next row.
@param[out] buf the row fetched.
@return 0 on success
*/
int rnd_next(uchar *buf);
int rnd_next(uchar *buf) override;
/**
Iterator, fetch the row at a given position.
@ -169,42 +169,42 @@ public:
@param pos the row position
@return 0 on success
*/
int rnd_pos(uchar *buf, uchar *pos);
int rnd_pos(uchar *buf, uchar *pos) override;
/**
Read the row current position.
@param record the current row
*/
void position(const uchar *record);
void position(const uchar *record) override;
int info(uint);
int info(uint) override;
int delete_all_rows(void);
int delete_all_rows(void) override;
int truncate();
int truncate() override;
int delete_table(const char *from);
int delete_table(const char *from) override;
int rename_table(const char * from, const char * to);
int rename_table(const char * from, const char * to) override;
int create(const char *name, TABLE *form,
HA_CREATE_INFO *create_info);
HA_CREATE_INFO *create_info) override;
THR_LOCK_DATA **store_lock(THD *thd, THR_LOCK_DATA **to,
enum thr_lock_type lock_type);
enum thr_lock_type lock_type) override;
virtual uint8 table_cache_type(void)
uint8 table_cache_type(void) override
{ return HA_CACHE_TBL_NOCACHE; }
virtual my_bool register_query_cache_table
my_bool register_query_cache_table
(THD *, const char *, uint , qc_engine_callback *engine_callback,
ulonglong *)
ulonglong *) override
{
*engine_callback= 0;
return FALSE;
}
virtual void print_error(int error, myf errflags);
void print_error(int error, myf errflags) override;
private:
/**

4
storage/perfschema/pfs_account.cc
View file

@ -666,7 +666,7 @@ public:
: m_thread(thread)
{}
virtual void operator()(PFS_account *pfs)
void operator()(PFS_account *pfs) override
{
PFS_user *user= sanitize_user(pfs->m_user);
PFS_host *host= sanitize_host(pfs->m_host);
@ -699,7 +699,7 @@ public:
: m_thread(thread)
{}
virtual void operator()(PFS_account *pfs)
void operator()(PFS_account *pfs) override
{
if (pfs->m_username_length > 0 && pfs->m_hostname_length > 0)
{

11
storage/perfschema/pfs_account.h
View file

@ -27,6 +27,7 @@
@file storage/perfschema/pfs_account.h
Performance schema account (declarations).
*/
#include <atomic>
#include "pfs_lock.h"
#include "lf.h"
@ -62,22 +63,22 @@ struct PFS_ALIGNED PFS_account : PFS_connection_slice
public:
inline void init_refcount(void)
{
PFS_atomic::store_32(& m_refcount, 1);
m_refcount.store(1);
}
inline int get_refcount(void)
{
return PFS_atomic::load_32(& m_refcount);
return m_refcount.load();
}
inline void inc_refcount(void)
{
PFS_atomic::add_32(& m_refcount, 1);
m_refcount.fetch_add(1);
}
inline void dec_refcount(void)
{
PFS_atomic::add_32(& m_refcount, -1);
m_refcount.fetch_sub(1);
}
void aggregate(bool alive, PFS_user *safe_user, PFS_host *safe_host);
@ -109,7 +110,7 @@ public:
ulonglong m_disconnected_count;
private:
int m_refcount;
std::atomic<int> m_refcount;
};
int init_account(const PFS_global_param *param);

141
storage/perfschema/pfs_atomic.h
View file

@ -1,141 +0,0 @@
/* Copyright (c) 2009, 2023, Oracle and/or its affiliates.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License, version 2.0,
as published by the Free Software Foundation.
This program is also distributed with certain software (including
but not limited to OpenSSL) that is licensed under separate terms,
as designated in a particular file or component or in included license
documentation. The authors of MySQL hereby grant you an additional
permission to link the program and your derivative works with the
separately licensed software that they have included with MySQL.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License, version 2.0, for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software Foundation,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef PFS_ATOMIC_H
#define PFS_ATOMIC_H
/**
@file storage/perfschema/pfs_atomic.h
Atomic operations (declarations).
*/
#include <my_atomic.h>
/** Helper for atomic operations. */
class PFS_atomic
{
public:
/** Atomic load. */
static inline int32 load_32(int32 *ptr)
{
return my_atomic_load32(ptr);
}
/** Atomic load. */
static inline int64 load_64(int64 *ptr)
{
return my_atomic_load64(ptr);
}
/** Atomic load. */
static inline uint32 load_u32(uint32 *ptr)
{
return (uint32) my_atomic_load32((int32*) ptr);
}
/** Atomic load. */
static inline uint64 load_u64(uint64 *ptr)
{
return (uint64) my_atomic_load64((int64*) ptr);
}
/** Atomic store. */
static inline void store_32(int32 *ptr, int32 value)
{
my_atomic_store32(ptr, value);
}
/** Atomic store. */
static inline void store_64(int64 *ptr, int64 value)
{
my_atomic_store64(ptr, value);
}
/** Atomic store. */
static inline void store_u32(uint32 *ptr, uint32 value)
{
my_atomic_store32((int32*) ptr, (int32) value);
}
/** Atomic store. */
static inline void store_u64(uint64 *ptr, uint64 value)
{
my_atomic_store64((int64*) ptr, (int64) value);
}
/** Atomic add. */
static inline int32 add_32(int32 *ptr, int32 value)
{
return my_atomic_add32(ptr, value);
}
/** Atomic add. */
static inline int64 add_64(int64 *ptr, int64 value)
{
return my_atomic_add64(ptr, value);
}
/** Atomic add. */
static inline uint32 add_u32(uint32 *ptr, uint32 value)
{
return (uint32) my_atomic_add32((int32*) ptr, (int32) value);
}
/** Atomic add. */
static inline uint64 add_u64(uint64 *ptr, uint64 value)
{
return (uint64) my_atomic_add64((int64*) ptr, (int64) value);
}
/** Atomic compare and swap. */
static inline bool cas_32(int32 *ptr, int32 *old_value,
int32 new_value)
{
return my_atomic_cas32(ptr, old_value, new_value);
}
/** Atomic compare and swap. */
static inline bool cas_64(int64 *ptr, int64 *old_value,
int64 new_value)
{
return my_atomic_cas64(ptr, old_value, new_value);
}
/** Atomic compare and swap. */
static inline bool cas_u32(uint32 *ptr, uint32 *old_value,
uint32 new_value)
{
return my_atomic_cas32((int32*) ptr, (int32*) old_value,
(uint32) new_value);
}
/** Atomic compare and swap. */
static inline bool cas_u64(uint64 *ptr, uint64 *old_value,
uint64 new_value)
{
return my_atomic_cas64((int64*) ptr, (int64*) old_value,
(uint64) new_value);
}
};
#endif

15
storage/perfschema/pfs_buffer_container.h
View file

@ -87,7 +87,7 @@ public:
if (m_full)
return NULL;
monotonic= PFS_atomic::add_u32(& m_monotonic.m_u32, 1);
monotonic= m_monotonic.m_u32.fetch_add(1);
monotonic_max= monotonic + static_cast<uint>(m_max);
while (monotonic < monotonic_max)
@ -99,7 +99,8 @@ public:
{
return pfs;
}
monotonic= PFS_atomic::add_u32(& m_monotonic.m_u32, 1);
monotonic= m_monotonic.m_u32.fetch_add(1);
}
m_full= true;
@ -517,7 +518,7 @@ public:
ulong get_row_count()
{
ulong page_count= PFS_atomic::load_u32(& m_max_page_index.m_u32);
ulong page_count= m_max_page_index.m_u32.load();
return page_count * PFS_PAGE_SIZE;
}
@ -554,11 +555,11 @@ public:
/*
1: Try to find an available record within the existing pages
*/
current_page_count= PFS_atomic::load_u32(& m_max_page_index.m_u32);
current_page_count= m_max_page_index.m_u32.load();
if (current_page_count != 0)
{
monotonic= PFS_atomic::load_u32(& m_monotonic.m_u32);
monotonic= m_monotonic.m_u32.load();
monotonic_max= monotonic + current_page_count;
while (monotonic < monotonic_max)
@ -602,7 +603,7 @@ public:
counter faster and then move on to the detection of new pages,
in part 2: below.
*/
monotonic= PFS_atomic::add_u32(& m_monotonic.m_u32, 1);
monotonic= m_monotonic.m_u32.fetch_add(1);
};
}
@ -683,7 +684,7 @@ public:
my_atomic_storeptr(typed_addr, ptr);
/* Advertise the new page */
PFS_atomic::add_u32(& m_max_page_index.m_u32, 1);
m_max_page_index.m_u32.fetch_add(1);
}
pthread_mutex_unlock(& m_critical_section);

6
storage/perfschema/pfs_digest.cc
View file

@ -76,7 +76,7 @@ int init_digest(const PFS_global_param *param)
*/
digest_max= param->m_digest_sizing;
digest_lost= 0;
PFS_atomic::store_u32(& digest_monotonic_index.m_u32, 1);
digest_monotonic_index.m_u32.store(1);
digest_full= false;
if (digest_max == 0)
@ -275,7 +275,7 @@ search:
while (++attempts <= digest_max)
{
safe_index= PFS_atomic::add_u32(& digest_monotonic_index.m_u32, 1) % digest_max;
safe_index= digest_monotonic_index.m_u32.fetch_add(1) % digest_max;
if (safe_index == 0)
{
/* Record [0] is reserved. */
@ -407,7 +407,7 @@ void reset_esms_by_digest()
Reset index which indicates where the next calculated digest information
to be inserted in statements_digest_stat_array.
*/
PFS_atomic::store_u32(& digest_monotonic_index.m_u32, 1);
digest_monotonic_index.m_u32.store(1);
digest_full= false;
}

10
storage/perfschema/pfs_engine_table.cc
View file

@ -343,13 +343,13 @@ static PFS_engine_table_share *all_shares[]=
class PFS_silent_check_intact : public Table_check_intact
{
protected:
virtual void report_error(uint code, const char *fmt, ...) {}
void report_error(uint code, const char *fmt, ...) override {}
public:
PFS_silent_check_intact()
{}
~PFS_silent_check_intact()
~PFS_silent_check_intact() override
{}
};
@ -652,12 +652,12 @@ class PFS_internal_schema_access : public ACL_internal_schema_access
public:
PFS_internal_schema_access() = default;
~PFS_internal_schema_access() = default;
~PFS_internal_schema_access() override = default;
ACL_internal_access_result check(privilege_t want_access,
privilege_t *save_priv) const;
privilege_t *save_priv) const override;
const ACL_internal_table_access *lookup(const char *name) const;
const ACL_internal_table_access *lookup(const char *name) const override;
};
ACL_internal_access_result

22
storage/perfschema/pfs_engine_table.h
View file

@ -348,8 +348,8 @@ public:
~PFS_readonly_acl() = default;
virtual ACL_internal_access_result check(privilege_t want_access,
privilege_t *save_priv) const;
ACL_internal_access_result check(privilege_t want_access,
privilege_t *save_priv) const override;
};
/** Singleton instance of PFS_readonly_acl. */
@ -366,8 +366,8 @@ public:
~PFS_truncatable_acl() = default;
virtual ACL_internal_access_result check(privilege_t want_access,
privilege_t *save_priv) const;
ACL_internal_access_result check(privilege_t want_access,
privilege_t *save_priv) const override;
};
/** Singleton instance of PFS_truncatable_acl. */
@ -385,7 +385,7 @@ public:
~PFS_updatable_acl() = default;
ACL_internal_access_result check(privilege_t want_access,
privilege_t *save_priv) const;
privilege_t *save_priv) const override;
};
/** Singleton instance of PFS_updatable_acl. */
@ -403,7 +403,7 @@ public:
~PFS_editable_acl() = default;
ACL_internal_access_result check(privilege_t want_access,
privilege_t *save_priv) const;
privilege_t *save_priv) const override;
};
/** Singleton instance of PFS_editable_acl. */
@ -420,7 +420,7 @@ public:
~PFS_unknown_acl() = default;
ACL_internal_access_result check(privilege_t want_access,
privilege_t *save_priv) const;
privilege_t *save_priv) const override;
};
/** Singleton instance of PFS_unknown_acl. */
@ -438,7 +438,7 @@ public:
~PFS_readonly_world_acl()
{}
virtual ACL_internal_access_result check(privilege_t want_access, privilege_t *save_priv) const;
ACL_internal_access_result check(privilege_t want_access, privilege_t *save_priv) const override;
};
@ -457,7 +457,7 @@ public:
~PFS_truncatable_world_acl()
{}
virtual ACL_internal_access_result check(privilege_t want_access, privilege_t *save_priv) const;
ACL_internal_access_result check(privilege_t want_access, privilege_t *save_priv) const override;
};
@ -476,8 +476,8 @@ class PFS_readonly_processlist_acl : public PFS_readonly_acl {
~PFS_readonly_processlist_acl()
{}
virtual ACL_internal_access_result check(privilege_t want_access,
privilege_t *save_priv) const;
ACL_internal_access_result check(privilege_t want_access,
privilege_t *save_priv) const override;
};
/** Singleton instance of PFS_readonly_processlist_acl */

7
storage/perfschema/pfs_events_stages.cc
View file

@ -34,7 +34,6 @@
#include "pfs_host.h"
#include "pfs_user.h"
#include "pfs_events_stages.h"
#include "pfs_atomic.h"
#include "pfs_buffer_container.h"
#include "pfs_builtin_memory.h"
#include "m_string.h"
@ -62,7 +61,7 @@ int init_events_stages_history_long(uint events_stages_history_long_sizing)
{
events_stages_history_long_size= events_stages_history_long_sizing;
events_stages_history_long_full= false;
PFS_atomic::store_u32(&events_stages_history_long_index.m_u32, 0);
events_stages_history_long_index.m_u32.store(0);
if (events_stages_history_long_size == 0)
return 0;
@ -135,7 +134,7 @@ void insert_events_stages_history_long(PFS_events_stages *stage)
assert(events_stages_history_long_array != NULL);
uint index= PFS_atomic::add_u32(&events_stages_history_long_index.m_u32, 1);
uint index= events_stages_history_long_index.m_u32.fetch_add(1);
index= index % events_stages_history_long_size;
if (index == 0)
@ -176,7 +175,7 @@ void reset_events_stages_history(void)
/** Reset table EVENTS_STAGES_HISTORY_LONG data. */
void reset_events_stages_history_long(void)
{
PFS_atomic::store_u32(&events_stages_history_long_index.m_u32, 0);
events_stages_history_long_index.m_u32.store(0);
events_stages_history_long_full= false;
PFS_events_stages *pfs= events_stages_history_long_array;

7
storage/perfschema/pfs_events_statements.cc
View file

@ -34,7 +34,6 @@
#include "pfs_host.h"
#include "pfs_user.h"
#include "pfs_events_statements.h"
#include "pfs_atomic.h"
#include "pfs_buffer_container.h"
#include "pfs_builtin_memory.h"
#include "m_string.h"
@ -64,7 +63,7 @@ int init_events_statements_history_long(size_t events_statements_history_long_si
{
events_statements_history_long_size= events_statements_history_long_sizing;
events_statements_history_long_full= false;
PFS_atomic::store_u32(&events_statements_history_long_index.m_u32, 0);
events_statements_history_long_index.m_u32.store(0);
if (events_statements_history_long_size == 0)
return 0;
@ -213,7 +212,7 @@ void insert_events_statements_history_long(PFS_events_statements *statement)
assert(events_statements_history_long_array != NULL);
uint index= PFS_atomic::add_u32(&events_statements_history_long_index.m_u32, 1);
uint index= events_statements_history_long_index.m_u32.fetch_add(1);
index= index % events_statements_history_long_size;
if (index == 0)
@ -258,7 +257,7 @@ void reset_events_statements_history(void)
/** Reset table EVENTS_STATEMENTS_HISTORY_LONG data. */
void reset_events_statements_history_long(void)
{
PFS_atomic::store_u32(&events_statements_history_long_index.m_u32, 0);
events_statements_history_long_index.m_u32.store(0);
events_statements_history_long_full= false;
PFS_events_statements *pfs= events_statements_history_long_array;

7
storage/perfschema/pfs_events_transactions.cc
View file

@ -34,7 +34,6 @@
#include "pfs_host.h"
#include "pfs_user.h"
#include "pfs_events_transactions.h"
#include "pfs_atomic.h"
#include "pfs_buffer_container.h"
#include "pfs_builtin_memory.h"
#include "m_string.h"
@ -62,7 +61,7 @@ int init_events_transactions_history_long(uint events_transactions_history_long_
{
events_transactions_history_long_size= events_transactions_history_long_sizing;
events_transactions_history_long_full= false;
PFS_atomic::store_u32(&events_transactions_history_long_index.m_u32, 0);
events_transactions_history_long_index.m_u32.store(0);
if (events_transactions_history_long_size == 0)
return 0;
@ -135,7 +134,7 @@ void insert_events_transactions_history_long(PFS_events_transactions *transactio
assert(events_transactions_history_long_array != NULL);
uint index= PFS_atomic::add_u32(&events_transactions_history_long_index.m_u32, 1);
uint index= events_transactions_history_long_index.m_u32.fetch_add(1);
index= index % events_transactions_history_long_size;
if (index == 0)
@ -176,7 +175,7 @@ void reset_events_transactions_history(void)
/** Reset table EVENTS_TRANSACTIONS_HISTORY_LONG data. */
void reset_events_transactions_history_long(void)
{
PFS_atomic::store_u32(&events_transactions_history_long_index.m_u32, 0);
events_transactions_history_long_index.m_u32.store(0);
events_transactions_history_long_full= false;
PFS_events_transactions *pfs= events_transactions_history_long_array;

7
storage/perfschema/pfs_events_waits.cc
View file

@ -34,7 +34,6 @@
#include "pfs_host.h"
#include "pfs_account.h"
#include "pfs_events_waits.h"
#include "pfs_atomic.h"
#include "pfs_buffer_container.h"
#include "pfs_builtin_memory.h"
#include "m_string.h"
@ -66,7 +65,7 @@ int init_events_waits_history_long(uint events_waits_history_long_sizing)
{
events_waits_history_long_size= events_waits_history_long_sizing;
events_waits_history_long_full= false;
PFS_atomic::store_u32(&events_waits_history_long_index.m_u32, 0);
events_waits_history_long_index.m_u32.store(0);
if (events_waits_history_long_size == 0)
return 0;
@ -135,7 +134,7 @@ void insert_events_waits_history_long(PFS_events_waits *wait)
if (unlikely(events_waits_history_long_size == 0))
return;
uint index= PFS_atomic::add_u32(&events_waits_history_long_index.m_u32, 1);
uint index= events_waits_history_long_index.m_u32.fetch_add(1);
index= index % events_waits_history_long_size;
if (index == 0)
@ -181,7 +180,7 @@ void reset_events_waits_history(void)
/** Reset table EVENTS_WAITS_HISTORY_LONG data. */
void reset_events_waits_history_long(void)
{
PFS_atomic::store_u32(&events_waits_history_long_index.m_u32, 0);
events_waits_history_long_index.m_u32.store(0);
events_waits_history_long_full= false;
PFS_events_waits *wait= events_waits_history_long_array;

6
storage/perfschema/pfs_global.h
View file

@ -24,6 +24,8 @@
#ifndef PFS_GLOBAL_H
#define PFS_GLOBAL_H
#include <atomic>
#include "my_compiler.h"
/**
@ -44,7 +46,7 @@ extern size_t pfs_allocated_memory;
*/
struct PFS_cacheline_uint32
{
uint32 m_u32;
std::atomic<uint32> m_u32;
char m_full_cache_line[CPU_LEVEL1_DCACHE_LINESIZE - sizeof(uint32)];
PFS_cacheline_uint32()
@ -58,7 +60,7 @@ struct PFS_cacheline_uint32
*/
struct PFS_cacheline_uint64
{
uint64 m_u64;
std::atomic<uint64> m_u64;
char m_full_cache_line[CPU_LEVEL1_DCACHE_LINESIZE - sizeof(uint64)];
PFS_cacheline_uint64()

2
storage/perfschema/pfs_host.cc
View file

@ -350,7 +350,7 @@ public:
: m_thread(thread)
{}
virtual void operator()(PFS_host *pfs)
void operator()(PFS_host *pfs) override
{
pfs->aggregate(true);
if (pfs->get_refcount() == 0)

12
storage/perfschema/pfs_host.h
View file

@ -28,6 +28,8 @@
Performance schema host (declarations).
*/
#include <atomic>
#include "pfs_lock.h"
#include "lf.h"
#include "pfs_con_slice.h"
@ -58,22 +60,22 @@ struct PFS_ALIGNED PFS_host : PFS_connection_slice
public:
inline void init_refcount(void)
{
PFS_atomic::store_32(& m_refcount, 1);
m_refcount.store(1);
}
inline int get_refcount(void)
{
return PFS_atomic::load_32(& m_refcount);
return m_refcount.load();
}
inline void inc_refcount(void)
{
PFS_atomic::add_32(& m_refcount, 1);
m_refcount.fetch_add(1);
}
inline void dec_refcount(void)
{
PFS_atomic::add_32(& m_refcount, -1);
m_refcount.fetch_sub(1);
}
void aggregate(bool alive);
@ -97,7 +99,7 @@ public:
ulonglong m_disconnected_count;
private:
int m_refcount;
std::atomic<int> m_refcount;
};
int init_host(const PFS_global_param *param);

2
storage/perfschema/pfs_instr.cc
View file

@ -527,7 +527,7 @@ PFS_thread* create_thread(PFS_thread_class *klass, const void *identity,
if (pfs != NULL)
{
pfs->m_thread_internal_id=
PFS_atomic::add_u64(&thread_internal_id_counter.m_u64, 1);
thread_internal_id_counter.m_u64.fetch_add(1);
pfs->m_parent_thread_internal_id= 0;
pfs->m_processlist_id= static_cast<ulong>(processlist_id);
pfs->m_thread_os_id= my_thread_os_id();

78
storage/perfschema/pfs_instr_class.cc
View file

@ -25,6 +25,7 @@
@file storage/perfschema/pfs_instr_class.cc
Performance schema instruments meta data (implementation).
*/
#include <atomic>
#include "my_global.h"
#include "my_sys.h"
@ -36,7 +37,6 @@
#include "pfs_timer.h"
#include "pfs_events_waits.h"
#include "pfs_setup_object.h"
#include "pfs_atomic.h"
#include "pfs_program.h"
#include "pfs_buffer_container.h"
#include "mysql/psi/mysql_thread.h"
@ -76,12 +76,12 @@ static void init_instr_class(PFS_instr_class *klass,
- the performance schema initialization
- a plugin initialization
*/
static uint32 mutex_class_dirty_count= 0;
static uint32 mutex_class_allocated_count= 0;
static uint32 rwlock_class_dirty_count= 0;
static uint32 rwlock_class_allocated_count= 0;
static uint32 cond_class_dirty_count= 0;
static uint32 cond_class_allocated_count= 0;
static std::atomic<uint32> mutex_class_dirty_count(0);
static std::atomic<uint32> mutex_class_allocated_count(0);
static std::atomic<uint32> rwlock_class_dirty_count(0);
static std::atomic<uint32> rwlock_class_allocated_count(0);
static std::atomic<uint32> cond_class_dirty_count(0);
static std::atomic<uint32> cond_class_allocated_count(0);
/** Size of the mutex class array. @sa mutex_class_array */
ulong mutex_class_max= 0;
@ -137,8 +137,8 @@ PFS_cond_class *cond_class_array= NULL;
- the performance schema initialization
- a plugin initialization
*/
static uint32 thread_class_dirty_count= 0;
static uint32 thread_class_allocated_count= 0;
static std::atomic<uint32> thread_class_dirty_count(0);
static std::atomic<uint32> thread_class_allocated_count(0);
static PFS_thread_class *thread_class_array= NULL;
@ -185,28 +185,28 @@ LF_HASH table_share_hash;
/** True if table_share_hash is initialized. */
static bool table_share_hash_inited= false;
static uint32 file_class_dirty_count= 0;
static uint32 file_class_allocated_count= 0;
static std::atomic<uint32> file_class_dirty_count(0);
static std::atomic<uint32> file_class_allocated_count(0);
PFS_file_class *file_class_array= NULL;
static uint32 stage_class_dirty_count= 0;
static uint32 stage_class_allocated_count= 0;
static std::atomic<uint32> stage_class_dirty_count(0);
static std::atomic<uint32> stage_class_allocated_count(0);
static PFS_stage_class *stage_class_array= NULL;
static uint32 statement_class_dirty_count= 0;
static uint32 statement_class_allocated_count= 0;
static std::atomic<uint32> statement_class_dirty_count(0);
static std::atomic<uint32> statement_class_allocated_count(0);
static PFS_statement_class *statement_class_array= NULL;
static uint32 socket_class_dirty_count= 0;
static uint32 socket_class_allocated_count= 0;
static std::atomic<uint32> socket_class_dirty_count(0);
static std::atomic<uint32> socket_class_allocated_count(0);
static PFS_socket_class *socket_class_array= NULL;
static uint32 memory_class_dirty_count= 0;
static uint32 memory_class_allocated_count= 0;
static std::atomic<uint32> memory_class_dirty_count(0);
static std::atomic<uint32> memory_class_allocated_count(0);
static PFS_memory_class *memory_class_array= NULL;
@ -1078,7 +1078,7 @@ PFS_sync_key register_mutex_class(const char *name, uint name_length,
mutex_class_dirty_count is incremented *before* an entry is added
mutex_class_allocated_count is incremented *after* an entry is added
*/
index= PFS_atomic::add_u32(&mutex_class_dirty_count, 1);
index= mutex_class_dirty_count.fetch_add(1);
if (index < mutex_class_max)
{
@ -1134,7 +1134,7 @@ PFS_sync_key register_mutex_class(const char *name, uint name_length,
empty/NULL/zero, but this won't cause a crash
(mutex_class_array is initialized with MY_ZEROFILL).
*/
PFS_atomic::add_u32(&mutex_class_allocated_count, 1);
mutex_class_allocated_count.fetch_add(1);
return (index + 1);
}
@ -1164,7 +1164,7 @@ PFS_sync_key register_rwlock_class(const char *name, uint name_length,
REGISTER_CLASS_BODY_PART(index, rwlock_class_array, rwlock_class_max,
name, name_length)
index= PFS_atomic::add_u32(&rwlock_class_dirty_count, 1);
index= rwlock_class_dirty_count.fetch_add(1);
if (index < rwlock_class_max)
{
@ -1177,7 +1177,7 @@ PFS_sync_key register_rwlock_class(const char *name, uint name_length,
entry->m_timed= false;
/* Set user-defined configuration options for this instrument */
configure_instr_class(entry);
PFS_atomic::add_u32(&rwlock_class_allocated_count, 1);
rwlock_class_allocated_count.fetch_add(1);
return (index + 1);
}
@ -1203,7 +1203,7 @@ PFS_sync_key register_cond_class(const char *name, uint name_length,
REGISTER_CLASS_BODY_PART(index, cond_class_array, cond_class_max,
name, name_length)
index= PFS_atomic::add_u32(&cond_class_dirty_count, 1);
index= cond_class_dirty_count.fetch_add(1);
if (index < cond_class_max)
{
@ -1215,7 +1215,7 @@ PFS_sync_key register_cond_class(const char *name, uint name_length,
entry->m_timed= false;
/* Set user-defined configuration options for this instrument */
configure_instr_class(entry);
PFS_atomic::add_u32(&cond_class_allocated_count, 1);
cond_class_allocated_count.fetch_add(1);
return (index + 1);
}
@ -1297,7 +1297,7 @@ PFS_thread_key register_thread_class(const char *name, uint name_length,
return (index + 1);
}
index= PFS_atomic::add_u32(&thread_class_dirty_count, 1);
index= thread_class_dirty_count.fetch_add(1);
if (index < thread_class_max)
{
@ -1306,7 +1306,7 @@ PFS_thread_key register_thread_class(const char *name, uint name_length,
strncpy(entry->m_name, name, name_length);
entry->m_name_length= name_length;
entry->m_enabled= true;
PFS_atomic::add_u32(&thread_class_allocated_count, 1);
thread_class_allocated_count.fetch_add(1);
return (index + 1);
}
@ -1347,7 +1347,7 @@ PFS_file_key register_file_class(const char *name, uint name_length,
REGISTER_CLASS_BODY_PART(index, file_class_array, file_class_max,
name, name_length)
index= PFS_atomic::add_u32(&file_class_dirty_count, 1);
index= file_class_dirty_count.fetch_add(1);
if (index < file_class_max)
{
@ -1359,7 +1359,7 @@ PFS_file_key register_file_class(const char *name, uint name_length,
entry->m_timed= true;
/* Set user-defined configuration options for this instrument */
configure_instr_class(entry);
PFS_atomic::add_u32(&file_class_allocated_count, 1);
file_class_allocated_count.fetch_add(1);
return (index + 1);
}
@ -1389,7 +1389,7 @@ PFS_stage_key register_stage_class(const char *name,
REGISTER_CLASS_BODY_PART(index, stage_class_array, stage_class_max,
name, name_length)
index= PFS_atomic::add_u32(&stage_class_dirty_count, 1);
index= stage_class_dirty_count.fetch_add(1);
if (index < stage_class_max)
{
@ -1413,7 +1413,7 @@ PFS_stage_key register_stage_class(const char *name,
/* Set user-defined configuration options for this instrument */
configure_instr_class(entry);
PFS_atomic::add_u32(&stage_class_allocated_count, 1);
stage_class_allocated_count.fetch_add(1);
return (index + 1);
}
@ -1440,7 +1440,7 @@ PFS_statement_key register_statement_class(const char *name, uint name_length,
REGISTER_CLASS_BODY_PART(index, statement_class_array, statement_class_max,
name, name_length)
index= PFS_atomic::add_u32(&statement_class_dirty_count, 1);
index= statement_class_dirty_count.fetch_add(1);
if (index < statement_class_max)
{
@ -1451,7 +1451,7 @@ PFS_statement_key register_statement_class(const char *name, uint name_length,
entry->m_timed= true;
/* Set user-defined configuration options for this instrument */
configure_instr_class(entry);
PFS_atomic::add_u32(&statement_class_allocated_count, 1);
statement_class_allocated_count.fetch_add(1);
return (index + 1);
}
@ -1523,7 +1523,7 @@ PFS_socket_key register_socket_class(const char *name, uint name_length,
REGISTER_CLASS_BODY_PART(index, socket_class_array, socket_class_max,
name, name_length)
index= PFS_atomic::add_u32(&socket_class_dirty_count, 1);
index= socket_class_dirty_count.fetch_add(1);
if (index < socket_class_max)
{
@ -1535,7 +1535,7 @@ PFS_socket_key register_socket_class(const char *name, uint name_length,
entry->m_timed= false;
/* Set user-defined configuration options for this instrument */
configure_instr_class(entry);
PFS_atomic::add_u32(&socket_class_allocated_count, 1);
socket_class_allocated_count.fetch_add(1);
return (index + 1);
}
@ -1576,7 +1576,7 @@ PFS_memory_key register_memory_class(const char *name, uint name_length,
REGISTER_CLASS_BODY_PART(index, memory_class_array, memory_class_max,
name, name_length)
index= PFS_atomic::add_u32(&memory_class_dirty_count, 1);
index= memory_class_dirty_count.fetch_add(1);
if (index < memory_class_max)
{
@ -1587,7 +1587,7 @@ PFS_memory_key register_memory_class(const char *name, uint name_length,
/* Set user-defined configuration options for this instrument */
configure_instr_class(entry);
entry->m_timed= false; /* Immutable */
PFS_atomic::add_u32(&memory_class_allocated_count, 1);
memory_class_allocated_count.fetch_add(1);
return (index + 1);
}
@ -2007,7 +2007,7 @@ public:
: m_thread(thread)
{}
virtual void operator()(PFS_table_share *pfs)
void operator()(PFS_table_share *pfs) override
{
pfs->refresh_setup_object_flags(m_thread);
}
@ -2030,7 +2030,7 @@ public:
: m_thread(thread)
{}
virtual void operator()(PFS_program *pfs)
void operator()(PFS_program *pfs) override
{
pfs->refresh_setup_object_flags(m_thread);
}

13
storage/perfschema/pfs_instr_class.h
View file

@ -23,11 +23,12 @@
#ifndef PFS_INSTR_CLASS_H
#define PFS_INSTR_CLASS_H
#include <atomic>
#include "my_global.h"
#include "mysql_com.h" /* NAME_LEN */
#include "lf.h"
#include "pfs_global.h"
#include "pfs_atomic.h"
#include "sql_array.h"
/**
@ -369,22 +370,22 @@ public:
inline void init_refcount(void)
{
PFS_atomic::store_32(& m_refcount, 1);
m_refcount.store(1);
}
inline int get_refcount(void)
{
return PFS_atomic::load_32(& m_refcount);
return m_refcount.load();
}
inline void inc_refcount(void)
{
PFS_atomic::add_32(& m_refcount, 1);
m_refcount.fetch_add(1);
}
inline void dec_refcount(void)
{
PFS_atomic::add_32(& m_refcount, -1);
m_refcount.fetch_sub(1);
}
void refresh_setup_object_flags(PFS_thread *thread);
@ -427,7 +428,7 @@ public:
private:
/** Number of opened table handles. */
int m_refcount;
std::atomic<int> m_refcount;
/** Table locks statistics. */
PFS_table_share_lock *m_race_lock_stat;
/** Table indexes' stats. */

34
storage/perfschema/pfs_lock.h
View file

@ -28,9 +28,9 @@
Performance schema internal locks (declarations).
*/
#include "my_global.h"
#include <atomic>
#include "pfs_atomic.h"
#include "my_global.h"
/* to cause bugs, testing */
// #define MEM(X) std::memory_order_relaxed
@ -103,7 +103,7 @@ struct pfs_lock
The version number is stored in the high 30 bits.
The state is stored in the low 2 bits.
*/
uint32 m_version_state;
std::atomic<uint32> m_version_state;
uint32 copy_version_state()
{
@ -119,7 +119,7 @@ struct pfs_lock
{
uint32 copy;
copy= PFS_atomic::load_u32(&m_version_state);
copy= m_version_state.load();
return ((copy & STATE_MASK) == PFS_LOCK_FREE);
}
@ -129,7 +129,7 @@ struct pfs_lock
{
uint32 copy;
copy= PFS_atomic::load_u32(&m_version_state);
copy= m_version_state.load();
return ((copy & STATE_MASK) == PFS_LOCK_ALLOCATED);
}
@ -144,7 +144,7 @@ struct pfs_lock
{
uint32 old_val;
old_val= PFS_atomic::load_u32(&m_version_state);
old_val= m_version_state.load();
if ((old_val & STATE_MASK) != PFS_LOCK_FREE)
{
@ -154,7 +154,7 @@ struct pfs_lock
uint32 new_val= (old_val & VERSION_MASK) + PFS_LOCK_DIRTY;
bool pass;
pass= PFS_atomic::cas_u32(&m_version_state, &old_val, new_val);
pass= m_version_state.compare_exchange_strong(old_val, new_val);
if (pass)
{
@ -178,7 +178,7 @@ struct pfs_lock
uint32 new_val= (copy & VERSION_MASK) + PFS_LOCK_DIRTY;
/* We own the record, no need to use compare and swap. */
PFS_atomic::store_u32(&m_version_state, new_val);
m_version_state.store(new_val);
copy_ptr->m_version_state= new_val;
}
@ -195,7 +195,7 @@ struct pfs_lock
/* Increment the version, set the ALLOCATED state */
uint32 new_val= (copy->m_version_state & VERSION_MASK) + VERSION_INC + PFS_LOCK_ALLOCATED;
PFS_atomic::store_u32(&m_version_state, new_val);
m_version_state.store(new_val);
}
/**
@ -210,7 +210,7 @@ struct pfs_lock
/* Increment the version, set the ALLOCATED state */
uint32 new_val= (copy & VERSION_MASK) + VERSION_INC + PFS_LOCK_ALLOCATED;
PFS_atomic::store_u32(&m_version_state, new_val);
m_version_state.store(new_val);
}
/**
@ -219,10 +219,10 @@ struct pfs_lock
void set_dirty(pfs_dirty_state *copy_ptr)
{
/* Do not set the version to 0, read the previous value. */
uint32 copy= PFS_atomic::load_u32(&m_version_state);
uint32 copy= m_version_state.load();
/* Increment the version, set the DIRTY state */
uint32 new_val= (copy & VERSION_MASK) + VERSION_INC + PFS_LOCK_DIRTY;
PFS_atomic::store_u32(&m_version_state, new_val);
m_version_state.store(new_val);
copy_ptr->m_version_state= new_val;
}
@ -238,7 +238,7 @@ struct pfs_lock
/* Keep the same version, set the FREE state */
uint32 new_val= (copy->m_version_state & VERSION_MASK) + PFS_LOCK_FREE;
PFS_atomic::store_u32(&m_version_state, new_val);
m_version_state.store(new_val);
}
/**
@ -258,7 +258,7 @@ struct pfs_lock
/* Keep the same version, set the FREE state */
uint32 new_val= (copy & VERSION_MASK) + PFS_LOCK_FREE;
PFS_atomic::store_u32(&m_version_state, new_val);
m_version_state.store(new_val);
}
/**
@ -268,7 +268,7 @@ struct pfs_lock
*/
void begin_optimistic_lock(struct pfs_optimistic_state *copy)
{
copy->m_version_state= PFS_atomic::load_u32(&m_version_state);
copy->m_version_state= m_version_state.load();
}
/**
@ -285,7 +285,7 @@ struct pfs_lock
if ((copy->m_version_state & STATE_MASK) != PFS_LOCK_ALLOCATED)
return false;
version_state= PFS_atomic::load_u32(&m_version_state);
version_state= m_version_state.load();
/* Check the version + state has not changed. */
if (copy->m_version_state != version_state)
@ -298,7 +298,7 @@ struct pfs_lock
{
uint32 version_state;
version_state= PFS_atomic::load_u32(&m_version_state);
version_state= m_version_state.load();
return (version_state & VERSION_MASK);
}

1
storage/perfschema/pfs_memory.cc
View file

@ -33,7 +33,6 @@
#include "pfs_account.h"
#include "pfs_host.h"
#include "pfs_user.h"
#include "pfs_atomic.h"
#include "pfs_buffer_container.h"
#include "m_string.h"

2
storage/perfschema/pfs_setup_actor.cc
View file

@ -231,7 +231,7 @@ public:
: m_pins(pins)
{}
virtual void operator()(PFS_setup_actor *pfs)
void operator()(PFS_setup_actor *pfs) override
{
lf_hash_delete(&setup_actor_hash, m_pins,
pfs->m_key.m_hash_key, pfs->m_key.m_key_length);

2
storage/perfschema/pfs_setup_object.cc
View file

@ -231,7 +231,7 @@ public:
: m_pins(pins)
{}
virtual void operator()(PFS_setup_object *pfs)
void operator()(PFS_setup_object *pfs) override
{
lf_hash_delete(&setup_object_hash, m_pins,
pfs->m_key.m_hash_key, pfs->m_key.m_key_length);

1
storage/perfschema/pfs_status.cc
View file

@ -34,7 +34,6 @@
#include "pfs_host.h"
#include "pfs_user.h"
#include "pfs_status.h"
#include "pfs_atomic.h"
#include "pfs_buffer_container.h"
#include "sql_show.h" /* reset_status_vars */

2
storage/perfschema/pfs_user.cc
View file

@ -314,7 +314,7 @@ public:
: m_thread(thread)
{}
virtual void operator()(PFS_user *pfs)
void operator()(PFS_user *pfs) override
{
pfs->aggregate(true);
if (pfs->get_refcount() == 0)

12
storage/perfschema/pfs_user.h
View file

@ -28,6 +28,8 @@
Performance schema user (declarations).
*/
#include <atomic>
#include "pfs_lock.h"
#include "lf.h"
#include "pfs_con_slice.h"
@ -58,22 +60,22 @@ struct PFS_ALIGNED PFS_user : public PFS_connection_slice
public:
inline void init_refcount(void)
{
PFS_atomic::store_32(& m_refcount, 1);
m_refcount.store(1);
}
inline int get_refcount(void)
{
return PFS_atomic::load_32(& m_refcount);
return m_refcount.load();
}
inline void inc_refcount(void)
{
PFS_atomic::add_32(& m_refcount, 1);
m_refcount.fetch_add(1);
}
inline void dec_refcount(void)
{
PFS_atomic::add_32(& m_refcount, -1);
m_refcount.fetch_sub(1);
}
void aggregate(bool alive);
@ -97,7 +99,7 @@ public:
ulonglong m_disconnected_count;
private:
int m_refcount;
std::atomic<int> m_refcount;
};
int init_user(const PFS_global_param *param);

26
storage/perfschema/pfs_variable.h
View file

@ -205,7 +205,7 @@ public:
Find_THD_variable() : m_unsafe_thd(NULL) {}
Find_THD_variable(THD *unsafe_thd) : m_unsafe_thd(unsafe_thd) {}
virtual bool operator()(THD *thd)
bool operator()(THD *thd) override
{
//TODO: filter bg threads?
if (thd != m_unsafe_thd)
@ -612,18 +612,18 @@ public:
private:
/* Build SHOW_var array. */
bool init_show_var_array(enum_var_type scope, bool strict);
bool do_initialize_session(void);
bool do_initialize_session(void) override;
/* Global */
int do_materialize_global(void);
int do_materialize_global(void) override;
/* Global and Session - THD */
int do_materialize_all(THD* thd);
int do_materialize_all(THD* thd) override;
/* Session - THD */
int do_materialize_session(THD* thd);
int do_materialize_session(THD* thd) override;
/* Session - PFS_thread */
int do_materialize_session(PFS_thread *thread);
int do_materialize_session(PFS_thread *thread) override;
/* Single variable - PFS_thread */
int do_materialize_session(PFS_thread *pfs_thread, uint index);
int do_materialize_session(PFS_thread *pfs_thread, uint index) override;
/* Temporary mem_root to use for materialization. */
MEM_ROOT m_mem_sysvar;
@ -664,14 +664,14 @@ protected:
bool m_show_command;
private:
bool do_initialize_session(void);
bool do_initialize_session(void) override;
int do_materialize_global(void);
int do_materialize_global(void) override;
/* Global and Session - THD */
int do_materialize_all(THD* thd);
int do_materialize_session(THD *thd);
int do_materialize_session(PFS_thread *thread);
int do_materialize_session(PFS_thread *thread, uint index) { return 0; }
int do_materialize_all(THD* thd) override;
int do_materialize_session(THD *thd) override;
int do_materialize_session(PFS_thread *thread) override;
int do_materialize_session(PFS_thread *thread, uint index) override { return 0; }
int do_materialize_client(PFS_client *pfs_client);
/* Callback to sum user, host or account status variables. */

16
storage/perfschema/pfs_visitor.cc
View file

@ -49,7 +49,7 @@ public:
: m_visitor(visitor)
{}
virtual void operator()(THD *thd)
void operator()(THD *thd) override
{
m_visitor->visit_THD(thd);
}
@ -132,7 +132,7 @@ public:
: m_visitor(visitor), m_host(host)
{}
virtual void operator()(THD *thd)
void operator()(THD *thd) override
{
PSI_thread *psi= thd->get_psi();
PFS_thread *pfs= reinterpret_cast<PFS_thread*>(psi);
@ -221,7 +221,7 @@ public:
: m_visitor(visitor), m_user(user)
{}
virtual void operator()(THD *thd)
void operator()(THD *thd) override
{
PSI_thread *psi= thd->get_psi();
PFS_thread *pfs= reinterpret_cast<PFS_thread*>(psi);
@ -310,7 +310,7 @@ public:
: m_visitor(visitor), m_account(account)
{}
virtual void operator()(THD *thd)
void operator()(THD *thd) override
{
PSI_thread *psi= thd->get_psi();
PFS_thread *pfs= reinterpret_cast<PFS_thread*>(psi);
@ -752,7 +752,7 @@ public:
: m_visitor(visitor)
{}
virtual void operator()(PFS_table_share *pfs)
void operator()(PFS_table_share *pfs) override
{
if (pfs->m_enabled)
{
@ -772,7 +772,7 @@ public:
: m_visitor(visitor)
{}
virtual void operator()(PFS_table *pfs)
void operator()(PFS_table *pfs) override
{
PFS_table_share *safe_share= sanitize_table_share(pfs->m_share);
if (safe_share != NULL)
@ -811,7 +811,7 @@ public:
: m_visitor(visitor), m_share(share)
{}
virtual void operator()(PFS_table *pfs)
void operator()(PFS_table *pfs) override
{
if (pfs->m_share == m_share)
{
@ -852,7 +852,7 @@ public:
: m_visitor(visitor), m_share(share), m_index(index)
{}
virtual void operator()(PFS_table *pfs)
void operator()(PFS_table *pfs) override
{
if (pfs->m_share == m_share)
{

160
storage/perfschema/pfs_visitor.h
View file

@ -314,11 +314,11 @@ public:
/** Constructor. */
PFS_connection_wait_visitor(PFS_instr_class *klass);
virtual ~PFS_connection_wait_visitor();
virtual void visit_global();
virtual void visit_host(PFS_host *pfs);
virtual void visit_account(PFS_account *pfs);
virtual void visit_user(PFS_user *pfs);
virtual void visit_thread(PFS_thread *pfs);
void visit_global() override;
void visit_host(PFS_host *pfs) override;
void visit_account(PFS_account *pfs) override;
void visit_user(PFS_user *pfs) override;
void visit_thread(PFS_thread *pfs) override;
/** EVENT_NAME instrument index. */
uint m_index;
@ -336,11 +336,11 @@ public:
/** Constructor. */
PFS_connection_all_wait_visitor();
virtual ~PFS_connection_all_wait_visitor();
virtual void visit_global();
virtual void visit_host(PFS_host *pfs);
virtual void visit_account(PFS_account *pfs);
virtual void visit_user(PFS_user *pfs);
virtual void visit_thread(PFS_thread *pfs);
void visit_global() override;
void visit_host(PFS_host *pfs) override;
void visit_account(PFS_account *pfs) override;
void visit_user(PFS_user *pfs) override;
void visit_thread(PFS_thread *pfs) override;
/** Wait statistic collected. */
PFS_single_stat m_stat;
@ -359,11 +359,11 @@ public:
/** Constructor. */
PFS_connection_stage_visitor(PFS_stage_class *klass);
virtual ~PFS_connection_stage_visitor();
virtual void visit_global();
virtual void visit_host(PFS_host *pfs);
virtual void visit_account(PFS_account *pfs);
virtual void visit_user(PFS_user *pfs);
virtual void visit_thread(PFS_thread *pfs);
void visit_global() override;
void visit_host(PFS_host *pfs) override;
void visit_account(PFS_account *pfs) override;
void visit_user(PFS_user *pfs) override;
void visit_thread(PFS_thread *pfs) override;
/** EVENT_NAME instrument index. */
uint m_index;
@ -381,11 +381,11 @@ public:
/** Constructor. */
PFS_connection_statement_visitor(PFS_statement_class *klass);
virtual ~PFS_connection_statement_visitor();
virtual void visit_global();
virtual void visit_host(PFS_host *pfs);
virtual void visit_account(PFS_account *pfs);
virtual void visit_user(PFS_user *pfs);
virtual void visit_thread(PFS_thread *pfs);
void visit_global() override;
void visit_host(PFS_host *pfs) override;
void visit_account(PFS_account *pfs) override;
void visit_user(PFS_user *pfs) override;
void visit_thread(PFS_thread *pfs) override;
/** EVENT_NAME instrument index. */
uint m_index;
@ -403,11 +403,11 @@ public:
/** Constructor. */
PFS_connection_all_statement_visitor();
virtual ~PFS_connection_all_statement_visitor();
virtual void visit_global();
virtual void visit_host(PFS_host *pfs);
virtual void visit_account(PFS_account *pfs);
virtual void visit_user(PFS_user *pfs);
virtual void visit_thread(PFS_thread *pfs);
void visit_global() override;
void visit_host(PFS_host *pfs) override;
void visit_account(PFS_account *pfs) override;
void visit_user(PFS_user *pfs) override;
void visit_thread(PFS_thread *pfs) override;
/** Statement statistic collected. */
PFS_statement_stat m_stat;
@ -426,11 +426,11 @@ public:
/** Constructor. */
PFS_connection_transaction_visitor(PFS_transaction_class *klass);
virtual ~PFS_connection_transaction_visitor();
virtual void visit_global();
virtual void visit_host(PFS_host *pfs);
virtual void visit_account(PFS_account *pfs);
virtual void visit_user(PFS_user *pfs);
virtual void visit_thread(PFS_thread *pfs);
void visit_global() override;
void visit_host(PFS_host *pfs) override;
void visit_account(PFS_account *pfs) override;
void visit_user(PFS_user *pfs) override;
void visit_thread(PFS_thread *pfs) override;
/** EVENT_NAME instrument index. */
uint m_index;
@ -450,11 +450,11 @@ public:
/** Constructor. */
PFS_connection_all_transaction_visitor();
virtual ~PFS_connection_all_transaction_visitor();
virtual void visit_global();
virtual void visit_host(PFS_host *pfs);
virtual void visit_account(PFS_account *pfs);
virtual void visit_user(PFS_user *pfs);
virtual void visit_thread(PFS_thread *pfs);
void visit_global() override;
void visit_host(PFS_host *pfs) override;
void visit_account(PFS_account *pfs) override;
void visit_user(PFS_user *pfs) override;
void visit_thread(PFS_thread *pfs) override;
/** Statement statistic collected. */
PFS_transaction_stat m_stat;
@ -474,11 +474,11 @@ public:
/** Constructor. */
PFS_connection_stat_visitor();
virtual ~PFS_connection_stat_visitor();
virtual void visit_global();
virtual void visit_host(PFS_host *pfs);
virtual void visit_account(PFS_account *pfs);
virtual void visit_user(PFS_user *pfs);
virtual void visit_thread(PFS_thread *pfs);
void visit_global() override;
void visit_host(PFS_host *pfs) override;
void visit_account(PFS_account *pfs) override;
void visit_user(PFS_user *pfs) override;
void visit_thread(PFS_thread *pfs) override;
/** Connection statistic collected. */
PFS_connection_stat m_stat;
@ -494,11 +494,11 @@ public:
/** Constructor. */
PFS_connection_memory_visitor(PFS_memory_class *klass);
virtual ~PFS_connection_memory_visitor();
virtual void visit_global();
virtual void visit_host(PFS_host *pfs);
virtual void visit_account(PFS_account *pfs);
virtual void visit_user(PFS_user *pfs);
virtual void visit_thread(PFS_thread *pfs);
void visit_global() override;
void visit_host(PFS_host *pfs) override;
void visit_account(PFS_account *pfs) override;
void visit_user(PFS_user *pfs) override;
void visit_thread(PFS_thread *pfs) override;
/** EVENT_NAME instrument index. */
uint m_index;
@ -516,12 +516,12 @@ public:
/** Constructor. */
PFS_connection_status_visitor(STATUS_VAR *status_vars);
virtual ~PFS_connection_status_visitor();
virtual void visit_global();
virtual void visit_host(PFS_host *pfs);
virtual void visit_account(PFS_account *pfs);
virtual void visit_user(PFS_user *pfs);
virtual void visit_thread(PFS_thread *pfs);
virtual void visit_THD(THD *thd);
void visit_global() override;
void visit_host(PFS_host *pfs) override;
void visit_account(PFS_account *pfs) override;
void visit_user(PFS_user *pfs) override;
void visit_thread(PFS_thread *pfs) override;
void visit_THD(THD *thd) override;
private:
STATUS_VAR *m_status_vars;
@ -536,16 +536,16 @@ class PFS_instance_wait_visitor : public PFS_instance_visitor
public:
PFS_instance_wait_visitor();
virtual ~PFS_instance_wait_visitor();
virtual void visit_mutex_class(PFS_mutex_class *pfs);
virtual void visit_rwlock_class(PFS_rwlock_class *pfs);
virtual void visit_cond_class(PFS_cond_class *pfs);
virtual void visit_file_class(PFS_file_class *pfs);
virtual void visit_socket_class(PFS_socket_class *pfs);
virtual void visit_mutex(PFS_mutex *pfs);
virtual void visit_rwlock(PFS_rwlock *pfs);
virtual void visit_cond(PFS_cond *pfs);
virtual void visit_file(PFS_file *pfs);
virtual void visit_socket(PFS_socket *pfs);
void visit_mutex_class(PFS_mutex_class *pfs) override;
void visit_rwlock_class(PFS_rwlock_class *pfs) override;
void visit_cond_class(PFS_cond_class *pfs) override;
void visit_file_class(PFS_file_class *pfs) override;
void visit_socket_class(PFS_socket_class *pfs) override;
void visit_mutex(PFS_mutex *pfs) override;
void visit_rwlock(PFS_rwlock *pfs) override;
void visit_cond(PFS_cond *pfs) override;
void visit_file(PFS_file *pfs) override;
void visit_socket(PFS_socket *pfs) override;
/** Wait statistic collected. */
PFS_single_stat m_stat;
@ -560,9 +560,9 @@ class PFS_object_wait_visitor : public PFS_object_visitor
public:
PFS_object_wait_visitor();
virtual ~PFS_object_wait_visitor();
virtual void visit_global();
virtual void visit_table_share(PFS_table_share *pfs);
virtual void visit_table(PFS_table *pfs);
void visit_global() override;
void visit_table_share(PFS_table_share *pfs) override;
void visit_table(PFS_table *pfs) override;
/** Object wait statistic collected. */
PFS_single_stat m_stat;
@ -577,9 +577,9 @@ class PFS_table_io_wait_visitor : public PFS_object_visitor
public:
PFS_table_io_wait_visitor();
virtual ~PFS_table_io_wait_visitor();
virtual void visit_global();
virtual void visit_table_share(PFS_table_share *pfs);
virtual void visit_table(PFS_table *pfs);
void visit_global() override;
void visit_table_share(PFS_table_share *pfs) override;
void visit_table(PFS_table *pfs) override;
/** Table io wait statistic collected. */
PFS_single_stat m_stat;
@ -594,8 +594,8 @@ class PFS_table_io_stat_visitor : public PFS_object_visitor
public:
PFS_table_io_stat_visitor();
virtual ~PFS_table_io_stat_visitor();
virtual void visit_table_share(PFS_table_share *pfs);
virtual void visit_table(PFS_table *pfs);
void visit_table_share(PFS_table_share *pfs) override;
void visit_table(PFS_table *pfs) override;
/** Table io statistic collected. */
PFS_table_io_stat m_stat;
@ -610,8 +610,8 @@ class PFS_index_io_stat_visitor : public PFS_object_visitor
public:
PFS_index_io_stat_visitor();
virtual ~PFS_index_io_stat_visitor();
virtual void visit_table_share_index(PFS_table_share *pfs, uint index);
virtual void visit_table_index(PFS_table *pfs, uint index);
void visit_table_share_index(PFS_table_share *pfs, uint index) override;
void visit_table_index(PFS_table *pfs, uint index) override;
/** Index io statistic collected. */
PFS_table_io_stat m_stat;
@ -626,9 +626,9 @@ class PFS_table_lock_wait_visitor : public PFS_object_visitor
public:
PFS_table_lock_wait_visitor();
virtual ~PFS_table_lock_wait_visitor();
virtual void visit_global();
virtual void visit_table_share(PFS_table_share *pfs);
virtual void visit_table(PFS_table *pfs);
void visit_global() override;
void visit_table_share(PFS_table_share *pfs) override;
void visit_table(PFS_table *pfs) override;
/** Table lock wait statistic collected. */
PFS_single_stat m_stat;
@ -643,8 +643,8 @@ class PFS_table_lock_stat_visitor : public PFS_object_visitor
public:
PFS_table_lock_stat_visitor();
virtual ~PFS_table_lock_stat_visitor();
virtual void visit_table_share(PFS_table_share *pfs);
virtual void visit_table(PFS_table *pfs);
void visit_table_share(PFS_table_share *pfs) override;
void visit_table(PFS_table *pfs) override;
/** Table lock statistic collected. */
PFS_table_lock_stat m_stat;
@ -659,8 +659,8 @@ class PFS_instance_socket_io_stat_visitor : public PFS_instance_visitor
public:
PFS_instance_socket_io_stat_visitor();
virtual ~PFS_instance_socket_io_stat_visitor();
virtual void visit_socket_class(PFS_socket_class *pfs);
virtual void visit_socket(PFS_socket *pfs);
void visit_socket_class(PFS_socket_class *pfs) override;
void visit_socket(PFS_socket *pfs) override;
/** Wait and byte count statistics collected. */
PFS_socket_io_stat m_socket_io_stat;
@ -675,8 +675,8 @@ class PFS_instance_file_io_stat_visitor : public PFS_instance_visitor
public:
PFS_instance_file_io_stat_visitor();
virtual ~PFS_instance_file_io_stat_visitor();
virtual void visit_file_class(PFS_file_class *pfs);
virtual void visit_file(PFS_file *pfs);
void visit_file_class(PFS_file_class *pfs) override;
void visit_file(PFS_file *pfs) override;
/** Wait and byte count statistics collected. */
PFS_file_io_stat m_file_io_stat;

10
storage/perfschema/table_accounts.h
View file

@ -57,10 +57,10 @@ public:
static int delete_all_rows();
protected:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
protected:
@ -70,7 +70,7 @@ public:
~table_accounts() = default;
private:
virtual void make_row(PFS_account *pfs);
void make_row(PFS_account *pfs) override;
/** Table share lock. */
static THR_LOCK m_table_lock;

6
storage/perfschema/table_all_instr.h
View file

@ -76,9 +76,9 @@ class table_all_instr : public PFS_engine_table
public:
static ha_rows get_row_count();
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
protected:
table_all_instr(const PFS_engine_table_share *share);

16
storage/perfschema/table_esgs_by_account_by_event_name.h
View file

@ -91,16 +91,16 @@ public:
static int delete_all_rows();
static ha_rows get_row_count();
virtual int rnd_init(bool scan);
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_init(bool scan) override;
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
protected:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_esgs_by_account_by_event_name();

16
storage/perfschema/table_esgs_by_host_by_event_name.h
View file

@ -91,16 +91,16 @@ public:
static int delete_all_rows();
static ha_rows get_row_count();
virtual int rnd_init(bool scan);
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_init(bool scan) override;
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
protected:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_esgs_by_host_by_event_name();

16
storage/perfschema/table_esgs_by_thread_by_event_name.h
View file

@ -95,16 +95,16 @@ public:
static int delete_all_rows();
static ha_rows get_row_count();
virtual int rnd_init(bool scan);
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_init(bool scan) override;
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
protected:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_esgs_by_thread_by_event_name();

16
storage/perfschema/table_esgs_by_user_by_event_name.h
View file

@ -96,16 +96,16 @@ public:
static int delete_all_rows();
static ha_rows get_row_count();
virtual int rnd_init(bool scan);
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_init(bool scan) override;
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
protected:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_esgs_by_user_by_event_name();

16
storage/perfschema/table_esgs_global_by_event_name.h
View file

@ -62,16 +62,16 @@ public:
static int delete_all_rows();
static ha_rows get_row_count();
virtual int rnd_init(bool scan);
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_init(bool scan) override;
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
protected:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_esgs_global_by_event_name();

16
storage/perfschema/table_esms_by_account_by_event_name.h
View file

@ -91,16 +91,16 @@ public:
static int delete_all_rows();
static ha_rows get_row_count();
virtual int rnd_init(bool scan);
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_init(bool scan) override;
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
protected:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_esms_by_account_by_event_name();

14
storage/perfschema/table_esms_by_digest.h
View file

@ -65,15 +65,15 @@ public:
static int delete_all_rows();
static ha_rows get_row_count();
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
protected:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_esms_by_digest();

16
storage/perfschema/table_esms_by_host_by_event_name.h
View file

@ -91,16 +91,16 @@ public:
static int delete_all_rows();
static ha_rows get_row_count();
virtual int rnd_init(bool scan);
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_init(bool scan) override;
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
protected:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_esms_by_host_by_event_name();

14
storage/perfschema/table_esms_by_program.h
View file

@ -75,15 +75,15 @@ public:
static int delete_all_rows();
static ha_rows get_row_count();
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
protected:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_esms_by_program();

16
storage/perfschema/table_esms_by_thread_by_event_name.h
View file

@ -95,16 +95,16 @@ public:
static int delete_all_rows();
static ha_rows get_row_count();
virtual int rnd_init(bool scan);
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_init(bool scan) override;
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
protected:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_esms_by_thread_by_event_name();

16
storage/perfschema/table_esms_by_user_by_event_name.h
View file

@ -91,16 +91,16 @@ public:
static int delete_all_rows();
static ha_rows get_row_count();
virtual int rnd_init(bool scan);
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_init(bool scan) override;
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
protected:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_esms_by_user_by_event_name();

16
storage/perfschema/table_esms_global_by_event_name.h
View file

@ -62,16 +62,16 @@ public:
static int delete_all_rows();
static ha_rows get_row_count();
virtual int rnd_init(bool scan);
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_init(bool scan) override;
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
protected:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_esms_global_by_event_name();

16
storage/perfschema/table_ets_by_account_by_event_name.h
View file

@ -95,16 +95,16 @@ public:
static int delete_all_rows();
static ha_rows get_row_count();
virtual int rnd_init(bool scan);
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_init(bool scan) override;
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
protected:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_ets_by_account_by_event_name();

16
storage/perfschema/table_ets_by_host_by_event_name.h
View file

@ -95,16 +95,16 @@ public:
static int delete_all_rows();
static ha_rows get_row_count();
virtual int rnd_init(bool scan);
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_init(bool scan) override;
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
protected:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_ets_by_host_by_event_name();

16
storage/perfschema/table_ets_by_thread_by_event_name.h
View file

@ -99,16 +99,16 @@ public:
static int delete_all_rows();
static ha_rows get_row_count();
virtual int rnd_init(bool scan);
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_init(bool scan) override;
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
protected:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_ets_by_thread_by_event_name();

16
storage/perfschema/table_ets_by_user_by_event_name.h
View file

@ -95,16 +95,16 @@ public:
static int delete_all_rows();
static ha_rows get_row_count();
virtual int rnd_init(bool scan);
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_init(bool scan) override;
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
protected:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_ets_by_user_by_event_name();

16
storage/perfschema/table_ets_global_by_event_name.h
View file

@ -66,16 +66,16 @@ public:
static int delete_all_rows();
static ha_rows get_row_count();
virtual int rnd_init(bool scan);
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_init(bool scan) override;
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
protected:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_ets_global_by_event_name();

32
storage/perfschema/table_events_stages.h
View file

@ -100,10 +100,10 @@ struct pos_events_stages_history : public PFS_double_index
class table_events_stages_common : public PFS_engine_table
{
protected:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_events_stages_common(const PFS_engine_table_share *share, void *pos);
@ -128,10 +128,10 @@ public:
static int delete_all_rows();
static ha_rows get_row_count();
virtual int rnd_init(bool scan);
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_init(bool scan) override;
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
protected:
table_events_stages_current();
@ -163,10 +163,10 @@ public:
static int delete_all_rows();
static ha_rows get_row_count();
virtual int rnd_init(bool scan);
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_init(bool scan) override;
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
protected:
table_events_stages_history();
@ -195,10 +195,10 @@ public:
static int delete_all_rows();
static ha_rows get_row_count();
virtual int rnd_init(bool scan);
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_init(bool scan) override;
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
protected:
table_events_stages_history_long();

32
storage/perfschema/table_events_statements.h
View file

@ -183,10 +183,10 @@ struct pos_events_statements_history : public PFS_double_index
class table_events_statements_common : public PFS_engine_table
{
protected:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_events_statements_common(const PFS_engine_table_share *share, void *pos);
@ -215,10 +215,10 @@ public:
static int delete_all_rows();
static ha_rows get_row_count();
virtual int rnd_init(bool scan);
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_init(bool scan) override;
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
protected:
table_events_statements_current();
@ -252,10 +252,10 @@ public:
static int delete_all_rows();
static ha_rows get_row_count();
virtual int rnd_init(bool scan);
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_init(bool scan) override;
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
protected:
table_events_statements_history();
@ -286,10 +286,10 @@ public:
static int delete_all_rows();
static ha_rows get_row_count();
virtual int rnd_init(bool scan);
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_init(bool scan) override;
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
protected:
table_events_statements_history_long();

32
storage/perfschema/table_events_transactions.h
View file

@ -127,10 +127,10 @@ struct pos_events_transactions_history : public PFS_double_index
class table_events_transactions_common : public PFS_engine_table
{
protected:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_events_transactions_common(const PFS_engine_table_share *share, void *pos);
@ -156,10 +156,10 @@ public:
static int delete_all_rows();
static ha_rows get_row_count();
virtual int rnd_init(bool scan);
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_init(bool scan) override;
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
protected:
table_events_transactions_current();
@ -198,10 +198,10 @@ public:
static int delete_all_rows();
static ha_rows get_row_count();
virtual int rnd_init(bool scan);
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_init(bool scan) override;
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
protected:
table_events_transactions_history();
@ -231,10 +231,10 @@ public:
static int delete_all_rows();
static ha_rows get_row_count();
virtual int rnd_init(bool scan);
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_init(bool scan) override;
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
protected:
table_events_transactions_history_long();

26
storage/perfschema/table_events_waits.h
View file

@ -139,10 +139,10 @@ struct pos_events_waits_history : public PFS_double_index
class table_events_waits_common : public PFS_engine_table
{
protected:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_events_waits_common(const PFS_engine_table_share *share, void *pos);
@ -173,9 +173,9 @@ public:
static int delete_all_rows();
static ha_rows get_row_count();
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
protected:
table_events_waits_current();
@ -209,9 +209,9 @@ public:
static int delete_all_rows();
static ha_rows get_row_count();
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
protected:
table_events_waits_history();
@ -242,9 +242,9 @@ public:
static int delete_all_rows();
static ha_rows get_row_count();
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;;
protected:
table_events_waits_history_long();

18
storage/perfschema/table_events_waits_summary.h
View file

@ -67,16 +67,16 @@ protected:
void make_instr_row(PFS_instr *pfs, PFS_instr_class *klass,
const void *object_instance_begin,
PFS_single_stat *pfs_stat);
virtual void make_mutex_row(PFS_mutex *pfs);
virtual void make_rwlock_row(PFS_rwlock *pfs);
virtual void make_cond_row(PFS_cond *pfs);
virtual void make_file_row(PFS_file *pfs);
virtual void make_socket_row(PFS_socket *pfs);
void make_mutex_row(PFS_mutex *pfs) override;
void make_rwlock_row(PFS_rwlock *pfs) override;
void make_cond_row(PFS_cond *pfs) override;
void make_file_row(PFS_file *pfs) override;
void make_socket_row(PFS_socket *pfs) override;
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_events_waits_summary_by_instance();

14
storage/perfschema/table_ews_by_account_by_event_name.h
View file

@ -103,15 +103,15 @@ public:
static int delete_all_rows();
static ha_rows get_row_count();
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
protected:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_ews_by_account_by_event_name();

14
storage/perfschema/table_ews_by_host_by_event_name.h
View file

@ -103,15 +103,15 @@ public:
static int delete_all_rows();
static ha_rows get_row_count();
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
protected:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_ews_by_host_by_event_name();

14
storage/perfschema/table_ews_by_thread_by_event_name.h
View file

@ -102,15 +102,15 @@ public:
static int delete_all_rows();
static ha_rows get_row_count();
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
protected:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_ews_by_thread_by_event_name();

14
storage/perfschema/table_ews_by_user_by_event_name.h
View file

@ -103,15 +103,15 @@ public:
static int delete_all_rows();
static ha_rows get_row_count();
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
protected:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_ews_by_user_by_event_name();

14
storage/perfschema/table_ews_global_by_event_name.h
View file

@ -91,15 +91,15 @@ public:
static int delete_all_rows();
static ha_rows get_row_count();
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
protected:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_ews_global_by_event_name();

14
storage/perfschema/table_file_instances.h
View file

@ -61,15 +61,15 @@ public:
static PFS_engine_table* create();
static ha_rows get_row_count();
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
private:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_file_instances();

14
storage/perfschema/table_file_summary_by_event_name.h
View file

@ -62,15 +62,15 @@ public:
static int delete_all_rows();
static ha_rows get_row_count();
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
private:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_file_summary_by_event_name();

14
storage/perfschema/table_file_summary_by_instance.h
View file

@ -70,15 +70,15 @@ public:
static int delete_all_rows();
static ha_rows get_row_count();
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
private:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_file_summary_by_instance();

16
storage/perfschema/table_global_status.h
View file

@ -75,16 +75,16 @@ public:
static int delete_all_rows();
static ha_rows get_row_count();
virtual int rnd_init(bool scan);
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_init(bool scan) override;
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
protected:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_global_status();
public:

16
storage/perfschema/table_global_variables.h
View file

@ -74,16 +74,16 @@ public:
static PFS_engine_table* create();
static ha_rows get_row_count();
virtual int rnd_init(bool scan);
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_init(bool scan) override;
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
protected:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_global_variables();
public:

14
storage/perfschema/table_host_cache.h
View file

@ -114,15 +114,15 @@ public:
static int delete_all_rows();
static ha_rows get_row_count();
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
protected:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_host_cache();

12
storage/perfschema/table_hosts.h
View file

@ -57,11 +57,11 @@ public:
static int delete_all_rows();
protected:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
protected:
table_hosts();
@ -70,7 +70,7 @@ public:
~table_hosts() = default;
private:
virtual void make_row(PFS_host *pfs);
void make_row(PFS_host *pfs) override;
/** Table share lock. */
static THR_LOCK m_table_lock;

14
storage/perfschema/table_md_locks.h
View file

@ -69,15 +69,15 @@ public:
static PFS_engine_table* create();
static ha_rows get_row_count();
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
private:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_metadata_locks();

14
storage/perfschema/table_mems_by_account_by_event_name.h
View file

@ -92,15 +92,15 @@ public:
static int delete_all_rows();
static ha_rows get_row_count();
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
private:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_mems_by_account_by_event_name();

14
storage/perfschema/table_mems_by_host_by_event_name.h
View file

@ -92,15 +92,15 @@ public:
static int delete_all_rows();
static ha_rows get_row_count();
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
private:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_mems_by_host_by_event_name();

14
storage/perfschema/table_mems_by_thread_by_event_name.h
View file

@ -92,15 +92,15 @@ public:
static int delete_all_rows();
static ha_rows get_row_count();
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
private:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_mems_by_thread_by_event_name();

14
storage/perfschema/table_mems_by_user_by_event_name.h
View file

@ -92,15 +92,15 @@ public:
static int delete_all_rows();
static ha_rows get_row_count();
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
private:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_mems_by_user_by_event_name();

14
storage/perfschema/table_mems_global_by_event_name.h
View file

@ -94,15 +94,15 @@ public:
static int delete_all_rows();
static ha_rows get_row_count();
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
private:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_mems_global_by_event_name();

14
storage/perfschema/table_os_global_by_type.h
View file

@ -93,15 +93,15 @@ public:
static int delete_all_rows();
static ha_rows get_row_count();
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
protected:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_os_global_by_type();

14
storage/perfschema/table_performance_timers.h
View file

@ -59,15 +59,15 @@ public:
static PFS_engine_table* create();
static ha_rows get_row_count();
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
protected:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
protected:
table_performance_timers();

14
storage/perfschema/table_prepared_stmt_instances.h
View file

@ -94,15 +94,15 @@ public:
static int delete_all_rows();
static ha_rows get_row_count();
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
protected:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_prepared_stmt_instances();

14
storage/perfschema/table_replication_applier_configuration.h
View file

@ -81,10 +81,10 @@ protected:
@param read_all true if all columns are read.
*/
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_replication_applier_configuration();
@ -96,9 +96,9 @@ public:
static PFS_engine_table_share m_share;
static PFS_engine_table* create();
static ha_rows get_row_count();
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
};

14
storage/perfschema/table_replication_applier_status.h
View file

@ -92,10 +92,10 @@ protected:
@param read_all true if all columns are read.
*/
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_replication_applier_status();
@ -107,9 +107,9 @@ public:
static PFS_engine_table_share m_share;
static PFS_engine_table* create();
static ha_rows get_row_count();
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
};

14
storage/perfschema/table_replication_applier_status_by_coordinator.h
View file

@ -101,10 +101,10 @@ protected:
@param read_all true if all columns are read.
*/
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_replication_applier_status_by_coordinator();
@ -116,9 +116,9 @@ public:
static PFS_engine_table_share m_share;
static PFS_engine_table* create();
static ha_rows get_row_count();
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
};

14
storage/perfschema/table_replication_applier_status_by_worker.h
View file

@ -130,10 +130,10 @@ protected:
@param read_all true if all columns are read.
*/
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_replication_applier_status_by_worker();
@ -145,9 +145,9 @@ public:
static PFS_engine_table_share m_share;
static PFS_engine_table* create();
static ha_rows get_row_count();
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
};

14
storage/perfschema/table_replication_connection_configuration.h
View file

@ -153,10 +153,10 @@ protected:
@param read_all true if all columns are read.
*/
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_replication_connection_configuration();
@ -168,9 +168,9 @@ public:
static PFS_engine_table_share m_share;
static PFS_engine_table* create();
static ha_rows get_row_count();
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
};

14
storage/perfschema/table_replication_connection_status.h
View file

@ -126,10 +126,10 @@ protected:
@param read_all true if all columns are read.
*/
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_replication_connection_status();
@ -141,9 +141,9 @@ public:
static PFS_engine_table_share m_share;
static PFS_engine_table* create();
static ha_rows get_row_count();
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
};

14
storage/perfschema/table_replication_group_member_stats.h
View file

@ -91,10 +91,10 @@ protected:
@param read_all true if all columns are read.
*/
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_replication_group_member_stats();
@ -106,9 +106,9 @@ public:
static PFS_engine_table_share m_share;
static PFS_engine_table* create();
static ha_rows get_row_count();
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
};

14
storage/perfschema/table_replication_group_members.h
View file

@ -84,10 +84,10 @@ protected:
@param read_all true if all columns are read.
*/
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_replication_group_members();
@ -99,9 +99,9 @@ public:
static PFS_engine_table_share m_share;
static PFS_engine_table* create();
static ha_rows get_row_count();
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
};

2
storage/perfschema/table_session_account_connect_attrs.h
View file

@ -46,7 +46,7 @@ public:
~table_session_account_connect_attrs() = default;
protected:
virtual bool thread_fits(PFS_thread *thread);
bool thread_fits(PFS_thread *thread) override;
private:
/** Table share lock. */

6
storage/perfschema/table_session_connect.h
View file

@ -69,10 +69,10 @@ public:
~table_session_connect();
protected:
virtual void make_row(PFS_thread *pfs, uint ordinal);
void make_row(PFS_thread *pfs, uint ordinal) override;
virtual bool thread_fits(PFS_thread *thread);
virtual int read_row_values(TABLE *table, unsigned char *buf,
Field **fields, bool read_all);
int read_row_values(TABLE *table, unsigned char *buf,
Field **fields, bool read_all) override;
protected:
/** Current row. */
row_session_connect_attrs m_row;

16
storage/perfschema/table_session_status.h
View file

@ -76,16 +76,16 @@ public:
static PFS_engine_table* create();
static ha_rows get_row_count();
virtual int rnd_init(bool scan);
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_init(bool scan) override;
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
protected:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_session_status();
public:

16
storage/perfschema/table_session_variables.h
View file

@ -74,16 +74,16 @@ public:
static PFS_engine_table* create();
static ha_rows get_row_count();
virtual int rnd_init(bool scan);
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_init(bool scan) override;
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
protected:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_session_variables();
public:

28
storage/perfschema/table_setup_actors.h
View file

@ -71,24 +71,24 @@ public:
static int delete_all_rows();
static ha_rows get_row_count();
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
protected:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
virtual int update_row_values(TABLE *table,
const unsigned char *old_buf,
const unsigned char *new_buf,
Field **fields);
int update_row_values(TABLE *table,
const unsigned char *old_buf,
const unsigned char *new_buf,
Field **fields) override;
virtual int delete_row_values(TABLE *table,
const unsigned char *buf,
Field **fields);
int delete_row_values(TABLE *table,
const unsigned char *buf,
Field **fields) override;
table_setup_actors();

22
storage/perfschema/table_setup_consumers.h
View file

@ -59,20 +59,20 @@ public:
static PFS_engine_table* create();
static ha_rows get_row_count();
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
protected:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
virtual int update_row_values(TABLE *table,
const unsigned char *old_buf,
const unsigned char *new_buf,
Field **fields);
int update_row_values(TABLE *table,
const unsigned char *old_buf,
const unsigned char *new_buf,
Field **fields) override;
table_setup_consumers();

26
storage/perfschema/table_setup_instruments.h
View file

@ -97,21 +97,21 @@ public:
static PFS_engine_table* create();
static ha_rows get_row_count();
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
protected:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
virtual int update_row_values(TABLE *table,
const unsigned char *old_buf,
const unsigned char *new_buf,
Field **fields);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
int update_row_values(TABLE *table,
const unsigned char *old_buf,
const unsigned char *new_buf,
Field **fields) override;
table_setup_instruments();
public:

30
storage/perfschema/table_setup_objects.h
View file

@ -70,24 +70,24 @@ public:
static int delete_all_rows();
static ha_rows get_row_count();
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
protected:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
virtual int update_row_values(TABLE *table,
const unsigned char *old_buf,
const unsigned char *new_buf,
Field **fields);
virtual int delete_row_values(TABLE *table,
const unsigned char *buf,
Field **fields);
int update_row_values(TABLE *table,
const unsigned char *old_buf,
const unsigned char *new_buf,
Field **fields) override;
int delete_row_values(TABLE *table,
const unsigned char *buf,
Field **fields) override;
table_setup_objects();

22
storage/perfschema/table_setup_timers.h
View file

@ -55,20 +55,20 @@ public:
static PFS_engine_table* create();
static ha_rows get_row_count();
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
protected:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
virtual int update_row_values(TABLE *table,
const unsigned char *old_buf,
const unsigned char *new_buf,
Field **fields);
int update_row_values(TABLE *table,
const unsigned char *old_buf,
const unsigned char *new_buf,
Field **fields) override;
table_setup_timers();

14
storage/perfschema/table_socket_instances.h
View file

@ -73,15 +73,15 @@ public:
static PFS_engine_table* create();
static ha_rows get_row_count();
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
private:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_socket_instances();

14
storage/perfschema/table_socket_summary_by_event_name.h
View file

@ -63,15 +63,15 @@ public:
static int delete_all_rows();
static ha_rows get_row_count();
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
private:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_socket_summary_by_event_name();

14
storage/perfschema/table_socket_summary_by_instance.h
View file

@ -66,15 +66,15 @@ public:
static int delete_all_rows();
static ha_rows get_row_count();
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
private:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_socket_summary_by_instance();

16
storage/perfschema/table_status_by_account.h
View file

@ -111,16 +111,16 @@ public:
static int delete_all_rows();
static ha_rows get_row_count();
virtual int rnd_init(bool scan);
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_init(bool scan) override;
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
protected:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_status_by_account();
public:

Some files were not shown because too many files have changed in this diff Show more