Commit graph

22 commits

Author SHA1 Message Date
Leif Walsh
3719bf2c2f [t:4901] merging brt->ft rename to main
git-svn-id: file:///svn/toku/tokudb@43686 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-17 00:00:35 -04:00
Zardosht Kasheff
7942bcf209 [t:4028], merge to main
git-svn-id: file:///svn/toku/tokudb@41142 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-17 00:00:13 -04:00
Leif Walsh
784f47a841 [t:4002] Commiting HOT to main.
git-svn-id: file:///svn/toku/tokudb@38549 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-17 00:00:03 -04:00
Barry Perlman
b1324bd474 [t:4181] #4181 Merge from tokudb.4181 to main. Improve memory accounting to prevent resident set size (RSS) from exceeding allocation.
git-svn-id: file:///svn/toku/tokudb@37499 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:58 -04:00
Barry Perlman
9051b4736a [t:4127] #4020 Add function toku_mempool_get_allocated_space()
git-svn-id: file:///svn/toku/tokudb@36823 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:55 -04:00
Barry Perlman
7d828bbd29 [t:4050] #4050 Merge tokudb.4050 to merge, done with command svn merge -r36213:HEAD tokudb.4050 tokudb
git-svn-id: file:///svn/toku/tokudb@36808 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:55 -04:00
Bradley C. Kuszmaul
885c83300b [t:3604] Merge everything from the tokudb.3312c+3524+msn branch. Refs #3604.
git-svn-id: file:///svn/toku/tokudb@32294 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:40 -04:00
Bradley C. Kuszmaul
28cc5d1ed9 Merge the changes from 2499d onto the main line. Fixes #2499. close[t:2499].
{{{
svn merge -r 19523:19895 https://svn.tokutek.com/tokudb/toku/tokudb.2499d
}}}
.


git-svn-id: file:///svn/toku/tokudb@19902 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:09 -04:00
Bradley C. Kuszmaul
17e5214663 Refs #1529.
git-svn-id: file:///svn/toku/tokudb@11223 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:48 -04:00
Bradley C. Kuszmaul
1ed3f26d65 Add #ident Id info to all the newbrt/*.c and newbrt/*.h files. Refs #1529.
git-svn-id: file:///svn/toku/tokudb@11221 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:48 -04:00
Yoni Fogel
3b42b55489 Closes #1378 Merged all changes into main.
git-svn-id: file:///svn/toku/tokudb@9507 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:41 -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
Bradley C. Kuszmaul
728b016482 Merge main line (up to 6206) and resolve the differences.
{{{
svn merge -r5900:6206 https://svn.tokutek.com/tokudb/tokudb
}}}

Addresses #699, #1000, #1075, #1080, #1100, #1131, #1132, #1134, #1153, #1158.


git-svn-id: file:///svn/tokudb.1131b+1080a@6207 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:18 -04:00
Rich Prohaska
5fa2c451c5 delete the unused mempool compress feature
git-svn-id: file:///svn/tokudb@5439 c7de825b-a66e-492c-adef-691d508d4ae1
2008-07-30 19:36:37 +00:00
Bradley C. Kuszmaul
31144bf15b Make the leaf nodes have accurate memory footprint info.
git-svn-id: file:///svn/tokudb@4178 c7de825b-a66e-492c-adef-691d508d4ae1
2008-05-27 21:08:31 +00:00
Bradley C. Kuszmaul
22cf859734 Write leafentry code, and get things to compile. Make it more compatible with -Wconversion. Addresses #558.
git-svn-id: file:///svn/tokudb@3270 c7de825b-a66e-492c-adef-691d508d4ae1
2008-04-04 18:22:01 +00:00
Bradley C. Kuszmaul
83d416fa09 Merge the 558 branch back to the main with
{{{
svn merge -r3061:3225 https://svn.tokutek.com/tokudb/tokudb.558
}}}

Fixes #630.
Addresses #558.


git-svn-id: file:///svn/tokudb@3226 c7de825b-a66e-492c-adef-691d508d4ae1
2008-04-02 23:40:36 +00:00
Bradley C. Kuszmaul
1a155723d6 Add copyrights using #ident on the top of newbrt sources. Addresses #54.
git-svn-id: file:///svn/tokudb@817 c7de825b-a66e-492c-adef-691d508d4ae1
2007-11-29 14:18:54 +00:00
Rich Prohaska
67dc4d5e3e addresses #8
git-svn-id: file:///svn/tokudb@807 c7de825b-a66e-492c-adef-691d508d4ae1
2007-11-28 20:51:16 +00:00
Bradley C. Kuszmaul
48f0ad74b5 Up
git-svn-id: file:///svn/tokudb@519 c7de825b-a66e-492c-adef-691d508d4ae1
2007-11-14 17:58:38 +00:00
Rich Prohaska
11bf6c52f2 mempoll testing
git-svn-id: file:///svn/tokudb@444 c7de825b-a66e-492c-adef-691d508d4ae1
2007-10-12 23:50:05 +00:00
Rich Prohaska
c69bbcf7ff pma uses a memory pool
git-svn-id: file:///svn/tokudb@436 c7de825b-a66e-492c-adef-691d508d4ae1
2007-10-10 19:33:31 +00:00