Import SQLite 3.10.2.

third_party/sqlite/patches/0005-Virtual-table-supporting-recovery-of-corrupted-datab.patch

-From ec588be0416fab3e957d0901eb6e638543b01229 Mon Sep 17 00:00:00 2001
+From 29b8ad9263dbc700c002e9044c7c712a566a26d7 Mon Sep 17 00:00:00 2001
 From: Scott Hess <shess@chromium.org>
 Date: Sat, 20 Jul 2013 11:42:21 -0700
-Subject: [PATCH 06/11] Virtual table supporting recovery of corrupted
+Subject: [PATCH 05/10] Virtual table supporting recovery of corrupted
  databases.
 
 "recover" implements a virtual table which uses the SQLite pager layer
 to read table pages and pull out the data which is structurally sound
 (at least at the storage layer).
 
 BUG=109482
 
 Since this implements a new feature for SQLite, the review URLs aren't
 listed.  This patch and the top of recover.c should be considered
 authoritative.  The history is mostly under
 third_party/sqlite/src/src/{recover,recover-alt}.c .
 ---
  third_party/sqlite/src/Makefile.in         |    1 +
  third_party/sqlite/src/Makefile.linux-gcc  |    4 +
- third_party/sqlite/src/main.mk             |    4 +-
+ third_party/sqlite/src/main.mk             |    5 +-
  third_party/sqlite/src/src/main.c          |    8 +
- third_party/sqlite/src/src/recover.c       | 2165 ++++++++++++++++++++++++++++
+ third_party/sqlite/src/src/recover.c       | 2167 ++++++++++++++++++++++++++++
  third_party/sqlite/src/src/sqlite.h.in     |   16 +
  third_party/sqlite/src/test/recover.test   |  147 ++
  third_party/sqlite/src/test/recover0.test  |  532 +++++++
  third_party/sqlite/src/test/recover1.test  |  429 ++++++
  third_party/sqlite/src/test/recover2.test  |  157 ++
  third_party/sqlite/src/tool/mksqlite3c.tcl |    2 +
- 11 files changed, 3464 insertions(+), 1 deletion(-)
+ 11 files changed, 3467 insertions(+), 1 deletion(-)
  create mode 100644 third_party/sqlite/src/src/recover.c
  create mode 100644 third_party/sqlite/src/test/recover.test
  create mode 100644 third_party/sqlite/src/test/recover0.test
  create mode 100644 third_party/sqlite/src/test/recover1.test
  create mode 100644 third_party/sqlite/src/test/recover2.test
 
 diff --git a/third_party/sqlite/src/Makefile.in b/third_party/sqlite/src/Makefile.in
-index a2213e8..1389486 100644
+index 1fe49d6..8b965c7 100644
 --- a/third_party/sqlite/src/Makefile.in
 +++ b/third_party/sqlite/src/Makefile.in
-@@ -253,6 +253,7 @@ SRC = \
+@@ -260,6 +260,7 @@ SRC = \
    $(TOP)/src/prepare.c \
    $(TOP)/src/printf.c \
    $(TOP)/src/random.c \
 +  $(TOP)/src/recover.c \
    $(TOP)/src/resolve.c \
    $(TOP)/src/rowset.c \
    $(TOP)/src/select.c \
 diff --git a/third_party/sqlite/src/Makefile.linux-gcc b/third_party/sqlite/src/Makefile.linux-gcc
-index 4f6cdf1..dd8f46d 100644
+index 952e8d1..f6291c0 100644
 --- a/third_party/sqlite/src/Makefile.linux-gcc
 +++ b/third_party/sqlite/src/Makefile.linux-gcc
 @@ -81,6 +81,10 @@ OPTS += -DSQLITE_MEMDEBUG=1
  # TODO(shess) I can't see why I need this setting.
  OPTS += -DOS_UNIX=1
  
 +# The recover virtual table is not generally enabled.  Enable it for testing
 +# purposes.
 +OPTS += -DDEFAULT_ENABLE_RECOVER=1
 +
  #### The suffix to add to executable files.  ".exe" for windows.
  #    Nothing for unix.
  #
 diff --git a/third_party/sqlite/src/main.mk b/third_party/sqlite/src/main.mk
