Commit graph

93 commits

Author SHA1 Message Date
Leif Walsh
787fed4c0e [t:4462] finishing PROF=1 work, tests seem to compile and run (though it's
not a great idea to compile *all* of them, and valgrind gets whiny)


git-svn-id: file:///svn/toku/tokudb@39697 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-17 00:00:10 -04:00
Bradley C. Kuszmaul
223071f1e2 close[t:3706] Deprecate BOOL. Refs #3706.
git-svn-id: file:///svn/toku/tokudb@32750 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:43 -04:00
Bradley C. Kuszmaul
bfb7900fef [t:3620] Merge #3620 to main, and delete tokudb.3620. Refs #3620.
git-svn-id: file:///svn/toku/tokudb@32348 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:41 -04:00
Rich Prohaska
a774d5f857 #3618 get the statically linked tokudb_dump working. no need to run global destructors twice closes[t:3618]
git-svn-id: file:///svn/toku/tokudb@32323 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:41 -04:00
Bradley C. Kuszmaul
866597e6d1 [t:3586] [t:3604] Merge icc onto main. Refs #3586, #3604.
git-svn-id: file:///svn/toku/tokudb@32232 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:40 -04:00
Rich Prohaska
439d156cdf #3535 remove DB_YESOVERWRITE on main. merge tokudb.3535 to main refs[t:3535]
git-svn-id: file:///svn/toku/tokudb@31293 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:40 -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
Dave Wells
8c86529769 add thread parsing
git-svn-id: file:///svn/toku/tokudb@19929 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:09 -04:00
Bradley C. Kuszmaul
9cab06f7fb Merge the instrumentation from 2499d+2571 onto the main line (since 2499d has been merged.) Refs #2571. [t:2571].
{{{
svn merge -r 19857:19905 https://svn.tokutek.com/tokudb/toku/tokudb.2499d+2571
}}}
.


git-svn-id: file:///svn/toku/tokudb@19906 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
Yoni Fogel
3bb1ede015 [t:2517] utils and db-benchmark-test now compile statically only for windows
git-svn-id: file:///svn/toku/tokudb@19292 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:06 -04:00
Bradley C. Kuszmaul
7176886212 Change main's second argument to {{{char *const*argv}}}. Fixes #2228. close[t:2228]
git-svn-id: file:///svn/toku/tokudb@18184 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:01 -04:00
Yoni Fogel
c6fcce22ce [t:2328] Merge 2328 branch onto main,
some minimal porting

git-svn-id: file:///svn/toku/tokudb@17597 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:58:59 -04:00
Bradley C. Kuszmaul
528949b699 Fixes #2292. closes[t:2292]
git-svn-id: file:///svn/toku/tokudb@16859 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:58:57 -04:00
Yoni Fogel
324c278a31 Addresses #2257 refs[t:2257] Merge windows port back into main.
git-svn-id: file:///svn/toku/tokudb@16673 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:58:56 -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
Yoni Fogel
95f0e10dea Addresses #2116 refs[t:2116] Fix windows build.
git-svn-id: file:///svn/toku/tokudb@15431 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:58:04 -04:00
Yoni Fogel
001bc6f4c3 Addresses #1976 refs[t:1976] Add warnings for code hygiene that windows compiler requires.
Cleaned up code to remove warnings.

git-svn-id: file:///svn/toku/tokudb@14306 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:58:00 -04:00
Rich Prohaska
3ab3cbbfcc some progress on recovery close[t:1835]
git-svn-id: file:///svn/toku/tokudb@14112 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:59 -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
09f13fb815 addresses #1531 Make utils (check) works in windows
git-svn-id: file:///svn/toku/tokudb@11749 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:52 -04:00
Bradley C. Kuszmaul
1c2996546d Merge in [11215], Refs #1672. Consolidate tdiff. Fixes #1673.
git-svn-id: file:///svn/toku/tokudb@11217 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:48 -04:00
Yoni Fogel
526beea523 Addresses #1607 Static utilities now call initializers/destroyers. src/tests now use static utilities
git-svn-id: file:///svn/toku/tokudb@10662 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:46 -04:00
Yoni Fogel
522bd41792 Fix build due to windows porting
git-svn-id: file:///svn/toku/tokudb@10521 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:46 -04:00
Yoni Fogel
0844eec052 Addresses #1531 Removed -w option as a workaround for diffs
Windows utils/dump/etc will need to output the correct dos/unix endline format


git-svn-id: file:///svn/toku/tokudb@10495 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:45 -04:00
Yoni Fogel
6737a3be2f Addresses #1531 Ported utils to windows
git-svn-id: file:///svn/toku/tokudb@10478 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:45 -04:00
Bradley C. Kuszmaul
dbc0a3bae5 Delete .dirty files (patch from 1510). Fixes #1564.
git-svn-id: file:///svn/toku/tokudb@10337 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:44 -04:00
Yoni Fogel
ae3694319e Ignore and split utils makefile to bdb and tdb
git-svn-id: file:///svn/toku/tokudb@9958 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:43 -04:00
Bradley C. Kuszmaul
5d9be4ddf1 Merge the simplified logging back to the main line, and get rid of the tokudb.1493a branch. Closes #1493.
git-svn-id: file:///svn/toku/tokudb@9719 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:42 -04:00
Yoni Fogel
f470a45bcf Revert "Addresses #1298"
This reverts commit 5fa57d593d531a7ddc2f59afa4b082da46b00bbf.

