- commits - lists.mariadb.org

[Commits] 1dd0e500095: Update rocksdb submodule
by Sergei Petrunia 14 Jan '19

14 Jan '19

revision-id: 1dd0e500095ac01f5b103714f4712276551385a1 (fb-prod201801-190-g1dd0e500095) parent(s): 83296053443535732fcb5e2b0f46011bcb2aa9a0 author: Sergei Petrunia committer: Sergei Petrunia timestamp: 2019-01-15 00:26:51 +0300 message: Update rocksdb submodule Range Locking: disable key tracking when range locking is used --- rocksdb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rocksdb b/rocksdb index e4d7dbc4703..791d4c1f48f 160000 --- a/rocksdb +++ b/rocksdb @@ -1 +1 @@ -Subproject commit e4d7dbc47038638ed3d199c3d959ed5ead84f353 +Subproject commit 791d4c1f48fe30d7519b93508cc3670246063b7f

1 0

[Commits] 791d4c1f4: Range Locking: disable key tracking when range locking is used
by Sergei Petrunia 14 Jan '19

14 Jan '19

revision-id: 791d4c1f48fe30d7519b93508cc3670246063b7f (v5.8-1026-g791d4c1f4) parent(s): e4d7dbc47038638ed3d199c3d959ed5ead84f353 author: Sergei Petrunia committer: Sergei Petrunia timestamp: 2019-01-15 00:24:54 +0300 message: Range Locking: disable key tracking when range locking is used --- utilities/transactions/pessimistic_transaction.cc | 24 ++++++--- .../transactions/pessimistic_transaction_db.cc | 2 +- utilities/transactions/transaction_base.cc | 63 +++++++++++----------- utilities/transactions/transaction_base.h | 7 +++ utilities/transactions/transaction_lock_mgr.cc | 3 +- utilities/transactions/transaction_lock_mgr.h | 3 +- 6 files changed, 60 insertions(+), 42 deletions(-) diff --git a/utilities/transactions/pessimistic_transaction.cc b/utilities/transactions/pessimistic_transaction.cc index 36e6ed6ac..7a9a0d11e 100644 --- a/utilities/transactions/pessimistic_transaction.cc +++ b/utilities/transactions/pessimistic_transaction.cc @@ -50,6 +50,7 @@ PessimisticTransaction::PessimisticTransaction( skip_concurrency_control_(false) { txn_db_impl_ = static_cast_with_check<PessimisticTransactionDB, TransactionDB>(txn_db); + do_key_tracking_ = ! txn_db_impl_->use_range_locking; db_impl_ = static_cast_with_check<DBImpl, DB>(db_); Initialize(txn_options); } @@ -131,7 +132,8 @@ WriteCommittedTxn::WriteCommittedTxn(TransactionDB* txn_db, Status PessimisticTransaction::CommitBatch(WriteBatch* batch) { TransactionKeyMap keys_to_unlock; - Status s = LockBatch(batch, &keys_to_unlock); + + Status s = do_key_tracking_? LockBatch(batch, &keys_to_unlock): Status::OK(); if (!s.ok()) { return s; @@ -162,7 +164,7 @@ Status PessimisticTransaction::CommitBatch(WriteBatch* batch) { s = Status::InvalidArgument("Transaction is not in state for commit."); } - txn_db_impl_->UnLock(this, &keys_to_unlock); + txn_db_impl_->UnLock(this, &keys_to_unlock, /*all_keys_hint=*/true); return s; } @@ -400,12 +402,14 @@ Status PessimisticTransaction::RollbackToSavePoint() { return Status::InvalidArgument("Transaction is beyond state for rollback."); } - // Unlock any keys locked since last transaction - const std::unique_ptr<TransactionKeyMap>& keys = - GetTrackedKeysSinceSavePoint(); + if (do_key_tracking_) { + // Unlock any keys locked since last transaction + const std::unique_ptr<TransactionKeyMap>& keys = + GetTrackedKeysSinceSavePoint(); - if (keys) { - txn_db_impl_->UnLock(this, keys.get()); + if (keys) { + txn_db_impl_->UnLock(this, keys.get()); + } } return TransactionBaseImpl::RollbackToSavePoint(); @@ -503,6 +507,12 @@ Status PessimisticTransaction::TryLock(ColumnFamilyHandle* column_family, bool previously_locked; bool lock_upgrade = false; + // If we are not doing key tracking, just get the lock and return (this + // also assumes locks are "idempotent") + if (!do_key_tracking_) { + return txn_db_impl_->TryLock(this, cfh_id, key_str, exclusive); + } + // lock this key if this transactions hasn't already locked it SequenceNumber tracked_at_seq = kMaxSequenceNumber; diff --git a/utilities/transactions/pessimistic_transaction_db.cc b/utilities/transactions/pessimistic_transaction_db.cc index 425b3ba73..df5ec2d6c 100644 --- a/utilities/transactions/pessimistic_transaction_db.cc +++ b/utilities/transactions/pessimistic_transaction_db.cc @@ -409,7 +409,7 @@ void PessimisticTransactionDB::UnLock(PessimisticTransaction* txn, if (use_range_locking) { if (all_keys_hint) - range_lock_mgr_.UnLockAll(txn, keys, GetEnv()); + range_lock_mgr_.UnLockAll(txn, GetEnv()); else range_lock_mgr_.UnLock(txn, keys, GetEnv()); } diff --git a/utilities/transactions/transaction_base.cc b/utilities/transactions/transaction_base.cc index ac459a256..d81149201 100644 --- a/utilities/transactions/transaction_base.cc +++ b/utilities/transactions/transaction_base.cc @@ -24,6 +24,7 @@ TransactionBaseImpl::TransactionBaseImpl(DB* db, cmp_(GetColumnFamilyUserComparator(db->DefaultColumnFamily())), start_time_(db_->GetEnv()->NowMicros()), write_batch_(cmp_, 0, true, 0), + do_key_tracking_(true), indexing_enabled_(true) { assert(dynamic_cast<DBImpl*>(db_) != nullptr); log_number_ = 0; @@ -137,35 +138,37 @@ Status TransactionBaseImpl::RollbackToSavePoint() { Status s = write_batch_.RollbackToSavePoint(); assert(s.ok()); - // Rollback any keys that were tracked since the last savepoint - const TransactionKeyMap& key_map = save_point.new_keys_; - for (const auto& key_map_iter : key_map) { - uint32_t column_family_id = key_map_iter.first; - auto& keys = key_map_iter.second; - - auto& cf_tracked_keys = tracked_keys_[column_family_id]; - - for (const auto& key_iter : keys) { - const std::string& key = key_iter.first; - uint32_t num_reads = key_iter.second.num_reads; - uint32_t num_writes = key_iter.second.num_writes; - - auto tracked_keys_iter = cf_tracked_keys.find(key); - assert(tracked_keys_iter != cf_tracked_keys.end()); - - // Decrement the total reads/writes of this key by the number of - // reads/writes done since the last SavePoint. - if (num_reads > 0) { - assert(tracked_keys_iter->second.num_reads >= num_reads); - tracked_keys_iter->second.num_reads -= num_reads; - } - if (num_writes > 0) { - assert(tracked_keys_iter->second.num_writes >= num_writes); - tracked_keys_iter->second.num_writes -= num_writes; - } - if (tracked_keys_iter->second.num_reads == 0 && - tracked_keys_iter->second.num_writes == 0) { - tracked_keys_[column_family_id].erase(tracked_keys_iter); + if (do_key_tracking_) { + // Rollback any keys that were tracked since the last savepoint + const TransactionKeyMap& key_map = save_point.new_keys_; + for (const auto& key_map_iter : key_map) { + uint32_t column_family_id = key_map_iter.first; + auto& keys = key_map_iter.second; + + auto& cf_tracked_keys = tracked_keys_[column_family_id]; + + for (const auto& key_iter : keys) { + const std::string& key = key_iter.first; + uint32_t num_reads = key_iter.second.num_reads; + uint32_t num_writes = key_iter.second.num_writes; + + auto tracked_keys_iter = cf_tracked_keys.find(key); + assert(tracked_keys_iter != cf_tracked_keys.end()); + + // Decrement the total reads/writes of this key by the number of + // reads/writes done since the last SavePoint. + if (num_reads > 0) { + assert(tracked_keys_iter->second.num_reads >= num_reads); + tracked_keys_iter->second.num_reads -= num_reads; + } + if (num_writes > 0) { + assert(tracked_keys_iter->second.num_writes >= num_writes); + tracked_keys_iter->second.num_writes -= num_writes; + } + if (tracked_keys_iter->second.num_reads == 0 && + tracked_keys_iter->second.num_writes == 0) { + tracked_keys_[column_family_id].erase(tracked_keys_iter); + } } } } @@ -573,7 +576,7 @@ void TransactionBaseImpl::TrackKey(TransactionKeyMap* key_map, uint32_t cfh_id, std::unique_ptr<TransactionKeyMap> TransactionBaseImpl::GetTrackedKeysSinceSavePoint() { - if (save_points_ != nullptr && !save_points_->empty()) { + if (save_points_ != nullptr && !save_points_->empty() && do_key_tracking_) { // Examine the number of reads/writes performed on all keys written // since the last SavePoint and compare to the total number of reads/writes // for each key. diff --git a/utilities/transactions/transaction_base.h b/utilities/transactions/transaction_base.h index 171e13588..8edc81974 100644 --- a/utilities/transactions/transaction_base.h +++ b/utilities/transactions/transaction_base.h @@ -320,6 +320,13 @@ class TransactionBaseImpl : public Transaction { // Optimistic Transactions will wait till commit time to do conflict checking. TransactionKeyMap tracked_keys_; + protected: + // Whether to do key key tracking (in tracked_keys_). + // By default, key tracking is enabled. Pessimistic transactions with + // range locking don't do key tracking. + bool do_key_tracking_; + + private: // If true, future Put/Merge/Deletes will be indexed in the // WriteBatchWithIndex. // If false, future Put/Merge/Deletes will be inserted directly into the diff --git a/utilities/transactions/transaction_lock_mgr.cc b/utilities/transactions/transaction_lock_mgr.cc index ed382cefd..eef61e724 100644 --- a/utilities/transactions/transaction_lock_mgr.cc +++ b/utilities/transactions/transaction_lock_mgr.cc @@ -844,8 +844,7 @@ void RangeLockMgr::UnLock(const PessimisticTransaction* txn, toku::lock_request::retry_all_lock_requests(lt, nullptr /* lock_wait_needed_callback */); } -void RangeLockMgr::UnLockAll(const PessimisticTransaction* txn, - const TransactionKeyMap* key_map, Env* env) { +void RangeLockMgr::UnLockAll(const PessimisticTransaction* txn, Env* env) { // owned_locks may hold nullptr if the transaction has never acquired any // locks. diff --git a/utilities/transactions/transaction_lock_mgr.h b/utilities/transactions/transaction_lock_mgr.h index 8777983e4..f0b406ab5 100644 --- a/utilities/transactions/transaction_lock_mgr.h +++ b/utilities/transactions/transaction_lock_mgr.h @@ -212,8 +212,7 @@ class RangeLockMgr : Same as above, but *keys is guaranteed to hold all the locks obtained by the transaction. */ - void UnLockAll(const PessimisticTransaction* txn, const TransactionKeyMap* keys, - Env* env); + void UnLockAll(const PessimisticTransaction* txn, Env* env); void UnLock(PessimisticTransaction* txn, uint32_t column_family_id, const std::string& key, Env* env) override ;

1 0

[Commits] 83296053443: Update rocksdb submodule
by Sergei Petrunia 14 Jan '19

14 Jan '19

revision-id: 83296053443535732fcb5e2b0f46011bcb2aa9a0 (fb-prod201801-189-g83296053443) parent(s): b4bb2f5208cd8a587156b84f2b6b8af35c999f71 author: Sergei Petrunia committer: Sergei Petrunia timestamp: 2019-01-14 21:44:08 +0300 message: Update rocksdb submodule Make range lock escalation update transaction's list of owned locks --- rocksdb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rocksdb b/rocksdb index e3e66e6e0af..e4d7dbc4703 160000 --- a/rocksdb +++ b/rocksdb @@ -1 +1 @@ -Subproject commit e3e66e6e0af211cb2b963e4cd9c0539b746e0b8d +Subproject commit e4d7dbc47038638ed3d199c3d959ed5ead84f353

1 0

[Commits] e4d7dbc47: Make range lock escalation update transaction's list of owned locks
by Sergei Petrunia 14 Jan '19

14 Jan '19

revision-id: e4d7dbc47038638ed3d199c3d959ed5ead84f353 (v5.8-1025-ge4d7dbc47) parent(s): e3e66e6e0af211cb2b963e4cd9c0539b746e0b8d author: Sergei Petrunia committer: Sergei Petrunia timestamp: 2019-01-14 21:42:02 +0300 message: Make range lock escalation update transaction's list of owned locks --- utilities/transactions/transaction_lock_mgr.cc | 142 +++++++++++++++++-------- utilities/transactions/transaction_lock_mgr.h | 2 +- 2 files changed, 98 insertions(+), 46 deletions(-) diff --git a/utilities/transactions/transaction_lock_mgr.cc b/utilities/transactions/transaction_lock_mgr.cc index 395bcbaaf..ed382cefd 100644 --- a/utilities/transactions/transaction_lock_mgr.cc +++ b/utilities/transactions/transaction_lock_mgr.cc @@ -327,26 +327,36 @@ void RangeLockMgr::KillLockWait(void *cdata) We store them in toku::range_buffer because toku::locktree::release_locks() accepts that as an argument. - TODO: lock escalation in the lock table should affect this structure, too? + Note: the list of locks may differ slighly from the contents of the lock + tree, due to concurrency between lock acquisition, lock release, and lock + escalation. See MDEV-18227 and RangeLockMgr::UnLockAll for details. + This property is currently harmless. */ class RangeLockList: public PessimisticTransaction::LockStorage { public: - virtual ~RangeLockList() - { + virtual ~RangeLockList() { buffer.destroy(); } - RangeLockList() - { + RangeLockList() : releasing_locks(false) { buffer.create(); } void append(const DBT *left_key, const DBT *right_key) { + MutexLock l(&mutex_); + // there's only one thread that calls this function. + // the same thread will do lock release. + assert(!releasing_locks); buffer.append(left_key, right_key); } + /* Ranges that we are holding the locks on. */ toku::range_buffer buffer; + + /* Synchronization. See RangeLockMgr::UnLockAll for details */ + port::Mutex mutex_; + bool releasing_locks; }; // Get a range lock on [start_key; end_key] range @@ -364,8 +374,8 @@ Status RangeLockMgr::TryRangeLock(PessimisticTransaction* txn, toku_fill_dbt(&start_key_dbt, start_key.data(), start_key.size()); toku_fill_dbt(&end_key_dbt, end_key.data(), end_key.size()); - request.set(lt, txn->GetID(), &start_key_dbt, &end_key_dbt, toku::lock_request::WRITE, - false /* not a big txn */, (void*)txn->GetID() /*client_extra*/); + request.set(lt, (TXNID)txn, &start_key_dbt, &end_key_dbt, toku::lock_request::WRITE, + false /* not a big txn */, (void*)txn->GetID()/*client_extra, for KILL*/); uint64_t killed_time_msec = 0; // TODO: what should this have? uint64_t wait_time_msec = txn->GetLockTimeout(); @@ -806,7 +816,7 @@ range_lock_mgr_release_lock_int(toku::locktree *lt, toku::range_buffer range_buf; range_buf.create(); range_buf.append(&key_dbt, &key_dbt); - lt->release_locks(txn->GetID(), &range_buf); + lt->release_locks((TXNID)txn, &range_buf); range_buf.destroy(); } @@ -836,21 +846,6 @@ void RangeLockMgr::UnLock(const PessimisticTransaction* txn, void RangeLockMgr::UnLockAll(const PessimisticTransaction* txn, const TransactionKeyMap* key_map, Env* env) { -#if 0 - //TODO: collecting multiple locks into a buffer and then making one call - // to lock_tree::release_locks() will be faster. - for (auto& key_map_iter : *key_map) { - uint32_t column_family_id = key_map_iter.first; - auto& keys = key_map_iter.second; - - for (auto& key_iter : keys) { - const std::string& key = key_iter.first; - range_lock_mgr_release_lock_int(lt, txn, column_family_id, key, true); - } - } - - toku::lock_request::retry_all_lock_requests(lt, nullptr /* lock_wait_needed_callback */); -#endif // owned_locks may hold nullptr if the transaction has never acquired any // locks. @@ -858,33 +853,49 @@ void RangeLockMgr::UnLockAll(const PessimisticTransaction* txn, { RangeLockList* range_list= (RangeLockList*)txn->owned_locks.get(); + { + MutexLock l(&range_list->mutex_); + /* + The lt->release_locks() call below will walk range_list->buffer. We + need to prevent lock escalation callback from replacing + range_list->buffer while we are doing that. + + Additional complication here is internal mutex(es) in the locktree + (let's call them latches): + - Lock escalation first obtains latches on the lock tree + - Then, it calls RangeLockMgr::on_escalate to replace transaction's + range_list->buffer. + = Access to that buffer must be synchronized, so it will want to + acquire the range_list->mutex_. + + While in this function we would want to do the reverse: + - Acquire range_list->mutex_ to prevent access to the range_list. + - Then, lt->release_locks() call will walk through the range_list + - and acquire latches on parts of the lock tree to remove locks from + it. + + How do we avoid the deadlock? Thei ideas is that here we set + releasing_locks=true, and release the mutex. + All other users of the range_list must: + - Acquire the mutex, then check that releasing_locks=false. + (the code in this function doesnt do that as there's only one thread + that does lock release) + */ + range_list->releasing_locks= true; + } + // Don't try to call release_locks() if the buffer is empty! if we are - // not holding any locks, other transaction may be in STO-mode currently - // and our attempt to release an empty set of locks will cause an - // assertion failure. + // not holding any locks, the lock tree might be on STO-mode with another + // transaction, and our attempt to release an empty set of locks will + // cause an assertion failure. if (range_list->buffer.get_num_ranges()) - lt->release_locks(txn->GetID(), &range_list->buffer, true); + lt->release_locks((TXNID)txn, &range_list->buffer, true); range_list->buffer.destroy(); range_list->buffer.create(); - toku::lock_request::retry_all_lock_requests(lt, nullptr /* lock_wait_needed_callback */); - } + range_list->releasing_locks= false; -#if 0 - Original usage: - void release_locks(TXNID txnid, const range_buffer *ranges); - - // release all of the locks this txn has ever successfully - // acquired and stored in the range buffer for this locktree - lt->release_locks(txnid, ranges->buffer); - lt->get_manager()->note_mem_released(ranges->buffer->total_memory_size()); - ranges->buffer->destroy(); - toku_free(ranges->buffer); - - // all of our locks have been released, so first try to wake up - // pending lock requests, then release our reference on the lt toku::lock_request::retry_all_lock_requests(lt, nullptr /* lock_wait_needed_callback */); - -#endif + } } int RangeLockMgr::compare_dbt_endpoints(__toku_db*, void *arg, @@ -903,6 +914,46 @@ RangeLockMgr::RangeLockMgr(TransactionDB* txn_db) : my_txn_db(txn_db) lt= nullptr; } + +/* + @brief Lock Escalation Callback function + + @param txnid Transaction whose locks got escalated + @param lt Lock Tree where escalation is happening (currently there is only one) + @param buffer Escalation result: list of locks that this transaction now + owns in this lock tree. + @param extra Callback context +*/ + +void RangeLockMgr::on_escalate(TXNID txnid, const locktree *lt, + const range_buffer &buffer, void *extra) +{ + auto txn= (PessimisticTransaction*)txnid; + + RangeLockList* trx_locks= (RangeLockList*)txn->owned_locks.get(); + + MutexLock l(&trx_locks->mutex_); + if (trx_locks->releasing_locks) { + /* + Do nothing. The transaction is releasing its locks, so it will not care + about having a correct list of ranges. (In TokuDB, + toku_db_txn_escalate_callback() makes use of this property, too) + */ + return; + } + + // TODO: are we tracking this mem: lt->get_manager()->note_mem_released(trx_locks->ranges.buffer->total_memory_size()); + trx_locks->buffer.destroy(); + trx_locks->buffer.create(); + toku::range_buffer::iterator iter(&buffer); + toku::range_buffer::iterator::record rec; + while (iter.current(&rec)) { + trx_locks->buffer.append(rec.get_left_key(), rec.get_right_key()); + iter.next(); + } + // TODO: same as above: lt->get_manager()->note_mem_used(ranges.buffer->total_memory_size()); +} + void RangeLockMgr::set_endpoint_cmp_functions(convert_key_to_endpoint_func cvt_func, compare_endpoints_func cmp_func) { @@ -997,7 +1048,7 @@ struct LOCK_PRINT_CONTEXT { static void push_into_lock_status_data(void* param, const DBT *left, - const DBT *right, TXNID txnid) + const DBT *right, TXNID txnid_arg) { struct LOCK_PRINT_CONTEXT *ctx= (LOCK_PRINT_CONTEXT*)param; struct KeyLockInfo info; @@ -1013,6 +1064,7 @@ void push_into_lock_status_data(void* param, const DBT *left, info.key2.append((const char*)right->data, right->size); } + TXNID txnid= ((PessimisticTransaction*)txnid_arg)->GetID(); info.ids.push_back(txnid); ctx->data->insert({ctx->cfh_id, info}); } diff --git a/utilities/transactions/transaction_lock_mgr.h b/utilities/transactions/transaction_lock_mgr.h index 59234c26f..8777983e4 100644 --- a/utilities/transactions/transaction_lock_mgr.h +++ b/utilities/transactions/transaction_lock_mgr.h @@ -256,7 +256,7 @@ class RangeLockMgr : static int on_create(locktree *lt, void *extra) { return 0; /* no error */ } static void on_destroy(locktree *lt) {} static void on_escalate(TXNID txnid, const locktree *lt, - const range_buffer &buffer, void *extra) {} + const range_buffer &buffer, void *extra); };

1 0

[Commits] f953315: MDEV-5313 Improving audit api.
by holyfoot＠askmonty.org 14 Jan '19

14 Jan '19

revision-id: f953315f68e21c9a994c9c30d02589631e4778a7 (mariadb-10.4.1-75-gf953315) parent(s): 301bd62b2536f85a8ce418dcd5e705796d8c5763 committer: Alexey Botchkov timestamp: 2019-01-14 20:17:55 +0400 message: MDEV-5313 Improving audit api. The 'run query from plugin' proposal interface. Consists of a single function 'run_plugin_proc', that gets the 'stored function with no args returning TEXT' in plain string format, runs it and returns the TEXT result. --- plugin/server_audit/server_audit.c | 18 ++++++ sql/sp.cc | 120 +++++++++++++++++++++++++++++++++++++ 2 files changed, 138 insertions(+) diff --git a/plugin/server_audit/server_audit.c b/plugin/server_audit/server_audit.c index a9b4ff2..968d8b5 100644 --- a/plugin/server_audit/server_audit.c +++ b/plugin/server_audit/server_audit.c @@ -2325,6 +2325,23 @@ typedef struct loc_system_variables static int init_done= 0; +extern int run_plugin_proc(const char *proc, size_t proc_len, + char *result, size_t result_buf_len, size_t *result_len); + +static const char *sel0= + "CREATE DEFINER=`root`@`localhost` FUNCTION `lipi`() RETURNS TEXT\n" + "begin declare v TEXT; select concat('Value: ', s1) from lipi_t into v; return v; end"; + +int runselect() +{ + char buf[1024]; + size_t res_len; + int res; + + res= run_plugin_proc(sel0, strlen(sel0), buf, sizeof(buf), &res_len); + return res; +} + static int server_audit_init(void *p __attribute__((unused))) { if (!serv_ver) @@ -2433,6 +2450,7 @@ static int server_audit_init(void *p __attribute__((unused))) if (logging) start_logging(); + runselect(); init_done= 1; return 0; } diff --git a/sql/sp.cc b/sql/sp.cc index 6b38a0d..647f201 100644 --- a/sql/sp.cc +++ b/sql/sp.cc @@ -273,6 +273,7 @@ class Stored_routine_creation_ctx : public Stored_program_creation_ctx, : Stored_program_creation_ctx(thd) { } +public: Stored_routine_creation_ctx(CHARSET_INFO *client_cs, CHARSET_INFO *connection_cl, CHARSET_INFO *db_cl) @@ -3056,3 +3057,122 @@ LEX_CSTRING Sp_handler_function::empty_body_lex_cstring(sql_mode_t mode) const static LEX_CSTRING m_empty_body_ora= {STRING_WITH_LEN("AS BEGIN RETURN NULL; END")}; return mode & MODE_ORACLE ? m_empty_body_ora : m_empty_body_std; } + + +static Stored_routine_creation_ctx rs_ctx(&my_charset_bin, + &my_charset_bin, + &my_charset_bin); + +#include "sp_rcontext.h" //sp_rcontext declaration + +extern "C" int run_plugin_proc(const char *proc, size_t proc_len, + char *result, size_t result_buf_len, size_t *result_len) +{ + THD *thd= current_thd; + LEX *old_lex= thd->lex, newlex; + TABLE *dummy_table; + MEM_ROOT sp_mem_root; + String defstr(proc, proc_len, system_charset_info); + sql_mode_t sql_mode; + Sp_chistics chistics; + Query_arena *sp_query_arena; + Field *sp_result_field; + uchar result_buf[10]; + uchar null_buf[1]; + //Stored_program_creation_ctx *creation_ctx; + Sub_statement_state statement_state; + sp_rcontext *func_ctx= NULL; + String buf; + int err_status= 1; + + thd->lex= &newlex; + newlex.current_select= NULL; + + sql_mode= thd->variables.sql_mode; + + sp_head *pi= sp_compile(thd, &defstr, sql_mode, NULL, &rs_ctx); + { + /* Set current user as a definer. */ + CHARSET_INFO *cs= system_charset_info; + const char *user= thd->security_ctx->user; + const char *host= thd->security_ctx->host; + size_t res_length= (strlen(user)+strlen(host)+2) * cs->mbmaxlen; + if (buf.alloc((uint) res_length)) + goto error; + res_length= cs->cset->snprintf(cs, (char*)buf.ptr(), (uint) res_length, + "%s@%s", user, host); + buf.length(res_length); + pi->set_definer(buf.ptr(), buf.length()); + } + chistics.suid= SP_IS_SUID; + chistics.daccess= SP_CONTAINS_SQL; + chistics.agg_type= NOT_AGGREGATE; + pi->set_info(0, 0, chistics, sql_mode); + pi->set_creation_ctx(&rs_ctx); + pi->optimize(); + + newlex.set_trg_event_type_for_tables(); + thd->lex->sphead= NULL; + lex_end(thd->lex); + thd->lex= old_lex; + + /* Item_sp::Item_sp > */ + dummy_table= (TABLE*) thd->calloc(sizeof(TABLE) + sizeof(TABLE_SHARE) + + sizeof(Query_arena)); + dummy_table->s= (TABLE_SHARE*) (dummy_table + 1); + sp_query_arena= (Query_arena *) (dummy_table->s + 1); + memset(&sp_mem_root, 0, sizeof(sp_mem_root)); + /* < Item_sp::Item_sp */ + /* Item_sp::init_result_field > */ + /* + A Field needs to be attached to a Table. + Below we "create" a dummy table by initializing + the needed pointers. + */ + dummy_table->alias.set("", 0, table_alias_charset); + dummy_table->in_use= thd; + dummy_table->copy_blobs= TRUE; + dummy_table->s->table_cache_key= empty_clex_str; + dummy_table->s->table_name= empty_clex_str; + dummy_table->maybe_null= 1; + + if (!(sp_result_field= new (thd->mem_root) + Field_blob(result_buf, null_buf, 1, + Field::NONE, &empty_clex_str, + dummy_table->s, 2, &my_charset_latin1))) + goto error; + sp_result_field->init(dummy_table); + sp_result_field->null_bit= 1; //???? + + /* < Item_sp::init_result_field */ + + /* Item_sp::execute >*/ + thd->reset_sub_statement_state(&statement_state, SUB_STMT_FUNCTION); + init_sql_alloc(&sp_mem_root, "ap_query", MEM_ROOT_BLOCK_SIZE, 0, MYF(0)); + *sp_query_arena= Query_arena(&sp_mem_root, + Query_arena::STMT_INITIALIZED_FOR_SP); + + err_status= pi->execute_function(thd, NULL, 0, sp_result_field, + &func_ctx, sp_query_arena); + + delete func_ctx; + sp_query_arena->free_items(); + free_root(&sp_mem_root, MYF(0)); + + thd->restore_sub_statement_state(&statement_state); + sp_result_field->val_str(&buf); + *result_len= buf.length(); + if (buf.length() < result_buf_len) + result_buf_len= buf.length(); + + memcpy(result, buf.ptr(), result_buf_len); + + thd->lex->sphead= NULL; + lex_end(thd->lex); + thd->lex= old_lex; + + /* < Item_sp::execute */ +error: + return err_status; +} +

1 0

[Commits] aa6ea37b1e5: fix
by Oleksandr Byelkin 14 Jan '19

14 Jan '19

revision-id: aa6ea37b1e5e23d8f7364ba5afa0d66bf8eeb0f7 (mariadb-10.4.1-68-gaa6ea37b1e5) parent(s): fadbf04cdf19c9b144340f5d96d603df9597c8ef author: Oleksandr Byelkin committer: Oleksandr Byelkin timestamp: 2019-01-14 16:21:27 +0100 message: fix --- sql/sql_union.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sql/sql_union.cc b/sql/sql_union.cc index 7c3f390ce22..d563301a339 100644 --- a/sql/sql_union.cc +++ b/sql/sql_union.cc @@ -1502,7 +1502,7 @@ bool st_select_lex_unit::exec() } } if (found_rows_for_union && !sl->braces && - lim.is_unlimited()) + !lim.is_unlimited()) { /* This is a union without braces. Remember the number of rows that

1 0

[Commits] 6f7e2515907: Fix test failures
by jan 14 Jan '19

14 Jan '19

revision-id: 6f7e2515907576b0fc5738fb6cf932352b2dd4e9 (mariadb-10.3.6-299-g6f7e2515907) parent(s): f5769e497dd1d1b7355b92a0c51970a94726025c author: Jan Lindström committer: Jan Lindström timestamp: 2019-01-14 13:15:38 +0200 message: Fix test failures modified: mysql-test/suite/galera/r/galera_bf_abort_shutdown.result modified: mysql-test/suite/galera/r/galera_ist_innodb_flush_logs.result modified: mysql-test/suite/galera/t/galera_bf_abort_shutdown.test --- mysql-test/suite/galera/r/galera_bf_abort_shutdown.result | 3 +++ mysql-test/suite/galera/r/galera_ist_innodb_flush_logs.result | 2 ++ mysql-test/suite/galera/t/galera_bf_abort_shutdown.test | 10 ++++++++++ 3 files changed, 15 insertions(+) diff --git a/mysql-test/suite/galera/r/galera_bf_abort_shutdown.result b/mysql-test/suite/galera/r/galera_bf_abort_shutdown.result index 08833cbd503..fa2a5c373f2 100644 --- a/mysql-test/suite/galera/r/galera_bf_abort_shutdown.result +++ b/mysql-test/suite/galera/r/galera_bf_abort_shutdown.result @@ -1,5 +1,8 @@ connection node_2; connection node_1; +connection node_1; +connection node_2; +connection node_1; CREATE TABLE t1 (f1 INT PRIMARY KEY); connection node_2; SET DEBUG_SYNC = 'wsrep_before_certification WAIT_FOR continue'; diff --git a/mysql-test/suite/galera/r/galera_ist_innodb_flush_logs.result b/mysql-test/suite/galera/r/galera_ist_innodb_flush_logs.result index 481a85711be..cad00aaee48 100644 --- a/mysql-test/suite/galera/r/galera_ist_innodb_flush_logs.result +++ b/mysql-test/suite/galera/r/galera_ist_innodb_flush_logs.result @@ -1,3 +1,5 @@ +connection node_2; +connection node_1; Performing State Transfer on a server that has been killed and restarted connection node_1; CREATE TABLE t1 (f1 CHAR(255)) ENGINE=InnoDB; diff --git a/mysql-test/suite/galera/t/galera_bf_abort_shutdown.test b/mysql-test/suite/galera/t/galera_bf_abort_shutdown.test index 0980a1e0262..c7af8375b3f 100644 --- a/mysql-test/suite/galera/t/galera_bf_abort_shutdown.test +++ b/mysql-test/suite/galera/t/galera_bf_abort_shutdown.test @@ -9,6 +9,12 @@ --source include/galera_cluster.inc --source include/have_debug_sync.inc +# Save original auto_increment_offset values. +--let $node_1=node_1 +--let $node_2=node_2 +--source include/auto_increment_offset_save.inc + +--connection node_1 CREATE TABLE t1 (f1 INT PRIMARY KEY); --connection node_2 @@ -18,6 +24,10 @@ SET DEBUG_SYNC = 'wsrep_before_certification WAIT_FOR continue'; --connect node_2a, 127.0.0.1, root, , test, $NODE_MYPORT_2 --source include/restart_mysqld.inc +# Restore original auto_increment_offset values. +--let $node_2=node_2a +--source include/auto_increment_offset_restore.inc + --connection node_1 DROP TABLE t1;

1 0

[Commits] f5769e497dd: MDEV-17705: Review InnoDB changes on Galera 4 wsrep patch
by jan 14 Jan '19

14 Jan '19

revision-id: f5769e497dd1d1b7355b92a0c51970a94726025c (mariadb-10.3.6-298-gf5769e497dd) parent(s): 18279fc377e5c087e30a23b425f2c866a796f255 author: Jan Lindström committer: Jan Lindström timestamp: 2019-01-14 11:27:54 +0200 message: MDEV-17705: Review InnoDB changes on Galera 4 wsrep patch Remove unnecessary changes and fix coding style. modified: mysql-test/include/mtr_warnings.sql modified: mysql-test/suite/innodb/r/innodb-index-online-fk.result modified: mysql-test/suite/innodb/t/innodb-index-online-fk.test modified: storage/innobase/handler/ha_innodb.cc modified: storage/innobase/include/trx0trx.h modified: storage/innobase/row/row0sel.cc modified: storage/innobase/trx/trx0roll.cc modified: storage/innobase/trx/trx0rseg.cc modified: storage/innobase/trx/trx0trx.cc --- mysql-test/include/mtr_warnings.sql | 1 + mysql-test/suite/innodb/r/innodb-index-online-fk.result | 10 +++++----- mysql-test/suite/innodb/t/innodb-index-online-fk.test | 10 +++++----- storage/innobase/handler/ha_innodb.cc | 15 ++++++--------- storage/innobase/include/trx0trx.h | 4 ++-- storage/innobase/row/row0sel.cc | 4 +++- storage/innobase/trx/trx0roll.cc | 1 - storage/innobase/trx/trx0rseg.cc | 4 ++-- storage/innobase/trx/trx0trx.cc | 1 - 9 files changed, 24 insertions(+), 26 deletions(-) diff --git a/mysql-test/include/mtr_warnings.sql b/mysql-test/include/mtr_warnings.sql index 4cdc9868c22..524ea0f4859 100644 --- a/mysql-test/include/mtr_warnings.sql +++ b/mysql-test/include/mtr_warnings.sql @@ -229,6 +229,7 @@ INSERT INTO global_suppressions VALUES MDEV-12501 -- set --maturity-level by default */ ("Plugin .* is of maturity level .* while the server is .*"), + ("THE_LAST_SUPPRESSION")|| diff --git a/mysql-test/suite/innodb/r/innodb-index-online-fk.result b/mysql-test/suite/innodb/r/innodb-index-online-fk.result index 6ec5a72db25..47fc8e8b840 100644 --- a/mysql-test/suite/innodb/r/innodb-index-online-fk.result +++ b/mysql-test/suite/innodb/r/innodb-index-online-fk.result @@ -118,7 +118,7 @@ SELECT t2.name, t1.name FROM information_schema.innodb_sys_columns t1, informati name name test/child a1 test/child a2 -SELECT NAME FROM information_schema.INNODB_SYS_TABLES WHERE NAME NOT LIKE 'wsrep%'; +SELECT NAME FROM information_schema.INNODB_SYS_TABLES; NAME SYS_DATAFILES SYS_FOREIGN @@ -310,7 +310,7 @@ SELECT t2.name, t1.name FROM information_schema.innodb_sys_columns t1, informati name name test/child a1 test/child a2 -SELECT NAME FROM information_schema.INNODB_SYS_TABLES WHERE NAME NOT LIKE 'wsrep%'; +SELECT NAME FROM information_schema.INNODB_SYS_TABLES; NAME SYS_DATAFILES SYS_FOREIGN @@ -336,7 +336,7 @@ SELECT t2.name, t1.name FROM information_schema.innodb_sys_columns t1, informati name name test/child a2 test/child a3 -SELECT NAME FROM information_schema.INNODB_SYS_TABLES WHERE NAME NOT LIKE 'wsrep%'; +SELECT NAME FROM information_schema.INNODB_SYS_TABLES; NAME SYS_DATAFILES SYS_FOREIGN @@ -373,7 +373,7 @@ SELECT t2.name, t1.name FROM information_schema.innodb_sys_columns t1, informati name name test/child a1 test/child a2 -SELECT NAME FROM information_schema.INNODB_SYS_TABLES WHERE NAME NOT LIKE 'wsrep%'; +SELECT NAME FROM information_schema.INNODB_SYS_TABLES; NAME SYS_DATAFILES SYS_FOREIGN @@ -410,7 +410,7 @@ SELECT t2.name, t1.name FROM information_schema.innodb_sys_columns t1, informati name name test/child a2 test/child a3 -SELECT NAME FROM information_schema.INNODB_SYS_TABLES WHERE NAME NOT LIKE 'wsrep%'; +SELECT NAME FROM information_schema.INNODB_SYS_TABLES; NAME SYS_DATAFILES SYS_FOREIGN diff --git a/mysql-test/suite/innodb/t/innodb-index-online-fk.test b/mysql-test/suite/innodb/t/innodb-index-online-fk.test index dd185a9843a..5c8954064ce 100644 --- a/mysql-test/suite/innodb/t/innodb-index-online-fk.test +++ b/mysql-test/suite/innodb/t/innodb-index-online-fk.test @@ -105,7 +105,7 @@ SELECT * FROM information_schema.INNODB_SYS_FOREIGN_COLS; SELECT t2.name, t1.name FROM information_schema.innodb_sys_columns t1, information_schema.innodb_sys_tables t2 WHERE t1.table_id = t2.table_id AND t2.name LIKE "%child" ORDER BY t1.name; -SELECT NAME FROM information_schema.INNODB_SYS_TABLES WHERE NAME NOT LIKE 'wsrep%'; +SELECT NAME FROM information_schema.INNODB_SYS_TABLES; # this should succeed, since we disabled the foreign key check INSERT INTO child VALUES(5,4); @@ -287,7 +287,7 @@ SET DEBUG_DBUG = @saved_debug_dbug; SELECT * FROM INFORMATION_SCHEMA.INNODB_SYS_FOREIGN; SELECT * FROM INFORMATION_SCHEMA.INNODB_SYS_FOREIGN_COLS; SELECT t2.name, t1.name FROM information_schema.innodb_sys_columns t1, information_schema.innodb_sys_tables t2 WHERE t1.table_id = t2.table_id AND t2.name LIKE "%child" ORDER BY t1.name; -SELECT NAME FROM information_schema.INNODB_SYS_TABLES WHERE NAME NOT LIKE 'wsrep%'; +SELECT NAME FROM information_schema.INNODB_SYS_TABLES; # This should be successful. It will also check any left over # from previous failed operation (if dictionary entries not cleaned, @@ -300,7 +300,7 @@ ALGORITHM = INPLACE; SELECT * FROM INFORMATION_SCHEMA.INNODB_SYS_FOREIGN; SELECT * FROM INFORMATION_SCHEMA.INNODB_SYS_FOREIGN_COLS; SELECT t2.name, t1.name FROM information_schema.innodb_sys_columns t1, information_schema.innodb_sys_tables t2 WHERE t1.table_id = t2.table_id AND t2.name LIKE "%child" ORDER BY t1.name; -SELECT NAME FROM information_schema.INNODB_SYS_TABLES WHERE NAME NOT LIKE 'wsrep%'; +SELECT NAME FROM information_schema.INNODB_SYS_TABLES; SHOW CREATE TABLE child; @@ -317,7 +317,7 @@ ALGORITHM = INPLACE; SELECT * from information_schema.INNODB_SYS_FOREIGN; SELECT * from information_schema.INNODB_SYS_FOREIGN_COLS; SELECT t2.name, t1.name FROM information_schema.innodb_sys_columns t1, information_schema.innodb_sys_tables t2 WHERE t1.table_id = t2.table_id AND t2.name LIKE "%child" ORDER BY t1.name; -SELECT NAME FROM information_schema.INNODB_SYS_TABLES WHERE NAME NOT LIKE 'wsrep%'; +SELECT NAME FROM information_schema.INNODB_SYS_TABLES; SHOW CREATE TABLE child; @@ -333,7 +333,7 @@ ALGORITHM = INPLACE; SELECT * from information_schema.INNODB_SYS_FOREIGN; SELECT * from information_schema.INNODB_SYS_FOREIGN_COLS; SELECT t2.name, t1.name FROM information_schema.innodb_sys_columns t1, information_schema.innodb_sys_tables t2 WHERE t1.table_id = t2.table_id AND t2.name LIKE "%child" ORDER BY t1.name; -SELECT NAME FROM information_schema.INNODB_SYS_TABLES WHERE NAME NOT LIKE 'wsrep%'; +SELECT NAME FROM information_schema.INNODB_SYS_TABLES; SHOW CREATE TABLE child; diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc index c371f6b270c..fe3fee6d5d2 100644 --- a/storage/innobase/handler/ha_innodb.cc +++ b/storage/innobase/handler/ha_innodb.cc @@ -8207,8 +8207,8 @@ ha_innobase::write_row( if (wsrep_append_keys(m_user_thd, WSREP_SERVICE_KEY_EXCLUSIVE, record, NULL)) { - DBUG_PRINT("wsrep", ("row key failed")); - error_result = HA_ERR_INTERNAL_ERROR; + DBUG_PRINT("wsrep", ("row key failed")); + error_result = HA_ERR_INTERNAL_ERROR; goto wsrep_error; } } @@ -18609,7 +18609,7 @@ wsrep_innobase_kill_one_trx( * which is already marked as BF victim * lock_sys is held until this vicitm has aborted */ - victim_trx->lock.was_chosen_as_wsrep_victim= TRUE; + victim_trx->lock.was_chosen_as_wsrep_victim = TRUE; wsrep_thd_UNLOCK(thd); if (wsrep_thd_bf_abort(bf_thd, thd, signal)) @@ -18625,10 +18625,9 @@ wsrep_innobase_kill_one_trx( lock_cancel_waiting_and_release(wait_lock); } } - } - else { + } else { /* victim was not BF aborted, after all */ - victim_trx->lock.was_chosen_as_wsrep_victim= TRUE; + victim_trx->lock.was_chosen_as_wsrep_victim = TRUE; } DBUG_RETURN(0); @@ -18662,9 +18661,7 @@ wsrep_abort_transaction( lock_mutex_exit(); wsrep_srv_conc_cancel_wait(victim_trx); DBUG_RETURN(rcode); - } - else - { + } else { wsrep_thd_bf_abort(bf_thd, victim_thd, signal); } diff --git a/storage/innobase/include/trx0trx.h b/storage/innobase/include/trx0trx.h index 7ef5c624707..8bf64c28441 100644 --- a/storage/innobase/include/trx0trx.h +++ b/storage/innobase/include/trx0trx.h @@ -579,8 +579,8 @@ struct trx_lock_t { serving the running transaction. */ #ifdef WITH_WSREP bool was_chosen_as_wsrep_victim; - /*!< high priority wsrep thread has marked - this trx to abort */ + /*!< high priority wsrep thread has + marked this trx to abort */ #endif /* WITH_WSREP */ /** Pre-allocated record locks */ diff --git a/storage/innobase/row/row0sel.cc b/storage/innobase/row/row0sel.cc index 30b1666b4ae..80d84756724 100644 --- a/storage/innobase/row/row0sel.cc +++ b/storage/innobase/row/row0sel.cc @@ -54,7 +54,9 @@ Created 12/19/1997 Heikki Tuuri #include "buf0lru.h" #include "srv0srv.h" #include "srv0mon.h" -#include "ha_innodb.h" /* For wsrep_thd_skip_locking */ +#ifdef WITH_WSREP +#include "mysql/service_wsrep.h" /* For wsrep_thd_skip_locking */ +#endif /* Maximum number of rows to prefetch; MySQL interface has another parameter */ #define SEL_MAX_N_PREFETCH 16 diff --git a/storage/innobase/trx/trx0roll.cc b/storage/innobase/trx/trx0roll.cc index a33eb1fa0f9..22b72a14304 100644 --- a/storage/innobase/trx/trx0roll.cc +++ b/storage/innobase/trx/trx0roll.cc @@ -451,7 +451,6 @@ trx_rollback_to_savepoint_for_mysql_low( trx_mark_sql_stat_end(trx); trx->op_info = ""; - trx->lock.was_chosen_as_deadlock_victim = FALSE; #ifdef WITH_WSREP trx->lock.was_chosen_as_wsrep_victim = FALSE; #endif diff --git a/storage/innobase/trx/trx0rseg.cc b/storage/innobase/trx/trx0rseg.cc index 494c163ca9e..803a8e3f586 100644 --- a/storage/innobase/trx/trx0rseg.cc +++ b/storage/innobase/trx/trx0rseg.cc @@ -60,8 +60,8 @@ trx_rseg_update_wsrep_checkpoint( long long xid_seqno = wsrep_xid_seqno(xid); const byte* xid_uuid = wsrep_xid_uuid(xid); - if (!memcmp(xid_uuid, wsrep_uuid, sizeof wsrep_uuid) && - xid_seqno != -1) { + if (xid_seqno != -1 + && !memcmp(xid_uuid, wsrep_uuid, sizeof wsrep_uuid)) { ut_ad(xid_seqno > wsrep_seqno); } else { memcpy(wsrep_uuid, xid_uuid, sizeof wsrep_uuid); diff --git a/storage/innobase/trx/trx0trx.cc b/storage/innobase/trx/trx0trx.cc index 91613f9f6cc..e5de832ed5f 100644 --- a/storage/innobase/trx/trx0trx.cc +++ b/storage/innobase/trx/trx0trx.cc @@ -1441,7 +1441,6 @@ trx_commit_in_memory( trx_mutex_enter(trx); trx->dict_operation = TRX_DICT_OP_NONE; - trx->lock.was_chosen_as_deadlock_victim = FALSE; #ifdef WITH_WSREP trx->lock.was_chosen_as_wsrep_victim = FALSE; #endif

1 0

[Commits] 18279fc377e: Merge remote-tracking branch 'origin/10.4' into bb-10.4-galera4
by jan 14 Jan '19

14 Jan '19

revision-id: 18279fc377e5c087e30a23b425f2c866a796f255 (mariadb-10.3.6-297-g18279fc377e) parent(s): addba9c09d0295328ecd999e463f962824a3312b e7924a8598cbb785363ddd6489cb3c1210347f5f author: Jan Lindström committer: Jan Lindström timestamp: 2019-01-14 09:13:56 +0200 message: Merge remote-tracking branch 'origin/10.4' into bb-10.4-galera4 include/my_counter.h | 2 + mysql-test/include/have_auth_named_pipe.inc | 13 + mysql-test/main/max_password_errors.result | 45 ++ mysql-test/main/max_password_errors.test | 64 +++ mysql-test/main/mysqld--help.result | 5 + mysql-test/suite/galera/disabled.def | 8 +- mysql-test/suite/innodb/disabled.def | 1 - .../suite/innodb/r/alter_inplace_perfschema.result | 9 +- mysql-test/suite/innodb/r/instant_alter.result | 212 ++++++++- mysql-test/suite/innodb/r/instant_drop.result | 14 +- .../suite/innodb/t/alter_inplace_perfschema.test | 8 +- mysql-test/suite/innodb/t/instant_alter.test | 77 +++ mysql-test/suite/innodb/t/instant_drop.test | 11 +- .../r/max_password_errors_auth_named_pipe.result | 12 + .../r/max_password_errors_auth_socket.result | 12 + .../t/max_password_errors_auth_named_pipe.opt | 1 + .../t/max_password_errors_auth_named_pipe.test | 22 + .../plugins/t/max_password_errors_auth_socket.opt | 1 + .../plugins/t/max_password_errors_auth_socket.test | 23 + .../sys_vars/r/sysvars_server_embedded.result | 14 + .../sys_vars/r/sysvars_server_notembedded.result | 14 + scripts/wsrep_sst_mariabackup.sh | 21 +- sql/mysqld.cc | 1 + sql/mysqld.h | 1 + sql/share/errmsg-utf8.txt | 2 + sql/sql_acl.cc | 67 +++ sql/sys_vars.cc | 8 + storage/innobase/btr/btr0btr.cc | 70 +-- storage/innobase/btr/btr0bulk.cc | 2 +- storage/innobase/btr/btr0cur.cc | 19 +- storage/innobase/buf/buf0buf.cc | 36 +- storage/innobase/buf/buf0flu.cc | 159 ++----- storage/innobase/buf/buf0lru.cc | 2 +- storage/innobase/data/data0data.cc | 3 +- storage/innobase/handler/ha_innodb.cc | 13 +- storage/innobase/handler/handler0alter.cc | 9 +- storage/innobase/include/btr0btr.h | 4 +- storage/innobase/include/buf0buf.h | 44 +- storage/innobase/include/buf0buf.ic | 53 +-- storage/innobase/include/buf0flu.h | 12 - storage/innobase/include/buf0flu.ic | 79 +--- storage/innobase/include/ib0mutex.h | 23 +- storage/innobase/include/mtr0mtr.ic | 2 +- storage/innobase/include/srv0srv.h | 1 - storage/innobase/include/sync0policy.h | 522 ++++++++------------- storage/innobase/include/sync0policy.ic | 101 ---- storage/innobase/include/sync0rw.h | 1 - storage/innobase/include/sync0types.h | 30 -- storage/innobase/include/ut0mutex.h | 2 - storage/innobase/log/log0recv.cc | 2 +- storage/innobase/mtr/mtr0mtr.cc | 4 +- storage/innobase/os/os0event.cc | 2 +- storage/innobase/row/row0upd.cc | 2 +- storage/innobase/srv/srv0srv.cc | 11 +- storage/innobase/sync/sync0arr.cc | 26 +- storage/innobase/sync/sync0rw.cc | 24 +- storage/innobase/trx/trx0trx.cc | 4 +- 57 files changed, 981 insertions(+), 949 deletions(-) diff --cc mysql-test/suite/galera/disabled.def index 9a173a484c4,23c9b9d7b55..bf03a4c488d --- a/mysql-test/suite/galera/disabled.def +++ b/mysql-test/suite/galera/disabled.def @@@ -50,20 -50,6 +50,14 @@@ galera_pc_ignore_sb : MDEV-17357 Test f MW-328A : MDEV-17847 Galera test failure on MW-328[A|B|C] MW-328B : MDEV-17847 Galera test failure on MW-328[A|B|C] MW-328C : MDEV-17847 Galera test failure on MW-328[A|B|C] - galera_autoinc_sst_xtrabackup : xtrabackup is deprecated - galera_ist_xtrabackup-v2 : xtrabackup is deprecated - galera_sst_xtrabackup-v2_data_dir : xtrabackup is deprecated - galera_sst_xtrabackup-v2_encrypt_with_key : xtrabackup is deprecated - galera_sst_xtrabackup-v2-options : xtrabackup is deprecated - galera_ist_innodb_flush_logs : xtrabackup is deprecated - galera_sst_xtrabackup-v2 : xtrabackup is deprecated galera.galera_encrypt_tmp_files : Get error failed to enable encryption of temporary files galera.galera_var_reject_queries : assertion in inline_mysql_socket_send + query_cache : MDEV-18137: Galera test failure on query_cache +galera.galera_ist_mariabackup : Leaves port open +galera.galera_autoinc_sst_mariabackup : MDEV-18177 Galera test failure on galera_autoinc_sst_mariabackup +galera.galera_gtid_slave_sst_rsync: MDEV-18176 Galera test failure on galera.galera_gtid_slave_sst_rsync +galera.galera_sst_rsync2 : MDEV-18178 Galera test failure on galera_sst_rsync2 +galera.galera_kill_largechanges : MDEV-18179 Galera test failure on galera.galera_kill_largechanges +galera.galera_concurrent_ctas : MDEV-18180 Galera test failure on galera.galera_concurrent_ctas +galera.galera_var_retry_autocommit: MDEV-18181 Galera test failure on galera.galera_var_retry_autocommit +galera.galera_many_tables_nopk : MDEV-18182 Galera test failure on galera.galera_many_tables_nopk

1 0

[Commits] b4ea18300a0: Apply this patch from Percona Server:
by Sergei Petrunia 11 Jan '19

11 Jan '19

revision-id: b4ea18300a08bd6f8e35d2ffdaec41b58ae8fe3b (mariadb-10.3.12-7-gb4ea18300a0) parent(s): 82490a97dbbe1dfdf88ed6b9fee8974cf58c63e3 author: Sergei Petrunia committer: Sergei Petrunia timestamp: 2019-01-11 23:57:11 +0300 message: Apply this patch from Percona Server: commit cd7201514fee78aaf7d3eb2b28d2573c76f53b84 Author: Laurynas Biveinis <laurynas.biveinis(a)gmail.com> Date: Tue Nov 14 06:34:19 2017 +0200 Fix bug 1704195 / 87065 / TDB-83 (Stop ANALYZE TABLE from flushing table definition cache) Make ANALYZE TABLE stop flushing affected tables from the table definition cache, which has the effect of not blocking any subsequent new queries involving the table if there's a parallel long-running query: - new table flag HA_ONLINE_ANALYZE, return it for InnoDB and TokuDB tables; - in mysql_admin_table, if we are performing ANALYZE TABLE, and the table flag is set, do not remove the table from the table definition cache, do not invalidate query cache; - in partitioning handler, refresh the query optimizer statistics after ANALYZE if the underlying handler supports HA_ONLINE_ANALYZE; - new testcases main.percona_nonflushing_analyze_debug, parts.percona_nonflushing_abalyze_debug and a supporting debug sync point. For TokuDB, this change exposes bug TDB-83 (Index cardinality stats updated for handler::info(HA_STATUS_CONST), not often enough for tokudb_cardinality_scale_percent). TokuDB may return different rec_per_key values depending on dynamic variable tokudb_cardinality_scale_percent value. The server does not have a way of knowing that changing this variable invalidates the previous rec_per_key values in any opened table shares, and so does not call info(HA_STATUS_CONST) again. Fix by updating rec_per_key for both HA_STATUS_CONST and HA_STATUS_VARIABLE. This also forces a re-record of tokudb.bugs.db756_card_part_hash_1_pick, with the new output seeming to be more correct. --- .../include/percona_nonflushing_analyze_debug.inc | 32 +++++++++++ .../main/percona_nonflushing_analyze_debug.result | 25 +++++++++ .../main/percona_nonflushing_analyze_debug.test | 11 ++++ .../r/percona_nonflushing_analyze_debug.result | 62 ++++++++++++++++++++++ .../parts/t/percona_nonflushing_analyze_debug.test | 29 ++++++++++ sql/ha_partition.cc | 12 ++++- sql/handler.cc | 3 ++ sql/handler.h | 6 +++ sql/sql_admin.cc | 5 +- storage/innobase/handler/ha_innodb.cc | 1 + 10 files changed, 184 insertions(+), 2 deletions(-) diff --git a/mysql-test/include/percona_nonflushing_analyze_debug.inc b/mysql-test/include/percona_nonflushing_analyze_debug.inc new file mode 100644 index 00000000000..b2f6df51ab8 --- /dev/null +++ b/mysql-test/include/percona_nonflushing_analyze_debug.inc @@ -0,0 +1,32 @@ +# +# Test ANALYZE TABLE that does not flush table definition cache +# Arguments: +# $percona_nonflushing_analyze_table - table to test +# + +--source include/count_sessions.inc + +--connect con1,localhost,root + +SET DEBUG_SYNC="handler_ha_index_next_end SIGNAL idx_scan_in_progress WAIT_FOR finish_scan"; + +send_eval SELECT * FROM $percona_nonflushing_analyze_table; + +--connection default + +SET DEBUG_SYNC="now WAIT_FOR idx_scan_in_progress"; + +eval ANALYZE TABLE $percona_nonflushing_analyze_table; + +# With the bug fixed this should not block +eval SELECT * FROM $percona_nonflushing_analyze_table; + +SET DEBUG_SYNC="now SIGNAL finish_scan"; + +--connection con1 +reap; +--disconnect con1 +--connection default +SET DEBUG_SYNC='reset'; + +--source include/wait_until_count_sessions.inc diff --git a/mysql-test/main/percona_nonflushing_analyze_debug.result b/mysql-test/main/percona_nonflushing_analyze_debug.result new file mode 100644 index 00000000000..f78888f1918 --- /dev/null +++ b/mysql-test/main/percona_nonflushing_analyze_debug.result @@ -0,0 +1,25 @@ +CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=InnoDB; +INSERT INTO t1 VALUES (1), (2), (3); +connect con1,localhost,root; +SET DEBUG_SYNC="handler_ha_index_next_end SIGNAL idx_scan_in_progress WAIT_FOR finish_scan"; +SELECT * FROM t1; +connection default; +SET DEBUG_SYNC="now WAIT_FOR idx_scan_in_progress"; +ANALYZE TABLE t1; +Table Op Msg_type Msg_text +test.t1 analyze status OK +SELECT * FROM t1; +a +1 +2 +3 +SET DEBUG_SYNC="now SIGNAL finish_scan"; +connection con1; +a +1 +2 +3 +disconnect con1; +connection default; +SET DEBUG_SYNC='reset'; +DROP TABLE t1; diff --git a/mysql-test/main/percona_nonflushing_analyze_debug.test b/mysql-test/main/percona_nonflushing_analyze_debug.test new file mode 100644 index 00000000000..6d5962ae8a0 --- /dev/null +++ b/mysql-test/main/percona_nonflushing_analyze_debug.test @@ -0,0 +1,11 @@ +--source include/have_debug_sync.inc +--source include/have_innodb.inc + +CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=InnoDB; +INSERT INTO t1 VALUES (1), (2), (3); + +--let $percona_nonflushing_analyze_table= t1 +--source include/percona_nonflushing_analyze_debug.inc + +DROP TABLE t1; + diff --git a/mysql-test/suite/parts/r/percona_nonflushing_analyze_debug.result b/mysql-test/suite/parts/r/percona_nonflushing_analyze_debug.result new file mode 100644 index 00000000000..f4ee86d7620 --- /dev/null +++ b/mysql-test/suite/parts/r/percona_nonflushing_analyze_debug.result @@ -0,0 +1,62 @@ +CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=InnoDB +PARTITION BY RANGE (a) ( +PARTITION p0 VALUES LESS THAN (3), +PARTITION p1 VALUES LESS THAN (10)); +INSERT INTO t1 VALUES (1), (2), (3), (4); +connect con1,localhost,root; +SET DEBUG_SYNC="handler_ha_index_next_end SIGNAL idx_scan_in_progress WAIT_FOR finish_scan"; +SELECT * FROM t1; +connection default; +SET DEBUG_SYNC="now WAIT_FOR idx_scan_in_progress"; +ANALYZE TABLE t1; +Table Op Msg_type Msg_text +test.t1 analyze status OK +SELECT * FROM t1; +a +1 +2 +3 +4 +SET DEBUG_SYNC="now SIGNAL finish_scan"; +connection con1; +a +1 +2 +3 +4 +disconnect con1; +connection default; +SET DEBUG_SYNC='reset'; +DROP TABLE t1; +CREATE TABLE t2 (a INT PRIMARY KEY) ENGINE=InnoDB +PARTITION BY RANGE (a) +SUBPARTITION BY HASH (A) +SUBPARTITIONS 2 ( +PARTITION p0 VALUES LESS THAN (3), +PARTITION p1 VALUES LESS THAN (10)); +INSERT INTO t2 VALUES (1), (2), (3), (4); +connect con1,localhost,root; +SET DEBUG_SYNC="handler_ha_index_next_end SIGNAL idx_scan_in_progress WAIT_FOR finish_scan"; +SELECT * FROM t2; +connection default; +SET DEBUG_SYNC="now WAIT_FOR idx_scan_in_progress"; +ANALYZE TABLE t2; +Table Op Msg_type Msg_text +test.t2 analyze status OK +SELECT * FROM t2; +a +1 +2 +3 +4 +SET DEBUG_SYNC="now SIGNAL finish_scan"; +connection con1; +a +1 +2 +3 +4 +disconnect con1; +connection default; +SET DEBUG_SYNC='reset'; +DROP TABLE t2; diff --git a/mysql-test/suite/parts/t/percona_nonflushing_analyze_debug.test b/mysql-test/suite/parts/t/percona_nonflushing_analyze_debug.test new file mode 100644 index 00000000000..61c0a278ebb --- /dev/null +++ b/mysql-test/suite/parts/t/percona_nonflushing_analyze_debug.test @@ -0,0 +1,29 @@ +--source include/have_debug_sync.inc +--source include/have_innodb.inc +--source include/have_partition.inc + +CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=InnoDB + PARTITION BY RANGE (a) ( + PARTITION p0 VALUES LESS THAN (3), + PARTITION p1 VALUES LESS THAN (10)); + +INSERT INTO t1 VALUES (1), (2), (3), (4); + +--let $percona_nonflushing_analyze_table= t1 +--source include/percona_nonflushing_analyze_debug.inc + +DROP TABLE t1; + +CREATE TABLE t2 (a INT PRIMARY KEY) ENGINE=InnoDB + PARTITION BY RANGE (a) + SUBPARTITION BY HASH (A) + SUBPARTITIONS 2 ( + PARTITION p0 VALUES LESS THAN (3), + PARTITION p1 VALUES LESS THAN (10)); + +INSERT INTO t2 VALUES (1), (2), (3), (4); + +--let $percona_nonflushing_analyze_table= t2 +--source include/percona_nonflushing_analyze_debug.inc + +DROP TABLE t2; diff --git a/sql/ha_partition.cc b/sql/ha_partition.cc index 1349571a3f8..361dacb51f4 100644 --- a/sql/ha_partition.cc +++ b/sql/ha_partition.cc @@ -1162,7 +1162,17 @@ int ha_partition::analyze(THD *thd, HA_CHECK_OPT *check_opt) { DBUG_ENTER("ha_partition::analyze"); - DBUG_RETURN(handle_opt_partitions(thd, check_opt, ANALYZE_PARTS)); + int result= handle_opt_partitions(thd, check_opt, ANALYZE_PARTS); + + if ((result == 0) && m_file[0] + && (m_file[0]->ha_table_flags() & HA_ONLINE_ANALYZE)) + { + /* If this is ANALYZE TABLE that will not force table definition cache + eviction, update statistics for the partition handler. */ + this->info(HA_STATUS_CONST | HA_STATUS_VARIABLE | HA_STATUS_NO_LOCK); + } + + DBUG_RETURN(result); } diff --git a/sql/handler.cc b/sql/handler.cc index 897d468f2ba..08735f284d8 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -2880,6 +2880,9 @@ int handler::ha_index_next(uchar * buf) table->update_virtual_fields(this, VCOL_UPDATE_FOR_READ); } table->status=result ? STATUS_NOT_FOUND: 0; + + DEBUG_SYNC(ha_thd(), "handler_ha_index_next_end"); + DBUG_RETURN(result); } diff --git a/sql/handler.h b/sql/handler.h index a4e81ea0365..2e469e23e04 100644 --- a/sql/handler.h +++ b/sql/handler.h @@ -304,6 +304,12 @@ enum enum_alter_inplace_result { /* Engine wants primary keys for everything except sequences */ #define HA_WANTS_PRIMARY_KEY (1ULL << 55) +/* + There is no need to evict the table from the table definition cache having + run ANALYZE TABLE on it + */ +#define HA_ONLINE_ANALYZE (1ULL << 56) + /* bits in index_flags(index_number) for what you can do with index */ #define HA_READ_NEXT 1 /* TODO really use this flag */ #define HA_READ_PREV 2 /* supports ::index_prev */ diff --git a/sql/sql_admin.cc b/sql/sql_admin.cc index c17567e6a89..221220ba3d4 100644 --- a/sql/sql_admin.cc +++ b/sql/sql_admin.cc @@ -1143,6 +1143,9 @@ static bool mysql_admin_table(THD* thd, TABLE_LIST* tables, } if (table->table && !table->view) { + const bool skip_flush= + (operator_func == &handler::ha_analyze) + && (table->table->file->ha_table_flags() & HA_ONLINE_ANALYZE); if (table->table->s->tmp_table) { /* @@ -1152,7 +1155,7 @@ static bool mysql_admin_table(THD* thd, TABLE_LIST* tables, if (open_for_modify && !open_error) table->table->file->info(HA_STATUS_CONST); } - else if (open_for_modify || fatal_error) + else if ((!skip_flush && open_for_modify) || fatal_error) { tdc_remove_table(thd, TDC_RT_REMOVE_UNUSED, table->db.str, table->table_name.str, FALSE); diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc index 84ae2580e4f..94b533f6b06 100644 --- a/storage/innobase/handler/ha_innodb.cc +++ b/storage/innobase/handler/ha_innodb.cc @@ -2912,6 +2912,7 @@ ha_innobase::ha_innobase( | HA_CAN_FULLTEXT_HINTS */ | HA_CAN_EXPORT + | HA_ONLINE_ANALYZE | HA_CAN_RTREEKEYS | HA_CAN_TABLES_WITHOUT_ROLLBACK | HA_CONCURRENT_OPTIMIZE

1 0