diff options
3 files changed, 11 insertions, 68 deletions
diff --git a/meta/recipes-support/sqlite/files/0001-revert-ad601c7962-that-brings-2-increase-of-build-ti.patch b/meta/recipes-support/sqlite/files/0001-revert-ad601c7962-that-brings-2-increase-of-build-ti.patch deleted file mode 100644 index 26540b241a..0000000000 --- a/meta/recipes-support/sqlite/files/0001-revert-ad601c7962-that-brings-2-increase-of-build-ti.patch +++ /dev/null | |||
| @@ -1,56 +0,0 @@ | |||
| 1 | From 4b286b441e8efa9a34eb0db8227748ebffd91c35 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Jianxun Zhang <jianxun.zhang@linux.intel.com> | ||
| 3 | Date: Thu, 13 Oct 2016 09:24:21 -0700 | ||
| 4 | Subject: [PATCH] revert ad601c7962 that brings 2% increase of build time. | ||
| 5 | |||
| 6 | The comment of the change in sqlite fossil project is: | ||
| 7 | "For in-memory databases, it does not matter if pcache | ||
| 8 | entries are marked "clean" or "writable"." | ||
| 9 | |||
| 10 | Upstream Status: Inappropriate | ||
| 11 | |||
| 12 | Signed-off-by: Jianxun Zhang <jianxun.zhang@linux.intel.com> | ||
| 13 | --- | ||
| 14 | sqlite3.c | 12 +++--------- | ||
| 15 | 1 file changed, 3 insertions(+), 9 deletions(-) | ||
| 16 | |||
| 17 | diff --git a/sqlite3.c b/sqlite3.c | ||
| 18 | index ccddfe6..ecae550 100644 | ||
| 19 | --- a/sqlite3.c | ||
| 20 | +++ b/sqlite3.c | ||
| 21 | @@ -13146,7 +13146,7 @@ struct PgHdr { | ||
| 22 | sqlite3_pcache_page *pPage; /* Pcache object page handle */ | ||
| 23 | void *pData; /* Page data */ | ||
| 24 | void *pExtra; /* Extra content */ | ||
| 25 | - PgHdr *pDirty; /* Transient list of dirty sorted by pgno */ | ||
| 26 | + PgHdr *pDirty; /* Transient list of dirty pages */ | ||
| 27 | Pager *pPager; /* The pager this page is part of */ | ||
| 28 | Pgno pgno; /* Page number for this page */ | ||
| 29 | #ifdef SQLITE_CHECK_PAGES | ||
| 30 | @@ -43504,13 +43504,7 @@ bitvec_end: | ||
| 31 | /* #include "sqliteInt.h" */ | ||
| 32 | |||
| 33 | /* | ||
| 34 | -** A complete page cache is an instance of this structure. Every | ||
| 35 | -** entry in the cache holds a single page of the database file. The | ||
| 36 | -** btree layer only operates on the cached copy of the database pages. | ||
| 37 | -** | ||
| 38 | -** A page cache entry is "clean" if it exactly matches what is currently | ||
| 39 | -** on disk. A page is "dirty" if it has been modified and needs to be | ||
| 40 | -** persisted to disk. | ||
| 41 | +** A complete page cache is an instance of this structure. | ||
| 42 | ** | ||
| 43 | ** pDirty, pDirtyTail, pSynced: | ||
| 44 | ** All dirty pages are linked into the doubly linked list using | ||
| 45 | @@ -48314,7 +48308,7 @@ static int pager_end_transaction(Pager *pPager, int hasMaster, int bCommit){ | ||
| 46 | pPager->pInJournal = 0; | ||
| 47 | pPager->nRec = 0; | ||
| 48 | if( rc==SQLITE_OK ){ | ||
| 49 | - if( pagerFlushOnCommit(pPager, bCommit) ){ | ||
| 50 | + if( MEMDB || pagerFlushOnCommit(pPager, bCommit) ){ | ||
| 51 | sqlite3PcacheCleanAll(pPager->pPCache); | ||
| 52 | }else{ | ||
| 53 | sqlite3PcacheClearWritable(pPager->pPCache); | ||
| 54 | -- | ||
| 55 | 2.7.4 | ||
| 56 | |||
diff --git a/meta/recipes-support/sqlite/sqlite3_3.15.2.bb b/meta/recipes-support/sqlite/sqlite3_3.15.2.bb deleted file mode 100644 index 20bc51596b..0000000000 --- a/meta/recipes-support/sqlite/sqlite3_3.15.2.bb +++ /dev/null | |||
| @@ -1,12 +0,0 @@ | |||
| 1 | require sqlite3.inc | ||
| 2 | |||
| 3 | LICENSE = "PD" | ||
| 4 | LIC_FILES_CHKSUM = "file://sqlite3.h;endline=11;md5=65f0a57ca6928710b418c094b3570bb0" | ||
| 5 | |||
| 6 | SRC_URI = "\ | ||
| 7 | http://www.sqlite.org/2016/sqlite-autoconf-${SQLITE_PV}.tar.gz \ | ||
| 8 | file://0001-revert-ad601c7962-that-brings-2-increase-of-build-ti.patch \ | ||
| 9 | " | ||
| 10 | |||
| 11 | SRC_URI[md5sum] = "6b4fc0d8f7f02dd56bbde10a7c497a05" | ||
| 12 | SRC_URI[sha256sum] = "07b35063b9386865b78226cdaca9a299d938a87aaa8fdc4d73edb0cef30f3149" | ||
diff --git a/meta/recipes-support/sqlite/sqlite3_3.16.2.bb b/meta/recipes-support/sqlite/sqlite3_3.16.2.bb new file mode 100644 index 0000000000..cfbe198c88 --- /dev/null +++ b/meta/recipes-support/sqlite/sqlite3_3.16.2.bb | |||
| @@ -0,0 +1,11 @@ | |||
| 1 | require sqlite3.inc | ||
| 2 | |||
| 3 | LICENSE = "PD" | ||
| 4 | LIC_FILES_CHKSUM = "file://sqlite3.h;endline=11;md5=65f0a57ca6928710b418c094b3570bb0" | ||
| 5 | |||
| 6 | SRC_URI = "\ | ||
| 7 | http://www.sqlite.org/2017/sqlite-autoconf-${SQLITE_PV}.tar.gz \ | ||
| 8 | " | ||
| 9 | SRC_URI[md5sum] = "5a153ef1fd2fa5845ada74deabc68e32" | ||
| 10 | SRC_URI[sha256sum] = "65cc0c3e9366f50c0679c5ccd31432cea894bc4a3e8947dabab88c8693263615" | ||
| 11 | |||
