Commit graph

2659 commits

Author SHA1 Message Date
Bradley C. Kuszmaul
d7d0e89240 Merge is not implicated.
I thought that the merge was implicated for making nodes too big, but now I'm convinced it's not.

When the brt tries to merge two nodes (maybe_merge_pinned_leaf_nodes) it has two cases
 1) The nodes combined are more than 3/4 a node, in which case it balances the nodes.
 2) Otherwise it merges them.  Hence merged nodes are always smaller than a node.

So I'm considering  and  to be fully resolved.

Refs .  Closes 


git-svn-id: file:///svn/toku/tokudb@12836 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:54 -04:00
Rich Prohaska
7fdfb60a3e merge tokudb.1802 rev 12722:HEAD tokudb. addresses
git-svn-id: file:///svn/toku/tokudb@12779 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:54 -04:00
Bradley C. Kuszmaul
03d402adf1 Cleanup. Recreate the travelgid/kayak assertion failure. Refs .
git-svn-id: file:///svn/toku/tokudb@12762 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:54 -04:00
Bradley C. Kuszmaul
49ebe83194 Recreate the travelgid/kayak assertion failure.
git-svn-id: file:///svn/toku/tokudb@12761 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:54 -04:00
Bradley C. Kuszmaul
5e5a473306 inflate2 gets a node size of 15641
git-svn-id: file:///svn/toku/tokudb@12760 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:54 -04:00
Bradley C. Kuszmaul
20e019e6c0 Get it to work on BDB and TDB. Refs .
git-svn-id: file:///svn/toku/tokudb@12759 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:54 -04:00
Bradley C. Kuszmaul
2a8619061d Got a node up to 9143 bytes. Refs .
git-svn-id: file:///svn/toku/tokudb@12758 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:54 -04:00
Bradley C. Kuszmaul
ce38432785 A test that can grow a node bigger than a nodesize (only a little bit). Refs .
git-svn-id: file:///svn/toku/tokudb@12757 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:54 -04:00
Rich Prohaska
a255cd1672 build with icc on linux
git-svn-id: file:///svn/toku/tokudb@12742 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:54 -04:00
Rich Prohaska
d9e71a1691 throw a better error message for row size errors. addresses
git-svn-id: file:///svn/toku/tokudb@12659 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:54 -04:00
Rich Prohaska
30d18a7eaa solaris port. addresses
git-svn-id: file:///svn/toku/tokudb@12606 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:54 -04:00
Rich Prohaska
e5fb3970bb merge 1766b to main. addresses
git-svn-id: file:///svn/toku/tokudb@12577 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:54 -04:00
Rich Prohaska
4528364f7b simplify. addresses
git-svn-id: file:///svn/toku/tokudb@12573 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:54 -04:00
Rich Prohaska
81f649eb9b solaris port. addresses
git-svn-id: file:///svn/toku/tokudb@12570 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:54 -04:00
Rich Prohaska
1ea7ce00b4 abstract stdint.h for solaris. addresses
git-svn-id: file:///svn/toku/tokudb@12569 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:54 -04:00
Rich Prohaska
848a96a64c solaris port. addresses
git-svn-id: file:///svn/toku/tokudb@12535 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:54 -04:00
Rich Prohaska
bb2ba73091 portability. addresses
git-svn-id: file:///svn/toku/tokudb@12523 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:54 -04:00
Rich Prohaska
08c95da46d imp lock/unlock file on solaris. addresses
git-svn-id: file:///svn/toku/tokudb@12510 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:54 -04:00
Rich Prohaska
b65b62a932 freebsd port. addresses
git-svn-id: file:///svn/toku/tokudb@12507 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:54 -04:00
Yoni Fogel
3a734d77b8 Addresses Merge [12505] from 2.0.1 to main and 2.0.0
Note: [12502], [12503] also address 

git-svn-id: file:///svn/toku/tokudb@12506 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:54 -04:00
Yoni Fogel
ad3f097111 Merged [12502] (db benchmark runbenchmarks.sh features moved into makefile) from 2.0.1 to 2.0.0 and main
git-svn-id: file:///svn/toku/tokudb@12503 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:54 -04:00
Rich Prohaska
aab009a25a build on freebsd with gcc 4.3.4. addresses
git-svn-id: file:///svn/toku/tokudb@12483 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:53 -04:00
Yoni Fogel
173695c194 Closes Merge changes from 2.0.1 into main
svn merge --accept=postpone -r 12461:12467 ../../mysql.branches/2.0.1/tokudb/

git-svn-id: file:///svn/toku/tokudb@12468 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:53 -04:00
Rich Prohaska
bedeef9336 build our handlerton on freebsd. addresses
git-svn-id: file:///svn/toku/tokudb@12466 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:53 -04:00
Yoni Fogel
daa05c3f29 Closes Merge from 2.0.1 into main. Also add tests to freebsd.
svn merge --accept=postpone -r 12459:12461 ../../mysql.branches/2.0.1/tokudb/

