diff options
| -rw-r--r-- | manifest | 23 | ||||
| -rw-r--r-- | manifest.uuid | 2 | ||||
| -rw-r--r-- | src/main.c | 42 | ||||
| -rw-r--r-- | src/pager.c | 131 | ||||
| -rw-r--r-- | src/pager.h | 6 | ||||
| -rw-r--r-- | src/sqlite.h.in | 27 | ||||
| -rw-r--r-- | src/sqliteInt.h | 3 |
7 files changed, 179 insertions, 55 deletions
@@ -1,5 +1,5 @@ -C Fix\sto\sthe\sregister\svalidity\stracking\slogic\sin\sdebug\sbuilds.\s\sNo\simpact\non\srelease\sbuilds. -D 2020-01-10T01:05:49.616 +C Rearchitect\sthe\sway\sin\swhich\sfilenames\sare\sstored\sin\sthe\sPager\sobject\sso\sthat\nthe\ssqlite3_uri_parameter()\sinterface\swill\swork\sfrom\sjournal\sand\sWAL\sfilenames\ntoo.\s\sThis\scheck-in\simplements\sthe\scentral\sidea,\sand\scompile\sand\sruns\ssomewhat,\nbut\scrashes\son\san\sextended\stest. +D 2020-01-10T18:05:55.320 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -494,7 +494,7 @@ F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71 F src/insert.c 5ba8fd376f539240939ae76b5bc9fa7ad9a0d86e9914ecd11eb7002204138c11 F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa F src/loadext.c d74f5e7bd51f3c9d283442473eb65aef359664efd6513591c03f01881c4ae2da -F src/main.c 6ba00f15f0e7d36a12136ac390a403de4c4b47b76733d1cad60c2b23b4a2cf1d +F src/main.c abc034557685db2bead003e7d6b2bd74bf1a44c4d3bfe9ddcf35dc90524a8c21 F src/malloc.c eaa4dc9602ce28b077f7de2eb275db2be270c5cc56d7fec5466301bd9b80e2f5 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645 F src/mem1.c c12a42539b1ba105e3707d0e628ad70e611040d8f5e38cf942cee30c867083de @@ -517,8 +517,8 @@ F src/os_setup.h 0dbaea40a7d36bf311613d31342e0b99e2536586 F src/os_unix.c ad7640c04eed946052a3b12856362a773d0a717696707313037186df0e2b59f2 F src/os_win.c 035a813cbd17f355bdcad7ab894af214a9c13a1db8aeac902365350b98cd45a7 F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a -F src/pager.c b08541016855b06956cb34c4cddd8c9fa97793f3bfdc4f7809f09fda24702435 -F src/pager.h 217921e81eb5fe455caa5cda96061959706bcdd29ddb57166198645ef7822ac3 +F src/pager.c 14ae8110bcb65a703d91131586848fe256c1a3cbbbc3eb1791090dbf925aa742 +F src/pager.h e541ff7e1931e6e2165c38c7ff38cd1af8df0e20472ee8596479fd53c6aa149d F src/parse.y c8d2de64db469fd56e0fa24da46cd8ec8523eb98626567d2708df371b47fdc3f F src/pcache.c 385ff064bca69789d199a98e2169445dc16e4291fa807babd61d4890c3b34177 F src/pcache.h 4f87acd914cef5016fae3030343540d75f5b85a1877eed1a2a19b9f284248586 @@ -532,10 +532,10 @@ F src/resolve.c 1139e3157c710c6e6f04fe726f4e0d8bdb1ae89a276d3b0ca4975af163141c9c F src/rowset.c d977b011993aaea002cab3e0bb2ce50cf346000dff94e944d547b989f4b1fe93 F src/select.c 924b61cef57033a8ca1ed3dcffd02445a7dd0c837cc849b2e4117251cac831f5 F src/shell.c.in 43d3cfbee97d78ca5782dc53e4c1e22d3cc15c91beff20889dc60551f47eab9f -F src/sqlite.h.in 0ed2c973fcfa1e2ce120b35827a23e252719c3337ff64a1f76b800b53169d56e +F src/sqlite.h.in 4022f00351aec1ad99b9dcadc4fbe70a1db0e306e84fee509daf97a82ef044a4 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8 F src/sqlite3ext.h 72af51aa4e912e14cd495fb6e7fac65f0940db80ed950d90911aff292cc47ce2 -F src/sqliteInt.h ee242902766f9a96aeaca4315dbe1e204bbb2954cd455ffa085bba84fa47956b +F src/sqliteInt.h 7a29ba700a51eeb925731749a570cf3859f6a58ed94797ecf47508875b0ba279 F src/sqliteLimit.h 1513bfb7b20378aa0041e7022d04acb73525de35b80b252f1b83fedb4de6a76b F src/status.c 9ff2210207c6c3b4d9631a8241a7d45ab1b26a0e9c84cb07a9b5ce2de9a3b278 F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34 @@ -1856,7 +1856,10 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P 8845a8c22a4ceabee130ce2addbe07e13b0496eeb542c89850f8658d21a48f89 -R da0f5b6fa0488473f060f2857ba231cf +P 0a500da6aa659a8e73206e6d22ddbf2da5e4f1d1d551eeb66433163a3e13109d +R dd17ff42793e7be350eec0c77a1551ba +T *branch * enhanced-uri +T *sym-enhanced-uri * +T -sym-trunk * U drh -Z 7914b326b60d9184810fac64aa24751d +Z a098e9553bba752fd93040dc261a9c76 diff --git a/manifest.uuid b/manifest.uuid index 1a9c6e325..980ac6d4c 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -0a500da6aa659a8e73206e6d22ddbf2da5e4f1d1d551eeb66433163a3e13109d
\ No newline at end of file +2ae77bd2335708343bce4541b4d2cf16edfe3fd5bc2dfb93757238c926aa960b
\ No newline at end of file diff --git a/src/main.c b/src/main.c index c0f53916a..5426c8d71 100644 --- a/src/main.c +++ b/src/main.c @@ -4272,13 +4272,17 @@ int sqlite3UriCount(const char *z){ ** returns a NULL pointer. */ const char *sqlite3_uri_parameter(const char *zFilename, const char *zParam){ + const Pager *pPager; + const char *z; if( zFilename==0 || zParam==0 ) return 0; - zFilename += sqlite3Strlen30(zFilename) + 1; - while( zFilename[0] ){ - int x = strcmp(zFilename, zParam); - zFilename += sqlite3Strlen30(zFilename) + 1; - if( x==0 ) return zFilename; - zFilename += sqlite3Strlen30(zFilename) + 1; + pPager = sqlite3PagerFromFilename(zFilename); + assert( pPager!=0 ); + z = sqlite3PagerQueryParameters(pPager); + while( z[0] ){ + int x = strcmp(z, zParam); + z += sqlite3Strlen30(z) + 1; + if( x==0 ) return z; + z += sqlite3Strlen30(z) + 1; } return 0; } @@ -4309,6 +4313,32 @@ sqlite3_int64 sqlite3_uri_int64( } /* +** Translate a filename that was handed to a VFS routine into the corresponding +** database, journal, or WAL file. +** +** It is an error to pass this routine a filename string that was not +** passed into the VFS from the SQLite core. Doing so is similar to +** passing free() a pointer that was not obtained from malloc() - it is +** an error that we cannot easily detect but that will likely cause memory +** corruption. +*/ +const char *sqlite3_filename_database(const char *zFilename){ + const Pager *pPager = sqlite3PagerFromFilename(zFilename); + assert( pPager!=0 ); + return sqlite3PagerFilename(pPager, 0); +} +const char *sqlite3_filename_journal(const char *zFilename){ + const Pager *pPager = sqlite3PagerFromFilename(zFilename); + assert( pPager!=0 ); + return sqlite3PagerJournalFilename(pPager); +} +const char *sqlite3_filename_wal(const char *zFilename){ + const Pager *pPager = sqlite3PagerFromFilename(zFilename); + assert( pPager!=0 ); + return sqlite3PagerWalFilename(pPager); +} + +/* ** Return the Btree pointer identified by zDbName. Return NULL if not found. */ Btree *sqlite3DbNameToBtree(sqlite3 *db, const char *zDbName){ diff --git a/src/pager.c b/src/pager.c index 0fae9ae3d..685f0462b 100644 --- a/src/pager.c +++ b/src/pager.c @@ -696,6 +696,7 @@ struct Pager { Pgno mxPgno; /* Maximum allowed size of the database */ i64 journalSizeLimit; /* Size limit for persistent journal files */ char *zFilename; /* Name of the database file */ + char *zQueryParam; /* URI query parameters on the filename */ char *zJournal; /* Name of the journal file */ int (*xBusyHandler)(void*); /* Function to call when busy */ void *pBusyHandlerArg; /* Context argument for xBusyHandler */ @@ -4838,53 +4839,72 @@ int sqlite3PagerOpen( ** Database file handle (pVfs->szOsFile bytes) ** Sub-journal file handle (journalFileSize bytes) ** Main journal file handle (journalFileSize bytes) + ** Pointer back to self (sizeof(*Pager) bytes) ** Database file name (nPathname+1 bytes) + ** URI query parameters (nUriByte bytes) + ** padding for 8-byte alignment + ** Pointer back to self (sizeof(*Pager) bytes) + ** WAL filename (nPathname+4+1 bytes) + ** padding for 8-byte alignment + ** Pointer back to self (sizeof(*Pager) bytes) ** Journal file name (nPathname+8+1 bytes) */ pPtr = (u8 *)sqlite3MallocZero( - ROUND8(sizeof(*pPager)) + /* Pager structure */ - ROUND8(pcacheSize) + /* PCache object */ - ROUND8(pVfs->szOsFile) + /* The main db file */ - journalFileSize * 2 + /* The two journal files */ - nPathname + 1 + nUriByte + /* zFilename */ - nPathname + 8 + 2 /* zJournal */ + ROUND8(sizeof(*pPager)) + /* Pager structure */ + ROUND8(pcacheSize) + /* PCache object */ + ROUND8(pVfs->szOsFile) + /* The main db file */ + journalFileSize * 2 + /* The two journal files */ + sizeof(Pager*) + /* Self-pointer for database */ + ROUND8(nPathname + 1 + nUriByte) + /* database filename + query params */ + sizeof(Pager*) + /* Self-pointer for journal */ + ROUND8(nPathname + 8 + 2) + /* zJournal */ #ifndef SQLITE_OMIT_WAL - + nPathname + 4 + 2 /* zWal */ + sizeof(Pager*) + /* Self-pointer for zWal */ + ROUND8(nPathname + 4 + 2) + /* zWal */ #endif + 0 ); assert( EIGHT_BYTE_ALIGNMENT(SQLITE_INT_TO_PTR(journalFileSize)) ); if( !pPtr ){ sqlite3DbFree(0, zPathname); return SQLITE_NOMEM_BKPT; } - pPager = (Pager*)(pPtr); - pPager->pPCache = (PCache*)(pPtr += ROUND8(sizeof(*pPager))); - pPager->fd = (sqlite3_file*)(pPtr += ROUND8(pcacheSize)); - pPager->sjfd = (sqlite3_file*)(pPtr += ROUND8(pVfs->szOsFile)); - pPager->jfd = (sqlite3_file*)(pPtr += journalFileSize); - pPager->zFilename = (char*)(pPtr += journalFileSize); + pPager = (Pager*)pPtr; pPtr += ROUND8(sizeof(*pPager)); + pPager->pPCache = (PCache*)pPtr; pPtr += ROUND8(pcacheSize); + pPager->fd = (sqlite3_file*)pPtr; pPtr += ROUND8(pVfs->szOsFile); + pPager->sjfd = (sqlite3_file*)pPtr; pPtr += journalFileSize; + pPager->jfd = (sqlite3_file*)pPtr; pPtr += journalFileSize; assert( EIGHT_BYTE_ALIGNMENT(pPager->jfd) ); - /* Fill in the Pager.zFilename and Pager.zJournal buffers, if required. */ - if( zPathname ){ - assert( nPathname>0 ); - memcpy(pPager->zFilename, zPathname, nPathname); - if( nUri ) memcpy(&pPager->zFilename[nPathname+1], zUri, nUriByte); - pPager->zJournal = (char*)(pPtr += nPathname + 1 + nUriByte); - memcpy(pPager->zJournal, zPathname, nPathname); - memcpy(&pPager->zJournal[nPathname], "-journal", 8); - sqlite3FileSuffix3(pPager->zFilename, pPager->zJournal); + /* Fill in the Pager.zFilename and pPager.zQueryParam fields */ + assert( EIGHT_BYTE_ALIGNMENT(pPtr) ); + memcpy(pPtr, &pPager, sizeof(pPager)); pPtr += sizeof(pPager); + pPager->zFilename = (char*)pPtr; + if( nPathname==0 ) zPathname = ""; + memcpy(pPtr, zPathname, nPathname); + pPager->zQueryParam = pPager->zFilename + nPathname + 1; + if( zUri ) memcpy(pPager->zQueryParam, zUri, nUriByte); + assert( nUriByte>=1 ); + assert( nUriByte >= nUri*3 + 1 ); + pPtr += ROUND8(nPathname + 1 + nUriByte); + #ifndef SQLITE_OMIT_WAL - pPager->zWal = (char*)(pPtr += nPathname + 8 + 2); - memcpy(pPager->zWal, zPathname, nPathname); - memcpy(&pPager->zWal[nPathname], "-wal", 4); - sqlite3FileSuffix3(pPager->zFilename, pPager->zWal); - assert( sqlite3UriCount(pPager->zWal)==0 ); + /* Fill in Pager.zWal */ + assert( EIGHT_BYTE_ALIGNMENT(pPtr) ); + memcpy(pPtr, &pPager, sizeof(pPager)); pPtr += sizeof(pPager); + pPager->zWal = (char*)pPtr; + memcpy(pPtr, zPathname, nPathname); + memcpy(pPtr+nPathname, "-wal", 4); pPtr += ROUND8(nPathname + 4 + 2); #endif - assert( sqlite3UriCount(pPager->zFilename)==nUri ); - assert( sqlite3UriCount(pPager->zJournal)==0 ); - sqlite3DbFree(0, zPathname); - } + + /* Fill in Pager.zJournal */ + assert( EIGHT_BYTE_ALIGNMENT(pPtr) ); + memcpy(pPtr, &pPager, sizeof(pPager)); pPtr += sizeof(pPager); + pPager->zJournal = (char*)pPtr; + memcpy(pPtr, zPathname, nPathname); + memcpy(pPtr+nPathname, "-journal",8); /*pPtr += ROUND8(nPathname + 8 + 2);*/ + + if( nPathname ) sqlite3DbFree(0, zPathname); pPager->pVfs = pVfs; pPager->vfsFlags = vfsFlags; @@ -4933,9 +4953,9 @@ int sqlite3PagerOpen( } #endif } - pPager->noLock = sqlite3_uri_boolean(zFilename, "nolock", 0); + pPager->noLock = sqlite3_uri_boolean(pPager->zFilename, "nolock", 0); if( (iDc & SQLITE_IOCAP_IMMUTABLE)!=0 - || sqlite3_uri_boolean(zFilename, "immutable", 0) ){ + || sqlite3_uri_boolean(pPager->zFilename, "immutable", 0) ){ vfsFlags |= SQLITE_OPEN_READONLY; goto act_like_temp_file; } @@ -6999,11 +7019,52 @@ int sqlite3PagerSavepoint(Pager *pPager, int op, int iSavepoint){ ** shared cache, it uses nullIfMemDb==0 so that in-memory databases can ** participate in shared-cache. */ -const char *sqlite3PagerFilename(Pager *pPager, int nullIfMemDb){ +const char *sqlite3PagerFilename(const Pager *pPager, int nullIfMemDb){ return (nullIfMemDb && pPager->memDb) ? "" : pPager->zFilename; } /* +** Return the name of the Journal file or WAL file of the given pager. +*/ +const char *sqlite3PagerJournalFilename(const Pager *pPager){ + assert( pPager!=0 ); + return pPager->zJournal; +} +#ifndef SQLITE_OMIT_WAL +const char *sqlite3PagerWalFilename(const Pager *pPager){ + assert( pPager!=0 ); + return pPager->zWal; +} +#endif /* SQLITE_OMIT_WAL */ + +/* Return a pointer to the URI query parameters associated with the +** pager. +** +** The query parameters are a sequence of strings pairs. The first +** string of each pair is the key and the second string is the value. +** All strings are terminated by a single 0x00 byte. The list is +** terminated by the first empty-string key. +*/ +const char *sqlite3PagerQueryParameters(const Pager *pPager){ + assert( pPager!=0 ); + return pPager->zQueryParam; +} + +/* If zFilename is a filename passed to the xOpen method of the VFS - +** either the main database file, the WAL file, or the journal file - +** then this routine returns a pointer to the Pager object associated +** with that file. +*/ +const Pager *sqlite3PagerFromFilename(const char *zFilename){ + const Pager **pp = (const Pager**)zFilename; + pp--; + assert( (*pp)->zFilename==zFilename + || (*pp)->zJournal==zFilename + || (*pp)->zWal==zFilename ); + return *pp; +} + +/* ** Return the VFS structure for the pager. */ sqlite3_vfs *sqlite3PagerVfs(Pager *pPager){ @@ -7655,6 +7716,8 @@ int sqlite3PagerCloseWal(Pager *pPager, sqlite3 *db){ return rc; } + + #ifdef SQLITE_ENABLE_SNAPSHOT /* ** If this is a WAL database, obtain a snapshot handle for the snapshot diff --git a/src/pager.h b/src/pager.h index de96dc551..2e8ba30f3 100644 --- a/src/pager.h +++ b/src/pager.h @@ -203,7 +203,11 @@ u32 sqlite3PagerDataVersion(Pager*); int sqlite3PagerRefcount(Pager*); #endif int sqlite3PagerMemUsed(Pager*); -const char *sqlite3PagerFilename(Pager*, int); +const char *sqlite3PagerFilename(const Pager*, int); +const char *sqlite3PagerWalFilename(const Pager*); +const char *sqlite3PagerJournalFilename(const Pager*); +const char *sqlite3PagerQueryParameters(const Pager*); +const Pager *sqlite3PagerFromFilename(const char*); sqlite3_vfs *sqlite3PagerVfs(Pager*); sqlite3_file *sqlite3PagerFile(Pager*); sqlite3_file *sqlite3PagerJrnlFile(Pager*); diff --git a/src/sqlite.h.in b/src/sqlite.h.in index 909666975..7f76e0855 100644 --- a/src/sqlite.h.in +++ b/src/sqlite.h.in @@ -3536,6 +3536,33 @@ const char *sqlite3_uri_parameter(const char *zFilename, const char *zParam); int sqlite3_uri_boolean(const char *zFile, const char *zParam, int bDefault); sqlite3_int64 sqlite3_uri_int64(const char*, const char*, sqlite3_int64); +/* +** CAPI3REF: Translate filenames +** +** These routines are available to VFS implementations for translating +** filenames between the main database file, the journal file, and the +** WAL file. +** +** If F is the name of an sqlite database file, journal file, or WAL file +** then sqlite3_filename_database(F) returns the name of the corresponding +** database file. +** +** If F is the name of an sqlite database file, journal file, or WAL file +** then sqlite3_filename_journal(F) returns the name of the corresponding +** rollback journal file. +** +** If F is the name of an sqlite database file, journal file, or WAL file +** then sqlite3_filename_wal(F) returns the name of the corresponding +** WAL file. +** +** In all of the above, if F is not the name of a database, journal or WAL +** filename passed into the VFS from the SQLite core, then the result is +** undefined and is likely a memory access violation. +*/ +const char *sqlite3_filename_database(const char*); +const char *sqlite3_filename_journal(const char*); +const char *sqlite3_filename_wal(const char*); + /* ** CAPI3REF: Error Codes And Messages diff --git a/src/sqliteInt.h b/src/sqliteInt.h index 14c17a42e..53e7095da 100644 --- a/src/sqliteInt.h +++ b/src/sqliteInt.h @@ -4108,9 +4108,6 @@ void sqlite3AddDefaultValue(Parse*,Expr*,const char*,const char*); void sqlite3AddCollateType(Parse*, Token*); void sqlite3AddGenerated(Parse*,Expr*,Token*); void sqlite3EndTable(Parse*,Token*,Token*,u8,Select*); -#ifdef SQLITE_DEBUG - int sqlite3UriCount(const char*); -#endif int sqlite3ParseUri(const char*,const char*,unsigned int*, sqlite3_vfs**,char**,char **); #ifdef SQLITE_HAS_CODEC |