Commits · 730e17faafdd001824959f387952a70f75596691 · nexedi / MariaDB

17 Apr, 2013 40 commits

merge 1032 into 1032b. addresses #1032 · 730e17fa
Rich Prohaska authored Apr 16, 2013
```
git-svn-id: file:///svn/toku/tokudb.1032b@7781 c7de825b-a66e-492c-adef-691d508d4ae1
```
730e17fa
more merging of 1032 to 1032b. addresses #1032 · fbfd0476
Rich Prohaska authored Apr 16, 2013
```
git-svn-id: file:///svn/toku/tokudb.1032b@7779 c7de825b-a66e-492c-adef-691d508d4ae1
```
fbfd0476
merge some tokudb.1032 into 1032b. addresses #1032 · 0d44815b
Rich Prohaska authored Apr 16, 2013
```
git-svn-id: file:///svn/toku/tokudb.1032b@7778 c7de825b-a66e-492c-adef-691d508d4ae1
```
0d44815b

Rich Prohaska authored Apr 16, 2013

git-svn-id: file:///svn/toku/tokudb@7758 c7de825b-a66e-492c-adef-691d508d4ae1

ef434529

Merge all mainline patches into the 1195 branch. Fixes #1243. · 0ee4e385

Bradley C. Kuszmaul authored Apr 16, 2013

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

0ee4e385

Remove printf. Addresses #1195. · 9b10cda3
Bradley C. Kuszmaul authored Apr 16, 2013
```
git-svn-id: file:///svn/toku/tokudb.1195@7731 c7de825b-a66e-492c-adef-691d508d4ae1
```
9b10cda3
merge intel c++ changes from changeset 6813. addresses #1185 · a19234e8
Rich Prohaska authored Apr 16, 2013
```
git-svn-id: file:///svn/toku/tokudb.1195@7730 c7de825b-a66e-492c-adef-691d508d4ae1
```
a19234e8
merge ticket 1200 changeset 6617 to the tokudb.1195 branch. addresses #1200 adresses #1195 · ab0ac5ad
Rich Prohaska authored Apr 16, 2013
```
git-svn-id: file:///svn/toku/tokudb.1195@7705 c7de825b-a66e-492c-adef-691d508d4ae1
```
ab0ac5ad
fix icc 32 bit warnings. addresses #1195 · 0cb7def2
Rich Prohaska authored Apr 16, 2013
```
git-svn-id: file:///svn/toku/tokudb.1195@7704 c7de825b-a66e-492c-adef-691d508d4ae1
```
0cb7def2
fix icc compile issues. addresses #1195 · fe1ba371
Rich Prohaska authored Apr 16, 2013
```
git-svn-id: file:///svn/toku/tokudb.1195@7703 c7de825b-a66e-492c-adef-691d508d4ae1
```
fe1ba371
Get rid of a memory leak. Addresses #1195. · f91ae71a
Bradley C. Kuszmaul authored Apr 16, 2013
```
git-svn-id: file:///svn/toku/tokudb.1195@7685 c7de825b-a66e-492c-adef-691d508d4ae1
```
f91ae71a
play around with /proc/status. closes #1239 · 588457db
Rich Prohaska authored Apr 16, 2013
```
git-svn-id: file:///svn/toku/tokudb.1195@7682 c7de825b-a66e-492c-adef-691d508d4ae1
```
588457db
merge read uncommited changes to the dev branch. addresses #1201 · 63df00fc
Rich Prohaska authored Apr 16, 2013
```
git-svn-id: file:///svn/toku/tokudb.1195@7681 c7de825b-a66e-492c-adef-691d508d4ae1
```
63df00fc

Failed to generate a new splitk if we didn't merge (in one case). Makes... · 769a3ab1

Bradley C. Kuszmaul authored Apr 16, 2013

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

769a3ab1

free diskblocks. Addresses #1195. · 6b654211
Bradley C. Kuszmaul authored Apr 16, 2013
```
git-svn-id: file:///svn/toku/tokudb.1195@7679 c7de825b-a66e-492c-adef-691d508d4ae1
```
6b654211
add cachesize parameter to scanscan addresses #1195 · e9a8a721
Rich Prohaska authored Apr 16, 2013
```
git-svn-id: file:///svn/toku/tokudb.1195@7676 c7de825b-a66e-492c-adef-691d508d4ae1
```
e9a8a721
compile with icc 32 bit linux. addresses #1195 · c4415cbe
Rich Prohaska authored Apr 16, 2013
```
git-svn-id: file:///svn/toku/tokudb.1195@7659 c7de825b-a66e-492c-adef-691d508d4ae1
```
c4415cbe
minor changes to compile with icc and make the windows port easier. addresses #1195 · 2a662e81
Rich Prohaska authored Apr 16, 2013
```
git-svn-id: file:///svn/toku/tokudb.1195@7647 c7de825b-a66e-492c-adef-691d508d4ae1
```
2a662e81
build on 32 bit linux. addresses #1195 · 765c9980
Rich Prohaska authored Apr 16, 2013
```
git-svn-id: file:///svn/toku/tokudb.1195@7644 c7de825b-a66e-492c-adef-691d508d4ae1
```
765c9980
sequential insert leaf split at 1/4 of the original node. addresses #1195 · 656daf1a
Rich Prohaska authored Apr 16, 2013
```
git-svn-id: file:///svn/toku/tokudb.1195@7641 c7de825b-a66e-492c-adef-691d508d4ae1
```
656daf1a
turn on the cachetable writer threads. use fast asserts. addresses #1195 · 6bfb7722
Rich Prohaska authored Apr 16, 2013
```
git-svn-id: file:///svn/toku/tokudb.1195@7640 c7de825b-a66e-492c-adef-691d508d4ae1
```
6bfb7722
compile using gcc 4.3 (fedora 9) addresses #1195 · 55684669
Rich Prohaska authored Apr 16, 2013
```
git-svn-id: file:///svn/toku/tokudb.1195@7639 c7de825b-a66e-492c-adef-691d508d4ae1
```
55684669

