mirror of
https://github.com/MariaDB/server.git
synced 2026-05-16 20:07:13 +02:00
Merge InnoDB 5.7 from mysql-5.7.9.
Contains also
MDEV-10547: Test multi_update_innodb fails with InnoDB 5.7
The failure happened because 5.7 has changed the signature of
the bool handler::primary_key_is_clustered() const
virtual function ("const" was added). InnoDB was using the old
signature which caused the function not to be used.
MDEV-10550: Parallel replication lock waits/deadlock handling does not work with InnoDB 5.7
Fixed mutexing problem on lock_trx_handle_wait. Note that
rpl_parallel and rpl_optimistic_parallel tests still
fail.
MDEV-10156 : Group commit tests fail on 10.2 InnoDB (branch bb-10.2-jan)
Reason: incorrect merge
MDEV-10550: Parallel replication can't sync with master in InnoDB 5.7 (branch bb-10.2-jan)
Reason: incorrect merge
This commit is contained in:
Jan Lindström
parent
848d211c5c
commit
2e814d4702
835 changed files with 173885 additions and 83591 deletions
224
storage/innobase/include/lock0prdt.h
Normal file
224
storage/innobase/include/lock0prdt.h
Normal file
|
|
@ -0,0 +1,224 @@
|
|||
/*****************************************************************************
|
||||
|
||||
Copyright (c) 2014, Oracle and/or its affiliates. All Rights Reserved.
|
||||
|
||||
This program is free software; you can redistribute it and/or modify it under
|
||||
the terms of the GNU General Public License as published by the Free Software
|
||||
Foundation; version 2 of the License.
|
||||
|
||||
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 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, Inc.,
|
||||
51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA
|
||||
|
||||
*****************************************************************************/
|
||||
|
||||
/**************************************************//**
|
||||
@file include/lock0prdt.h
|
||||
The predicate lock system
|
||||
|
||||
Created 9/7/2013 Jimmy Yang
|
||||
*******************************************************/
|
||||
#ifndef lock0prdt_h
|
||||
#define lock0prdt_h
|
||||
|
||||
#include "univ.i"
|
||||
#include "lock0lock.h"
|
||||
|
||||
/* Predicate lock data */
|
||||
typedef struct lock_prdt {
|
||||
void* data; /* Predicate data */
|
||||
uint16 op; /* Predicate operator */
|
||||
} lock_prdt_t;
|
||||
|
||||
/*********************************************************************//**
|
||||
Acquire a predicate lock on a block
|
||||
@return DB_SUCCESS, DB_LOCK_WAIT, DB_DEADLOCK, or DB_QUE_THR_SUSPENDED */
|
||||
dberr_t
|
||||
lock_prdt_lock(
|
||||
/*===========*/
|
||||
buf_block_t* block, /*!< in/out: buffer block of rec */
|
||||
lock_prdt_t* prdt, /*!< in: Predicate for the lock */
|
||||
dict_index_t* index, /*!< in: secondary index */
|
||||
enum lock_mode mode, /*!< in: mode of the lock which
|
||||
the read cursor should set on
|
||||
records: LOCK_S or LOCK_X; the
|
||||
latter is possible in
|
||||
SELECT FOR UPDATE */
|
||||
ulint type_mode,
|
||||
/*!< in: LOCK_PREDICATE or LOCK_PRDT_PAGE */
|
||||
que_thr_t* thr, /*!< in: query thread
|
||||
(can be NULL if BTR_NO_LOCKING_FLAG) */
|
||||
mtr_t* mtr); /*!< in/out: mini-transaction */
|
||||
|
||||
/*********************************************************************//**
|
||||
Acquire a "Page" lock on a block
|
||||
@return DB_SUCCESS, DB_LOCK_WAIT, DB_DEADLOCK, or DB_QUE_THR_SUSPENDED */
|
||||
dberr_t
|
||||
lock_place_prdt_page_lock(
|
||||
/*======================*/
|
||||
ulint space, /*!< in: space for the page to lock */
|
||||
ulint pageno, /*!< in: page number */
|
||||
dict_index_t* index, /*!< in: secondary index */
|
||||
que_thr_t* thr); /*!< in: query thread */
|
||||
|
||||
/*********************************************************************//**
|
||||
Checks two predicate locks are compatible with each other
|
||||
@return true if conflicts */
|
||||
bool
|
||||
lock_prdt_consistent(
|
||||
/*=================*/
|
||||
lock_prdt_t* prdt1, /*!< in: Predicate for the lock */
|
||||
lock_prdt_t* prdt2, /*!< in: Predicate for the lock */
|
||||
ulint op); /*!< in: Predicate comparison operator */
|
||||
|
||||
/*********************************************************************//**
|
||||
Initiate a Predicate lock from a MBR */
|
||||
void
|
||||
lock_init_prdt_from_mbr(
|
||||
/*====================*/
|
||||
lock_prdt_t* prdt, /*!< in/out: predicate to initialized */
|
||||
rtr_mbr_t* mbr, /*!< in: Minimum Bounding Rectangle */
|
||||
ulint mode, /*!< in: Search mode */
|
||||
mem_heap_t* heap); /*!< in: heap for allocating memory */
|
||||
|
||||
/*********************************************************************//**
|
||||
Get predicate lock's minimum bounding box
|
||||
@return the minimum bounding box*/
|
||||
lock_prdt_t*
|
||||
lock_get_prdt_from_lock(
|
||||
/*====================*/
|
||||
const lock_t* lock); /*!< in: the lock */
|
||||
|
||||
/*********************************************************************//**
|
||||
Checks if a predicate lock request for a new lock has to wait for
|
||||
request lock2.
|
||||
@return true if new lock has to wait for lock2 to be removed */
|
||||
bool
|
||||
lock_prdt_has_to_wait(
|
||||
/*==================*/
|
||||
const trx_t* trx, /*!< in: trx of new lock */
|
||||
ulint type_mode,/*!< in: precise mode of the new lock
|
||||
to set: LOCK_S or LOCK_X, possibly
|
||||
ORed to LOCK_PREDICATE or LOCK_PRDT_PAGE,
|
||||
LOCK_INSERT_INTENTION */
|
||||
lock_prdt_t* prdt, /*!< in: lock predicate to check */
|
||||
const lock_t* lock2); /*!< in: another record lock; NOTE that
|
||||
it is assumed that this has a lock bit
|
||||
set on the same record as in the new
|
||||
lock we are setting */
|
||||
|
||||
/**************************************************************//**
|
||||
Update predicate lock when page splits */
|
||||
void
|
||||
lock_prdt_update_split(
|
||||
/*===================*/
|
||||
buf_block_t* block, /*!< in/out: page to be split */
|
||||
buf_block_t* new_block, /*!< in/out: the new half page */
|
||||
lock_prdt_t* prdt, /*!< in: MBR on the old page */
|
||||
lock_prdt_t* new_prdt, /*!< in: MBR on the new page */
|
||||
ulint space, /*!< in: space id */
|
||||
ulint page_no); /*!< in: page number */
|
||||
|
||||
/**************************************************************//**
|
||||
Ajust locks from an ancester page of Rtree on the appropriate level . */
|
||||
void
|
||||
lock_prdt_update_parent(
|
||||
/*====================*/
|
||||
buf_block_t* left_block, /*!< in/out: page to be split */
|
||||
buf_block_t* right_block, /*!< in/out: the new half page */
|
||||
lock_prdt_t* left_prdt, /*!< in: MBR on the old page */
|
||||
lock_prdt_t* right_prdt, /*!< in: MBR on the new page */
|
||||
lock_prdt_t* parent_prdt, /*!< in: original parent MBR */
|
||||
ulint space, /*!< in: space id */
|
||||
ulint page_no); /*!< in: page number */
|
||||
|
||||
/*********************************************************************//**
|
||||
Checks if locks of other transactions prevent an immediate insert of
|
||||
a predicate record.
|
||||
@return DB_SUCCESS, DB_LOCK_WAIT, DB_DEADLOCK, or DB_QUE_THR_SUSPENDED */
|
||||
dberr_t
|
||||
lock_prdt_insert_check_and_lock(
|
||||
/*============================*/
|
||||
ulint flags, /*!< in: if BTR_NO_LOCKING_FLAG bit is
|
||||
set, does nothing */
|
||||
const rec_t* rec, /*!< in: record after which to insert */
|
||||
buf_block_t* block, /*!< in/out: buffer block of rec */
|
||||
dict_index_t* index, /*!< in: index */
|
||||
que_thr_t* thr, /*!< in: query thread */
|
||||
mtr_t* mtr, /*!< in/out: mini-transaction */
|
||||
lock_prdt_t* prdt); /*!< in: Minimum Bound Rectangle */
|
||||
|
||||
/*********************************************************************//**
|
||||
Append a predicate to the lock */
|
||||
void
|
||||
lock_prdt_set_prdt(
|
||||
/*===============*/
|
||||
lock_t* lock, /*!< in: lock */
|
||||
const lock_prdt_t* prdt); /*!< in: Predicate */
|
||||
|
||||
#if 0
|
||||
|
||||
/*********************************************************************//**
|
||||
Checks if a predicate lock request for a new lock has to wait for
|
||||
request lock2.
|
||||
@return true if new lock has to wait for lock2 to be removed */
|
||||
UNIV_INLINE
|
||||
bool
|
||||
lock_prdt_has_to_wait(
|
||||
/*==================*/
|
||||
const trx_t* trx, /*!< in: trx of new lock */
|
||||
ulint type_mode,/*!< in: precise mode of the new lock
|
||||
to set: LOCK_S or LOCK_X, possibly
|
||||
ORed to LOCK_PREDICATE or LOCK_PRDT_PAGE,
|
||||
LOCK_INSERT_INTENTION */
|
||||
lock_prdt_t* prdt, /*!< in: lock predicate to check */
|
||||
const lock_t* lock2); /*!< in: another record lock; NOTE that
|
||||
it is assumed that this has a lock bit
|
||||
set on the same record as in the new
|
||||
lock we are setting */
|
||||
|
||||
/*********************************************************************//**
|
||||
Get predicate lock's minimum bounding box
|
||||
@return the minimum bounding box*/
|
||||
UNIV_INLINE
|
||||
rtr_mbr_t*
|
||||
prdt_get_mbr_from_prdt(
|
||||
/*===================*/
|
||||
const lock_prdt_t* prdt); /*!< in: the lock predicate */
|
||||
|
||||
|
||||
#endif
|
||||
/*************************************************************//**
|
||||
Moves the locks of a record to another record and resets the lock bits of
|
||||
the donating record. */
|
||||
void
|
||||
lock_prdt_rec_move(
|
||||
/*===============*/
|
||||
const buf_block_t* receiver, /*!< in: buffer block containing
|
||||
the receiving record */
|
||||
const buf_block_t* donator); /*!< in: buffer block containing
|
||||
the donating record */
|
||||
|
||||
/*********************************************************************//**
|
||||
Check whether there are R-tree Page lock on a buffer page
|
||||
@return true if there is none */
|
||||
bool
|
||||
lock_test_prdt_page_lock(
|
||||
/*=====================*/
|
||||
ulint space, /*!< in: space id for the page */
|
||||
ulint page_no); /*!< in: page number */
|
||||
|
||||
/*************************************************************//**
|
||||
Removes predicate lock objects set on an index page which is discarded. */
|
||||
void
|
||||
lock_prdt_free_from_discard_page(
|
||||
/*=============================*/
|
||||
const buf_block_t* block, /*!< in: page to be discarded */
|
||||
hash_table_t* lock_hash);
|
||||
/*!< in: lock hash */
|
||||
|
||||
#endif
|
||||
Loading…
Add table
Add a link
Reference in a new issue