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
Rich Prohaska
6f8c78d19b
#4869 #4753 simplify the pthreads api, remove dead code, remove untest error recovery patch, increase test coverage refs[t:4753]
...
git-svn-id: file:///svn/toku/tokudb@43590 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-17 00:00:31 -04:00
Zardosht Kasheff
357b4981c2
[t:4768], [t:4829], [t:4834], [t:4511], [t:4513], merge fixes to main
...
git-svn-id: file:///svn/toku/tokudb@43396 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-17 00:00:27 -04:00
Leif Walsh
63b1969fbb
[t:4814] merging cmake work to mainline
...
git-svn-id: file:///svn/toku/tokudb@43179 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-17 00:00:25 -04:00
Rich Prohaska
e25ea55928
#4682 remove cilkarts code from the loader. refs[t:4682]
...
git-svn-id: file:///svn/toku/tokudb@42090 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-17 00:00:22 -04:00
Leif Walsh
36eb33a18e
[t:4635] fixing the loader to work with compression types, and fixing some tests
...
git-svn-id: file:///svn/toku/tokudb@41510 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-17 00:00:14 -04:00
Leif Walsh
ed07802061
[t:3646] merging changes from tokudb.3646b. fixes #3646
...
git-svn-id: file:///svn/toku/tokudb@32975 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:44 -04:00
Rich Prohaska
28877528fb
#3678 use clean or mvcc leaf entries when appropriate refs[t:3678]
...
git-svn-id: file:///svn/toku/tokudb@32718 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:42 -04:00
Rich Prohaska
bb69802bed
#3588 merge tokudb.3588 to main refs[t:3588]
...
git-svn-id: file:///svn/toku/tokudb@32669 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:42 -04:00
Rich Prohaska
42921bb831
#3163 use the nodesize configured in a db in the brtloader refs[t:3163]
...
git-svn-id: file:///svn/toku/tokudb@26909 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:34 -04:00
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
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
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
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
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
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
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
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
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
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
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
0d184b5625
Fix #2630 . close[t:2630]
...
git-svn-id: file:///svn/toku/tokudb@20405 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:13 -04:00
Dave Wells
da1467e398
do not define toku_merge_some_files_using_dbufio as a cilk function
...
git-svn-id: file:///svn/toku/tokudb@20403 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:13 -04:00
Rich Prohaska
d009c784dc
closes[t:2626] fix the brtloader add_row realloc error recovery
...
git-svn-id: file:///svn/toku/tokudb@20385 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:13 -04:00
Bradley C. Kuszmaul
5e75d244c1
Merge #2623 changes onto main line. The new test fails, but I need to get a merge from main again. Refs #2623 . [t:2623]
...
{{{
svn merge -r 20348:20378 https://svn.tokutek.com/tokudb/toku/tokudb.2623
}}}
.
git-svn-id: file:///svn/toku/tokudb@20379 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:13 -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
c20a422a93
Reserve memory. Refs #2613 . [t:2613].
...
git-svn-id: file:///svn/toku/tokudb@20241 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:12 -04:00
Rich Prohaska
3bd180d120
move the brtloader's panic fields. closes[t:2611]
...
git-svn-id: file:///svn/toku/tokudb@20217 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:11 -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
dbd2d1b43b
use toku_pthread_mutex_t closes[t:2605] #2605
...
git-svn-id: file:///svn/toku/tokudb@20182 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
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
bb7d5414f2
shutdown the extractor in loader abort. closes[t:2586] #2586
...
git-svn-id: file:///svn/toku/tokudb@20013 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:10 -04:00
Yoni Fogel
d91de8331a
[t:2499] Windows port.
...
*pthread* -> *toku_pthread*
Printf format issues
Including toku_portability and toku_os before everything else
git-svn-id: file:///svn/toku/tokudb@19938 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
Yoni Fogel
667e46d60c
closes[t:2483] Fix recovery bug in loader.
...
checkpoint_lsn written to headers made by loader are now the fsynced 'load' log entry's lsn instead of MAX_UINT64
git-svn-id: file:///svn/toku/tokudb@19136 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:05 -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
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
b3f5306b41
[t:2249] Merge #2249 to main.
...
'load' entry and rollback/recovery,
single filename for brtloader and rest of brt
test-fsync
git-svn-id: file:///svn/toku/tokudb@18617 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:03 -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