Skip to content

Resolve conflicts in src/backend/access/transam/multixact.c and xlog.c #2564

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

Open
silent-observer wants to merge 1 commit into
base: sync-14x-b13
Choose a base branch
from
Open

Resolve conflicts in src/backend/access/transam/multixact.c and xlog.c #2564

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
20 changes: 2 additions & 18 deletions src/backend/access/transam/distributedlog.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -836,22 +836,6 @@ DistributedLog_Startup(TransactionId oldestActiveXid,
LWLockRelease(DistributedLogControlLock);
}

/*
* This must be called ONCE during postmaster or standalone-backend shutdown
*/
void
DistributedLog_Shutdown(void)
{
if (IS_QUERY_DISPATCHER())
return;

elog((Debug_print_full_dtm ? LOG : DEBUG5),
"DistributedLog_Shutdown");

/* Flush dirty DistributedLog pages to disk */
SimpleLruFlush(DistributedLogCtl, false);
}

/*
* Perform a checkpoint --- either during shutdown, or on-the-fly
*/
Expand All @@ -864,8 +848,8 @@ DistributedLog_CheckPoint(void)
elog((Debug_print_full_dtm ? LOG : DEBUG5),
"DistributedLog_CheckPoint");

/* Flush dirty DistributedLog pages to disk */
SimpleLruFlush(DistributedLogCtl, true);
/* Write dirty DistributedLog pages to disk */
SimpleLruWriteAll(DistributedLogCtl, true);
}


Expand Down
17 changes: 0 additions & 17 deletions src/backend/access/transam/multixact.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2121,23 +2121,6 @@ TrimMultiXact(void)
}

/*
<<<<<<< HEAD
* This must be called ONCE during postmaster or standalone-backend shutdown
*/
void
ShutdownMultiXact(void)
{
/* Flush dirty MultiXact pages to disk */
TRACE_POSTGRESQL_MULTIXACT_CHECKPOINT_START(false);
SimpleLruFlush(MultiXactOffsetCtl, false);
SimpleLruFlush(MultiXactMemberCtl, false);

TRACE_POSTGRESQL_MULTIXACT_CHECKPOINT_DONE(false);
}

/*
=======
>>>>>>> f81e97d0475cd4bc597adc23b665bd84fbf79a0d
* Get the MultiXact data to save in a checkpoint record
*/
void
Expand Down
8 changes: 0 additions & 8 deletions src/backend/access/transam/xlog.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8965,14 +8965,6 @@ ShutdownXLOG(int code pg_attribute_unused() , Datum arg pg_attribute_unused() )

CreateCheckPoint(CHECKPOINT_IS_SHUTDOWN | CHECKPOINT_IMMEDIATE);
}
<<<<<<< HEAD
ShutdownCLOG();
ShutdownCommitTs();
ShutdownSUBTRANS();
ShutdownMultiXact();
DistributedLog_Shutdown();
=======
>>>>>>> f81e97d0475cd4bc597adc23b665bd84fbf79a0d
}

/*
Expand Down
1 change: 0 additions & 1 deletion src/include/access/distributedlog.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ extern void DistributedLog_BootStrap(void);
extern void DistributedLog_Startup(
TransactionId oldestActiveXid,
TransactionId nextXid);
extern void DistributedLog_Shutdown(void);
extern void DistributedLog_CheckPoint(void);
extern void DistributedLog_Extend(TransactionId newestXid);
extern bool DistributedLog_GetLowWaterXid(
Expand Down