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

Merge pull request #296 from apple/release-5.1

Browse Source 
Merge Release 5.1 Into Release 5.2
This commit is contained in:
A.J. Beamon 2018-05-03 12:05:35 -07:00 committed by GitHub
commit d5f69ff596
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bindings/go/src/fdb/doc.go
View File

@ -25,7 +25,7 @@ Package fdb provides an interface to FoundationDB databases (version 2.0 or high
To build and run programs using this package, you must have an installed copy of
the FoundationDB client libraries (version 2.0.0 or later), available for Linux,
Windows and OS X at https://www.foundationdb.org/downloads/fdb-c/.
Windows and OS X at https://www.foundationdb.org/download/.
This documentation specifically applies to the FoundationDB Go binding. For more
extensive guidance to programming with FoundationDB, as well as API

2
bindings/java/pom.xml.in
View File

@ -10,7 +10,7 @@
<packaging>jar</packaging>
<name>foundationdb-java</name>
<description>Java bindings for the FoundationDB database. These bindings require the FoundationDB client, which is under a different license. The client can be obtained from https://www.foundationdb.org/downloads/fdb-c/.</description>
<description>Java bindings for the FoundationDB database. These bindings require the FoundationDB client, which is under a different license. The client can be obtained from https://www.foundationdb.org/download/.</description>
<inceptionYear>2010</inceptionYear>
<url>https://www.foundationdb.org</url>

4
bindings/java/src/main/com/apple/foundationdb/tuple/Tuple.java
View File

@ -73,12 +73,12 @@ public class Tuple implements Comparable<Tuple>, Iterable<Object> {
private List<Object> elements;
private Tuple(List<? extends Object> elements, Object newItem) {
this(new LinkedList<Object>(elements));
this(elements);
this.elements.add(newItem);
}
private Tuple(List<? extends Object> elements) {
this.elements = new ArrayList<Object>(elements);
this.elements = new ArrayList<>(elements);
}
/**

2
bindings/python/README.rst
View File

@ -1,3 +1,3 @@
Complete documentation of the FoundationDB Python API can be found at https://apple.github.io/foundationdb/api-python.html.
These bindings require the FoundationDB client. The client can be obtained from https://www.foundationdb.org/downloads/fdb-c/.
These bindings require the FoundationDB client. The client can be obtained from https://www.foundationdb.org/download/.

2
bindings/ruby/fdb.gemspec.in
View File

@ -18,5 +18,5 @@ EOF
s.license = 'Apache v2'
s.add_dependency('ffi', '>= 1.1.5')
s.required_ruby_version = '>= 1.9.3'
s.requirements << 'These bindings require the FoundationDB client. The client can be obtained from https://www.foundationdb.org/downloads/fdb-c/.'
s.requirements << 'These bindings require the FoundationDB client. The client can be obtained from https://www.foundationdb.org/download/.'
end

4
build/packages.mk
View File

@ -121,7 +121,9 @@ ifeq ($(PLATFORM),linux)
@rm -f packages/foundationdb-server-*.rpm packages/foundationdb-clients-*.rpm
@packaging/rpm/buildrpms.sh $(VERSION) $(PKGRELEASE)
packages: DEB RPM JAVA_RELEASE FDBTESTS FDBHEADERS
FDBTLS: bin/FDBLibTLS.$(DLEXT)
packages: DEB RPM JAVA_RELEASE FDBTESTS FDBHEADERS FDBTLS
packages_clean: DEB_clean RPM_clean JAVA_RELEASE_clean FDBHEADERS_clean

4
documentation/sphinx/source/class-scheduling-go.rst
View File

@ -149,8 +149,8 @@ FoundationDB includes a few modules that make it easy to model data using this a
The :mod:`directory` module lets us open a :ref:`directory <developer-guide-directories>` in the database::
schedulingDir, err := directory.CreateOrOpen(db, []string{"scheduling"}, nil)
if e != nil {
log.Fatal(e)
if err != nil {
log.Fatal(err)
}
The :func:`CreateOrOpen` function returns a :ref:`subspace <developer-guide-sub-keyspaces>` where we'll store our application data. Each subspace has a fixed prefix it uses when defining keys. The prefix corresponds to the first element of a tuple. We decided that we wanted ``"attends"`` and ``"class"`` as our prefixes, so we'll create new subspaces for them within the ``scheduling`` subspace.::