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

1880 commits

This branch
This branch
All branches
Author SHA1 Message Date
Bradley C. Kuszmaul
4ce5197c5a handle split keys better. Addresses #1195. 
git-svn-id: file:///svn/toku/tokudb.1195@7521 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:24 -04:00
Bradley C. Kuszmaul
19690a2344 Implement leaf node balancing (sometimes intead of merging we balance two leaf nodes). Also improve the printout for {{{toku_dump_brt()}}}. Addresses #1195. 
git-svn-id: file:///svn/toku/tokudb.1195@7517 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:24 -04:00
Bradley C. Kuszmaul
7d9610c0bf Handle another merge case. Addresses #1195. 
git-svn-id: file:///svn/toku/tokudb.1195@7508 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:24 -04:00
Bradley C. Kuszmaul
55111c50cd Start doing merge. Addresses #1195. 
git-svn-id: file:///svn/toku/tokudb.1195@7499 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:24 -04:00
Bradley C. Kuszmaul
b29bddd24f Change an {{{EINVAL}}} to an {{{abort()}}}. Addresses #1195. 
git-svn-id: file:///svn/toku/tokudb.1195@7471 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:24 -04:00
Bradley C. Kuszmaul
41a52d6d73 Factor out some common subexpressions for handling reactive children. Addresses #1195. 
git-svn-id: file:///svn/toku/tokudb.1195@7470 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:24 -04:00
Bradley C. Kuszmaul
0ea80d5524 Simplify {{{assert(0); return;}}} into {{{abort()}}}. Addresses #1195. 
git-svn-id: file:///svn/toku/tokudb.1195@7468 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:24 -04:00
Bradley C. Kuszmaul
196d6a25b0 Get rid of dead code in fingerprint. Addresses #1195. 
git-svn-id: file:///svn/toku/tokudb.1195@7467 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
b5ef4b0e20 Simplified splitting code (don't split fifo. Instead push everything to the child.) Tests run. Addresses #1195. 
git-svn-id: file:///svn/toku/tokudb.1195@7453 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
34341f29e8 More surgery. Most of cursor stuff compiles now. Addresses #1195. 
git-svn-id: file:///svn/toku/tokudb.1195@7326 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:24 -04:00
Bradley C. Kuszmaul
d3eb758aac More surgery. A few tests run. Many still don't link. Addresses #1195. 
git-svn-id: file:///svn/toku/tokudb.1195@7295 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:24 -04:00
Bradley C. Kuszmaul
20894b913f More surgery. The newbrt.o file now builds. Addresess #1195. 
git-svn-id: file:///svn/toku/tokudb.1195@7273 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:24 -04:00
Bradley C. Kuszmaul
83864266a8 More surgery. Addresess #1195. 
git-svn-id: file:///svn/toku/tokudb.1195@7272 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:23 -04:00
Bradley C. Kuszmaul
4c03814f58 Surgery continues. Addresses #1195. 
git-svn-id: file:///svn/toku/tokudb.1195@7271 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:23 -04:00
Bradley C. Kuszmaul
deab1245cb Surgery continues. Addresses #1195. 
git-svn-id: file:///svn/toku/tokudb.1195@7270 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:23 -04:00
Bradley C. Kuszmaul
bcd12764b7 Put the leaf application code back in. Addresses #1195. 
git-svn-id: file:///svn/toku/tokudb.1195@7134 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:23 -04:00
Bradley C. Kuszmaul
58838a3f2a More surgery. Addresess #1195. 
git-svn-id: file:///svn/toku/tokudb.1195@7123 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:23 -04:00
Bradley C. Kuszmaul
e138ba595a Start doing the surgery. Addresses #1195. 
git-svn-id: file:///svn/toku/tokudb.1195@7118 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:23 -04:00
Bradley C. Kuszmaul
f2329d912a Copy the brt code in preparation for more major surgery. Addresses #1195. 
git-svn-id: file:///svn/toku/tokudb.1195@7096 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:23 -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
eec8bc2d56 Remove a lot of printfs. Addresses #1195. 
git-svn-id: file:///svn/toku/tokudb.1195@6885 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
Bradley C. Kuszmaul
f13fa4beca Start using the simplified code in some cases. Addresses #1195. 
git-svn-id: file:///svn/toku/tokudb.1195@6611 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:23 -04:00
Bradley C. Kuszmaul
d5c96813bc This version compiles, but none of the new code is run by any test. Addresses #1195. 
git-svn-id: file:///svn/toku/tokudb.1195@6590 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:23 -04:00
Bradley C. Kuszmaul
b54c77c3cb Start simplification of tree code, in preparation for merge on delete. Addresses #1195. 
git-svn-id: file:///svn/toku/tokudb.1195@6589 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:23 -04:00
Bradley C. Kuszmaul
21502c1381 Start simplification of tree code, in preparation for merge on delete. Addresses #1195. 
git-svn-id: file:///svn/toku/tokudb.1195@6588 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:23 -04:00
Bradley C. Kuszmaul
01a3ecde78 Get rid of one assertion that the nodes are smaller than the nodesize. Those assertions are no longer needed. Addresses #1195. 
git-svn-id: file:///svn/toku/tokudb.1195@6586 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:23 -04:00
Rich Prohaska
111975b8ce need to move to portability layer. no statm on freebsd for example. addresses #1185 
git-svn-id: file:///svn/toku/tokudb@6583 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:22 -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
03b92c9f4e problem including brt-types.h in c++ code. c is not always compatible with c++. addresses #1185 
git-svn-id: file:///svn/tokudb.1131b+1080a+1185+nostatementexprs@6556 c7de825b-a66e-492c-adef-691d508d4ae1
 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
fc3fa5d809 Addresses #1185 
Windows portability for srandom->srand random->rand
Allows omt-test to succeed

git-svn-id: file:///svn/tokudb.1131b+1080a+1185+nostatementexprs@6496 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
Yoni Fogel
6a2017c7d1 Addresses #1185 
More portability code

git-svn-id: file:///svn/tokudb.1131b+1080a+1185+nostatementexprs@6493 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:22 -04:00
Bradley C. Kuszmaul
5d2267731f Try to build a LESWITCHCALL that works with both icc on windows, and on icc and gcc on linux. Addresses #1185. 
git-svn-id: file:///svn/tokudb.1131b+1080a+1185+nostatementexprs@6492 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:22 -04:00
Yoni Fogel
9cf3e69508 Addresses #1185 
Fix bug with W-intel compiler and variadic macros.

git-svn-id: file:///svn/tokudb.1131b+1080a+1185+nostatementexprs@6488 c7de825b-a66e-492c-adef-691d508d4ae1
 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
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
Bradley C. Kuszmaul
32eca1b0c8 Fix variadic macro to be right again? Must put space before comma. Addresses #1185. 
git-svn-id: file:///svn/tokudb.1131b+1080a+1185+nostatementexprs@6474 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:21 -04:00
Yoni Fogel
5d7a5dfaa3 Addresses #1185 
Modified makefile to be more modular with icc and gcc options.
Modified portability.h with some stubs and some real portability code

Removed named variadic macros for unnamed variadic macros (c99 only supports unnamed)
Removed ', ## __VAR_ARGS__' in favor of ', __VAR_ARGS__' due to apparent bug in the intel compiler (on windows at least)
__ICC means the linux intel compiler, __ICL means the windows intel compiler
__INTEL_COMPILER is set by both
Removed some include files (for windows) that don't exist.

git-svn-id: file:///svn/tokudb.1131b+1080a+1185+nostatementexprs@6473 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:21 -04:00
Rich Prohaska
31c755d35b compile with gcc 4.3. addresses #1185 
git-svn-id: file:///svn/tokudb.1131b+1080a+1185+nostatementexprs@6471 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
Rich Prohaska
746d28bf51 compile with gcc. addresses #1185 
git-svn-id: file:///svn/tokudb.1131b+1080a+1185+nostatementexprs@6469 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:21 -04:00
Bradley C. Kuszmaul
a25c7dc501 Make it work better with icc. Addresses #1185. 
git-svn-id: file:///svn/tokudb.1131b+1080a+1185+nostatementexprs@6468 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