Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitd0273c0

Browse files
committed
misc
1 parente1a118e commitd0273c0

File tree

5 files changed

+28
-12
lines changed

5 files changed

+28
-12
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* Portions Copyright (c) 1996-2000, PostgreSQL, Inc
77
* Portions Copyright (c) 1994, Regents of the University of California
88
*
9-
* $Header: /cvsroot/pgsql/src/backend/access/transam/xlog.c,v 1.16 2000/06/02 15:57:16 momjian Exp $
9+
* $Header: /cvsroot/pgsql/src/backend/access/transam/xlog.c,v 1.17 2000/07/04 01:49:43 vadim Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
@@ -1402,7 +1402,7 @@ StartupXLOG()
14021402
record=ReadRecord(&RecPtr,buffer);
14031403
if (TransactionIdIsValid(record->xl_xid)&&
14041404
!TransactionIdDidCommit(record->xl_xid))
1405-
RmgrTable[record->xl_rmid].rm_undo(record);
1405+
RmgrTable[record->xl_rmid].rm_undo(EndRecPtr,record);
14061406
RecPtr=record->xl_prev;
14071407
}while (XLByteLE(checkPoint.undo,RecPtr));
14081408
elog(LOG,"Undo done at (%u, %u)",

‎src/include/access/htup.h

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* Portions Copyright (c) 1996-2000, PostgreSQL, Inc
88
* Portions Copyright (c) 1994, Regents of the University of California
99
*
10-
* $Id: htup.h,v 1.32 2000/07/03 02:54:17 vadim Exp $
10+
* $Id: htup.h,v 1.33 2000/07/04 01:49:43 vadim Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -87,6 +87,8 @@ typedef struct xl_heap_delete
8787
xl_heaptiddtid;/* deleted tuple id */
8888
}xl_heap_delete;
8989

90+
#defineSizeOfHeapDelete(offsetof(xl_heaptid, tid) + SizeOfIptrData))
91+
9092
/* This is what we need to know about insert - 26 + data */
9193
typedefstructxl_heap_insert
9294
{
@@ -99,6 +101,8 @@ typedef struct xl_heap_insert
99101
/* TUPLE DATA FOLLOWS AT END OF STRUCT */
100102
}xl_heap_insert;
101103

104+
#defineSizeOfHeapInsert(offsetof(xl_heap_insert, mask) + sizeof(uint8))
105+
102106
/* This is what we need to know about update - 28 + data */
103107
typedefstructxl_heap_update
104108
{
@@ -111,13 +115,17 @@ typedef struct xl_heap_update
111115
/* NEW TUPLE DATA FOLLOWS AT END OF STRUCT */
112116
}xl_heap_update;
113117

118+
#defineSizeOfHeapUpdate(offsetof(xl_heap_update, mask) + sizeof(uint8))
119+
114120
/* This is what we need to know about tuple move - 24 bytes */
115121
typedefstructxl_heap_move
116122
{
117123
xl_heaptidftid;/* moved from */
118124
ItemPointerDatattid;/* moved to */
119125
}xl_heap_move;
120126

127+
#defineSizeOfHeapMove(offsetof(xl_heap_move, ttid) + SizeOfIptrData))
128+
121129
/* end of XLOG stuff */
122130

123131
#endif/* XLOG */

‎src/include/access/rmgr.h

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ typedef uint8 RmgrId;
1313
typedefstructRmgrData
1414
{
1515
char*rm_name;
16-
char*(*rm_redo)();/* REDO(XLogRecPtr rptr) */
17-
char*(*rm_undo)();/* UNDO(XLogRecPtr rptr) */
16+
void (*rm_redo)();/* REDO(XLogRecPtr lsn, XLogRecord rptr) */
17+
void (*rm_undo)();/* UNDO(XLogRecPtr lsn, XLogRecord rptr) */
1818
}RmgrData;
1919

2020
externRmgrData*RmgrTable;
@@ -24,11 +24,12 @@ extern RmgrData *RmgrTable;
2424
*/
2525
#defineRM_XLOG_ID0
2626
#defineRM_XACT_ID1
27-
#defineRM_HEAP_ID2
28-
#defineRM_BTREE_ID3
29-
#defineRM_HASH_ID4
30-
#defineRM_RTREE_ID5
31-
#defineRM_GIST_ID6
27+
#defineRM_SMGR_ID2
28+
#defineRM_HEAP_ID10
29+
#defineRM_BTREE_ID11
30+
#defineRM_HASH_ID12
31+
#defineRM_RTREE_ID13
32+
#defineRM_GIST_ID14
3233
#defineRM_MAX_IDRM_GIST_ID
3334

3435
#endif/* RMGR_H */

‎src/include/access/xlog.h

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ typedef struct XLogRecord
2222
XLogRecPtrxl_prev;/* ptr to previous record in log */
2323
XLogRecPtrxl_xact_prev;/* ptr to previous record of this xact */
2424
TransactionIdxl_xid;/* xact id */
25-
uint16xl_len;/* len of record on this page */
25+
uint16xl_len;/* len of record*data*on this page */
2626
uint8xl_info;
2727
RmgrIdxl_rmid;/* resource manager inserted this record */
2828

@@ -32,6 +32,10 @@ typedef struct XLogRecord
3232

3333
#defineSizeOfXLogRecordDOUBLEALIGN(sizeof(XLogRecord))
3434
#defineMAXLOGRECSZ(2 * BLCKSZ)
35+
36+
#defineXLogRecGetData(record)\
37+
((char*)record + SizeOfXLogRecord)
38+
3539
/*
3640
* When there is no space on current page we continue on the next
3741
* page with subrecord.

‎src/include/storage/itemptr.h

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* Portions Copyright (c) 1996-2000, PostgreSQL, Inc
88
* Portions Copyright (c) 1994, Regents of the University of California
99
*
10-
* $Id: itemptr.h,v 1.14 2000/01/26 05:58:33 momjian Exp $
10+
* $Id: itemptr.h,v 1.15 2000/07/04 01:49:44 vadim Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -30,6 +30,9 @@ typedef struct ItemPointerData
3030
OffsetNumberip_posid;
3131
}ItemPointerData;
3232

33+
#defineSizeOfIptrData\
34+
(offsetof(ItemPointerData, ip_posid) + sizeof(OffsetNumber))
35+
3336
typedefItemPointerData*ItemPointer;
3437

3538
/* ----------------

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp