Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit f490623

Browse files
committed
dmq integration: remove pre-dmq transaction handling
1 parent acb39af commit f490623

File tree

7 files changed

+127
-2083
lines changed

7 files changed

+127
-2083
lines changed

multimaster--1.0.sql

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,6 @@ AS 'MODULE_PATHNAME','dmq_receiver_loop'
1616
LANGUAGE C;
1717

1818

19-
CREATE FUNCTION mtm.start_replication() RETURNS void
20-
AS 'MODULE_PATHNAME','mtm_start_replication'
21-
LANGUAGE C;
22-
23-
CREATE FUNCTION mtm.stop_replication() RETURNS void
24-
AS 'MODULE_PATHNAME','mtm_stop_replication'
25-
LANGUAGE C;
26-
2719
-- Stop replication to the node. Node is didsabled, If drop_slot is true, then replication slot is dropped and node can be recovered using basebackup and recover_node function.
2820
-- If drop_slot is false and limit for maximal slot gap was not reached, then node can be restarted using resume_node function.
2921
CREATE FUNCTION mtm.stop_node(node integer, drop_slot bool default false) RETURNS void
@@ -47,18 +39,6 @@ AS 'MODULE_PATHNAME','mtm_resume_node'
4739
LANGUAGE C;
4840

4941

50-
CREATE FUNCTION mtm.get_snapshot() RETURNS bigint
51-
AS 'MODULE_PATHNAME','mtm_get_snapshot'
52-
LANGUAGE C;
53-
54-
CREATE FUNCTION mtm.get_csn(xid bigint) RETURNS bigint
55-
AS 'MODULE_PATHNAME','mtm_get_csn'
56-
LANGUAGE C;
57-
58-
CREATE FUNCTION mtm.get_last_csn() RETURNS bigint
59-
AS 'MODULE_PATHNAME','mtm_get_last_csn'
60-
LANGUAGE C;
61-
6242
CREATE TYPE mtm.node_state AS (
6343
"id" integer,
6444
"enabled" bool,
@@ -124,13 +104,6 @@ CREATE TYPE mtm.trans_state AS (
124104
"config_changes" integer
125105
);
126106

127-
CREATE FUNCTION mtm.get_trans_by_gid(git text) RETURNS mtm.trans_state
128-
AS 'MODULE_PATHNAME','mtm_get_trans_by_gid'
129-
LANGUAGE C;
130-
131-
CREATE FUNCTION mtm.get_trans_by_xid(xid bigint) RETURNS mtm.trans_state
132-
AS 'MODULE_PATHNAME','mtm_get_trans_by_xid'
133-
LANGUAGE C;
134107

135108
CREATE FUNCTION mtm.get_cluster_state() RETURNS mtm.cluster_state
136109
AS 'MODULE_PATHNAME','mtm_get_cluster_state'
@@ -160,10 +133,6 @@ CREATE FUNCTION mtm.poll_node(node_id integer, no_wait boolean default FALSE) RE
160133
AS 'MODULE_PATHNAME','mtm_poll_node'
161134
LANGUAGE C;
162135

163-
CREATE FUNCTION mtm.inject_2pc_error(stage integer) RETURNS void
164-
AS 'MODULE_PATHNAME','mtm_inject_2pc_error'
165-
LANGUAGE C;
166-
167136
CREATE FUNCTION mtm.check_deadlock(xid bigint) RETURNS boolean
168137
AS 'MODULE_PATHNAME','mtm_check_deadlock'
169138
LANGUAGE C;

src/bgwpool.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -253,9 +253,9 @@ void BgwPoolExecute(BgwPool* pool, void* work, size_t size)
253253

254254
void BgwPoolStop(BgwPool* pool)
255255
{
256-
SpinLockAcquire(&pool->lock);
256+
// SpinLockAcquire(&pool->lock);
257257
pool->shutdown = true;
258-
SpinLockRelease(&pool->lock);
258+
// SpinLockRelease(&pool->lock);
259259
PGSemaphoreUnlock(pool->available);
260260
PGSemaphoreUnlock(pool->overflow);
261261
}

src/include/multimaster.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -507,7 +507,6 @@ extern void MtmRollbackPreparedTransaction(int nodeId, char const* gid);
507507
extern bool MtmFilterTransaction(char* record, int size);
508508
extern void MtmPrecommitTransaction(char const* gid);
509509
extern char* MtmGucSerialize(void);
510-
extern bool MtmTransIsActive(void);
511510
extern MtmTransState* MtmGetActiveTransaction(MtmL2List* list);
512511
extern void MtmReleaseLocks(void);
513512
extern void MtmInitMessage(MtmArbiterMessage* msg, MtmMessageCode code);
@@ -519,4 +518,6 @@ extern int MtmGetNumberOfVotingNodes(void);
519518
extern void MtmToggleDML(void);
520519
extern void MtmUpdateControlFile(void);
521520

521+
extern void MtmCheckSlots(void);
522+
522523
#endif

0 commit comments

Comments
 (0)