[almanah] storage: mockup implementation of a SQLITE VFS
- From: Álvaro Peña <alvaropg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [almanah] storage: mockup implementation of a SQLITE VFS
- Date: Mon, 8 Sep 2014 20:31:08 +0000 (UTC)
commit fb9a922669c70c830386864e67ef08f346d9828a
Author: Álvaro Peña <alvaropg gmail com>
Date: Mon Sep 8 22:23:16 2014 +0200
storage: mockup implementation of a SQLITE VFS
Created a SQLITE VFS called "almanah" based in the code by the SQLITE
hackers available in http://www.sqlite.org/vfs.html, example called
test_demovfs.c.
This is the starting point to implement the SQLITE VFS with non-pageable
memory. At the moment, just the code from test_demovfs.c
See Bug #659500 - Prevent the unencrypted database from hitting the disk
https://bugzilla.gnome.org/show_bug.cgi?id=659500
src/Makefile.am | 4 +-
src/storage-manager.c | 4 +-
src/vfs.c | 558 +++++++++++++++++++++++++++++++++++++++++++++++++
src/vfs.h | 20 ++
4 files changed, 584 insertions(+), 2 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index e50c3c3..dcf61d3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -53,7 +53,9 @@ almanah_SOURCES = \
widgets/tag.c \
widgets/tag.h \
widgets/tag-entry.c \
- widgets/tag-entry.h
+ widgets/tag-entry.h \
+ vfs.h \
+ vfs.c
if HAVE_EVO
almanah_SOURCES += \
diff --git a/src/storage-manager.c b/src/storage-manager.c
index adb5e9b..7e22879 100644
--- a/src/storage-manager.c
+++ b/src/storage-manager.c
@@ -35,6 +35,7 @@
#include "entry.h"
#include "storage-manager.h"
#include "almanah-marshal.h"
+#include "vfs.h"
#define ENCRYPTED_SUFFIX ".encrypted"
@@ -614,8 +615,9 @@ almanah_storage_manager_connect (AlmanahStorageManager *self, GError **error)
self->priv->decrypted = FALSE;
#endif /* ENABLE_ENCRYPTION */
+ almanah_vfs_init();
/* Open the plain database */
- if (sqlite3_open (self->priv->plain_filename, &(self->priv->connection)) != SQLITE_OK) {
+ if (sqlite3_open_v2 (self->priv->plain_filename, &(self->priv->connection), SQLITE_OPEN_READWRITE |
SQLITE_OPEN_CREATE, "almanah") != SQLITE_OK) {
g_set_error (error, ALMANAH_STORAGE_MANAGER_ERROR, ALMANAH_STORAGE_MANAGER_ERROR_OPENING_FILE,
_("Could not open database \"%s\". SQLite provided the following error message:
%s"),
self->priv->filename, sqlite3_errmsg (self->priv->connection));
diff --git a/src/vfs.c b/src/vfs.c
new file mode 100644
index 0000000..7009d75
--- /dev/null
+++ b/src/vfs.c
@@ -0,0 +1,558 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+/*
+ * Almanah
+ * Copyright (C) Alvaro Peña 2014 <alvaropg gmail com>
+ *
+ * Almanah is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Almanah is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Almanah. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/*
+ * This code is based in the code available in the SQlite web
+ * http://www.sqlite.org/vfs.html called test_demovfs.c.
+ * So, many thanks to the SQLite guys!
+ */
+
+#include <sqlite3.h>
+
+#include <assert.h>
+#include <string.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/file.h>
+#include <sys/param.h>
+#include <unistd.h>
+#include <time.h>
+#include <errno.h>
+#include <fcntl.h>
+
+#include <config.h>
+
+#define ENCRYPTED_SUFFIX ".encrypted"
+
+/*
+** Size of the write buffer used by journal files in bytes.
+*/
+#ifndef SQLITE_DEMOVFS_BUFFERSZ
+# define SQLITE_DEMOVFS_BUFFERSZ 8192
+#endif
+
+/*
+** The maximum pathname length supported by this VFS.
+*/
+#define MAXPATHNAME 512
+
+/*
+** When using this VFS, the sqlite3_file* handles that SQLite uses are
+** actually pointers to instances of type DemoFile.
+*/
+typedef struct DemoFile DemoFile;
+struct DemoFile {
+ sqlite3_file base; /* Base class. Must be first. */
+ int fd; /* File descriptor */
+
+ char *aBuffer; /* Pointer to malloc'd buffer */
+ int nBuffer; /* Valid bytes of data in zBuffer */
+ sqlite3_int64 iBufferOfst; /* Offset in file of zBuffer[0] */
+};
+
+/*
+** Write directly to the file passed as the first argument. Even if the
+** file has a write-buffer (DemoFile.aBuffer), ignore it.
+*/
+static int demoDirectWrite(
+ DemoFile *p, /* File handle */
+ const void *zBuf, /* Buffer containing data to write */
+ int iAmt, /* Size of data to write in bytes */
+ sqlite_int64 iOfst /* File offset to write to */
+){
+ off_t ofst; /* Return value from lseek() */
+ size_t nWrite; /* Return value from write() */
+
+ ofst = lseek(p->fd, iOfst, SEEK_SET);
+ if( ofst!=iOfst ){
+ return SQLITE_IOERR_WRITE;
+ }
+
+ nWrite = write(p->fd, zBuf, iAmt);
+ if( nWrite!=iAmt ){
+ return SQLITE_IOERR_WRITE;
+ }
+
+ return SQLITE_OK;
+}
+
+/*
+** Flush the contents of the DemoFile.aBuffer buffer to disk. This is a
+** no-op if this particular file does not have a buffer (i.e. it is not
+** a journal file) or if the buffer is currently empty.
+*/
+static int demoFlushBuffer(DemoFile *p){
+ int rc = SQLITE_OK;
+ if( p->nBuffer ){
+ rc = demoDirectWrite(p, p->aBuffer, p->nBuffer, p->iBufferOfst);
+ p->nBuffer = 0;
+ }
+ return rc;
+}
+
+/*
+** Close a file.
+*/
+static int demoClose(sqlite3_file *pFile){
+ int rc;
+ DemoFile *p = (DemoFile*)pFile;
+ rc = demoFlushBuffer(p);
+ sqlite3_free(p->aBuffer);
+ close(p->fd);
+ return rc;
+}
+
+/*
+** Read data from a file.
+*/
+static int demoRead(
+ sqlite3_file *pFile,
+ void *zBuf,
+ int iAmt,
+ sqlite_int64 iOfst
+){
+ DemoFile *p = (DemoFile*)pFile;
+ off_t ofst; /* Return value from lseek() */
+ int nRead; /* Return value from read() */
+ int rc; /* Return code from demoFlushBuffer() */
+
+ /* Flush any data in the write buffer to disk in case this operation
+ ** is trying to read data the file-region currently cached in the buffer.
+ ** It would be possible to detect this case and possibly save an
+ ** unnecessary write here, but in practice SQLite will rarely read from
+ ** a journal file when there is data cached in the write-buffer.
+ */
+ rc = demoFlushBuffer(p);
+ if( rc!=SQLITE_OK ){
+ return rc;
+ }
+
+ ofst = lseek(p->fd, iOfst, SEEK_SET);
+ if( ofst!=iOfst ){
+ return SQLITE_IOERR_READ;
+ }
+ nRead = read(p->fd, zBuf, iAmt);
+
+ if( nRead==iAmt ){
+ return SQLITE_OK;
+ }else if( nRead>=0 ){
+ return SQLITE_IOERR_SHORT_READ;
+ }
+
+ return SQLITE_IOERR_READ;
+}
+
+/*
+** Write data to a crash-file.
+*/
+static int demoWrite(
+ sqlite3_file *pFile,
+ const void *zBuf,
+ int iAmt,
+ sqlite_int64 iOfst
+){
+ DemoFile *p = (DemoFile*)pFile;
+
+ if( p->aBuffer ){
+ char *z = (char *)zBuf; /* Pointer to remaining data to write */
+ int n = iAmt; /* Number of bytes at z */
+ sqlite3_int64 i = iOfst; /* File offset to write to */
+
+ while( n>0 ){
+ int nCopy; /* Number of bytes to copy into buffer */
+
+ /* If the buffer is full, or if this data is not being written directly
+ ** following the data already buffered, flush the buffer. Flushing
+ ** the buffer is a no-op if it is empty.
+ */
+ if( p->nBuffer==SQLITE_DEMOVFS_BUFFERSZ || p->iBufferOfst+p->nBuffer!=i ){
+ int rc = demoFlushBuffer(p);
+ if( rc!=SQLITE_OK ){
+ return rc;
+ }
+ }
+ assert( p->nBuffer==0 || p->iBufferOfst+p->nBuffer==i );
+ p->iBufferOfst = i - p->nBuffer;
+
+ /* Copy as much data as possible into the buffer. */
+ nCopy = SQLITE_DEMOVFS_BUFFERSZ - p->nBuffer;
+ if( nCopy>n ){
+ nCopy = n;
+ }
+ memcpy(&p->aBuffer[p->nBuffer], z, nCopy);
+ p->nBuffer += nCopy;
+
+ n -= nCopy;
+ i += nCopy;
+ z += nCopy;
+ }
+ }else{
+ return demoDirectWrite(p, zBuf, iAmt, iOfst);
+ }
+
+ return SQLITE_OK;
+}
+
+/*
+** Truncate a file. This is a no-op for this VFS (see header comments at
+** the top of the file).
+*/
+static int demoTruncate(sqlite3_file *pFile, sqlite_int64 size){
+#if 0
+ if( ftruncate(((DemoFile *)pFile)->fd, size) ) return SQLITE_IOERR_TRUNCATE;
+#endif
+ return SQLITE_OK;
+}
+
+/*
+** Sync the contents of the file to the persistent media.
+*/
+static int demoSync(sqlite3_file *pFile, int flags){
+ DemoFile *p = (DemoFile*)pFile;
+ int rc;
+
+ rc = demoFlushBuffer(p);
+ if( rc!=SQLITE_OK ){
+ return rc;
+ }
+
+ rc = fsync(p->fd);
+ return (rc==0 ? SQLITE_OK : SQLITE_IOERR_FSYNC);
+}
+
+/*
+** Write the size of the file in bytes to *pSize.
+*/
+static int demoFileSize(sqlite3_file *pFile, sqlite_int64 *pSize){
+ DemoFile *p = (DemoFile*)pFile;
+ int rc; /* Return code from fstat() call */
+ struct stat sStat; /* Output of fstat() call */
+
+ /* Flush the contents of the buffer to disk. As with the flush in the
+ ** demoRead() method, it would be possible to avoid this and save a write
+ ** here and there. But in practice this comes up so infrequently it is
+ ** not worth the trouble.
+ */
+ rc = demoFlushBuffer(p);
+ if( rc!=SQLITE_OK ){
+ return rc;
+ }
+
+ rc = fstat(p->fd, &sStat);
+ if( rc!=0 ) return SQLITE_IOERR_FSTAT;
+ *pSize = sStat.st_size;
+ return SQLITE_OK;
+}
+
+/*
+** Locking functions. The xLock() and xUnlock() methods are both no-ops.
+** The xCheckReservedLock() always indicates that no other process holds
+** a reserved lock on the database file. This ensures that if a hot-journal
+** file is found in the file-system it is rolled back.
+*/
+static int demoLock(sqlite3_file *pFile, int eLock){
+ return SQLITE_OK;
+}
+static int demoUnlock(sqlite3_file *pFile, int eLock){
+ return SQLITE_OK;
+}
+static int demoCheckReservedLock(sqlite3_file *pFile, int *pResOut){
+ *pResOut = 0;
+ return SQLITE_OK;
+}
+
+/*
+** No xFileControl() verbs are implemented by this VFS.
+*/
+static int demoFileControl(sqlite3_file *pFile, int op, void *pArg){
+ return SQLITE_OK;
+}
+
+/*
+** The xSectorSize() and xDeviceCharacteristics() methods. These two
+** may return special values allowing SQLite to optimize file-system
+** access to some extent. But it is also safe to simply return 0.
+*/
+static int demoSectorSize(sqlite3_file *pFile){
+ return 0;
+}
+static int demoDeviceCharacteristics(sqlite3_file *pFile){
+ return 0;
+}
+
+/*
+** Open a file handle.
+*/
+static int
+demoOpen(sqlite3_vfs *pVfs, /* VFS */
+ const char *zName, /* File to open, or 0 for a temp file */
+ sqlite3_file *pFile, /* Pointer to DemoFile struct to populate */
+ int flags, /* Input SQLITE_OPEN_XXX flags */
+ int *pOutFlags /* Output SQLITE_OPEN_XXX flags (or NULL) */
+ )
+{
+ static const sqlite3_io_methods demoio = {
+ 1, /* iVersion */
+ demoClose, /* xClose */
+ demoRead, /* xRead */
+ demoWrite, /* xWrite */
+ demoTruncate, /* xTruncate */
+ demoSync, /* xSync */
+ demoFileSize, /* xFileSize */
+ demoLock, /* xLock */
+ demoUnlock, /* xUnlock */
+ demoCheckReservedLock, /* xCheckReservedLock */
+ demoFileControl, /* xFileControl */
+ demoSectorSize, /* xSectorSize */
+ demoDeviceCharacteristics /* xDeviceCharacteristics */
+ };
+
+ DemoFile *p = (DemoFile*) pFile; /* Populate this structure */
+ int oflags = 0; /* flags to pass to open() call */
+ char *aBuf = 0;
+
+ if (zName == 0) {
+ return SQLITE_IOERR;
+ }
+
+ if (flags & SQLITE_OPEN_MAIN_JOURNAL){
+ aBuf = (char *) sqlite3_malloc(SQLITE_DEMOVFS_BUFFERSZ);
+ if(!aBuf) {
+ return SQLITE_NOMEM;
+ }
+ }
+
+ if (flags & SQLITE_OPEN_EXCLUSIVE) oflags |= O_EXCL;
+ if (flags & SQLITE_OPEN_CREATE) oflags |= O_CREAT;
+ if (flags & SQLITE_OPEN_READONLY) oflags |= O_RDONLY;
+ if (flags & SQLITE_OPEN_READWRITE) oflags |= O_RDWR;
+
+ memset(p, 0, sizeof(DemoFile));
+ p->fd = open (zName, oflags, 0600);
+ if (p->fd < 0) {
+ sqlite3_free (aBuf);
+ return SQLITE_CANTOPEN;
+ }
+ p->aBuffer = aBuf;
+
+ if (pOutFlags) {
+ *pOutFlags = flags;
+ }
+
+ p->base.pMethods = &demoio;
+
+ return SQLITE_OK;
+}
+
+/*
+** Delete the file identified by argument zPath. If the dirSync parameter
+** is non-zero, then ensure the file-system modification to delete the
+** file has been synced to disk before returning.
+*/
+static int demoDelete(sqlite3_vfs *pVfs, const char *zPath, int dirSync){
+ int rc; /* Return code */
+
+ rc = unlink(zPath);
+ if( rc!=0 && errno==ENOENT ) return SQLITE_OK;
+
+ if( rc==0 && dirSync ){
+ int dfd; /* File descriptor open on directory */
+ int i; /* Iterator variable */
+ char zDir[MAXPATHNAME+1]; /* Name of directory containing file zPath */
+
+ /* Figure out the directory name from the path of the file deleted. */
+ sqlite3_snprintf(MAXPATHNAME, zDir, "%s", zPath);
+ zDir[MAXPATHNAME] = '\0';
+ for(i=strlen(zDir); i>1 && zDir[i]!='/'; i++);
+ zDir[i] = '\0';
+
+ /* Open a file-descriptor on the directory. Sync. Close. */
+ dfd = open(zDir, O_RDONLY, 0);
+ if( dfd<0 ){
+ rc = -1;
+ }else{
+ rc = fsync(dfd);
+ close(dfd);
+ }
+ }
+ return (rc==0 ? SQLITE_OK : SQLITE_IOERR_DELETE);
+}
+
+#ifndef F_OK
+# define F_OK 0
+#endif
+#ifndef R_OK
+# define R_OK 4
+#endif
+#ifndef W_OK
+# define W_OK 2
+#endif
+
+/*
+** Query the file-system to see if the named file exists, is readable or
+** is both readable and writable.
+*/
+static int demoAccess(
+ sqlite3_vfs *pVfs,
+ const char *zPath,
+ int flags,
+ int *pResOut
+){
+ int rc; /* access() return code */
+ int eAccess = F_OK; /* Second argument to access() */
+
+ assert( flags==SQLITE_ACCESS_EXISTS /* access(zPath, F_OK) */
+ || flags==SQLITE_ACCESS_READ /* access(zPath, R_OK) */
+ || flags==SQLITE_ACCESS_READWRITE /* access(zPath, R_OK|W_OK) */
+ );
+
+ if( flags==SQLITE_ACCESS_READWRITE ) eAccess = R_OK|W_OK;
+ if( flags==SQLITE_ACCESS_READ ) eAccess = R_OK;
+
+ rc = access(zPath, eAccess);
+ *pResOut = (rc==0);
+ return SQLITE_OK;
+}
+
+/*
+** Argument zPath points to a nul-terminated string containing a file path.
+** If zPath is an absolute path, then it is copied as is into the output
+** buffer. Otherwise, if it is a relative path, then the equivalent full
+** path is written to the output buffer.
+**
+** This function assumes that paths are UNIX style. Specifically, that:
+**
+** 1. Path components are separated by a '/'. and
+** 2. Full paths begin with a '/' character.
+*/
+static int demoFullPathname(
+ sqlite3_vfs *pVfs, /* VFS */
+ const char *zPath, /* Input path (possibly a relative path) */
+ int nPathOut, /* Size of output buffer in bytes */
+ char *zPathOut /* Pointer to output buffer */
+){
+ char zDir[MAXPATHNAME+1];
+ if( zPath[0]=='/' ){
+ zDir[0] = '\0';
+ }else{
+ getcwd(zDir, sizeof(zDir));
+ }
+ zDir[MAXPATHNAME] = '\0';
+
+ sqlite3_snprintf(nPathOut, zPathOut, "%s/%s", zDir, zPath);
+ zPathOut[nPathOut-1] = '\0';
+
+ return SQLITE_OK;
+}
+
+/*
+** The following four VFS methods:
+**
+** xDlOpen
+** xDlError
+** xDlSym
+** xDlClose
+**
+** are supposed to implement the functionality needed by SQLite to load
+** extensions compiled as shared objects. This simple VFS does not support
+** this functionality, so the following functions are no-ops.
+*/
+static void *demoDlOpen(sqlite3_vfs *pVfs, const char *zPath){
+ return 0;
+}
+static void demoDlError(sqlite3_vfs *pVfs, int nByte, char *zErrMsg){
+ sqlite3_snprintf(nByte, zErrMsg, "Loadable extensions are not supported");
+ zErrMsg[nByte-1] = '\0';
+}
+static void (*demoDlSym(sqlite3_vfs *pVfs, void *pH, const char *z))(void){
+ return 0;
+}
+static void demoDlClose(sqlite3_vfs *pVfs, void *pHandle){
+ return;
+}
+
+/*
+** Parameter zByte points to a buffer nByte bytes in size. Populate this
+** buffer with pseudo-random data.
+*/
+static int demoRandomness(sqlite3_vfs *pVfs, int nByte, char *zByte){
+ return SQLITE_OK;
+}
+
+/*
+** Sleep for at least nMicro microseconds. Return the (approximate) number
+** of microseconds slept for.
+*/
+static int demoSleep(sqlite3_vfs *pVfs, int nMicro){
+ sleep(nMicro / 1000000);
+ usleep(nMicro % 1000000);
+ return nMicro;
+}
+
+/*
+** Set *pTime to the current UTC time expressed as a Julian day. Return
+** SQLITE_OK if successful, or an error code otherwise.
+**
+** http://en.wikipedia.org/wiki/Julian_day
+**
+** This implementation is not very good. The current time is rounded to
+** an integer number of seconds. Also, assuming time_t is a signed 32-bit
+** value, it will stop working some time in the year 2038 AD (the so-called
+** "year 2038" problem that afflicts systems that store time this way).
+*/
+static int demoCurrentTime(sqlite3_vfs *pVfs, double *pTime){
+ time_t t = time(0);
+ *pTime = t/86400.0 + 2440587.5;
+ return SQLITE_OK;
+}
+
+/*
+** This function returns a pointer to the VFS implemented in this file.
+** To make the VFS available to SQLite:
+**
+** sqlite3_vfs_register(sqlite3_demovfs(), 0);
+*/
+sqlite3_vfs *sqlite3_demovfs(void){
+ static sqlite3_vfs demovfs = {
+ 1, /* iVersion */
+ sizeof(DemoFile), /* szOsFile */
+ MAXPATHNAME, /* mxPathname */
+ 0, /* pNext */
+ "almanah", /* zName */
+ 0, /* pAppData */
+ demoOpen, /* xOpen */
+ demoDelete, /* xDelete */
+ demoAccess, /* xAccess */
+ demoFullPathname, /* xFullPathname */
+ demoDlOpen, /* xDlOpen */
+ demoDlError, /* xDlError */
+ demoDlSym, /* xDlSym */
+ demoDlClose, /* xDlClose */
+ demoRandomness, /* xRandomness */
+ demoSleep, /* xSleep */
+ demoCurrentTime, /* xCurrentTime */
+ };
+ return &demovfs;
+}
+
+int
+almanah_vfs_init(void)
+{
+ return sqlite3_vfs_register(sqlite3_demovfs(), 0);
+}
diff --git a/src/vfs.h b/src/vfs.h
new file mode 100644
index 0000000..552c768
--- /dev/null
+++ b/src/vfs.h
@@ -0,0 +1,20 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+/*
+ * Almanah
+ * Copyright (C) Alvaro Peña 2014 <alvaropg gmail com>
+ *
+ * Almanah is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Almanah is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Almanah. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+int almanah_vfs_init(void);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
