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

Jump to bottom

Fix shared memory initialization for last written LSN cache #225

Closed
wants to merge 1 commit into from
Closed

Fix shared memory initialization for last written LSN cache #225

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
16 changes: 10 additions & 6 deletions src/backend/access/transam/xlog.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5247,7 +5247,7 @@ XLOGShmemInit(void)


XLogCtl = (XLogCtlData *)
ShmemInitStruct("XLOG Ctl", XLOGShmemSize(), &foundXLog);
ShmemInitStruct("XLOG Ctl", XLOGCtlShmemSize(), &foundXLog);

{
static HASHCTL info;
Expand Down Expand Up @@ -8976,7 +8976,7 @@ GetLastWrittenLSN(RelFileNode rnode, ForkNumber forknum, BlockNumber blkno)
* SetLastWrittenLsn with dummy rnode is used by createdb and dbase_redo functions.
*/
void
SetLastWrittenLSNForBlockRange(XLogRecPtr lsn, RelFileNode rnode, ForkNumber forknum, BlockNumber from, BlockNumber till)
SetLastWrittenLSNForBlockRange(XLogRecPtr lsn, RelFileNode rnode, ForkNumber forknum, BlockNumber from, BlockNumber n_blocks)
{
if (lsn == InvalidXLogRecPtr)
return;
Expand All @@ -8993,12 +8993,16 @@ SetLastWrittenLSNForBlockRange(XLogRecPtr lsn, RelFileNode rnode, ForkNumber for
BufferTag key;
bool found;
BlockNumber bucket;
BlockNumber start_bucket; /* inclusive */
BlockNumber end_bucket; /* exclusive */

start_bucket = from / LAST_WRITTEN_LSN_CACHE_BUCKET;
end_bucket = n_blocks == 0
? start_bucket : (from + n_blocks + LAST_WRITTEN_LSN_CACHE_BUCKET - 1) / LAST_WRITTEN_LSN_CACHE_BUCKET;

key.rnode = rnode;
key.forkNum = forknum;
for (bucket = from / LAST_WRITTEN_LSN_CACHE_BUCKET;
bucket <= till / LAST_WRITTEN_LSN_CACHE_BUCKET;
bucket++)
for (bucket = start_bucket; bucket < end_bucket; bucket++)
{
key.blockNum = bucket;
entry = hash_search(lastWrittenLsnCache, &key, HASH_ENTER, &found);
Expand Down Expand Up @@ -9036,7 +9040,7 @@ SetLastWrittenLSNForBlockRange(XLogRecPtr lsn, RelFileNode rnode, ForkNumber for
void
SetLastWrittenLSNForBlock(XLogRecPtr lsn, RelFileNode rnode, ForkNumber forknum, BlockNumber blkno)
{
SetLastWrittenLSNForBlockRange(lsn, rnode, forknum, blkno, blkno);
SetLastWrittenLSNForBlockRange(lsn, rnode, forknum, blkno, 1);
}

/*
Expand Down
2 changes: 1 addition & 1 deletion src/include/access/xlog.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,7 @@ extern XLogRecPtr GetLastImportantRecPtr(void);
extern void RemovePromoteSignalFiles(void);

extern void SetLastWrittenLSNForBlock(XLogRecPtr lsn, RelFileNode relfilenode, ForkNumber forknum, BlockNumber blkno);
extern void SetLastWrittenLSNForBlockRange(XLogRecPtr lsn, RelFileNode relfilenode, ForkNumber forknum, BlockNumber from, BlockNumber till);
extern void SetLastWrittenLSNForBlockRange(XLogRecPtr lsn, RelFileNode relfilenode, ForkNumber forknum, BlockNumber from, BlockNumber n_blocks);
extern void SetLastWrittenLSNForDatabase(XLogRecPtr lsn);
extern void SetLastWrittenLSNForRelation(XLogRecPtr lsn, RelFileNode relfilenode, ForkNumber forknum);
extern XLogRecPtr GetLastWrittenLSN(RelFileNode relfilenode, ForkNumber forknum, BlockNumber blkno);
Expand Down