database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-11-12 13:01:09 +03:00
Code Activity

Have .recover store all orphaned rows in a single table, with extra columns to indicate the orphaned page and sub-tree they were discovered within.

Browse Source 
FossilOrigin-Name: 7221f6e33ed6a5a96ec61e25f2a1f70b84aae66e503d897eb7b7ff1aec42355d
This commit is contained in:
dan
2019-04-26 21:11:37 +00:00
parent ca42438261
commit 98c5ad309f
3 changed files with 133 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
manifest
View File

@@ -1,5 +1,5 @@
C Fix\sanother\sproblem\swith\sdatabase\sfreelist\shandling\sin\sthe\s".recover"\scommand. C Have\s.recover\sstore\sall\sorphaned\srows\sin\sa\ssingle\stable,\swith\sextra\scolumns\sto\sindicate\sthe\sorphaned\spage\sand\ssub-tree\sthey\swere\sdiscovered\swithin.
D 2019-04-26T15:40:27.902 D 2019-04-26T21:11:37.615
F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -520,7 +520,7 @@ F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
F src/resolve.c 567888ee3faec14dae06519b4306201771058364a37560186a3e0e755ebc4cb8 F src/resolve.c 567888ee3faec14dae06519b4306201771058364a37560186a3e0e755ebc4cb8
F src/rowset.c d977b011993aaea002cab3e0bb2ce50cf346000dff94e944d547b989f4b1fe93 F src/rowset.c d977b011993aaea002cab3e0bb2ce50cf346000dff94e944d547b989f4b1fe93
F src/select.c b7304d2f491c11a03a7fbdf34bc218282ac54052377809d4dc3b4b1e7f4bfc93 F src/select.c b7304d2f491c11a03a7fbdf34bc218282ac54052377809d4dc3b4b1e7f4bfc93
F src/shell.c.in 44dce9f5b3c68c07e30db740aa4e635819ab6fa01a229a21356ddd4fa8f1e47e F src/shell.c.in 146dbc2708a314556710f8e8b13226d647fbb70778c973bb6fd655186811ce63
F src/sqlite.h.in 38390767acc1914d58930e03149595ee4710afa4e3c43ab6c3a8aea3f1a6b8cd F src/sqlite.h.in 38390767acc1914d58930e03149595ee4710afa4e3c43ab6c3a8aea3f1a6b8cd
F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
F src/sqlite3ext.h 9ecc93b8493bd20c0c07d52e2ac0ed8bab9b549c7f7955b59869597b650dd8b5 F src/sqlite3ext.h 9ecc93b8493bd20c0c07d52e2ac0ed8bab9b549c7f7955b59869597b650dd8b5
@@ -1821,7 +1821,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
P afdae10424f0f3d0f10a4b73e9732aa55c5ee664814d8ca0edd372cfb17c2445 P bee2652ac26370e612a8c81dd7554befc2d523442a2fbbc77dc73479e6a0d7fd
R 5b76306d65317b1b0fee3a74fc0359d7 R 52eb405413df1bbf1e7b369ddce62695
U dan U dan
Z 068a6ba7f1f2eaa523c5f432cd2b8c0c Z 87ebd735a2a8d2115b37082d2935a00e

2
manifest.uuid
View File

@@ -1 +1 @@
bee2652ac26370e612a8c81dd7554befc2d523442a2fbbc77dc73479e6a0d7fd 7221f6e33ed6a5a96ec61e25f2a1f70b84aae66e503d897eb7b7ff1aec42355d

209
src/shell.c.in
View File

