apple/foundationdb
1
0
Fork 0
mirror of https://github.com/apple/foundationdb.git synced 2025-05-14 09:58:50 +08:00
Code Issues Packages Projects Releases Wiki Activity
3,169 Commits 35 Branches 318 Tags
Commit Graph

3169 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ofek Lev
4bd9efc4fc
Update vendored Python module six 2018-10-25 23:46:49 -04:00
Alec Grieser
51afb29e3b
Merge pull request #864 from EasterTheBunny/master 
tuple.Tuple needs to be deconstructed into TupleElement items
 2018-10-24 15:50:17 -07:00
Evan Tschannen
cb0c2afdad
Merge pull request #868 from etschannen/master 
Merge 6.0 into master
 2018-10-24 15:43:22 -07:00
Evan Tschannen
24c5a8982c Merge branch 'release-6.0' 
# Conflicts:
#	documentation/sphinx/source/release-notes.rst
#	versions.target
 2018-10-24 15:40:37 -07:00
Evan Tschannen
3cb7fb3f0f
Merge pull request #867 from etschannen/post-release-cleanup-6.0.14 
Post release cleanup 6.0.14
 2018-10-24 15:33:12 -07:00
Evan Tschannen
4dbe1412f5 update installer WIX GUID following release 2018-10-24 15:32:29 -07:00
Evan Tschannen
bb3ed478f2 update versions target to 6.0.15 2018-10-24 15:32:29 -07:00
Evan Tschannen
458ff6e0c0
Merge pull request #866 from etschannen/prepare-release-6.0.14 
update installer WIX GUID before release
6.0.14 		2018-10-24 11:13:51 -07:00
Evan Tschannen
d35399ed16 update installer WIX GUID following release 2018-10-24 11:12:53 -07:00
Evan Tschannen
66b8cf0c19
Merge pull request #865 from etschannen/release-6.0 
updated release notes and downloads for 6.0.14
 2018-10-24 11:11:37 -07:00
Evan Tschannen
5f59b24ac9 updated release notes and downloads for 6.0.14 2018-10-24 11:10:56 -07:00
Awbrey Hughlett
832d8d5e8c tuple.Tuple needed to be deconstructed into TupleElement items before appending to key tuple 2018-10-23 22:13:52 -05:00
Alex Miller
a074dc2a60 Revert one line from #856 that accidentally changed the include path for Windows.h 2018-10-23 18:58:00 -07:00
Alex Miller
039fbe299e
Merge pull request #863 from apple/revert-860-pr/operator-errors 
Revert "Fix operator problems like those mentioned in GitHub issue #606"
 2018-10-23 17:22:40 -07:00
Alex Miller
7c6cf47e37
Revert "Fix operator problems like those mentioned in GitHub issue #606" 2018-10-23 17:21:48 -07:00
Evan Tschannen
81c9e0b6c1
Merge pull request #862 from etschannen/master 
Merge 6.0 into master
 2018-10-23 17:14:26 -07:00
Evan Tschannen
6bb2ba5d92 Merge commit '2a34115e65639b7aad368a148de3c4189bc34bfc' 
# Conflicts:
#	fdbserver/storageserver.actor.cpp
#	fdbserver/worker.actor.cpp
 2018-10-23 17:05:42 -07:00
Alex Miller
64db6da87b
Merge pull request #860 from dropbox/pr/operator-errors 
Fix operator problems like those mentioned in GitHub issue #606
 2018-10-23 17:00:10 -07:00
Evan Tschannen
2a34115e65
Merge pull request #861 from etschannen/release-6.0 
small bug fix
 2018-10-23 16:54:30 -07:00
Evan Tschannen
a123c9c533 forgot to commit as part of the merge 2018-10-23 16:53:41 -07:00
Evan Tschannen
7e215b7e0c Merge branch 'release-6.0' of github.com:apple/foundationdb into release-6.0 
# Conflicts:
#	fdbserver/worker.actor.cpp
 2018-10-23 16:53:07 -07:00
Robert Escriva
47dd24a9fa Fix operator problems like those mentioned in GitHub issue #606 
So the code as written works well on older gcc, but does not like newer gcc.  I
don't fully know why member operators seem to be more in conflict with different
compiler versions, but experience has taught me to always use non-member
operators for maximum portability across compilers.

Make a small change to that effect here.

Signed-off-by: Robert Escriva <rescriva@dropbox.com>
 2018-10-23 23:24:34 +00:00
Evan Tschannen
890fb3f228
Merge pull request #821 from panghy/memory-fast-rollback 
Reuse KeyValueStore on rollback
 2018-10-22 16:40:30 -07:00
