Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Remove some c++isms from sqlite3ota.c. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | ota-update |
| Files: | files | file ages | folders |
| SHA1: |
0da1862b1b68f15c7c14286a982dda88 |
| User & Date: | dan 2014-09-18 15:57:22 |
Context
|
2014-09-18
| ||
| 16:38 | Use quotes instead of angle-brackets to include sqlite3.h from sqlite3ota.h. check-in: fce9c6cc user: dan tags: ota-update | |
| 15:57 | Remove some c++isms from sqlite3ota.c. check-in: 0da1862b user: dan tags: ota-update | |
| 15:22 | Add new file ext/ota/README.txt, containing notes regarding the implementation of the ota extension. check-in: 3c6e1cbb user: dan tags: ota-update | |
Changes
Changes to ext/ota/sqlite3ota.c.
36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 .. 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 ... 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 ... 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 ... 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 |
** so far as part of this ota update.
*/
#define OTA_CREATE_STATE "CREATE TABLE IF NOT EXISTS ota.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;
................................................................................
** * 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 */
................................................................................
int bSeenPk = 0;
int rc2; /* sqlite3_finalize() return value */
zSql = sqlite3_mprintf("PRAGMA main.table_info(%Q)", pIter->zTbl);
p->rc = prepareFreeAndCollectError(p->db, &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->abTblPk, 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 ){
................................................................................
if( eType==OTA_IDX_DELETE || eType==OTA_DELETE ){
pWriter = pIter->pDelete;
}else{
pWriter = pIter->pInsert;
}
for(i=0; i<pIter->nCol; i++){
if( eType==SQLITE_DELETE && pIter->zIdx==0 && pIter->abTblPk[i]==0 ){
continue;
}
sqlite3_value *pVal = sqlite3_column_value(pIter->pSelect, i);
sqlite3_bind_value(pWriter, i+1, pVal);
}
sqlite3_step(pWriter);
p->rc = resetAndCollectError(pWriter, &p->zErrmsg);
}else if( eType==OTA_UPDATE ){
sqlite3_stmt *pUpdate = 0;
otaGetUpdateStmt(p, pIter, zMask, &pUpdate);
................................................................................
OtaObjIter *pIter = &p->objiter;
while( p && p->rc==SQLITE_OK && pIter->zTbl ){
if( pIter->bCleanup ){
/* Clean up the ota_tmp_xxx table for the previous table. It
** cannot be dropped as there are currently active SQL statements.
** But the contents can be deleted. */
// otaMPrintfExec(p, "DELETE FROM ota.'ota_tmp_%q'", pIter->zTbl);
}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 ){
|
< | > | > | | |
36 37 38 39 40 41 42 43 44 45 46 47 48 49 .. 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 ... 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 ... 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 ... 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 |
** so far as part of this ota update.
*/
#define OTA_CREATE_STATE "CREATE TABLE IF NOT EXISTS ota.ota_state" \
"(tbl, idx, row, progress)"
typedef struct OtaState OtaState;
typedef struct OtaObjIter OtaObjIter;
/*
** A structure to store values read from the ota_state table in memory.
*/
struct OtaState {
char *zTbl;
char *zIdx;
................................................................................
** * 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 */
unsigned char *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 */
................................................................................
int bSeenPk = 0;
int rc2; /* sqlite3_finalize() return value */
zSql = sqlite3_mprintf("PRAGMA main.table_info(%Q)", pIter->zTbl);
p->rc = prepareFreeAndCollectError(p->db, &pStmt, &p->zErrmsg, zSql);
while( p->rc==SQLITE_OK && SQLITE_ROW==sqlite3_step(pStmt) ){
if( (nCol % 8)==0 ){
unsigned char *abNew;
int nByte = sizeof(char*) * (nCol+8);
char **azNew = (char**)sqlite3_realloc(pIter->azTblCol, nByte);
abNew = (unsigned char*)sqlite3_realloc(pIter->abTblPk, 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 ){
................................................................................
if( eType==OTA_IDX_DELETE || eType==OTA_DELETE ){
pWriter = pIter->pDelete;
}else{
pWriter = pIter->pInsert;
}
for(i=0; i<pIter->nCol; i++){
sqlite3_value *pVal;
if( eType==SQLITE_DELETE && pIter->zIdx==0 && pIter->abTblPk[i]==0 ){
continue;
}
pVal = sqlite3_column_value(pIter->pSelect, i);
sqlite3_bind_value(pWriter, i+1, pVal);
}
sqlite3_step(pWriter);
p->rc = resetAndCollectError(pWriter, &p->zErrmsg);
}else if( eType==OTA_UPDATE ){
sqlite3_stmt *pUpdate = 0;
otaGetUpdateStmt(p, pIter, zMask, &pUpdate);
................................................................................
OtaObjIter *pIter = &p->objiter;
while( p && p->rc==SQLITE_OK && pIter->zTbl ){
if( pIter->bCleanup ){
/* Clean up the ota_tmp_xxx table for the previous table. It
** cannot be dropped as there are currently active SQL statements.
** But the contents can be deleted. */
otaMPrintfExec(p, "DELETE FROM ota.'ota_tmp_%q'", pIter->zTbl);
}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 ){
|