mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-14 19:07:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge 10.5 into 10.6

Browse source
This commit is contained in:
Marko Mäkelä 2024-06-24 13:09:47 +03:00
commit 0076eb3d4e
333 changed files with 6732 additions and 6129 deletions
Download patch file Download diff file Expand all files Collapse all files

6
storage/rocksdb/ha_rocksdb.cc
View file

@ -3176,7 +3176,7 @@ class Rdb_transaction_impl : public Rdb_transaction {
}
}
virtual bool is_writebatch_trx() const override { return false; }
bool is_writebatch_trx() const override { return false; }
bool is_prepared() override {
return m_rocksdb_tx && rocksdb::Transaction::PREPARED == m_rocksdb_tx->GetState();
@ -3521,7 +3521,7 @@ private:
m_notifier = std::make_shared<Rdb_snapshot_notifier>(this);
}
virtual ~Rdb_transaction_impl() override {
~Rdb_transaction_impl() override {
rollback();
// Theoretically the notifier could outlive the Rdb_transaction_impl
@ -3727,7 +3727,7 @@ class Rdb_writebatch_impl : public Rdb_transaction {
true);
}
virtual ~Rdb_writebatch_impl() override {
~Rdb_writebatch_impl() override {
rollback();
delete m_batch;
}

20
storage/rocksdb/ha_rocksdb.h
View file

@ -441,7 +441,7 @@ class ha_rocksdb : public my_core::handler {
ha_rocksdb(my_core::handlerton *const hton,
my_core::TABLE_SHARE *const table_arg);
virtual ~ha_rocksdb() override {
~ha_rocksdb() override {
int err MY_ATTRIBUTE((__unused__));
err = finalize_bulk_load(false);
if (err != 0) {
@ -458,7 +458,7 @@ class ha_rocksdb : public my_core::handler {
const char *table_type() const
is non-virtual in class handler, so there's no point to override it.
is non-in class handler, so there's no point to override it.
*/
/* The following is only used by SHOW KEYS: */
@ -623,15 +623,15 @@ public:
bool sorted) override
MY_ATTRIBUTE((__warn_unused_result__));
virtual double scan_time() override {
double scan_time() override {
DBUG_ENTER_FUNC();
DBUG_RETURN(
static_cast<double>((stats.records + stats.deleted) / 20.0 + 10));
}
virtual double read_time(uint, uint, ha_rows rows) override;
virtual void print_error(int error, myf errflag) override;
double read_time(uint, uint, ha_rows rows) override;
void print_error(int error, myf errflag) override;
int open(const char *const name, int mode, uint test_if_locked) override
MY_ATTRIBUTE((__warn_unused_result__));
@ -980,11 +980,11 @@ public:
#ifdef MARIAROCKS_NOT_YET // MDEV-10976
public:
virtual void rpl_before_delete_rows() override;
virtual void rpl_after_delete_rows() override;
virtual void rpl_before_update_rows() override;
virtual void rpl_after_update_rows() override;
virtual bool use_read_free_rpl() const override;
void rpl_before_delete_rows() override;
void rpl_after_delete_rows() override;
void rpl_before_update_rows() override;
void rpl_after_update_rows() override;
bool use_read_free_rpl() const override;
#endif // MARIAROCKS_NOT_YET
private:

4
storage/rocksdb/properties_collector.h
View file

@ -128,7 +128,7 @@ class Rdb_tbl_prop_coll : public rocksdb::TablePropertiesCollector {
virtual rocksdb::Status Finish(
rocksdb::UserCollectedProperties *properties) override;
virtual const char *Name() const override { return "Rdb_tbl_prop_coll"; }
const char *Name() const override { return "Rdb_tbl_prop_coll"; }
rocksdb::UserCollectedProperties GetReadableProperties() const override;
@ -193,7 +193,7 @@ class Rdb_tbl_prop_coll_factory
m_table_stats_sampling_pct);
}
virtual const char *Name() const override {
const char *Name() const override {
return "Rdb_tbl_prop_coll_factory";
}

4
storage/rocksdb/rdb_compact_filter.h
View file

@ -105,9 +105,9 @@ class Rdb_compact_filter : public rocksdb::CompactionFilter {
return false;
}
virtual bool IgnoreSnapshots() const override { return true; }
bool IgnoreSnapshots() const override { return true; }
virtual const char *Name() const override { return "Rdb_compact_filter"; }
const char *Name() const override { return "Rdb_compact_filter"; }
void get_ttl_duration_and_offset(const GL_INDEX_ID &gl_index_id,
uint64 *ttl_duration,

2
storage/rocksdb/rdb_datadic.h
View file

@ -1584,7 +1584,7 @@ class Rdb_system_merge_op : public rocksdb::AssociativeMergeOperator {
return true;
}
virtual const char *Name() const override { return "Rdb_system_merge_op"; }
const char *Name() const override { return "Rdb_system_merge_op"; }
private:
/*

14
storage/rocksdb/rdb_mutex_wrapper.h
View file

@ -39,7 +39,7 @@ class Rdb_mutex : public rocksdb::TransactionDBMutex {
public:
Rdb_mutex();
virtual ~Rdb_mutex() override;
~Rdb_mutex() override;
/*
Override parent class's virtual methods of interrest.
@ -47,7 +47,7 @@ class Rdb_mutex : public rocksdb::TransactionDBMutex {
// Attempt to acquire lock. Return OK on success, or other Status on failure.
// If returned status is OK, TransactionDB will eventually call UnLock().
virtual rocksdb::Status Lock() override;
rocksdb::Status Lock() override;
// Attempt to acquire lock. If timeout is non-negative, operation should be
// failed after this many microseconds.
@ -59,7 +59,7 @@ class Rdb_mutex : public rocksdb::TransactionDBMutex {
int64_t timeout_time MY_ATTRIBUTE((__unused__))) override;
// Unlock Mutex that was successfully locked by Lock() or TryLockUntil()
virtual void UnLock() override;
void UnLock() override;
private:
mysql_mutex_t m_mutex;
@ -77,7 +77,7 @@ class Rdb_cond_var : public rocksdb::TransactionDBCondVar {
public:
Rdb_cond_var();
virtual ~Rdb_cond_var() override;
~Rdb_cond_var() override;
/*
Override parent class's virtual methods of interrest.
@ -109,10 +109,10 @@ class Rdb_cond_var : public rocksdb::TransactionDBCondVar {
// If any threads are waiting on *this, unblock at least one of the
// waiting threads.
virtual void Notify() override;
void Notify() override;
// Unblocks all threads waiting on *this.
virtual void NotifyAll() override;
void NotifyAll() override;
private:
mysql_cond_t m_cond;
@ -137,7 +137,7 @@ class Rdb_mutex_factory : public rocksdb::TransactionDBMutexFactory {
return std::make_shared<Rdb_cond_var>();
}
virtual ~Rdb_mutex_factory() override = default;
~Rdb_mutex_factory() override = default;
};
} // namespace myrocks

6
storage/rocksdb/rdb_threads.h
View file

@ -148,7 +148,7 @@ class Rdb_background_thread : public Rdb_thread {
}
public:
virtual void run() override;
void run() override;
void request_save_stats() {
RDB_MUTEX_LOCK_CHECK(m_signal_mutex);
@ -175,7 +175,7 @@ class Rdb_manual_compaction_thread : public Rdb_thread {
std::map<int, Manual_compaction_request> m_requests;
public:
virtual void run() override;
void run() override;
int request_manual_compaction(rocksdb::ColumnFamilyHandle *cf,
rocksdb::Slice *start, rocksdb::Slice *limit,
int concurrency = 0);
@ -189,7 +189,7 @@ class Rdb_manual_compaction_thread : public Rdb_thread {
*/
struct Rdb_drop_index_thread : public Rdb_thread {
virtual void run() override;
void run() override;
};
} // namespace myrocks