@@ -6226,7 +6226,7 @@ static void recoverFreeTable(RecoverTable *pTab){
sqlite3_free(pTab->zQuoted); sqlite3_free(pTab->zQuoted);
if( pTab->azlCol ){ if( pTab->azlCol ){
int i; int i;
for(i=0; i<pTab->nCol; i++){ for(i=0; i<=pTab->nCol; i++){
sqlite3_free(pTab->azlCol[i]); sqlite3_free(pTab->azlCol[i]);
} }
sqlite3_free(pTab->azlCol); sqlite3_free(pTab->azlCol);
@@ -6235,9 +6235,8 @@ static void recoverFreeTable(RecoverTable *pTab){
} }
} }
static void recoverOldTable( static RecoverTable *recoverOldTable(
int *pRc, /* IN/OUT: Error code */ int *pRc, /* IN/OUT: Error code */
RecoverTable *pTab,
const char *zName, /* Name of table */ const char *zName, /* Name of table */
const char *zSql, /* CREATE TABLE statement */ const char *zSql, /* CREATE TABLE statement */
int bIntkey, int bIntkey,
@@ -6245,12 +6244,14 @@ static void recoverOldTable(
){ ){
sqlite3 *dbtmp = 0; /* sqlite3 handle for testing CREATE TABLE */ sqlite3 *dbtmp = 0; /* sqlite3 handle for testing CREATE TABLE */
int rc = *pRc; int rc = *pRc;
RecoverTable *pTab = 0;
pTab = (RecoverTable*)shellMalloc(&rc, sizeof(RecoverTable));
if( rc==SQLITE_OK ){ if( rc==SQLITE_OK ){
int nSqlCol = 0; int nSqlCol = 0;
int bSqlIntkey = 0; int bSqlIntkey = 0;
sqlite3_stmt *pStmt = 0; sqlite3_stmt *pStmt = 0;
rc = sqlite3_open("", &dbtmp); rc = sqlite3_open("", &dbtmp);
if( rc==SQLITE_OK ){ if( rc==SQLITE_OK ){
rc = sqlite3_exec(dbtmp, "PRAGMA writable_schema = on", 0, 0, 0); rc = sqlite3_exec(dbtmp, "PRAGMA writable_schema = on", 0, 0, 0);
@@ -6285,43 +6286,48 @@ static void recoverOldTable(
shellFinalize(&rc, pStmt); shellFinalize(&rc, pStmt);
if( bIntkey==bSqlIntkey ){ if( bIntkey==bSqlIntkey ){
int i;
const char *zPk = "_rowid_"; const char *zPk = "_rowid_";
sqlite3_stmt *pPkFinder = 0; sqlite3_stmt *pPkFinder = 0;
shellPreparePrintf(dbtmp, &rc, &pPkFinder, pTab->iPk = -2;
if( bIntkey ){
shellPreparePrintf(dbtmp, &rc, &pPkFinder,
"SELECT cid, name FROM pragma_table_info(%Q) " "SELECT cid, name FROM pragma_table_info(%Q) "
" WHERE pk=1 AND type='integer' COLLATE nocase" " WHERE pk=1 AND type='integer' COLLATE nocase"
" AND NOT EXISTS (SELECT cid FROM pragma_table_info(%Q) WHERE pk=2)", " AND NOT EXISTS (SELECT cid FROM pragma_table_info(%Q) WHERE pk=2)"
zName, zName , zName, zName
); );
if( rc==SQLITE_OK && SQLITE_ROW==sqlite3_step(pPkFinder) ){ if( rc==SQLITE_OK && SQLITE_ROW==sqlite3_step(pPkFinder) ){
pTab->iPk = sqlite3_column_int(pPkFinder, 0); pTab->iPk = sqlite3_column_int(pPkFinder, 0);
zPk = (const char*)sqlite3_column_text(pPkFinder, 1); zPk = (const char*)sqlite3_column_text(pPkFinder, 1);
}
} }
pTab->zName = shellMPrintf(&rc, "%s", zName); pTab->zName = shellMPrintf(&rc, "%s", zName);
pTab->zQuoted = shellMPrintf(&rc, "%Q", pTab->zName); pTab->zQuoted = shellMPrintf(&rc, "%Q", pTab->zName);
pTab->azlCol = (char**)shellMalloc(&rc, sizeof(char*) * nSqlCol); pTab->azlCol = (char**)shellMalloc(&rc, sizeof(char*) * (nSqlCol+1));
pTab->nCol = nSqlCol; pTab->nCol = nSqlCol;
if( nSqlCol==1 && pTab->iPk==0 ){ if( bIntkey ){
pTab->azlCol[0] = shellMPrintf(&rc, "%Q", zPk); pTab->azlCol[0] = shellMPrintf(&rc, "%Q", zPk);
}else{ }else{
shellPreparePrintf(dbtmp, &rc, &pStmt, pTab->azlCol[0] = shellMPrintf(&rc, "");
"SELECT -1+row_number() OVER (ORDER BY cid),"
" %Q||%Q||group_concat(name, ', ') FILTER (WHERE cid!=%d) "
" OVER (ORDER BY cid) "
"FROM pragma_table_info(%Q)",
(bIntkey ? zPk : ""), (bIntkey ? ", " : ""),
pTab->iPk, zName
);
while( rc==SQLITE_OK && SQLITE_ROW==sqlite3_step(pStmt) ){
int idx = sqlite3_column_int(pStmt, 0);
const char *zText = (const char*)sqlite3_column_text(pStmt, 1);
pTab->azlCol[idx] = shellMPrintf(&rc, "%s", zText);
}
shellFinalize(&rc, pStmt);
} }
i = 1;
shellPreparePrintf(dbtmp, &rc, &pStmt,
"SELECT %Q || group_concat(name, ', ') "
" FILTER (WHERE cid!=%d) OVER (ORDER BY cid) "
"FROM pragma_table_info(%Q)",
bIntkey ? ", " : "", pTab->iPk, zName
);
while( rc==SQLITE_OK && SQLITE_ROW==sqlite3_step(pStmt) ){
const char *zText = (const char*)sqlite3_column_text(pStmt, 0);
pTab->azlCol[i] = shellMPrintf(&rc, "%s%s", pTab->azlCol[0], zText);
i++;
}
shellFinalize(&rc, pStmt);
shellFinalize(&rc, pPkFinder); shellFinalize(&rc, pPkFinder);
} }
} }
@@ -6329,6 +6335,11 @@ static void recoverOldTable(
finished: finished:
sqlite3_close(dbtmp); sqlite3_close(dbtmp);
*pRc = rc; *pRc = rc;
if( rc!=SQLITE_OK ){
recoverFreeTable(pTab);
pTab = 0;
}
return pTab;
} }
static RecoverTable *recoverNewTable( static RecoverTable *recoverNewTable(
@@ -6336,7 +6347,8 @@ static RecoverTable *recoverNewTable(
int *pRc, int *pRc,
int iRoot, int iRoot,
int bIntkey, int bIntkey,
int nCol int nCol,
int *pbNoop
){ ){
sqlite3_stmt *pStmt = 0; sqlite3_stmt *pStmt = 0;
RecoverTable *pRet = 0; RecoverTable *pRet = 0;
@@ -6344,8 +6356,6 @@ static RecoverTable *recoverNewTable(
const char *zSql = 0; const char *zSql = 0;
const char *zName = 0; const char *zName = 0;
pRet = (RecoverTable*)shellMalloc(pRc, sizeof(RecoverTable));
if( pRet ) pRet->iPk = -2;
/* Search the recovered schema for an object with root page iRoot. */ /* Search the recovered schema for an object with root page iRoot. */
shellPreparePrintf(pState->db, pRc, &pStmt, shellPreparePrintf(pState->db, pRc, &pStmt,
@@ -6360,55 +6370,56 @@ static RecoverTable *recoverNewTable(
if( sqlite3_stricmp(zType, "table")==0 ){ if( sqlite3_stricmp(zType, "table")==0 ){
zName = (const char*)sqlite3_column_text(pStmt, 1); zName = (const char*)sqlite3_column_text(pStmt, 1);
zSql = (const char*)sqlite3_column_text(pStmt, 2); zSql = (const char*)sqlite3_column_text(pStmt, 2);
recoverOldTable(pRc, pRet, zName, zSql, bIntkey, nCol); pRet = recoverOldTable(pRc, zName, zSql, bIntkey, nCol);
break; break;
} }
} }
shellFinalize(pRc, pStmt); shellFinalize(pRc, pStmt);
if( bNoop ){ *pbNoop = bNoop;
sqlite3_free(pRet); return pRet;
return 0; }
}
if( pRet && pRet->zName==0 ){ static RecoverTable *recoverOrphanTable(
sqlite3_stmt *pStmt = 0; ShellState *pState,
int *pRc,
pRet->zName = shellMPrintf(pRc, "orphan_%d_%d", nCol, iRoot); int nCol
pRet->zQuoted = shellMPrintf(pRc, "%Q", pRet->zName); ){
pRet->azlCol = (char**)shellMalloc(pRc, sizeof(char*) * nCol); RecoverTable *pTab = 0;
pRet->nCol = nCol; if( nCol>=0 && *pRc==SQLITE_OK ){
int i;
shellPreparePrintf(pState->db, pRc, &pStmt, raw_printf(pState->out,
"WITH s(i) AS (" "CREATE TABLE recover_orphan(rootpgno INTEGER, "
" SELECT 1 UNION ALL SELECT i+1 FROM s WHERE i<%d" "pgno INTEGER, nfield INTEGER, id INTEGER"
")"
"SELECT i-1, %Q || group_concat('c' || i, ', ') OVER (ORDER BY i) FROM s",
nCol, (bIntkey ? "id, " : "")
); );
while( *pRc==SQLITE_OK && SQLITE_ROW==sqlite3_step(pStmt) ){ for(i=0; i<nCol; i++){
int idx = sqlite3_column_int(pStmt, 0); raw_printf(pState->out, ", c%d", i);
const char *zText = (const char*)sqlite3_column_text(pStmt, 1);
pRet->azlCol[idx] = shellMPrintf(pRc, "%s", zText);
} }
shellFinalize(pRc, pStmt); raw_printf(pState->out, ");\n");
if( *pRc==SQLITE_OK ){ pTab = (RecoverTable*)shellMalloc(pRc, sizeof(RecoverTable));
char *zCreate = shellMPrintf(pRc, "CREATE TABLE %Q (%s)", if( pTab ){
pRet->zName, pRet->azlCol[nCol-1] pTab->zName = shellMPrintf(pRc, "%s", "recover_orphan");
); pTab->zQuoted = shellMPrintf(pRc, "%Q", pTab->zName);
if( zCreate ){ pTab->nCol = nCol;
raw_printf(pState->out, "%s;\n", zCreate); pTab->iPk = -2;
sqlite3_free(zCreate); if( nCol>0 ){
pTab->azlCol = (char**)shellMalloc(pRc, sizeof(char*) * (nCol+1));
if( pTab->azlCol ){
pTab->azlCol[nCol] = shellMPrintf(pRc, "");
for(i=nCol-1; i>=0; i--){
pTab->azlCol[i] = shellMPrintf(pRc, "%s, NULL", pTab->azlCol[i+1]);
}
}
} }
} }
}
if( *pRc!=SQLITE_OK ){ if( *pRc!=SQLITE_OK ){
recoverFreeTable(pRet); recoverFreeTable(pTab);
pRet = 0; pTab = 0;
}
} }
return pTab;
return pRet;
} }
/* /*
@@ -6423,6 +6434,8 @@ static int recoverDatabaseCmd(ShellState *pState, int nArg, char **azArg){
sqlite3_stmt *pCells = 0; /* Loop through all cells in a page */ sqlite3_stmt *pCells = 0; /* Loop through all cells in a page */
const char *zRecoveryDb = ""; /* Name of "recovery" database */ const char *zRecoveryDb = ""; /* Name of "recovery" database */
int i; int i;
int nOrphan = -1;
RecoverTable *pOrphan = 0;
int bFreelist = 1; /* 0 if --freelist-corrupt is specified */ int bFreelist = 1; /* 0 if --freelist-corrupt is specified */
for(i=1; i<nArg; i++){ for(i=1; i<nArg; i++){
@@ -6545,6 +6558,7 @@ static int recoverDatabaseCmd(ShellState *pState, int nArg, char **azArg){
" SELECT pgno FROM recovery.map WHERE root=1" " SELECT pgno FROM recovery.map WHERE root=1"
")" ")"
"GROUP BY pgno, cell;" "GROUP BY pgno, cell;"
"CREATE INDEX recovery.schema_rootpage ON schema(rootpage);"
); );
/* Open a transaction, then print out all non-virtual, non-"sqlite_%" /* Open a transaction, then print out all non-virtual, non-"sqlite_%"
@@ -6566,6 +6580,20 @@ static int recoverDatabaseCmd(ShellState *pState, int nArg, char **azArg){
shellFinalize(&rc, pStmt); shellFinalize(&rc, pStmt);
} }
/* Figure out if an orphan table will be required. And if so, how many
** user columns it should contain */
shellPrepare(pState->db, &rc,
"SELECT coalesce(max(maxlen), -2) FROM recovery.map"
" WHERE root>1 AND root NOT IN (SELECT rootpage FROM recovery.schema)"
, &pLoop
);
if( rc==SQLITE_OK && SQLITE_ROW==sqlite3_step(pLoop) ){
nOrphan = sqlite3_column_int(pLoop, 0);
}
shellFinalize(&rc, pLoop);
pLoop = 0;
pOrphan = recoverOrphanTable(pState, &rc, nOrphan);
shellPrepare(pState->db, &rc, shellPrepare(pState->db, &rc,
"SELECT pgno FROM recovery.map WHERE root=?", &pPages "SELECT pgno FROM recovery.map WHERE root=?", &pPages
); );
@@ -6586,33 +6614,48 @@ static int recoverDatabaseCmd(ShellState *pState, int nArg, char **azArg){
int iRoot = sqlite3_column_int(pLoop, 0); int iRoot = sqlite3_column_int(pLoop, 0);
int bIntkey = sqlite3_column_int(pLoop, 1); int bIntkey = sqlite3_column_int(pLoop, 1);
int nCol = sqlite3_column_int(pLoop, 2); int nCol = sqlite3_column_int(pLoop, 2);
int bNoop = 0;
RecoverTable *pTab; RecoverTable *pTab;
pTab = recoverNewTable(pState, &rc, iRoot, bIntkey, nCol); pTab = recoverNewTable(pState, &rc, iRoot, bIntkey, nCol, &bNoop);
if( pTab ){ if( bNoop || rc ) continue;
if( 0==sqlite3_stricmp(pTab->zName, "sqlite_sequence") ){ if( pTab==0 ) pTab = pOrphan;
raw_printf(pState->out, "DELETE FROM sqlite_sequence;\n");
} if( 0==sqlite3_stricmp(pTab->zName, "sqlite_sequence") ){
sqlite3_bind_int(pPages, 1, iRoot); raw_printf(pState->out, "DELETE FROM sqlite_sequence;\n");
sqlite3_bind_int(pCells, 2, pTab->iPk); }
while( rc==SQLITE_OK && SQLITE_ROW==sqlite3_step(pPages) ){ sqlite3_bind_int(pPages, 1, iRoot);
sqlite3_bind_int(pCells, 1, sqlite3_column_int(pPages, 0)); sqlite3_bind_int(pCells, 2, pTab->iPk);
while( rc==SQLITE_OK && SQLITE_ROW==sqlite3_step(pCells) ){
int iMax = sqlite3_column_int(pCells, 0); while( rc==SQLITE_OK && SQLITE_ROW==sqlite3_step(pPages) ){
const char *zVal = (const char*)sqlite3_column_text(pCells, 1); int iPgno = sqlite3_column_int(pPages, 0);
sqlite3_bind_int(pCells, 1, iPgno);
while( rc==SQLITE_OK && SQLITE_ROW==sqlite3_step(pCells) ){
int nField = sqlite3_column_int(pCells, 0);
const char *zVal = (const char*)sqlite3_column_text(pCells, 1);
nField = nField+1;
if( pTab==pOrphan ){
raw_printf(pState->out,
"INSERT INTO %s VALUES(%d, %d, %d, %s%s%s);\n",
pTab->zQuoted, iRoot, iPgno, nField,
bIntkey ? "" : "NULL, ", zVal, pTab->azlCol[nField]
);
}else{
raw_printf(pState->out, "INSERT INTO %s(%s) VALUES( %s );\n", raw_printf(pState->out, "INSERT INTO %s(%s) VALUES( %s );\n",
pTab->zQuoted, pTab->azlCol[iMax>0?iMax:0], zVal pTab->zQuoted, pTab->azlCol[nField], zVal
); );
} }
shellReset(&rc, pCells);
} }
shellReset(&rc, pPages); shellReset(&rc, pCells);
} }
recoverFreeTable(pTab); shellReset(&rc, pPages);
if( pTab!=pOrphan ) recoverFreeTable(pTab);
} }
shellFinalize(&rc, pLoop); shellFinalize(&rc, pLoop);
shellFinalize(&rc, pPages); shellFinalize(&rc, pPages);
shellFinalize(&rc, pCells); shellFinalize(&rc, pCells);
recoverFreeTable(pOrphan);
/* The rest of the schema */ /* The rest of the schema */
if( rc==SQLITE_OK ){ if( rc==SQLITE_OK ){