8000 cleanup · postgrespro/postgres_cluster@f32c856 · GitHub
[go: up one dir, main page]
Skip to content

Commit f32c856

Browse files
kelvichkelvich
committed
cleanup
1 parent 2162563 commit f32c856

File tree

6 files changed

+9
-8
lines changed

6 files changed

+9
-8
lines changed

‎contrib/pglogical/pglogical_apply.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -369,7 +369,6 @@ UserTableUpdateOpenIndexes(EState *estate, TupleTableSlot *slot)
369369
&slot->tts_tuple->t_self,
370370
estate, false, NULL, NIL);
371371

372-
373372
/* FIXME: recheck the indexes */
374373
if (recheckIndexes != NIL)
375374
ereport(ERROR,
@@ -477,7 +476,6 @@ handle_insert(StringInfo s)
477476
estate = create_estate_for_relation(rel->rel);
478477
econtext = GetPerTupleExprContext(estate);
479478

480-
481479
PushActiveSnapshot(GetTransactionSnapshot());
482480

483481
MemoryContextSwitchTo(GetPerTupleMemoryContext(estate));

‎contrib/pglogical/pglogical_proto.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ typedef struct PGLogicalTupleData
2929
#define PGLOGICAL_COMMIT_PREPARED 0x02
3030
#define PGLOGICAL_ABORT_PREPARED 0x03
3131

32-
#define PGLOGICAL_XACT_EVENT(flags) (flags & 0x3)
32+
#define PGLOGICAL_XACT_EVENT(flags) (flags & 0x03)
3333

3434
extern void pglogical_read_begin(StringInfo in, XLogRecPtr *remote_lsn,
3535
TimestampTz *committime, TransactionId *remote_xid);

‎contrib/pglogical_output/pglogical_proto_native.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
#include "access/tuptoaster.h"
2323
#include "access/xact.h"
2424
#include "access/twophase.h"
25+
2526
#include "catalog/catversion.h"
2627
#include "catalog/index.h"
2728

‎contrib/pglogical_output/pglogical_proto_native.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
#define PGLOGICAL_COMMIT_PREPARED 0x02
2929
#define PGLOGICAL_ABORT_PREPARED 0x03
3030

31-
#define PGLOGICAL_XACT_EVENT(flags) (flags & 0x3)
31+
#define PGLOGICAL_XACT_EVENT(flags) (flags & 0x03)
3232

3333
extern void pglogical_write_rel(StringInfo out, PGLogicalOutputData *data, Relation rel,
3434
struct PGLRelMetaCacheEntry *cache_entry);

‎src/backend/access/transam/twophase.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1258,12 +1258,12 @@ ParsePrepareRecord(uint8 info, char *xlrec, xl_xact_parsed_prepare *parsed)
12581258

12591259
parsed->xnodes = (RelFileNode *) bufptr;
12601260
bufptr += MAXALIGN(hdr->ncommitrels * sizeof(RelFileNode));
1261-
1261+
12621262
/* Ignoring abortrels? */
12631263
bufptr += MAXALIGN(hdr->nabortrels * sizeof(RelFileNode));
1264-
1264+
12651265
parsed->msgs = (SharedInvalidationMessage *) bufptr;
1266-
bufptr += MAXALIGN(hdr->ninvalmsgs * sizeof(SharedInvalidationMessage));
1266+
bufptr += MAXALIGN(hdr->ninvalmsgs * sizeof(SharedInvalidationMessage));
12671267
}
12681268

12691269

‎src/backend/access/transam/xact.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5311,7 +5311,9 @@ XactLogAbortRecord(TimestampTz abort_time,
53115311
{
53125312
XLogRegisterData((char *) (&xl_twophase), MinSizeOfXactTwophase);
53135313
XLogRegisterData((char *) twophase_gid, xl_twophase.gidlen);
5314-
} if (xl_xinfo.xinfo & XACT_XINFO_HAS_DBINFO)
5314+
}
5315+
5316+
if (xl_xinfo.xinfo & XACT_XINFO_HAS_DBINFO)
53155317
XLogRegisterData((char *) (&xl_dbinfo), sizeof(xl_dbinfo));
53165318

53175319
return XLogInsert(RM_XACT_ID, info);

0 commit comments

Comments
 (0)
0