Commit Graph

681 Commits

Author SHA1 Message Date
Hallvard Furuseth
91a93004ce Update MDB doc: Cursors, DB handles, data lifetime 2013-05-04 12:34:20 +02:00
Hallvard Furuseth
385889b0be Allow mdb_cursor_close() after readonly txn ends.
Catch mdb_cursor_renew(write txn's cursor).  Add flag C_UNTRACK, so
mdb_cursor_close need not peek inside a possibly-freed readonly txn.
2013-05-04 12:34:02 +02:00
Hallvard Furuseth
17ffe9c992 Close cursors when commit(writer). Factor out code.
Close remaining cursors when committing a write txn. The doc says this
happens, and it avoids cursor tracking when updating mainDB + freeDB.

Rename mdb_cursor_merge() -> mdb_cursors_close() for code reuse,
and add a merge option.  Simplify its loop a bit.

Factor out cleanup of DBIs.
2013-05-04 12:33:06 +02:00
Hallvard Furuseth
dca0cef678 Plug txn leak and MDB_NOTLS slot leaks on error.
On mdb_env_copy() error: Abort the txn.
On mdb_txn_renew0() error: Release new MDB_NOTLS reader slot.
2013-05-04 12:31:31 +02:00
Hallvard Furuseth
f45d40a88b Cleaner "Support mdb_txn_abort(a reset txn)".
Redo 8a562f560e so !mt_dbxs indicates
"txn was reset", so mt_numdbs gets one magic value instead of two.
2013-05-04 10:03:19 +02:00
Hallvard Furuseth
151c416b46 Update fixes for dbi_open/close, ITS#7515.
Reset me_dbflags[dbi] when closing DBI, to get rid of MDB_VALID flag.
mdb_env_close(): Re-fix DB-name memleak. DBIs > me_numdbs may exist.
2013-05-04 10:03:19 +02:00
Howard Chu
21da623bf4 Allow reading freelist while working on it
The circular dependency issues appear to have been resolved.
Still, need to watch closely, maybe revert this change if
problems arise.
2013-05-01 22:45:15 -07:00
Howard Chu
568c22c4cc Avoid assert
Due to underfilled branch page. We're in the process of merging/moving
nodes to it because we already know it's underfilled. Took this approach
rather than just removing the assert in mdb_page_search_root, because
that assert may yet catch other situations we don't know about.

(Although, it has been there since the original commit of mdb.c and
has never triggered any other times...)
2013-04-30 21:09:09 -07:00
Hallvard Furuseth
37bd48a618 Plug mdb_cursor_renew() memleak 2013-04-30 21:06:36 -07:00
Howard Chu
c057582573 Fix MDB_LAST, reset cursor index 2013-04-20 19:30:06 -07:00
Howard Chu
da3e4d78d6 Fix typo from 7aba5f5ab9 2013-04-20 09:47:33 -07:00
Hallvard Furuseth
9dd61011fe Tweak comments/readability.
Show MDB_PERSISTENT/MDB_VALID/DB_VALID relationship.
mdb_txn_renew0(): Remove obsolete "cannot fail" comment.
2013-04-18 08:00:03 +02:00
Howard Chu
272e4e98ad Add MDB_NOTLS envflag. 2013-04-18 04:17:03 +02:00
Hallvard Furuseth
afe488d8a9 Catch MDB txn reuse/sync errors. 2013-04-18 04:16:07 +02:00
Hallvard Furuseth
8a562f560e Support mdb_txn_abort(a reset txn). 2013-04-18 04:15:45 +02:00
Hallvard Furuseth
ce6335b0d9 Cleanup for TLS key and read-only filesystem.
Move key init into mdb_env_setup_locks().
Don't create unused TLS key when read-only filesystem.
Drop internal flag MDB_ROFS, we can instead test either
!me_txns, !mt_u.reader or me_lfd==INVALID_HANDLE_VALUE.
2013-04-18 04:15:13 +02:00
Hallvard Furuseth
65a6542765 Clean up MDB_env setup.
Malloc before I/O. Avoids possible malloc error after I/O.
Don't allocate dirty & free lists when MDB_RDONLY.
Factor out code.
2013-04-18 04:13:43 +02:00
Howard Chu
dbb9ded2f8 Fix mdb_rebalance
Don't do anything with (fake root) subpages
2013-04-17 14:33:41 -07:00
Howard Chu
aca6c08897 ITS#7574 blind fix
Fix 227329c8e1, don't persist
the MDB_VALID bit in db.md_flags.
2013-04-16 12:05:03 -07:00
Howard Chu
92fc932f21 fix prev commit 2013-04-15 09:30:39 -07:00
Howard Chu
0cccf79a02 Fix mdb_rebalance
Need to check NUMKEYS as well as fill threshold, when deciding
whether to change anything. Don't let the page drop below the
minimum number of keys.
2013-04-14 23:59:54 -07:00
Howard Chu
14c5a5dff1 Revert "ITS#7570 fix MDB_GET_MULTIPLE and MDB_NEXT_MULTIPLE"
This reverts commit 372b3ddb85.

Original code works as designed.
2013-04-14 16:53:30 -07:00
Claude Brisson
372b3ddb85 ITS#7570 fix MDB_GET_MULTIPLE and MDB_NEXT_MULTIPLE 2013-04-11 15:10:23 -07:00
Howard Chu
fbe6a6051b Fix 227329c8e1
mdb_dbi_close() must allow any dbi < maxdbs, since opens in an
uncommitted txn don't increment env->me_numdbs.
2013-04-07 19:21:46 -07:00
Howard Chu
e43fa77eaa Revert "Fix 6beaad52129da5353fd40c0ec48e6a78c4f71a2e"
This reverts commit 8eef7a4275.
Previous commit was correct, duplicate keys should not appear here.
2013-04-05 03:44:56 -07:00
Howard Chu
227329c8e1 Fixes for dbi_open/close, ITS#7515 2013-04-05 02:58:08 -07:00
Howard Chu
6b46799379 ITS#7561 Fix mdb_drop bugs
Check for overflow pages, reset cursor position properly.
2013-04-04 16:52:55 -07:00
Howard Chu
8eef7a4275 Fix 6beaad5212
In APPEND don't immediately reject matching key, since this
is valid for APPENDDUP.
2013-04-04 07:25:21 -07:00
Howard Chu
6beaad5212 Fix d3990eb2f8
Append mode should *reject* keys that are too small.
Also allow APPENDDUP in mdb_put().
2013-04-03 18:26:41 -07:00
Howard Chu
e31d748dbe Fix rebalance when collapsing root page
When fixing other cursors, must also fix their depth.
2013-04-01 20:34:40 -07:00
Howard Chu
cb1cc64831 More fixes for MDB_LAST
Make sure C_INITIALIZED gets set on successful call
2013-04-01 19:49:40 -07:00
Howard Chu
3213fc4db7 ITS#7556 fix cursor_sibling for PREV 2013-04-01 19:06:05 -07:00
Hallvard Furuseth
7d643d3acb Plug MDB memory leak of DB names. 2013-03-31 23:50:02 +02:00
Hallvard Furuseth
ccb7b26916 Silence signedness warning 2013-03-31 23:48:10 +02:00
Hallvard Furuseth
a70b026f6b Fix MDB_DEBUG compile when no varargs macros.
Variables mdb_debug, mdb_debug_start were used undefined.
2013-03-31 23:47:45 +02:00
Howard Chu
30da15a18d Tweak mode_t def per Hallvard's suggestion 2013-03-31 20:56:08 +01:00
Howard Chu
0c568117ce MSVC doesn't define mode_t 2013-03-31 08:10:43 -08:00
Howard Chu
7aae15739b Fix CURSOR_LAST/CURSOR_PREV 2013-03-29 01:08:06 -07:00
Howard Chu
863fa77a08 ITS#7553 better fix 2013-03-26 11:24:59 -07:00
Howard Chu
8a99b00acc ITS#7553 deinit cursor after deleting last node 2013-03-25 12:15:53 -07:00
Howard Chu
bccbcd1938 Silence stupid warnings 2013-03-25 11:53:32 -07:00
Claude Brisson
bbb27cde4a bugfix for mdb_cursor_put with MDB_MULTIPLE
If the variable dkey.mv_size is non-zero, then it means dkey
contains some original data which has to be put back in the
child db, typically when the child db has just been created.

But when using MDB_MULTIPLE, if this variable has not been
reset to zero, we may come back to this section and wrongly
think that there is some original data to be taken care of.
2013-03-23 14:03:12 -07:00
Howard Chu
77001f549b ITS#7538 fallout from ITS#7536 fix.
Allow leaf pages to have only 1 key.
2013-03-12 17:29:34 -07:00
Howard Chu
3247d7cbd6 Precalculate max size of a node 2013-03-12 17:25:49 -07:00
Howard Chu
8c1d95a438 Fix f97552a83a
Causes Bus Error on SPARC
2013-03-11 10:28:25 -07:00
Howard Chu
f80171e079 Check for MADV_RANDOM
Android supports madvise but not posix_madvise
2013-03-11 06:04:54 -07:00
Howard Chu
9c4ee82297 ITS#7377 Fix c0f3d9b9a8
Add missing parens
2013-03-11 05:59:07 -07:00
Howard Chu
b1da555c4c Turn off readahead on main mmap
It's harmful when the DB is larger than RAM.
2013-03-11 05:49:14 -07:00
Howard Chu
d74330128a ITS#7536 fix mdb_rebalance
A page must always have at least 2 keys (unless it's a root page)
2013-03-06 15:10:22 -08:00
Howard Chu
6dab37f2ac Use CC/LDFLAGS to link the shared lib 2013-02-25 05:06:51 -08:00