Commits · e5a97fb2987ea535586a7fef20ea5dcb2a4e23a4 · nexedi / MariaDB

17 Apr, 2013 40 commits

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

Bradley C. Kuszmaul authored Nov 11, 2008

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

e5a97fb2

Remove printf. Addresses #1195. · 222e3a36
Bradley C. Kuszmaul authored Nov 10, 2008
```
git-svn-id: file:///svn/toku/tokudb.1195@7731 c7de825b-a66e-492c-adef-691d508d4ae1
```
222e3a36
merge intel c++ changes from changeset 6813. addresses #1185 · 5f772b51
Rich Prohaska authored Nov 10, 2008
```
git-svn-id: file:///svn/toku/tokudb.1195@7730 c7de825b-a66e-492c-adef-691d508d4ae1
```
5f772b51
merge ticket 1200 changeset 6617 to the tokudb.1195 branch. addresses #1200 adresses #1195 · 71871aa0
Rich Prohaska authored Nov 08, 2008
```
git-svn-id: file:///svn/toku/tokudb.1195@7705 c7de825b-a66e-492c-adef-691d508d4ae1
```
71871aa0
fix icc 32 bit warnings. addresses #1195 · 54206832
Rich Prohaska authored Nov 08, 2008
```
git-svn-id: file:///svn/toku/tokudb.1195@7704 c7de825b-a66e-492c-adef-691d508d4ae1
```
54206832
fix icc compile issues. addresses #1195 · 2d4f7748
Rich Prohaska authored Nov 08, 2008
```
git-svn-id: file:///svn/toku/tokudb.1195@7703 c7de825b-a66e-492c-adef-691d508d4ae1
```
2d4f7748
Get rid of a memory leak. Addresses #1195. · 0489447a
Bradley C. Kuszmaul authored Nov 07, 2008
```
git-svn-id: file:///svn/toku/tokudb.1195@7685 c7de825b-a66e-492c-adef-691d508d4ae1
```
0489447a
play around with /proc/status. closes #1239 · c2720771
Rich Prohaska authored Nov 07, 2008
```
git-svn-id: file:///svn/toku/tokudb.1195@7682 c7de825b-a66e-492c-adef-691d508d4ae1
```
c2720771
merge read uncommited changes to the dev branch. addresses #1201 · c96e94ee
Rich Prohaska authored Nov 07, 2008
```
git-svn-id: file:///svn/toku/tokudb.1195@7681 c7de825b-a66e-492c-adef-691d508d4ae1
```
c96e94ee

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

Bradley C. Kuszmaul authored Nov 07, 2008

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

c2ef1a3a

free diskblocks. Addresses #1195. · 4232a577
Bradley C. Kuszmaul authored Nov 07, 2008
```
git-svn-id: file:///svn/toku/tokudb.1195@7679 c7de825b-a66e-492c-adef-691d508d4ae1
```
4232a577
add cachesize parameter to scanscan addresses #1195 · de600712
Rich Prohaska authored Nov 07, 2008
```
git-svn-id: file:///svn/toku/tokudb.1195@7676 c7de825b-a66e-492c-adef-691d508d4ae1
```
de600712
compile with icc 32 bit linux. addresses #1195 · 3d694ede
Rich Prohaska authored Nov 06, 2008
```
git-svn-id: file:///svn/toku/tokudb.1195@7659 c7de825b-a66e-492c-adef-691d508d4ae1
```
3d694ede
minor changes to compile with icc and make the windows port easier. addresses #1195 · 0d96531b
Rich Prohaska authored Nov 06, 2008
```
git-svn-id: file:///svn/toku/tokudb.1195@7647 c7de825b-a66e-492c-adef-691d508d4ae1
```
0d96531b
build on 32 bit linux. addresses #1195 · 5873fc59
Rich Prohaska authored Nov 05, 2008
```
git-svn-id: file:///svn/toku/tokudb.1195@7644 c7de825b-a66e-492c-adef-691d508d4ae1
```
5873fc59
sequential insert leaf split at 1/4 of the original node. addresses #1195 · e79a0c26
Rich Prohaska authored Nov 05, 2008
```
git-svn-id: file:///svn/toku/tokudb.1195@7641 c7de825b-a66e-492c-adef-691d508d4ae1
```
e79a0c26
turn on the cachetable writer threads. use fast asserts. addresses #1195 · f13442b5
Rich Prohaska authored Nov 05, 2008
```
git-svn-id: file:///svn/toku/tokudb.1195@7640 c7de825b-a66e-492c-adef-691d508d4ae1
```
f13442b5
compile using gcc 4.3 (fedora 9) addresses #1195 · ecafd8c7
Rich Prohaska authored Nov 05, 2008
```
git-svn-id: file:///svn/toku/tokudb.1195@7639 c7de825b-a66e-492c-adef-691d508d4ae1
```
ecafd8c7

Unpin child before calling {{{brt_handle_maybe_reactive_child}}}, because... · 596bf318

Bradley C. Kuszmaul authored Nov 05, 2008

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

596bf318

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

Bradley C. Kuszmaul authored Nov 04, 2008

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

