diff options
| author | drh <drh@noemail.net> | 2013-04-08 19:13:48 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2013-04-08 19:13:48 +0000 |
| commit | f90e50f60bd01af442a9b68eb5d808ef6faa4ca7 (patch) | |
| tree | 1f3d8a88f4c54c3017ea2bcffafe6b2a40a5c7ea /mptest/mptest.c | |
| parent | 6adab7a1a870a1af8dfeb18b82957e8e4385b2fa (diff) | |
| download | sqlite-f90e50f60bd01af442a9b68eb5d808ef6faa4ca7.tar.gz sqlite-f90e50f60bd01af442a9b68eb5d808ef6faa4ca7.zip | |
In mptester, handle startScript no-change commits using a retry rather
than grabbing an exclusive transaction.
FossilOrigin-Name: ae8bb24bfb014bdcb8aaa8159ddae0cd376afe99
Diffstat (limited to 'mptest/mptest.c')
| -rw-r--r-- | mptest/mptest.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/mptest/mptest.c b/mptest/mptest.c index cf8eb14e1..f14a640e8 100644 --- a/mptest/mptest.c +++ b/mptest/mptest.c @@ -526,7 +526,7 @@ static int startScript( *pzScript = 0; g.iTimeout = 0; while(1){ - rc = trySql("BEGIN EXCLUSIVE"); + rc = trySql("BEGIN IMMEDIATE"); if( rc==SQLITE_BUSY ){ sqlite3_sleep(10); totalTime += 10; @@ -546,8 +546,8 @@ static int startScript( sqlite3_finalize(pStmt); if( rc==SQLITE_ROW ){ runSql("DELETE FROM client WHERE id=%d", iClient); - runSql("COMMIT"); g.iTimeout = DEFAULT_TIMEOUT; + runSql("COMMIT TRANSACTION;"); return SQLITE_DONE; } pStmt = prepareSql( @@ -557,15 +557,15 @@ static int startScript( rc = sqlite3_step(pStmt); if( rc==SQLITE_ROW ){ int n = sqlite3_column_bytes(pStmt, 0); - *pzScript = sqlite3_malloc( n+ 1 ); + *pzScript = sqlite3_malloc(n+1); strcpy(*pzScript, (const char*)sqlite3_column_text(pStmt, 0)); *pTaskId = taskId = sqlite3_column_int(pStmt, 1); sqlite3_finalize(pStmt); runSql("UPDATE task" " SET starttime=strftime('%%Y-%%m-%%d %%H:%%M:%%f','now')" " WHERE id=%d;", taskId); - runSql("COMMIT;"); g.iTimeout = DEFAULT_TIMEOUT; + runSql("COMMIT TRANSACTION;"); return SQLITE_OK; } sqlite3_finalize(pStmt); @@ -576,7 +576,10 @@ static int startScript( sqlite3_close(g.db); exit(1); } - runSql("COMMIT;"); + while( trySql("COMMIT")==SQLITE_BUSY ){ + sqlite3_sleep(10); + totalTime += 10; + } sqlite3_sleep(100); totalTime += 100; continue; |