database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-07-29 08:01:23 +03:00
Code Activity

Fix an RBU problem causing spurious SQLITE_CONSTRAINT errors when restarting

Browse Source 
an RBU update in which more than one source table writes to a single target
database table.

FossilOrigin-Name: 564ae8297d417ba4b7978e430d41f125007177673163f6ed9adc3a3974f73d24
This commit is contained in:
dan
2018-04-28 18:20:01 +00:00
parent a19d09677b
commit 2b137d65f5
6 changed files with 140 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ext/rbu/rbu1.test
View File

@ -139,6 +139,7 @@ foreach {tn3 create_vfs destroy_vfs} {
foreach {tn2 cmd} {
1 run_rbu
2 step_rbu 3 step_rbu_uri 4 step_rbu_state
5 step_rbu_legacy
} {
foreach {tn schema} {
1 {

16
ext/rbu/rbu_common.tcl
View File

@ -70,6 +70,22 @@ proc step_rbu {target rbu} {
set rc
}
proc step_rbu_legacy {target rbu} {
while 1 {
sqlite3rbu rbu $target $rbu
set state [rbu state]
check_prestep_state $target $state
set rc [rbu step]
check_poststep_state $rc $target $state
rbu close
if {$rc != "SQLITE_OK"} break
sqlite3 tmpdb $rbu
tmpdb eval { DELETE FROM rbu_state WHERE k==10 }
tmpdb close
}
set rc
}
proc do_rbu_vacuum_test {tn step} {
forcedelete state.db
uplevel [list do_test $tn.1 {

95
ext/rbu/rbusplit.test Normal file
View File

@ -0,0 +1,95 @@
# 2018 April 28
#
# The author disclaims copyright to this source code. In place of
# a legal notice, here is a blessing:
#
# May you do good and not evil.
# May you find forgiveness for yourself and forgive others.
# May you share freely, never taking more than you give.
#
#***********************************************************************
#
#
source [file join [file dirname [info script]] rbu_common.tcl]
set ::testprefix rbusplit
db close
sqlite3_shutdown
sqlite3_config_uri 1
autoinstall_test_functions
proc build_db {db} {
$db eval {
CREATE TABLE t1(a PRIMARY KEY, b, c);
CREATE TABLE t2(a PRIMARY KEY, b, c);
CREATE INDEX t1c ON t1(c);
}
}
proc build_rbu {filename} {
forcedelete $filename
sqlite3 dbRbu $filename
dbRbu eval {
CREATE TABLE data0_t1(a, b, c, rbu_control);
CREATE TABLE data1_t1(a, b, c, rbu_control);
CREATE TABLE data2_t1(a, b, c, rbu_control);
CREATE TABLE data3_t1(a, b, c, rbu_control);
CREATE TABLE data_t2(a, b, c, rbu_control);
INSERT INTO data0_t1 VALUES(1, 1, 1, 0);
INSERT INTO data0_t1 VALUES(2, 2, 2, 0);
INSERT INTO data0_t1 VALUES(3, 3, 3, 0);
INSERT INTO data0_t1 VALUES(4, 4, 4, 0);
INSERT INTO data1_t1 VALUES(5, 5, 5, 0);
INSERT INTO data1_t1 VALUES(6, 6, 6, 0);
INSERT INTO data1_t1 VALUES(7, 7, 7, 0);
INSERT INTO data1_t1 VALUES(8, 8, 8, 0);
INSERT INTO data3_t1 VALUES(9, 9, 9, 0);
INSERT INTO data_t2 VALUES(1, 1, 1, 0);
INSERT INTO data_t2 VALUES(2, 2, 2, 0);
INSERT INTO data_t2 VALUES(3, 3, 3, 0);
INSERT INTO data_t2 VALUES(4, 4, 4, 0);
INSERT INTO data_t2 VALUES(5, 5, 5, 0);
INSERT INTO data_t2 VALUES(6, 6, 6, 0);
INSERT INTO data_t2 VALUES(7, 7, 7, 0);
INSERT INTO data_t2 VALUES(8, 8, 8, 0);
INSERT INTO data_t2 VALUES(9, 9, 9, 0);
}
dbRbu close
}
foreach {tn cmd} {
1 run_rbu
2 step_rbu
} {
reset_db
build_db db
build_rbu testrbu.db
do_test 1.$tn.1 {
$cmd test.db testrbu.db
} {SQLITE_DONE}
do_execsql_test 1.$tn.1 {
SELECT * FROM t1;
} {
1 1 1 2 2 2 3 3 3 4 4 4
5 5 5 6 6 6 7 7 7 8 8 8
9 9 9
}
do_execsql_test 1.$tn.2 {
SELECT * FROM t2;
} {
1 1 1 2 2 2 3 3 3 4 4 4
5 5 5 6 6 6 7 7 7 8 8 8
9 9 9
}
}
finish_test

20
ext/rbu/sqlite3rbu.c
View File

@ -153,6 +153,10 @@
**
** RBU_STATE_OALSZ:
** Valid if STAGE==1. The size in bytes of the *-oal file.
**
** RBU_STATE_DATATBL:
** Only valid if STAGE==1. The RBU database name of the table
** currently being read.
*/
#define RBU_STATE_STAGE 1
#define RBU_STATE_TBL 2
@ -163,6 +167,7 @@
#define RBU_STATE_COOKIE 7
#define RBU_STATE_OALSZ 8
#define RBU_STATE_PHASEONESTEP 9
#define RBU_STATE_DATATBL 10
#define RBU_STAGE_OAL 1
#define RBU_STAGE_MOVE 2
@ -205,6 +210,7 @@ typedef sqlite3_int64 i64;
struct RbuState {
int eStage;
char *zTbl;
char *zDataTbl;
char *zIdx;
i64 iWalCksum;
int nRow;
@ -2268,6 +2274,7 @@ static sqlite3 *rbuOpenDbhandle(
static void rbuFreeState(RbuState *p){
if( p ){
sqlite3_free(p->zTbl);
sqlite3_free(p->zDataTbl);
sqlite3_free(p->zIdx);
sqlite3_free(p);
}
@ -2338,6 +2345,10 @@ static RbuState *rbuLoadState(sqlite3rbu *p){
pRet->nPhaseOneStep = sqlite3_column_int64(pStmt, 1);
break;
case RBU_STATE_DATATBL:
pRet->zDataTbl = rbuStrndup((char*)sqlite3_column_text(pStmt, 1), &rc);
break;
default:
rc = SQLITE_CORRUPT;
break;
@ -3112,7 +3123,8 @@ static void rbuSaveState(sqlite3rbu *p, int eStage){
"(%d, %lld), "
"(%d, %lld), "
"(%d, %lld), "
"(%d, %lld) ",
"(%d, %lld), "
"(%d, %Q) ",
p->zStateDb,
RBU_STATE_STAGE, eStage,
RBU_STATE_TBL, p->objiter.zTbl,
@ -3122,7 +3134,8 @@ static void rbuSaveState(sqlite3rbu *p, int eStage){
RBU_STATE_CKPT, p->iWalCksum,
RBU_STATE_COOKIE, (i64)pFd->iCookie,
RBU_STATE_OALSZ, p->iOalSz,
RBU_STATE_PHASEONESTEP, p->nPhaseOneStep
RBU_STATE_PHASEONESTEP, p->nPhaseOneStep,
RBU_STATE_DATATBL, p->objiter.zDataTbl
)
);
assert( pInsert==0 || rc==SQLITE_OK );
@ -3378,7 +3391,8 @@ static void rbuSetupOal(sqlite3rbu *p, RbuState *pState){
while( rc==SQLITE_OK && pIter->zTbl && (pIter->bCleanup
|| rbuStrCompare(pIter->zIdx, pState->zIdx)
|| rbuStrCompare(pIter->zTbl, pState->zTbl)
|| (pState->zDataTbl==0 && rbuStrCompare(pIter->zTbl, pState->zTbl))
|| (pState->zDataTbl && rbuStrCompare(pIter->zDataTbl, pState->zDataTbl))
)){
rc = rbuObjIterNext(p, pIter);
}