Commit graph

213 commits

Author SHA1 Message Date
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
Rich Prohaska
b4281f36b4 #2946 merge le-cursor's to main
git-svn-id: file:///svn/toku/tokudb@24142 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:23 -04:00
Rich Prohaska
cb9539d657 #2938 refs[t:2938] get gcov working with newbrt (again)
git-svn-id: file:///svn/toku/tokudb@23927 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:23 -04:00
Rich Prohaska
261715cf6e #2891 refs[t:2891] fix the newbrt cilk build
git-svn-id: file:///svn/toku/tokudb@23926 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:23 -04:00
Bradley C. Kuszmaul
65926c2164 Make the dynamic library work with COMBINE=0 mode also. (Since on Ubunto 9.10 with gcc 4.4.1, -combine doesn't work. Refs #2848. [t:2848]
git-svn-id: file:///svn/toku/tokudb@22719 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:21 -04:00
Bradley C. Kuszmaul
52714401a0 Use dynamic libraries for newbrt tests. Fix #2848. close[t:2848]
git-svn-id: file:///svn/toku/tokudb@22718 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:21 -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
Yoni Fogel
7eb67d825b Windows port: ENODATA->TOKUDB_NO_DATA, disable unreachable code warning, disabled trace_mem for windows
git-svn-id: file:///svn/toku/tokudb@20400 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:13 -04:00
Bradley C. Kuszmaul
fe23612513 Merge in changes. Refs #2608, #2609, and #2610. [t:2608] [t:2609] [t:2610]
{{{
svn merge -r 20187:20196 https://svn.tokutek.com/tokudb/toku/tokudb.2571
}}}
.


git-svn-id: file:///svn/toku/tokudb@20197 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:11 -04:00
Bradley C. Kuszmaul
042be43d29 Merge in the double buffered io abstraction. It's not in the loader yet. Refs #2571. [t:2571]
{{{
svn merge -r 20089:20155 https://svn.tokutek.com/tokudb/toku/tokudb.2571
}}}
.


git-svn-id: file:///svn/toku/tokudb@20156 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
486decfd7f put the loader error callback in its own source file so we can reduce dependancies on cilk refs[t:2576]
git-svn-id: file:///svn/toku/tokudb@19931 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
2657367d80 makefile improvements
git-svn-id: file:///svn/toku/tokudb@19554 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:07 -04:00
Yoni Fogel
1bf7a7a403 closes[t:2449] [t:2484] Merge #2449 changes to main.
Rollback logs are now checkpointed.  There are no rolltmp files.


git-svn-id: file:///svn/toku/tokudb@19167 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:05 -04:00
Rich Prohaska
48414ab76b create multiple sub blocks per leaf in the loader. merge -r 18961:head ptq branch to main refs[t:2351]
git-svn-id: file:///svn/toku/tokudb@18992 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:05 -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
Yoni Fogel
f07af9de73 Added make local in newbrt to skip building tests
git-svn-id: file:///svn/toku/tokudb@17680 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:00 -04:00
Yoni Fogel
c6fcce22ce [t:2328] Merge 2328 branch onto main,
some minimal porting

git-svn-id: file:///svn/toku/tokudb@17597 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:58:59 -04:00
Dave Wells
a146155e4f merge DB_LOADER->abort changes from tokudb.2216a branch
git-svn-id: file:///svn/toku/tokudb@17320 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:58:59 -04:00
Bradley C. Kuszmaul
56d2c6fdf8 Merge 2216 onto main (from 16706-17293) as
{{{
svn merge -r16706:17293 https://svn.tokutek.com/tokudb/toku/tokudb.2216
}}}

Refs #2216. [t:2216]


git-svn-id: file:///svn/toku/tokudb@17299 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:58:59 -04:00
Yoni Fogel
324c278a31 Addresses #2257 refs[t:2257] Merge windows port back into main.
git-svn-id: file:///svn/toku/tokudb@16673 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:58:56 -04:00
Rich Prohaska
c521ee3a91 put the log print functions in log_print.c refs[t:2193]
git-svn-id: file:///svn/toku/tokudb@16447 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:58:56 -04:00
Rich Prohaska
6c30f3916d remove the fifo_msg cruft from the newbrt refs[t:2189]
git-svn-id: file:///svn/toku/tokudb@15962 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:58:54 -04:00
Rich Prohaska
c9ed5c989f remove varray closes[t:2186]
git-svn-id: file:///svn/toku/tokudb@15923 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:58:53 -04:00
Dave Wells
7e81e8be66 beginnings of logic to trim log files if possible. No actual trimming done yet
git-svn-id: file:///svn/toku/tokudb@14380 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:58:01 -04:00
Rich Prohaska
3ab3cbbfcc some progress on recovery close[t:1835]
git-svn-id: file:///svn/toku/tokudb@14112 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:59 -04:00
Yoni Fogel
110754f57c Addresses #1125 Merged nested transactions from temporary merge branch into main.
Current tests fail (not regressions, they fail as of 13461)
 * {{{x1.tdbrun}}}
 * {{{test_log(2,3,4,5,6,7,8,9,10).recover}}}
 * {{{test-recover(1,2,3).tdbrun}}}
 * {{{test1324.tdbrun}}}
ULE_DEBUG disabled (defined to 0)  Can be re-enabled for test purposes (set to 1).
refs [t:1125]
Merging into the temp branch (tokudb.main_13461+1125)
{{{svn merge --accept=postpone -r 12527:13461 ../tokudb.1125 ./}}}

Merging into main
{{{svn merge --accept=postpone -r13462:13463 ../tokudb.main_13461+1125/ ./}}}


git-svn-id: file:///svn/toku/tokudb@13464 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:56 -04:00
Dave Wells
d6e96be1f0 MERGE tokudb/toku/tokudb/1857 into main, refs [t:1857]
git-svn-id: file:///svn/toku/tokudb@13431 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:55 -04:00
Yoni Fogel
be608a5f70 Fix windows build.
git-svn-id: file:///svn/toku/tokudb@13298 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:55 -04:00
Dave Wells
68df634693 MERGE tokudb.logchanges2 13168:13253 into main
git-svn-id: file:///svn/toku/tokudb@13261 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:55 -04:00
Bradley C. Kuszmaul
6df3b7e6db Fixes #1775 (logformat execv error)
git-svn-id: file:///svn/toku/tokudb@12146 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:53 -04:00
Barry Perlman
df9cd04035 Closes #1741, Addresses #1398 Fix Makefiles to expose BRT_LEVEL_STRADDLE_CALLBACK_LOGIC_NOT_READY
to all files that need it in both src/ and newbrt/ levels.

git-svn-id: file:///svn/toku/tokudb@11701 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:52 -04:00
Barry Perlman
646141a74c Addresses #1736, #1398 When inside straddle_hack callback don't use normal rwlock_read_lock for get_and_pin, but simply increment reader count instead. This prevents deadlock where callback waits for end_checkpoint to release write lock, but while end_checkpoint waits for callback to release read lock.
git-svn-id: file:///svn/toku/tokudb@11658 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:51 -04:00
Bradley C. Kuszmaul
d6ab1513e8 Merge the tokudb.1665 branch into the main line. Fixes #1665.
{{{
svn merge -r 11185:11261 https://svn.tokutek.com/tokudb/toku/tokudb.1665
}}}


git-svn-id: file:///svn/toku/tokudb@11264 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:48 -04:00
Bradley C. Kuszmaul
1a48d75807 Merge in the 1390 fixes, and delete 1390. Fixes #1390.
{{{
svn merge -r10820:HEAD https://svn.tokutek.com/tokudb/toku/tokudb.1390
}}}


git-svn-id: file:///svn/toku/tokudb@11192 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:48 -04:00
Yoni Fogel
8f2b0a7e11 Addresses #1510 Merge of 1510 (so far) back into main
Several fixes are included, particulary db remove after db truncate (with descriptor) does not crash anymore.
svn merge -r 10931:11019 ../tokudb.1510

git-svn-id: file:///svn/toku/tokudb@11020 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:47 -04:00
Bradley C. Kuszmaul
682405a0f6 Fixes #1580. logformat now only runs once.
git-svn-id: file:///svn/toku/tokudb@10417 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:45 -04:00
Yoni Fogel
1e1031f1ce Addresses #1531 fix newbrt/ make checko2 in windows
git-svn-id: file:///svn/toku/tokudb@9961 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:43 -04:00
Yoni Fogel
0f8b5dcf7d add VTUNE=1 option for profiling in windows
git-svn-id: file:///svn/toku/tokudb@9634 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:42 -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
Yoni Fogel
d1aab2ef76 Addresses #1463
Abstracted out the block translation table and the block allocator
into BLOCK_TABLE
All use is done by accessors surrounded by locks.


git-svn-id: file:///svn/toku/tokudb@9360 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:41 -04:00
Yoni Fogel
0207163a80 Addresses #1442
Use MT instead of MD by default for windows.
In windows, newbrt and src tests use static libraries (pre-ipo with optimization, standard without)

git-svn-id: file:///svn/toku/tokudb@9235 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:40 -04:00
Yoni Fogel
f470a45bcf Revert "Addresses #1298"
This reverts commit 5fa57d593d531a7ddc2f59afa4b082da46b00bbf.

git-svn-id: file:///svn/toku/tokudb@9229 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:40 -04:00
Yoni Fogel
566d68bfa5 Addresses #1298
make local (at top level) skips tests

git-svn-id: file:///svn/toku/tokudb@9227 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:40 -04:00
Rich Prohaska
8eaa912f33 merge generalized worker threads from the 1183 branch. addresses #1183
git-svn-id: file:///svn/toku/tokudb@8902 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:38 -04:00
Bradley C. Kuszmaul
2f856f7d29 Candidate fix for #1374 (wrong db.h include file for BDB versions of code.) Addresses #1374.
git-svn-id: file:///svn/toku/tokudb@8667 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:37 -04:00
Bradley C. Kuszmaul
141ef2eaa5 Clean up the MAYBEATSIGN and verbosity stuff. Fixes #1365.
git-svn-id: file:///svn/toku/tokudb.1032b+1343@8573 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:34 -04:00
Bradley C. Kuszmaul
fe0a157971 Cleaned up. Note that some stuff moved into the windows directory with symlinks from linux (since I know that symlinks work in linux, but maybe not in windows.) Addresses #1348.
git-svn-id: file:///svn/toku/tokudb.1032b+1343@8560 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:34 -04:00
Bradley C. Kuszmaul
017d4f8cc3 Separate out the common malloc into newbrt/memory.c, and put the os-specific stuff into windows and linux subdirs. Things are broken. Addresses #1343.
git-svn-id: file:///svn/toku/tokudb.1032b+1343@8559 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:34 -04:00