Commit graph

2013 commits

Author SHA1 Message Date
Rich Prohaska
730e17faaf merge 1032 into 1032b. addresses #1032
git-svn-id: file:///svn/toku/tokudb.1032b@7781 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:27 -04:00
Rich Prohaska
fbfd0476ba more merging of 1032 to 1032b. addresses #1032
git-svn-id: file:///svn/toku/tokudb.1032b@7779 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:27 -04:00
Rich Prohaska
0d44815bf5 merge some tokudb.1032 into 1032b. addresses #1032
git-svn-id: file:///svn/toku/tokudb.1032b@7778 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:27 -04:00
Rich Prohaska
ef43452992 fix an icc warning on eng32
git-svn-id: file:///svn/toku/tokudb@7758 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:26 -04:00
Bradley C. Kuszmaul
0ee4e385f1 Merge all mainline patches into the 1195 branch. Fixes #1243.
Details:  I merged with
{{{
svn merge -r6585:7747 https://svn.tokutek.com/tokudb/toku/tokudb
}}}
then resolved conflicts.  The most interesting conflict was the double inclusion of the {{{BLOCK_ALLOCATOR_HEADER_RESERVE}}} for {{{brt-internal.h}}}.   The subversion merger got confused because the patch was applied with an extra space at the end of each line.


git-svn-id: file:///svn/toku/tokudb.1243@7750 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:26 -04:00
Bradley C. Kuszmaul
9b10cda331 Remove printf. Addresses #1195.
git-svn-id: file:///svn/toku/tokudb.1195@7731 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:25 -04:00
Rich Prohaska
a19234e8d1 merge intel c++ changes from changeset 6813. addresses #1185
git-svn-id: file:///svn/toku/tokudb.1195@7730 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:25 -04:00
Rich Prohaska
ab0ac5ad70 merge ticket 1200 changeset 6617 to the tokudb.1195 branch. addresses #1200 adresses #1195
git-svn-id: file:///svn/toku/tokudb.1195@7705 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:25 -04:00
Rich Prohaska
0cb7def202 fix icc 32 bit warnings. addresses #1195
git-svn-id: file:///svn/toku/tokudb.1195@7704 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:25 -04:00
Rich Prohaska
fe1ba37143 fix icc compile issues. addresses #1195
git-svn-id: file:///svn/toku/tokudb.1195@7703 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:25 -04:00
Bradley C. Kuszmaul
f91ae71a2c Get rid of a memory leak. Addresses #1195.
git-svn-id: file:///svn/toku/tokudb.1195@7685 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:25 -04:00
Rich Prohaska
588457dbe8 play around with /proc/status. closes #1239
git-svn-id: file:///svn/toku/tokudb.1195@7682 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:25 -04:00
Rich Prohaska
63df00fc53 merge read uncommited changes to the dev branch. addresses #1201
git-svn-id: file:///svn/toku/tokudb.1195@7681 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:25 -04:00
Bradley C. Kuszmaul
769a3ab12d Failed to generate a new splitk if we didn't merge (in one case). Makes {{{test_dup_delete}}} run. Addresses #1195.
git-svn-id: file:///svn/toku/tokudb.1195@7680 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:25 -04:00
Bradley C. Kuszmaul
6b654211c0 free diskblocks. Addresses #1195.
git-svn-id: file:///svn/toku/tokudb.1195@7679 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:25 -04:00
Rich Prohaska
e9a8a72193 add cachesize parameter to scanscan addresses #1195
git-svn-id: file:///svn/toku/tokudb.1195@7676 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:25 -04:00
Rich Prohaska
c4415cbe27 compile with icc 32 bit linux. addresses #1195
git-svn-id: file:///svn/toku/tokudb.1195@7659 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:25 -04:00
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
765c998055 build on 32 bit linux. addresses #1195
git-svn-id: file:///svn/toku/tokudb.1195@7644 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
6bfb7722fd turn on the cachetable writer threads. use fast asserts. addresses #1195
git-svn-id: file:///svn/toku/tokudb.1195@7640 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
Rich Prohaska
7466b31c4c fix evict remove race. addresses #1195
git-svn-id: file:///svn/toku/tokudb.1195@7617 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:24 -04:00
Rich Prohaska
a4812e1269 test for evict remove race. addresses #1195
git-svn-id: file:///svn/toku/tokudb.1195@7616 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
Rich Prohaska
a3ae38596f test cachetable_unpin_and_remove. addresses #1237
git-svn-id: file:///svn/toku/tokudb.1195@7612 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
Rich Prohaska
9a7a624066 measure seq and random insert rates
git-svn-id: file:///svn/toku/tokudb.1195@7584 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
196d6a25b0 Get rid of dead code in fingerprint. Addresses #1195.
git-svn-id: file:///svn/toku/tokudb.1195@7467 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