Commit graph

169 commits

Author SHA1 Message Date
Barry Perlman
036c8d6b54 [t:3236] [t:3238] Merge tokudb.3236+3238 to main.
git-svn-id: file:///svn/toku/tokudb@28070 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:36 -04:00
Rich Prohaska
6131fab3c3 #3185 merge from the tokudb.3185 branch to main refs[t:3185]
git-svn-id: file:///svn/toku/tokudb@27723 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:35 -04:00
Zardosht Kasheff
7d83e7a751 [t:3166], add flag for db->open to say you are creating a hot db
git-svn-id: file:///svn/toku/tokudb@27078 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:34 -04:00
Bradley C. Kuszmaul
abd5212bcf Merge r26784 into the main line.
Changes include patches to
 * Handle gcc 4.4.1's foibles.
 * Instrument {{{toku_os_pread}}}
 * Release the lock during I/Os for queries (#3039)
 * Simplification of the ydb lock (no more backoff)
 * Use {{{DB_TXN_NOSYNC}} for several tests (which speeds them up).
 * Set the redzone to zero for several tests  (so they can run on machines with little free space). (#3111)
 * Add  helgrind and valgrind suppressions to some tests.
 * Add dollar-id-dollar to several files.
 * Declare the schedule status values to be volatile.
 * Add a method to the toku {{{RWLOCK}}} to effectively grab the read lock and then release it quickly.  (With only one condition variable acquisition.)
Fixes #3039. close[t:3039]
Refs #3111,   #3112,   #3119,   #3125,   #3126,   #3128,   #3131,   #3133,   #3142,   #3152.
   [t:3111] [t:3112] [t:3119] [t:3125] [t:3126] [t:3128] [t:3131] [t:3133] [t:3142] [t:3152].


git-svn-id: file:///svn/toku/tokudb@26785 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:34 -04:00
Barry Perlman
8a810eafd8 [t:3130] Add start time of oldest live txn to engine status.
git-svn-id: file:///svn/toku/tokudb@26502 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:33 -04:00
Zardosht Kasheff
702f49e52f [t:3117], merge fractal tree piece to main
git-svn-id: file:///svn/toku/tokudb@26451 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:33 -04:00
Barry Perlman
37f0a697b3 [t:3034] Update engine status for new functionality.
git-svn-id: file:///svn/toku/tokudb@26444 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:33 -04:00
Barry Perlman
678912ae5f [t:3028] Suppress engine status on failed assert for tests that expect to fail.
git-svn-id: file:///svn/toku/tokudb@25860 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:31 -04:00
Rich Prohaska
363e82ee74 #3045 merge update_multiple bug fixes to main refs[t:3045]
git-svn-id: file:///svn/toku/tokudb@25722 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:30 -04:00
Rich Prohaska
71827f7710 #3011 fix the generate_row_for_del definition refs[t:3011]
git-svn-id: file:///svn/toku/tokudb@25650 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:30 -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
70228bb313 [t:3034] Add status info for indexer.
git-svn-id: file:///svn/toku/tokudb@25599 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:29 -04:00
Dave Wells
f31a90e9e9 merge indexer to main refs #2843 [t:2843]
git-svn-id: file:///svn/toku/tokudb@25593 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:29 -04:00
Barry Perlman
444f563d49 [t:3034] Add engine status counters for *multiple operations.
git-svn-id: file:///svn/toku/tokudb@25503 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:26 -04:00
Barry Perlman
32a99b2b02 [t:3033] Add panic information to engine status. If env or logger is panicked, say so and say why.
git-svn-id: file:///svn/toku/tokudb@25478 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:26 -04:00
Zardosht Kasheff
a0994a1793 [t:3015], merge update_multiple changes to main
git-svn-id: file:///svn/toku/tokudb@25473 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:26 -04:00
Barry Perlman
0a22812e83 [t:2905] Add upgrade info and environment creation timestamp to engine status.
git-svn-id: file:///svn/toku/tokudb@25400 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:26 -04:00
Rich Prohaska
fcfef3e8f6 #3010,#3023 merge *multiple changes to main, i mean it this time refs[t:3010] refs[t:3023]
git-svn-id: file:///svn/toku/tokudb@25308 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:26 -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
7606a0eb32 #2953 merge update_multiple to main refs[t:2953]
git-svn-id: file:///svn/toku/tokudb@25124 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:24 -04:00
Zardosht Kasheff
ef960b35eb [t:2952], merge db.h changes
git-svn-id: file:///svn/toku/tokudb@24962 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:24 -04:00
Bradley C. Kuszmaul
70eb6ebabe Close #2945 (get rid of {{{db->set_bt_compare}}} in favor of {{{env->set_default_bt_compare}}}).
Closes #2945.  close[t:2945]
{{{
svn merge -r 24888:24894 https://svn.tokutek.com/tokudb/toku/tokudb.2945
}}}
.


git-svn-id: file:///svn/toku/tokudb@24931 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:24 -04:00
Zardosht Kasheff
17eccfed9b [t:2935], merge to main
git-svn-id: file:///svn/toku/tokudb@24885 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
Yoni Fogel
7e247e3647 [t:2808] Merge 2808 onto main, remove dev and merge branches
git-svn-id: file:///svn/toku/tokudb@23201 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:22 -04:00
Bradley C. Kuszmaul
1bfd207e32 Merge the fixes for #2862, #2861, and #2269 onto main. Fixes #2269, #2861, #2862. close[t:2269] close[t:2861] close[t:2862]
{{{
svn merge -r 23006:23042 https://svn.tokutek.com/tokudb/toku/tokudb.2862b
}}}
.


git-svn-id: file:///svn/toku/tokudb@23046 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:21 -04:00
Bradley C. Kuszmaul
684da3b6ba Merge changes to remove heaviside and straddle from the ydb layer. Fixes #2865. [t:2865].
{{{
svn merge -c22808 https://svn.tokutek.com/tokudb/toku/tokudb.2861
}}}
.


git-svn-id: file:///svn/toku/tokudb@22809 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
Barry Perlman
39670ab94b Allow logger status with no logger.
git-svn-id: file:///svn/toku/tokudb@20495 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:15 -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
Barry Perlman
2108cc42c6 Closes [t:2624] Added toku_os_close() which retries on EINTR. Closes [t:2621] Added toku_os_open(), toku_os_fopen(), toku_os_fdopen(), toku_os_fclose() and related override hooks db_env_set_func_open(), db_env_set_func_fopen(), db_env_set_func_fdopen(), db_env_set_func_fclose(). Modified test program loader-cleanup-test to use new hooks to inject synthetic errors. Marked some error cases in brtloader.c. with ###.
git-svn-id: file:///svn/toku/tokudb@20364 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:13 -04:00
Barry Perlman
061de97e14 Closes [t:2612] Make separate override functions for use by toku_os_write(), toku_os_full_write(), toku_os_pwrite(), and toku_os_full_pwrite(). Modify src/tests/diskfull.c to use new override functions.
git-svn-id: file:///svn/toku/tokudb@20220 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:11 -04:00
Barry Perlman
1dcdd9e63b [t:2499] Allow test program to set loader's scale_factor. Improve loader-cleanup-test to exercise with different combinations of size_factor, ENOSPC from toku_os_write(), and abort_on_poll. Command line options are used to exercise known bugs.
git-svn-id: file:///svn/toku/tokudb@20109 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:11 -04:00
Barry Perlman
ae050bf956 [t:2504] Improve engine status.
git-svn-id: file:///svn/toku/tokudb@20077 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:11 -04:00
Yoni Fogel
034da281ee [t:2499]Added TOKUDB_CANCELED error code for use in canceling during poll function of loader.
git-svn-id: file:///svn/toku/tokudb@19950 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:10 -04:00
Barry Perlman
0fc32fb911 [t:2449] Export test function (override loader's fwrite) via env. Fix bug in brtloader's handling of error from overridden fwrite().
Fix bug in ydb's handling of ephemeral loader when unable to write to disk.
Improve loader-cleanup-test.

git-svn-id: file:///svn/toku/tokudb@19825 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:08 -04:00
Barry Perlman
c4ca0a7256 [t:2504] Added range lock escalation success/failure counts to engine status.
git-svn-id: file:///svn/toku/tokudb@19267 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:06 -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
Zardosht Kasheff
a87006b10c [t:2494], merge read committed to main
git-svn-id: file:///svn/toku/tokudb@19073 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:05 -04:00
Barry Perlman
13c324ed06 Merge from 3.1.0 using following commands:
> svn merge --accept=postpone -r18405:HEAD https://svn.tokutek.com/tokudb/mysql.branches/3.0.5/tokudb
> svn merge --accept=postpone -r18484:HEAD https://svn.tokutek.com/tokudb/mysql.branches/3.1.0/tokudb
> svn merge --accept=postpone -c18403 https://svn.tokutek.com/tokudb/mysql.branches/3.0.5/tokudb
> all executed inside directory tokudb/toku/tokudb

git-svn-id: file:///svn/toku/tokudb@18877 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
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
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
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
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
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