Dave Wells
c9e32bbe03
add toku_brt_loader_abort, fix up error handling in toku_loader_*
...
git-svn-id: file:///svn/toku/tokudb@18804 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
eb9ad2a896
Merge in the 2462 branch that has a rudimentary implementation of polling. Refs #2462 . [t:2462]
...
{{{
svn merge -c 18768 https://svn.tokutek.com/tokudb/toku/tokudb.2462
}}}
.
git-svn-id: file:///svn/toku/tokudb@18771 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
9fa915c7f9
[t:2436] Windows port of #2436
...
git-svn-id: file:///svn/toku/tokudb@18737 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:03 -04:00
Bradley C. Kuszmaul
8e833273da
Merge in all the changes from 18354 to 18555 from 3.1.0. The only real change was in the engine status instrumentation. Refs #2467 . [t:2467].
...
{{{
svn merge -r18354:18555 https://svn.tokutek.com/tokudb/mysql.branches/3.1.0/tokudb/
}}}
.
git-svn-id: file:///svn/toku/tokudb@18657 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:03 -04:00
Bradley C. Kuszmaul
a2f83cd13b
get_tdiff shouldn't be in export.map. [t:2434] Refs #2434 .
...
git-svn-id: file:///svn/toku/tokudb@18652 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:03 -04:00
Bradley C. Kuszmaul
e21e3b6328
Merge r18085. No actual changes. Refs #2467 . [t:2467].
...
git-svn-id: file:///svn/toku/tokudb@18649 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:03 -04:00
Bradley C. Kuszmaul
e8af332d42
Merge r18357 to put the logger statistics. Refs #2385 . [t:2385].
...
{{{
svn merge -c18357 https://svn.tokutek.com/tokudb/mysql.branches/3.1.0/tokudb/
}}}
.
git-svn-id: file:///svn/toku/tokudb@18640 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:03 -04:00
Bradley C. Kuszmaul
9bac0b073a
move get_tdiff to test.h. Refs #2434 . [t:2434]
...
{{{
svn merge -c18257 https://svn.tokutek.com/tokudb/mysql.branches/3.1.0/tokudb/
}}}
.
git-svn-id: file:///svn/toku/tokudb@18638 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:03 -04:00
Bradley C. Kuszmaul
b4d376d908
Merge all the changes from tokudb.2370. We hope to deprecate 2370.
...
{{{
svn merge -r17811:18633 https://svn.tokutek.com/tokudb/toku/tokudb.2370
}}}
Refs #2370 . [t:2370]
git-svn-id: file:///svn/toku/tokudb@18637 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
fe3420136d
Make the group commit test compile. Refs #2228 . [t:2228].
...
git-svn-id: file:///svn/toku/tokudb@18401 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:02 -04:00
Rich Prohaska
b55e48b90a
merge -c 18380 from 3.0.5 to main refs[t:2436]
...
git-svn-id: file:///svn/toku/tokudb@18382 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:02 -04:00
Dave Wells
d988daee39
add powerfail test
...
git-svn-id: file:///svn/toku/tokudb@18322 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:02 -04:00
Bradley C. Kuszmaul
296fca6bed
Contrary to r18222, the new group commit code was not on the main truck.
...
{{{
svn merge -r17893:18056 https://svn.tokutek.com/tokudb/toku/tokudb.2370c
}}}
Refs #2370 , #2385 . [t:2370] [t:2385].
git-svn-id: file:///svn/toku/tokudb@18259 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:02 -04:00
Yoni Fogel
d968f27fc4
[t:2216] Fix lock tree tests (not allowed to use dictionary id 0 anymore)
...
git-svn-id: file:///svn/toku/tokudb@18199 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:01 -04:00
Yoni Fogel
6baa2eb69c
[t:2216] Removed double export of toku_do_assert
...
git-svn-id: file:///svn/toku/tokudb@18190 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:01 -04:00
Bradley C. Kuszmaul
7176886212
Change main's second argument to {{{char *const*argv}}}. Fixes #2228 . close[t:2228]
...
git-svn-id: file:///svn/toku/tokudb@18184 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
Yoni Fogel
83f0f54ea4
closes[t:2408] Merge branch #2408 back to main. Delete dev branch.
...
git-svn-id: file:///svn/toku/tokudb@18163 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:01 -04:00
Yoni Fogel
14d67581f0
closes[t:2391] Merge 2391 branch to main
...
git-svn-id: file:///svn/toku/tokudb@18153 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:01 -04:00
Yoni Fogel
0bdd64ae5f
[t:2418] Fixed memory corruption error for using "" as env dir found by coverity
...
git-svn-id: file:///svn/toku/tokudb@18138 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:01 -04:00
Yoni Fogel
07b085dc65
[t:2418] Fixed missing va_end in construct_full_name found by coverity
...
git-svn-id: file:///svn/toku/tokudb@18137 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:01 -04:00
Yoni Fogel
1a3cc4bfa2
[t:2418] Fixed double-free in lock tree found by coverity
...
git-svn-id: file:///svn/toku/tokudb@18136 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:01 -04:00
Bradley C. Kuszmaul
f62b35b745
Merge the backtrace onto the mainline. Refs #2387 . [t:2387].
...
{{{
svn merge -r 18063:18082 https://svn.tokutek.com/tokudb/toku/tokudb.2387
}}}
git-svn-id: file:///svn/toku/tokudb@18084 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:01 -04:00
Yoni Fogel
adf3e7ae95
[t:2350] Added DB_NOOVERWRITE_NO_ERROR flag for DB->put.
...
Will return EINVAL for ENV->put_multiple.
Has same semantics as INSERT IGNORE in mysql.
(equivalently) Has same semantics as DB_NOOVERWRITE except that it returns 0 if there is a duplicate key error
instead of DB_KEYEXISTS
git-svn-id: file:///svn/toku/tokudb@17682 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
Yoni Fogel
ef06c33f34
[t:2216] loader src tests support -q and -v (ignore, but don't fail with them)
...
git-svn-id: file:///svn/toku/tokudb@17590 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:58:59 -04:00
Dave Wells
f408fad151
fix make dependencies by straightening out includes
...
git-svn-id: file:///svn/toku/tokudb@17328 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
838e0e5b1c
[t:2318] Merge #2318 back to main up to r17166
...
git-svn-id: file:///svn/toku/tokudb@17178 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:58:59 -04:00
Bradley C. Kuszmaul
f27cc8fa09
Fixes #2323 by getting rid of gcc warnings. closes[t:2323]
...
git-svn-id: file:///svn/toku/tokudb@17147 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:58:59 -04:00
Yoni Fogel
e944ee50a6
[t:2312] All paths to write/pwrite go through portability layer.
...
full_os_(p)write check for partial reads, and fixable errors.
git-svn-id: file:///svn/toku/tokudb@17078 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:58:58 -04:00
Yoni Fogel
1726f9927b
closes[t:2310] Update insertion(deletion) counter for env_put(del)_multiple
...
git-svn-id: file:///svn/toku/tokudb@17024 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:58:58 -04:00
Yoni Fogel
4f52983666
[t:2309] linux fix to windows port (export toku_dup2)
...
svn:ignore
git-svn-id: file:///svn/toku/tokudb@17021 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:58:58 -04:00
Yoni Fogel
a0d3657e23
closes[t:2309] [t:2308] Deprecate dup2, _dup2 (wrap with toku_dup2), and replace /dev/null with DEV_NULL_FILE
...
Fixes some recovery tests in windows
git-svn-id: file:///svn/toku/tokudb@17020 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:58:58 -04:00
Yoni Fogel
40bd8113eb
[t:2308] Fix several recovery tests that used void* arithmetic
...
git-svn-id: file:///svn/toku/tokudb@17016 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:58:58 -04:00
Yoni Fogel
f1086d049d
[t:2257] Switch atomic instructions to decrement, increment if they only modify by 1,
...
remove some bookkkeeping in windows that is slow and not completely necessary.
git-svn-id: file:///svn/toku/tokudb@16998 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:58:58 -04:00
Yoni Fogel
836889d0b2
[t:2257] Src tests and newbrt tests now verify init and destroy function succeed
...
git-svn-id: file:///svn/toku/tokudb@16996 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:58:58 -04:00
Barry Perlman
fb351891c5
Add comment about checkpoint callbacks, used for testing purposes only.
...
git-svn-id: file:///svn/toku/tokudb@16992 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:58:58 -04:00
Yoni Fogel
c248a0e5bb
Addresses #2249 [t:2249] Fix bug in recover-put-multiple-fdelete-all.c
...
used db1->close(db2... (mismatched parameters)
git-svn-id: file:///svn/toku/tokudb@16978 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:58:58 -04:00
Rich Prohaska
0b2ee07869
dont run recover-split-checkpoint on bdb refs[t:2294]
...
git-svn-id: file:///svn/toku/tokudb@16965 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:58:58 -04:00
Dave Wells
c7c9c7aa22
merge changes from tokudb.2294.logtrim
...
git-svn-id: file:///svn/toku/tokudb@16947 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:58:58 -04:00
Yoni Fogel
9557f27e82
Addresses #2249 [t:2249] Merge DB_ENV->put_multiple branch back onto main.
...
Fixed some makefile issues, ported recovery tests to use toku_hard_crash_on_purpose(), fixed db-benchmark-test to use default name
for 0th db
git-svn-id: file:///svn/toku/tokudb@16936 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:58:58 -04:00
Bradley C. Kuszmaul
567fe59588
Speed up test_rand_insert, it was gratuitously slow.
...
git-svn-id: file:///svn/toku/tokudb@16862 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:58:58 -04:00
Bradley C. Kuszmaul
528949b699
Fixes #2292 . closes[t:2292]
...
git-svn-id: file:///svn/toku/tokudb@16859 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:58:57 -04:00
Bradley C. Kuszmaul
91dd0fd281
abortrecover gets magic brackets. Refs #2297 . [t:2287]
...
git-svn-id: file:///svn/toku/tokudb@16856 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:58:57 -04:00
Bradley C. Kuszmaul
fb923aad34
diskfull.tdbrun now works. Fixes #2290 . close[t:2290]
...
git-svn-id: file:///svn/toku/tokudb@16854 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:58:57 -04:00