Unpin child before calling {{{brt_handle_maybe_reactive_child}}}, because... · ed85b2e9

Bradley C. Kuszmaul authored Apr 16, 2013

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

ed85b2e9

Remove use of uninitialized value (caught by valgrind, causing infinite loop... · 7988f9ff

Bradley C. Kuszmaul authored Apr 16, 2013

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

7988f9ff

Make {{{src/tests/test_dup_search}}} work. Addresses #1195. · b0c5a7cb
Bradley C. Kuszmaul authored Apr 16, 2013
```
git-svn-id: file:///svn/toku/tokudb.1195@7620 c7de825b-a66e-492c-adef-691d508d4ae1
```
b0c5a7cb
fix evict remove race. addresses #1195 · 7466b31c
Rich Prohaska authored Apr 16, 2013
```
git-svn-id: file:///svn/toku/tokudb.1195@7617 c7de825b-a66e-492c-adef-691d508d4ae1
```
7466b31c
test for evict remove race. addresses #1195 · a4812e12
Rich Prohaska authored Apr 16, 2013
```
git-svn-id: file:///svn/toku/tokudb.1195@7616 c7de825b-a66e-492c-adef-691d508d4ae1
```
a4812e12
Make some tests run better. Addresses #1195. · e875d710
Bradley C. Kuszmaul authored Apr 16, 2013
```
git-svn-id: file:///svn/toku/tokudb.1195@7615 c7de825b-a66e-492c-adef-691d508d4ae1
```
e875d710
test cachetable_unpin_and_remove. addresses #1237 · a3ae3859
Rich Prohaska authored Apr 16, 2013
```
git-svn-id: file:///svn/toku/tokudb.1195@7612 c7de825b-a66e-492c-adef-691d508d4ae1
```
a3ae3859

newbrt tests run (had to get the keylen computation right.) Still does not... · 586af672

Bradley C. Kuszmaul authored Apr 16, 2013

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

586af672

Add {{{fullhash}}} to {{{toku_cachetable_remove}}}, and rename it to... · 42325e19

Bradley C. Kuszmaul authored Apr 16, 2013

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

42325e19

measure seq and random insert rates · 9a7a6240
Rich Prohaska authored Apr 16, 2013
```
git-svn-id: file:///svn/toku/tokudb.1195@7584 c7de825b-a66e-492c-adef-691d508d4ae1
```
9a7a6240
Work on merging nonleaf nodes. Addresses #1195. · 502a5ff4
Bradley C. Kuszmaul authored Apr 16, 2013
```
git-svn-id: file:///svn/toku/tokudb.1195@7561 c7de825b-a66e-492c-adef-691d508d4ae1
```
502a5ff4
handle split keys better. Addresses #1195. · 4ce5197c
Bradley C. Kuszmaul authored Apr 16, 2013
```
git-svn-id: file:///svn/toku/tokudb.1195@7521 c7de825b-a66e-492c-adef-691d508d4ae1
```
4ce5197c

Implement leaf node balancing (sometimes intead of merging we balance two leaf... · 19690a23

Bradley C. Kuszmaul authored Apr 16, 2013

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

19690a23

Handle another merge case. Addresses #1195. · 7d9610c0
Bradley C. Kuszmaul authored Apr 16, 2013
```
git-svn-id: file:///svn/toku/tokudb.1195@7508 c7de825b-a66e-492c-adef-691d508d4ae1
```
7d9610c0
Start doing merge. Addresses #1195. · 55111c50
Bradley C. Kuszmaul authored Apr 16, 2013
```
git-svn-id: file:///svn/toku/tokudb.1195@7499 c7de825b-a66e-492c-adef-691d508d4ae1
```
55111c50
Change an {{{EINVAL}}} to an {{{abort()}}}. Addresses #1195. · b29bddd2
Bradley C. Kuszmaul authored Apr 16, 2013
```
git-svn-id: file:///svn/toku/tokudb.1195@7471 c7de825b-a66e-492c-adef-691d508d4ae1
```
b29bddd2
Factor out some common subexpressions for handling reactive children. Addresses #1195. · 41a52d6d
Bradley C. Kuszmaul authored Apr 16, 2013
```
git-svn-id: file:///svn/toku/tokudb.1195@7470 c7de825b-a66e-492c-adef-691d508d4ae1
```
41a52d6d
Simplify {{{assert(0); return;}}} into {{{abort()}}}. Addresses #1195. · 0ea80d55
Bradley C. Kuszmaul authored Apr 16, 2013
```
git-svn-id: file:///svn/toku/tokudb.1195@7468 c7de825b-a66e-492c-adef-691d508d4ae1
```
0ea80d55