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

Commitdc919c4

Browse files
committed
read-committed patch
1 parent8625723 commitdc919c4

File tree

2 files changed

+42
-6
lines changed

2 files changed

+42
-6
lines changed

‎contrib/mmts/multimaster.c‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -516,9 +516,11 @@ void MtmSetSnapshot(csn_t globalSnapshot)
516516
SnapshotMtmGetSnapshot(Snapshotsnapshot)
517517
{
518518
snapshot=PgGetSnapshotData(snapshot);
519-
if (XactIsoLevel==XACT_READ_COMMITTED&&MtmTx.snapshot!=INVALID_CSN&&TransactionIdIsValid(GetCurrentTransactionIdIfAny())) {
519+
if (XactIsoLevel==XACT_READ_COMMITTED&&MtmTx.snapshot!=INVALID_CSN) {
520520
MtmTx.snapshot=MtmGetCurrentTime();
521-
LogLogicalMessage("S", (char*)&MtmTx.snapshot,sizeof(MtmTx.snapshot), true);
521+
if (TransactionIdIsValid(GetCurrentTransactionIdIfAny())) {
522+
LogLogicalMessage("S", (char*)&MtmTx.snapshot,sizeof(MtmTx.snapshot), true);
523+
}
522524
}
523525
RecentGlobalDataXmin=RecentGlobalXmin=Mtm->oldestXid;
524526
returnsnapshot;

‎contrib/mmts/tests/dtmbench.cpp‎

Lines changed: 38 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
#include<pqxx/connection>
1313
#include<pqxx/transaction>
14+
#include<pqxx/subtransaction.hxx>
1415
#include<pqxx/nontransaction>
1516
#include<pqxx/pipeline>
1617

@@ -70,7 +71,8 @@ struct config
7071
vector<string> connections;
7172
bool scatter;
7273
bool avoidDeadlocks;
73-
74+
bool subtransactions;
75+
7476
config() {
7577
nReaders =1;
7678
nWriters =10;
@@ -79,6 +81,7 @@ struct config
7981
updatePercent =100;
8082
scatter =false;
8183
avoidDeadlocks =false;
84+
subtransactions =false;
8285
}
8386
};
8487

@@ -159,6 +162,33 @@ void* writer(void* arg)
159162
if (cfg.scatter) {
160163
srcAcc = srcAcc/cfg.nWriters*cfg.nWriters + t.id;
161164
dstAcc = dstAcc/cfg.nWriters*cfg.nWriters + t.id;
165+
}elseif (cfg.subtransactions) {
166+
if (dstAcc < srcAcc) {
167+
int tmp = srcAcc;
168+
srcAcc = dstAcc;
169+
dstAcc = tmp;
170+
}
171+
while (true) {
172+
try {
173+
subtransactionsubtxn(txn,"withdraw");
174+
exec(subtxn,"update t set v = v - 1 where u=%d", srcAcc);
175+
break;
176+
}catch (pqxx_exceptionconst& x) {
177+
t.aborts +=1;
178+
}
179+
}
180+
while (true) {
181+
try {
182+
subtransactionsubtxn(txn,"deposit");
183+
exec(subtxn,"update t set v = v + 1 where u=%d", dstAcc);
184+
break;
185+
}catch (pqxx_exceptionconst& x) {
186+
t.aborts +=1;
187+
}
188+
}
189+
txn.commit();
190+
t.transactions +=1;
191+
continue;
162192
}elseif (cfg.avoidDeadlocks) {
163193
if (dstAcc < srcAcc) {
164194
int tmp = srcAcc;
@@ -198,8 +228,8 @@ void initializeDatabase()
198228
printf("Creating database schema...\n");
199229
{
200230
nontransactiontxn(conn);
201-
exec(txn,"drop extension if exists multimaster");
202-
exec(txn,"create extension multimaster");
231+
//exec(txn, "drop extension if exists multimaster");
232+
//exec(txn, "create extension multimaster");
203233
exec(txn,"drop table if exists t");
204234
exec(txn,"create table t(u int primary key, v int)");
205235
}
@@ -251,6 +281,9 @@ int main (int argc, char* argv[])
251281
case'd':
252282
cfg.avoidDeadlocks =true;
253283
continue;
284+
case'x':
285+
cfg.subtransactions =true;
286+
continue;
254287
}
255288
}
256289
printf("Options:\n"
@@ -260,7 +293,8 @@ int main (int argc, char* argv[])
260293
"\t-n N\tnumber of iterations (1000)\n"
261294
"\t-p N\tupdate percent (100)\n"
262295
"\t-c STR\tdatabase connection string\n"
263-
"\t-s\tscattern avoid deadlocks\n"
296+
"\t-s\tscatter ids to avoid conflicts\n"
297+
"\t-x\tuse subtransactions\n"
264298
"\t-d\tavoid deadlocks\n"
265299
"\t-i\tinitialize database\n");
266300
return1;

0 commit comments

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