mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-23 15:24:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
1859 commits 2778 branches 343 tags 1.6 GiB
Commit graph

83 commits

Author SHA1 Message Date
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
0cb7def202 fix icc 32 bit warnings. addresses #1195 
git-svn-id: file:///svn/toku/tokudb.1195@7704 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
Rich Prohaska
a4812e1269 test for evict remove race. addresses #1195 
git-svn-id: file:///svn/toku/tokudb.1195@7616 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:24 -04:00
Bradley C. Kuszmaul
e875d7109e Make some tests run better. Addresses #1195. 
git-svn-id: file:///svn/toku/tokudb.1195@7615 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:24 -04:00
Rich Prohaska
a3ae38596f test cachetable_unpin_and_remove. addresses #1237 
git-svn-id: file:///svn/toku/tokudb.1195@7612 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:24 -04:00
Rich Prohaska
9a7a624066 measure seq and random insert rates 
git-svn-id: file:///svn/toku/tokudb.1195@7584 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:24 -04:00
Bradley C. Kuszmaul
7a1f2d5706 Write tests for {{{toku_dump_brt()}}}. Addresses #1195. 
git-svn-id: file:///svn/toku/tokudb.1195@7461 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:24 -04:00
Bradley C. Kuszmaul
8195b25b5a Fix up fingerprints, and speed up by removing checks. Passes newbrt tests (haven't checked with valgrind). Addresses #1195. 
git-svn-id: file:///svn/toku/tokudb.1195@7434 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:24 -04:00
Bradley C. Kuszmaul
def3be83af Not all tests ran (because splitting was broken). Start fixing the splitting. Addresses #1195. 
git-svn-id: file:///svn/toku/tokudb.1195@7367 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:24 -04:00
Bradley C. Kuszmaul
e3d8b75e84 newbrt tests run. Still no deletes. But the code is smaller than it was (2734 according to sloccount vs 3137 before, which is 13 percent reduction). Addresses #1195. 
git-svn-id: file:///svn/toku/tokudb.1195@7362 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:24 -04:00
Bradley C. Kuszmaul
2dd4dd7b0d the splitting works again. Addresses #1195. 
git-svn-id: file:///svn/toku/tokudb.1195@7054 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:23 -04:00
Bradley C. Kuszmaul
2f0936b291 Fix up some sizing issues, set the dirty bit after splitting, and put in a lot of printfs. Addresses #1195. 
git-svn-id: file:///svn/toku/tokudb.1195@6883 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:23 -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
Yoni Fogel
f53dfab8b7 Addresses #1185 
omt-cursor-test now works in wintel

git-svn-id: file:///svn/tokudb.1131b+1080a+1185+nostatementexprs@6498 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:22 -04:00
Yoni Fogel
1912f987a2 Addresses #1185 
Accidentally left stubs in which disabled randomness in omt-test

git-svn-id: file:///svn/tokudb.1131b+1080a+1185+nostatementexprs@6495 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:22 -04:00
Yoni Fogel
0bed4483eb Addresses #1185 
omt-test now works in windows/cygwin/icc (although not through makefile)

newbrt/tests/makefile now supports icc in cygwin (more so than before)


git-svn-id: file:///svn/tokudb.1131b+1080a+1185+nostatementexprs@6494 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:22 -04:00
Bradley C. Kuszmaul
568c71a362 add -ip -ipo2. Addresses #1185. 
git-svn-id: file:///svn/tokudb.1131b+1080a+1185+nostatementexprs@6475 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:21 -04:00
Rich Prohaska
548c7f644f compile with gcc and icc. addresses #1185 
git-svn-id: file:///svn/tokudb.1131b+1080a+1185+nostatementexprs@6470 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:21 -04:00
Bradley C. Kuszmaul
5398661a9e Make it work better with icc. Addresses #1185. 
git-svn-id: file:///svn/tokudb.1131b+1080a+1185+nostatementexprs@6467 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
332b87bd3b Add idag-enable port-win. Addresses #1085. 
git-svn-id: file:///svn/tokudb.1131b+1080a+1185@6460 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:20 -04:00
Bradley C. Kuszmaul
41253ffabb Get rid of more cil warnings. Addresses #1185. 
git-svn-id: file:///svn/tokudb.1131b+1080a+1185@6459 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:20 -04:00
Bradley C. Kuszmaul
2c412190e7 Get rid of most CIL warnings. Addresses #1185. 
git-svn-id: file:///svn/tokudb.1131b+1080a+1185@6456 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:20 -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
681b3ed56e turn on -Werror for icc builds. addresses #1185 
git-svn-id: file:///svn/tokudb.1131b+1080a+1185@6409 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:20 -04:00
Bradley C. Kuszmaul
9f7f84e655 Get rid of almost all compiler warnings in newbrt for icc, and also compiles with gcc. Addresses #1185. 
git-svn-id: file:///svn/tokudb.1131b+1080a+1185@6383 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:20 -04:00
Rich Prohaska
3fe38b45b5 compile with either gcc or icc. addresses #1185 
git-svn-id: file:///svn/tokudb.1131b+1080a+1185@6378 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:20 -04:00
Bradley C. Kuszmaul
3009670479 Get rid of some compiler warnings. Addresses #1185. 
git-svn-id: file:///svn/tokudb.1131b+1080a+1185@6377 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:20 -04:00
Bradley C. Kuszmaul
00a182b134 Get rid of some compiler warnings. Addresses #1185. 
git-svn-id: file:///svn/tokudb.1131b+1080a+1185@6376 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:20 -04:00
Bradley C. Kuszmaul
4267767fe9 Get rid of some compiler warnings. brt-test runs under valgrind. Addresses #1185. 
git-svn-id: file:///svn/tokudb.1131b+1080a+1185@6374 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:19 -04:00
Rich Prohaska
78d8f02303 compile fifo-test with icc, remove nested functions. addresses #1185 
git-svn-id: file:///svn/tokudb.1131b+1080a+1185@6343 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:19 -04:00
Rich Prohaska
d8613b06c8 use icc -ipa-c to build the newbrt code. addresses #1185 
git-svn-id: file:///svn/tokudb.1131b+1080a+1185@6331 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:19 -04:00
Rich Prohaska
2adbbe6d15 fix 1172. we can not use the brt in the block serialize functions as the brt may not be valid. addresses #1172 
git-svn-id: file:///svn/tokudb.1131b+1080a@6272 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
cb7297248a Allocate blocks on alignment and don't write the root FIFO over the translate block. Addresses #1080, #1000, #1131. 
git-svn-id: file:///svn/tokudb.1131b+1080a@6167 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
550c6c0e6d Add the extraargs callback for fetch. Also make brt-serial-test run. Addresses #1000, #1080, #1131. 
git-svn-id: file:///svn/tokudb.1131b+1080a@6115 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:18 -04:00
Bradley C. Kuszmaul
9e8e600430 Block allocator works and is tested. Addresses #1080, #1031, #1000. 
git-svn-id: file:///svn/tokudb.1131b+1080a@6076 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
Bradley C. Kuszmaul
ce6b171044 Merge the multihreaded writer changes as 
{{{
svn merge -r 5899:5987 https://svn.tokutek.com/tokudb/tokudb
}}}
and resolve the conflicts.


git-svn-id: file:///svn/tokudb.1131b@5988 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:17 -04:00
Bradley C. Kuszmaul
9d9c4f78d7 Add compress supresssion for valgrind. Addresses #1131. 
git-svn-id: file:///svn/tokudb.1131@5955 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:17 -04:00
Bradley C. Kuszmaul
48facf2ce5 Compress (but don't uncompress right) 
git-svn-id: file:///svn/tokudb.1131@5901 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:16 -04:00
Yoni Fogel
f81bffebc5 Removed non-existant test. 
git-svn-id: file:///svn/tokudb@5867 c7de825b-a66e-492c-adef-691d508d4ae1
 2008-08-27 15:29:23 +00:00
Rich Prohaska
29ac9b3ceb merge cachetable tests from the 1075 branch to main. addresses #1075 
git-svn-id: file:///svn/tokudb@5849 c7de825b-a66e-492c-adef-691d508d4ae1
 2008-08-26 14:07:27 +00:00
Rich Prohaska
3b23ec425a merge new cachetable tests. addresses #1075 
git-svn-id: file:///svn/tokudb@5797 c7de825b-a66e-492c-adef-691d508d4ae1
 2008-08-22 17:50:05 +00:00
Rich Prohaska
1f05fe210f port to 32 bit linux 
git-svn-id: file:///svn/tokudb@5381 c7de825b-a66e-492c-adef-691d508d4ae1
 2008-07-28 14:55:41 +00:00
Bradley C. Kuszmaul
3aafa0d873 Some files didn't merge right. Fixes #1021. 
git-svn-id: file:///svn/tokudb@5364 c7de825b-a66e-492c-adef-691d508d4ae1
 2008-07-27 22:19:08 +00:00