mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-22 14:54:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
2958 commits 2785 branches 343 tags 1.6 GiB
Commit graph

72 commits

Author SHA1 Message Date
Rich Prohaska
1440b4a3b9 merge -r 18992:head ptq to main refs[t:2351] 
git-svn-id: file:///svn/toku/tokudb@19099 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
Rich Prohaska
c1b0e91b95 new block format with a header checksum and sub block checksums. merge -c 18916:head from 2351.ptq to main refs[t:2351] 
git-svn-id: file:///svn/toku/tokudb@18961 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:05 -04:00
Rich Prohaska
654d3a08f8 fix a windows build problem 
git-svn-id: file:///svn/toku/tokudb@18954 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:05 -04:00
Rich Prohaska
864812ad48 some reorganization of brt serialize. merge -r 18898:head https://svn.tokutek.com/tokudb/toku/tokudb.2351.ptq main refs[t:2351] #2351 
git-svn-id: file:///svn/toku/tokudb@18919 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
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
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
Bradley C. Kuszmaul
4726801d1a Fixes[t:2209] Fixes #2209. 
git-svn-id: file:///svn/toku/tokudb@16032 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:58:54 -04:00
Barry Perlman
c3738f4487 Addresses #2197 refs[t:2197] brtdump: Provide cachefile for brt header. 
git-svn-id: file:///svn/toku/tokudb@15989 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:58:54 -04:00
Yoni Fogel
465065c60c Addresses #1737 refs[t:1737] Mega abort/mega commit messages coded 
These messages are broadcast to an entire dictionary, aborting/committing a particular transaction only.

git-svn-id: file:///svn/toku/tokudb@14571 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:58:02 -04:00
Yoni Fogel
1f72e6db67 Addresses #1936 refs[t:1936] Removed log_lsn/disk_lsn from nodes, added original version and version read from disk 
Backwards compatibility for version 10 upgraded to support change (read lsns into void, set original/read_from_disk versions to 10 on read)

git-svn-id: file:///svn/toku/tokudb@14457 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:58:01 -04:00
Barry Perlman
ee339d03aa Addresses #1987, #1936 refs[t:1987] refs[t:1936] Insert broadcast commit on upgrade from version 10 to 11, record original version in new header field. Also fixed incorrect message type for broadcast commit. 
git-svn-id: file:///svn/toku/tokudb@14430 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:58:01 -04:00
Barry Perlman
0860425ef6 Addresses #1987 refs[t:1987] API and implementation of broadcast commit (all xids) message. 
Cleaned up BRT_CMD vs BRT_MSG, removed logger from query path.

git-svn-id: file:///svn/toku/tokudb@14376 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:58:00 -04:00
Barry Perlman
d69c552f03 Addresses #1987 refs[t:1987] Fully replace (rename) BRT_CMD with BRT_MSG (same struct) for consistency 
git-svn-id: file:///svn/toku/tokudb@14372 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:58:00 -04:00
Yoni Fogel
9197483c86 Addresses #1125 refs[t:1125] brtdump upgraded to support XIDS in messages 
git-svn-id: file:///svn/toku/tokudb@13968 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:58 -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
7ba09091c4 make the interactive help better 
git-svn-id: file:///svn/toku/tokudb@12921 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:54 -04:00
Rich Prohaska
84cf612572 add interactive help to brtdump. closes #1732 
git-svn-id: file:///svn/toku/tokudb@11637 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:51 -04:00
Bradley C. Kuszmaul
17e5214663 Refs #1529. 
git-svn-id: file:///svn/toku/tokudb@11223 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:48 -04:00
Bradley C. Kuszmaul
1ed3f26d65 Add #ident Id info to all the newbrt/*.c and newbrt/*.h files. Refs #1529. 
git-svn-id: file:///svn/toku/tokudb@11221 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:48 -04:00
Yoni Fogel
5c108195c3 Addresses #1603 Root fifo is gone. 
git-svn-id: file:///svn/toku/tokudb@11165 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
Yoni Fogel
dab780fdbd Addresses #1510 Merge tokud.main+1510 back into main 
svn merge --accept=postpone -r 10895:10898 ../tokudb.main+1510
Previously on tokudb.main+1510:
svn merge --accept=postpone -r 10317:10892 ../tokudb.1510

git-svn-id: file:///svn/toku/tokudb@10899 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:47 -04:00
Bradley C. Kuszmaul
da0efde586 Merge in 1591 and fix conflicts. Fixes #1591. 
{{{
svn merge -r10512:10803 https://svn.tokutek.com/tokudb/toku/tokudb.1591
}}}


git-svn-id: file:///svn/toku/tokudb@10804 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:47 -04:00
Rich Prohaska
9d20502817 merge 1489 to main. addresses #1489 
git-svn-id: file:///svn/toku/tokudb@10639 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:46 -04:00
Rich Prohaska
302f13a2a6 merge -r 10283:10284 tokudb.1559 tokudb. closes #1559 
git-svn-id: file:///svn/toku/tokudb@10293 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:44 -04:00
Rich Prohaska
20393fcee5 print the brt node offset and size. closes #1506 
git-svn-id: file:///svn/toku/tokudb@9682 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:42 -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
Rich Prohaska
0cf3ded1b1 merge the brt prefetch changes to the main trunk. closes #1183 
git-svn-id: file:///svn/toku/tokudb@9135 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:39 -04:00
Yoni Fogel
a9c69fd3fe Manual glue for svn-git migration for r8452 due to multiple merge + diffs in the same patch. 
Original message:
Create a branch to make Doug Lea's malloc work. The big problem is having another malloc() in the system breaks things. Address #1343, #1032.
 2013-04-16 23:57:33 -04:00
