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

131 commits

Author SHA1 Message Date
Zardosht Kasheff
a87006b10c [t:2494], merge read committed to main 
git-svn-id: file:///svn/toku/tokudb@19073 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:05 -04:00
Barry Perlman
13c324ed06 Merge from 3.1.0 using following commands: 
> svn merge --accept=postpone -r18405:HEAD https://svn.tokutek.com/tokudb/mysql.branches/3.0.5/tokudb
> svn merge --accept=postpone -r18484:HEAD https://svn.tokutek.com/tokudb/mysql.branches/3.1.0/tokudb
> svn merge --accept=postpone -c18403 https://svn.tokutek.com/tokudb/mysql.branches/3.0.5/tokudb
> all executed inside directory tokudb/toku/tokudb

git-svn-id: file:///svn/toku/tokudb@18877 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:04 -04:00
Bradley C. Kuszmaul
eb9ad2a896 Merge in the 2462 branch that has a rudimentary implementation of polling. Refs #2462. [t:2462] 
{{{
svn merge -c 18768 https://svn.tokutek.com/tokudb/toku/tokudb.2462
}}}
.


git-svn-id: file:///svn/toku/tokudb@18771 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
Bradley C. Kuszmaul
8e833273da Merge in all the changes from 18354 to 18555 from 3.1.0. The only real change was in the engine status instrumentation. Refs #2467. [t:2467]. 
{{{
svn merge -r18354:18555 https://svn.tokutek.com/tokudb/mysql.branches/3.1.0/tokudb/
}}}
.


git-svn-id: file:///svn/toku/tokudb@18657 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:03 -04:00
Bradley C. Kuszmaul
e8af332d42 Merge r18357 to put the logger statistics. Refs #2385. [t:2385]. 
{{{
svn merge -c18357 https://svn.tokutek.com/tokudb/mysql.branches/3.1.0/tokudb/
}}}
.


git-svn-id: file:///svn/toku/tokudb@18640 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:03 -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
83f0f54ea4 closes[t:2408] Merge branch #2408 back to main. Delete dev branch. 
git-svn-id: file:///svn/toku/tokudb@18163 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:01 -04:00
Yoni Fogel
14d67581f0 closes[t:2391] Merge 2391 branch to main 
git-svn-id: file:///svn/toku/tokudb@18153 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
Dave Wells
a146155e4f merge DB_LOADER->abort changes from tokudb.2216a branch 
git-svn-id: file:///svn/toku/tokudb@17320 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:58:59 -04:00
Bradley C. Kuszmaul
56d2c6fdf8 Merge 2216 onto main (from 16706-17293) as 
{{{
svn merge -r16706:17293 https://svn.tokutek.com/tokudb/toku/tokudb.2216
}}}

Refs #2216. [t:2216]


git-svn-id: file:///svn/toku/tokudb@17299 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:58:59 -04:00
Yoni Fogel
2146c3d242 [t:2318] Replace DB_DBT_TEMPMEMORY with flags==0 
git-svn-id: file:///svn/toku/tokudb@17197 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:58:59 -04:00
Yoni Fogel
838e0e5b1c [t:2318] Merge #2318 back to main up to r17166 
git-svn-id: file:///svn/toku/tokudb@17178 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:58:59 -04:00
Yoni Fogel
9557f27e82 Addresses #2249 [t:2249] Merge DB_ENV->put_multiple branch back onto main. 
Fixed some makefile issues, ported recovery tests to use toku_hard_crash_on_purpose(), fixed db-benchmark-test to use default name
for 0th db

