]>
git.sur5r.net Git - openldap/log
Hallvard Furuseth [Sun, 7 Jul 2013 15:14:38 +0000 (17:14 +0200)]
ITS#7515 Reject conflicting page versions.
If mdb_page_touch() sees a page in txn's dirty_list, that
is the page version txn's cursors should have. Fail if
the user may be seeing and depending on another version.
Hallvard Furuseth [Sun, 7 Jul 2013 15:13:27 +0000 (17:13 +0200)]
ITS#7515 Fix tracking of parent txn's cursors.
Restore mc_flags and xcursors, they were tracked but not merged.
Simplify: Track parent txn's original cursors after backing them
up, instead of tracking copies and merging them back at commit.
Hallvard Furuseth [Sun, 7 Jul 2013 15:13:27 +0000 (17:13 +0200)]
Simplify MDB_cursor: Drop flags C_ALLOCD,C_SHADOW.
Hallvard Furuseth [Sat, 6 Jul 2013 19:42:45 +0000 (21:42 +0200)]
Silence more uninit warnings
Howard Chu [Tue, 2 Jul 2013 09:23:49 +0000 (02:23 -0700)]
Silence uninit warning in prev commit
Howard Chu [Tue, 2 Jul 2013 09:19:17 +0000 (02:19 -0700)]
Tweaks for MDB_MULTIPLE
Terminate loop on intermediate failures, return count of written items,
document usage.
Howard Chu [Mon, 1 Jul 2013 21:53:29 +0000 (14:53 -0700)]
Howard Chu [Mon, 1 Jul 2013 20:41:23 +0000 (13:41 -0700)]
ITS#7635 fix read txn potential data race
Howard Chu [Sun, 30 Jun 2013 14:40:02 +0000 (07:40 -0700)]
Fix uninit warnings, lseek usage
Hallvard Furuseth [Wed, 26 Jun 2013 16:02:52 +0000 (18:02 +0200)]
Fix alloc/free issues.
Page leak, mdb_page_alloc(). On error, don't shorten me_pghead.
Memleak, mdb_ovpage_free(). Free page or keep it in dirty_list.
Bad MIDL, mdb_midl_need(). Fix midl[-1] (allocated size).
Hallvard Furuseth [Wed, 26 Jun 2013 16:02:48 +0000 (18:02 +0200)]
Factor out some vars, simplify.
Hallvard Furuseth [Wed, 26 Jun 2013 16:02:26 +0000 (18:02 +0200)]
Makefile/user-macro comments.
Hallvard Furuseth [Wed, 26 Jun 2013 16:02:17 +0000 (18:02 +0200)]
Tweak I/O, fix last commit.
Hallvard Furuseth [Sat, 22 Jun 2013 21:15:10 +0000 (23:15 +0200)]
Improve MDB error handling, drop seek calls.
Catch I/O errors. Do nothing between OS call failure and ErrCode().
Do not use errno after non-OS-errors like write() >= 0, which could
give a failure return of success (errno 0) or some irrelevant error
code. Drop seek calls, use pwrite/pread/Windows OVERLAPPED offset.
Hallvard Furuseth [Sat, 22 Jun 2013 21:01:30 +0000 (23:01 +0200)]
Fix Windows I/O.
Don't put a 64-bit filesize in a 32-bit int before shifting
down. Always pass &sizehi to SetFilePointer->maxsize, so
sizelo not is treated a signed distance. Hide unused vars
when _WIN32. Reinitialize OVERLAPPED before reuse.
Hallvard Furuseth [Sat, 22 Jun 2013 20:17:41 +0000 (22:17 +0200)]
Catch more MDB errors. DPRINTF in mdb_env_reset0.
Hallvard Furuseth [Sat, 22 Jun 2013 20:10:43 +0000 (22:10 +0200)]
Tweak MIDLs, catch errors.
Grow midls earlier in order to catch errors earlier. Use
mdb_midl_need() instead of mdb_midl_grow(), then mdb_midl_xappend()
needs no error checks. Factor out mdb_midl_append_range().
Hallvard Furuseth [Sat, 22 Jun 2013 10:30:04 +0000 (12:30 +0200)]
Factor out MDB variables/expressions, cleanup.
mdb_page_malloc(): Take a txn arg instead of a cursor.
Hallvard Furuseth [Sat, 22 Jun 2013 09:56:04 +0000 (11:56 +0200)]
Rearrange MDB dirty page code.
Split out mdb_dpage_free(), mdb_page_flush() and clean up.
Hallvard Furuseth [Thu, 20 Jun 2013 05:41:35 +0000 (07:41 +0200)]
Simplify mdb_page_alloc().
Merge if() branches. Restore retry=500 when MDB_PARANOID, for clarity.
Hallvard Furuseth [Thu, 20 Jun 2013 05:41:35 +0000 (07:41 +0200)]
ITS#7620: Keep empty IDLs. Tweak mdb_page_alloc().
MDB_env.me_pghead: Don't free it when empty. mdb_ovpage_free()
needs it, but cannot allocate it.
mdb_midl_alloc(): Fill in length=0.
mdb_page_alloc(): Also Skip freeDB if txnid<3, instead of <4,
and consistently DPRINTF consumed IDLs.
Howard Chu [Mon, 17 Jun 2013 20:26:11 +0000 (22:26 +0200)]
ITS#7623 Clear P_SUBP on conversion from fake page
Hallvard Furuseth [Thu, 13 Jun 2013 06:58:25 +0000 (08:58 +0200)]
ITS#7515 Nested MDB txns: Inherit txn flags.
Committing a nested txn lost the MDB_TXN_DIRTY flag
in the parent, unless the child had set it too.
Hallvard Furuseth [Thu, 13 Jun 2013 06:58:24 +0000 (08:58 +0200)]
Clean up mdb_page_touch(), mdb_page_copy().
When copying, round up/down to aligned sizes. Skip the unused portion,
this was not done when touching a page dirty in the parent txn.
No other change in behavior.
Simplify mdb_page_touch(), including: Drop test m3==mc, the condition
is caught below. Don't "modify" the parent's pgno into the same pgno,
when a nested txn copies a parent's page into its freelist.
Hallvard Furuseth [Thu, 13 Jun 2013 06:58:24 +0000 (08:58 +0200)]
ITS#7594 Fix MDB cursor tracking with subDBs.
The tracking code should not change the current cursor.
It did when that was a C_SUB cursor, which should not be
checked against the tracked cursors but their xcursors.
However, do not bother to skip the tracking code for the
current cursor when it would not change that cursor anyway.
Hallvard Furuseth [Thu, 13 Jun 2013 06:58:24 +0000 (08:58 +0200)]
ITS#7594 Invalidate a dropped MDB DB's cursors.
Hallvard Furuseth [Thu, 13 Jun 2013 06:58:24 +0000 (08:58 +0200)]
Don't #define _GNU_SOURCE if already defined.
Hallvard Furuseth [Thu, 13 Jun 2013 06:25:25 +0000 (08:25 +0200)]
More for ITS#7620 Fix mdb_ovpage_free().
Do not binary-search dirty_list, it is unsorted when MDB_WRITEMAP.
Catch errors. In nested txns, put the page in mt_free_pgs after
all since pages dirty in a parent txn would add complexities.
Howard Chu [Wed, 12 Jun 2013 15:41:32 +0000 (08:41 -0700)]
Partial revert
c2cac4588a40480c020d320b544bc5f8e72adb11
MDB_NEXT was fine before, duh.
Hallvard Furuseth [Wed, 12 Jun 2013 15:20:42 +0000 (17:20 +0200)]
Drop me_pgfree, add mdb_freelist_save().
Split up saving me_pghead, to make me_pgfree unneeded. Also mf_pghead
is now a midl. Needed after
e7f6767ea815fe0ada1f95037dfdec176ec4d5bb
("Return fresh overflow pages to current pghead").
Tweak MDB_DEBUG freelist output, make it ascending.
Howard Chu [Wed, 12 Jun 2013 00:13:08 +0000 (17:13 -0700)]
Fix CURSOR_NEXT/PREV on emptied DB
Howard Chu [Sat, 8 Jun 2013 21:10:08 +0000 (14:10 -0700)]
Make sure mdb_stat() gets valid data
Howard Chu [Sun, 5 May 2013 08:28:12 +0000 (01:28 -0700)]
Return fresh overflow pages to current pghead
And remove them from the current dirty list.
Howard Chu [Wed, 5 Jun 2013 23:13:43 +0000 (16:13 -0700)]
ITS#7594 more for subDB cursor fix
Howard Chu [Wed, 5 Jun 2013 22:23:54 +0000 (15:23 -0700)]
ITS#7594 better fix
Update the subDB cursor, don't invalidate it
Howard Chu [Thu, 30 May 2013 22:56:30 +0000 (15:56 -0700)]
tweak mdb_copy, trap signals
Howard Chu [Thu, 30 May 2013 22:33:59 +0000 (15:33 -0700)]
Windows portability fixes for prev commit
Howard Chu [Thu, 30 May 2013 20:13:33 +0000 (13:13 -0700)]
Add warning about interrupting copy
Howard Chu [Thu, 30 May 2013 20:09:28 +0000 (13:09 -0700)]
Fix prev commit
Howard Chu [Thu, 30 May 2013 20:06:12 +0000 (13:06 -0700)]
Add mdb_env_copyfd()
Allow writing backup to an already opened file handle, for piping
to tar/gzip/ssh/whatever.
Howard Chu [Sat, 25 May 2013 17:16:55 +0000 (10:16 -0700)]
Add _M_IX86 macro for MSVC
Howard Chu [Thu, 23 May 2013 15:13:08 +0000 (08:13 -0700)]
ITS#7594 De-init other subcursors in page_touch
Hallvard Furuseth [Tue, 21 May 2013 21:58:57 +0000 (23:58 +0200)]
Drop unused liblmdb MIDL-range support.
Hallvard Furuseth [Tue, 21 May 2013 21:55:13 +0000 (23:55 +0200)]
Factor out mdb_find_oldest,mdb_dlist_free,dirty_list.
Do not rescan reader table (mdb_find_oldest) after "goto again".
Skip clearing dirty_list[nonzero].mid in mdb_dlist_free(); it
was not done in mdb_reset0() anyway.
Hallvard Furuseth [Tue, 21 May 2013 21:48:27 +0000 (23:48 +0200)]
mdb_stat cleanup.
Exit with success when there was no failure.
Do not use data containing NUL as a DB name (which is a C string).
Hallvard Furuseth [Tue, 21 May 2013 20:44:51 +0000 (22:44 +0200)]
ITS#7598 Tweak MDB_<NEXT/PREV>_NODUP,fix mdb_stat.
MDB_NEXT_NODUP, MDB_PREV_NODUP: Allow for non-MDB_DUPSORT databases.
No mdb.c code changes needed.
mdb_stat.c: Use MDB_NEXT_NODUP, to avoid a crash with a DUPSORT mainDB.
Hallvard Furuseth [Tue, 21 May 2013 17:04:52 +0000 (19:04 +0200)]
ITS#7598 mdb_dbi_open(named DB): Check mainDB flags.
Reject attempts to open named databases if the main
database has flag MDB_DUPSORT or MDB_INTEGERKEY.
DUPSORT would require an xcursor for the DB, INTEGERKEY
would expect the DB name to be a binary integer.
Hallvard Furuseth [Mon, 20 May 2013 21:12:52 +0000 (23:12 +0200)]
ITS#7515 Fix nested txn touch of subpage/ovpage.
mdb_page_touch(): Don't touch a subpage, replacing with non-subpage.
mdb_cursor_put(): Don't overwrite ancestor txn's dirty overflow page.
Hallvard Furuseth [Mon, 20 May 2013 21:12:26 +0000 (23:12 +0200)]
Tweak mdb_page_malloc(),mdb_page_get() semantics.
mdb_page_malloc(): Add "number of pages" parameter.
mdb_page_get(): Add output param for how page was found.
Do not set return params on error.
mdb_cursor_put(): Catch mdb_page_get() error.
Prepares for next commit, no change in caller behavior other
than on mdb_page_get error.
Hallvard Furuseth [Sun, 19 May 2013 17:08:07 +0000 (19:08 +0200)]
More ITS#7589 followup: OVPAGES() -> mp_pages.
Hallvard Furuseth [Sun, 19 May 2013 16:38:13 +0000 (18:38 +0200)]
More ITS#7589: Fix prev commit.
mp_pages gives #pages in the ovpage. OVPAGES() no longer does.
Hallvard Furuseth [Fri, 17 May 2013 17:31:17 +0000 (19:31 +0200)]
ITS#7589 mdb_cursor_put(): Update ovpage nodesize.
Update the nodesize when overwriting an overflow page.
As before, do not attempt to shrink the page.
Howard Chu [Wed, 15 May 2013 18:50:40 +0000 (11:50 -0700)]
Include <netinet/in.h> for Solaris 8
Needed for <resolv.h>, which is needed for BYTE_ORDER.
Howard Chu [Tue, 14 May 2013 23:57:50 +0000 (16:57 -0700)]
Fix mdb_page_split - nested split
If updating a page's separator triggers a split in its parent,
we may have missed adjusting the parent's cursor position.
Howard Chu [Mon, 13 May 2013 19:36:47 +0000 (12:36 -0700)]
Doxygen cleanup
Howard Chu [Fri, 10 May 2013 12:56:16 +0000 (05:56 -0700)]
Howard Chu [Fri, 10 May 2013 00:27:29 +0000 (17:27 -0700)]
Refactor mdb_midl_append, add mdb_midl_grow()
Hallvard Furuseth [Sun, 5 May 2013 13:13:31 +0000 (15:13 +0200)]
ITS#7515 Fix nested transaction error handling.
mdb_txn_begin(): Do not free(mt_free_pgs), it needs mdb_midl_free().
mdb_txn_commit(): Catch commit(child) error.
Hallvard Furuseth [Sun, 5 May 2013 12:26:05 +0000 (14:26 +0200)]
Fix mdb_env_close(unopened MDB_env).
Do not try to scan me_dbxs in a closed/never-opened MDB_env.
Broken by
7d643d3acb94a6d7306330b550fce0e5755444a9
and
151c416b460b02cd96502a47189cda19ab651ada .
Hallvard Furuseth [Sat, 4 May 2013 10:53:43 +0000 (12:53 +0200)]
Simplify/cleanup mdb_cursor_init, C_ALLOCD.
No real change.
mdb_cursor_init() checks if it needs mx, so pass it unconditionally.
Set C_ALLOCD for shadow cursors, for clarity. (It was always set as
it should anyway from the origin cursor, which would have C_ALLOCD.)
Hallvard Furuseth [Sat, 4 May 2013 10:41:28 +0000 (12:41 +0200)]
MDB warning cleanup.
Unused function when MDB_DEBUG. Unused 'excl' param.
Hallvard Furuseth [Sat, 4 May 2013 10:34:49 +0000 (12:34 +0200)]
mdb_dcmp(): Assume the database has MDB_DUPSORT.
There was little point in returning EINVAL when not: Comparing (A,B)
and (B,A) would claim (A > B && B > A), which could confuse callers.
Hallvard Furuseth [Sat, 4 May 2013 10:34:20 +0000 (12:34 +0200)]
Update MDB doc: Cursors, DB handles, data lifetime
Hallvard Furuseth [Sat, 4 May 2013 10:34:02 +0000 (12:34 +0200)]
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.
Hallvard Furuseth [Sat, 4 May 2013 10:33:06 +0000 (12:33 +0200)]
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.
Hallvard Furuseth [Sat, 4 May 2013 10:31:31 +0000 (12:31 +0200)]
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.
Hallvard Furuseth [Sat, 4 May 2013 08:03:19 +0000 (10:03 +0200)]
Cleaner "Support mdb_txn_abort(a reset txn)".
Redo
8a562f560edcc6417672df453c4e626dfb4c4024 so !mt_dbxs indicates
"txn was reset", so mt_numdbs gets one magic value instead of two.
Hallvard Furuseth [Sat, 4 May 2013 08:03:19 +0000 (10:03 +0200)]
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.
Howard Chu [Thu, 2 May 2013 05:43:35 +0000 (22:43 -0700)]
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.
Howard Chu [Wed, 1 May 2013 04:09:09 +0000 (21:09 -0700)]
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...)
Hallvard Furuseth [Mon, 22 Apr 2013 18:46:56 +0000 (20:46 +0200)]
Plug mdb_cursor_renew() memleak
Howard Chu [Sun, 21 Apr 2013 02:30:06 +0000 (19:30 -0700)]
Fix MDB_LAST, reset cursor index
Howard Chu [Sat, 20 Apr 2013 16:47:33 +0000 (09:47 -0700)]
Hallvard Furuseth [Thu, 18 Apr 2013 06:00:03 +0000 (08:00 +0200)]
Tweak comments/readability.
Show MDB_PERSISTENT/MDB_VALID/DB_VALID relationship.
mdb_txn_renew0(): Remove obsolete "cannot fail" comment.
Howard Chu [Thu, 18 Apr 2013 02:17:03 +0000 (04:17 +0200)]
Add MDB_NOTLS envflag.
Hallvard Furuseth [Thu, 18 Apr 2013 02:16:07 +0000 (04:16 +0200)]
Catch MDB txn reuse/sync errors.
Hallvard Furuseth [Thu, 18 Apr 2013 02:15:45 +0000 (04:15 +0200)]
Support mdb_txn_abort(a reset txn).
Hallvard Furuseth [Thu, 18 Apr 2013 02:15:13 +0000 (04:15 +0200)]
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.
Hallvard Furuseth [Thu, 18 Apr 2013 02:13:43 +0000 (04:13 +0200)]
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.
Howard Chu [Wed, 17 Apr 2013 21:33:41 +0000 (14:33 -0700)]
Fix mdb_rebalance
Don't do anything with (fake root) subpages
Howard Chu [Tue, 16 Apr 2013 19:05:03 +0000 (12:05 -0700)]
ITS#7574 blind fix
Fix
227329c8e1fb818548f1936f5dc1349ffd733523 , don't persist
the MDB_VALID bit in db.md_flags.
Howard Chu [Mon, 15 Apr 2013 16:30:39 +0000 (09:30 -0700)]
fix prev commit
Howard Chu [Mon, 15 Apr 2013 06:59:54 +0000 (23:59 -0700)]
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.
Howard Chu [Sun, 14 Apr 2013 23:53:30 +0000 (16:53 -0700)]
Revert "ITS#7570 fix MDB_GET_MULTIPLE and MDB_NEXT_MULTIPLE"
This reverts commit
372b3ddb85bef953fb548fbf2b9ef0cba4e3c8ed .
Original code works as designed.
Claude Brisson [Wed, 10 Apr 2013 12:40:49 +0000 (14:40 +0200)]
ITS#7570 fix MDB_GET_MULTIPLE and MDB_NEXT_MULTIPLE
Howard Chu [Mon, 8 Apr 2013 02:21:46 +0000 (19:21 -0700)]
Fix
227329c8e1fb818548f1936f5dc1349ffd73352
mdb_dbi_close() must allow any dbi < maxdbs, since opens in an
uncommitted txn don't increment env->me_numdbs.
Howard Chu [Fri, 5 Apr 2013 10:44:56 +0000 (03:44 -0700)]
Revert "Fix
6beaad52129da5353fd40c0ec48e6a78c4f71a2e "
This reverts commit
8eef7a4275eda8f2fa2e0d1e67c1d5cbcd91607e .
Previous commit was correct, duplicate keys should not appear here.
Howard Chu [Tue, 2 Apr 2013 18:25:44 +0000 (11:25 -0700)]
Fixes for dbi_open/close, ITS#7515
Howard Chu [Thu, 4 Apr 2013 23:16:25 +0000 (16:16 -0700)]
ITS#7561 Fix mdb_drop bugs
Check for overflow pages, reset cursor position properly.
Howard Chu [Thu, 4 Apr 2013 14:25:21 +0000 (07:25 -0700)]
Fix
6beaad52129da5353fd40c0ec48e6a78c4f71a2e
In APPEND don't immediately reject matching key, since this
is valid for APPENDDUP.
Howard Chu [Thu, 4 Apr 2013 01:26:41 +0000 (18:26 -0700)]
Fix
d3990eb2f8b2944782604a2ca7bd52e08c58fc3e
Append mode should *reject* keys that are too small.
Also allow APPENDDUP in mdb_put().
Howard Chu [Tue, 2 Apr 2013 03:34:40 +0000 (20:34 -0700)]
Fix rebalance when collapsing root page
When fixing other cursors, must also fix their depth.
Howard Chu [Tue, 2 Apr 2013 02:49:40 +0000 (19:49 -0700)]
More fixes for MDB_LAST
Make sure C_INITIALIZED gets set on successful call
Howard Chu [Tue, 2 Apr 2013 02:06:05 +0000 (19:06 -0700)]
ITS#7556 fix cursor_sibling for PREV
Hallvard Furuseth [Sun, 31 Mar 2013 21:50:02 +0000 (23:50 +0200)]
Plug MDB memory leak of DB names.
Hallvard Furuseth [Sun, 31 Mar 2013 21:48:10 +0000 (23:48 +0200)]
Silence signedness warning
Hallvard Furuseth [Sun, 31 Mar 2013 21:47:45 +0000 (23:47 +0200)]
Fix MDB_DEBUG compile when no varargs macros.
Variables mdb_debug, mdb_debug_start were used undefined.
Howard Chu [Sun, 31 Mar 2013 19:56:08 +0000 (20:56 +0100)]
Tweak mode_t def per Hallvard's suggestion
Howard Chu [Sun, 31 Mar 2013 16:10:43 +0000 (08:10 -0800)]
MSVC doesn't define mode_t
Howard Chu [Fri, 29 Mar 2013 08:08:06 +0000 (01:08 -0700)]
Fix CURSOR_LAST/CURSOR_PREV