mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-01-06 10:46:21 +08:00
Code Issues Packages Projects Releases Wiki Activity
811 Commits 38 Branches 307 Tags 74 MiB
e0273020bd
Commit Graph

442 Commits

Author SHA1 Message Date
Hallvard Furuseth
b898cb642a ITS#7793 Re-fix MDB_CURRENT doc: Match current item 2014-06-18 23:01:14 +02:00
Hallvard Furuseth
01a75c5ab5 Fix MDB_GET_MULTIPLE/MDB_NEXT_MULTIPLE doc. 2014-06-18 23:01:14 +02:00
Howard Chu
39ed8bef04 Tweak ovpage search 
Use num*20, chosen from empirical testing
 2014-06-18 13:37:04 -07:00
Howard Chu
b4ecbd78d9 Fix some overwrite quirks 
Was skipping the overwrite in some cases, if the cmp function
said the new and old already matched. We should always perform
the overwrite anyway, since the cmp function may only be doing
a prefix compare and the data may actually be different.
 2014-06-18 12:29:13 -07:00
Howard Chu
dc7f2530dd Tweak prev patch for ovpage search 2014-06-18 09:07:39 -07:00
Howard Chu
2db55c7d99 Shorten search for ovpage space 2014-06-18 03:02:08 -07:00
Howard Chu
ecb71ee197 Bump version to 0.9.12 2014-06-13 10:46:27 -07:00
Howard Chu
17c09fa476 ITS#7875 fix #7681 regression 
Due to commit 18a07eb7c2
 2014-06-11 02:27:56 -07:00
Alexey Naumov
a93810cc3d Fix possible crash in DLL_THREAD_DETACH (explodes in .Net Framework) 2014-05-30 23:39:44 -07:00
Hallvard Furuseth
c0d64cf182 Comment ~MDB_APPEND, from earlier commit message. 2014-05-30 10:50:04 +02:00
Hallvard Furuseth
cb5656c726 Factor out mdb_cmp_clong() 2014-05-30 10:47:56 +02:00
Hallvard Furuseth
64a02e2279 More for big MDB_MAXKEYSIZE with MDB_DUPSORT. 
With mdb_cursor_put(new key, data item big enough to need a sub-DB):
- Track cursors as when adding other nodes.  The "!do_sub" is now
  unneeded.  Before ITS#7861 it distinguished inserting key from data.
- Set MDB_TXN_ERROR if an empty sub-DB was created.  I.e. adding
  key:subDB succeeded, but inserting the data item failed.
 2014-05-30 10:47:56 +02:00
Hallvard Furuseth
b37b2a651f Factor out MDB_TXN_ERROR 2014-05-30 09:06:08 +02:00
Hallvard Furuseth
ba8f59edf4 Simplify MDB_MULTIPLE 2014-05-30 09:06:08 +02:00
Hallvard Furuseth
ac158c7e1e ITS#7834 Fix MDB_MULTIPLE writing multiple keys. 
Update the state before looping, so the key is not duplicated.
Broke in 4c8f57615c (mostly).
 2014-05-30 09:06:08 +02:00
Hallvard Furuseth
d170df58fb ITS#7861 Re-fix MDB_db.md_entries. 
mdb_cursor_del(): Fix md_entries with MDB_NODUPDATA.
mdb_cursor_put(): Check in xcursor whether an item got inserted. Count
data instead of keys after 13d6d59c51.
 2014-05-30 09:06:08 +02:00
Hallvard Furuseth
92c01ffda8 ITS#7771 mdb_cursor_put doc: Cursor moves on error 2014-05-30 09:06:08 +02:00
Hallvard Furuseth
83676dc0f0 Document DBI issues, extend MDB_BAD_VALSIZE. 2014-05-30 09:06:08 +02:00
Hallvard Furuseth
2f33effcdc More ITS#7793 Check key->mv_size with MDB_CURRENT. 
Since non-NULL key must be provided now.
 2014-05-30 09:06:08 +02:00
