Rich Prohaska
432e750814
refs[t:2613] get the brtloader tests working with the new memory accounting
...
git-svn-id: file:///svn/toku/tokudb@20307 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:12 -04:00
Bradley C. Kuszmaul
e3d629fb2e
Merge in memory management for the extractor thread. Refs #2613 . [t:2613].
...
{{{
svn merge -r 20278:20301 https://svn.tokutek.com/tokudb/toku/tokudb.2613
}}}
.
git-svn-id: file:///svn/toku/tokudb@20302 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:12 -04:00
Bradley C. Kuszmaul
9dfcef61c1
Merge the 2571 double-buffering stuff over and delete the 2571 branch. Double buffering of the file merge is complete. Fixes #2571 . close[t:2571]
...
{{{
svn merge -r 20199:20206 https://svn.tokutek.com/tokudb/toku/tokudb.2571
}}}
.
git-svn-id: file:///svn/toku/tokudb@20208 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:11 -04:00
Rich Prohaska
52b5bafc07
merge 2578b to main refs[t:2578]
...
git-svn-id: file:///svn/toku/tokudb@20143 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:11 -04:00
Bradley C. Kuszmaul
0827928d76
Merge in the changes that make the reads not use fidx locks too. Refs #2571 . [t:2571]
...
{{{
svn merge -r 20067:20072 https://svn.tokutek.com/tokudb/toku/tokudb.2571
}}}
.
git-svn-id: file:///svn/toku/tokudb@20073 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:11 -04:00
Rich Prohaska
b7d19f5045
the brt_loader_sort_and_write_rows contract changed which caused the tests to fail. fix the tests closes[t:2593] #2593
...
git-svn-id: file:///svn/toku/tokudb@20059 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:10 -04:00
Bradley C. Kuszmaul
47f2199d9d
Merge in
...
* bradley's benchmarking changes, and
* the big speedup in the sort-and-write-rows (slowness caused the lock in fidx2file).
Refs #2571 . [t:2571]
{{{
svn merge -r 19909:20027 https://svn.tokutek.com/tokudb/toku/tokudb.2571
}}}
.
git-svn-id: file:///svn/toku/tokudb@20029 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:10 -04:00
Rich Prohaska
0612028bcf
fix the loader error callback and the pqueue-test closes[t:2576]
...
git-svn-id: file:///svn/toku/tokudb@19913 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:09 -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
Rich Prohaska
3f35cb893b
change block format to support leaf partitions closes[t:2351]
...
git-svn-id: file:///svn/toku/tokudb@19500 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:07 -04:00
Bradley C. Kuszmaul
3bfdfa2921
Get rid of the gratuitous IDX files.
...
git-svn-id: file:///svn/toku/tokudb@18835 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:04 -04:00
Bradley C. Kuszmaul
3919e85519
Merge the finer-grained progress report for the loader. Refs #2462 . [t:2462]
...
{{{
svn merge -r 18775:18791 https://svn.tokutek.com/tokudb/toku/tokudb.2462
}}}
.
git-svn-id: file:///svn/toku/tokudb@18792 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:04 -04:00
Rich Prohaska
287f0e8384
fix 32 bit linux build of brtloader test #2475 closes[t:2475]
...
git-svn-id: file:///svn/toku/tokudb@18769 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:03 -04:00
Bradley C. Kuszmaul
788b96e407
Merge 2216b onto main line. Refs #2216 . [t:2216]
...
{{{
svn merge -r18206:18672 https://svn.tokutek.com/tokudb/toku/tokudb.2216b
svn merge -r 18738:18746 https://svn.tokutek.com/tokudb/toku/tokudb.2216b
}}}
.
git-svn-id: file:///svn/toku/tokudb@18749 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:03 -04:00
Yoni Fogel
1f1c288024
[t:2216] printf format now matches (windows port)
...
git-svn-id: file:///svn/toku/tokudb@18189 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:01 -04:00
Bradley C. Kuszmaul
178820a688
Merge changes from 2216a to main (except possibly for the windows subdirectory, which Yoni will do separately).
...
2216a is no longer valid.
Refs #2216 . [t:2216].
{{{
svn merge -r17301:18179 https://svn.tokutek.com/tokudb/toku/tokudb.2216a/src/tests
}}}
git-svn-id: file:///svn/toku/tokudb@18181 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:01 -04:00
