Barry Perlman
c68e4f968a
[t:3102] Change brtloader_fi_close() to ignore files that are already closed when called from brtloader_fi_close_all().
...
git-svn-id: file:///svn/toku/tokudb@26361 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:33 -04:00
Barry Perlman
2f4f4976be
[t:3102] Restore brtloader_fi_close_all() to brtloader-internal.h (needed by test programs). Also clarify use of return values in brtloader_fi_close().
...
git-svn-id: file:///svn/toku/tokudb@26360 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:33 -04:00
Barry Perlman
de61796b6c
[t:3102] Propogate error return up call stack when fclose() fails. Make brtloader_fi_close_all() static to brtloader.c and delete its signature from brtloader-internal.h.
...
git-svn-id: file:///svn/toku/tokudb@26318 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:33 -04:00
Rich Prohaska
43e5039e58
#3011 remove *extra from *multiple functions and callbacks refs[t:3011]
...
git-svn-id: file:///svn/toku/tokudb@25627 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:30 -04:00
Barry Perlman
548d03d70e
[t:2892] Merge upgrade logic to main. Merge command was svn merge --accept=postpone -r25293:HEAD ../tokudb.main+2892 .
...
git-svn-id: file:///svn/toku/tokudb@25303 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:25 -04:00
Rich Prohaska
24d915f259
#2966 use assert_zero in some of the newbrt files refs[t:2966]
...
git-svn-id: file:///svn/toku/tokudb@24717 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:23 -04:00
Rich Prohaska
5c0dce7cbb
#2513 merge the cached threadpool to main refs[t:2513]
...
git-svn-id: file:///svn/toku/tokudb@24627 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:23 -04:00
Zardosht Kasheff
cc91ea8ca4
[t:2811], merge to main \!\!\!
...
git-svn-id: file:///svn/toku/tokudb@23495 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:22 -04:00
Rich Prohaska
59a83a0814
#2868 refs[t:2868] comments from code review
...
git-svn-id: file:///svn/toku/tokudb@22875 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:21 -04:00
Rich Prohaska
ab1d8172bd
#2868 refs[t:2868] fix the presort speedup in the loader
...
git-svn-id: file:///svn/toku/tokudb@22868 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:21 -04:00
Rich Prohaska
d9985ad0cf
#2840 refs[t:2840] add debug prints to the loader to help fix the dbufio read row problem, also remove the assert on this error path
...
git-svn-id: file:///svn/toku/tokudb@22673 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:20 -04:00
Rich Prohaska
44d24685b8
#2833 refs[t:2833] fix the brtloader to use less memory during key extraction and merge sorting
...
git-svn-id: file:///svn/toku/tokudb@22581 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:20 -04:00
Rich Prohaska
7a3f6089e2
#2821 refs[t:2821] fixup the loader tests
...
git-svn-id: file:///svn/toku/tokudb@22416 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:20 -04:00
Rich Prohaska
6f67fad660
#2821 #2829 refs[t:2821] refs[t:2829] fix the loader's merger vmsize and remove an fsync bubble
...
git-svn-id: file:///svn/toku/tokudb@22413 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:20 -04:00
Rich Prohaska
663acdae84
#2654 refs[t:2654] merge loader persort speedup to main tokudb
...
git-svn-id: file:///svn/toku/tokudb@22354 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:20 -04:00
Bradley C. Kuszmaul
07f7970808
Merge 2577c onto main line. Refs #2755c. [t:2755c]
...
{{{
svn merge -r22020:22070 https://svn.tokutek.com/tokudb/toku/tokudb.2755c
}}}
.
git-svn-id: file:///svn/toku/tokudb@22160 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:20 -04:00
Bradley C. Kuszmaul
c49d7a8c0c
The first loader gets 1/2 of cachetable memory.
...
* That's 2/3 of 3/4, which is calculated as 1/4 is unreservable. The loader asks for 2/3 of what's reservable, getting one half.
The second loader gets 1/6 of cachetable memory.
* That's 2/3 of 1/4: The loader asks for 2/3 of what's reservable. 1/2 has been reserved. 1/4 is unreservable. 1/4 is reservable. 2/3 of 1/4 is 1/6.
The third loader gets 1/18 of cachetable memory.
* That's 2/3 or 1/12. (1/4 is unreservable. 1/2 was reserved by the first loader. 1/6 by the second. That leaves 1/12)
Generally the next one gets 1/3 of what the previous one got.
Refs #2759 . [t:2759]
git-svn-id: file:///svn/toku/tokudb@21564 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:19 -04:00
Rich Prohaska
c37567705f
#2738 refs[t:2738] merge dbufio bug fix to main
...
git-svn-id: file:///svn/toku/tokudb@21260 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:19 -04:00
Rich Prohaska
1a65ba1d80
#2723 refs[t:2723] fix the slow control-c reaction in the brtloader's write to brt function
...
git-svn-id: file:///svn/toku/tokudb@21103 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:19 -04:00
Bradley C. Kuszmaul
dfdaee296d
Candidate fix for #2730 (the race in the loader and the io-thread where they glare at each other). Refs #2730 . [t:2730]
...
git-svn-id: file:///svn/toku/tokudb@21082 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:19 -04:00
Rich Prohaska
6b09687c83
#2718 refs[t:2718] free the big buffer attached to the temp files when they are closed
...
git-svn-id: file:///svn/toku/tokudb@21045 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:19 -04:00
Rich Prohaska
8a95226d84
#2717 refs[t:2717] fix the brtloader subtree estimates
...
git-svn-id: file:///svn/toku/tokudb@21040 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:19 -04:00
Yoni Fogel
c9b2b066dd
[t:2561] Merge tokudb.2561b to main. Disabled auto-upgrade and auto-upgrade tests
...
git-svn-id: file:///svn/toku/tokudb@20778 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:17 -04:00
Rich Prohaska
16cbf13ca2
closes[t:2445] fsync dirs after file creation
...
git-svn-id: file:///svn/toku/tokudb@20735 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:16 -04:00
Dave Wells
85bfc804f0
remove cilk_spawn that is within cilk_for loop
...
git-svn-id: file:///svn/toku/tokudb@20684 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:16 -04:00
Rich Prohaska
e6a7af95a3
refs[t:2654] fix a NULL pointer deref found by valgrind brtloader-test-open
...
git-svn-id: file:///svn/toku/tokudb@20672 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:16 -04:00
Rich Prohaska
d86d1e5361
closes[t:2659] fix the data race in the finish_primary_rows_internal function. found by cilkscreen ./brtloader-test-extractor -s
...
git-svn-id: file:///svn/toku/tokudb@20657 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:16 -04:00
Bradley C. Kuszmaul
54490d3c06
Simplify structures to keep track of whether data in an index is sorted. Refs #2654 . [t:2654].
...
git-svn-id: file:///svn/toku/tokudb@20644 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:16 -04:00
Bradley C. Kuszmaul
57fb43c9c5
Add structures to keep track of whether data in an index is sorted. We aren't maintaining it properly yet, but everything should work since we aren't using it. Refs #2654 . [t:2654].
...
git-svn-id: file:///svn/toku/tokudb@20640 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:15 -04:00
Rich Prohaska
9e02290285
closes[t:2642] fix a mem leak in the brtloader found with the cleanup test
...
git-svn-id: file:///svn/toku/tokudb@20627 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:15 -04:00
Rich Prohaska
5518290137
closes[t:2591] fix the brtloader destroy to avoid the mutex when not yet initialized
...
git-svn-id: file:///svn/toku/tokudb@20608 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:15 -04:00
Rich Prohaska
42fdb90153
refs[t:2591] mutex destroy called on an uninitalized mutex
...
git-svn-id: file:///svn/toku/tokudb@20557 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:15 -04:00
Bradley C. Kuszmaul
d14326cc0e
brtloader.c is now 96.61% of lines and 87.13% of branches. [t:2647] Refs #2647 .
...
git-svn-id: file:///svn/toku/tokudb@20539 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:15 -04:00
Rich Prohaska
543dd95cdb
closes[t:2648] improve the brtloader writer coverage
...
git-svn-id: file:///svn/toku/tokudb@20538 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:15 -04:00
Bradley C. Kuszmaul
59a8f06e93
The brtloader is now at 95.03% lines covered and 84.64% of branches taken. That's pretty good. We can work to remove a few more, but it's diminishing returns from here. [t:2647] Refs #2647 .
...
git-svn-id: file:///svn/toku/tokudb@20537 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:15 -04:00
Bradley C. Kuszmaul
c4405b714c
Make the ...dbufio tests better. Refs #2633 . [t:2633]
...
git-svn-id: file:///svn/toku/tokudb@20534 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:15 -04:00
Dave Wells
2ef2752ced
cleanup merge_some_files error path [t:2642]
...
git-svn-id: file:///svn/toku/tokudb@20533 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:15 -04:00
Rich Prohaska
1bba1e63b2
closes[t:2644] combine the brtloader panic and error callback state
...
git-svn-id: file:///svn/toku/tokudb@20526 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:15 -04:00
Dave Wells
b3800e0177
fix loader_open test failures, closes #2591 [t:2591]
...
git-svn-id: file:///svn/toku/tokudb@20486 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:14 -04:00
Bradley C. Kuszmaul
7b435f245a
Fix at least one problem found by the loader-cleanup-test. Make the valgrind version of loader-cleanup-test use {{{-r 1000}}} so it runs faster. Refs #2642 . [t:2642]
...
git-svn-id: file:///svn/toku/tokudb@20482 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:14 -04:00
Dave Wells
faea32e1ca
add asserts, cleanup fta init
...
git-svn-id: file:///svn/toku/tokudb@20471 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:14 -04:00
Bradley C. Kuszmaul
d567a309ac
Fix #2643 . (Make progress reporting work right again in the loader). close[t:2643]
...
git-svn-id: file:///svn/toku/tokudb@20470 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:14 -04:00
Rich Prohaska
6c54d4ae28
closes[t:2639] recover from translation table realloc failures in the allocate block function of the brtloader. merge -r 20450:head from tokudb.2639
...
git-svn-id: file:///svn/toku/tokudb@20466 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:14 -04:00
Bradley C. Kuszmaul
227abb8536
Fix #2533 . (Avoid runts and don't make maximal fanout in loader). close[t:2533]
...
git-svn-id: file:///svn/toku/tokudb@20459 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:14 -04:00
Bradley C. Kuszmaul
a6e22aadac
Merge in the 2623 branch to main. Closes #2623 . close[t:2623]
...
{{{
svn merge -r 20428:20432 https://svn.tokutek.com/tokudb/toku/tokudb.2623
}}}
.
git-svn-id: file:///svn/toku/tokudb@20433 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:14 -04:00
Rich Prohaska
7fd7b5c15f
closes[t:2634] fix some file open and close errors paths in the brtloader
...
git-svn-id: file:///svn/toku/tokudb@20430 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:14 -04:00
Bradley C. Kuszmaul
47c5441a8d
Merge the basic dbufio working test in. It doesn't test destination files, and the failure cases aren't running yet. But the ...dbufio() code looks fairly well covered anyway. [t:2623] Refs #2623 .
...
{{{
svn merge -r 20423:20425 https://svn.tokutek.com/tokudb/toku/tokudb.2623
}}}
.
git-svn-id: file:///svn/toku/tokudb@20426 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:14 -04:00
Bradley C. Kuszmaul
53cb67c979
Merge some tests of error paths back to main line. Refs #2623 . [t:2623]
...
{{{
svn merge -r 20415:20420 https://svn.tokutek.com/tokudb/toku/tokudb.2623
}}}
.
git-svn-id: file:///svn/toku/tokudb@20421 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:14 -04:00
Rich Prohaska
d3a0eca073
closes[t:2617] change some MALLOCs with no error checks to XMALLOCs
...
git-svn-id: file:///svn/toku/tokudb@20419 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:14 -04:00
Bradley C. Kuszmaul
661106bce3
Merge some changes back to main line (Refs #2623 , #2631 ). [t:2623] [t:2631]
...
{{{
svn merge -r 20381:20412 https://svn.tokutek.com/tokudb/toku/tokudb.2623
}}}
.
git-svn-id: file:///svn/toku/tokudb@20413 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:13 -04:00