Commit graph

206 commits

Author SHA1 Message Date
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
Barry Perlman
833583c7a6 [t:3654] #3654 Create new BRT_STATUS to collect info on brt behavior.
git-svn-id: file:///svn/toku/tokudb@32971 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:44 -04:00
Zardosht Kasheff
4ed966c1ca [t:3740], fix bug
git-svn-id: file:///svn/toku/tokudb@32939 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:44 -04:00
Zardosht Kasheff
d9f9fc5672 [t:3643], rename a function, add comments
git-svn-id: file:///svn/toku/tokudb@32910 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:44 -04:00
Zardosht Kasheff
108a698022 [t:3643], add comments to structs in brt-internal.h
git-svn-id: file:///svn/toku/tokudb@32908 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:44 -04:00
Zardosht Kasheff
3f98cbcc93 [t:3734], move brt->curr_dsn to brt_header
git-svn-id: file:///svn/toku/tokudb@32890 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:43 -04:00
Zardosht Kasheff
b9623f06fa [t:3724], [t:3717], [t:3727], merge fixes to main
git-svn-id: file:///svn/toku/tokudb@32829 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:43 -04:00
Zardosht Kasheff
d5505938e9 [t:3703], merge to main
git-svn-id: file:///svn/toku/tokudb@32737 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:43 -04:00
Zardosht Kasheff
8927a3e718 [t:3609], fix race condition by having shortcut cursors grab read locks on PAIRs, range queries will be slower
git-svn-id: file:///svn/toku/tokudb@32713 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:42 -04:00
Bradley C. Kuszmaul
2379d061e9 [t:3564] Merge in barry's stuff to the main line. {{{svn merge -r32637:32693 ../tokudb.3564b+3312}}} Refs #3564.
git-svn-id: file:///svn/toku/tokudb@32694 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:42 -04:00
Leif Walsh
0a1b4c8a69 [t:3148] comments, whitespace, typecasting, macro fixes
git-svn-id: file:///svn/toku/tokudb@32672 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
Zardosht Kasheff
b90f894d14 [t:3651], merge to main
git-svn-id: file:///svn/toku/tokudb@32620 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:41 -04:00
Zardosht Kasheff
219331cc02 [t:3627], merge last of milestone 3 to main
git-svn-id: file:///svn/toku/tokudb@32565 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:41 -04:00
Zardosht Kasheff
4a88cb22b4 [t:3644], merge cachetable changes for #3627 from tokudb.3627 to main
git-svn-id: file:///svn/toku/tokudb@32519 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:41 -04:00
Zardosht Kasheff
cd757a485d [t:3641], merge refactoring of BRTNODE to main from tokudb.3627
git-svn-id: file:///svn/toku/tokudb@32481 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:41 -04:00
Bradley C. Kuszmaul
885c83300b [t:3604] Merge everything from the tokudb.3312c+3524+msn branch. Refs #3604.
git-svn-id: file:///svn/toku/tokudb@32294 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:40 -04:00
Bradley C. Kuszmaul
65ba19377c [t:3604] Merge r29923 from tokudb.3312c+3524+msn. Refs #3604.
git-svn-id: file:///svn/toku/tokudb@32283 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:40 -04:00
Barry Perlman
5feab17959 [t:3374] #Closes #3374 Add status counter for setting descriptor.
git-svn-id: file:///svn/toku/tokudb@29408 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:38 -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
7e7e93103c #3316 #3318 #3339
* #3316 quicklz is now part of the brt layer (but it won't be enabled for compression in 5.0.2, #3339)
 * #3318 (add valgrind suppresseions)
{{{
svn merge -r28917:29103 https://svn.tokutek.com/tokudb/toku/tokudb.3316
}}}
.
[t:3316] [t:3318] [t:3339]


git-svn-id: file:///svn/toku/tokudb@29107 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
Rich Prohaska
fdd5f20e8c #3269 define TOKUDB_REVISION in CPPFLAGS refs[t:3269]
git-svn-id: file:///svn/toku/tokudb@28217 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:36 -04:00
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
Rich Prohaska
b2171df852 #3211 #3185 test brt verify and repair refs[t:3211] refs[t:3185]
git-svn-id: file:///svn/toku/tokudb@27642 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:35 -04:00
Barry Perlman
fe5882cc90 [t:3113] Fix symbol name in function signatures.
git-svn-id: file:///svn/toku/tokudb@27502 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:35 -04:00
Bradley C. Kuszmaul
bab85ba037 Fixes #3207. Don't use assert() in verify_brt_node. [t:3207]
git-svn-id: file:///svn/toku/tokudb@27468 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:35 -04:00
Barry Perlman
83e823e2e6 [t:3113] During recovery, do not use latest version of rollback log file,
but use latest version that was checkpointed at or before the last complete checkpoint.

git-svn-id: file:///svn/toku/tokudb@27338 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:35 -04:00
Bradley C. Kuszmaul
703dbc4784 Candidate fix for #3173. Refs #3173. [t:3173]
git-svn-id: file:///svn/toku/tokudb@27114 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:34 -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
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
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
Bradley C. Kuszmaul
bb5579a145 Merge 2948 changes to main: Start putting upsert into brt layer (Refs #2948). Also add unused attributes (Closes #2950). [t:2948] close[t:2950]
{{{
svn merge -c 24081 https://svn.tokutek.com/tokudb/toku/tokudb.2948
}}}
.


git-svn-id: file:///svn/toku/tokudb@24083 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
Bradley C. Kuszmaul
06d1c0e1eb Get rid of {{{TAGMALLOC}}}. Fixes #2912. close[t:2912]
git-svn-id: file:///svn/toku/tokudb@23493 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
Rich Prohaska
8a95226d84 #2717 refs[t:2717] fix the brtloader subtree estimates
git-svn-id: file:///svn/toku/tokudb@21040 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:19 -04:00
Yoni Fogel
a9c554b353 [t:2641] Merge DB_READCOMMITTED bugfix (r20839) to main.
git-svn-id: file:///svn/toku/tokudb@20863 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:18 -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
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
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
4c7d34d0f3 [t:2449] Bugfix in cachetable pairs for rollback log nodes.
We were using TOKUTXNs as the extraarg, but the TOKUTXN struct could be freed while the pair is still in memory.
We only used the TOKUTXN to get the cachefile and header.  We already are given the cachefile, so we
made the extraargs be the header

git-svn-id: file:///svn/toku/tokudb@19238 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
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
Yoni Fogel
c6510b33fe closes[t:2463] Merge #2463 changes (r18552,18555) to main to fix race condition
with CACHEFILE->fd

git-svn-id: file:///svn/toku/tokudb@18612 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:02 -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
76340644aa [t:2350] Change BRT_LAYOUT_VERSION 11->12 to support new brt message BRT_INSERT_NO_OVERWRITE
git-svn-id: file:///svn/toku/tokudb@17701 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:00 -04:00