Bradley C. Kuszmaul
b18544282e
refs[t:4697] Merge xa to main. {{{svn merge -r41628:41661 ../tokudb.4697 }}} Refs #4697 .
...
git-svn-id: file:///svn/toku/tokudb@41662 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-17 00:00:17 -04:00
Zardosht Kasheff
6f1691684d
[t:4541], merge new fix to main
...
git-svn-id: file:///svn/toku/tokudb@41583 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-17 00:00:15 -04:00
John Esmet
0d32c57b9f
close[t:4574] merging 4574 to main. fixes the hcad deadlock found by Tim's stress test, which adds and drops indexes concurrent with queries and insertions. transactions no longer keep trollback nodes pinned after an operation, but instead always unpin them.
...
this merge also introduces a lot of improvements to our rollback code, in terms of clarity and consistency. to that end, variable names and function names were improved, as well as more documentation of the rollback logic in rollback.h and log-internal.h
roll.h is removed because it is a dead file.
git-svn-id: file:///svn/toku/tokudb@41576 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-17 00:00:15 -04:00
Bradley C. Kuszmaul
7ad7bb0611
close[t:4298] Merge from 4298j: {{{svn merge -c41355 ../tokudb.4298i}}}. Closes #4298 .
...
git-svn-id: file:///svn/toku/tokudb@41357 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
Bradley C. Kuszmaul
866597e6d1
[t:3586] [t:3604] Merge icc onto main. Refs #3586 , #3604 .
...
git-svn-id: file:///svn/toku/tokudb@32232 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:40 -04:00
Zardosht Kasheff
a927dc1fc9
[t:3347], merge fractal tree piece of HCAD to main
...
git-svn-id: file:///svn/toku/tokudb@29146 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:37 -04:00
Bradley C. Kuszmaul
80089f63a4
#3099 Merge 3099 onto the main line.
...
{{{
svn merge -r28775:29048 https://svn.tokutek.com/tokudb/toku/tokudb.3099
}}}
git-svn-id: file:///svn/toku/tokudb@29055 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:37 -04:00
Barry Perlman
ecca7928f3
[t:3175] Put nodesize in fcreate recovery log entry, remove fcreate2 recovery log entry.
...
git-svn-id: file:///svn/toku/tokudb@27081 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:34 -04:00
Rich Prohaska
cf3bbe92df
#3147 merge tokudb block size changes to main refs[t:3147]
...
git-svn-id: file:///svn/toku/tokudb@26780 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:34 -04:00
Rich Prohaska
353b893861
#3054 fix closes[t:3054]
...
git-svn-id: file:///svn/toku/tokudb@26088 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:32 -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
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
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
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
8c34dda452
closes[t:2440] Merge #2440 to main.
...
closes[t:2512] merge #2512 to main
Delete dev branch
git-svn-id: file:///svn/toku/tokudb@19439 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
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
Dave Wells
10b1d60dad
fix [t:2426], add test
...
git-svn-id: file:///svn/toku/tokudb@18290 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:02 -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
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
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
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
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
508adfd5a4
replace the timestamp and shutdown log entry with a comment log entry closes[t:2192]
...
git-svn-id: file:///svn/toku/tokudb@15946 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:58:53 -04:00
Yoni Fogel
86a917a99d
Closes #2160 closes[t:2160] Implement forward and backward recovery for fdelete.
...
fopen forward recovery: file missing (ENOENT) is not considered an error.
git-svn-id: file:///svn/toku/tokudb.2037b@15693 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:58:06 -04:00
Yoni Fogel
a522ceda16
Closes #2153 refs[t:2153] fopen logged only once (unless closed and reopened). Removed logger from cachefile_close,
...
removed txnid from logging of fopen.
git-svn-id: file:///svn/toku/tokudb.2037b@15691 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:58:06 -04:00
Yoni Fogel
580f5caafb
Addresses #2037 refs[t:2037] Merged #2037 back into main
...
git-svn-id: file:///svn/toku/tokudb@15562 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:58:04 -04:00
Rich Prohaska
22b6cb163e
merge 1967.mtm2 to main refs[t:1967]
...
git-svn-id: file:///svn/toku/tokudb@15205 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:58:04 -04:00
Yoni Fogel
2fefaf6428
Closes #2003 closes [t:2003] add 'table lock on empty' log entry, and recovery logic for it.
...
git-svn-id: file:///svn/toku/tokudb@14489 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:58:01 -04:00
Rich Prohaska
8e214a919d
filter some operations during recovery close[t:1993]
...
git-svn-id: file:///svn/toku/tokudb@14421 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:58:01 -04:00
Yoni Fogel
535754ec12
Closes #1973 closes[t:1973] Log entry for DELETE_ANY no longer wastes memory on 'value'
...
git-svn-id: file:///svn/toku/tokudb@14292 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:58:00 -04:00
Rich Prohaska
1a7354b892
merge recovery key compare function to main. close[t:1966]
...
git-svn-id: file:///svn/toku/tokudb@14218 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:59 -04:00
Rich Prohaska
26c68b80d9
add treeflags to the fcreate log entry close[t:1965]
...
git-svn-id: file:///svn/toku/tokudb@14200 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:59 -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
Rich Prohaska
ceb7a3036e
merge -c 14032 from tokudb.1835.recovery to main close[t:1831]
...
git-svn-id: file:///svn/toku/tokudb@14033 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:58 -04:00
Rich Prohaska
584c66dca2
add a timestamp to the checkpoint begin and end log entries close[t:1855]
...
git-svn-id: file:///svn/toku/tokudb@13992 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:58 -04:00
Dave Wells
e57b5d0110
merge second round of changes to support logcursors into main, refs[t:1857]
...
git-svn-id: file:///svn/toku/tokudb@13515 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:56 -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
Rich Prohaska
363e371758
merge the enqrootentry and shutdown log entry changes to main. addresses #1847
...
git-svn-id: file:///svn/toku/tokudb@13453 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:56 -04:00
Rich Prohaska
d9b5e99a08
add the timestamp log entry. addresses #1855
...
git-svn-id: file:///svn/toku/tokudb@13284 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:55 -04:00
Bradley C. Kuszmaul
719786c001
Fixes #1848 (add parent txn to xstillopen).
...
git-svn-id: file:///svn/toku/tokudb@13131 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:55 -04:00
Bradley C. Kuszmaul
43b8c94f9c
Fixes #1846 .
...
git-svn-id: file:///svn/toku/tokudb@13130 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:55 -04:00
Rich Prohaska
289551902f
1st cut at verifying the lsn sequence. addresses #1837
...
git-svn-id: file:///svn/toku/tokudb@13093 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:55 -04:00
Bradley C. Kuszmaul
6c211758b1
Merge 1767 into main line (including 1768 and 1627 fixes) and delete 1767 branch. Fixes #1767 . Refs #1768 , 1627.
...
git-svn-id: file:///svn/toku/tokudb@12140 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:53 -04:00