git-svn-id: file:///svn/toku/tokudb@12462 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:53 -04:00
Rich Prohaska
3ea335abdb freebsd port. addresses
git-svn-id: file:///svn/toku/tokudb@12444 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:53 -04:00
Rich Prohaska
510286c76f freebsd portability lib. addresses
git-svn-id: file:///svn/toku/tokudb@12442 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:53 -04:00
Yoni Fogel
a80e780477 Fix windows build (removed some unneeded/useless warnings), svn ignore
git-svn-id: file:///svn/toku/tokudb@12412 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:53 -04:00
Yoni Fogel
bc9fd74c80 Merge 2.0.0 back into main
svn merge --accept=postpone -r 12123:12373 ../../mysql.branches/2.0.0/tokudb/

git-svn-id: file:///svn/toku/tokudb@12375 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:53 -04:00
Yoni Fogel
d3a3ad5f3b Make clean gets rid of TAGS (obsolete TAGS files in other directories can override)
git-svn-id: file:///svn/toku/tokudb@12374 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:53 -04:00
Bradley C. Kuszmaul
84432d75f8 Merge tokudb.1779 onto mainline. Fixes .
git-svn-id: file:///svn/toku/tokudb@12281 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:53 -04:00
Bradley C. Kuszmaul
6df3b7e6db Fixes (logformat execv error)
git-svn-id: file:///svn/toku/tokudb@12146 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:53 -04:00
Bradley C. Kuszmaul
6c211758b1 Merge 1767 into main line (including 1768 and 1627 fixes) and delete 1767 branch. Fixes . Refs , 1627.
git-svn-id: file:///svn/toku/tokudb@12140 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:53 -04:00
Barry Perlman
e191dd014e Merged from 2.0.0 branch with command:
svn merge -r12118:HEAD ../../mysql.branches/2.0.0/tokudb/

git-svn-id: file:///svn/toku/tokudb@12124 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:53 -04:00
Yoni Fogel
845f7c37bb Addresses , , , Merge 12079:12119 from 2.0.0 into main
git-svn-id: file:///svn/toku/tokudb@12121 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:53 -04:00
Rich Prohaska
80c3cbb7de fix linux compile. addresses
git-svn-id: file:///svn/toku/tokudb@12083 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:53 -04:00
Yoni Fogel
049c7625a3 Addresses Merge [12079] into main (pthreads-win32 for windows)
git-svn-id: file:///svn/toku/tokudb@12081 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:53 -04:00
Yoni Fogel
935c8c5897 Addresses Windows port of test1753
git-svn-id: file:///svn/toku/tokudb@12080 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:53 -04:00
Yoni Fogel
a686807877 Addresses Merge db-benchmark-test changes from 2.0.0 ([12009])
git-svn-id: file:///svn/toku/tokudb@12010 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:53 -04:00
Yoni Fogel
4def00f108 Closes Merge fix for [11989] from 2.0.0 into main
git-svn-id: file:///svn/toku/tokudb@11990 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:53 -04:00
Yoni Fogel
6b717670e8 Addresses Merge fix 'checkpoints do not happen during abort/commit, use internal function' from 2.0.0 to main
git-svn-id: file:///svn/toku/tokudb@11988 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:53 -04:00
Yoni Fogel
d4e09942d5 Addresses Merge fix 'checkpoints do not happen during abort/commit' from 2.0.0 to main
git-svn-id: file:///svn/toku/tokudb@11986 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:52 -04:00
Yoni Fogel
bc6e35bda3 Addresses Add test case that shows bug with r_h
git-svn-id: file:///svn/toku/tokudb@11961 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:52 -04:00
Bradley C. Kuszmaul
02d6a37e3b Fixes .
git-svn-id: file:///svn/toku/tokudb@11914 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:52 -04:00
Bradley C. Kuszmaul
64874ce9bc Remove printf of {{{set callback}}}. Fixes .
git-svn-id: file:///svn/toku/tokudb@11913 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:52 -04:00
Rich Prohaska
79a7937a2f merge changeset 11870 from the 2.0.0 branch to main. addresses
git-svn-id: file:///svn/toku/tokudb@11878 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:52 -04:00
Yoni Fogel
9d5dc15d11 Addresses Linux version of 1426 is more strict.
git-svn-id: file:///svn/toku/tokudb@11855 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:52 -04:00
Yoni Fogel
1a21f4cada Addresses test1426 now passes in windows (uses saved results from bdb in linux)
git-svn-id: file:///svn/toku/tokudb@11854 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:52 -04:00
Yoni Fogel
f5aa78a479 Addresses Port test1426 to windows
Order of evaluation of parameters is not guaranteed in C.  Now linux and windows will produce same output.

git-svn-id: file:///svn/toku/tokudb@11853 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:52 -04:00
Yoni Fogel
ef3669a740 Addresses Update windows ydb level tests expected behavior
git-svn-id: file:///svn/toku/tokudb@11827 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:52 -04:00