bd0c64fe

Make {{{src/tests/test_dup_search}}} work. Addresses #1195. · 2b020676
Bradley C. Kuszmaul authored Nov 04, 2008
```
git-svn-id: file:///svn/toku/tokudb.1195@7620 c7de825b-a66e-492c-adef-691d508d4ae1
```
2b020676
fix evict remove race. addresses #1195 · d0b92303
Rich Prohaska authored Nov 04, 2008
```
git-svn-id: file:///svn/toku/tokudb.1195@7617 c7de825b-a66e-492c-adef-691d508d4ae1
```
d0b92303
test for evict remove race. addresses #1195 · 46eb0bed
Rich Prohaska authored Nov 04, 2008
```
git-svn-id: file:///svn/toku/tokudb.1195@7616 c7de825b-a66e-492c-adef-691d508d4ae1
```
46eb0bed
Make some tests run better. Addresses #1195. · c377fece
Bradley C. Kuszmaul authored Nov 04, 2008
```
git-svn-id: file:///svn/toku/tokudb.1195@7615 c7de825b-a66e-492c-adef-691d508d4ae1
```
c377fece
test cachetable_unpin_and_remove. addresses #1237 · 59a80f29
Rich Prohaska authored Nov 04, 2008
```
git-svn-id: file:///svn/toku/tokudb.1195@7612 c7de825b-a66e-492c-adef-691d508d4ae1
```
59a80f29

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

Bradley C. Kuszmaul authored Nov 04, 2008

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

5533e9a0

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

Bradley C. Kuszmaul authored Nov 03, 2008

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

d506dbff

measure seq and random insert rates · 01fc7b22
Rich Prohaska authored Nov 03, 2008
```
git-svn-id: file:///svn/toku/tokudb.1195@7584 c7de825b-a66e-492c-adef-691d508d4ae1
```
01fc7b22
Work on merging nonleaf nodes. Addresses #1195. · 0fec0d7d
Bradley C. Kuszmaul authored Nov 02, 2008
```
git-svn-id: file:///svn/toku/tokudb.1195@7561 c7de825b-a66e-492c-adef-691d508d4ae1
```
0fec0d7d
handle split keys better. Addresses #1195. · 4056b9dd
Bradley C. Kuszmaul authored Oct 31, 2008
```
git-svn-id: file:///svn/toku/tokudb.1195@7521 c7de825b-a66e-492c-adef-691d508d4ae1
```
4056b9dd

Implement leaf node balancing (sometimes intead of merging we balance two leaf... · 3f5c158e

Bradley C. Kuszmaul authored Oct 31, 2008

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

3f5c158e

Handle another merge case. Addresses #1195. · acbd7dcb
Bradley C. Kuszmaul authored Oct 31, 2008
```
git-svn-id: file:///svn/toku/tokudb.1195@7508 c7de825b-a66e-492c-adef-691d508d4ae1
```
acbd7dcb
Start doing merge. Addresses #1195. · e006f35b
Bradley C. Kuszmaul authored Oct 31, 2008
```
git-svn-id: file:///svn/toku/tokudb.1195@7499 c7de825b-a66e-492c-adef-691d508d4ae1
```
e006f35b
Change an {{{EINVAL}}} to an {{{abort()}}}. Addresses #1195. · 68705588
Bradley C. Kuszmaul authored Oct 30, 2008
```
git-svn-id: file:///svn/toku/tokudb.1195@7471 c7de825b-a66e-492c-adef-691d508d4ae1
```
68705588
Factor out some common subexpressions for handling reactive children. Addresses #1195. · eba57012
Bradley C. Kuszmaul authored Oct 30, 2008
```
git-svn-id: file:///svn/toku/tokudb.1195@7470 c7de825b-a66e-492c-adef-691d508d4ae1
```
eba57012
Simplify {{{assert(0); return;}}} into {{{abort()}}}. Addresses #1195. · 948557d7
Bradley C. Kuszmaul authored Oct 30, 2008
```
git-svn-id: file:///svn/toku/tokudb.1195@7468 c7de825b-a66e-492c-adef-691d508d4ae1
```
948557d7
Get rid of dead code in fingerprint. Addresses #1195. · a8ad4bc1
Bradley C. Kuszmaul authored Oct 30, 2008
```
git-svn-id: file:///svn/toku/tokudb.1195@7467 c7de825b-a66e-492c-adef-691d508d4ae1
```
a8ad4bc1
Write tests for {{{toku_dump_brt()}}}. Addresses #1195. · 005394bf
Bradley C. Kuszmaul authored Oct 30, 2008
```
git-svn-id: file:///svn/toku/tokudb.1195@7461 c7de825b-a66e-492c-adef-691d508d4ae1
```
005394bf

Simplified splitting code (don't split fifo. Instead push everything to the... · e8518514

Bradley C. Kuszmaul authored Oct 30, 2008

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

e8518514

Fix up fingerprints, and speed up by removing checks. Passes newbrt tests... · 35d6ba8f

Bradley C. Kuszmaul authored Oct 29, 2008

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

35d6ba8f