AlvinMooreSr · AlvinMooreSr · Apr 23, 2018 · Apr 24, 2018 · Apr 24, 2018 · Apr 22, 2018
diff --git a/FDBLibTLS/local.mk b/FDBLibTLS/local.mk
@@ -5,7 +5,7 @@ FDBLibTLS_LDFLAGS += -Wl,-soname,FDBLibTLS.so -Wl,--version-script=FDBLibTLS/FDB
 
 # The plugin isn't a typical library, so it feels more sensible to have a copy
 # of it in bin/.
-bin/FDBLibTLS.$(DLEXT): lib/libFDBLibTLS.$(DLEXT)
+bin/fdb-libressl-plugin.$(DLEXT): lib/libFDBLibTLS.$(DLEXT)
 	@cp $< $@
 
-TARGETS += bin/FDBLibTLS.$(DLEXT)
+TARGETS += bin/fdb-libressl-plugin.$(DLEXT)
diff --git a/bindings/c/test/performance_test.c b/bindings/c/test/performance_test.c
@@ -44,7 +44,6 @@ fdb_error_t waitError(FDBFuture *f) {
 
 struct RunResult run(struct ResultSet *rs, FDBDatabase *db, struct RunResult (*func)(struct ResultSet*, FDBTransaction*)) {
 	FDBTransaction *tr = NULL;
-	checkError(fdb_database_create_transaction(db, &tr), "create transaction", rs);
 	fdb_error_t e = fdb_database_create_transaction(db, &tr);
 	checkError(e, "create transaction", rs);
 
@@ -62,9 +61,11 @@ struct RunResult run(struct ResultSet *rs, FDBDatabase *db, struct RunResult (*f
 			fdb_error_t retryE = waitError(f);
 			fdb_future_destroy(f);
 			if (retryE) {
+				fdb_transaction_destroy(tr);
 				return (struct RunResult) {0, retryE};
 			}
 		} else {
+			fdb_transaction_destroy(tr);
 			return r;
 		}
 	}

diff --git a/bindings/c/test/ryw_benchmark.c b/bindings/c/test/ryw_benchmark.c
@@ -236,6 +236,7 @@ void runTests(struct ResultSet *rs) {
 	runTest(&clearRangeGetRange, tr, rs, "C: get range cached values with clear ranges throughput");
 	runTest(&interleavedSetsGets, tr, rs, "C: interleaved sets and gets on a single key throughput");
 
+	fdb_transaction_destroy(tr);
 	fdb_database_destroy(db);
 	fdb_stop_network();
 }

diff --git a/bindings/flow/tester/Tester.actor.cpp b/bindings/flow/tester/Tester.actor.cpp
@@ -1520,7 +1520,6 @@ struct UnitTestsFunc : InstructionFunc {
 		tr->setOption(FDBTransactionOption::FDB_TR_OPTION_READ_AHEAD_DISABLE);
 		tr->setOption(FDBTransactionOption::FDB_TR_OPTION_READ_SYSTEM_KEYS);
 		tr->setOption(FDBTransactionOption::FDB_TR_OPTION_ACCESS_SYSTEM_KEYS);
-		tr->setOption(FDBTransactionOption::FDB_TR_OPTION_DURABILITY_DEV_NULL_IS_WEB_SCALE);
 		const uint64_t timeout = 60*1000;
 		tr->setOption(FDBTransactionOption::FDB_TR_OPTION_TIMEOUT, Optional<StringRef>(StringRef((const uint8_t*)&timeout, 8)));
 		const uint64_t retryLimit = 50;

diff --git a/bindings/go/fdb-go-install.sh b/bindings/go/fdb-go-install.sh
@@ -167,7 +167,7 @@ else
 
         if [[ "${status}" -eq 0 ]] ; then
             destdir=$( cd "${destdir}" && pwd ) # Get absolute path of destination dir.
-            fdbdir="${destdir}/foundation"
+            fdbdir="${destdir}/foundationdb"
 
             if [[ ! -d "${destdir}" ]] ; then
                 cmd=("mkdir" "-p" "${destdir}")

diff --git a/bindings/go/src/_stacktester/stacktester.go b/bindings/go/src/_stacktester/stacktester.go
@@ -761,7 +761,6 @@ func (sm *StackMachine) processInst(idx int, inst tuple.Tuple) {
 			tr.Options().SetReadAheadDisable()
 			tr.Options().SetReadSystemKeys()
 			tr.Options().SetAccessSystemKeys()
-			tr.Options().SetDurabilityDevNullIsWebScale()
 			tr.Options().SetTimeout(60 * 1000)
 			tr.Options().SetRetryLimit(50)
 			tr.Options().SetMaxRetryDelay(100)

diff --git a/bindings/go/src/fdb/directory/directoryLayer.go b/bindings/go/src/fdb/directory/directoryLayer.go
@@ -27,6 +27,7 @@ import (
 	"encoding/binary"
 	"errors"
 	"fmt"
+
 	"github.com/apple/foundationdb/bindings/go/src/fdb"
 	"github.com/apple/foundationdb/bindings/go/src/fdb/subspace"
 	"github.com/apple/foundationdb/bindings/go/src/fdb/tuple"
@@ -78,9 +79,8 @@ func (dl directoryLayer) createOrOpen(rtr fdb.ReadTransaction, tr *fdb.Transacti
 	if prefix != nil && !dl.allowManualPrefixes {
 		if len(dl.path) == 0 {
 			return nil, errors.New("cannot specify a prefix unless manual prefixes are enabled")
-		} else {
-			return nil, errors.New("cannot specify a prefix in a partition")
 		}
+		return nil, errors.New("cannot specify a prefix in a partition")
 	}
 
 	if len(path) == 0 {
@@ -562,9 +562,8 @@ func (dl directoryLayer) contentsOfNode(node subspace.Subspace, path []string, l
 		ndl := NewDirectoryLayer(subspace.FromBytes(nssb), ss, false).(directoryLayer)
 		ndl.path = newPath
 		return directoryPartition{ndl, dl}, nil
-	} else {
-		return directorySubspace{ss, dl, newPath, layer}, nil
 	}
+	return directorySubspace{ss, dl, newPath, layer}, nil
 }
 
 func (dl directoryLayer) nodeWithPrefix(prefix []byte) subspace.Subspace {

diff --git a/bindings/go/src/fdb/directory/directoryPartition.go b/bindings/go/src/fdb/directory/directoryPartition.go
@@ -72,9 +72,8 @@ func (dp directoryPartition) GetLayer() []byte {
 func (dp directoryPartition) getLayerForPath(path []string) directoryLayer {
 	if len(path) == 0 {
 		return dp.parentDirectoryLayer
-	} else {
-		return dp.directoryLayer
 	}
+	return dp.directoryLayer
 }
 
 func (dp directoryPartition) MoveTo(t fdb.Transactor, newAbsolutePath []string) (DirectorySubspace, error) {

diff --git a/bindings/go/src/fdb/doc.go b/bindings/go/src/fdb/doc.go
@@ -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

diff --git a/bindings/go/src/fdb/fdb.go b/bindings/go/src/fdb/fdb.go
@@ -139,9 +139,8 @@ func APIVersion(version int) error {
 				maxSupportedVersion := C.fdb_get_max_api_version()
 				if headerVersion > int(maxSupportedVersion) {
 					return fmt.Errorf("This version of the FoundationDB Go binding is not supported by the installed FoundationDB C library. The binding requires a library that supports API version %d, but the installed library supports a maximum version of %d.", version, maxSupportedVersion)
-				} else {
-					return fmt.Errorf("API version %d is not supported by the installed FoundationDB C library.", version)
 				}
+				return fmt.Errorf("API version %d is not supported by the installed FoundationDB C library.", version)
 			}
 			return Error{int(e)}
 		}
@@ -326,9 +325,8 @@ func CreateCluster(clusterFile string) (Cluster, error) {
 func byteSliceToPtr(b []byte) *C.uint8_t {
 	if len(b) > 0 {
 		return (*C.uint8_t)(unsafe.Pointer(&b[0]))
-	} else {
-		return nil
 	}
+	return nil
 }
 
 // A KeyConvertible can be converted to a FoundationDB Key. All functions in the

diff --git a/bindings/go/src/fdb/generated.go b/bindings/go/src/fdb/generated.go
@@ -284,11 +284,6 @@ func (o TransactionOptions) SetDurabilityRisky() error {
 	return o.setOpt(120, nil)
 }
 
-// Not yet implemented.
-func (o TransactionOptions) SetDurabilityDevNullIsWebScale() error {
-	return o.setOpt(130, nil)
-}
-
 // Specifies that this transaction should be treated as highest priority and that lower priority transactions should block behind this one. Use is discouraged outside of low-level tools
 func (o TransactionOptions) SetPrioritySystemImmediate() error {
 	return o.setOpt(200, nil)

diff --git a/bindings/go/src/fdb/range.go b/bindings/go/src/fdb/range.go
@@ -247,7 +247,7 @@ func (ri *RangeIterator) fetchNextBatch() {
 		ri.sr.Begin = FirstGreaterThan(ri.kvs[ri.index-1].Key)
 	}
 
-	ri.iteration += 1
+	ri.iteration++
 
 	f := ri.t.doGetRange(ri.sr, ri.options, ri.snapshot, ri.iteration)
 	ri.f = &f
@@ -265,7 +265,7 @@ func (ri *RangeIterator) Get() (kv KeyValue, e error) {
 
 	kv = ri.kvs[ri.index]
 
-	ri.index += 1
+	ri.index++
 
 	if ri.index == len(ri.kvs) {
 		ri.fetchNextBatch()
@@ -291,7 +291,7 @@ func Strinc(prefix []byte) ([]byte, error) {
 		if prefix[i] != 0xFF {
 			ret := make([]byte, i+1)
 			copy(ret, prefix[:i+1])
-			ret[i] += 1
+			ret[i]++
 			return ret, nil
 		}
 	}

diff --git a/bindings/go/src/fdb/transaction.go b/bindings/go/src/fdb/transaction.go
@@ -352,9 +352,8 @@ func (t Transaction) Reset() {
 func boolToInt(b bool) int {
 	if b {
 		return 1
-	} else {
-		return 0
 	}
+	return 0
 }
 
 func (t *transaction) getKey(sel KeySelector, snapshot int) FutureKey {

diff --git a/bindings/go/src/fdb/tuple/tuple.go b/bindings/go/src/fdb/tuple/tuple.go
@@ -38,6 +38,7 @@ import (
 	"bytes"
 	"encoding/binary"
 	"fmt"
+
 	"github.com/apple/foundationdb/bindings/go/src/fdb"
 )
 
@@ -114,7 +115,7 @@ func encodeBytes(buf *bytes.Buffer, code byte, b []byte) {
 func bisectLeft(u uint64) int {
 	var n int
 	for sizeLimits[n] < u {
-		n += 1
+		n++
 	}
 	return n
 }
@@ -356,7 +357,7 @@ func decodeTuple(b []byte, nested bool) (Tuple, int, error) {
 			if err != nil {
 				return nil, i, err
 			}
-			off += 1
+			off++
 		default:
 			return nil, i, fmt.Errorf("unable to decode tuple element with unknown typecode %02x", b[i])
 		}

diff --git a/bindings/java/pom.xml.in b/bindings/java/pom.xml.in
@@ -4,27 +4,27 @@
                       http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
-  <groupId>com.apple.cie.foundationdb</groupId>
+  <groupId>org.foundationdb</groupId>
   <artifactId>NAME</artifactId>
   <version>VERSION</version>
   <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>
 
   <organization>
     <name>FoundationDB</name>
     <url>https://www.foundationdb.org</url>
   </organization>
-  
+
   <developers>
     <developer>
         <name>FoundationDB</name>
     </developer>
   </developers>
-  
+
   <scm>
     <url>http://0.0.0.0</url>
   </scm>

diff --git a/bindings/java/src/main/com/apple/foundationdb/tuple/Tuple.java b/bindings/java/src/main/com/apple/foundationdb/tuple/Tuple.java
@@ -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);
 	}
 
 	/**

diff --git a/bindings/java/src/test/com/apple/foundationdb/test/AsyncStackTester.java b/bindings/java/src/test/com/apple/foundationdb/test/AsyncStackTester.java
@@ -459,7 +459,6 @@ else if(op == StackOperation.UNIT_TESTS) {
 				tr.options().setReadAheadDisable();
 				tr.options().setReadSystemKeys();
 				tr.options().setAccessSystemKeys();
-				tr.options().setDurabilityDevNullIsWebScale();
 				tr.options().setTimeout(60*1000);
 				tr.options().setRetryLimit(50);
 				tr.options().setMaxRetryDelay(100);

diff --git a/bindings/java/src/test/com/apple/foundationdb/test/StackTester.java b/bindings/java/src/test/com/apple/foundationdb/test/StackTester.java
@@ -408,7 +408,6 @@ else if(op == StackOperation.UNIT_TESTS) {
 						tr.options().setReadAheadDisable();
 						tr.options().setReadSystemKeys();
 						tr.options().setAccessSystemKeys();
-						tr.options().setDurabilityDevNullIsWebScale();
 						tr.options().setTimeout(60*1000);
 						tr.options().setRetryLimit(50);
 						tr.options().setMaxRetryDelay(100);

diff --git a/bindings/python/README.rst b/bindings/python/README.rst
@@ -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/.
diff --git a/bindings/python/tests/tester.py b/bindings/python/tests/tester.py
@@ -132,7 +132,6 @@ def test_options(tr):
     tr.options.set_read_ahead_disable()
     tr.options.set_read_system_keys()
     tr.options.set_access_system_keys()
-    tr.options.set_durability_dev_null_is_web_scale()
     tr.options.set_timeout(60 * 1000)
     tr.options.set_retry_limit(50)
     tr.options.set_max_retry_delay(100)

diff --git a/bindings/ruby/fdb.gemspec.in b/bindings/ruby/fdb.gemspec.in
@@ -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
diff --git a/bindings/ruby/tests/tester.rb b/bindings/ruby/tests/tester.rb
@@ -439,7 +439,6 @@ def run
               tr.options.set_read_ahead_disable
               tr.options.set_read_system_keys
               tr.options.set_access_system_keys
-              tr.options.set_durability_dev_null_is_web_scale
               tr.options.set_timeout(60*1000)
               tr.options.set_retry_limit(50)
               tr.options.set_max_retry_delay(100)

diff --git a/build/packages.mk b/build/packages.mk
@@ -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/fdb-libressl-plugin.$(DLEXT)
+
+  packages: DEB RPM JAVA_RELEASE FDBTESTS FDBHEADERS FDBTLS
 
   packages_clean: DEB_clean RPM_clean JAVA_RELEASE_clean FDBHEADERS_clean