Howard Chu
4b9aed26a5 Fix mdb_rebalance collapsing root 
Shift the rest of the cursor stack as needed
 2014-05-20 08:47:28 -07:00
Howard Chu
4844a72d01 ITS#7829 more for mdb_rebalance 
Make sure to propagate rebalance results all the
way back to original caller's cursor.
 2014-04-03 12:51:41 -07:00
Hallvard Furuseth
2764360a7b ITS#7829 Simplify last commit 2014-04-02 07:02:14 +02:00
Howard Chu
fca18d2586 ITS#7829 more for prev commit 2014-03-31 13:42:19 -07:00
Howard Chu
ac3acc1218 ITS#7829 fix rebalance 
Fixup cursor state after node_move/page_merge
 2014-03-28 13:51:59 -07:00
Howard Chu
13d6d59c51 ITS#7793/7828 
Fix md_entries count, test for insert on md_entries increment
 2014-03-26 08:59:43 -07:00
Howard Chu
6948f9dace More for ITS#7793/7828 
Note MDB_CURRENT/MDB_DUPSORT requirement
 2014-03-26 02:41:26 -07:00
Howard Chu
f537429b64 ITS#7828, #7793 
Clarify MDB_CURRENT key usage, simplify freelist_save
 2014-03-26 02:35:56 -07:00
Howard Chu
9026894e05 Revert "ITS#7793 mdb_cursor_put(): Fix MDB_CURRENT." 
This reverts commit 4e954f8ae8.
Caused ITS#7828.
 2014-03-26 02:35:45 -07:00
Hallvard Furuseth
86d9675543 Revert "Update MDB_PANIC description" (thinko). 
This reverts commit 6bd34d0534.
 2014-03-23 13:06:03 +01:00
Hallvard Furuseth
6bd34d0534 Update MDB_PANIC description 2014-03-22 22:27:10 +01:00
Hallvard Furuseth
1519f4bc3d Tweak mdb_mid2l_insert() call from ITS#7775. 
It does not return MDB error codes.
 2014-03-22 22:27:10 +01:00
Hallvard Furuseth
2727e97de3 mtest: Accept an MDB_NOTFOUND case 2014-03-16 12:42:43 +01:00
Hallvard Furuseth
68e97b2184 Handle more errors. Invalidate txn if needed. 2014-03-16 12:42:43 +01:00
Hallvard Furuseth
937b5eff07 Don't use non-existent node info in branch/leaf2 2014-03-16 12:42:42 +01:00
Hallvard Furuseth
86f8b203f5 Move code out of mdb_cursor_del0() and mdb_del(). 
Prepares for the next commits.
 2014-03-16 12:42:42 +01:00
Hallvard Furuseth
012d7b5de7 More checks for closed DBIs and invalidated txns. 
Factor txn/DBI-checks out to TXN_DBI_EXIST().
mdb_audit(): Skip closed DBIs.
mdb_cursor_renew(), mdb_stat(): Check DBI and txn.
mdb_cursor_count(): Check txn.
mdb_dbi_flags(): Check DBI.
 2014-03-16 12:42:42 +01:00
Hallvard Furuseth
3e7c1bd4e2 mdb_page_list(): Support & display all page types 2014-03-16 12:42:42 +01:00
Hallvard Furuseth
a22c31115f mdb_txn_renew0(): Fix un-mutexed me_flags update. 
Replace env flag MDB_LIVE_READER with field me_live_reader.
 2014-03-16 12:42:42 +01:00
Hallvard Furuseth
684bb867ce Doxygen fixes 2014-03-16 12:42:42 +01:00
Howard Chu
4ddf2ec831 Rename samples 
They're meant to be read and studied, not run.
 2014-03-16 03:55:03 -07:00
Howard Chu
797ff136a8 ITS#7815 more for page_split 
This case didn't come up in testing. Needs finer grained test.
 2014-03-05 20:40:12 -08:00