-index dc56b0d..2189fd6 100644
+index 6ff3bd4..a8629aa 100644
 --- a/third_party/sqlite/src/main.mk
 +++ b/third_party/sqlite/src/main.mk
-@@ -65,7 +65,7 @@ LIBOBJ+= vdbe.o parse.o \
+@@ -67,7 +67,8 @@ LIBOBJ+= vdbe.o parse.o \
           mutex.o mutex_noop.o mutex_unix.o mutex_w32.o \
           notify.o opcodes.o os.o os_unix.o os_win.o \
           pager.o pcache.o pcache1.o pragma.o prepare.o printf.o \
--         random.o resolve.o rowset.o rtree.o select.o status.o \
-+         random.o recover.o resolve.o rowset.o rtree.o select.o status.o \
-          table.o threads.o tokenize.o trigger.o \
+-         random.o resolve.o rowset.o rtree.o select.o sqlite3rbu.o status.o \
++         random.o recover.o resolve.o rowset.o rtree.o \
++         select.o sqlite3rbu.o status.o \
+          table.o threads.o tokenize.o treeview.o trigger.o \
           update.o userauth.o util.o vacuum.o \
           vdbeapi.o vdbeaux.o vdbeblob.o vdbemem.o vdbesort.o \
-@@ -135,6 +135,7 @@ SRC = \
+@@ -140,6 +141,7 @@ SRC = \
    $(TOP)/src/prepare.c \
    $(TOP)/src/printf.c \
    $(TOP)/src/random.c \
 +  $(TOP)/src/recover.c \
    $(TOP)/src/resolve.c \
    $(TOP)/src/rowset.c \
    $(TOP)/src/select.c \
-@@ -315,6 +316,7 @@ TESTSRC2 = \
+@@ -360,6 +362,7 @@ TESTSRC2 = \
    $(TOP)/src/prepare.c \
    $(TOP)/src/printf.c \
    $(TOP)/src/random.c \
 +  $(TOP)/src/recover.c \
    $(TOP)/src/pcache.c \
    $(TOP)/src/pcache1.c \
    $(TOP)/src/select.c \
 diff --git a/third_party/sqlite/src/src/main.c b/third_party/sqlite/src/src/main.c
-index fc03700..d15ab9bb 100644
+index 3be7c77..301808c 100644
 --- a/third_party/sqlite/src/src/main.c
 +++ b/third_party/sqlite/src/src/main.c
