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

Commitb7eda3e

Browse files
committed
Move generic snapshot related code from tqual.h to snapmgr.h.
The code in tqual.c is largely heap specific. Due to the upcomingpluggable storage work, it therefore makes sense to move it intoaccess/heap/ (as the file's header notes, the tqual name isn't verygood).But the various statically allocated snapshot and snapshotinitialization functions are now (see previous commit) generic and donot depend on functions declared in tqual.h anymore. Therefore move.Also move XidInMVCCSnapshot as that's useful for future AMs, andalready used outside of tqual.c.Author: Andres FreundDiscussion:https://postgr.es/m/20180703070645.wchpu5muyto5n647@alap3.anarazel.de
1 parent6374618 commitb7eda3e

File tree

17 files changed

+177
-181
lines changed

17 files changed

+177
-181
lines changed

‎contrib/amcheck/verify_nbtree.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
#include"storage/lmgr.h"
3737
#include"utils/memutils.h"
3838
#include"utils/snapmgr.h"
39-
#include"utils/tqual.h"
4039

4140

4241
PG_MODULE_MAGIC;

‎contrib/sepgsql/database.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#include"commands/seclabel.h"
2222
#include"utils/builtins.h"
2323
#include"utils/fmgroids.h"
24-
#include"utils/tqual.h"
24+
#include"utils/snapmgr.h"
2525
#include"sepgsql.h"
2626

2727
/*

‎contrib/sepgsql/proc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
#include"utils/builtins.h"
2525
#include"utils/fmgroids.h"
2626
#include"utils/lsyscache.h"
27+
#include"utils/snapmgr.h"
2728
#include"utils/syscache.h"
28-
#include"utils/tqual.h"
2929

3030
#include"sepgsql.h"
3131

‎contrib/sepgsql/relation.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
#include"utils/catcache.h"
2727
#include"utils/lsyscache.h"
2828
#include"utils/rel.h"
29+
#include"utils/snapmgr.h"
2930
#include"utils/syscache.h"
30-
#include"utils/tqual.h"
3131

3232
#include"sepgsql.h"
3333

‎contrib/sepgsql/schema.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
#include"utils/builtins.h"
2525
#include"utils/fmgroids.h"
2626
#include"utils/lsyscache.h"
27-
#include"utils/tqual.h"
27+
#include"utils/snapmgr.h"
2828

2929
#include"sepgsql.h"
3030

‎src/backend/access/nbtree/nbtsort.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@
7272
#include"utils/rel.h"
7373
#include"utils/sortsupport.h"
7474
#include"utils/tuplesort.h"
75-
#include"utils/tqual.h"
7675

7776

7877
/* Magic numbers for parallel state sharing */

‎src/backend/catalog/catalog.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@
4747
#include"utils/fmgroids.h"
4848
#include"utils/fmgrprotos.h"
4949
#include"utils/rel.h"
50+
#include"utils/snapmgr.h"
5051
#include"utils/syscache.h"
51-
#include"utils/tqual.h"
5252

5353

5454
/*

‎src/backend/commands/async.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,6 @@
139139
#include"utils/ps_status.h"
140140
#include"utils/snapmgr.h"
141141
#include"utils/timestamp.h"
142-
#include"utils/tqual.h"
143142

144143

145144
/*

‎src/backend/commands/constraint.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include"executor/executor.h"
2121
#include"utils/builtins.h"
2222
#include"utils/rel.h"
23-
#include"utils/tqual.h"
23+
#include"utils/snapmgr.h"
2424

2525

2626
/*

‎src/backend/executor/execIndexing.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@
113113
#include"executor/executor.h"
114114
#include"nodes/nodeFuncs.h"
115115
#include"storage/lmgr.h"
116-
#include"utils/tqual.h"
116+
#include"utils/snapmgr.h"
117117

118118
/* waitMode argument to check_exclusion_or_unique_constraint() */
119119
typedefenum

‎src/backend/replication/logical/origin.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@
9595
#include"utils/pg_lsn.h"
9696
#include"utils/rel.h"
9797
#include"utils/syscache.h"
98-
#include"utils/tqual.h"
98+
#include"utils/snapmgr.h"
9999

100100
/*
101101
* Replay progress of a single remote node.

‎src/backend/replication/logical/snapbuild.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,6 @@
136136
#include"utils/memutils.h"
137137
#include"utils/snapshot.h"
138138
#include"utils/snapmgr.h"
139-
#include"utils/tqual.h"
140139

141140
#include"storage/block.h"/* debugging output */
142141
#include"storage/fd.h"

‎src/backend/utils/adt/selfuncs.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,6 @@
146146
#include"utils/spccache.h"
147147
#include"utils/syscache.h"
148148
#include"utils/timestamp.h"
149-
#include"utils/tqual.h"
150149
#include"utils/typcache.h"
151150
#include"utils/varlena.h"
152151

‎src/backend/utils/time/snapmgr.c

Lines changed: 125 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
#include<sys/stat.h>
4949
#include<unistd.h>
5050

51+
#include"access/subtrans.h"
5152
#include"access/transam.h"
5253
#include"access/xact.h"
5354
#include"access/xlog.h"
@@ -66,7 +67,6 @@
6667
#include"utils/resowner_private.h"
6768
#include"utils/snapmgr.h"
6869
#include"utils/syscache.h"
69-
#include"utils/tqual.h"
7070

7171