A.J. Beamon
0a296fc471
Merge pull request #797 from apkar/master 
Adding Flow documentation.
 2018-10-22 16:50:37 -04:00
Alex Miller
6bb1f4093d
Merge pull request #856 from dropbox/pr/include-fix 
Adjust all includes to be relative to the root.
 2018-10-22 09:51:55 -07:00
Robert Escriva
2f4c0fae99 Merge branch 'dboxfix' of https://github.com/alexmiller-apple/foundationdb into include-fix 
* 'dboxfix' of https://github.com/alexmiller-apple/foundationdb:
  Remove specifying non-root directory as a path to search for includes.
  Fix FDBLibTLS to specify includes from the root.
 2018-10-22 16:05:08 +00:00
Clement Pang
3a30621071
Merge branch 'release-6.0' into memory-fast-rollback 2018-10-21 12:48:46 +09:00
Alex Miller
e2fc1c9b95 Remove specifying non-root directory as a path to search for includes. 2018-10-19 18:56:45 -07:00
Alex Miller
7cd73468f1 Fix FDBLibTLS to specify includes from the root. 2018-10-19 18:56:36 -07:00
Clement Pang
3ceec01392 Address review comments. 2018-10-19 18:55:35 -07:00
Evan Tschannen
22b68d6cf3 fix: we need to get the result of the future before getting the error from the ErrorOr 2018-10-19 17:34:28 -07:00
Evan Tschannen
f31ec775a5
Merge pull request #858 from etschannen/master 
more windows build fixes
 2018-10-19 17:00:56 -07:00
Evan Tschannen
1ef29cbf0d more windows build fixes 2018-10-19 17:00:24 -07:00
Evan Tschannen
27e3c1c588
Merge pull request #857 from etschannen/master 
fixed windows build
 2018-10-19 13:29:47 -07:00
Evan Tschannen
888378c8cb fixed windows build 2018-10-19 13:28:32 -07:00
Robert Escriva
268093a96d Adjust all includes to be relative to the root. 
Remove the use of relative paths.  A header at foo/bar.h could be included by
files under foo/ with "bar.h", but would be included everywhere else as
"foo/bar.h".  Adjust so that every include references such a header with the
latter form.

Signed-off-by: Robert Escriva <rescriva@dropbox.com>
 2018-10-19 17:35:33 +00:00
Steve Atherton
bf6b3f57b1
Merge pull request #855 from etschannen/master 
fixed the windows build
 2018-10-18 20:29:59 -07:00
Evan Tschannen
8dd900a337 fixed the windows build 2018-10-18 20:26:45 -07:00
Evan Tschannen
5c52711f01
Merge pull request #854 from satherton/feature-redwood 
Fixed line endings.
 2018-10-18 19:56:05 -07:00
Stephen Atherton
3b641643cb Fixed line endings. 2018-10-18 19:46:58 -07:00
Evan Tschannen
db71b60d72
Merge pull request #819 from satherton/feature-redwood 
Redwood storage engine, initial/experimental version
 2018-10-18 18:38:11 -07:00
Evan Tschannen
22387d5438
Merge pull request #853 from etschannen/master 
merge 6.0 into master
 2018-10-18 17:04:28 -07:00
Evan Tschannen
ed7036139a Merge branch 'release-6.0' 
# Conflicts:
#	documentation/sphinx/source/release-notes.rst
#	fdbserver/DataDistribution.actor.cpp
#	fdbserver/storageserver.actor.cpp
 2018-10-18 17:00:52 -07:00
Evan Tschannen
39d35f8a96
Merge pull request #852 from etschannen/release-6.0 
Updated release notes
 2018-10-18 16:54:59 -07:00
Evan Tschannen
952b26d746 removed upgrade code from 2.0.3 2018-10-18 16:53:40 -07:00
Evan Tschannen
fc7f2f6431 added a release note for 6.0.14 2018-10-18 16:53:05 -07:00
Alex Miller
3c6dc9e24d
Merge pull request #851 from etschannen/release-6.0 
Added yields to prevent slow tasks when processes single versions with large amounts of data
 2018-10-18 16:13:04 -07:00
Evan Tschannen
9b6c7f253c changed a knob 2018-10-18 15:26:19 -07:00
Evan Tschannen
0b304495ad added a yield to the proxy when committing a large batch of mutations 2018-10-18 15:26:00 -07:00
Evan Tschannen
0613a34845 The storage server would block the main thread when processing a single version with a large amount of data 2018-10-18 13:37:31 -07:00