git-svn-id: file:///svn/toku/tokudb@16936 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:58:58 -04:00
Bradley C. Kuszmaul
798429c3cb Fixes #2276. closes[t:2276] 
git-svn-id: file:///svn/toku/tokudb@16801 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:58:57 -04:00
Yoni Fogel
e339d26531 Addresses #2262 refs[t:2262] Add DB_INHERIT_ISOLATION flag to TXN_BEGIN 
git-svn-id: file:///svn/toku/tokudb@16621 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:58:56 -04:00
Dave Wells
dec996c12a add ability to execute 2 callbacks during recovery - for [t:2028] 
git-svn-id: file:///svn/toku/tokudb@16279 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:58:56 -04:00
Barry Perlman
bb8cf498bd Addresses #652, #2170, #2178 refs[t:652,2170,2178] Merge from 3.0.0-logging branch with command: svn merge -r15784:HEAD https://svn.tokutek.com/tokudb/mysql.branches/3.0.0-logging/tokudb . 
git-svn-id: file:///svn/toku/tokudb@15839 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:58:52 -04:00
Barry Perlman
97fa5e2467 Addresses #2075, #2094 refs[t:2075] refs[t:2094] 
Merge 2.2.0 scheduling statistics to 3.0.0 (#2075).
Restore #2094 fix to 3.0.0 (cachefiles_lock).
Command line for merge (executed in tokudb.2037b, ../tokudb.2.2.0 is local sandbox image of 2.2.0 release): svn merge -r14900:HEAD ../tokudb.2.2.0

git-svn-id: file:///svn/toku/tokudb.2037b@15629 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:58:06 -04:00
Yoni Fogel
580f5caafb Addresses #2037 refs[t:2037] Merged #2037 back into main 
git-svn-id: file:///svn/toku/tokudb@15562 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:58:04 -04:00
Barry Perlman
15ead646d1 Addresses #1792 refs[t:1792] Added logger lock info to engine status. 
git-svn-id: file:///svn/toku/tokudb@14821 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:58:03 -04:00
Barry Perlman
7e96e32963 Addresses #1792 refs[t:1792] Added timestamps to engine status 
git-svn-id: file:///svn/toku/tokudb@14817 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:58:03 -04:00
Barry Perlman
d0ec2daa02 Addresses #1792 refs[t:1792] Added ydb-layer operation counters to engine status 
git-svn-id: file:///svn/toku/tokudb@14812 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:58:03 -04:00
Barry Perlman
c8b8e42194 Addresses 1792 refs[t:1792] Add more info to show engine status 
git-svn-id: file:///svn/toku/tokudb@14804 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:58:03 -04:00
Barry Perlman
f1137e7a66 Addresses #1792 refs[t:1792] Added range lock info to show engine status 
git-svn-id: file:///svn/toku/tokudb@14745 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:58:03 -04:00
Barry Perlman
73f0b0b395 Addresses 1792 refs[t:1792] Further implementation of show engine status 
git-svn-id: file:///svn/toku/tokudb@14741 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:58:03 -04:00
Rich Prohaska
ddfd7cae33 abort live txns when the env closes [t:1962] 
git-svn-id: file:///svn/toku/tokudb@14725 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:58:03 -04:00
Barry Perlman
ee6e11bcf0 Addresses #1792 refs[t:1792] Started adding show engine status 
git-svn-id: file:///svn/toku/tokudb@14695 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:58:02 -04:00
Bradley C. Kuszmaul
7f42f7cec1 Rebuild the db files and run {{{make install}}} to create {{{include/db.h}}}. Fixes #2029 close[t:2029] 
git-svn-id: file:///svn/toku/tokudb@14640 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:58:02 -04:00
Rich Prohaska
9f75c8f438 fix the nightly build (update db.h_4_6) 
git-svn-id: file:///svn/toku/tokudb@14637 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:58:02 -04:00
Dave Wells
3106fcce80 Fix recover-missing-logfiles test. In the process, define DB_CLOSE_DONT_TRIM_LOG flag for db_close. Also, remove some old, unused code 
git-svn-id: file:///svn/toku/tokudb@14631 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:58:02 -04:00
Barry Perlman
554596ce59 Addresses #1993 refs[t:1993] Added second callback to checkpoint. 
git-svn-id: file:///svn/toku/tokudb@14369 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:58:00 -04:00
Rich Prohaska
8e2d40b9b0 merge tokudb.1844 to main close[t:1844] 
git-svn-id: file:///svn/toku/tokudb@14180 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:59 -04:00
Yoni Fogel
316b9c96ed Addresses #1112 refs[t:1112] Implement 'flatten' function at brt layer 
git-svn-id: file:///svn/toku/tokudb@14168 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:59 -04:00
Yoni Fogel
d2cae8914e Addresses #1956 refs[t:1956] Add c_getf_set_range_reverse, c_getf_get_both_range_reverse, (and c_get versions) 
Equivalent to non-reverse but just changes the search direction

git-svn-id: file:///svn/toku/tokudb@14086 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:59 -04:00
Yoni Fogel
9f8047a8fb Addresses #1927 closes[t:1927] Make db->getf_set and db->getf_get_both externally visible 
git-svn-id: file:///svn/toku/tokudb@13851 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:58 -04:00
Yoni Fogel
080eb82a0f Addresses #1832 Add DB_TRUNCATE_WITHCURSORS flag to db->truncate. Will allow truncate while cursors open. 
git-svn-id: file:///svn/toku/tokudb@13255 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:55 -04:00
Barry Perlman
86f1706897 Added mechanism for using checkpoint callback, for testing only. 
git-svn-id: file:///svn/toku/tokudb@11314 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:49 -04:00
Yoni Fogel
115a711093 Closes #1681, Closes #1682 two-header choosing logic is more robust 
version now comes before 'size' in header
Some cleanup/defined new error codes instead of '-1'

git-svn-id: file:///svn/toku/tokudb@11304 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:49 -04:00
Yoni Fogel
c2d7fd1f8a Fixes #1686 Added ydb-level functions to get/set interval for automatic recurring checkpointing. 
git-svn-id: file:///svn/toku/tokudb@11298 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:49 -04:00
Yoni Fogel
1b96373aca Addresses #1670 Standardized descriptor (de)serialization. 
Added versioning to descriptor.
Changing a descriptor REQUIRES the version to increase.
Version 0 is reserved for a non-descriptor db. (cannot be set).
Not yet added to brtnodes.
Still possible to change descriptor with an open brt (which would not be upgraded).


git-svn-id: file:///svn/toku/tokudb@11198 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:48 -04:00
Bradley C. Kuszmaul
1a48d75807 Merge in the 1390 fixes, and delete 1390. Fixes #1390. 
{{{
svn merge -r10820:HEAD https://svn.tokutek.com/tokudb/toku/tokudb.1390
}}}


git-svn-id: file:///svn/toku/tokudb@11192 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:48 -04:00
Yoni Fogel
60812ccbfe Addresses #1603 Row descriptor changed from DB->DBT to DB->DBT* 
Will aid in having multiple DB handles to a single brt, which is needed to kill root fifo

git-svn-id: file:///svn/toku/tokudb@11157 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:48 -04:00
Yoni Fogel
6561bd1af8 Addresses #1510 Final merge into main. Delete #1510 branch. 
svn merge -r 11048:11110 ../tokudb.1510

git-svn-id: file:///svn/toku/tokudb@11112 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:47 -04:00
Yoni Fogel
0b981a3796 Addresses #1639 Can now remove (unnamed) old version dbs. Test included 
git-svn-id: file:///svn/toku/tokudb@10925 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
0630b6922c {{{db->stat64}}} now has all functionality required for #447. 
Merge [10806] into tokudb.  Refs #1629, #447.
{{{
svn merge -r10805:10806 https://svn.tokutek.com/tokudb/toku/tokudb.1629
}}}


git-svn-id: file:///svn/toku/tokudb@10807 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
Yoni Fogel
315770b1ac Addresses #1519 Linux port of 'poison off_t' in windows 
git-svn-id: file:///svn/toku/tokudb@9784 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:43 -04:00