Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Reorganize the code in sqlite3ota.c in preparation for adding support for update and delete operations. |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | ota-update |
Files: | files | file ages | folders |
SHA1: |
98387f05697526c7740e91d8a846a31f |
User & Date: | dan 2014-09-05 19:31:15.782 |
Context
2014-09-05
| ||
19:52 | Switch back to using a single database connection in sqlite3ota.c. (check-in: 3c2f4a0781 user: dan tags: ota-update) | |
19:31 | Reorganize the code in sqlite3ota.c in preparation for adding support for update and delete operations. (check-in: 98387f0569 user: dan tags: ota-update) | |
2014-09-04
| ||
19:05 | Avoid ever running a checkpoint in ota mode. (check-in: 9ae4444725 user: dan tags: ota-update) | |
Changes
Changes to ext/ota/ota1.test.
︙ | ︙ | |||
59 60 61 62 63 64 65 | set rc [ota step] ota close if {$rc != "SQLITE_OK"} break } set rc } | | | 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 | set rc [ota step] ota close if {$rc != "SQLITE_OK"} break } set rc } foreach {tn2 cmd} {1 run_ota 2 step_ota} { foreach {tn schema} { 1 { CREATE TABLE t1(a INTEGER PRIMARY KEY, b, c); } 2 { CREATE TABLE t1(a INTEGER PRIMARY KEY, b, c); CREATE INDEX i1 ON t1(b); |
︙ | ︙ |
Changes to ext/ota/sqlite3ota.c.
︙ | ︙ | |||
26 27 28 29 30 31 32 | ** single row: ** ** "tbl" -> Table currently being written (target database names). ** ** "idx" -> Index currently being written (target database names). ** Or, if the main table is being written, a NULL value. ** | | | | > > > > > | > > > > | > > < < < | | | | < | < < < < < | | | < < | < < < < < < < < | | | < | > | < < | < | < < < < | > > | | > > > > > > > > > > < | > > > > > > > > > > > > > > > > > < | > | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | < > > > | > | > > > > | | | < | | > < | | < < | < | | | < < < < | < < < < < < < < | < < < < < < | < | < | | < | > | | > | > | | > > > < | | < | < < < < < | < | | | < < < < | > > | > > > > | > > > > | | | | > | | < < < | | < < | < < < < < < < < | | | | | < < | | < < | | < | < | < | > | | < < < < < < < < < | | | | | < < | | | | > > | | > > | | | | < < < < < < | < | < < | < < < < < < < < < < < | > > | > | < | > | < < < < | | | > > > | < < > > | < < > | > | | | < < < < < < < | | | < < | < < < | | | | < < | > > | > > > > | | | | | < < | < | | < < < < < < < < < | < < | | < | > > > > | < > > | | | < < | > > | | < < | > > > > > > | < < < < | < < < < < | < < < < | < < < | < < < < < < < < | | < < < | | < | < | < < | | | < < < > | < < | | < | > | | | < < | | > | 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 | ** single row: ** ** "tbl" -> Table currently being written (target database names). ** ** "idx" -> Index currently being written (target database names). ** Or, if the main table is being written, a NULL value. ** ** "row" -> Number of rows for this object already processed ** ** "progress" -> total number of key/value b-tree operations performed ** so far as part of this ota update. */ #define OTA_CREATE_STATE "CREATE TABLE IF NOT EXISTS ota_state" \ "(tbl, idx, row, progress)" typedef struct OtaState OtaState; typedef struct OtaObjIter OtaObjIter; typedef unsigned char u8; /* ** A structure to store values read from the ota_state table in memory. */ struct OtaState { char *zTbl; char *zIdx; int nRow; }; /* ** An iterator of this type is used to iterate through all objects in ** the target database that require updating. For each such table, the ** iterator visits, in order: ** ** * the table itself, ** * each index of the table (zero or more points to visit), and ** * a special "cleanup table" point. */ struct OtaObjIter { sqlite3_stmt *pTblIter; /* Iterate through tables */ sqlite3_stmt *pIdxIter; /* Index iterator */ int nTblCol; /* Size of azTblCol[] array */ char **azTblCol; /* Array of quoted column names */ u8 *abTblPk; /* Array of flags - true for PK columns */ /* Output variables. zTbl==0 implies EOF. */ int bCleanup; /* True in "cleanup" state */ const char *zTbl; /* Name of target db table */ const char *zIdx; /* Name of target db index (or null) */ int iVisit; /* Number of points visited, incl. current */ /* Statements created by otaObjIterPrepareAll() */ int nCol; /* Number of columns in current object */ sqlite3_stmt *pSelect; /* Source data */ sqlite3_stmt *pInsert; /* Statement for INSERT operations */ }; /* ** OTA handle. */ struct sqlite3ota { sqlite3 *dbDest; /* Target db */ sqlite3 *dbOta; /* Ota db */ char *zTarget; /* Path to target db */ int rc; /* Value returned by last ota_step() call */ char *zErrmsg; /* Error message if rc!=SQLITE_OK */ int nStep; /* Rows processed for current object */ OtaObjIter objiter; }; /* ** Prepare the SQL statement in buffer zSql against database handle db. ** If successful, set *ppStmt to point to the new statement and return ** SQLITE_OK. ** ** Otherwise, if an error does occur, set *ppStmt to NULL and return ** an SQLite error code. Additionally, set output variable *pzErrmsg to ** point to a buffer containing an error message. It is the responsibility ** of the caller to (eventually) free this buffer using sqlite3_free(). */ static int prepareAndCollectError( sqlite3 *db, sqlite3_stmt **ppStmt, char **pzErrmsg, const char *zSql ){ int rc = sqlite3_prepare_v2(db, zSql, -1, ppStmt, 0); if( rc!=SQLITE_OK ){ *pzErrmsg = sqlite3_mprintf("%s", sqlite3_errmsg(db)); *ppStmt = 0; } return rc; } /* ** Reset the SQL statement passed as the first argument. Return a copy ** of the value returned by sqlite3_reset(). ** ** If an error has occurred, then set *pzErrmsg to point to a buffer ** containing an error message. It is the responsibility of the caller ** to eventually free this buffer using sqlite3_free(). */ static int resetAndCollectError(sqlite3_stmt *pStmt, char **pzErrmsg){ int rc = sqlite3_reset(pStmt); if( rc!=SQLITE_OK ){ *pzErrmsg = sqlite3_mprintf("%s", sqlite3_errmsg(sqlite3_db_handle(pStmt))); } return rc; } /* ** Unless it is NULL, argument zSql points to a buffer allocated using ** sqlite3_malloc containing an SQL statement. This function prepares the SQL ** statement against database db and frees the buffer. If statement ** compilation is successful, *ppStmt is set to point to the new statement ** handle and SQLITE_OK is returned. ** ** Otherwise, if an error occurs, *ppStmt is set to NULL and an error code ** returned. In this case, *pzErrmsg may also be set to point to an error ** message. It is the responsibility of the caller to free this error message ** buffer using sqlite3_free(). ** ** If argument zSql is NULL, this function assumes that an OOM has occurred. ** In this case SQLITE_NOMEM is returned and *ppStmt set to NULL. */ static int prepareFreeAndCollectError( sqlite3 *db, sqlite3_stmt **ppStmt, char **pzErrmsg, char *zSql ){ int rc; assert( *pzErrmsg==0 ); if( zSql==0 ){ rc = SQLITE_NOMEM; *ppStmt = 0; }else{ rc = prepareAndCollectError(db, ppStmt, pzErrmsg, zSql); sqlite3_free(zSql); } return rc; } /* ** Free the OtaObjIter.azTblCol[] and OtaObjIter.abTblPk[] arrays allocated ** by an earlier call to otaObjIterGetCols(). */ static void otaObjIterFreeCols(OtaObjIter *pIter){ int i; for(i=0; i<pIter->nTblCol; i++){ sqlite3_free(pIter->azTblCol[i]); } sqlite3_free(pIter->azTblCol); sqlite3_free(pIter->abTblPk); pIter->azTblCol = 0; pIter->abTblPk = 0; pIter->nTblCol = 0; } /* ** Clean up any resources allocated as part of the iterator object passed ** as the only argument. */ static void otaObjIterFinalize(OtaObjIter *pIter){ sqlite3_finalize(pIter->pTblIter); sqlite3_finalize(pIter->pIdxIter); sqlite3_finalize(pIter->pSelect); sqlite3_finalize(pIter->pInsert); otaObjIterFreeCols(pIter); memset(pIter, 0, sizeof(OtaObjIter)); } /* ** Advance the iterator to the next position. ** ** If no error occurs, SQLITE_OK is returned and the iterator is left ** pointing to the next entry. Otherwise, an error code and message is ** left in the OTA handle passed as the first argument. A copy of the ** error code is returned. */ static int otaObjIterNext(sqlite3ota *p, OtaObjIter *pIter){ int rc = p->rc; if( rc==SQLITE_OK ){ /* Free any SQLite statements used while processing the previous object */ sqlite3_finalize(pIter->pSelect); sqlite3_finalize(pIter->pInsert); pIter->pSelect = 0; pIter->pInsert = 0; pIter->nCol = 0; if( pIter->bCleanup ){ otaObjIterFreeCols(pIter); pIter->bCleanup = 0; rc = sqlite3_step(pIter->pTblIter); if( rc!=SQLITE_ROW ){ rc = sqlite3_reset(pIter->pTblIter); pIter->zTbl = 0; }else{ pIter->zTbl = (const char*)sqlite3_column_text(pIter->pTblIter, 0); rc = SQLITE_OK; } }else{ if( pIter->zIdx==0 ){ sqlite3_bind_text(pIter->pIdxIter, 1, pIter->zTbl, -1, SQLITE_STATIC); } rc = sqlite3_step(pIter->pIdxIter); if( rc!=SQLITE_ROW ){ rc = sqlite3_reset(pIter->pIdxIter); pIter->bCleanup = 1; pIter->zIdx = 0; }else{ pIter->zIdx = (const char*)sqlite3_column_text(pIter->pIdxIter, 0); rc = SQLITE_OK; } } } if( rc!=SQLITE_OK ){ otaObjIterFinalize(pIter); p->rc = rc; } pIter->iVisit++; return rc; } /* ** Initialize the iterator structure passed as the second argument. ** ** If no error occurs, SQLITE_OK is returned and the iterator is left ** pointing to the first entry. Otherwise, an error code and message is ** left in the OTA handle passed as the first argument. A copy of the ** error code is returned. */ static int otaObjIterFirst(sqlite3ota *p, OtaObjIter *pIter){ int rc; memset(pIter, 0, sizeof(OtaObjIter)); rc = prepareAndCollectError(p->dbOta, &pIter->pTblIter, &p->zErrmsg, "SELECT substr(name, 6) FROM sqlite_master " "WHERE type='table' AND name LIKE 'data_%'" ); if( rc==SQLITE_OK ){ rc = prepareAndCollectError(p->dbDest, &pIter->pIdxIter, &p->zErrmsg, "SELECT name FROM sqlite_master " "WHERE type='index' AND tbl_name = ?" ); } pIter->bCleanup = 1; p->rc = rc; return otaObjIterNext(p, pIter); } /* ** Allocate a buffer and populate it with the double-quoted version of the ** string in the argument buffer, suitable for use as an SQL identifier. ** For example: ** ** [quick "brown" fox] -> ["quick ""brown"" fox"] ** ** Assuming the allocation is successful, a pointer to the new buffer is ** returned. It is the responsibility of the caller to free it using ** sqlite3_free() at some point in the future. Or, if the allocation fails, ** a NULL pointer is returned. */ static char *otaQuoteName(const char *zName){ int nName = strlen(zName); char *zRet = sqlite3_malloc(nName * 2 + 2 + 1); if( zRet ){ int i; char *p = zRet; *p++ = '"'; for(i=0; i<nName; i++){ if( zName[i]=='"' ) *p++ = '"'; *p++ = zName[i]; } *p++ = '"'; *p++ = '\0'; } return zRet; } /* ** If they are not already populated, populate the pIter->azTblCol[], ** pIter->abTblPk[] and pIter->nTblCol variables according to the table ** that the iterator currently points to. ** ** Return SQLITE_OK if successful, or an SQLite error code otherwise. If ** an error does occur, an error code and error message are also left in ** the OTA handle. */ static int otaObjIterGetCols(sqlite3ota *p, OtaObjIter *pIter){ if( pIter->azTblCol==0 ){ sqlite3_stmt *pStmt; char *zSql; int nCol = 0; int bSeenPk = 0; int rc2; /* sqlite3_finalize() return value */ zSql = sqlite3_mprintf("PRAGMA table_info(%Q)", pIter->zTbl); p->rc = prepareFreeAndCollectError(p->dbDest, &pStmt, &p->zErrmsg, zSql); while( p->rc==SQLITE_OK && SQLITE_ROW==sqlite3_step(pStmt) ){ if( (nCol % 8)==0 ){ int nByte = sizeof(char*) * (nCol+8); char **azNew = (char**)sqlite3_realloc(pIter->azTblCol, nByte); u8 *abNew = (u8*)sqlite3_realloc(pIter->azTblCol, nCol+8); if( azNew ) pIter->azTblCol = azNew; if( abNew ) pIter->abTblPk = abNew; if( azNew==0 || abNew==0 ) p->rc = SQLITE_NOMEM; } if( p->rc==SQLITE_OK ){ const char *zName = (const char*)sqlite3_column_text(pStmt, 1); pIter->abTblPk[nCol] = sqlite3_column_int(pStmt, 5); if( pIter->abTblPk[nCol] ) bSeenPk = 1; pIter->azTblCol[nCol] = otaQuoteName(zName); if( pIter->azTblCol[nCol]==0 ) p->rc = SQLITE_NOMEM; nCol++; } } pIter->nTblCol = nCol; rc2 = sqlite3_finalize(pStmt); if( p->rc==SQLITE_OK ) p->rc = rc2; if( p->rc==SQLITE_OK && bSeenPk==0 ){ p->zErrmsg = sqlite3_mprintf("table %s has no PRIMARY KEY", pIter->zTbl); p->rc = SQLITE_ERROR; } } return p->rc; } static char *otaObjIterGetCollist( sqlite3ota *p, OtaObjIter *pIter, int nCol, int *aiCol ){ char *zList = 0; if( p->rc==SQLITE_OK ){ const char *zSep = ""; int i; for(i=0; i<nCol; i++){ int iCol = aiCol ? aiCol[i] : i; zList = sqlite3_mprintf("%z%s%s", zList, zSep, pIter->azTblCol[iCol]); zSep = ", "; if( zList==0 ){ p->rc = SQLITE_NOMEM; break; } } } return zList; } static char *otaObjIterGetBindlist(sqlite3ota *p, int nBind){ char *zRet = 0; if( p->rc==SQLITE_OK ){ int nByte = nBind*2 + 1; zRet = sqlite3_malloc(nByte); if( zRet==0 ){ p->rc = SQLITE_NOMEM; }else{ int i; for(i=0; i<nBind; i++){ zRet[i*2] = '?'; zRet[i*2+1] = (i+1==nBind) ? '\0' : ','; } } } return zRet; } /* ** Ensure that the SQLite statement handles required to update the ** target database object currently indicated by the iterator passed ** as the second argument are available. */ static int otaObjIterPrepareAll( sqlite3ota *p, OtaObjIter *pIter, int nOffset /* Add "LIMIT -1 OFFSET $nOffset" to SELECT */ ){ assert( pIter->bCleanup==0 ); if( pIter->pSelect==0 && otaObjIterGetCols(p, pIter)==SQLITE_OK ){ char *zCollist = 0; /* List of indexed columns */ char **pz = &p->zErrmsg; const char *zIdx = pIter->zIdx; char *zLimit = 0; if( nOffset ){ zLimit = sqlite3_mprintf(" LIMIT -1 OFFSET %d", nOffset); if( !zLimit ) p->rc = SQLITE_NOMEM; } if( zIdx ){ int *aiCol; /* Column map */ /* Create the index writer */ if( p->rc==SQLITE_OK ){ p->rc = sqlite3_index_writer( p->dbDest, 0, zIdx, &pIter->pInsert, &aiCol, &pIter->nCol ); } /* Create the SELECT statement to read keys in sorted order */ zCollist = otaObjIterGetCollist(p, pIter, pIter->nCol, aiCol); if( p->rc==SQLITE_OK ){ p->rc = prepareFreeAndCollectError(p->dbOta, &pIter->pSelect, pz, sqlite3_mprintf( "SELECT %s FROM 'data_%q' ORDER BY %s%s", zCollist, pIter->zTbl, zCollist, zLimit ) ); } }else{ char *zBindings = otaObjIterGetBindlist(p, pIter->nTblCol); zCollist = otaObjIterGetCollist(p, pIter, pIter->nTblCol, 0); pIter->nCol = pIter->nTblCol; /* Create the SELECT statement to read keys from data_xxx */ if( p->rc==SQLITE_OK ){ p->rc = prepareFreeAndCollectError(p->dbOta, &pIter->pSelect, pz, sqlite3_mprintf( "SELECT %s FROM 'data_%q'%s", zCollist, pIter->zTbl, zLimit) ); } /* Create the INSERT statement to write to the target PK b-tree */ if( p->rc==SQLITE_OK ){ p->rc = prepareFreeAndCollectError(p->dbDest, &pIter->pInsert, pz, sqlite3_mprintf( "INSERT INTO %Q(%s) VALUES(%s)", pIter->zTbl, zCollist, zBindings ) ); } sqlite3_free(zBindings); } sqlite3_free(zCollist); sqlite3_free(zLimit); } return p->rc; } /* ** This function does the work for an sqlite3ota_step() call. ** ** The object-iterator (p->objiter) currently points to a valid object, ** and the input cursor (p->objiter.pSelect) currently points to a valid ** input row. Perform whatever processing is required and return. ** ** If no error occurs, SQLITE_OK is returned. Otherwise, an error code ** and message is left in the OTA handle and a copy of the error code ** returned. */ static int otaStep(sqlite3ota *p){ OtaObjIter *pIter = &p->objiter; int i; for(i=0; i<pIter->nCol; i++){ sqlite3_value *pVal = sqlite3_column_value(pIter->pSelect, i); sqlite3_bind_value(pIter->pInsert, i+1, pVal); } sqlite3_step(pIter->pInsert); p->rc = resetAndCollectError(pIter->pInsert, &p->zErrmsg); return p->rc; } /* ** Step the OTA object. */ int sqlite3ota_step(sqlite3ota *p){ if( p ){ OtaObjIter *pIter = &p->objiter; while( p && p->rc==SQLITE_OK && pIter->zTbl ){ if( pIter->bCleanup ){ /* this is where cleanup of the ota_xxx table will happen... */ }else{ otaObjIterPrepareAll(p, pIter, 0); /* Advance to the next row to process. */ if( p->rc==SQLITE_OK ){ int rc = sqlite3_step(pIter->pSelect); if( rc==SQLITE_ROW ){ p->nStep++; return otaStep(p); } p->rc = sqlite3_reset(pIter->pSelect); p->nStep = 0; } } otaObjIterNext(p, pIter); } if( p->rc==SQLITE_OK && pIter->zTbl==0 ){ p->rc = SQLITE_DONE; } } return p->rc; } static void otaOpenDatabase(sqlite3ota *p, sqlite3 **pDb, const char *zFile){ if( p->rc==SQLITE_OK ){ p->rc = sqlite3_open(zFile, pDb); if( p->rc ){ const char *zErr = sqlite3_errmsg(*pDb); p->zErrmsg = sqlite3_mprintf("sqlite3_open(): %s", zErr); } } } static void otaSaveTransactionState(sqlite3ota *p){ char *zInsert; zInsert = sqlite3_mprintf( "INSERT OR REPLACE INTO ota_state(rowid, tbl, idx, row, progress)" "VALUES(1, %Q, %Q, %d, NULL)", p->objiter.zTbl, p->objiter.zIdx, p->nStep ); if( zInsert==0 ){ p->rc = SQLITE_NOMEM; }else{ p->rc = sqlite3_exec(p->dbOta, zInsert, 0, 0, &p->zErrmsg); if( p->rc==SQLITE_OK ){ p->rc = sqlite3_exec(p->dbOta, "COMMIT", 0, 0, &p->zErrmsg); } |
︙ | ︙ | |||
547 548 549 550 551 552 553 | static OtaState *otaLoadState(sqlite3ota *p){ const char *zSelect = "SELECT tbl, idx, row, progress FROM ota_state"; OtaState *pRet = 0; sqlite3_stmt *pStmt; int rc; assert( p->rc==SQLITE_OK ); | | | > > > > > > > < < < < < | < < < < < < < | < > | | | | > | | | | | < < < | < < < < < < < < | < < < | | | 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 | static OtaState *otaLoadState(sqlite3ota *p){ const char *zSelect = "SELECT tbl, idx, row, progress FROM ota_state"; OtaState *pRet = 0; sqlite3_stmt *pStmt; int rc; assert( p->rc==SQLITE_OK ); rc = prepareAndCollectError(p->dbOta, &pStmt, &p->zErrmsg, zSelect); if( rc==SQLITE_OK ){ if( sqlite3_step(pStmt)==SQLITE_ROW ){ const char *zIdx = (const char*)sqlite3_column_text(pStmt, 1); const char *zTbl = (const char*)sqlite3_column_text(pStmt, 0); int nIdx = zIdx ? (strlen(zIdx) + 1) : 0; int nTbl = strlen(zTbl) + 1; int nByte = sizeof(OtaState) + nTbl + nIdx; pRet = (OtaState*)sqlite3_malloc(nByte); if( pRet ){ pRet->zTbl = (char*)&pRet[1]; memcpy(pRet->zTbl, sqlite3_column_text(pStmt, 0), nTbl); if( zIdx ){ pRet->zIdx = &pRet->zTbl[nTbl]; memcpy(pRet->zIdx, zIdx, nIdx); }else{ pRet->zIdx = 0; } pRet->nRow = sqlite3_column_int(pStmt, 2); } }else{ pRet = (OtaState*)sqlite3_malloc(sizeof(OtaState)); if( pRet ){ memset(pRet, 0, sizeof(*pRet)); } } rc = sqlite3_finalize(pStmt); if( rc==SQLITE_OK && pRet==0 ) rc = SQLITE_NOMEM; if( rc!=SQLITE_OK ){ sqlite3_free(pRet); pRet = 0; } } p->rc = rc; return pRet; } static int otaStrCompare(const char *z1, const char *z2){ if( z1==0 && z2==0 ) return 0; if( z1==0 || z2==0 ) return 1; return (sqlite3_stricmp(z1, z2)!=0); } static void otaLoadTransactionState(sqlite3ota *p, OtaState *pState){ assert( p->rc==SQLITE_OK ); if( pState->zTbl ){ OtaObjIter *pIter = &p->objiter; int rc; while( rc==SQLITE_OK && pIter->zTbl && (pIter->bCleanup || otaStrCompare(pIter->zTbl, pState->zTbl) || otaStrCompare(pIter->zIdx, pState->zIdx) )){ rc = otaObjIterNext(p, &p->objiter); } if( rc==SQLITE_OK && !p->objiter.zTbl ){ rc = SQLITE_ERROR; p->zErrmsg = sqlite3_mprintf("ota_state mismatch error"); } if( rc==SQLITE_OK ){ p->nStep = pState->nRow; rc = otaObjIterPrepareAll(p, &p->objiter, p->nStep); } p->rc = rc; } } /* ** Move the "*-oal" file corresponding to the target database to the ** "*-wal" location. If an error occurs, leave an error code and error |
︙ | ︙ | |||
699 700 701 702 703 704 705 | if( p->rc==SQLITE_OK ){ pState = otaLoadState(p); if( pState && pState->zTbl==0 ){ otaDeleteOalFile(p); } } | < | | < > | < < | | < > > > > > | | > > | 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 | if( p->rc==SQLITE_OK ){ pState = otaLoadState(p); if( pState && pState->zTbl==0 ){ otaDeleteOalFile(p); } } if( p->rc==SQLITE_OK ){ const char *zScript = "PRAGMA journal_mode=off;" "PRAGMA pager_ota_mode=1;" "PRAGMA ota_mode=1;" "BEGIN IMMEDIATE;" ; p->rc = sqlite3_exec(p->dbDest, zScript, 0, 0, &p->zErrmsg); } if( p->rc==SQLITE_OK ){ const char *zScript = "BEGIN IMMEDIATE"; p->rc = sqlite3_exec(p->dbOta, zScript, 0, 0, &p->zErrmsg); } /* Point the object iterator at the first object */ if( p->rc==SQLITE_OK ){ p->rc = otaObjIterFirst(p, &p->objiter); } if( p->rc==SQLITE_OK ){ otaLoadTransactionState(p, pState); } sqlite3_free(pState); } return p; } /* ** Close the OTA handle. */ int sqlite3ota_close(sqlite3ota *p, char **pzErrmsg){ int rc; if( p ){ /* If the update has not been fully applied, save the state in ** the ota db. If successful, this call also commits the open ** transaction on the ota db. */ assert( p->rc!=SQLITE_ROW ); if( p->rc==SQLITE_OK ){ assert( p->zErrmsg==0 ); otaSaveTransactionState(p); } /* Close all open statement handles. */ otaObjIterFinalize(&p->objiter); /* Commit the transaction to the *-oal file. */ if( p->rc==SQLITE_OK || p->rc==SQLITE_DONE ){ rc = sqlite3_exec(p->dbDest, "COMMIT", 0, 0, &p->zErrmsg); if( rc!=SQLITE_OK ) p->rc = rc; } assert( sqlite3_next_stmt(p->dbDest, 0)==0 ); assert( sqlite3_next_stmt(p->dbOta, 0)==0 ); /* Close the open database handles */ sqlite3_close(p->dbDest); sqlite3_close(p->dbOta); /* If the OTA has been completely applied and no error occurred, move ** the *-oal file to *-wal. */ if( p->rc==SQLITE_DONE ){ otaMoveOalFile(p); } rc = p->rc; *pzErrmsg = p->zErrmsg; sqlite3_free(p); |
︙ | ︙ |