From: drh Date: Tue, 21 Apr 2020 01:06:35 +0000 (+0000) Subject: Experimental API: sqlite3_database_file_object(). X-Git-Tag: version-3.32.0~69^2~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=480620c71340e8dca10d6c842985c45f6ba6cf15;p=thirdparty%2Fsqlite.git Experimental API: sqlite3_database_file_object(). FossilOrigin-Name: ae697b152d22737169892411a0c4d908895ff5fb249cce9bdb1ba0bbe32806f0 --- diff --git a/manifest b/manifest index f57656af3a..35ca686870 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Do\snot\suse\sO_NOFOLLOW\swhen\sopening\sa\sdirectory\sjust\sto\scall\sfsync()\son\nthat\sdirectory. -D 2020-04-20T17:35:32.334 +C Experimental\sAPI:\ssqlite3_database_file_object(). +D 2020-04-21T01:06:35.069 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -495,7 +495,7 @@ F src/hwtime.h cb1d7e3e1ed94b7aa6fde95ae2c2daccc3df826be26fc9ed7fd90d1750ae6144 F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71 F src/insert.c 8e4211d04eb460c0694d486c6ba1c068d468c6f653c3f237869a802ad82854de F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa -F src/loadext.c b179df50e6e8bb0c36c149e95d958d49bd8c6c7469e59c01b53d164360bc6c32 +F src/loadext.c 4540fb20e8606b5cea7efee1d727cc69b20390ddc2e6a6c5515e20f96dcc205c F src/main.c 652a782cd7b6c6ddf7419fcaf06b8aa9440b7c815857241171c9bdf03ab6544c F src/malloc.c cabfef0d725e04c8abfe0231a556ed8b78bf329dcc3fddbf903f6cdcd53cf4e6 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645 @@ -519,7 +519,7 @@ F src/os_setup.h 0dbaea40a7d36bf311613d31342e0b99e2536586 F src/os_unix.c 7ef8b60222558a373d89c18d0c3bc44365b45273a528183d40bec5bb76ce23fc F src/os_win.c 035a813cbd17f355bdcad7ab894af214a9c13a1db8aeac902365350b98cd45a7 F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a -F src/pager.c a71ffd145f55e28cbdc1bdabb5e6bef063da428a6c0de3c3a36e9a0c41d4c8c0 +F src/pager.c 29ee0618daa1f49c24431a9f21b7ac15fa148eb63626c9e0ac145fffbe0b209d F src/pager.h 3b33619a90180e0874c7eca31d6f6ceb464d9322c6fb4e9a7bbb318c8a17bdb3 F src/parse.y c8eff38606f443d5ba245263fa7abc05e4116d95656e050c4b78e9bfbf931add F src/pcache.c 385ff064bca69789d199a98e2169445dc16e4291fa807babd61d4890c3b34177 @@ -534,9 +534,9 @@ F src/resolve.c d36a2b1639e1c33d7b508abfd3452a63e7fd81737f6f3940bfef085fca6f21f4 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92 F src/select.c ab4eb1aee1bd066feea5b6eff264220ae54459019654264e9f688368a7d0c0b5 F src/shell.c.in 5402d3a7281576c96d788569778483746859c5e47052facfc4a4ccfac025d5da -F src/sqlite.h.in d4430b302155f757f0fbce33c5afe136525827ddfbe532a79fd7fe85b127ea29 +F src/sqlite.h.in fd6fcfe173accab8d9cb9a843856d9e9fb475f893b60a455e01d8739b5076f0e F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8 -F src/sqlite3ext.h 9c5269260409eb3275324ccace6a13a96f4ad330c708415f70ca6097901ff4ee +F src/sqlite3ext.h 224bd560533a3479bd38ece4af12799b684751c61d7762a54859efc2cf68c702 F src/sqliteInt.h 0f3848c46310d197246003f052985b72d1cdbfc0b31e069db76cb5231062fa1d F src/sqliteLimit.h 95cb8479ca459496d9c1c6a9f76b38aee12203a56ce1092fe13e50ae2454c032 F src/status.c 9ff2210207c6c3b4d9631a8241a7d45ab1b26a0e9c84cb07a9b5ce2de9a3b278 @@ -1861,7 +1861,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 698d40db58b76f4094687d46b5c6292702a62168054f9e6a70ee86650a6635f7 -R 1a3f713395bcb50f232d9e1e989d47d0 +P 2fc80ef16ce5878311ab88a0c64631813572ffbb71f75363b4619c9667e0926b +R 179a1e5a1fd45f685d8f9f4125f02840 +T *branch * sqlite3_database_file_object +T *sym-sqlite3_database_file_object * +T -sym-trunk * U drh -Z 3de631e900a36e1c44f2a5a4e6c38aa5 +Z 4494bc3e04abebffc2e5f13976ff0914 diff --git a/manifest.uuid b/manifest.uuid index 567a9e7beb..9bb6891bbe 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -2fc80ef16ce5878311ab88a0c64631813572ffbb71f75363b4619c9667e0926b \ No newline at end of file +ae697b152d22737169892411a0c4d908895ff5fb249cce9bdb1ba0bbe32806f0 \ No newline at end of file diff --git a/src/loadext.c b/src/loadext.c index 06297e6bb6..5a661cdc26 100644 --- a/src/loadext.c +++ b/src/loadext.c @@ -477,6 +477,7 @@ static const sqlite3_api_routines sqlite3Apis = { /* Version 3.32.0 and later */ sqlite3_create_filename, sqlite3_free_filename, + sqlite3_database_file_object, }; /* diff --git a/src/pager.c b/src/pager.c index 5d2225590e..3377762300 100644 --- a/src/pager.c +++ b/src/pager.c @@ -4742,6 +4742,7 @@ int sqlite3PagerOpen( ** Database file handle (pVfs->szOsFile bytes) ** Sub-journal file handle (journalFileSize bytes) ** Main journal file handle (journalFileSize bytes) + ** Ptr back to the Pager (sizeof(Pager*) bytes) ** \0\0\0\0 database prefix (4 bytes) ** Database file name (nPathname+1 bytes) ** URI query parameters (nUriByte bytes) @@ -4781,6 +4782,7 @@ int sqlite3PagerOpen( ROUND8(pcacheSize) + /* PCache object */ ROUND8(pVfs->szOsFile) + /* The main db file */ journalFileSize * 2 + /* The two journal files */ + sizeof(pPager) + /* Space to hold a pointer */ 4 + /* Database prefix */ nPathname + 1 + /* database filename */ nUriByte + /* query parameters */ @@ -4801,6 +4803,7 @@ int sqlite3PagerOpen( pPager->sjfd = (sqlite3_file*)pPtr; pPtr += journalFileSize; pPager->jfd = (sqlite3_file*)pPtr; pPtr += journalFileSize; assert( EIGHT_BYTE_ALIGNMENT(pPager->jfd) ); + memcpy(pPtr, &pPager, sizeof(pPager)); pPtr += sizeof(pPager); /* Fill in the Pager.zFilename and pPager.zQueryParam fields */ pPtr += 4; /* Skip zero prefix */ @@ -5001,6 +5004,19 @@ act_like_temp_file: return SQLITE_OK; } +/* +** Return the sqlite3_file for the main database given the name +** of the corresonding WAL or Journal name as passed into +** xOpen. +*/ +sqlite3_file *sqlite3_database_file_object(const char *zName){ + Pager *pPager; + while( zName[-1]!=0 || zName[-2]!=0 || zName[-3]!=0 || zName[-4]!=0 ){ + zName--; + } + pPager = *(Pager**)(zName - 4 - sizeof(Pager*)); + return pPager->fd; +} /* diff --git a/src/sqlite.h.in b/src/sqlite.h.in index 2f05665e96..a5e8d14974 100644 --- a/src/sqlite.h.in +++ b/src/sqlite.h.in @@ -3620,6 +3620,25 @@ const char *sqlite3_filename_database(const char*); const char *sqlite3_filename_journal(const char*); const char *sqlite3_filename_wal(const char*); +/* +** CAPI3REF: Database File Corresponding To A Journal +** +** ^If X is the name of a rollback or WAL-mode journal file that is +** passed into the xOpen method of [sqlite3_vfs], then +** sqlite3_database_file_object(X) returns a pointer to the [sqlite3_file] +** object that represents the main database file. +** +** This routine is intended for use in custom [VFS] implementations +** only. It is not a general-purpose interface. +** The argument sqlite3_file_object(X) must be a filename pointer that +** has been passed into [sqlite3_vfs].xOpen method where the +** flags parameter to xOpen contains one of the bits +** [SQLITE_OPEN_MAIN_JOURNAL] or [SQLITE_OPEN_WAL]. Any other use +** of this routine results in undefined and probably undesirable +** behavior. +*/ +sqlite3_file *sqlite3_database_file_object(const char*); + /* ** CAPI3REF: Create and Destroy VFS Filenames ** diff --git a/src/sqlite3ext.h b/src/sqlite3ext.h index a7c76a6784..283a679ad4 100644 --- a/src/sqlite3ext.h +++ b/src/sqlite3ext.h @@ -334,6 +334,7 @@ struct sqlite3_api_routines { char *(*create_filename)(const char*,const char*,const char*, int,const char**); void (*free_filename)(char*); + sqlite3_file *(*database_file_object)(const char*); }; /*