7272
/*
@@ -144,6 +144,8 @@ static volatile OldSnapshotControlData *oldSnapshotControl;
144144
staticSnapshotDataCurrentSnapshotData= {SNAPSHOT_MVCC};
145145
staticSnapshotDataSecondarySnapshotData= {SNAPSHOT_MVCC};
146146
SnapshotDataCatalogSnapshotData= {SNAPSHOT_MVCC};
147+
SnapshotDataSnapshotSelfData= {SNAPSHOT_SELF};
148+
SnapshotDataSnapshotAnyData= {SNAPSHOT_ANY};
147149

148150
/* Pointers to valid snapshots */
149151
staticSnapshotCurrentSnapshot=NULL;
@@ -2192,3 +2194,125 @@ RestoreTransactionSnapshot(Snapshot snapshot, void *master_pgproc)
21922194
{
21932195
SetTransactionSnapshot(snapshot,NULL,InvalidPid,master_pgproc);
21942196
}
2197+
2198+
/*
2199+
* XidInMVCCSnapshot
2200+
*Is the given XID still-in-progress according to the snapshot?
2201+
*
2202+
* Note: GetSnapshotData never stores either top xid or subxids of our own
2203+
* backend into a snapshot, so these xids will not be reported as "running"
2204+
* by this function. This is OK for current uses, because we always check
2205+
* TransactionIdIsCurrentTransactionId first, except when it's known the
2206+
* XID could not be ours anyway.
2207+
*/
2208+
bool
2209+
XidInMVCCSnapshot(TransactionIdxid,Snapshotsnapshot)
2210+
{
2211+
uint32i;
2212+
2213+
/*
2214+
* Make a quick range check to eliminate most XIDs without looking at the
2215+
* xip arrays. Note that this is OK even if we convert a subxact XID to
2216+
* its parent below, because a subxact with XID < xmin has surely also got
2217+
* a parent with XID < xmin, while one with XID >= xmax must belong to a
2218+
* parent that was not yet committed at the time of this snapshot.
2219+
*/
2220+
2221+
/* Any xid < xmin is not in-progress */
2222+
if (TransactionIdPrecedes(xid,snapshot->xmin))
2223+
return false;
2224+
/* Any xid >= xmax is in-progress */
2225+
if (TransactionIdFollowsOrEquals(xid,snapshot->xmax))
2226+
return true;
2227+
2228+
/*
2229+
* Snapshot information is stored slightly differently in snapshots taken
2230+
* during recovery.
2231+
*/
2232+
if (!snapshot->takenDuringRecovery)
2233+
{
2234+
/*
2235+
* If the snapshot contains full subxact data, the fastest way to
2236+
* check things is just to compare the given XID against both subxact
2237+
* XIDs and top-level XIDs. If the snapshot overflowed, we have to
2238+
* use pg_subtrans to convert a subxact XID to its parent XID, but
2239+
* then we need only look at top-level XIDs not subxacts.
2240+
*/
2241+
if (!snapshot->suboverflowed)
2242+
{
2243+
/* we have full data, so search subxip */
2244+
int32j;
2245+
2246+
for (j=0;j<snapshot->subxcnt;j++)
2247+
{
2248+
if (TransactionIdEquals(xid,snapshot->subxip[j]))
2249+
return true;
2250+
}
2251+
2252+
/* not there, fall through to search xip[] */
2253+
}
2254+
else
2255+
{
2256+
/*
2257+
* Snapshot overflowed, so convert xid to top-level. This is safe
2258+
* because we eliminated too-old XIDs above.
2259+
*/
2260+
xid=SubTransGetTopmostTransaction(xid);
2261+
2262+
/*
2263+
* If xid was indeed a subxact, we might now have an xid < xmin,
2264+
* so recheck to avoid an array scan. No point in rechecking
2265+
* xmax.
2266+
*/
2267+
if (TransactionIdPrecedes(xid,snapshot->xmin))
2268+
return false;
2269+
}
2270+
2271+
for (i=0;i<snapshot->xcnt;i++)
2272+
{
2273+
if (TransactionIdEquals(xid,snapshot->xip[i]))
2274+
return true;
2275+
}
2276+
}
2277+
else
2278+
{
2279+
int32j;
2280+
2281+
/*
2282+
* In recovery we store all xids in the subxact array because it is by
2283+
* far the bigger array, and we mostly don't know which xids are
2284+
* top-level and which are subxacts. The xip array is empty.
2285+
*
2286+
* We start by searching subtrans, if we overflowed.
2287+
*/
2288+
if (snapshot->suboverflowed)
2289+
{
2290+
/*
2291+
* Snapshot overflowed, so convert xid to top-level. This is safe
2292+
* because we eliminated too-old XIDs above.
2293+
*/
2294+
xid=SubTransGetTopmostTransaction(xid);
2295+
2296+
/*
2297+
* If xid was indeed a subxact, we might now have an xid < xmin,
2298+
* so recheck to avoid an array scan. No point in rechecking
2299+
* xmax.
2300+
*/
2301+
if (TransactionIdPrecedes(xid,snapshot->xmin))
2302+
return false;
2303+
}
2304+
2305+
/*
2306+
* We now have either a top-level xid higher than xmin or an
2307+
* indeterminate xid. We don't know whether it's top level or subxact
2308+
* but it doesn't matter. If it's present, the xid is visible.
2309+
*/
2310+
for (j=0;j<snapshot->subxcnt;j++)
2311+
{
2312+
if (TransactionIdEquals(xid,snapshot->subxip[j]))
2313+
return true;
2314+
}
2315+
}
2316+
2317+
return false;
2318+
}

0 commit comments

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