Howard Chu
0e7fba73b7 ITS#7815 fix mdb_page_split 
Was leaving cursor pointed at wrong page if the newindx was
in the right sibling page, and the parent was also split.
 2014-03-05 20:04:42 -08:00
Hallvard Furuseth
e2bdd44624 mtest*.c, sample-*.c: Add/note error checks. 2014-02-19 21:25:40 +01:00
Hallvard Furuseth
a604948993 mtest[46]: Use different DBs when different flags. 2014-02-19 21:25:40 +01:00
Hallvard Furuseth
4e954f8ae8 ITS#7793 mdb_cursor_put(): Fix MDB_CURRENT. 
Ignore key, broken by 5bda3565a9
and some older code.  Document and clarify MDB_CURRENT usage.

Also affects non-MDB_CURRENT put() with empty data and a key
which matches by the mdb_set_compare function but not by memcmp.
 2014-01-28 14:27:27 +01:00
Howard Chu
aa3463ec7c Bump version to 0.9.11 2014-01-15 09:09:48 -08:00
Howard Chu
ec97f49a65 Note changes for LMDB 0.9.11 2014-01-14 17:12:48 -08:00
Hallvard Furuseth
98f3bc88bf Revert "ITS#7772 Reduce spurious sub-page growth." 
This reverts commit 75494c08b4,
which must await a fix to ITS#7771 (DUPSORT cursor tracking).
 2014-01-13 20:46:08 +01:00
Howard Chu
3f241365d5 Make sure mapsize changes take effect on Windows. 2014-01-12 20:04:50 -08:00
Hallvard Furuseth
5bda3565a9 ITS#7775 Drop <assert.h>, drop/replace assert()s. 
db_mid2l_insert(): Move assert to mdb.c.
mdb_cursor_set(): Previous assert cannot fail now.
mdb_cursor_put(): Check mc/key and return EINVAL.
mdb_cursor_dbi(): No error return, so just segfault if cursor==NULL.
 2014-01-06 23:21:54 +01:00
Howard Chu
6fb561d33e ITS#7775 Cleanup mdb_node_del() 2014-01-06 23:21:44 +01:00
Hallvard Furuseth
88342f9661 ITS#7775 Add mdb_env_set_assert() 2014-01-06 23:17:38 +01:00
Hallvard Furuseth
e40dae1064 Add mdb_env_<set,get>_userctx() 2014-01-06 23:17:38 +01:00
Hallvard Furuseth
c99525f42a ITS#7377 Invalidate txn on page-allocation errors 
This should likely be reverted when all callers handle these errors.
 2014-01-06 23:17:37 +01:00
Hallvard Furuseth
123b6e3c3e Wrap __func__ in mdb_func_ 2014-01-05 16:37:26 +01:00
Hallvard Furuseth
21621cc741 Invalidate the txn on corruption/internal errors 2014-01-05 16:26:21 +01:00
Howard Chu
c48cdd7a16 ITS#7775 cleanup unnecessary assert()s 2014-01-03 12:40:28 -08:00
Hallvard Furuseth
1f191ba930 mdb_page_malloc(): Move VGMEMP_ALLOC before memset 2013-12-31 02:16:19 +01:00
Hallvard Furuseth
ce2a0d4016 ITS#7771 mdb_cursor_del0(): Fix xcursor tracking. 2013-12-29 15:58:21 +01:00
Hallvard Furuseth
5adc46d1d2 sprintf format: pid_t need not be an int. 2013-12-29 15:57:33 +01:00
Hallvard Furuseth
661dd2c66d Add mdb_dbg_pgno(): (sub)pagenum for debug output. 2013-12-29 15:09:51 +01:00
Hallvard Furuseth
75494c08b4 ITS#7772 Reduce spurious sub-page growth. 
mdb_cursor_put(): Use free sub-page space added by a
previous put(existing DUPSORT item), if any.
Tweak NUMKEYS code to avoid a new signedness warning.
 2013-12-29 15:09:05 +01:00
