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
3323 commits 2774 branches 343 tags 1.6 GiB
Commit graph

27 commits

Author SHA1 Message Date
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
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
Bradley C. Kuszmaul
74565b165a Merge changes for #2859 (delete dirs when tests complete). Fixes #2859. close[t:2859] 
git-svn-id: file:///svn/toku/tokudb@22773 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:21 -04:00
Rich Prohaska
7a3f6089e2 #2821 refs[t:2821] fixup the loader tests 
git-svn-id: file:///svn/toku/tokudb@22416 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:20 -04:00
Rich Prohaska
663acdae84 #2654 refs[t:2654] merge loader persort speedup to main tokudb 
git-svn-id: file:///svn/toku/tokudb@22354 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:20 -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
Rich Prohaska
1bba1e63b2 closes[t:2644] combine the brtloader panic and error callback state 
git-svn-id: file:///svn/toku/tokudb@20526 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:15 -04:00
Rich Prohaska
418b60fbd7 refs[t:2643] compile the brtloader tests 
git-svn-id: file:///svn/toku/tokudb@20489 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:15 -04:00
Bradley C. Kuszmaul
227abb8536 Fix #2533. (Avoid runts and don't make maximal fanout in loader). close[t:2533] 
git-svn-id: file:///svn/toku/tokudb@20459 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:14 -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
Rich Prohaska
432e750814 refs[t:2613] get the brtloader tests working with the new memory accounting 
git-svn-id: file:///svn/toku/tokudb@20307 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:12 -04:00
Bradley C. Kuszmaul
e3d629fb2e Merge in memory management for the extractor thread. Refs #2613. [t:2613]. 
{{{
svn merge -r 20278:20301 https://svn.tokutek.com/tokudb/toku/tokudb.2613
}}}
.


git-svn-id: file:///svn/toku/tokudb@20302 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:12 -04:00
Bradley C. Kuszmaul
9dfcef61c1 Merge the 2571 double-buffering stuff over and delete the 2571 branch. Double buffering of the file merge is complete. Fixes #2571. close[t:2571] 
{{{
svn merge -r 20199:20206 https://svn.tokutek.com/tokudb/toku/tokudb.2571
}}}
.


git-svn-id: file:///svn/toku/tokudb@20208 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:11 -04:00
Rich Prohaska
52b5bafc07 merge 2578b to main refs[t:2578] 
git-svn-id: file:///svn/toku/tokudb@20143 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:11 -04:00
Bradley C. Kuszmaul
0827928d76 Merge in the changes that make the reads not use fidx locks too. Refs #2571. [t:2571] 
{{{
svn merge -r 20067:20072 https://svn.tokutek.com/tokudb/toku/tokudb.2571
}}}
.


git-svn-id: file:///svn/toku/tokudb@20073 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:11 -04:00
Rich Prohaska
b7d19f5045 the brt_loader_sort_and_write_rows contract changed which caused the tests to fail. fix the tests closes[t:2593] #2593 
git-svn-id: file:///svn/toku/tokudb@20059 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:10 -04:00
Bradley C. Kuszmaul
47f2199d9d Merge in 
* bradley's benchmarking changes, and
 * the big speedup in the sort-and-write-rows (slowness caused the lock in fidx2file).
Refs #2571. [t:2571]
{{{
svn merge -r 19909:20027 https://svn.tokutek.com/tokudb/toku/tokudb.2571
}}}
.


git-svn-id: file:///svn/toku/tokudb@20029 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:10 -04:00
Rich Prohaska
0612028bcf fix the loader error callback and the pqueue-test closes[t:2576] 
git-svn-id: file:///svn/toku/tokudb@19913 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:09 -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
Rich Prohaska
3f35cb893b change block format to support leaf partitions closes[t:2351] 
git-svn-id: file:///svn/toku/tokudb@19500 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:07 -04:00
Bradley C. Kuszmaul
3bfdfa2921 Get rid of the gratuitous IDX files. 
git-svn-id: file:///svn/toku/tokudb@18835 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:04 -04:00
Bradley C. Kuszmaul
3919e85519 Merge the finer-grained progress report for the loader. Refs #2462. [t:2462] 
{{{
svn merge -r 18775:18791 https://svn.tokutek.com/tokudb/toku/tokudb.2462
}}}
.


git-svn-id: file:///svn/toku/tokudb@18792 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:04 -04:00
Rich Prohaska
287f0e8384 fix 32 bit linux build of brtloader test #2475 closes[t:2475] 
git-svn-id: file:///svn/toku/tokudb@18769 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:03 -04:00
Bradley C. Kuszmaul
788b96e407 Merge 2216b onto main line. Refs #2216. [t:2216] 
{{{
svn merge -r18206:18672 https://svn.tokutek.com/tokudb/toku/tokudb.2216b
svn merge -r 18738:18746 https://svn.tokutek.com/tokudb/toku/tokudb.2216b
}}}
.


git-svn-id: file:///svn/toku/tokudb@18749 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:03 -04:00
Yoni Fogel
1f1c288024 [t:2216] printf format now matches (windows port) 
git-svn-id: file:///svn/toku/tokudb@18189 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