Commit Graph

21016 Commits

Author SHA1 Message Date
Howard Chu
4a6adbf589 Merge remote-tracking branch 'origin/mdb.master' 2013-05-10 13:04:44 -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
054812517f Merge remote branch 'origin/mdb.master' 2013-04-30 23:18:01 -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
201ddbe3e4 ITS#7577 more for previous commit 2013-04-28 12:47:14 -07:00
Howard Chu
fb537d747c ITS#7577 alias fixes 2013-04-28 12:25:58 -07:00
Ted C. Cheng
d3633632e1 ITS#7513 added TCP keepalive support to back-meta 2013-04-24 01:22:17 -07:00
Howard Chu
1e68029078 Drop ldap_int_sasl_mutex
It was introduced for Cyrus 1.5 in 2001; we've been on 2.x since 2002 and
Cyrus does its own locking when needed.
2013-04-24 00:52:52 -07:00
Howard Chu
9381d04b87 Don't expire a conn if it's still referenced 2013-04-24 00:27:26 -07:00
Jorge Perez Burgos
69f4f4b673 ITS#7524 make sure binding flag is set before trying to bind 2013-04-24 00:25:04 -07:00
Howard Chu
2b837de9c1 ITS#7518 fix manpage 2013-04-23 14:44:55 -07:00
Howard Chu
33fc2b54a5 ITS#7518 resync nss-pam-ldapd files
Also note minimum version required.
2013-04-23 12:49:25 -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
Jan Synacek
fb790edccd ITS#7568 Add -Q to slaptest's help 2013-04-10 18:21:48 -07:00
Jan Synacek
ee23a4ca24 ITS#7568 Fix typos in ldap.conf.5 2013-04-10 18:15:49 -07:00
Ted C. Cheng
21ff23ac71 ITS#7569 fixed a group enumeration bug (Symas#2255) 2013-04-10 16:25:28 -07:00
Howard Chu
1da5f1faf0 Merge remote-tracking branch 'origin/mdb.master' 2013-04-07 19:23:19 -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
Pierangelo Masarati
27e1614fde no need to mention replog any longer (ITS#7562) 2013-04-06 20:31:40 +02:00
Howard Chu
15af1b8cac Merge remote-tracking branch 'origin/mdb.master' 2013-04-05 03:48:05 -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
55d91653fd Merge remote-tracking branch 'origin/mdb.master' 2013-04-05 03:04:31 -07:00
Howard Chu
8cc61d8dbd attrdb fixes 2013-04-05 03:03:07 -07:00