Hallvard Furuseth
46de4ab84c ITS#7665 Drop lmdb.h doc on non-overlapping flags. 
It was inaccurate and misplaced. Verify it in mdb.c instead.
 2013-12-29 14:54:17 +01:00
Hallvard Furuseth
353cc77cff ITS#7515 has been fixed. 2013-12-29 14:52:30 +01:00
Hallvard Furuseth
c91f38160c Drop UNLOCK_MUTEX_R() on mdb_reader_pid() error 2013-12-29 14:52:30 +01:00
Hallvard Furuseth
4c8f57615c Fix commit "Raise safe max MDB_MAXKEYSIZE." 
I.e. d69d2ce230, it left out some changes.
 2013-12-21 12:31:57 +01:00
Hallvard Furuseth
a2ed03642c Replace MDB_node.mn_offset[], to ease debugging. 2013-12-11 11:57:13 +01:00
Hallvard Furuseth
2ce9ffa003 Comment MDB_node, mdb_page_unspill, mdb_update_key 2013-12-11 11:57:13 +01:00
Hallvard Furuseth
7e453c9763 Fix mdb_reader_list() and its spec. 
It and the MDB_msg_func can now return >= 0 for success.
Always return any MDB_msg_func() error result.
 2013-12-11 11:57:13 +01:00
Hallvard Furuseth
a58fd16ae5 Support dynamic max MDB keysize. 2013-12-11 11:57:13 +01:00
Hallvard Furuseth
d69d2ce230 Raise safe max MDB_MAXKEYSIZE. 
Use a sub-DB for DUPSORT item #1/#2 per key if needed: Not a sub-
page too big for a node, nor an overflow page (which not all DUPSORT
code checks for). Move "insert" code, to avoid non-loop goto upwards.

(This is the commit which needs the change to xdata.mv_size in
commit 9d6e4a9163 "page sizes".)
 2013-12-11 11:57:13 +01:00
Hallvard Furuseth
734bc7e6ad Relax MDB_MAXKEYSIZE for existing data. 
Handle keys stored by a liblmdb with a bigger MDB_MAXKEYSIZE.
mdb_get/mdb_del(absent key bigger than our MDB_MAXKEYSIZE)
now return MDB_NOTFOUND instead of MDB_BAD_VALSIZE.
 2013-12-11 11:57:12 +01:00
Hallvard Furuseth
a8de10d148 ITS#7589 Fix me_nodemax and related node sizes. 
Change me_nodemax to not count the mp_ptrs[] entry. That's mostly
how it was used. Compare node sizes ">" me_nodemax instead of ">=".
The ">=" was a workaround for confusing sizes with and without the
mp_ptrs[] entry, but broke for nodes with size (old me_nodemax-1).

Explicitly make me_nodemax even. An odd value could break the
comparisons. It was even anyway because MDB_MINKEYS == 2.
 2013-12-11 11:57:12 +01:00
Hallvard Furuseth
6808abe770 ITS#7589 Fix delete(uneven-sized MDB_DUPFIXED data). 
Do not give uneven sizes to the sub-page and the node it lives in.
 2013-12-11 11:57:12 +01:00
Hallvard Furuseth
c0858e6d93 put(MDB_MULTIPLE): Skip existing item cleanly. 
Don't set dkey.mv_size if mdb won't clear it before next iteration.
 2013-12-11 11:57:12 +01:00
Hallvard Furuseth
fcb0d09598 Add EVEN(): Micro-optimize "up to multiple of 2". 2013-12-11 11:57:12 +01:00
Hallvard Furuseth
753356a38a Warning cleanup. 
Drop unused computed/assigned values.
mdb_page_alloc(): Make "mop_len>0 implies mop!=NULL" provable.
 2013-12-11 11:57:12 +01:00
Hallvard Furuseth
e1266bf331 Clean up mdb_copy. 
Support MDB_NOSUBDIR. Catch more errors.  Write messages
to stderr, not stdout which the data too may be piped to.
 2013-12-11 11:57:12 +01:00