-@@ -2644,6 +2644,14 @@ static int openDatabase(
+@@ -2927,6 +2927,14 @@ static int openDatabase(
    }
  #endif
  
 +#ifdef DEFAULT_ENABLE_RECOVER
 +  /* Initialize recover virtual table for testing. */
 +  extern int recoverVtableInit(sqlite3 *db);
 +  if( !db->mallocFailed && rc==SQLITE_OK ){
 +    rc = recoverVtableInit(db);
 +  }
 +#endif
 +
  #ifdef SQLITE_ENABLE_ICU
    if( !db->mallocFailed && rc==SQLITE_OK ){
      rc = sqlite3IcuInit(db);
 diff --git a/third_party/sqlite/src/src/recover.c b/third_party/sqlite/src/src/recover.c
 new file mode 100644
-index 0000000..6882d6f
+index 0000000..8e3929d
 --- /dev/null
 +++ b/third_party/sqlite/src/src/recover.c
-@@ -0,0 +1,2165 @@
+@@ -0,0 +1,2167 @@
 +/*
 +** 2012 Jan 11
 +**
 +** The author disclaims copyright to this source code.  In place of
 +** a legal notice, here is a blessing:
 +**
 +**    May you do good and not evil.
 +**    May you find forgiveness for yourself and forgive others.
 +**    May you share freely, never taking more than you give.
 +*/
@@ skipping 201 matching lines @@
 +#include <ctype.h>
 +#include <stdio.h>
 +#include <string.h>
 +
 +/* Internal SQLite things that are used:
 + * u32, u64, i64 types.
 + * Btree, Pager, and DbPage structs.
 + * DbPage.pData, .pPager, and .pgno
 + * sqlite3 struct.
 + * sqlite3BtreePager() and sqlite3BtreeGetPageSize()
-+ * sqlite3PagerAcquire() and sqlite3PagerUnref()
++ * sqlite3BtreeGetOptimalReserve()
++ * sqlite3PagerGet() and sqlite3PagerUnref()
 + * getVarint().
 + */
 +#include "sqliteInt.h"
 +
 +/* For debugging. */
 +#if 0
 +#define FNENTRY() fprintf(stderr, "In %s\n", __FUNCTION__)
 +#else
 +#define FNENTRY()
 +#endif
@@ skipping 165 matching lines @@
 +    if( ascii_strcasecmp(db->aDb[i].zName, zName)==0 ){
 +      pBt = db->aDb[i].pBt;
 +      break;
 +    }
 +  }
 +  if( !pBt ){
 +    return SQLITE_ERROR;
 +  }
 +
 +  *pPager = sqlite3BtreePager(pBt);
-+  *pnPageSize = sqlite3BtreeGetPageSize(pBt) - sqlite3BtreeGetReserve(pBt);
++  *pnPageSize =
++      sqlite3BtreeGetPageSize(pBt) - sqlite3BtreeGetOptimalReserve(pBt);
 +  return SQLITE_OK;
 +}
 +
 +/* iSerialType is a type read from a record header.  See "2.1 Record Format".
 + */
 +
 +/* Storage size of iSerialType in bytes.  My interpretation of SQLite
 + * documentation is that text and blob fields can have 32-bit length.
 + * Values past 2^31-12 will need more than 32 bits to encode, which is
 + * why iSerialType is u64.
@@ skipping 351 matching lines @@
 +    int rc;
 +    const unsigned char *pPageHeader;  /* Header of found page. */
 +
 +    /* Find a valid child page which isn't on the stack. */
 +    while( pCursor->iChild<pCursor->nChildren ){
 +      const unsigned iPage = interiorCursorChildPage(pCursor);
 +      pCursor->iChild++;
 +      if( interiorCursorPageInUse(pCursor, iPage) ){
 +        fprintf(stderr, "Loop detected at %d\n", iPage);
 +      }else{
-+        int rc = sqlite3PagerAcquire(pCursor->pPage->pPager, iPage, ppPage, 0);
++        int rc = sqlite3PagerGet(pCursor->pPage->pPager, iPage, ppPage, 0);
 +        if( rc==SQLITE_OK ){
 +          return SQLITE_ROW;
 +        }
 +      }
 +    }
 +
 +    /* This page has no more children.  Get next page from parent. */
 +    if( !pCursor->pParent ){
 +      return SQLITE_DONE;
 +    }
