Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
3dabe637
Commit
3dabe637
authored
Jan 04, 2021
by
Marko Mäkelä
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Clarify some comments
parent
6268bdad
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
19 additions
and
21 deletions
+19
-21
storage/innobase/buf/buf0buf.cc
storage/innobase/buf/buf0buf.cc
+8
-8
storage/innobase/include/buf0buf.h
storage/innobase/include/buf0buf.h
+8
-8
storage/innobase/trx/trx0trx.cc
storage/innobase/trx/trx0trx.cc
+3
-5
No files found.
storage/innobase/buf/buf0buf.cc
View file @
3dabe637
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
Copyright (c) 1995, 2018, Oracle and/or its affiliates. All Rights Reserved.
Copyright (c) 1995, 2018, Oracle and/or its affiliates. All Rights Reserved.
Copyright (c) 2008, Google Inc.
Copyright (c) 2008, Google Inc.
Copyright (c) 2013, 202
0
, MariaDB Corporation.
Copyright (c) 2013, 202
1
, MariaDB Corporation.
Portions of this file contain modifications contributed and copyrighted by
Portions of this file contain modifications contributed and copyrighted by
Google, Inc. Those modifications are gratefully acknowledged and are described
Google, Inc. Those modifications are gratefully acknowledged and are described
...
@@ -3436,13 +3436,13 @@ buf_page_optimistic_get(
...
@@ -3436,13 +3436,13 @@ buf_page_optimistic_get(
return
(
TRUE
);
return
(
TRUE
);
}
}
/**
Given a tablespace id and page number tries to get that page. If the
/**
Try to U-latch a page.
page is not in the buffer pool it is not loaded and NULL is returned
.
Suitable for using when holding the lock_sys latches (as it avoids deadlock)
.
Suitable for using when holding the lock_sys_t::mutex.
@param[in] page_id page identifier
@param[in
] page_id page id
@param[in
,out] mtr mini-transaction
@
param[in] mtr mini-transaction
@
return the block
@ret
urn pointer to a page or NULL
*/
@ret
val nullptr if an U-latch cannot be granted immediately
*/
buf_block_t
*
buf_page_try_get
(
const
page_id_t
page_id
,
mtr_t
*
mtr
)
buf_block_t
*
buf_page_try_get
(
const
page_id_t
page_id
,
mtr_t
*
mtr
)
{
{
ut_ad
(
mtr
);
ut_ad
(
mtr
);
ut_ad
(
mtr
->
is_active
());
ut_ad
(
mtr
->
is_active
());
...
...
storage/innobase/include/buf0buf.h
View file @
3dabe637
/*****************************************************************************
/*****************************************************************************
Copyright (c) 1995, 2016, Oracle and/or its affiliates. All Rights Reserved.
Copyright (c) 1995, 2016, Oracle and/or its affiliates. All Rights Reserved.
Copyright (c) 2013, 202
0
, MariaDB Corporation.
Copyright (c) 2013, 202
1
, MariaDB Corporation.
This program is free software; you can redistribute it and/or modify it under
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
the terms of the GNU General Public License as published by the Free Software
...
@@ -232,13 +232,13 @@ buf_page_optimistic_get(
...
@@ -232,13 +232,13 @@ buf_page_optimistic_get(
ib_uint64_t
modify_clock
,
/*!< in: modify clock value */
ib_uint64_t
modify_clock
,
/*!< in: modify clock value */
mtr_t
*
mtr
);
/*!< in: mini-transaction */
mtr_t
*
mtr
);
/*!< in: mini-transaction */
/**
Given a tablespace id and page number tries to get that page. If the
/**
Try to U-latch a page.
page is not in the buffer pool it is not loaded and NULL is returned
.
Suitable for using when holding the lock_sys latches (as it avoids deadlock)
.
Suitable for using when holding the lock_sys_t::mutex.
@param[in] page_id page identifier
@param[in
] page_id page id
@param[in
,out] mtr mini-transaction
@
param[in] mtr mini-transaction
@
return the block
@ret
urn pointer to a page or NULL
*/
@ret
val nullptr if an U-latch cannot be granted immediately
*/
buf_block_t
*
buf_page_try_get
(
const
page_id_t
page_id
,
mtr_t
*
mtr
);
buf_block_t
*
buf_page_try_get
(
const
page_id_t
page_id
,
mtr_t
*
mtr
);
/** Get read access to a compressed page (usually of type
/** Get read access to a compressed page (usually of type
FIL_PAGE_TYPE_ZBLOB or FIL_PAGE_TYPE_ZBLOB2).
FIL_PAGE_TYPE_ZBLOB or FIL_PAGE_TYPE_ZBLOB2).
...
...
storage/innobase/trx/trx0trx.cc
View file @
3dabe637
/*****************************************************************************
/*****************************************************************************
Copyright (c) 1996, 2016, Oracle and/or its affiliates. All Rights Reserved.
Copyright (c) 1996, 2016, Oracle and/or its affiliates. All Rights Reserved.
Copyright (c) 2015, 202
0
, MariaDB Corporation.
Copyright (c) 2015, 202
1
, MariaDB Corporation.
This program is free software; you can redistribute it and/or modify it under
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
the terms of the GNU General Public License as published by the Free Software
...
@@ -1323,10 +1323,8 @@ inline void trx_t::commit_in_memory(const mtr_t *mtr)
...
@@ -1323,10 +1323,8 @@ inline void trx_t::commit_in_memory(const mtr_t *mtr)
ut_a
(
!
is_recovered
);
ut_a
(
!
is_recovered
);
ut_ad
(
!
rsegs
.
m_redo
.
rseg
);
ut_ad
(
!
rsegs
.
m_redo
.
rseg
);
/* Note: We are asserting without holding the lock mutex. But
/* Note: We do not have to hold any lock_sys latch here, because
that is OK because this transaction is not waiting and cannot
this is a non-locking transaction. */
be rolled back and no new locks can (or should) be added
because it is flagged as a non-locking read-only transaction. */
ut_a
(
UT_LIST_GET_LEN
(
lock
.
trx_locks
)
==
0
);
ut_a
(
UT_LIST_GET_LEN
(
lock
.
trx_locks
)
==
0
);
/* This state change is not protected by any mutex, therefore
/* This state change is not protected by any mutex, therefore
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment