mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-01-12 10:54:48 +08:00
Code Issues Packages Projects Releases Wiki Activity
573 Commits 38 Branches 307 Tags 75 MiB
254b77e63d
Commit Graph

205 Commits

Author SHA1 Message Date
Hallvard Furuseth
4a9ee2cb72 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.
 2013-06-20 07:41:35 +02:00
Howard Chu
1d94ea5b55 ITS#7623 Clear P_SUBP on conversion from fake page 2013-06-17 22:26:11 +02:00
Hallvard Furuseth
60086c1bc7 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.
 2013-06-13 08:58:25 +02:00
Hallvard Furuseth
7030ad16e2 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.
 2013-06-13 08:58:24 +02:00
Hallvard Furuseth
79844bd446 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.
 2013-06-13 08:58:24 +02:00
Hallvard Furuseth
2bacf6e59e ITS#7594 Invalidate a dropped MDB DB's cursors. 2013-06-13 08:58:24 +02:00
Hallvard Furuseth
62e4c4f9d0 Don't #define _GNU_SOURCE if already defined. 2013-06-13 08:58:24 +02:00
Hallvard Furuseth
c37a11a424 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.
 2013-06-13 08:25:25 +02:00
Howard Chu
2d0b362b6f Partial revert c2cac4588a 
MDB_NEXT was fine before, duh.
 2013-06-12 08:41:32 -07:00
Hallvard Furuseth
99427aa7de 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 e7f6767ea8
("Return fresh overflow pages to current pghead").
Tweak MDB_DEBUG freelist output, make it ascending.
 2013-06-12 17:20:42 +02:00
Howard Chu
c2cac4588a Fix CURSOR_NEXT/PREV on emptied DB 2013-06-11 17:13:08 -07:00
Howard Chu
bcb67dd22f Make sure mdb_stat() gets valid data 2013-06-08 14:10:08 -07:00
Howard Chu
e7f6767ea8 Return fresh overflow pages to current pghead 
And remove them from the current dirty list.
 2013-06-06 16:44:02 -07:00
Howard Chu
aff123ba11 ITS#7594 more for subDB cursor fix 2013-06-05 16:13:43 -07:00
Howard Chu
3b623d66e1 ITS#7594 better fix 
Update the subDB cursor, don't invalidate it
 2013-06-05 15:23:54 -07:00
Howard Chu
65faa5ed7e tweak mdb_copy, trap signals 2013-05-30 15:56:30 -07:00
Howard Chu
d29b9600e6 Windows portability fixes for prev commit 2013-05-30 15:33:59 -07:00
Howard Chu
f207c50b15 Add warning about interrupting copy 2013-05-30 13:13:33 -07:00
Howard Chu
ad573fe125 Fix prev commit 2013-05-30 13:09:28 -07:00
Howard Chu
c68e5ae9be Add mdb_env_copyfd() 
Allow writing backup to an already opened file handle, for piping
to tar/gzip/ssh/whatever.
 2013-05-30 13:06:12 -07:00
Howard Chu
4b49291653 Add _M_IX86 macro for MSVC 2013-05-25 10:16:55 -07:00
Howard Chu
e31c7d3b31 ITS#7594 De-init other subcursors in page_touch 2013-05-23 12:17:21 -07:00
Hallvard Furuseth
92fe958805 Drop unused liblmdb MIDL-range support. 2013-05-21 23:58:57 +02:00
Hallvard Furuseth
feaeab0c04 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.
 2013-05-21 23:55:13 +02:00
Hallvard Furuseth
5ea1cd8f6d 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).
 2013-05-21 23:48:27 +02:00
Hallvard Furuseth
a1b16ce5f0 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.
 2013-05-21 22:44:51 +02:00
Hallvard Furuseth
1b6d7ee7e1 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.
 2013-05-21 19:04:52 +02:00
Hallvard Furuseth
a2ce25482a 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.
 2013-05-20 23:12:52 +02:00
Hallvard Furuseth
5bdf2aae6e 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.
 2013-05-20 23:12:26 +02:00
Hallvard Furuseth
2eb50b1d2e More ITS#7589 followup: OVPAGES() -> mp_pages. 2013-05-19 19:08:07 +02:00
Hallvard Furuseth
e4ce404992 More ITS#7589: Fix prev commit. 
mp_pages gives #pages in the ovpage. OVPAGES() no longer does.
 2013-05-19 18:38:13 +02:00
Hallvard Furuseth
0cdd9dffdd 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.
 2013-05-17 19:31:17 +02:00
Howard Chu
833cd905b7 Include <netinet/in.h> for Solaris 8 
Needed for <resolv.h>, which is needed for BYTE_ORDER.
 2013-05-15 11:50:40 -07:00
Howard Chu
7233bc295b 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.
 2013-05-14 16:57:50 -07:00
Howard Chu
1105aa35ba Doxygen cleanup 2013-05-13 12:36:47 -07:00
Howard Chu
9ebd5992c9 Fix 66c839f029 
Forgot #include <errno.h>
 2013-05-10 05:56:16 -07:00
Howard Chu
66c839f029 Refactor mdb_midl_append, add mdb_midl_grow() 2013-05-09 17:27:29 -07:00
Hallvard Furuseth
2d6aed7537 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.
 2013-05-05 15:13:31 +02:00
Hallvard Furuseth
521fdb00cc Fix mdb_env_close(unopened MDB_env). 
Do not try to scan me_dbxs in a closed/never-opened MDB_env.
Broken by 7d643d3acb
and 151c416b46.
 2013-05-05 14:26:05 +02:00
Hallvard Furuseth
0b9a208530 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.)
 2013-05-04 12:53:43 +02:00
Hallvard Furuseth
f355de0298 MDB warning cleanup. 
Unused function when MDB_DEBUG. Unused 'excl' param.
 2013-05-04 12:41:28 +02:00
Hallvard Furuseth
b389341b4b 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.
 2013-05-04 12:34:49 +02:00
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
Howard Chu
d8b407d9a2 Install manpages too 2013-02-25 02:02:15 -08:00
Howard Chu
26e4222ffb Delete obsolete @todo 
We do it now... (coalescing freelist entries in page_alloc)
 2013-02-24 23:43:36 -08:00
Howard Chu
58e27b6c20 Add sample apps for comparison/education purposes 2013-02-24 23:43:18 -08:00
Howard Chu
66c9f03055 Add $(DESTDIR) to make install target 2013-02-25 06:50:51 +00:00
Howard Chu
3394bac2c0 Update error code instances 2013-02-20 05:08:52 -08:00
Hallvard Furuseth
80cd881184 Tweak MDB_INCOMPATIBLE description 2013-02-20 12:19:45 +01:00
Hallvard Furuseth
fbd76c44e4 Tweak prev commit: Restore if-test as an assert 2013-02-20 09:08:41 +01:00
Hallvard Furuseth
208e5c614d ITS#7515 Fix mdb_txn_commit(nested txn). 
Don't modify the parent txn until the current txn cannot fail.
Don't assume new dirty child pgnos > dirty parent pgnos.

Page alloc/touch: Fail if child+parent dirty pages would exceed
dirty_list's maxsize. Avoids an error situation in commit.
 2013-02-19 18:44:10 -08:00