@@ skipping 123 matching lines @@
 +  nBytes = nLocalRecordBytes;
 +
 +  /* While there are more pages to read, and more bytes are needed,
 +   * get another page.
 +   */
 +  pFirstOverflow = pLastOverflow = NULL;
 +  rc = SQLITE_OK;
 +  while( iNextPage && nBytes<nRecordBytes ){
 +    RecoverOverflow *pOverflow;  /* New overflow page for the list. */
 +
-+    rc = sqlite3PagerAcquire(pPage->pPager, iNextPage, &pPage, 0);
++    rc = sqlite3PagerGet(pPage->pPager, iNextPage, &pPage, 0);
 +    if( rc!=SQLITE_OK ){
 +      break;
 +    }
 +
 +    pOverflow = sqlite3_malloc(sizeof(RecoverOverflow));
 +    if( !pOverflow ){
 +      sqlite3PagerUnref(pPage);
 +      rc = SQLITE_NOMEM;
 +      break;
 +    }
@@ skipping 308 matching lines @@
 + * - pPage is a valid interior page who's leaves contain no valid cells.
 + * - pPage is not a valid leaf or interior page.
 + */
 +static int leafCursorCreate(Pager *pPager, unsigned nPageSize,
 +                            u32 iRootPage, RecoverLeafCursor **ppCursor){
 +  DbPage *pPage;               /* Reference to page at iRootPage. */
 +  RecoverLeafCursor *pCursor;  /* Leaf cursor being constructed. */
 +  int rc;
 +
 +  /* Start out with the root page. */
-+  rc = sqlite3PagerAcquire(pPager, iRootPage, &pPage, 0);
++  rc = sqlite3PagerGet(pPager, iRootPage, &pPage, 0);
 +  if( rc!=SQLITE_OK ){
 +    return rc;
 +  }
 +
 +  pCursor = sqlite3_malloc(sizeof(RecoverLeafCursor));
 +  if( !pCursor ){
 +    sqlite3PagerUnref(pPage);
 +    return SQLITE_NOMEM;
 +  }
 +  memset(pCursor, 0, sizeof(*pCursor));
@@ skipping 893 matching lines @@
 +  sqlite3_free(zCreateSql);
 +  if( rc!=SQLITE_OK ){
 +    recoverRelease(pRecover);
 +    return rc;
 +  }
 +
 +  *ppVtab = (sqlite3_vtab *)pRecover;
 +  return SQLITE_OK;
 +}
 diff --git a/third_party/sqlite/src/src/sqlite.h.in b/third_party/sqlite/src/src/sqlite.h.in
-index 36aa999..333adfe 100644
+index e5673fd..6829bcb 100644
 --- a/third_party/sqlite/src/src/sqlite.h.in
 +++ b/third_party/sqlite/src/src/sqlite.h.in
-@@ -7408,6 +7408,22 @@ int sqlite3_vtab_on_conflict(sqlite3 *);
- 
- 
+@@ -7411,6 +7411,22 @@ int sqlite3_strnicmp(const char *, const char *, int);
+ */
+ int sqlite3_strglob(const char *zGlob, const char *zStr);
  
 +/* Begin recover virtual table patch for Chromium */
 +/* Our patches don't conform to SQLite's amalgamation processing. Hack it. */
 +#ifndef CHROMIUM_SQLITE_API
 +#define CHROMIUM_SQLITE_API SQLITE_API
 +#endif
 +/*
 +** Call to initialize the recover virtual-table modules (see recover.c).
 +**
 +** This could be loaded by default in main.c, but that would make the
@@ skipping 1290 matching lines @@
 +
 +  execsql {
 +    PRAGMA page_count;
 +    PRAGMA page_size;
 +    SELECT rowid, TYPEOF(value), length(value), value FROM overflow_recover;
 +  }
 +} [list 4 1024 1 text [string length $substr] $substr]
 +
 +finish_test
 diff --git a/third_party/sqlite/src/tool/mksqlite3c.tcl b/third_party/sqlite/src/tool/mksqlite3c.tcl
-index 0e97923..9e2b0fe 100644
+index 23241e2..1113758 100644
 --- a/third_party/sqlite/src/tool/mksqlite3c.tcl
 +++ b/third_party/sqlite/src/tool/mksqlite3c.tcl
-@@ -316,6 +316,8 @@ foreach file {
+@@ -361,6 +361,8 @@ foreach file {
     main.c
     notify.c
  
 +   recover.c
 +
     fts3.c
     fts3_aux.c
     fts3_expr.c
 -- 
-2.4.5
+2.7.0