Howard Chu
1ffb5e1cba Fix GET_BOTH_RANGE 
On near match, return the matched data.
 2013-12-04 18:42:49 -08:00
Howard Chu
b77689f975 ITS#7756 keysizes were wrong in mdb_update_key 2013-11-29 17:03:49 -08:00
Howard Chu
f39bceb800 Doc tweak 
Measured perf cost of meminit was 7% worst case on an Intel Core2
system. YMMV.
 2013-11-12 08:10:33 -08:00
Howard Chu
3e40d0c805 Bump to 0.9.10 2013-11-11 20:15:54 -08:00
Howard Chu
f6d8dc4e76 Windows/Win64/MSVC tweaks 
Silence warnings, fix broken MinGW64 definitions, etc.
 2013-11-11 20:08:26 -08:00
Howard Chu
eecbaa5942 Clarify WRITEMAP / NOMEMINIT 2013-11-11 16:35:17 -08:00
Howard Chu
509a197728 Change default mem init behavior 
Init malloc'd memory by default, use #MDB_NOMEMINIT to disable.
Bump version to 0.9.10
 2013-11-11 15:09:32 -08:00
Hallvard Furuseth
92f71f50f9 Add MDB_CLEANMEM option. 
Initialize unused portions of DB pages, for security or to silence
checkers like Purify and Valgrind. Like BDB configure --enable-umrw.
 2013-11-07 23:41:30 +01:00
Hallvard Furuseth
fc87d405f1 Fix MDB_MAXKEYSIZE doc: Account for MDB_DUPSORT. 
A node may need room for [key, subpage with 2 items] = 3 keys.
 2013-11-07 23:38:15 +01:00
Hallvard Furuseth
9d6e4a9163 ITS#7713 Handle bigger OS page sizes 
Use DB page size = min(32k, OS pagesize).  Previous limit was 8k
(MDB_MINKEYS*MDB_PAGESIZE).

Handle DB pagesize < OS pagesize. That's an I/O pessimization,
but transactions remain atomic: Only writing the MDB_meta must
be atomic, and it fits in one OS page.

Don't truncate desired subpage size: Asssign it to a size_t
(mv_size), not an uint16_t (mp_upper).
 2013-11-07 23:38:15 +01:00
Hallvard Furuseth
25d370cb2e mdb_cursor_put(): Factor out code. Kill a label. 2013-11-07 23:38:15 +01:00
Howard Chu
550bbe3788 Fix prev commit, cursor depth comparison 2013-11-07 09:37:48 -08:00
Howard Chu
4a1717708c Fix cursor_del0 cursor fixup 
Skip cursors that aren't as deep as current cursor
 2013-11-06 16:51:21 -08:00
Howard Chu
8c9a26c90d More for #7589 2013-11-04 20:00:55 -08:00
Howard Chu
34459e0585 ITS#7589 another mdb_page_split fix 
Tweak split_indx check, go one slot further.
 2013-10-31 17:31:15 -07:00
Howard Chu
e31983c723 ITS#7736 fix regression in ITS#7733 patch 
In d8eccb353b
 2013-10-31 16:01:49 -07:00
Howard Chu
d8eccb353b ITS#7733 check cursor index before cursor_del 2013-10-28 07:25:54 -07:00
David Wilson
742a078ea5 ITS#7734 Add MDB_NORDAHEAD to CHANGELESS. 2013-10-28 06:58:52 -07:00
Howard Chu
7449ca604c Bump to 0.9.9 2013-10-24 15:57:17 -07:00
Howard Chu
b86f08e9d6 Add mdb_env_get_fd() 
Return the environment's filedescriptor. Useful when the caller
is doing their own locking.
 2013-10-21 10:41:41 -07:00
Howard Chu
dddc7a385b Fix 01dfb2083d 
USE_POSIX_SEM must define USE_HASH
 2013-10-14 09:47:26 -07:00
Howard Chu
ab9b08f8af ITS#7725 add MDB_NORDAHEAD flag for env_open 2013-10-12 16:20:04 -07:00