Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PG-799: Implement smgr GUC variable and chaining #23

Open
wants to merge 1 commit into
base: TDE_REL_17_STABLE
Choose a base branch
from
Open

PG-799: Implement smgr GUC variable and chaining #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/backend/postmaster/postmaster.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -917,6 +917,8 @@ PostmasterMain(int argc, char *argv[])
*/
process_shared_preload_libraries();

process_smgr_chain();

/*
* Initialize SSL library, if specified.
*/
Expand Down
41 changes: 21 additions & 20 deletions src/backend/storage/smgr/md.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,7 @@ void mdsmgr_register(void)
/* magnetic disk */
f_smgr md_smgr = (f_smgr) {
.name = MdSMgrName,
.chain_position = SMGR_CHAIN_TAIL,
.smgr_init = mdinit,
.smgr_shutdown = NULL,
.smgr_open = mdopen,
Expand Down Expand Up @@ -210,7 +211,7 @@ mdinit(void)
* Note: this will return true for lingering files, with pending deletions
*/
bool
mdexists(SMgrRelation reln, ForkNumber forknum)
mdexists(SMgrRelation reln, ForkNumber forknum, SmgrChainIndex chain_index)
{
MdSMgrRelation mdreln = (MdSMgrRelation) reln;

Expand All @@ -220,7 +221,7 @@ mdexists(SMgrRelation reln, ForkNumber forknum)
* which already closes relations when dropping them.
*/
if (!InRecovery)
mdclose(reln, forknum);
mdclose(reln, forknum, 0);

return (mdopenfork(mdreln, forknum, EXTENSION_RETURN_NULL) != NULL);
}
Expand All @@ -231,7 +232,7 @@ mdexists(SMgrRelation reln, ForkNumber forknum)
* If isRedo is true, it's okay for the relation to exist already.
*/
void
mdcreate(RelFileLocator relold, SMgrRelation reln, ForkNumber forknum, bool isRedo)
mdcreate(RelFileLocator relold, SMgrRelation reln, ForkNumber forknum, bool isRedo, SmgrChainIndex chain_index)
{
MdfdVec *mdfd;
char *path;
Expand Down Expand Up @@ -350,7 +351,7 @@ mdcreate(RelFileLocator relold, SMgrRelation reln, ForkNumber forknum, bool isRe
* we are usually not in a transaction anymore when this is called.
*/
void
mdunlink(RelFileLocatorBackend rlocator, ForkNumber forknum, bool isRedo)
mdunlink(RelFileLocatorBackend rlocator, ForkNumber forknum, bool isRedo, SmgrChainIndex chain_index)
{
/* Now do the per-fork work */
if (forknum == InvalidForkNumber)
Expand Down Expand Up @@ -504,7 +505,7 @@ mdunlinkfork(RelFileLocatorBackend rlocator, ForkNumber forknum, bool isRedo)
*/
void
mdextend(SMgrRelation reln, ForkNumber forknum, BlockNumber blocknum,
const void *buffer, bool skipFsync)
const void *buffer, bool skipFsync, SmgrChainIndex chain_index)
{
off_t seekpos;
int nbytes;
Expand Down Expand Up @@ -570,7 +571,7 @@ mdextend(SMgrRelation reln, ForkNumber forknum, BlockNumber blocknum,
*/
void
mdzeroextend(SMgrRelation reln, ForkNumber forknum,
BlockNumber blocknum, int nblocks, bool skipFsync)
BlockNumber blocknum, int nblocks, bool skipFsync, SmgrChainIndex chain_index)
{
MdfdVec *v;
BlockNumber curblocknum = blocknum;
Expand Down Expand Up @@ -725,7 +726,7 @@ mdopenfork(MdSMgrRelation reln, ForkNumber forknum, int behavior)
* mdopen() -- Initialize newly-opened relation.
*/
void
mdopen(SMgrRelation reln)
mdopen(SMgrRelation reln, SmgrChainIndex chain_index)
{
MdSMgrRelation mdreln = (MdSMgrRelation) reln;
/* mark it not open */
Expand All @@ -737,7 +738,7 @@ mdopen(SMgrRelation reln)
* mdclose() -- Close the specified relation, if it isn't closed already.
*/
void
mdclose(SMgrRelation reln, ForkNumber forknum)
mdclose(SMgrRelation reln, ForkNumber forknum, SmgrChainIndex chain_index)
{
MdSMgrRelation mdreln = (MdSMgrRelation) reln;
int nopensegs = mdreln->md_num_open_segs[forknum];
Expand All @@ -762,7 +763,7 @@ mdclose(SMgrRelation reln, ForkNumber forknum)
*/
bool
mdprefetch(SMgrRelation reln, ForkNumber forknum, BlockNumber blocknum,
int nblocks)
int nblocks, SmgrChainIndex chain_index)
{
#ifdef USE_PREFETCH
MdSMgrRelation mdreln = (MdSMgrRelation) reln;
Expand Down Expand Up @@ -859,7 +860,7 @@ buffers_to_iovec(struct iovec *iov, void **buffers, int nblocks)
*/
void
mdreadv(SMgrRelation reln, ForkNumber forknum, BlockNumber blocknum,
void **buffers, BlockNumber nblocks)
void **buffers, BlockNumber nblocks, SmgrChainIndex chain_index)
{
MdSMgrRelation mdreln = (MdSMgrRelation) reln;

Expand Down Expand Up @@ -979,7 +980,7 @@ mdreadv(SMgrRelation reln, ForkNumber forknum, BlockNumber blocknum,
*/
void
mdwritev(SMgrRelation reln, ForkNumber forknum, BlockNumber blocknum,
const void **buffers, BlockNumber nblocks, bool skipFsync)
const void **buffers, BlockNumber nblocks, bool skipFsync, SmgrChainIndex chain_index)
{
MdSMgrRelation mdreln = (MdSMgrRelation) reln;

Expand Down Expand Up @@ -1083,7 +1084,7 @@ mdwritev(SMgrRelation reln, ForkNumber forknum, BlockNumber blocknum,
*/
void
mdwriteback(SMgrRelation reln, ForkNumber forknum,
BlockNumber blocknum, BlockNumber nblocks)
BlockNumber blocknum, BlockNumber nblocks, SmgrChainIndex chain_index)
{
MdSMgrRelation mdreln = (MdSMgrRelation) reln;
Assert((io_direct_flags & IO_DIRECT_DATA) == 0);
Expand Down Expand Up @@ -1142,7 +1143,7 @@ mdwriteback(SMgrRelation reln, ForkNumber forknum,
* are present in the array.
*/
BlockNumber
mdnblocks(SMgrRelation reln, ForkNumber forknum)
mdnblocks(SMgrRelation reln, ForkNumber forknum, SmgrChainIndex chain_index)
{
MdfdVec *v;
BlockNumber nblocks;
Expand Down Expand Up @@ -1200,7 +1201,7 @@ mdnblocks(SMgrRelation reln, ForkNumber forknum)
* mdtruncate() -- Truncate relation to specified number of blocks.
*/
void
mdtruncate(SMgrRelation reln, ForkNumber forknum, BlockNumber nblocks)
mdtruncate(SMgrRelation reln, ForkNumber forknum, BlockNumber nblocks, SmgrChainIndex chain_index)
{
BlockNumber curnblk;
BlockNumber priorblocks;
Expand All @@ -1211,7 +1212,7 @@ mdtruncate(SMgrRelation reln, ForkNumber forknum, BlockNumber nblocks)
* NOTE: mdnblocks makes sure we have opened all active segments, so that
* truncation loop will get them all!
*/
curnblk = mdnblocks(reln, forknum);
curnblk = mdnblocks(reln, forknum, 0);
if (nblocks > curnblk)
{
/* Bogus request ... but no complaint if InRecovery */
Expand Down Expand Up @@ -1295,7 +1296,7 @@ mdtruncate(SMgrRelation reln, ForkNumber forknum, BlockNumber nblocks)
* mdregistersync() -- Mark whole relation as needing fsync
*/
void
mdregistersync(SMgrRelation reln, ForkNumber forknum)
mdregistersync(SMgrRelation reln, ForkNumber forknum, SmgrChainIndex chain_index)
{
int segno;
int min_inactive_seg;
Expand All @@ -1305,7 +1306,7 @@ mdregistersync(SMgrRelation reln, ForkNumber forknum)
* NOTE: mdnblocks makes sure we have opened all active segments, so that
* the loop below will get them all!
*/
mdnblocks(reln, forknum);
mdnblocks(reln, forknum, 0);

min_inactive_seg = segno = mdreln->md_num_open_segs[forknum];

Expand Down Expand Up @@ -1347,7 +1348,7 @@ mdregistersync(SMgrRelation reln, ForkNumber forknum)
* segment may survive recovery, reintroducing unwanted data into the table.
*/
void
mdimmedsync(SMgrRelation reln, ForkNumber forknum)
mdimmedsync(SMgrRelation reln, ForkNumber forknum, SmgrChainIndex chain_index)
{
int segno;
int min_inactive_seg;
Expand All @@ -1357,7 +1358,7 @@ mdimmedsync(SMgrRelation reln, ForkNumber forknum)
* NOTE: mdnblocks makes sure we have opened all active segments, so that
* the loop below will get them all!
*/
mdnblocks(reln, forknum);
mdnblocks(reln, forknum, 0);

min_inactive_seg = segno = mdreln->md_num_open_segs[forknum];

Expand Down Expand Up @@ -1717,7 +1718,7 @@ _mdfd_getseg(MdSMgrRelation reln, ForkNumber forknum, BlockNumber blkno,

mdextend((SMgrRelation) reln, forknum,
nextsegno * ((BlockNumber) RELSEG_SIZE) - 1,
zerobuf, skipFsync);
zerobuf, skipFsync, 0);
pfree(zerobuf);
}
flags = O_CREAT;
Expand Down
Loading
Loading