database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-08-08 14:02:16 +03:00
Code Activity

Fix minor problems with new code in memjournal.c.

Browse Source 
FossilOrigin-Name: 9fd3f7b9c93325a83cdbe7dc9ee312b22a9c2898
This commit is contained in:
dan
2016-02-29 20:00:13 +00:00
parent 2491de28f1
commit 5f37ed5121
4 changed files with 24 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/memjournal.c
View File

@@ -248,6 +248,10 @@ static int memjrnlWrite(
/*
** Truncate the file.
**
** If the journal file is already on disk, truncate it there. Or, if it
** is still in main memory but is being truncated to zero bytes in size,
** ignore
*/
static int memjrnlTruncate(sqlite3_file *pJfd, sqlite_int64 size){
MemJournal *p = (MemJournal *)pJfd;
@@ -350,7 +354,7 @@ int sqlite3JournalOpen(
** it using the sqlite3OsOpen() function of the underlying VFS. In this
** case none of the code in this module is executed as a result of calls
** made on the journal file-handle. */
memset(p, 0, sizeof(MemJournal));
memset(p, 0, sizeof(MemJournal) + pVfs ? pVfs->szOsFile : 0);
if( nBuf==0 ){
return sqlite3OsOpen(pVfs, zName, pJfd, flags, 0);
}
@@ -377,30 +381,23 @@ void sqlite3MemJournalOpen(sqlite3_file *pJfd){
sqlite3JournalOpen(0, 0, pJfd, 0, -1);
}
/*
** Return true if the file-handle passed as an argument is an in-memory
** journal.
*/
int sqlite3IsMemJournal(sqlite3_file *pJfd){
return pJfd->pMethods==&MemJournalMethods && ((MemJournal*)pJfd)->pReal==0;
}
/*
** If the argument p points to a MemJournal structure that is not an
** in-memory-only journal file, and the underlying file has not yet been
** created, create it now.
** in-memory-only journal file (i.e. is one that was opened with a +ve
** nBuf parameter), and the underlying file has not yet been created,
** create it now.
*/
int sqlite3JournalCreate(sqlite3_file *p){
int rc = SQLITE_OK;
if( p->pMethods==&MemJournalMethods && ((MemJournal*)p)->nBuf>=0 ){
if( p->pMethods==&MemJournalMethods && ((MemJournal*)p)->nBuf>0 ){
rc = createFile((MemJournal*)p);
}
return rc;
}
/*
** The file-handle passed as teh only argument is open on a journal file.
** Return true if this "journal file" is actually stored in heap memory,
** The file-handle passed as the only argument is open on a journal file.
** Return true if this "journal file" is currently stored in heap memory,
** or false otherwise.
*/
int sqlite3JournalIsInMemory(sqlite3_file *p){