Commit graph

495 commits

Author SHA1 Message Date
Rich Prohaska
2a662e812b minor changes to compile with icc and make the windows port easier. addresses #1195
git-svn-id: file:///svn/toku/tokudb.1195@7647 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:25 -04:00
Rich Prohaska
656daf1a7b sequential insert leaf split at 1/4 of the original node. addresses #1195
git-svn-id: file:///svn/toku/tokudb.1195@7641 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:25 -04:00
Rich Prohaska
5568466982 compile using gcc 4.3 (fedora 9) addresses #1195
git-svn-id: file:///svn/toku/tokudb.1195@7639 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:25 -04:00
Bradley C. Kuszmaul
ed85b2e977 Unpin child before calling {{{brt_handle_maybe_reactive_child}}}, because handling the reactive child may remove it from the hash table. Addresses #1195.
git-svn-id: file:///svn/toku/tokudb.1195@7638 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:25 -04:00
Bradley C. Kuszmaul
7988f9ff1f Remove use of uninitialized value (caught by valgrind, causing infinite loop in brt-test-cursor). Addresses #1195.
git-svn-id: file:///svn/toku/tokudb.1195@7622 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:25 -04:00
Bradley C. Kuszmaul
b0c5a7cb7a Make {{{src/tests/test_dup_search}}} work. Addresses #1195.
git-svn-id: file:///svn/toku/tokudb.1195@7620 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:24 -04:00
Bradley C. Kuszmaul
e875d7109e Make some tests run better. Addresses #1195.
git-svn-id: file:///svn/toku/tokudb.1195@7615 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:24 -04:00
Bradley C. Kuszmaul
586af672c5 newbrt tests run (had to get the keylen computation right.) Still does not reuse blocknums and diskspace. Addresses #1195.
git-svn-id: file:///svn/toku/tokudb.1195@7605 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:24 -04:00
Bradley C. Kuszmaul
42325e1951 Add {{{fullhash}}} to {{{toku_cachetable_remove}}}, and rename it to {{{toku_cachetable_unpin_and_remove}}}. Addresses #1195.
git-svn-id: file:///svn/toku/tokudb.1195@7588 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:24 -04:00
Bradley C. Kuszmaul
502a5ff4e1 Work on merging nonleaf nodes. Addresses #1195.
git-svn-id: file:///svn/toku/tokudb.1195@7561 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:24 -04:00
Bradley C. Kuszmaul
4ce5197c5a handle split keys better. Addresses #1195.
git-svn-id: file:///svn/toku/tokudb.1195@7521 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:24 -04:00
Bradley C. Kuszmaul
19690a2344 Implement leaf node balancing (sometimes intead of merging we balance two leaf nodes). Also improve the printout for {{{toku_dump_brt()}}}. Addresses #1195.
git-svn-id: file:///svn/toku/tokudb.1195@7517 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:24 -04:00
Bradley C. Kuszmaul
7d9610c0bf Handle another merge case. Addresses #1195.
git-svn-id: file:///svn/toku/tokudb.1195@7508 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:24 -04:00
Bradley C. Kuszmaul
55111c50cd Start doing merge. Addresses #1195.
git-svn-id: file:///svn/toku/tokudb.1195@7499 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:24 -04:00
Bradley C. Kuszmaul
b29bddd24f Change an {{{EINVAL}}} to an {{{abort()}}}. Addresses #1195.
git-svn-id: file:///svn/toku/tokudb.1195@7471 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:24 -04:00
Bradley C. Kuszmaul
41a52d6d73 Factor out some common subexpressions for handling reactive children. Addresses #1195.
git-svn-id: file:///svn/toku/tokudb.1195@7470 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:24 -04:00
Bradley C. Kuszmaul
0ea80d5524 Simplify {{{assert(0); return;}}} into {{{abort()}}}. Addresses #1195.
git-svn-id: file:///svn/toku/tokudb.1195@7468 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:24 -04:00
Bradley C. Kuszmaul
7a1f2d5706 Write tests for {{{toku_dump_brt()}}}. Addresses #1195.
git-svn-id: file:///svn/toku/tokudb.1195@7461 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:24 -04:00
Bradley C. Kuszmaul
b5ef4b0e20 Simplified splitting code (don't split fifo. Instead push everything to the child.) Tests run. Addresses #1195.
git-svn-id: file:///svn/toku/tokudb.1195@7453 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:24 -04:00
Bradley C. Kuszmaul
8195b25b5a Fix up fingerprints, and speed up by removing checks. Passes newbrt tests (haven't checked with valgrind). Addresses #1195.
git-svn-id: file:///svn/toku/tokudb.1195@7434 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:24 -04:00
Bradley C. Kuszmaul
def3be83af Not all tests ran (because splitting was broken). Start fixing the splitting. Addresses #1195.
git-svn-id: file:///svn/toku/tokudb.1195@7367 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:24 -04:00
Bradley C. Kuszmaul
e3d8b75e84 newbrt tests run. Still no deletes. But the code is smaller than it was (2734 according to sloccount vs 3137 before, which is 13 percent reduction). Addresses #1195.
git-svn-id: file:///svn/toku/tokudb.1195@7362 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:24 -04:00
Bradley C. Kuszmaul
34341f29e8 More surgery. Most of cursor stuff compiles now. Addresses #1195.
git-svn-id: file:///svn/toku/tokudb.1195@7326 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:24 -04:00
Bradley C. Kuszmaul
d3eb758aac More surgery. A few tests run. Many still don't link. Addresses #1195.
git-svn-id: file:///svn/toku/tokudb.1195@7295 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:24 -04:00
Bradley C. Kuszmaul
20894b913f More surgery. The newbrt.o file now builds. Addresess #1195.
git-svn-id: file:///svn/toku/tokudb.1195@7273 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:24 -04:00
Bradley C. Kuszmaul
83864266a8 More surgery. Addresess #1195.
git-svn-id: file:///svn/toku/tokudb.1195@7272 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:23 -04:00
Bradley C. Kuszmaul
4c03814f58 Surgery continues. Addresses #1195.
git-svn-id: file:///svn/toku/tokudb.1195@7271 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:23 -04:00
Bradley C. Kuszmaul
deab1245cb Surgery continues. Addresses #1195.
git-svn-id: file:///svn/toku/tokudb.1195@7270 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:23 -04:00
Bradley C. Kuszmaul
bcd12764b7 Put the leaf application code back in. Addresses #1195.
git-svn-id: file:///svn/toku/tokudb.1195@7134 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:23 -04:00
Bradley C. Kuszmaul
58838a3f2a More surgery. Addresess #1195.
git-svn-id: file:///svn/toku/tokudb.1195@7123 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:23 -04:00
Bradley C. Kuszmaul
e138ba595a Start doing the surgery. Addresses #1195.
git-svn-id: file:///svn/toku/tokudb.1195@7118 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:23 -04:00
Bradley C. Kuszmaul
2dd4dd7b0d the splitting works again. Addresses #1195.
git-svn-id: file:///svn/toku/tokudb.1195@7054 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:23 -04:00
Bradley C. Kuszmaul
eec8bc2d56 Remove a lot of printfs. Addresses #1195.
git-svn-id: file:///svn/toku/tokudb.1195@6885 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:23 -04:00
Bradley C. Kuszmaul
2f0936b291 Fix up some sizing issues, set the dirty bit after splitting, and put in a lot of printfs. Addresses #1195.
git-svn-id: file:///svn/toku/tokudb.1195@6883 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:23 -04:00
Bradley C. Kuszmaul
f13fa4beca Start using the simplified code in some cases. Addresses #1195.
git-svn-id: file:///svn/toku/tokudb.1195@6611 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:23 -04:00
Bradley C. Kuszmaul
d5c96813bc This version compiles, but none of the new code is run by any test. Addresses #1195.
git-svn-id: file:///svn/toku/tokudb.1195@6590 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:23 -04:00
Bradley C. Kuszmaul
b54c77c3cb Start simplification of tree code, in preparation for merge on delete. Addresses #1195.
git-svn-id: file:///svn/toku/tokudb.1195@6589 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:23 -04:00
Bradley C. Kuszmaul
21502c1381 Start simplification of tree code, in preparation for merge on delete. Addresses #1195.
git-svn-id: file:///svn/toku/tokudb.1195@6588 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:23 -04:00
Bradley C. Kuszmaul
01a3ecde78 Get rid of one assertion that the nodes are smaller than the nodesize. Those assertions are no longer needed. Addresses #1195.
git-svn-id: file:///svn/toku/tokudb.1195@6586 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:23 -04:00
Rich Prohaska
31c755d35b compile with gcc 4.3. addresses #1185
git-svn-id: file:///svn/tokudb.1131b+1080a+1185+nostatementexprs@6471 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:21 -04:00
Bradley C. Kuszmaul
5398661a9e Make it work better with icc. Addresses #1185.
git-svn-id: file:///svn/tokudb.1131b+1080a+1185+nostatementexprs@6467 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:21 -04:00
Bradley C. Kuszmaul
cd8840f04d Get rid of icc warnings (with port-win warnings.) Addresss #1185.
git-svn-id: file:///svn/tokudb.1131b+1080a+1185+nostatementexprs@6466 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:21 -04:00
Bradley C. Kuszmaul
0ed47ea357 CIL gets upset if includes are not in the same order, because int64_t gets typedefed to different things depending on what you include. So do all the includes in a standard way. Addresses #1185.
git-svn-id: file:///svn/tokudb.1131b+1080a+1185@6439 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:20 -04:00
Bradley C. Kuszmaul
9f7f84e655 Get rid of almost all compiler warnings in newbrt for icc, and also compiles with gcc. Addresses #1185.
git-svn-id: file:///svn/tokudb.1131b+1080a+1185@6383 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:20 -04:00
Bradley C. Kuszmaul
0363b1697a Get rid of almost all compiler warnings in newbrt. Addresses #1185.
git-svn-id: file:///svn/tokudb.1131b+1080a+1185@6381 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:20 -04:00
Bradley C. Kuszmaul
0d2788eb22 Get rid of some compiler warnings. Addresses #1185.
git-svn-id: file:///svn/tokudb.1131b+1080a+1185@6371 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:19 -04:00
Rich Prohaska
02c73ee328 compile newbrt with icc. addresses #1185
git-svn-id: file:///svn/tokudb.1131b+1080a+1185@6330 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:19 -04:00
Rich Prohaska
5ef2e3e59f fix valgrind errors introduced by checkin 6279. addresses #1054
git-svn-id: file:///svn/tokudb.1131b+1080a@6284 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:18 -04:00
Rich Prohaska
00edc91492 move the root_put_counter to the brt_header. closes #1054
git-svn-id: file:///svn/tokudb.1131b+1080a@6279 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:18 -04:00
Rich Prohaska
2adbbe6d15 fix 1172. we can not use the brt in the block serialize functions as the brt may not be valid. addresses #1172
git-svn-id: file:///svn/tokudb.1131b+1080a@6272 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:18 -04:00