Rich Prohaska
730e17faaf merge 1032 into 1032b. addresses #1032 
git-svn-id: file:///svn/toku/tokudb.1032b@7781 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:27 -04:00
Bradley C. Kuszmaul
0ee4e385f1 Merge all mainline patches into the 1195 branch. Fixes #1243. 
Details:  I merged with
{{{
svn merge -r6585:7747 https://svn.tokutek.com/tokudb/toku/tokudb
}}}
then resolved conflicts.  The most interesting conflict was the double inclusion of the {{{BLOCK_ALLOCATOR_HEADER_RESERVE}}} for {{{brt-internal.h}}}.   The subversion merger got confused because the patch was applied with an extra space at the end of each line.


git-svn-id: file:///svn/toku/tokudb.1243@7750 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:26 -04:00
Rich Prohaska
fe1ba37143 fix icc compile issues. addresses #1195 
git-svn-id: file:///svn/toku/tokudb.1195@7703 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:25 -04:00
Bradley C. Kuszmaul
6b654211c0 free diskblocks. Addresses #1195. 
git-svn-id: file:///svn/toku/tokudb.1195@7679 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:25 -04:00
Rich Prohaska
2a662e812b minor changes to compile with icc and make the windows port easier. addresses #1195 
git-svn-id: file:///svn/toku/tokudb.1195@7647 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:25 -04:00
Rich Prohaska
765c998055 build on 32 bit linux. addresses #1195 
git-svn-id: file:///svn/toku/tokudb.1195@7644 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:25 -04:00
Yoni Fogel
7e5fd7c56e Manual glue for svn-git migration for r6575 due to multiple merges. 
Original message:
Create new main branch from tokudb.1131b+1080a+1185+nostatementexprs. Create in in the new directory layout. Addresses #1131,#1080,#1185,#1193.
 2013-04-16 23:57:22 -04:00
Rich Prohaska
e8194aa954 fixup fragmentation calculation. addresses #1190 
git-svn-id: file:///svn/tokudb.1131b+1080a+1185+nostatementexprs@6487 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:21 -04:00
Bradley C. Kuszmaul
cd8840f04d Get rid of icc warnings (with port-win warnings.) Addresss #1185. 
git-svn-id: file:///svn/tokudb.1131b+1080a+1185+nostatementexprs@6466 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:21 -04:00
Bradley C. Kuszmaul
0ed47ea357 CIL gets upset if includes are not in the same order, because int64_t gets typedefed to different things depending on what you include. So do all the includes in a standard way. Addresses #1185. 
git-svn-id: file:///svn/tokudb.1131b+1080a+1185@6439 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:20 -04:00
Rich Prohaska
fd9bf11381 dump block fragmentation information. closes #1190 
git-svn-id: file:///svn/tokudb.1131b+1080a+1185@6435 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:20 -04:00
Bradley C. Kuszmaul
0363b1697a Get rid of almost all compiler warnings in newbrt. Addresses #1185. 
git-svn-id: file:///svn/tokudb.1131b+1080a+1185@6381 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:20 -04:00
Rich Prohaska
5ef2e3e59f fix valgrind errors introduced by checkin 6279. addresses #1054 
git-svn-id: file:///svn/tokudb.1131b+1080a@6284 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:18 -04:00
Bradley C. Kuszmaul
728b016482 Merge main line (up to 6206) and resolve the differences. 
{{{
svn merge -r5900:6206 https://svn.tokutek.com/tokudb/tokudb
}}}

Addresses #699, #1000, #1075, #1080, #1100, #1131, #1132, #1134, #1153, #1158.


git-svn-id: file:///svn/tokudb.1131b+1080a@6207 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:18 -04:00
Bradley C. Kuszmaul
c126b01af5 The tests may be running. Addresses #1000, #1080, #1131. 
git-svn-id: file:///svn/tokudb.1131b+1080a@6156 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:18 -04:00
Bradley C. Kuszmaul
7ba939a031 Manage the header not in the cachetable. This will help with #1054. Addresses #1000, #1054, #1080, #1131. 
git-svn-id: file:///svn/tokudb.1131b+1080a@6128 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:18 -04:00
Bradley C. Kuszmaul
fcd8cb084c Deserialize the fifo header inside the header deserialization code instead of separately. Addresses #1131, #1080, #1000. 
git-svn-id: file:///svn/tokudb.1131b+1080a@6057 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:18 -04:00
Bradley C. Kuszmaul
616abc829e Incorporate blocknum code from 1080a. Runs a little, need a big run on coyote. Addresses #1000, #1080, #1131. 
git-svn-id: file:///svn/tokudb.1131b+1080a@6025 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:18 -04:00