git-svn-id: file:///svn/toku/tokudb@9229 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:40 -04:00
Yoni Fogel
566d68bfa5 Addresses #1298
make local (at top level) skips tests

git-svn-id: file:///svn/toku/tokudb@9227 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:40 -04:00
Bradley C. Kuszmaul
2f856f7d29 Candidate fix for #1374 (wrong db.h include file for BDB versions of code.) Addresses #1374.
git-svn-id: file:///svn/toku/tokudb@8667 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:37 -04:00
Bradley C. Kuszmaul
141ef2eaa5 Clean up the MAYBEATSIGN and verbosity stuff. Fixes #1365.
git-svn-id: file:///svn/toku/tokudb.1032b+1343@8573 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:34 -04:00
Bradley C. Kuszmaul
f66b523f89 Merge all stuff from source:tokudb/toku/tokudb.1032 since the creation of this branch at [8452] to the present [8556], as
{{{
svn merge -r 8452:8556 https://svn.tokutek.com/tokudb/toku/tokudb.1032b/
}}}
And resolve conflicts.

It compiles, and we'll see if it runs.

Addresses #1032, #1343.


git-svn-id: file:///svn/toku/tokudb.1032b+1343@8557 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:34 -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
430aa86333 Add -lz. Addresses #1131.
git-svn-id: file:///svn/tokudb.1131@5954 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:16 -04:00
Yoni Fogel
afb0f26e3b Closes #1107
Added missing prereqs (static library) to statically linked programs

git-svn-id: file:///svn/tokudb@5730 c7de825b-a66e-492c-adef-691d508d4ae1
2008-08-18 19:58:47 +00:00
Yoni Fogel
6ccb067147 Addresses #1032
Standardize unsigned ints:
uint8_t -> u_int8_t
uint32_t -> u_int32_t
uint64_t ->u_int64_t
Windows seems to differentiate between the two, linux does not.

git-svn-id: file:///svn/tokudb@5239 c7de825b-a66e-492c-adef-691d508d4ae1
2008-07-21 18:00:38 +00:00
Bradley C. Kuszmaul
7828ced3a8 Finish up the pretty output. Fixes #811.
git-svn-id: file:///svn/tokudb@3926 c7de825b-a66e-492c-adef-691d508d4ae1
2008-05-13 02:35:50 +00:00
Bradley C. Kuszmaul
83d416fa09 Merge the 558 branch back to the main with
{{{
svn merge -r3061:3225 https://svn.tokutek.com/tokudb/tokudb.558
}}}

Fixes #630.
Addresses #558.


git-svn-id: file:///svn/tokudb@3226 c7de825b-a66e-492c-adef-691d508d4ae1
2008-04-02 23:40:36 +00:00
Rich Prohaska
07047bdfd0 rename libdb.so to libtokudb.so. closes #150
git-svn-id: file:///svn/tokudb@2230 c7de825b-a66e-492c-adef-691d508d4ae1
2008-02-10 03:50:15 +00:00
Yoni Fogel
2cb9fb2ebe Port to OSX for makefiles, easier to use OSX versions.
git-svn-id: file:///svn/tokudb@2229 c7de825b-a66e-492c-adef-691d508d4ae1
2008-02-10 02:39:08 +00:00
Rich Prohaska
dd061396ed added -DS flags to tokudb_gen to generate duplicates and dupsort header fields. closes #315
git-svn-id: file:///svn/tokudb@1939 c7de825b-a66e-492c-adef-691d508d4ae1
2008-01-28 16:35:02 +00:00
Rich Prohaska
162dcc529e tokudb_load now supports dupsort databases. we defer judgement on db flags until the db->open method is called. this allows incremental update of the flags.
closes #314


git-svn-id: file:///svn/tokudb@1938 c7de825b-a66e-492c-adef-691d508d4ae1
2008-01-28 14:27:28 +00:00
Rich Prohaska
afe29aba89 get tokudb_dump -s working
get tokudb_dump working with dupsort databases



git-svn-id: file:///svn/tokudb@1928 c7de825b-a66e-492c-adef-691d508d4ae1
2008-01-27 19:36:15 +00:00
Bradley C. Kuszmaul
9fe0391206 Add copyright 2008. Fixes #283.
git-svn-id: file:///svn/tokudb@1844 c7de825b-a66e-492c-adef-691d508d4ae1
2008-01-24 15:10:32 +00:00
Rich Prohaska
155a75874a add test-coverage target addresses #277
git-svn-id: file:///svn/tokudb@1767 c7de825b-a66e-492c-adef-691d508d4ae1
2008-01-21 14:03:46 +00:00
Rich Prohaska
345a341cd0 cleanup the gcov files. addresses #277
git-svn-id: file:///svn/tokudb@1732 c7de825b-a66e-492c-adef-691d508d4ae1
2008-01-18 16:05:11 +00:00
Rich Prohaska
63f80c0cd6 make build-coverage. addresses #277
git-svn-id: file:///svn/tokudb@1729 c7de825b-a66e-492c-adef-691d508d4ae1
2008-01-18 14:43:32 +00:00
Yoni Fogel
907df64d8b Closes #270
Closes #271
Bugfixes in tokudb_load:
Now supports -T (text) option along with other command line parameters
Now supports -T option without newline at end of file (i.e. last data item ends with end of file)


git-svn-id: file:///svn/tokudb@1651 c7de825b-a66e-492c-adef-691d508d4ae1
2008-01-14 20:13:30 +00:00