Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Fix the error messages returned by ota if an update violates a unique constraint. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | ota-update |
| Files: | files | file ages | folders |
| SHA1: |
c4845a3b591723ff60b7b1da198f4490 |
| User & Date: | dan 2015-02-04 19:20:42 |
Context
|
2015-02-04
| ||
| 23:51 | Merge all changes from index_xinfo, including the move of the pragma table into the separate pragma.h file. check-in: 21e95d28 user: drh tags: ota-update | |
| 19:20 | Fix the error messages returned by ota if an update violates a unique constraint. check-in: c4845a3b user: dan tags: ota-update | |
| 16:32 | Avoid a linear scan of the entire table when ota updates or deletes a row from a table with an external primary key index. check-in: 1db198cc user: dan tags: ota-update | |
Changes
Changes to ext/ota/sqlite3ota.c.
670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 .... 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 .... 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 .... 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 .... 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 .... 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 1274 1275 1276 1277 .... 1848 1849 1850 1851 1852 1853 1854 1855 1856 1857 1858 1859 1860 1861 1862 .... 1887 1888 1889 1890 1891 1892 1893 1894 1895 1896 1897 1898 1899 1900 .... 1919 1920 1921 1922 1923 1924 1925 1926 1927 1928 1929 1930 1931 1932 |
zCol = pIter->azTblCol[iCid];
zType = pIter->azTblType[iCid];
}
zRet = sqlite3_mprintf("%z%s\"%w\" COLLATE %Q", zRet, zCom, zCol, zCollate);
if( pIter->bUnique==0 || sqlite3_column_int(pXInfo, 5) ){
const char *zOrder = (bDesc ? " DESC" : "");
zImpPK = sqlite3_mprintf("%z%sc%d%s", zImpPK, zCom, nBind, zOrder);
}
zImpCols = sqlite3_mprintf(
"%z%sc%d %s COLLATE %Q", zImpCols, zCom, nBind, zType, zCollate
);
zWhere = sqlite3_mprintf("%z%sc%d IS ?", zWhere, zAnd, nBind);
if( zRet==0 || zImpPK==0 || zImpCols==0 || zWhere==0 ) rc = SQLITE_NOMEM;
zCom = ", ";
zAnd = " AND ";
nBind++;
}
rc2 = sqlite3_finalize(pXInfo);
................................................................................
if( pIter->eType==OTA_PK_WITHOUT_ROWID ){
char *zPk = otaWithoutRowidPK(p, pIter);
if( zPk ){
zSql = otaMPrintf(p, "%z, %z", zSql, zPk);
}
}
zSql = otaMPrintf(p, "CREATE TABLE ota_imposter(%z)%s",
zSql, (pIter->eType==OTA_PK_WITHOUT_ROWID ? " WITHOUT ROWID" : "")
);
if( p->rc==SQLITE_OK ){
sqlite3_test_control(SQLITE_TESTCTRL_IMPOSTER, p->db, "main", 1, tnum);
p->rc = sqlite3_exec(p->db, zSql, 0, 0, &p->zErrmsg);
sqlite3_test_control(SQLITE_TESTCTRL_IMPOSTER, p->db, "main", 0, 0);
}
sqlite3_free(zSql);
................................................................................
if( nOffset ){
zLimit = sqlite3_mprintf(" LIMIT -1 OFFSET %d", nOffset);
if( !zLimit ) p->rc = SQLITE_NOMEM;
}
if( zIdx ){
char *zImposterCols = 0; /* Columns for imposter table */
char *zImposterPK = 0; /* Primary key declaration for imposter */
char *zWhere = 0; /* WHERE clause on PK columns */
char *zBind = 0;
int nBind = 0;
assert( pIter->eType!=OTA_PK_VTAB );
................................................................................
);
zBind = otaObjIterGetBindlist(p, nBind);
/* Create the imposter table used to write to this index. */
sqlite3_test_control(SQLITE_TESTCTRL_IMPOSTER, p->db, "main", 0, 1);
sqlite3_test_control(SQLITE_TESTCTRL_IMPOSTER, p->db, "main", 1, tnum);
otaMPrintfExec(p,
"CREATE TABLE ota_imposter( %s, PRIMARY KEY( %s ) ) WITHOUT ROWID",
zImposterCols, zImposterPK
);
sqlite3_test_control(SQLITE_TESTCTRL_IMPOSTER, p->db, "main", 0, 0);
/* Create the statement to insert index entries */
pIter->nCol = nBind;
if( p->rc==SQLITE_OK ){
p->rc = prepareFreeAndCollectError(p->db, &pIter->pInsert, &p->zErrmsg,
sqlite3_mprintf("INSERT INTO ota_imposter VALUES(%s)", zBind)
);
}
/* And to delete index entries */
if( p->rc==SQLITE_OK ){
p->rc = prepareFreeAndCollectError(p->db, &pIter->pDelete, &p->zErrmsg,
sqlite3_mprintf("DELETE FROM ota_imposter WHERE %s", zWhere)
);
}
/* Create the SELECT statement to read keys in sorted order */
if( p->rc==SQLITE_OK ){
char *zSql;
if( pIter->eType==OTA_PK_EXTERNAL || pIter->eType==OTA_PK_NONE ){
................................................................................
)
);
}
/* Create the imposter table or tables (if required). */
otaCreateImposterTable(p, pIter);
otaCreateImposterTable2(p, pIter);
zWrite = (pIter->eType==OTA_PK_VTAB ? zTbl : "ota_imposter");
/* Create the INSERT statement to write to the target PK b-tree */
if( p->rc==SQLITE_OK ){
p->rc = prepareFreeAndCollectError(p->db, &pIter->pInsert, pz,
sqlite3_mprintf(
"INSERT INTO main.%Q(%s%s) VALUES(%s)",
zWrite, zCollist, (bOtaRowid ? ", _rowid_" : ""), zBindings
)
);
}
/* Create the DELETE statement to write to the target PK b-tree */
if( p->rc==SQLITE_OK ){
p->rc = prepareFreeAndCollectError(p->db, &pIter->pDelete, pz,
sqlite3_mprintf(
"DELETE FROM main.%Q WHERE %s", zWrite, zWhere
)
);
}
if( pIter->eType!=OTA_PK_VTAB ){
const char *zOtaRowid = "";
if( pIter->eType==OTA_PK_EXTERNAL || pIter->eType==OTA_PK_NONE ){
zOtaRowid = ", ota_rowid";
}
/* Create the ota_tmp_xxx table and the triggers to populate it. */
otaMPrintfExec(p,
"PRAGMA ota_mode = 1;"
"CREATE TABLE IF NOT EXISTS ota.'ota_tmp_%q' AS "
"SELECT *%s FROM ota.'data_%q' WHERE 0;"
"CREATE TEMP TRIGGER ota_delete_tr BEFORE DELETE ON ota_imposter "
"BEGIN "
" INSERT INTO 'ota_tmp_%q'(ota_control, %s%s) VALUES(2, %s);"
"END;"
"CREATE TEMP TRIGGER ota_update1_tr BEFORE UPDATE ON ota_imposter "
"BEGIN "
" INSERT INTO 'ota_tmp_%q'(ota_control, %s%s) VALUES(2, %s);"
"END;"
"CREATE TEMP TRIGGER ota_update2_tr AFTER UPDATE ON ota_imposter "
"BEGIN "
" INSERT INTO 'ota_tmp_%q'(ota_control, %s%s) VALUES(3, %s);"
"END;"
, zTbl, (pIter->eType==OTA_PK_EXTERNAL ? ", 0 AS ota_rowid" : "")
, zTbl,
zTbl, zCollist, zOtaRowid, zOldlist,
zTbl, zCollist, zOtaRowid, zOldlist,
zTbl, zCollist, zOtaRowid, zNewlist
);
if( pIter->eType==OTA_PK_EXTERNAL || pIter->eType==OTA_PK_NONE ){
otaMPrintfExec(p,
"CREATE TEMP TRIGGER ota_insert_tr AFTER INSERT ON ota_imposter "
"BEGIN "
" INSERT INTO 'ota_tmp_%q'(ota_control, %s, ota_rowid)"
" VALUES(0, %s);"
"END;"
, zTbl, zCollist, zNewlist
);
}
}else if( p->rc==SQLITE_OK ){
p->rc = sqlite3_exec(p->db, "PRAGMA ota_mode = 0", 0, 0, &p->zErrmsg);
}
/* Allocate space required for the zMask field. */
if( p->rc==SQLITE_OK ){
int nMask = pIter->nTblCol+1;
pIter->zMask = (char*)sqlite3_malloc(nMask);
if( pIter->zMask==0 ){
................................................................................
}else{
char *zWhere = otaObjIterGetWhere(p, pIter);
char *zSet = otaObjIterGetSetlist(p, pIter, zMask);
char *zUpdate = 0;
sqlite3_finalize(pIter->pUpdate);
pIter->pUpdate = 0;
if( p->rc==SQLITE_OK ){
zUpdate = sqlite3_mprintf("UPDATE \"%w\" SET %s WHERE %s",
(pIter->eType==OTA_PK_VTAB ? pIter->zTbl : "ota_imposter"),
zSet, zWhere
);
p->rc = prepareFreeAndCollectError(
p->db, &pIter->pUpdate, &p->zErrmsg, zUpdate
);
*ppStmt = pIter->pUpdate;
}
if( p->rc==SQLITE_OK ){
................................................................................
assert( p->rc!=SQLITE_OK || p->eStage!=0 );
if( p->rc==SQLITE_OK ){
if( p->eStage==OTA_STAGE_OAL ){
const char *zScript =
"PRAGMA journal_mode=off;"
"PRAGMA pager_ota_mode=1;"
"PRAGMA ota_mode=1;"
"BEGIN IMMEDIATE;"
;
p->rc = sqlite3_exec(p->db, zScript, 0, 0, &p->zErrmsg);
/* Point the object iterator at the first object */
if( p->rc==SQLITE_OK ){
p->rc = otaObjIterFirst(p, &p->objiter);
................................................................................
/*
** Return the database handle used by pOta.
*/
sqlite3 *sqlite3ota_db(sqlite3ota *pOta){
return (pOta ? pOta->db : 0);
}
/*
** Close the OTA handle.
*/
int sqlite3ota_close(sqlite3ota *p, char **pzErrmsg){
int rc;
if( p ){
................................................................................
p->rc = sqlite3_exec(p->db, "PRAGMA pager_ota_mode=2", 0, 0, &p->zErrmsg);
}
/* Close the open database handle */
if( p->pCkpt ) sqlite3_ckpt_close(p->pCkpt, 0, 0);
sqlite3_close(p->db);
rc = p->rc;
*pzErrmsg = p->zErrmsg;
sqlite3_free(p);
}else{
rc = SQLITE_NOMEM;
*pzErrmsg = 0;
}
|
| > > | | | > > | > | > | | | | | | | | < | > > > > > < < < < < | | | | | | | < < > > > | < | < > > > > > > > > > > > > > > > > > > > > > > |
670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 .... 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 .... 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 .... 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 .... 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 .... 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 1274 1275 1276 1277 1278 1279 1280 1281 1282 .... 1853 1854 1855 1856 1857 1858 1859 1860 1861 1862 1863 1864 1865 1866 .... 1891 1892 1893 1894 1895 1896 1897 1898 1899 1900 1901 1902 1903 1904 1905 1906 1907 1908 1909 1910 1911 1912 1913 1914 1915 1916 1917 1918 1919 1920 1921 1922 1923 1924 1925 .... 1944 1945 1946 1947 1948 1949 1950 1951 1952 1953 1954 1955 1956 1957 1958 |
zCol = pIter->azTblCol[iCid];
zType = pIter->azTblType[iCid];
}
zRet = sqlite3_mprintf("%z%s\"%w\" COLLATE %Q", zRet, zCom, zCol, zCollate);
if( pIter->bUnique==0 || sqlite3_column_int(pXInfo, 5) ){
const char *zOrder = (bDesc ? " DESC" : "");
zImpPK = sqlite3_mprintf("%z%s\"ota_imp_%d%w\"%s",
zImpPK, zCom, nBind, zCol, zOrder
);
}
zImpCols = sqlite3_mprintf("%z%s\"ota_imp_%d%w\" %s COLLATE %Q",
zImpCols, zCom, nBind, zCol, zType, zCollate
);
zWhere = sqlite3_mprintf(
"%z%s\"ota_imp_%d%w\" IS ?", zWhere, zAnd, nBind, zCol
);
if( zRet==0 || zImpPK==0 || zImpCols==0 || zWhere==0 ) rc = SQLITE_NOMEM;
zCom = ", ";
zAnd = " AND ";
nBind++;
}
rc2 = sqlite3_finalize(pXInfo);
................................................................................
if( pIter->eType==OTA_PK_WITHOUT_ROWID ){
char *zPk = otaWithoutRowidPK(p, pIter);
if( zPk ){
zSql = otaMPrintf(p, "%z, %z", zSql, zPk);
}
}
zSql = otaMPrintf(p, "CREATE TABLE \"ota_imp_%w\"(%z)%s",
pIter->zTbl, zSql,
(pIter->eType==OTA_PK_WITHOUT_ROWID ? " WITHOUT ROWID" : "")
);
if( p->rc==SQLITE_OK ){
sqlite3_test_control(SQLITE_TESTCTRL_IMPOSTER, p->db, "main", 1, tnum);
p->rc = sqlite3_exec(p->db, zSql, 0, 0, &p->zErrmsg);
sqlite3_test_control(SQLITE_TESTCTRL_IMPOSTER, p->db, "main", 0, 0);
}
sqlite3_free(zSql);
................................................................................
if( nOffset ){
zLimit = sqlite3_mprintf(" LIMIT -1 OFFSET %d", nOffset);
if( !zLimit ) p->rc = SQLITE_NOMEM;
}
if( zIdx ){
const char *zTbl = pIter->zTbl;
char *zImposterCols = 0; /* Columns for imposter table */
char *zImposterPK = 0; /* Primary key declaration for imposter */
char *zWhere = 0; /* WHERE clause on PK columns */
char *zBind = 0;
int nBind = 0;
assert( pIter->eType!=OTA_PK_VTAB );
................................................................................
);
zBind = otaObjIterGetBindlist(p, nBind);
/* Create the imposter table used to write to this index. */
sqlite3_test_control(SQLITE_TESTCTRL_IMPOSTER, p->db, "main", 0, 1);
sqlite3_test_control(SQLITE_TESTCTRL_IMPOSTER, p->db, "main", 1, tnum);
otaMPrintfExec(p,
"CREATE TABLE \"ota_imp_%w\"( %s, PRIMARY KEY( %s ) ) WITHOUT ROWID",
zTbl, zImposterCols, zImposterPK
);
sqlite3_test_control(SQLITE_TESTCTRL_IMPOSTER, p->db, "main", 0, 0);
/* Create the statement to insert index entries */
pIter->nCol = nBind;
if( p->rc==SQLITE_OK ){
p->rc = prepareFreeAndCollectError(p->db, &pIter->pInsert, &p->zErrmsg,
sqlite3_mprintf("INSERT INTO \"ota_imp_%w\" VALUES(%s)", zTbl, zBind)
);
}
/* And to delete index entries */
if( p->rc==SQLITE_OK ){
p->rc = prepareFreeAndCollectError(p->db, &pIter->pDelete, &p->zErrmsg,
sqlite3_mprintf("DELETE FROM \"ota_imp_%w\" WHERE %s", zTbl, zWhere)
);
}
/* Create the SELECT statement to read keys in sorted order */
if( p->rc==SQLITE_OK ){
char *zSql;
if( pIter->eType==OTA_PK_EXTERNAL || pIter->eType==OTA_PK_NONE ){
................................................................................
)
);
}
/* Create the imposter table or tables (if required). */
otaCreateImposterTable(p, pIter);
otaCreateImposterTable2(p, pIter);
zWrite = (pIter->eType==OTA_PK_VTAB ? "" : "ota_imp_");
/* Create the INSERT statement to write to the target PK b-tree */
if( p->rc==SQLITE_OK ){
p->rc = prepareFreeAndCollectError(p->db, &pIter->pInsert, pz,
sqlite3_mprintf(
"INSERT INTO main.\"%s%w\"(%s%s) VALUES(%s)",
zWrite, zTbl, zCollist, (bOtaRowid ? ", _rowid_" : ""), zBindings
)
);
}
/* Create the DELETE statement to write to the target PK b-tree */
if( p->rc==SQLITE_OK ){
p->rc = prepareFreeAndCollectError(p->db, &pIter->pDelete, pz,
sqlite3_mprintf(
"DELETE FROM main.\"%s%w\" WHERE %s", zWrite, zTbl, zWhere
)
);
}
if( pIter->eType!=OTA_PK_VTAB ){
const char *zOtaRowid = "";
if( pIter->eType==OTA_PK_EXTERNAL || pIter->eType==OTA_PK_NONE ){
zOtaRowid = ", ota_rowid";
}
/* Create the ota_tmp_xxx table and the triggers to populate it. */
otaMPrintfExec(p,
"CREATE TABLE IF NOT EXISTS ota.'ota_tmp_%q' AS "
"SELECT *%s FROM ota.'data_%q' WHERE 0;"
"CREATE TEMP TRIGGER ota_delete_tr BEFORE DELETE ON \"%s%w\" "
"BEGIN "
" INSERT INTO 'ota_tmp_%q'(ota_control, %s%s) VALUES(2, %s);"
"END;"
"CREATE TEMP TRIGGER ota_update1_tr BEFORE UPDATE ON \"%s%w\" "
"BEGIN "
" INSERT INTO 'ota_tmp_%q'(ota_control, %s%s) VALUES(2, %s);"
"END;"
"CREATE TEMP TRIGGER ota_update2_tr AFTER UPDATE ON \"%s%w\" "
"BEGIN "
" INSERT INTO 'ota_tmp_%q'(ota_control, %s%s) VALUES(3, %s);"
"END;"
, zTbl, (pIter->eType==OTA_PK_EXTERNAL ? ", 0 AS ota_rowid" : "")
, zTbl,
zWrite, zTbl, zTbl, zCollist, zOtaRowid, zOldlist,
zWrite, zTbl, zTbl, zCollist, zOtaRowid, zOldlist,
zWrite, zTbl, zTbl, zCollist, zOtaRowid, zNewlist
);
if( pIter->eType==OTA_PK_EXTERNAL || pIter->eType==OTA_PK_NONE ){
otaMPrintfExec(p,
"CREATE TEMP TRIGGER ota_insert_tr AFTER INSERT ON \"%s%w\" "
"BEGIN "
" INSERT INTO 'ota_tmp_%q'(ota_control, %s, ota_rowid)"
" VALUES(0, %s);"
"END;",
zWrite, zTbl, zTbl, zCollist, zNewlist
);
}
}
/* Allocate space required for the zMask field. */
if( p->rc==SQLITE_OK ){
int nMask = pIter->nTblCol+1;
pIter->zMask = (char*)sqlite3_malloc(nMask);
if( pIter->zMask==0 ){
................................................................................
}else{
char *zWhere = otaObjIterGetWhere(p, pIter);
char *zSet = otaObjIterGetSetlist(p, pIter, zMask);
char *zUpdate = 0;
sqlite3_finalize(pIter->pUpdate);
pIter->pUpdate = 0;
if( p->rc==SQLITE_OK ){
const char *zPrefix = "";
if( pIter->eType!=OTA_PK_VTAB ) zPrefix = "ota_imp_";
zUpdate = sqlite3_mprintf("UPDATE \"%s%w\" SET %s WHERE %s",
zPrefix, pIter->zTbl, zSet, zWhere
);
p->rc = prepareFreeAndCollectError(
p->db, &pIter->pUpdate, &p->zErrmsg, zUpdate
);
*ppStmt = pIter->pUpdate;
}
if( p->rc==SQLITE_OK ){
................................................................................
assert( p->rc!=SQLITE_OK || p->eStage!=0 );
if( p->rc==SQLITE_OK ){
if( p->eStage==OTA_STAGE_OAL ){
const char *zScript =
"PRAGMA journal_mode=off;"
"PRAGMA pager_ota_mode=1;"
"BEGIN IMMEDIATE;"
;
p->rc = sqlite3_exec(p->db, zScript, 0, 0, &p->zErrmsg);
/* Point the object iterator at the first object */
if( p->rc==SQLITE_OK ){
p->rc = otaObjIterFirst(p, &p->objiter);
................................................................................
/*
** Return the database handle used by pOta.
*/
sqlite3 *sqlite3ota_db(sqlite3ota *pOta){
return (pOta ? pOta->db : 0);
}
/*
** If the error code currently stored in the OTA handle is SQLITE_CONSTRAINT,
** then edit any error message string so as to remove all occurrences of
** the pattern "ota_imp_[0-9]*".
*/
static void otaEditErrmsg(sqlite3ota *p){
if( p->rc==SQLITE_CONSTRAINT && p->zErrmsg ){
int i;
int nErrmsg = strlen(p->zErrmsg);
for(i=0; i<(nErrmsg-8); i++){
if( memcmp(&p->zErrmsg[i], "ota_imp_", 8)==0 ){
int nDel = 8;
while( p->zErrmsg[i+nDel]>='0' && p->zErrmsg[i+nDel]<='9' ) nDel++;
memmove(&p->zErrmsg[i], &p->zErrmsg[i+nDel], nErrmsg + 1 - i - nDel);
nErrmsg -= nDel;
}
}
}
}
/*
** Close the OTA handle.
*/
int sqlite3ota_close(sqlite3ota *p, char **pzErrmsg){
int rc;
if( p ){
................................................................................
p->rc = sqlite3_exec(p->db, "PRAGMA pager_ota_mode=2", 0, 0, &p->zErrmsg);
}
/* Close the open database handle */
if( p->pCkpt ) sqlite3_ckpt_close(p->pCkpt, 0, 0);
sqlite3_close(p->db);
otaEditErrmsg(p);
rc = p->rc;
*pzErrmsg = p->zErrmsg;
sqlite3_free(p);
}else{
rc = SQLITE_NOMEM;
*pzErrmsg = 0;
}
|