[sql] Import SQLite 3.17.0.

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

-From d176c774ba1a8b431400f38ca71459bf148f0c3a Mon Sep 17 00:00:00 2001
+From b246b60be3e9e241892d772a324aced44865d7f9 Mon Sep 17 00:00:00 2001
 From: Scott Hess <shess@chromium.org>
 Date: Sat, 20 Jul 2013 11:42:21 -0700
-Subject: [PATCH 05/13] Virtual table supporting recovery of corrupted
+Subject: [PATCH 04/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/main.mk              |    6 +-
+ third_party/sqlite/src/main.mk              |    5 +
  third_party/sqlite/src/src/main.c           |    8 +
  third_party/sqlite/src/src/recover.c        | 2270 +++++++++++++++++++++++++++
  third_party/sqlite/src/src/recover.h        |   23 +
  third_party/sqlite/src/src/recover_varint.c |  201 +++
  third_party/sqlite/src/test/recover.test    |  164 ++
  third_party/sqlite/src/test/recover0.test   |  532 +++++++
  third_party/sqlite/src/test/recover1.test   |  429 +++++
  third_party/sqlite/src/test/recover2.test   |  157 ++
- 9 files changed, 3789 insertions(+), 1 deletion(-)
+ 9 files changed, 3789 insertions(+)
  create mode 100644 third_party/sqlite/src/src/recover.c
  create mode 100644 third_party/sqlite/src/src/recover.h
  create mode 100644 third_party/sqlite/src/src/recover_varint.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/main.mk b/third_party/sqlite/src/main.mk
-index 6ff3bd4..26f9f15 100644
+index 6feb638b9280..b46c5bbc9ced 100644
 --- a/third_party/sqlite/src/main.mk
 +++ b/third_party/sqlite/src/main.mk
-@@ -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 sqlite3rbu.o status.o \
-+         random.o recover.o recover_varint.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 \
-@@ -360,6 +361,8 @@ TESTSRC2 = \
+@@ -75,6 +75,8 @@ LIBOBJ+= vdbe.o parse.o \
+         vdbetrace.o wal.o walker.o where.o wherecode.o whereexpr.o \
+          utf.o vtab.o
+ 
++LIBOBJ += recover.o recover_varint.o resolve.o
++
+ LIBOBJ += sqlite3session.o
+ 
+ # All of the source code files.
+@@ -370,6 +372,8 @@ TESTSRC2 = \
    $(TOP)/src/prepare.c \
    $(TOP)/src/printf.c \
    $(TOP)/src/random.c \
 +  $(TOP)/src/recover.c \
 +  $(TOP)/src/recover_varint.c \
    $(TOP)/src/pcache.c \
    $(TOP)/src/pcache1.c \
    $(TOP)/src/select.c \
-@@ -720,6 +723,7 @@ sqlite3_analyzer$(EXE): sqlite3_analyzer.c
- #
- TESTFIXTURE_FLAGS  = -DSQLITE_TEST=1 -DSQLITE_CRASH_TEST=1
- TESTFIXTURE_FLAGS += -DSQLITE_SERVER=1 -DSQLITE_PRIVATE="" -DSQLITE_CORE 
+@@ -768,6 +772,7 @@ TESTFIXTURE_FLAGS  = -DSQLITE_TEST=1 -DSQLITE_CRASH_TEST=1
+ TESTFIXTURE_FLAGS += -DSQLITE_SERVER=1 -DSQLITE_PRIVATE="" -DSQLITE_CORE
+ TESTFIXTURE_FLAGS += -DSQLITE_SERIES_CONSTRAINT_VERIFY=1
+ TESTFIXTURE_FLAGS += -DSQLITE_DEFAULT_PAGE_SIZE=1024
 +TESTFIXTURE_FLAGS += -DDEFAULT_ENABLE_RECOVER=1
  
  testfixture$(EXE): $(TESTSRC2) libsqlite3.a $(TESTSRC) $(TOP)/src/tclsqlite.c
         $(TCCX) $(TCL_FLAGS) -DTCLSH=1 $(TESTFIXTURE_FLAGS)                  \
 diff --git a/third_party/sqlite/src/src/main.c b/third_party/sqlite/src/src/main.c
-index 3be7c77..301808c 100644
+index 9aad8fdd4cf8..03e4f1b92845 100644
 --- a/third_party/sqlite/src/src/main.c
 +++ b/third_party/sqlite/src/src/main.c
-@@ -2927,6 +2927,14 @@ static int openDatabase(
+@@ -3014,6 +3014,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..c22fd4d
+index 000000000000..c22fd4d43166
 --- /dev/null
 +++ b/third_party/sqlite/src/src/recover.c
 @@ -0,0 +1,2270 @@
 +/*
 +** 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.
@@ skipping 2255 matching lines @@
 +  if( rc!=SQLITE_OK ){
 +    recoverRelease(pRecover);
 +    return rc;
 +  }
 +
 +  *ppVtab = (sqlite3_vtab *)pRecover;
 +  return SQLITE_OK;
 +}
 diff --git a/third_party/sqlite/src/src/recover.h b/third_party/sqlite/src/src/recover.h
 new file mode 100644
-index 0000000..691f2fd
+index 000000000000..691f2fdbab22
 --- /dev/null
 +++ b/third_party/sqlite/src/src/recover.h
 @@ -0,0 +1,23 @@
 +/* TODO(shess): sqliteicu.h is able to make this include without
 +** trouble.  It doesn't work when used with Chromium's SQLite.  For
 +** now the including code must include sqlite3.h first.
 +*/
 +/* #include "sqlite3.h" */
 +
 +#ifdef __cplusplus
 +extern "C" {
 +#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
 +** virtual table available to Web SQL.  Breaking it out allows only
 +** selected users to enable it (currently sql/recovery.cc).
 +*/
 +SQLITE_API
 +int recoverVtableInit(sqlite3 *db);
 +
 +#ifdef __cplusplus
 +}  /* End of the 'extern "C"' block */
 +#endif
 diff --git a/third_party/sqlite/src/src/recover_varint.c b/third_party/sqlite/src/src/recover_varint.c
 new file mode 100644
-index 0000000..c111e2c
+index 000000000000..c111e2cedc44
 --- /dev/null
 +++ b/third_party/sqlite/src/src/recover_varint.c
 @@ -0,0 +1,201 @@
 +/*
 +** 2016 Feb 29
 +**
 +** 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.
@@ skipping 186 matching lines @@
 +  b = b>>3;
 +  s |= b;
 +
 +  *v = ((u64)s)<<32 | a;
 +
 +  return 9;
 +}
 +
 diff --git a/third_party/sqlite/src/test/recover.test b/third_party/sqlite/src/test/recover.test
 new file mode 100644
-index 0000000..bfb7888
+index 000000000000..bfb788814866
 --- /dev/null
 +++ b/third_party/sqlite/src/test/recover.test
 @@ -0,0 +1,164 @@
 +# 2012 January 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.
@@ skipping 149 matching lines @@
 +      t TEXT,
 +      n INTEGER
 +    );
 +  }
 +  execsql {SELECT t, n FROM interior2_recover WHERE (rowid%500)=0 ORDER BY rowid}
 +} {{Interior-node-generating line 499} 499 {Interior-node-generating line 999} 999 {Interior-node-generating line 1499} 1499 {Interior-node-generating line 1999} 1999 {Interior-node-generating line 2499} 2499 {Interior-node-generating line 2999} 2999 {Interior-node-generating line 3499} 3499 {Interior-node-generating line 3999} 3999 {Interior-node-generating line 4499} 4499 {Interior-node-generating line 4999} 4999}
 +
 +finish_test
 diff --git a/third_party/sqlite/src/test/recover0.test b/third_party/sqlite/src/test/recover0.test
 new file mode 100644
-index 0000000..aac2ed9
+index 000000000000..aac2ed9164ba
 --- /dev/null
 +++ b/third_party/sqlite/src/test/recover0.test
 @@ -0,0 +1,532 @@
 +# 2012 January 4 {}
 +#
 +# 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.
@@ skipping 517 matching lines @@
 +    CREATE VIRTUAL TABLE temp.syntax USING recover(
 +      backing,
 +      v INTEGER NOT NULL TEXT
 +    );
 +  }
 +} {1 {unable to parse column 0}}
 +
 +finish_test
 diff --git a/third_party/sqlite/src/test/recover1.test b/third_party/sqlite/src/test/recover1.test
 new file mode 100644
-index 0000000..1d90f09
+index 000000000000..1d90f096b727
 --- /dev/null
 +++ b/third_party/sqlite/src/test/recover1.test
 @@ -0,0 +1,429 @@
 +# 2012 January 4 {}
 +#
 +# 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.
@@ skipping 414 matching lines @@
 +      e,
 +      v TEXT
 +    );
 +    SELECT rowid, v FROM e_recover ORDER BY rowid;
 +  }
 +} {UTF-16be 1 Mjollnir 2 Mjölnir 3 Mjǫlnir 4 Mjölner 5 Mjølner 6 ハンマー}
 +
 +finish_test
 diff --git a/third_party/sqlite/src/test/recover2.test b/third_party/sqlite/src/test/recover2.test
 new file mode 100644
-index 0000000..8aa4e04
+index 000000000000..8aa4e049a010
 --- /dev/null
 +++ b/third_party/sqlite/src/test/recover2.test
 @@ -0,0 +1,157 @@
 +# 2012 January 4 {}
 +#
 +# 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.
@@ skipping 141 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
 -- 
-2.5.0
+2.11.0