ExternalVendorCode/serval-dna
1
0
Fork 0
mirror of https://github.com/servalproject/serval-dna.git synced 2025-01-29 15:43:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix transaction error checking

Browse Source
This commit is contained in:
Jeremy Lakeman 2012-12-28 12:46:07 +10:30
parent 04eaf99243
commit c8fbef9016
2 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
rhizome_database.c
View File

@ -750,8 +750,8 @@ int rhizome_store_bundle(rhizome_manifest *m)
const char *author = is_sid_any(m->author) ? NULL : alloca_tohex_sid(m->author);
sqlite_retry_state retry = SQLITE_RETRY_STATE_DEFAULT;
if (sqlite_exec_void_retry(&retry, "BEGIN TRANSACTION;") == -1)
return -1;
if (sqlite_exec_void_retry(&retry, "BEGIN TRANSACTION;") != SQLITE_OK)
return WHY("Failed to begin transaction");
sqlite3_stmt *stmt;
if ((stmt = sqlite_prepare(&retry, "INSERT OR REPLACE INTO MANIFESTS(id,manifest,version,inserttime,bar,filesize,filehash,author) VALUES(?,?,?,?,?,?,?,?);")) == NULL)
@ -825,7 +825,7 @@ int rhizome_store_bundle(rhizome_manifest *m)
sqlite3_finalize(stmt);
stmt = NULL;
}
if (sqlite_exec_void_retry(&retry, "COMMIT;") != -1)
if (sqlite_exec_void_retry(&retry, "COMMIT;") == SQLITE_OK)
return 0;
rollback:
if (stmt)
@ -957,8 +957,8 @@ int64_t rhizome_database_create_blob_for(const char *hashhex,int64_t fileLength,
sqlite_retry_state retry = SQLITE_RETRY_STATE_DEFAULT;
if (sqlite_exec_void_retry(&retry, "BEGIN TRANSACTION;") == -1)
return -1;
if (sqlite_exec_void_retry(&retry, "BEGIN TRANSACTION;") != SQLITE_OK)
return WHY("Failed to begin transaction");
/* Okay, so there are no records that match, but we should delete any half-baked record (with datavalid=0) so that the insert below doesn't fail.
Don't worry about the return result, since it might not delete any records. */
@ -1010,7 +1010,6 @@ insert_row_fail:
WHYF("Failed to commit transaction");
return -1;
}
return rowid;
}

22
rhizome_store.c
View File

@ -33,8 +33,8 @@ int rhizome_open_write(struct rhizome_write *write, char *expectedFileHash, int6
sqlite_retry_state retry = SQLITE_RETRY_STATE_DEFAULT;
if (sqlite_exec_void_retry(&retry, "BEGIN TRANSACTION;") == -1)
return -1;
if (sqlite_exec_void_retry(&retry, "BEGIN TRANSACTION;") != SQLITE_OK)
return WHY("Failed to begin transaction");
/* INSERT INTO FILES(id as text, data blob, length integer, highestpriority integer).
BUT, we have to do this incrementally so that we can handle blobs larger than available memory.
@ -87,7 +87,6 @@ int rhizome_open_write(struct rhizome_write *write, char *expectedFileHash, int6
/* Get rowid for inserted row, so that we can modify the blob */
write->blob_rowid = sqlite3_last_insert_rowid(rhizome_db);
DEBUGF("Got rowid %lld",write->blob_rowid);
write->file_length = file_length;
write->file_offset = 0;
SHA512_Init(&write->sha512_context);
@ -98,7 +97,10 @@ int rhizome_open_write(struct rhizome_write *write, char *expectedFileHash, int6
write->buffer_size=RHIZOME_BUFFER_MAXIMUM_SIZE;
write->buffer=malloc(write->buffer_size);
return sqlite_exec_void_retry(&retry, "COMMIT;");
if (sqlite_exec_void_retry(&retry, "COMMIT;")!=SQLITE_OK){
return WHYF("Failed to commit transaction: %s", sqlite3_errmsg(rhizome_db));
}
return 0;
}
/* Write write->buffer into the database blob */
@ -226,8 +228,10 @@ int rhizome_finish_write(struct rhizome_write *write){
SHA512_End(&write->sha512_context, hash_out);
sqlite_retry_state retry = SQLITE_RETRY_STATE_DEFAULT;
if (sqlite_exec_void_retry(&retry, "BEGIN TRANSACTION;") == -1)
return -1;
if (sqlite_exec_void_retry(&retry, "BEGIN TRANSACTION;") != SQLITE_OK){
WHY("Failed to begin transaction");
goto failure;
}
if (write->id_known){
if (strcasecmp(write->id, hash_out)){
@ -266,7 +270,11 @@ int rhizome_finish_write(struct rhizome_write *write){
}
strlcpy(write->id, hash_out, SHA512_DIGEST_STRING_LENGTH);
}
return sqlite_exec_void_retry(&retry, "COMMIT;");
if (sqlite_exec_void_retry(&retry, "COMMIT;")!=SQLITE_OK){
WHYF("Failed to commit transaction: %s", sqlite3_errmsg(rhizome_db));
goto failure;
}
return 0;
failure:
sqlite_exec_void_retry(&retry, "ROLLBACK;");