Bump to sqlite 3.18.0

[Model] All
[BinType] AP
[Customer] OPEN

[Issue#] N/A
[Request] N/A
[Occurrence Version] N/A

[Problem] version upgrade
[Cause & Measure] version upgrade
[Checking Method] N/A

[Team] Open Source Management and Setting Part
[Developer] dh0128.kwak
[Solution company] Samsung
[Change Type] N/A

Change-Id: I08ecec16e70d43537497ce6491eece249ca55a33
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>

diff --git a/packaging/sqlite.spec b/packaging/sqlite.spec
index f69c0cf..b8a3e8a 100644 (file)
--- a/packaging/sqlite.spec
+++ b/packaging/sqlite.spec
@@ -1,8 +1,8 @@
 Name:           sqlite
-Version:        3.14.2
+Version:        3.18.0
 Release:        0
 License:        Public-Domain
-%define tarversion 3140200
+%define tarversion 3180000
 Summary:        Embeddable SQL Database Engine
 Url:            http://www.sqlite.org/
 Group:          System/Database

diff --git a/sqlite3.c b/sqlite3.c
index 57f9899..13d962b 100644 (file)
--- a/sqlite3.c
+++ b/sqlite3.c
@@ -29437,8 +29437,17 @@ SQLITE_PRIVATE void *sqlite3HashInsert(Hash *pH, const char *pKey, void *data){
     }
     return old_data;
   }
-  if( strcmp(pVfs->zName,"unix-excl")==0 ){
-    pNew->ctrlFlags |= UNIXFILE_EXCL;
+  if( data==0 ) return 0;
+  new_elem = (HashElem*)sqlite3Malloc( sizeof(HashElem) );
+  if( new_elem==0 ) return data;
+  new_elem->pKey = pKey;
+  new_elem->data = data;
+  pH->count++;
+  if( pH->count>=10 && pH->count > 2*pH->htsize ){
+    if( rehash(pH, pH->count*2) ){
+      assert( pH->htsize>0 );
+      h = strHash(pKey) % pH->htsize;
+    }
   }
   insertElement(pH, pH->ht ? &pH->ht[h] : 0, new_elem);
   return 0;
@@ -43351,21 +43360,9 @@ static int winRandomness(sqlite3_vfs *pVfs, int nBuf, char *zBuf){
     osGetSystemTime(&x);
     xorMemory(&e, (unsigned char*)&x, sizeof(SYSTEMTIME));
   }
-  /* pPager->pFirst = 0; */
-  /* pPager->pFirstSynced = 0; */
-  /* pPager->pLast = 0; */
-  pPager->nExtra = (u16)nExtra;
-  pPager->journalSizeLimit = SQLITE_DEFAULT_JOURNAL_SIZE_LIMIT;
-  assert( isOpen(pPager->fd) || tempFile );
-  setSectorSize(pPager);
-  if( !useJournal ){
-    pPager->journalMode = PAGER_JOURNALMODE_OFF;
-  }else if( memDb ){
-    pPager->journalMode = PAGER_JOURNALMODE_MEMORY;
-#ifdef SQLITE_SLP_FEATURE
-  }else {
-    pPager->journalMode = PAGER_JOURNALMODE_PERSIST;
-#endif
+  {
+    DWORD pid = osGetCurrentProcessId();
+    xorMemory(&e, (unsigned char*)&pid, sizeof(DWORD));
   }
 #if SQLITE_OS_WINRT
   {
@@ -51768,7 +51765,7 @@ act_like_temp_file:
   }
 #ifdef SQLITE_TIZEN_FEATURE
   else {
-    pPager->journalMode = PAGER_JOURNALMODE_PERSIST;
+      pPager->journalMode = PAGER_JOURNALMODE_PERSIST;
   }
 #endif
   /* pPager->xBusyHandler = 0; */