Merge branch 'master' into feature-proxy-load-balance

# Conflicts: # fdbclient/NativeAPI.actor.cpp # fdbserver/MasterProxyServer.actor.cpp # flow/Knobs.cpp
2020-05-01 09:19:39 -07:00 · 2020-05-01 09:19:39 -07:00 · aed2d34bcb
parent 83ad9caf54 b3698ac921
commit aed2d34bcb
569 changed files with 38820 additions and 19690 deletions
--- a/.gitignore
+++ b/.gitignore
@ -81,6 +81,11 @@ compile_commands.json
 flow/actorcompiler/obj
 flow/coveragetool/obj

+# IDE indexing (commonly used tools)
+/compile_commands.json
+/.ccls-cache
+/.clangd
+
 # Temporary and user configuration files
 *~
 *.orig
@ -89,5 +94,4 @@ flow/coveragetool/obj
 .envrc
 .DS_Store
 temp/
-/compile_commands.json
-/.ccls-cache
+/versions.target
--- a/38
+++ b/38
@ -479,3 +479,41 @@ SHIBUKAWA Yoshiki (sphinxcontrib-rubydomain)
 	THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 	(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 	OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Armon Dadgar (ART)
+    Copyright (c) 2012, Armon Dadgar
+    All rights reserved.
+
+    Redistribution and use in source and binary forms, with or without
+           modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+           notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+           notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+    * Neither the name of the organization nor the
+    names of its contributors may be used to endorse or promote products
+    derived from this software without specific prior written permission.
+
+    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+           ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+    WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+    DISCLAIMED. IN NO EVENT SHALL ARMON DADGAR BE LIABLE FOR ANY
+    DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+    (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+    LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+           ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+           (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Copyright (C) 2009 The Guava Authors
+	
+	Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
+	in compliance with the License. You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+ 	Unless required by applicable law or agreed to in writing, software distributed under the License
+	is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+	or implied. See the License for the specific language governing permissions and limitations under
+	the License.
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -18,7 +18,7 @@
 # limitations under the License.
 cmake_minimum_required(VERSION 3.13)
 project(foundationdb
-  VERSION 7.0.0
+  VERSION 6.3.0
  DESCRIPTION "FoundationDB is a scalable, fault-tolerant, ordered key-value store with full ACID transactions."
  HOMEPAGE_URL "http://www.foundationdb.org/"
  LANGUAGES C CXX ASM)
@ -80,42 +80,10 @@ message(STATUS "Current git version ${CURRENT_GIT_VERSION}")
 # Version information
 ################################################################################

-if(NOT WIN32)
-  add_custom_target(version_file ALL DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/versions.target)
-  execute_process(
-    COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/build/get_version.sh ${CMAKE_CURRENT_SOURCE_DIR}/versions.target
-    OUTPUT_VARIABLE FDB_VERSION_WNL)
-  execute_process(
-    COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/build/get_package_name.sh ${CMAKE_CURRENT_SOURCE_DIR}/versions.target
-    OUTPUT_VARIABLE FDB_PACKAGE_NAME_WNL)
-  string(STRIP "${FDB_VERSION_WNL}" FDB_VERSION_TARGET_FILE)
-  string(STRIP "${FDB_PACKAGE_NAME_WNL}" FDB_PACKAGE_NAME_TARGET_FILE)
-endif()
-
-set(USE_VERSIONS_TARGET OFF CACHE BOOL "Use the deprecated versions.target file")
-if(USE_VERSIONS_TARGET)
-  if (WIN32)
-    message(FATAL_ERROR "USE_VERSION_TARGET us not supported on Windows")
-  endif()
-  set(FDB_VERSION ${FDB_VERION_TARGET_FILE})
-  set(FDB_PACKAGE_NAME ${FDB_PACKAGE_NAME_TARGET_FILE})
-  set(FDB_VERSION_PLAIN ${FDB_VERSION})
-else()
-  set(FDB_PACKAGE_NAME "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}")
-  set(FDB_VERSION ${PROJECT_VERSION})
-  set(FDB_VERSION_PLAIN ${FDB_VERSION})
-  if(NOT WIN32)
-    # we need to assert that the cmake version is in sync with the target version
-    if(NOT (FDB_VERSION STREQUAL FDB_VERSION_TARGET_FILE))
-      message(SEND_ERROR "The project version in cmake is set to ${FDB_VERSION},\
- but versions.target has it at ${FDB_VERSION_TARGET_FILE}")
-    endif()
-    if(NOT (FDB_PACKAGE_NAME STREQUAL FDB_PACKAGE_NAME_TARGET_FILE))
-      message(SEND_ERROR "The package name in cmake is set to ${FDB_PACKAGE_NAME},\
- but versions.target has it set to ${FDB_PACKAGE_NAME_TARGET_FILE}")
-    endif()
-  endif()
-endif()
+set(FDB_PACKAGE_NAME "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}")
+set(FDB_VERSION ${PROJECT_VERSION})
+set(FDB_VERSION_PLAIN ${FDB_VERSION})
+configure_file(${CMAKE_SOURCE_DIR}/versions.target.cmake ${CMAKE_SOURCE_DIR}/versions.target)

 message(STATUS "FDB version is ${FDB_VERSION}")
 message(STATUS "FDB package name is ${FDB_PACKAGE_NAME}")
@ -178,10 +146,11 @@ set(SEED "0x${SEED_}" CACHE STRING "Random seed for testing")
 # components
 ################################################################################

-include(CompileBoost)
-if(WITH_TLS)
-  add_subdirectory(FDBLibTLS)
+if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
+  include_directories(/usr/local/include)
 endif()
+
+include(CompileBoost)
 add_subdirectory(flow)
 add_subdirectory(fdbrpc)
 add_subdirectory(fdbclient)
@ -192,13 +161,15 @@ if(NOT WIN32)
 else()
  add_subdirectory(fdbservice)
 endif()
-add_subdirectory(bindings)
 add_subdirectory(fdbbackup)
+add_subdirectory(contrib)
 add_subdirectory(tests)
+if(WITH_PYTHON)
+  add_subdirectory(bindings)
+endif()
 if(WITH_DOCUMENTATION)
  add_subdirectory(documentation)
 endif()
-add_subdirectory(contrib/monitoring)

 if(WIN32)
  add_subdirectory(packaging/msi)
@ -206,17 +177,21 @@ else()
  include(CPack)
 endif()

+if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
+  add_link_options(-lexecinfo)
+endif()
+
 ################################################################################
 # process compile commands for IDE
 ################################################################################

-if (CMAKE_EXPORT_COMPILE_COMMANDS)
+if (CMAKE_EXPORT_COMPILE_COMMANDS AND WITH_PYTHON)
  add_custom_command(
-	OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/compile_commands.json
-	COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/build/gen_compile_db.py
-	ARGS -b ${CMAKE_CURRENT_BINARY_DIR} -s ${CMAKE_CURRENT_SOURCE_DIR} -o ${CMAKE_CURRENT_SOURCE_DIR}/compile_commands.json ${CMAKE_CURRENT_BINARY_DIR}/compile_commands.json
-	DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/build/gen_compile_db.py ${CMAKE_CURRENT_BINARY_DIR}/compile_commands.json
-	COMMENT "Build compile commands for IDE"
+	  OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/compile_commands.json
+	  COMMAND $<TARGET_FILE:Python::Interpreter> ${CMAKE_CURRENT_SOURCE_DIR}/build/gen_compile_db.py
+	  ARGS -b ${CMAKE_CURRENT_BINARY_DIR} -s ${CMAKE_CURRENT_SOURCE_DIR} -o ${CMAKE_CURRENT_SOURCE_DIR}/compile_commands.json ${CMAKE_CURRENT_BINARY_DIR}/compile_commands.json
+	  DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/build/gen_compile_db.py ${CMAKE_CURRENT_BINARY_DIR}/compile_commands.json
+	  COMMENT "Build compile commands for IDE"
 	)
  add_custom_target(processed_compile_commands ALL DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/compile_commands.json ${CMAKE_CURRENT_BINARY_DIR}/compile_commands.json)
 endif()
--- a/FDBLibTLS/CMakeLists.txt
+++ b/FDBLibTLS/CMakeLists.txt
@ -9,4 +9,4 @@ set(SRCS
  FDBLibTLSVerify.h)

 add_library(FDBLibTLS STATIC ${SRCS})
-target_link_libraries(FDBLibTLS PUBLIC LibreSSL boost_target PRIVATE flow)
+target_link_libraries(FDBLibTLS PUBLIC OpenSSL::SSL boost_target PRIVATE flow)
--- a/FDBLibTLS/FDBLibTLS.vcxproj
+++ b/FDBLibTLS/FDBLibTLS.vcxproj
@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.1" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|X64">
-      <Configuration>Debug</Configuration>
-      <Platform>X64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|X64">
-      <Configuration>Release</Configuration>
-      <Platform>X64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="FDBLibTLSPlugin.h" />
-    <ClCompile Include="FDBLibTLSPlugin.cpp" />
-    <ClInclude Include="FDBLibTLSPolicy.h" />
-    <ClCompile Include="FDBLibTLSPolicy.cpp" />
-    <ClInclude Include="FDBLibTLSVerify.h" />
-    <ClCompile Include="FDBLibTLSVerify.cpp" />
-    <ClInclude Include="FDBLibTLSSession.h" />
-    <ClCompile Include="FDBLibTLSSession.cpp" />
-  </ItemGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|X64'" Label="Configuration">
-		<ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|X64'" Label="Configuration">
-		<ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-</Project>
--- a/FDBLibTLS/FDBLibTLSPolicy.cpp
+++ b/FDBLibTLS/FDBLibTLSPolicy.cpp
@ -300,7 +300,7 @@ bool FDBLibTLSPolicy::set_verify_peers(int count, const uint8_t* verify_peers[],
 			}
 			Reference<FDBLibTLSVerify> verify = Reference<FDBLibTLSVerify>(new FDBLibTLSVerify(verifyString.substr(start)));
 			verify_rules.push_back(verify);
-		} catch ( const std::runtime_error& e ) {
+		} catch ( const std::runtime_error& ) {
 			verify_rules.clear();
 			std::string verifyString((const char*)verify_peers[i], verify_peers_len[i]);
 			TraceEvent(SevError, "FDBLibTLSVerifyPeersParseError").detail("Config", verifyString);
--- a/FDBLibTLS/FDBLibTLSSession.cpp
+++ b/FDBLibTLS/FDBLibTLSSession.cpp
@ -347,7 +347,7 @@ bool FDBLibTLSSession::verify_peer() {
 		if(now() - lastVerifyFailureLogged > 1.0) {
 			for (std::string reason : verify_failure_reasons) {
 				lastVerifyFailureLogged = now();
-				TraceEvent("FDBLibTLSVerifyFailure", uid).detail("Reason", reason);
+				TraceEvent("FDBLibTLSVerifyFailure", uid).suppressFor(1.0).detail("Reason", reason);
 			}
 		}
 	}
--- a/FDBLibTLS/Makefile
+++ b/FDBLibTLS/Makefile
@ -1,109 +0,0 @@
-PROJECTPATH = $(dir $(realpath $(firstword $(MAKEFILE_LIST))))
-PLUGINPATH = $(PROJECTPATH)/$(PLUGIN)
-
-CFLAGS ?= -O2 -g
-
-CXXFLAGS ?= -std=c++0x
-
-CFLAGS += -I/usr/local/include -I../flow -I../fdbrpc
-LDFLAGS += -L/usr/local/lib
-
-LIBS += -ltls -lssl -lcrypto
-
-PLATFORM := $(shell uname)
-ifneq ($(PLATFORM),Darwin)
-	PLATFORM := $(shell uname -o)
-endif
-
-ifeq ($(PLATFORM),Cygwin)
-	HOST := x86_64-w64-mingw32
-	CC := $(HOST)-gcc
-	CXX := $(HOST)-g++
-	STRIP := $(HOST)-strip --strip-all
-
-	DYEXT = dll
-	PLUGINPATH = $(PLUGIN)
-
-	LIBS += -static-libstdc++ -static-libgcc
-	LIBS += -lws2_32
-
-	LINK_LDFLAGS = -shared
-	LINK_LDFLAGS += -Wl,-soname,$(PLUGIN)
-	LINK_LDFLAGS += -Wl,--version-script=FDBLibTLS.map
-	LINK_LDFLAGS += -Wl,-Bstatic $(LIBS) -Wl,-Bdynamic
-
-else ifeq ($(PLATFORM),Darwin)
-	CC := clang
-	CXX := clang++
-	STRIP := strip -S -x
-
-	CFLAGS += -fPIC
-
-	DYEXT = dylib
-
-	vpath %.a /usr/local/lib
-	.LIBPATTERNS = lib%.a lib%.dylib lib%.so
-
-	LINK_LDFLAGS = -shared
-	LINK_LDFLAGS += -Wl,-exported_symbols_list,FDBLibTLS.symbols
-	LINK_LDFLAGS += -Wl,-dylib_install_name,$(PLUGIN)
-	LINK_LDFLAGS += $(LIBS)
-
-else ifeq ($(PLATFORM),GNU/Linux)
-	CC := clang
-	CXX := clang++
-	STRIP := strip --strip-all
-
-	CFLAGS += -fPIC
-	DYEXT = so
-
-	LIBS += -static-libstdc++ -static-libgcc -lrt
-
-	LINK_LDFLAGS = -shared
-	LINK_LDFLAGS += -Wl,-soname,$(PLUGIN)
-	LINK_LDFLAGS += -Wl,--version-script=FDBLibTLS.map
-	LINK_LDFLAGS += -Wl,-Bstatic $(LIBS) -Wl,-Bdynamic
-
-else
-$(error Unknown platform $(PLATFORM))
-endif
-
-PLUGIN := FDBLibTLS.$(DYEXT)
-OBJECTS := FDBLibTLSPlugin.o FDBLibTLSPolicy.o FDBLibTLSSession.o FDBLibTLSVerify.o
-LINKLINE := $(CXXFLAGS) $(CFLAGS) $(LDFLAGS) $(OBJECTS) $(LINK_LDFLAGS) -o $(PLUGIN)
-
-all: $(PLUGIN)
-
-build-depends-linux:
-	apt install clang make libboost-dev
-
-clean:
-	@rm -f *.o *.d $(PLUGIN) plugin-test verify-test
-	@rm -rf *.dSYM
-
-DEPS := $(patsubst %.o,%.d,$(OBJECTS))
-include $(DEPS)
-
-$(OBJECTS): %.o: %.cpp Makefile
-	@echo "Compiling $<"
-	@$(CXX) $(CXXFLAGS) $(CFLAGS) $(INCLUDES) -c $< -o $@ -MD -MP
-
-$(PLUGIN): $(OBJECTS) Makefile
-	@echo "Linking   $@"
-	@$(CXX) $(LINKLINE)
-	@echo "Stripping $@"
-	@$(STRIP) $@
-
-test: test-plugin test-verify
-
-test-plugin: plugin-test.cpp $(PLUGIN) Makefile
-	@echo "Compiling plugin-test"
-	@$(CXX) $(CXXFLAGS) $(CFLAGS) plugin-test.cpp -ldl -o plugin-test
-	@echo "Running   plugin-test..."
-	@$(PROJECTPATH)/plugin-test $(PLUGINPATH)
-
-test-verify: verify-test.cpp $(OBJECTS) Makefile
-	@echo "Compiling verify-test"
-	@$(CXX) $(CXXFLAGS) $(CFLAGS) $(LDFLAGS) $(OBJECTS) verify-test.cpp $(LIBS) -o verify-test
-	@echo "Running   verify-test..."
-	@$(PROJECTPATH)/verify-test
--- a/FDBLibTLS/local.mk
+++ b/FDBLibTLS/local.mk
@ -1,28 +0,0 @@
-#
-# local.mk
-#
-# This source file is part of the FoundationDB open source project
-#
-# Copyright 2013-2018 Apple Inc. and the FoundationDB project authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# -*- mode: makefile; -*-
-
-FDBLibTLS_BUILD_SOURCES +=
-
-
-FDBLibTLS_CFLAGS := -fPIC -I/usr/local/include -isystem$(BOOSTDIR) -I. -DUSE_UCONTEXT
-
-lib/libFDBLibTLS.a: bin/coverage.FDBLibTLS.xml
--- a/248
+++ b/248
@ -1,248 +0,0 @@
-export
-PLATFORM := $(shell uname)
-ARCH := $(shell uname -m)
-TOPDIR := $(shell pwd)
-
-# Allow custom libc++ hack for Ubuntu
-ifeq ("$(wildcard /etc/centos-release)", "")
-  LIBSTDCPP_HACK ?= 1
-endif
-
-ifeq ($(ARCH),x86_64)
-  ARCH := x64
-else
-  $(error Not prepared to compile on $(ARCH))
-endif
-
-MONO := $(shell which mono 2>/dev/null)
-ifeq ($(MONO),)
-  MONO := /usr/bin/mono
-endif
-
-MCS := $(shell which mcs 2>/dev/null)
-ifeq ($(MCS),)
-  MCS := $(shell which dmcs 2>/dev/null)
-endif
-ifeq ($(MCS),)
-  MCS := /usr/bin/mcs
-endif
-
-CFLAGS := -Werror -Wno-error=format -fPIC -DNO_INTELLISENSE -fvisibility=hidden -DNDEBUG=1 -Wreturn-type -fno-omit-frame-pointer
-ifeq ($(RELEASE),true)
-	CFLAGS += -DFDB_CLEAN_BUILD
-endif
-ifeq ($(NIGHTLY),true)
-	CFLAGS += -DFDB_CLEAN_BUILD
-endif
-
-BOOST_BASENAME ?= boost_1_67_0
-ifeq ($(PLATFORM),Linux)
-  PLATFORM := linux
-
-  CC ?= gcc
-  CXX ?= g++
-
-  ifneq '' '$(findstring clang++,$(CXX))'
-    CXXFLAGS += -Wno-undefined-var-template -Wno-unknown-warning-option -Wno-unused-command-line-argument -Wno-register -Wno-logical-op-parentheses
-  else
-    CXXFLAGS += -Wno-attributes
-  endif
-
-  CXXFLAGS += -std=c++17
-
-  BOOST_BASEDIR ?= /opt
-  TLS_LIBDIR ?= /usr/local/lib
-  DLEXT := so
-  java_DLEXT := so
-  TARGET_LIBC_VERSION ?= 2.11
-else ifeq ($(PLATFORM),Darwin)
-  PLATFORM := osx
-
-  CC := /usr/bin/clang
-  CXX := /usr/bin/clang
-
-  CFLAGS += -mmacosx-version-min=10.14 -stdlib=libc++
-  CXXFLAGS += -mmacosx-version-min=10.14 -std=c++17 -stdlib=libc++ -msse4.2 -Wno-undefined-var-template -Wno-unknown-warning-option
-
-  .LIBPATTERNS := lib%.dylib lib%.a
-
-  BOOST_BASEDIR ?= ${HOME}
-  TLS_LIBDIR ?= /usr/local/lib
-  DLEXT := dylib
-  java_DLEXT := jnilib
-else
-  $(error Not prepared to compile on platform $(PLATFORM))
-endif
-BOOSTDIR ?= ${BOOST_BASEDIR}/${BOOST_BASENAME}
-
-CCACHE := $(shell which ccache 2>/dev/null)
-ifneq ($(CCACHE),)
-  CCACHE_CC := $(CCACHE) $(CC)
-  CCACHE_CXX := $(CCACHE) $(CXX)
-else
-  CCACHE_CC := $(CC)
-  CCACHE_CXX := $(CXX)
-endif
-
-# Default variables don't get pushed into the environment, but scripts in build/
-# rely on the existence of CC in the environment.
-ifeq ($(origin CC), default)
-  CC := $(CC)
-endif
-
-ACTORCOMPILER := bin/actorcompiler.exe
-
-# UNSTRIPPED := 1
-
-# Normal optimization level
-CFLAGS += -O2
-
-# Or turn off optimization entirely
-# CFLAGS += -O0
-
-# Debugging symbols are a good thing (and harmless, since we keep them
-# in external debug files)
-CFLAGS += -g
-
-# valgrind-compatibile builds are enabled by uncommenting lines in valgind.mk
-
-# Define the TLS compilation and link variables
-ifdef TLS_DISABLED
-CFLAGS += -DTLS_DISABLED
-FDB_TLS_LIB :=
-TLS_LIBS :=
-else
-FDB_TLS_LIB := lib/libFDBLibTLS.a
-TLS_LIBS += $(addprefix $(TLS_LIBDIR)/,libtls.a libssl.a libcrypto.a)
-endif
-
-CXXFLAGS += -Wno-deprecated -DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED
-LDFLAGS :=
-LIBS :=
-STATIC_LIBS :=
-
-# Add library search paths (that aren't -Llib) to the VPATH
-VPATH += $(addprefix :,$(filter-out lib,$(patsubst -L%,%,$(filter -L%,$(LDFLAGS)))))
-
-CS_PROJECTS := flow/actorcompiler flow/coveragetool fdbclient/vexillographer
-CPP_PROJECTS := flow fdbrpc fdbclient fdbbackup fdbserver fdbcli bindings/c bindings/java fdbmonitor bindings/flow/tester bindings/flow
-ifndef TLS_DISABLED
-CPP_PROJECTS += FDBLibTLS
-endif
-OTHER_PROJECTS := bindings/python bindings/ruby bindings/go
-
-CS_MK_GENERATED := $(CS_PROJECTS:=/generated.mk)
-CPP_MK_GENERATED := $(CPP_PROJECTS:=/generated.mk)
-
-MK_GENERATED := $(CS_MK_GENERATED) $(CPP_MK_GENERATED)
-
-# build/valgrind.mk needs to be included before any _MK_GENERATED (which in turn includes local.mk)
-MK_INCLUDE := build/scver.mk build/valgrind.mk $(CS_MK_GENERATED) $(CPP_MK_GENERATED) $(OTHER_PROJECTS:=/include.mk) build/packages.mk
-
-ALL_MAKEFILES := Makefile $(MK_INCLUDE) $(patsubst %/generated.mk,%/local.mk,$(MK_GENERATED))
-
-TARGETS =
-
-.PHONY: clean all Makefiles
-
-default: fdbserver fdbbackup fdbcli fdb_c fdb_python fdb_python_sdist
-
-all: $(CS_PROJECTS) $(CPP_PROJECTS) $(OTHER_PROJECTS)
-
-# These are always defined and ready to use. Any target that uses them and needs them up to date
-#  should depend on versions.target
-VERSION := $(shell cat versions.target | grep '<Version>' | sed -e 's,^[^>]*>,,' -e 's,<.*,,')
-PACKAGE_NAME := $(shell cat versions.target | grep '<PackageName>' | sed -e 's,^[^>]*>,,' -e 's,<.*,,')
-
-versions.h: Makefile versions.target
-	@rm -f $@
-ifeq ($(RELEASE),true)
-	@echo "#define FDB_VT_VERSION \"$(VERSION)\"" >> $@
-else
-	@echo "#define FDB_VT_VERSION \"$(VERSION)-PRERELEASE\"" >> $@
-endif
-	@echo "#define FDB_VT_PACKAGE_NAME \"$(PACKAGE_NAME)\"" >> $@
-
-bindings: fdb_c fdb_python fdb_ruby fdb_java fdb_flow fdb_flow_tester fdb_go fdb_go_tester fdb_c_tests
-
-Makefiles: $(MK_GENERATED)
-
-$(CS_MK_GENERATED): build/csprojtom4.py build/csproj.mk Makefile
-	@echo "Creating       $@"
-	@python build/csprojtom4.py $(@D)/*.csproj | m4 -DGENDIR="$(@D)" -DGENNAME=`basename $(@D)/*.csproj .csproj` - build/csproj.mk > $(@D)/generated.mk
-
-$(CPP_MK_GENERATED): build/vcxprojtom4.py build/vcxproj.mk Makefile
-	@echo "Creating       $@"
-	@python build/vcxprojtom4.py $(@D)/*.vcxproj | m4 -DGENDIR="$(@D)" -DGENNAME=`basename $(@D)/*.vcxproj .vcxproj` - build/vcxproj.mk > $(@D)/generated.mk
-
-DEPSDIR := .deps
-OBJDIR := .objs
-CMDDIR := .cmds
-
-COMPILE_COMMANDS_JSONS := $(addprefix $(CMDDIR)/,$(addsuffix /compile_commands.json,${CPP_PROJECTS}))
-compile_commands.json: build/concatinate_jsons.py ${COMPILE_COMMANDS_JSONS}
-	@build/concatinate_jsons.py ${COMPILE_COMMANDS_JSONS}
-
-include $(MK_INCLUDE)
-
-clean: $(CLEAN_TARGETS) docpreview_clean
-	@echo "Cleaning       toplevel"
-	@rm -rf $(OBJDIR)
-	@rm -rf $(DEPSDIR)
-	@rm -rf lib/
-	@rm -rf bin/coverage.*.xml
-	@rm -rf $(CMDDIR) compile_commands.json
-	@find . -name "*.g.cpp" -exec rm -f {} \; -or -name "*.g.h" -exec rm -f {} \;
-
-targets:
-	@echo "Available targets:"
-	@for i in $(sort $(TARGETS)); do echo "  $$i" ; done
-	@echo "Append _clean to clean specific target."
-
-lib/libstdc++.a: $(shell $(CC) -print-file-name=libstdc++_pic.a)
-	@echo "Frobnicating   $@"
-	@mkdir -p lib
-	@rm -rf .libstdc++
-	@mkdir .libstdc++
-	@(cd .libstdc++ && ar x $<)
-	@for i in .libstdc++/*.o ; do \
-		nm $$i | grep -q \@ || continue ; \
-		nm $$i | awk '$$3 ~ /@@/ { COPY = $$3; sub(/@@.*/, "", COPY); print $$3, COPY; }' > .libstdc++/replacements ; \
-		objcopy --redefine-syms=.libstdc++/replacements $$i $$i.new && mv $$i.new $$i ; \
-		rm .libstdc++/replacements ; \
-		nm $$i | awk '$$3 ~ /@/ { print $$3; }' > .libstdc++/deletes ; \
-		objcopy --strip-symbols=.libstdc++/deletes $$i $$i.new && mv $$i.new $$i ; \
-		rm .libstdc++/deletes ; \
-	done
-	@ar rcs $@ .libstdc++/*.o
-	@rm -r .libstdc++
-
-
-docpreview: javadoc
-	@echo "Generating     docpreview"
-	@TARGETS= $(MAKE) -C documentation docpreview
-
-docpreview_clean:
-	@echo "Cleaning       docpreview"
-	@CLEAN_TARGETS= $(MAKE) -C documentation -s --no-print-directory docpreview_clean
-
-packages/foundationdb-docs-$(VERSION).tar.gz: FORCE javadoc
-	@echo "Packaging      documentation"
-	@TARGETS= $(MAKE) -C documentation docpackage
-	@mkdir -p packages
-	@rm -f packages/foundationdb-docs-$(VERSION).tar.gz
-	@cp documentation/sphinx/.dist/foundationdb-docs-$(VERSION).tar.gz packages/foundationdb-docs-$(VERSION).tar.gz
-
-docpackage: packages/foundationdb-docs-$(VERSION).tar.gz
-
-FORCE:
-
-.SECONDEXPANSION:
-
-bin/coverage.%.xml: bin/coveragetool.exe $$(%_ALL_SOURCES)
-	@echo "Creating       $@"
-	@$(MONO) bin/coveragetool.exe $@ $(filter-out $<,$^) >/dev/null
-
-$(CPP_MK_GENERATED): $$(@D)/*.vcxproj
-
-$(CS_MK_GENERATED): $$(@D)/*.csproj
--- a/README.md
+++ b/README.md
@ -33,6 +33,10 @@ CMake-based build system. Both of them should currently work for most users,
 and CMake should be the preferred choice as it will eventually become the only
 build system available.

+If compiling for local development, please set `-DUSE_WERROR=ON` in
+cmake. Our CI compiles with `-Werror` on, so this way you'll find out about
+compiler warnings that break the build earlier.
+
 ## CMake

 To build with CMake, generally the following is required (works on Linux and
@ -47,8 +51,8 @@ Mac OS - for Windows see below):
 1. Create a build directory (you can have the build directory anywhere you
   like): `mkdir build`
 1. `cd build`
-1. `cmake -DBOOST_ROOT=<PATH_TO_BOOST> <PATH_TO_FOUNDATIONDB_DIRECTORY>`
-1. `make`
+1. `cmake -GNinja -DBOOST_ROOT=<PATH_TO_BOOST> <PATH_TO_FOUNDATIONDB_DIRECTORY>`
+1. `ninja`

 CMake will try to find its dependencies. However, for LibreSSL this can be often
 problematic (especially if OpenSSL is installed as well). For that we recommend
@ -57,7 +61,7 @@ LibreSSL is installed under `/usr/local/libressl-2.8.3`, you should call cmake l
 this:

 ```
-cmake -DLibreSSL_ROOT=/usr/local/libressl-2.8.3/ ../foundationdb
+cmake -GNinja -DLibreSSL_ROOT=/usr/local/libressl-2.8.3/ ../foundationdb
 ```

 FoundationDB will build just fine without LibreSSL, however, the resulting
@ -119,6 +123,37 @@ cmake -G Xcode -DOPEN_FOR_IDE=ON <FDB_SOURCE_DIRECTORY>
 You should create a second build-directory which you will use for building
 (probably with make or ninja) and debugging.

+#### FreeBSD
+
+1. Check out this repo on your server.
+1. Install compile-time dependencies from ports.
+1. (Optional) Use tmpfs & ccache for significantly faster repeat builds
+1. (Optional) Install a [JDK](https://www.freshports.org/java/openjdk8/)
+   for Java Bindings. FoundationDB currently builds with Java 8.
+1. Navigate to the directory where you checked out the foundationdb
+   repo.
+1. Build from source.
+
+    ```shell
+    sudo pkg install -r FreeBSD \
+        shells/bash devel/cmake devel/ninja devel/ccache  \
+        lang/mono lang/python3 \
+        devel/boost-libs devel/libeio \
+        security/openssl
+    mkdir .build && cd .build
+    cmake -G Ninja \
+        -DUSE_CCACHE=on \
+        -DDISABLE_TLS=off \
+        -DUSE_DTRACE=off \
+        ..
+    ninja -j 10
+    # run fast tests
+    ctest -L fast
+    # run all tests
+    ctest --output-on-failure -v
+    ```
+
+
 ### Linux

 There are no special requirements for Linux.  A docker image can be pulled from
@ -129,31 +164,31 @@ If you want to create a package you have to tell cmake what platform it is for.
 And then you can build by simply calling `cpack`. So for debian, call:

 ```
-cmake -DINSTALL_LAYOUT=DEB  <FDB_SOURCE_DIR>
-make
-cpack
+cmake -GNinja <FDB_SOURCE_DIR>
+ninja
+cpack -G DEB
 ```

 For RPM simply replace `DEB` with `RPM`.

 ### MacOS

-The build under MacOS will work the same way as on Linux. To get LibreSSL and boost you
-can use [Homebrew](https://brew.sh/). LibreSSL will not be installed in
-`/usr/local` instead it will stay in `/usr/local/Cellar`. So the cmake command
-will look something like this:
+The build under MacOS will work the same way as on Linux. To get LibreSSL,
+boost, and ninja you can use [Homebrew](https://brew.sh/). LibreSSL will not be
+installed in `/usr/local` instead it will stay in `/usr/local/Cellar`. So the
+cmake command will look something like this:

 ```sh
-cmake -DLibreSSL_ROOT=/usr/local/Cellar/libressl/2.8.3 <PATH_TO_FOUNDATIONDB_SOURCE>
+cmake -GNinja -DLibreSSL_ROOT=/usr/local/Cellar/libressl/2.8.3 <PATH_TO_FOUNDATIONDB_SOURCE>
 ```

 To generate a installable package, you have to call CMake with the corresponding
 arguments and then use cpack to generate the package:

 ```sh
-cmake -DINSTALL_LAYOUT=OSX  <FDB_SOURCE_DIR>
-make
-cpack
+cmake -GNinja <FDB_SOURCE_DIR>
+ninja
+cpack -G productbuild
 ```

 ### Windows
@ -202,37 +237,3 @@ will automatically find it and build with TLS support.
 If you installed WIX before running `cmake` you should find the
 `FDBInstaller.msi` in your build directory under `packaging/msi`. 

-## Makefile (Deprecated - all users should transition to using cmake)
-
-#### MacOS
-
-1. Check out this repo on your Mac.
-1. Install the Xcode command-line tools.
-1. Download version 1.67.0 of [Boost](https://sourceforge.net/projects/boost/files/boost/1.67.0/).
-1. Set the `BOOSTDIR` environment variable to the location containing this boost installation.
-1. Install [Mono](http://www.mono-project.com/download/stable/).
-1. Install a [JDK](http://www.oracle.com/technetwork/java/javase/downloads/index.html). FoundationDB currently builds with Java 8.
-1. Navigate to the directory where you checked out the foundationdb repo.
-1. Run `make`.
-
-#### Linux
-
-1. Install [Docker](https://www.docker.com/).
-1. Check out the foundationdb repo.
-1. Run the docker image interactively with [Docker Run](https://docs.docker.com/engine/reference/run/#general-form), and with the directory containing the foundationdb repo mounted via [Docker Mounts](https://docs.docker.com/storage/volumes/).
-
-    ```shell
-    docker run -it -v '/local/dir/path/foundationdb:/docker/dir/path/foundationdb' foundationdb/foundationdb-build:latest
-    ```
-
-1. Run `$ scl enable devtoolset-8 python27 rh-python36 rh-ruby24 -- bash` within the running container.  This enables a more modern compiler, which is required to build FoundationDB.
-1. Navigate to the container's mounted directory which contains the foundationdb repo.
-
-    ```shell
-    cd /docker/dir/path/foundationdb
-    ```
-
-1. Run `make`.
-
-This will build the fdbserver binary and the python bindings. If you want to build our other bindings, you will need to install a runtime for the language whose binding you want to build. Each binding has an `.mk` file which provides specific targets for that binding.
-
--- a/bindings/CMakeLists.txt
+++ b/bindings/CMakeLists.txt
@ -13,3 +13,6 @@ endif()
 if(WITH_RUBY)
  add_subdirectory(ruby)
 endif()
+if(NOT WIN32 AND NOT OPEN_FOR_IDE)
+  package_bindingtester()
+endif()
--- a/bindings/bindingtester/init.py
+++ b/bindings/bindingtester/init.py
@ -26,7 +26,7 @@ sys.path[:0] = [os.path.join(os.path.dirname(__file__), '..', '..', 'bindings',

 import util

-FDB_API_VERSION = 620
+FDB_API_VERSION = 630

 LOGGING = {
    'version': 1,
--- a/bindings/bindingtester/bindingtester.py
+++ b/bindings/bindingtester/bindingtester.py
@ -157,7 +157,7 @@ def choose_api_version(selected_api_version, tester_min_version, tester_max_vers
            api_version = min_version
        elif random.random() < 0.9:
            api_version = random.choice([v for v in [13, 14, 16, 21, 22, 23, 100, 200, 300, 400, 410, 420, 430,
-                                                     440, 450, 460, 500, 510, 520, 600, 610, 620] if v >= min_version and v <= max_version])
+                                                     440, 450, 460, 500, 510, 520, 600, 610, 620, 630] if v >= min_version and v <= max_version])
        else:
            api_version = random.randint(min_version, max_version)

@ -199,7 +199,7 @@ class TestRunner(object):
            raise Exception('Not all testers support concurrency')

        # Test types should be intersection of all tester supported types
-        self.args.types = reduce(lambda t1, t2: filter(t1.__contains__, t2), map(lambda tester: tester.types, self.testers))
+        self.args.types = list(reduce(lambda t1, t2: filter(t1.__contains__, t2), map(lambda tester: tester.types, self.testers)))

        self.args.no_directory_snapshot_ops = self.args.no_directory_snapshot_ops or any([not tester.directory_snapshot_ops_enabled for tester in self.testers])

--- a/bindings/bindingtester/known_testers.py
+++ b/bindings/bindingtester/known_testers.py
@ -20,7 +20,7 @@

 import os

-MAX_API_VERSION = 620
+MAX_API_VERSION = 630
 COMMON_TYPES = ['null', 'bytes', 'string', 'int', 'uuid', 'bool', 'float', 'double', 'tuple']
 ALL_TYPES = COMMON_TYPES + ['versionstamp']

--- a/bindings/bindingtester/run_binding_tester.sh
+++ b/bindings/bindingtester/run_binding_tester.sh
@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 ######################################################
 #
 # FoundationDB Binding Test Script
@ -25,7 +25,8 @@ BREAKONERROR="${BREAKONERROR:-0}"
 RUNSCRIPTS="${RUNSCRIPTS:-1}"
 RUNTESTS="${RUNTESTS:-1}"
 RANDOMTEST="${RANDOMTEST:-0}"
-BINDINGTESTS="${BINDINGTESTS:-python python3 java java_async ruby go flow}"
+# BINDINGTESTS="${BINDINGTESTS:-python python3 java java_async ruby go flow}"
+BINDINGTESTS="${BINDINGTESTS:-python python3 java java_async go flow}"
 LOGLEVEL="${LOGLEVEL:-INFO}"
 _BINDINGTESTS=(${BINDINGTESTS})
 DISABLEDTESTS=()
--- a/bindings/bindingtester/run_tester_loop.sh
+++ b/bindings/bindingtester/run_tester_loop.sh
@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash

 LOGGING_LEVEL=WARNING

--- a/bindings/bindingtester/spec/bindingApiTester.md
+++ b/bindings/bindingtester/spec/bindingApiTester.md
@ -164,6 +164,13 @@ futures must apply the following rules to the result:
    database using the get() method. May optionally push a future onto the
    stack.

+#### GET_ESTIMATED_RANGE_SIZE
+
+    Pops the top two items off of the stack as BEGIN_KEY and END_KEY to 
+    construct a key range. Then call the `getEstimatedRangeSize` API of 
+    the language binding. Make sure the API returns without error. Finally 
+    push the string "GOT_ESTIMATED_RANGE_SIZE" onto the stack.
+
 #### GET_KEY (_SNAPSHOT, _DATABASE)

    Pops the top four items off of the stack as KEY, OR_EQUAL, OFFSET, PREFIX
--- a/bindings/bindingtester/tests/api.py
+++ b/bindings/bindingtester/tests/api.py
@ -157,6 +157,7 @@ class ApiTest(Test):
        read_conflicts = ['READ_CONFLICT_RANGE', 'READ_CONFLICT_KEY']
        write_conflicts = ['WRITE_CONFLICT_RANGE', 'WRITE_CONFLICT_KEY', 'DISABLE_WRITE_CONFLICT']
        txn_sizes = ['GET_APPROXIMATE_SIZE']
+        storage_metrics = ['GET_ESTIMATED_RANGE_SIZE']

        op_choices += reads
        op_choices += mutations
@ -170,6 +171,7 @@ class ApiTest(Test):
        op_choices += write_conflicts
        op_choices += resets
        op_choices += txn_sizes
+        op_choices += storage_metrics

        idempotent_atomic_ops = ['BIT_AND', 'BIT_OR', 'MAX', 'MIN', 'BYTE_MIN', 'BYTE_MAX']
        atomic_ops = idempotent_atomic_ops + ['ADD', 'BIT_XOR', 'APPEND_IF_FITS']
@ -536,6 +538,21 @@ class ApiTest(Test):
                instructions.push_args(d)
                instructions.append(op)
                self.add_strings(1)
+            elif op == 'GET_ESTIMATED_RANGE_SIZE':
+                # Protect against inverted range and identical keys
+                key1 = self.workspace.pack(self.random.random_tuple(1))
+                key2 = self.workspace.pack(self.random.random_tuple(1))
+
+                while key1 == key2:
+                    key1 = self.workspace.pack(self.random.random_tuple(1))
+                    key2 = self.workspace.pack(self.random.random_tuple(1))
+
+                if key1 > key2:
+                    key1, key2 = key2, key1
+
+                instructions.push_args(key1, key2)
+                instructions.append(op)
+                self.add_strings(1)

            else:
                assert False, 'Unknown operation: ' + op
--- a/bindings/bindingtester/tests/directory.py
+++ b/bindings/bindingtester/tests/directory.py
@ -52,12 +52,12 @@ class DirectoryTest(Test):
        self.dir_list.append(child)
        self.dir_index = directory_util.DEFAULT_DIRECTORY_INDEX

-    def generate_layer(self):
+    def generate_layer(self, allow_partition=True):
        if random.random() < 0.7:
            return b''
        else:
            choice = random.randint(0, 3)
-            if choice == 0:
+            if choice == 0 and allow_partition:
                return b'partition'
            elif choice == 1:
                return b'test_layer'
@ -184,7 +184,9 @@ class DirectoryTest(Test):
                    test_util.blocking_commit(instructions)

                path = generate_path()
-                op_args = test_util.with_length(path) + (self.generate_layer(),)
+                # Partitions that use the high-contention allocator can result in non-determinism if they fail to commit, 
+                # so we disallow them in comparison tests
+                op_args = test_util.with_length(path) + (self.generate_layer(allow_partition=args.concurrency>1),)
                directory_util.push_instruction_and_record_prefix(instructions, op, op_args, path, len(self.dir_list), self.random, self.prefix_log)

                if not op.endswith('_DATABASE') and args.concurrency == 1:
--- a/bindings/bindingtester/tests/scripted.py
+++ b/bindings/bindingtester/tests/scripted.py
@ -34,7 +34,7 @@ fdb.api_version(FDB_API_VERSION)


 class ScriptedTest(Test):
-    TEST_API_VERSION = 620
+    TEST_API_VERSION = 630

    def __init__(self, subspace):
        super(ScriptedTest, self).__init__(subspace, ScriptedTest.TEST_API_VERSION, ScriptedTest.TEST_API_VERSION)
--- a/bindings/c/CMakeLists.txt
+++ b/bindings/c/CMakeLists.txt
@ -38,6 +38,21 @@ else()
 endif()
 add_dependencies(fdb_c fdb_c_generated fdb_c_options)
 target_link_libraries(fdb_c PUBLIC $<BUILD_INTERFACE:fdbclient>)
+if(APPLE)
+  set(symbols ${CMAKE_CURRENT_BINARY_DIR}/fdb_c.symbols)
+  add_custom_command(OUTPUT ${symbols}
+    COMMAND $<TARGET_FILE:Python::Interpreter> ${CMAKE_CURRENT_SOURCE_DIR}/symbolify.py
+        ${CMAKE_CURRENT_SOURCE_DIR}/foundationdb/fdb_c.h
+        ${symbols}
+    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/symbolify.py ${CMAKE_CURRENT_SOURCE_DIR}/foundationdb/fdb_c.h
+    COMMENT "Generate exported_symbols_list")
+  add_custom_target(exported_symbols_list DEPENDS ${symbols})
+  add_dependencies(fdb_c exported_symbols_list)
+  target_link_options(fdb_c PRIVATE "LINKER:-no_weak_exports,-exported_symbols_list,${symbols}")
+elseif(WIN32)
+else()
+  target_link_options(fdb_c PRIVATE "LINKER:--version-script=${CMAKE_CURRENT_SOURCE_DIR}/fdb_c.map,-z,nodelete")
+endif()
 target_include_directories(fdb_c PUBLIC
  $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
--- a/bindings/c/ThreadCleanup.cpp
+++ b/bindings/c/ThreadCleanup.cpp
@ -34,6 +34,10 @@ BOOL WINAPI DllMain( HINSTANCE dll, DWORD reason, LPVOID reserved ) {

 #elif defined( __unixish__ )

+#ifdef __INTEL_COMPILER
+#pragma warning ( disable:2415 )
+#endif
+
 static pthread_key_t threadDestructorKey;

 static void threadDestructor(void*) {
@ -57,4 +61,4 @@ static int threadDestructorKeyInit = initThreadDestructorKey();

 #else
 #error Port me!
-#endif
+#endif
--- a/bindings/c/fdb_c.cpp
+++ b/bindings/c/fdb_c.cpp
@ -18,7 +18,7 @@
 * limitations under the License.
 */

-#define FDB_API_VERSION 620
+#define FDB_API_VERSION 630
 #define FDB_INCLUDE_LEGACY_TYPES

 #include "fdbclient/MultiVersionTransaction.h"
@ -44,8 +44,9 @@ int g_api_version = 0;
 // Legacy (pre API version 610)
 #define CLUSTER(c) ((char*)c)

-/* 
- * While we could just use the MultiVersionApi instance directly, this #define allows us to swap in any other IClientApi instance (e.g. from ThreadSafeApi)
+/*
+ * While we could just use the MultiVersionApi instance directly, this #define allows us to swap in any other IClientApi
+ * instance (e.g. from ThreadSafeApi)
 */
 #define API ((IClientApi*)MultiVersionApi::api)

@ -74,12 +75,10 @@ fdb_bool_t fdb_error_predicate( int predicate_test, fdb_error_t code ) {
 				code == error_code_cluster_version_changed;
 	}
 	if(predicate_test == FDBErrorPredicates::RETRYABLE_NOT_COMMITTED) {
-		return code == error_code_not_committed ||
-				code == error_code_transaction_too_old ||
-				code == error_code_future_version ||
-				code == error_code_database_locked ||
-				code == error_code_proxy_memory_limit_exceeded ||
-				code == error_code_process_behind;
+		return code == error_code_not_committed || code == error_code_transaction_too_old ||
+		       code == error_code_future_version || code == error_code_database_locked ||
+		       code == error_code_proxy_memory_limit_exceeded || code == error_code_batch_transaction_throttled ||
+		       code == error_code_process_behind;
 	}
 	return false;
 }
@ -628,6 +627,13 @@ fdb_error_t fdb_transaction_add_conflict_range( FDBTransaction*tr, uint8_t const

 }

+extern "C" DLLEXPORT 
+FDBFuture* fdb_transaction_get_estimated_range_size_bytes( FDBTransaction* tr, uint8_t const* begin_key_name,
+        int begin_key_name_length, uint8_t const* end_key_name, int end_key_name_length ) {
+	KeyRangeRef range(KeyRef(begin_key_name, begin_key_name_length), KeyRef(end_key_name, end_key_name_length));
+	return (FDBFuture*)(TXN(tr)->getEstimatedRangeSizeBytes(range).extractPtr());
+}
+
 #include "fdb_c_function_pointers.g.h"

 #define FDB_API_CHANGED(func, ver) if (header_version < ver) fdb_api_ptr_##func = (void*)&(func##_v##ver##_PREV); else if (fdb_api_ptr_##func == (void*)&fdb_api_ptr_unimpl) fdb_api_ptr_##func = (void*)&(func##_impl);
--- a/bindings/c/fdb_c.vcxproj
+++ b/bindings/c/fdb_c.vcxproj
@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.1" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Condition="'$(Release)' != 'true' ">
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Release)' == 'true' ">
-    <PreprocessorDefinitions>FDB_CLEAN_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-  </PropertyGroup>
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="fdb_c_function_pointers.g.h" />
-    <ClInclude Include="foundationdb\fdb_c.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="fdb_c.cpp" />
-    <ClCompile Include="ThreadCleanup.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <MASM Include="fdb_c.g.asm" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="generate_asm.py" />
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{CACB2C8E-3E55-4309-A411-2A9C56C6C1CB}</ProjectGuid>
-    <RootNamespace>c</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-    <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <ItemDefinitionGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-    <PostBuildEvent>
-      <Command>
-FOR /F "tokens=1" %%i in ('hg.exe id') do copy /Y "$(TargetPath)" "$(TargetPath)-%%i"</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <IncludePath>..\..\;C:\Program Files\boost_1_67_0;$(IncludePath)</IncludePath>
-    <OutDir>$(SolutionDir)bin\$(Configuration)\</OutDir>
-    <IntDir>$(SystemDrive)\temp\msvcfdb\$(Platform)$(Configuration)\$(MSBuildProjectName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>$(SolutionDir)bin\$(Configuration)\</OutDir>
-    <IntDir>$(SystemDrive)\temp\msvcfdb\$(Platform)$(Configuration)\$(MSBuildProjectName)\</IntDir>
-    <IncludePath>..\..\;C:\Program Files\boost_1_67_0;$(IncludePath)</IncludePath>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>TLS_DISABLED;WIN32;_WIN32_WINNT=_WIN32_WINNT_WS03;BOOST_ALL_NO_LIB;WINVER=_WIN32_WINNT_WS03;NTDDI_VERSION=NTDDI_WS03;_DEBUG;_HAS_ITERATOR_DEBUGGING=0;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <AdditionalOptions>/bigobj @..\..\flow/no_intellisense.opt %(AdditionalOptions)</AdditionalOptions>
-			<LanguageStandard>stdcpp17</LanguageStandard>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>$(SolutionDir)bin\$(Configuration)\fdbclient.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>TLS_DISABLED;WIN32;_WIN32_WINNT=_WIN32_WINNT_WS03;BOOST_ALL_NO_LIB;WINVER=_WIN32_WINNT_WS03;NTDDI_VERSION=NTDDI_WS03;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <AdditionalOptions>/bigobj @..\..\flow/no_intellisense.opt %(AdditionalOptions)</AdditionalOptions>
-			<LanguageStandard>stdcpp17</LanguageStandard>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>$(SolutionDir)bin\$(Configuration)\fdbclient.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <PropertyGroup>
-    <CustomBuildBeforeTargets>_MASM;ClCompile</CustomBuildBeforeTargets>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-    <CustomBuildStep>
-      <Command>c:\Python27\python.exe "$(ProjectDir)/generate_asm.py" windows "$(ProjectDir)/fdb_c.cpp" "$(ProjectDir)/fdb_c.g.asm" "$(ProjectDir)/fdb_c_function_pointers.g.h"</Command>
-      <Message>Generating API trampolines</Message>
-      <Outputs>$(ProjectDir)/fdb_c_function_pointers.g.h;$(ProjectDir)/fdb_c.g.asm</Outputs>
-      <Inputs>$(ProjectDir)/fdb_c.cpp;$(ProjectDir)/generate_asm.py</Inputs>
-    </CustomBuildStep>
-  </ItemDefinitionGroup>
-  <ImportGroup Label="ExtensionTargets">
-    <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.targets" />
-  </ImportGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-</Project>
--- a/bindings/c/foundationdb/fdb_c.h
+++ b/bindings/c/foundationdb/fdb_c.h
@ -28,10 +28,10 @@
 #endif

 #if !defined(FDB_API_VERSION)
-#error You must #define FDB_API_VERSION prior to including fdb_c.h (current version is 620)
+#error You must #define FDB_API_VERSION prior to including fdb_c.h (current version is 630)
 #elif FDB_API_VERSION < 13
 #error API version no longer supported (upgrade to 13)
-#elif FDB_API_VERSION > 620
+#elif FDB_API_VERSION > 630
 #error Requested API version requires a newer version of this header
 #endif

@ -91,12 +91,21 @@ extern "C" {
    DLLEXPORT WARN_UNUSED_RESULT fdb_error_t fdb_add_network_thread_completion_hook(void (*hook)(void*), void *hook_parameter);

 #pragma pack(push, 4)
+#if FDB_API_VERSION >= 630
+    typedef struct keyvalue {
+        const uint8_t* key;
+        int key_length;
+        const uint8_t* value;
+        int value_length;
+    } FDBKeyValue;
+#else
    typedef struct keyvalue {
        const void* key;
        int key_length;
        const void* value;
        int value_length;
    } FDBKeyValue;
+#endif
 #pragma pack(pop)

    DLLEXPORT void fdb_future_cancel( FDBFuture* f );
@ -247,6 +256,10 @@ extern "C" {
                                       int end_key_name_length,
                                       FDBConflictRangeType type);

+    DLLEXPORT WARN_UNUSED_RESULT FDBFuture*
+    fdb_transaction_get_estimated_range_size_bytes( FDBTransaction* tr, uint8_t const* begin_key_name,
+        int begin_key_name_length, uint8_t const* end_key_name, int end_key_name_length);
+
    #define FDB_KEYSEL_LAST_LESS_THAN(k, l) k, l, 0, 0
    #define FDB_KEYSEL_LAST_LESS_OR_EQUAL(k, l) k, l, 1, 0
    #define FDB_KEYSEL_FIRST_GREATER_THAN(k, l) k, l, 1, 1
--- a/bindings/c/generate_asm.py
+++ b/bindings/c/generate_asm.py
@ -61,7 +61,7 @@ def write_windows_asm(asmfile, functions):
 def write_unix_asm(asmfile, functions, prefix):
    asmfile.write(".intel_syntax noprefix\n")

-    if platform == "linux":
+    if platform == "linux" or platform == "freebsd":
        asmfile.write("\n.data\n")
        for f in functions:
            asmfile.write("\t.extern fdb_api_ptr_%s\n" % f)
--- a/bindings/c/local.mk
+++ b/bindings/c/local.mk
@ -1,113 +0,0 @@
-#
-# local.mk
-#
-# This source file is part of the FoundationDB open source project
-#
-# Copyright 2013-2018 Apple Inc. and the FoundationDB project authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# -*- mode: makefile; -*-
-
-fdb_c_CFLAGS := $(fdbclient_CFLAGS)
-fdb_c_LDFLAGS := $(fdbrpc_LDFLAGS)
-fdb_c_LIBS := lib/libfdbclient.a lib/libfdbrpc.a lib/libflow.a $(FDB_TLS_LIB)
-fdb_c_STATIC_LIBS := $(TLS_LIBS)
-fdb_c_tests_LIBS := -Llib -lfdb_c -lstdc++
-fdb_c_tests_HEADERS := -Ibindings/c
-
-CLEAN_TARGETS += fdb_c_tests_clean
-
-ifeq ($(PLATFORM),linux)
-  fdb_c_LDFLAGS += -Wl,--version-script=bindings/c/fdb_c.map -static-libgcc -Wl,-z,nodelete -lm -lpthread -lrt -ldl
-	# Link our custom libstdc++ statically in Ubuntu, if hacking
-  ifeq ("$(wildcard /etc/centos-release)", "")
-    ifeq ($(LIBSTDCPP_HACK),1)
-      fdb_c_LIBS += lib/libstdc++.a
-    endif
-	# Link stdc++ statically in Centos, if not hacking
-  else
-    fdb_c_STATIC_LIBS += -static-libstdc++
-  endif
-  fdb_c_tests_LIBS += -lpthread
-endif
-
-ifeq ($(PLATFORM),osx)
-  fdb_c_LDFLAGS += -lc++ -Xlinker -exported_symbols_list -Xlinker bindings/c/fdb_c.symbols
-  fdb_c_tests_LIBS += -lpthread
-
-  lib/libfdb_c.dylib: bindings/c/fdb_c.symbols
-
-  bindings/c/fdb_c.symbols: bindings/c/foundationdb/fdb_c.h $(ALL_MAKEFILES)
-	@awk '{sub(/^[ \t]+/, "");} /^#/ {next;} /DLLEXPORT\ .*[^ ]\(/ {sub(/\(.*/, ""); print "_" $$NF; next;} /DLLEXPORT/ { DLLEXPORT=1; next;} DLLEXPORT==1 {sub(/\(.*/, ""); print "_" $$0; DLLEXPORT=0}' $< | sort | uniq > $@
-
-  fdb_c_clean: fdb_c_symbols_clean
-
-  fdb_c_symbols_clean:
-	@rm -f bindings/c/fdb_c.symbols
-
-  fdb_javac_release: lib/libfdb_c.$(DLEXT)
-	mkdir -p lib
-	rm -f lib/libfdb_c.$(java_DLEXT)-*
-	cp lib/libfdb_c.$(DLEXT) lib/libfdb_c.$(DLEXT)-$(VERSION_ID)
-	cp lib/libfdb_c.$(DLEXT)-debug lib/libfdb_c.$(DLEXT)-debug-$(VERSION_ID)
-
-  fdb_javac_release_clean:
-	rm -f lib/libfdb_c.$(DLEXT)-*
-	rm -f lib/libfdb_c.$(javac_DLEXT)-*
-
-  # OS X needs to put its java lib in packages
-  packages: fdb_javac_lib_package
-
-  fdb_javac_lib_package: lib/libfdb_c.dylib
-	mkdir -p packages
-	cp lib/libfdb_c.$(DLEXT) packages/libfdb_c.$(DLEXT)-$(VERSION_ID)
-	cp lib/libfdb_c.$(DLEXT)-debug packages/libfdb_c.$(DLEXT)-debug-$(VERSION_ID)
-endif
-
-fdb_c_GENERATED_SOURCES += bindings/c/foundationdb/fdb_c_options.g.h bindings/c/fdb_c.g.S bindings/c/fdb_c_function_pointers.g.h
-
-bindings/c/%.g.S bindings/c/%_function_pointers.g.h: bindings/c/%.cpp bindings/c/generate_asm.py $(ALL_MAKEFILES)
-	@echo "Scanning       $<"
-	@bindings/c/generate_asm.py $(PLATFORM) bindings/c/fdb_c.cpp bindings/c/fdb_c.g.S bindings/c/fdb_c_function_pointers.g.h
-
-.PRECIOUS: bindings/c/fdb_c_function_pointers.g.h
-
-fdb_c_BUILD_SOURCES += bindings/c/fdb_c.g.S
-
-bindings/c/foundationdb/fdb_c_options.g.h: bin/vexillographer.exe fdbclient/vexillographer/fdb.options $(ALL_MAKEFILES)
-	@echo "Building       $@"
-	@$(MONO) bin/vexillographer.exe fdbclient/vexillographer/fdb.options c $@
-
-bin/fdb_c_performance_test: bindings/c/test/performance_test.c bindings/c/test/test.h fdb_c
-	@echo "Compiling      fdb_c_performance_test"
-	@$(CC) $(CFLAGS) $(fdb_c_tests_HEADERS) -o $@ bindings/c/test/performance_test.c $(fdb_c_tests_LIBS)
-
-bin/fdb_c_ryw_benchmark: bindings/c/test/ryw_benchmark.c bindings/c/test/test.h fdb_c
-	@echo "Compiling      fdb_c_ryw_benchmark"
-	@$(CC) $(CFLAGS) $(fdb_c_tests_HEADERS) -o $@ bindings/c/test/ryw_benchmark.c $(fdb_c_tests_LIBS)
-
-packages/fdb-c-tests-$(VERSION)-$(PLATFORM).tar.gz: bin/fdb_c_performance_test bin/fdb_c_ryw_benchmark
-	@echo "Packaging      $@"
-	@rm -rf packages/fdb-c-tests-$(VERSION)-$(PLATFORM)
-	@mkdir -p packages/fdb-c-tests-$(VERSION)-$(PLATFORM)/bin
-	@cp bin/fdb_c_performance_test packages/fdb-c-tests-$(VERSION)-$(PLATFORM)/bin
-	@cp bin/fdb_c_ryw_benchmark packages/fdb-c-tests-$(VERSION)-$(PLATFORM)/bin
-	@tar -C packages -czvf $@ fdb-c-tests-$(VERSION)-$(PLATFORM) > /dev/null
-	@rm -rf packages/fdb-c-tests-$(VERSION)-$(PLATFORM)
-
-fdb_c_tests: packages/fdb-c-tests-$(VERSION)-$(PLATFORM).tar.gz
-
-fdb_c_tests_clean:
-	@rm -f packages/fdb-c-tests-$(VERSION)-$(PLATFORM).tar.gz
--- a/bindings/c/symbolify.py
+++ b/bindings/c/symbolify.py
@ -0,0 +1,10 @@
+if __name__ == '__main__':
+    import re
+    import sys
+    r = re.compile('DLLEXPORT[^(]*(fdb_[^(]*)[(]')
+    (fdb_c_h, symbols_file) = sys.argv[1:]
+    with open(fdb_c_h, 'r') as f:
+        symbols = sorted(set('_' + m.group(1) for m in r.finditer(f.read())))
+    with open(symbols_file, 'w') as f:
+        f.write('\n'.join(symbols))
+        f.write('\n')
--- a/bindings/c/test/mako/mako.c
+++ b/bindings/c/test/mako/mako.c
--- a/bindings/c/test/mako/mako.h
+++ b/bindings/c/test/mako/mako.h
@ -3,7 +3,7 @@
 #pragma once

 #ifndef FDB_API_VERSION
-#define FDB_API_VERSION 620
+#define FDB_API_VERSION 630
 #endif

 #include <foundationdb/fdb_c.h>
@ -32,23 +32,22 @@
 #define FDB_ERROR_ABORT -2
 #define FDB_ERROR_CONFLICT -3

-
 /* transaction specification */
 enum Operations {
-  OP_GETREADVERSION,
-  OP_GET,
-  OP_GETRANGE,
-  OP_SGET,
-  OP_SGETRANGE,
-  OP_UPDATE,
-  OP_INSERT,
-  OP_INSERTRANGE,
-  OP_CLEAR,
-  OP_SETCLEAR,
-  OP_CLEARRANGE,
-  OP_SETCLEARRANGE,
-  OP_COMMIT,
-  MAX_OP /* must be the last item */
+	OP_GETREADVERSION,
+	OP_GET,
+	OP_GETRANGE,
+	OP_SGET,
+	OP_SGETRANGE,
+	OP_UPDATE,
+	OP_INSERT,
+	OP_INSERTRANGE,
+	OP_CLEAR,
+	OP_SETCLEAR,
+	OP_CLEARRANGE,
+	OP_SETCLEARRANGE,
+	OP_COMMIT,
+	MAX_OP /* must be the last item */
 };

 #define OP_COUNT 0
@ -57,27 +56,25 @@ enum Operations {

 /* for long arguments */
 enum Arguments {
-  ARG_KEYLEN,
-  ARG_VALLEN,
-  ARG_TPS,
-  ARG_COMMITGET,
-  ARG_SAMPLING,
-  ARG_VERSION,
-  ARG_KNOBS,
-  ARG_FLATBUFFERS,
-  ARG_TRACE,
-  ARG_TRACEPATH,
-  ARG_TPSMAX,
-  ARG_TPSMIN,
-  ARG_TPSINTERVAL,
-  ARG_TPSCHANGE
+	ARG_KEYLEN,
+	ARG_VALLEN,
+	ARG_TPS,
+	ARG_COMMITGET,
+	ARG_SAMPLING,
+	ARG_VERSION,
+	ARG_KNOBS,
+	ARG_FLATBUFFERS,
+	ARG_TRACE,
+	ARG_TRACEPATH,
+	ARG_TRACEFORMAT,
+	ARG_TPSMAX,
+	ARG_TPSMIN,
+	ARG_TPSINTERVAL,
+	ARG_TPSCHANGE,
+	ARG_TXNTRACE
 };

-enum TPSChangeTypes {
-  TPS_SIN,
-  TPS_SQUARE,
-  TPS_PULSE
-};
+enum TPSChangeTypes { TPS_SIN, TPS_SQUARE, TPS_PULSE };

 #define KEYPREFIX "mako"
 #define KEYPREFIXLEN 4
@ -87,38 +84,40 @@ enum TPSChangeTypes {
 */

 typedef struct {
-  /* for each operation, it stores "count", "range" and "reverse" */
-  int ops[MAX_OP][3];
+	/* for each operation, it stores "count", "range" and "reverse" */
+	int ops[MAX_OP][3];
 } mako_txnspec_t;

 #define KNOB_MAX 256

 /* benchmark parameters */
 typedef struct {
-  int api_version;
-  int json;
-  int num_processes;
-  int num_threads;
-  int mode;
-  int rows; /* is 2 billion enough? */
-  int seconds;
-  int iteration;
-  int tpsmax;
-  int tpsmin;
-  int tpsinterval;
-  int tpschange;
-  int sampling;
-  int key_length;
-  int value_length;
-  int zipf;
-  int commit_get;
-  int verbose;
-  mako_txnspec_t txnspec;
-  char cluster_file[PATH_MAX];
-  int trace;
-  char tracepath[PATH_MAX];
-  char knobs[KNOB_MAX];
-  uint8_t flatbuffers;
+	int api_version;
+	int json;
+	int num_processes;
+	int num_threads;
+	int mode;
+	int rows; /* is 2 billion enough? */
+	int seconds;
+	int iteration;
+	int tpsmax;
+	int tpsmin;
+	int tpsinterval;
+	int tpschange;
+	int sampling;
+	int key_length;
+	int value_length;
+	int zipf;
+	int commit_get;
+	int verbose;
+	mako_txnspec_t txnspec;
+	char cluster_file[PATH_MAX];
+	int trace;
+	char tracepath[PATH_MAX];
+	int traceformat; /* 0 - XML, 1 - JSON */
+	char knobs[KNOB_MAX];
+	uint8_t flatbuffers;
+	int txntrace;
 } mako_args_t;

 /* shared memory */
@ -127,34 +126,34 @@ typedef struct {
 #define SIGNAL_OFF 2

 typedef struct {
-  int signal;
-  int readycount;
-  double throttle_factor;
+	int signal;
+	int readycount;
+	double throttle_factor;
 } mako_shmhdr_t;

 typedef struct {
-  uint64_t xacts;
-  uint64_t conflicts;
-  uint64_t ops[MAX_OP];
-  uint64_t errors[MAX_OP];
-  uint64_t latency_samples[MAX_OP];
-  uint64_t latency_us_total[MAX_OP];
-  uint64_t latency_us_min[MAX_OP];
-  uint64_t latency_us_max[MAX_OP];
+	uint64_t xacts;
+	uint64_t conflicts;
+	uint64_t ops[MAX_OP];
+	uint64_t errors[MAX_OP];
+	uint64_t latency_samples[MAX_OP];
+	uint64_t latency_us_total[MAX_OP];
+	uint64_t latency_us_min[MAX_OP];
+	uint64_t latency_us_max[MAX_OP];
 } mako_stats_t;

 /* per-process information */
 typedef struct {
-  int worker_id;
-  FDBDatabase *database;
-  mako_args_t *args;
-  mako_shmhdr_t *shm;
+	int worker_id;
+	FDBDatabase* database;
+	mako_args_t* args;
+	mako_shmhdr_t* shm;
 } process_info_t;

 /* args for threads */
 typedef struct {
-  int thread_id;
-  process_info_t *process;
+	int thread_id;
+	process_info_t* process;
 } thread_args_t;

 /* process type */
--- a/bindings/c/test/mako/mako.rst
+++ b/bindings/c/test/mako/mako.rst
@ -1,27 +1,27 @@
 ##############
-mako Benchmark
+🦈 Mako Benchmark
 ##############

-| mako (named after a small, but very fast shark) is a micro-benchmark for FoundationDB
+| Mako (named after a very fast shark) is a micro-benchmark for FoundationDB
 | which is designed to be very light and flexible
 | so that you can stress a particular part of an FoundationDB cluster without introducing unnecessary overhead.


 How to Build
 ============
-| ``mako`` gets build automatically when you build FoundationDB.
+| ``mako`` gets built automatically when you build FoundationDB.
 | To build ``mako`` manually, simply build ``mako`` target in the FoundationDB build directory.
-| e.g. If you're using Unix Makefiles
+| e.g. If you're using Unix Makefiles, type:
 | ``make mako``


 Architecture
 ============
 - mako is a stand-alone program written in C,
-  which communicates to FoundationDB using C binding API (``libfdb_c.so``)
- It creates one master process, and one or more worker processes (multi-process)
- Each worker process creates one or more multiple threads (multi-thread)
- All threads within the same process share the same network thread
+  which communicates to FoundationDB using C API (via ``libfdb_c.so``)
+- It creates one master process, one stats emitter process, and one or more worker processes (multi-process)
+- Each worker process creates one FDB network thread, and one or more worker threads (multi-thread)
+- All worker threads within the same process share the same network thread


 Data Specification
@ -32,18 +32,18 @@ Data Specification

 Arguments
 =========
- | ``--mode <mode>``
+- | ``-m | --mode <mode>``
  | One of the following modes must be specified.  (Required)
  | - ``clean``:  Clean up existing data
  | - ``build``:  Populate data
  | - ``run``:  Run the benchmark

- | ``-a | --api_version <api_version>``
-  | FDB API version to use (Default: Latest)
-
 - | ``-c | --cluster <cluster file>``
  | FDB cluster file (Required)

+- | ``-a | --api_version <api_version>``
+  | FDB API version to use (Default: Latest)
+
 - | ``-p | --procs <procs>``
  | Number of worker processes (Default: 1)

@ -51,7 +51,7 @@ Arguments
  | Number of threads per worker process (Default: 1)

 - | ``-r | --rows <rows>``
-  | Number of rows populated (Default: 100000)
+  | Number of rows initially populated (Default: 100000)

 - | ``-s | --seconds <seconds>``
  | Test duration in seconds (Default: 30)
@ -113,10 +113,10 @@ Arguments

 Transaction Specification
 =========================
-| A transaction may contain multiple operations of multiple types.
+| A transaction may contain multiple operations of various types.
 | You can specify multiple operations for one operation type by specifying "Count".
-| For RANGE operations, "Range" needs to be specified in addition to "Count".
-| Every transaction is committed unless it contains only GET / GET RANGE operations.
+| For RANGE operations, the "Range" needs to be specified in addition to "Count".
+| Every transaction is committed unless the transaction is read-only.

 Operation Types
 ---------------
@ -137,21 +137,22 @@ Format
 ------
 | One operation type is defined as ``<Type><Count>`` or ``<Type><Count>:<Range>``.
 | When Count is omitted, it's equivalent to setting it to 1.  (e.g. ``g`` is equivalent to ``g1``)
-| Multiple operation types can be concatenated.  (e.g. ``g9u1`` = 9 GETs and 1 update)
+| Multiple operation types within the same trancaction can be concatenated.  (e.g. ``g9u1`` = 9 GETs and 1 update)

 Transaction Specification Examples
 ----------------------------------
- | 100 GETs (No Commit)
+- | 100 GETs (Non-commited)
  | ``g100``

- | 10 GET RANGE with Range of 50 (No Commit)
+- | 10 GET RANGE with Range of 50 (Non-commited)
  | ``gr10:50``

 - | 90 GETs and 10 Updates (Committed)
  | ``g90u10``

- | 80 GETs, 10 Updates and 10 Inserts (Committed)
-  | ``g90u10i10``
+- | 70 GETs, 10 Updates and 10 Inserts (Committed)
+  | ``g70u10i10``
+  | This is 80-20.


 Execution Examples
@ -160,12 +161,14 @@ Execution Examples
 Preparation
 -----------
 - Start the FoundationDB cluster and create a database
- Set LD_LIBRARY_PATH pointing to a proper ``libfdb_c.so``
+- Set ``LD_LIBRARY_PATH`` environment variable pointing to a proper ``libfdb_c.so`` shared library

-Build
-----
+Populate Initial Database
+-------------------------
 ``mako --cluster /etc/foundationdb/fdb.cluster --mode build --rows 1000000 --procs 4``
+Note: You may be able to speed up the data population by increasing the number of processes or threads.

 Run
 ---
+Run a mixed workload with a total of 8 threads for 60 seconds, keeping the throughput limited to 1000 TPS.
 ``mako --cluster /etc/foundationdb/fdb.cluster --mode run --rows 1000000 --procs 2 --threads 8 --transaction "g8ui" --seconds 60 --tps 1000``
--- a/bindings/c/test/mako/utils.c
+++ b/bindings/c/test/mako/utils.c
@ -1,81 +1,79 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <math.h>
 #include "utils.h"
 #include "mako.h"
+#include <math.h>
+#include <stdio.h>
+#include <stdlib.h>

 /* uniform-distribution random */
 int urand(int low, int high) {
-  double r = rand() / (1.0 + RAND_MAX);
-  int range = high - low + 1;
-  return (int)((r * range) + low);
+	double r = rand() / (1.0 + RAND_MAX);
+	int range = high - low + 1;
+	return (int)((r * range) + low);
 }

 /* random string */
 /* len is the buffer size, must include null */
-void randstr(char *str, int len) {
-  int i;
-  for (i = 0; i < len-1; i++) {
-    str[i] = '!' + urand(0, 'z'-'!');  /* generage a char from '!' to 'z' */
-  }
-  str[len-1] = '\0';
+void randstr(char* str, int len) {
+	int i;
+	for (i = 0; i < len - 1; i++) {
+		str[i] = '!' + urand(0, 'z' - '!'); /* generage a char from '!' to 'z' */
+	}
+	str[len - 1] = '\0';
 }

 /* random numeric string */
 /* len is the buffer size, must include null */
-void randnumstr(char *str, int len) {
-  int i;
-  for (i = 0; i < len-1; i++) {
-    str[i] = '0' + urand(0, 9);  /* generage a char from '!' to 'z' */
-  }
-  str[len-1] = '\0';
+void randnumstr(char* str, int len) {
+	int i;
+	for (i = 0; i < len - 1; i++) {
+		str[i] = '0' + urand(0, 9); /* generage a char from '!' to 'z' */
+	}
+	str[len - 1] = '\0';
 }

 /* return the first key to be inserted */
 int insert_begin(int rows, int p_idx, int t_idx, int total_p, int total_t) {
-  double interval = (double)rows / total_p / total_t;
-  return (int)(round(interval * ((p_idx * total_t) + t_idx)));
+	double interval = (double)rows / total_p / total_t;
+	return (int)(round(interval * ((p_idx * total_t) + t_idx)));
 }

 /* return the last key to be inserted */
 int insert_end(int rows, int p_idx, int t_idx, int total_p, int total_t) {
-  double interval = (double)rows / total_p / total_t;
-  return (int)(round(interval * ((p_idx * total_t) + t_idx + 1) - 1));
+	double interval = (double)rows / total_p / total_t;
+	return (int)(round(interval * ((p_idx * total_t) + t_idx + 1) - 1));
 }

 /* devide val equally among threads */
 int compute_thread_portion(int val, int p_idx, int t_idx, int total_p, int total_t) {
-  int interval = val / total_p / total_t;
-  int remaining = val - (interval * total_p * total_t);
-  if ((p_idx * total_t + t_idx) < remaining) {
-    return interval+1;
-  } else if (interval == 0) {
-    return -1;
-  }
-  /* else */
-  return interval;
+	int interval = val / total_p / total_t;
+	int remaining = val - (interval * total_p * total_t);
+	if ((p_idx * total_t + t_idx) < remaining) {
+		return interval + 1;
+	} else if (interval == 0) {
+		return -1;
+	}
+	/* else */
+	return interval;
 }

 /* number of digits */
 int digits(int num) {
-  int digits = 0;
-  while (num > 0) {
-    num /= 10;
-    digits++;
-  }
-  return digits;
+	int digits = 0;
+	while (num > 0) {
+		num /= 10;
+		digits++;
+	}
+	return digits;
 }

-
 /* generate a key for a given key number */
 /* len is the buffer size, key length + null */
-void genkey(char *str, int num, int rows, int len) {
-  int i;
-  int rowdigit = digits(rows);
-  sprintf(str, KEYPREFIX "%0.*d", rowdigit, num);
-  for (i = (KEYPREFIXLEN + rowdigit); i < len-1; i++) {
-    str[i] = 'x';
-  }
-  str[len-1] = '\0';
+void genkey(char* str, int num, int rows, int len) {
+	int i;
+	int rowdigit = digits(rows);
+	sprintf(str, KEYPREFIX "%0.*d", rowdigit, num);
+	for (i = (KEYPREFIXLEN + rowdigit); i < len - 1; i++) {
+		str[i] = 'x';
+	}
+	str[len - 1] = '\0';
 }
-
--- a/bindings/c/test/mako/utils.h
+++ b/bindings/c/test/mako/utils.h
@ -9,12 +9,12 @@ int urand(int low, int high);
 /* write a random string of the length of (len-1) to memory pointed by str
 * with a null-termination character at str[len-1].
 */
-void randstr(char *str, int len);
+void randstr(char* str, int len);

 /* write a random numeric string of the length of (len-1) to memory pointed by str
 * with a null-termination character at str[len-1].
 */
-void randnumstr(char *str, int len);
+void randnumstr(char* str, int len);

 /* given the total number of rows to be inserted,
 * the worker process index p_idx and the thread index t_idx (both 0-based),
@ -27,26 +27,25 @@ int insert_begin(int rows, int p_idx, int t_idx, int total_p, int total_t);
 int insert_end(int rows, int p_idx, int t_idx, int total_p, int total_t);

 /* devide a value equally among threads */
-int compute_thread_portion(int val, int p_idx, int t_idx, int total_p,
-                           int total_t);
+int compute_thread_portion(int val, int p_idx, int t_idx, int total_p, int total_t);

 /* similar to insert_begin/end, compute_thread_tps computes
 * the per-thread target TPS for given configuration.
 */
-#define compute_thread_tps(val, p_idx, t_idx, total_p, total_t)                \
-  compute_thread_portion(val, p_idx, t_idx, total_p, total_t)
+#define compute_thread_tps(val, p_idx, t_idx, total_p, total_t)                                                        \
+	compute_thread_portion(val, p_idx, t_idx, total_p, total_t)

 /* similar to compute_thread_tps,
 * compute_thread_iters computs the number of iterations.
 */
-#define compute_thread_iters(val, p_idx, t_idx, total_p, total_t)              \
-  compute_thread_portion(val, p_idx, t_idx, total_p, total_t)
+#define compute_thread_iters(val, p_idx, t_idx, total_p, total_t)                                                      \
+	compute_thread_portion(val, p_idx, t_idx, total_p, total_t)

 /* get the number of digits */
 int digits(int num);

 /* generate a key for a given key number */
 /* len is the buffer size, key length + null */
-void genkey(char *str, int num, int rows, int len);
+void genkey(char* str, int num, int rows, int len);

 #endif /* UTILS_H */
--- a/bindings/c/test/performance_test.c
+++ b/bindings/c/test/performance_test.c
@ -603,7 +603,7 @@ void runTests(struct ResultSet *rs) {
 int main(int argc, char **argv) {
 	srand(time(NULL));
 	struct ResultSet *rs = newResultSet();
-	checkError(fdb_select_api_version(620), "select API version", rs);
+	checkError(fdb_select_api_version(630), "select API version", rs);
 	printf("Running performance test at client version: %s\n", fdb_get_client_version());

 	valueStr = (uint8_t*)malloc((sizeof(uint8_t))*valueSize);
--- a/bindings/c/test/ryw_benchmark.c
+++ b/bindings/c/test/ryw_benchmark.c
@ -244,7 +244,7 @@ void runTests(struct ResultSet *rs) {
 int main(int argc, char **argv) {
 	srand(time(NULL));
 	struct ResultSet *rs = newResultSet();
-	checkError(fdb_select_api_version(620), "select API version", rs);
+	checkError(fdb_select_api_version(630), "select API version", rs);
 	printf("Running RYW Benchmark test at client version: %s\n", fdb_get_client_version());

 	keys = generateKeys(numKeys, keySize);
--- a/bindings/c/test/test.h
+++ b/bindings/c/test/test.h
@ -29,7 +29,7 @@
 #include <inttypes.h>

 #ifndef FDB_API_VERSION
-#define FDB_API_VERSION 620
+#define FDB_API_VERSION 630
 #endif

 #include <foundationdb/fdb_c.h>
@ -236,7 +236,7 @@ void* runNetwork() {

 FDBDatabase* openDatabase(struct ResultSet *rs, pthread_t *netThread) {
 	checkError(fdb_setup_network(), "setup network", rs);
-	pthread_create(netThread, NULL, &runNetwork, NULL);
+	pthread_create(netThread, NULL, (void*)(&runNetwork), NULL);

 	FDBDatabase *db;
 	checkError(fdb_create_database(NULL, &db), "create database", rs);
--- a/bindings/c/test/txn_size_test.c
+++ b/bindings/c/test/txn_size_test.c
@ -97,7 +97,7 @@ void runTests(struct ResultSet *rs) {
 int main(int argc, char **argv) {
 	srand(time(NULL));
 	struct ResultSet *rs = newResultSet();
-	checkError(fdb_select_api_version(620), "select API version", rs);
+	checkError(fdb_select_api_version(630), "select API version", rs);
 	printf("Running performance test at client version: %s\n", fdb_get_client_version());

 	keys = generateKeys(numKeys, KEY_SIZE);
--- a/bindings/c/test/workloads/SimpleWorkload.cpp
+++ b/bindings/c/test/workloads/SimpleWorkload.cpp
@ -18,7 +18,7 @@
 * limitations under the License.
 */

-#define FDB_API_VERSION 620
+#define FDB_API_VERSION 630
 #include "foundationdb/fdb_c.h"
 #undef DLLEXPORT
 #include "workloads.h"
@ -258,7 +258,7 @@ struct SimpleWorkload : FDBWorkload {
 		insertsPerTx = context->getOption("insertsPerTx", 100ul);
 		opsPerTx = context->getOption("opsPerTx", 100ul);
 		runFor = context->getOption("runFor", 10.0);
-		auto err = fdb_select_api_version(620);
+		auto err = fdb_select_api_version(630);
 		if (err) {
 			context->trace(FDBSeverity::Info, "SelectAPIVersionFailed",
 			               { { "Error", std::string(fdb_get_error(err)) } });
--- a/bindings/flow/CMakeLists.txt
+++ b/bindings/flow/CMakeLists.txt
@ -16,7 +16,7 @@ set(SRCS
  fdb_flow.actor.cpp
  fdb_flow.h)

-add_flow_target(NAME fdb_flow SRCS ${SRCS} STATIC_LIBRARY)
+add_flow_target(STATIC_LIBRARY NAME fdb_flow SRCS ${SRCS})
 target_link_libraries(fdb_flow PUBLIC fdb_c)

 add_subdirectory(tester)
--- a/bindings/flow/fdb_flow.actor.cpp
+++ b/bindings/flow/fdb_flow.actor.cpp
@ -25,6 +25,7 @@

 #include "flow/DeterministicRandom.h"
 #include "flow/SystemMonitor.h"
+#include "flow/TLSConfig.actor.h"
 #include "flow/actorcompiler.h" // This must be the last #include.

 using namespace FDB;
@ -35,7 +36,7 @@ THREAD_FUNC networkThread(void* fdb) {
 }

 ACTOR Future<Void> _test() {
-	API *fdb = FDB::API::selectAPIVersion(620);
+	API *fdb = FDB::API::selectAPIVersion(630);
 	auto db = fdb->createDatabase();
 	state Reference<Transaction> tr = db->createTransaction();

@ -78,11 +79,11 @@ ACTOR Future<Void> _test() {
 }

 void fdb_flow_test() {
-	API *fdb = FDB::API::selectAPIVersion(620);
+	API *fdb = FDB::API::selectAPIVersion(630);
 	fdb->setupNetwork();
 	startThread(networkThread, fdb);

-	g_network = newNet2( false );
+	g_network = newNet2(TLSConfig());

 	openTraceFile(NetworkAddress(), 1000000, 1000000, ".");
 	systemMonitor();
@ -131,6 +132,8 @@ namespace FDB {
 													   GetRangeLimits limits = GetRangeLimits(), bool snapshot = false,
 													   bool reverse = false,
 													   FDBStreamingMode streamingMode = FDB_STREAMING_MODE_SERIAL) override;
+		
+		Future<int64_t> getEstimatedRangeSizeBytes(const KeyRange& keys) override;

 		void addReadConflictRange(KeyRangeRef const& keys) override;
 		void addReadConflictKey(KeyRef const& key) override;
@ -345,6 +348,14 @@ namespace FDB {
 			} );
 	}

+	Future<int64_t> TransactionImpl::getEstimatedRangeSizeBytes(const KeyRange& keys) {
+		return backToFuture<int64_t>(fdb_transaction_get_estimated_range_size_bytes(tr, keys.begin.begin(), keys.begin.size(), keys.end.begin(), keys.end.size()), [](Reference<CFuture> f) {
+			int64_t bytes;
+			throw_on_error(fdb_future_get_int64(f->f, &bytes));
+			return bytes;
+		});
+	}
+
 	void TransactionImpl::addReadConflictRange(KeyRangeRef const& keys) {
 		throw_on_error( fdb_transaction_add_conflict_range( tr, keys.begin.begin(), keys.begin.size(), keys.end.begin(), keys.end.size(), FDB_CONFLICT_RANGE_TYPE_READ ) );
 	}
--- a/bindings/flow/fdb_flow.h
+++ b/bindings/flow/fdb_flow.h
@ -23,7 +23,7 @@

 #include <flow/flow.h>

-#define FDB_API_VERSION 620
+#define FDB_API_VERSION 630
 #include <bindings/c/foundationdb/fdb_c.h>
 #undef DLLEXPORT

@ -89,6 +89,8 @@ namespace FDB {
 							streamingMode);
 		}

+		virtual Future<int64_t> getEstimatedRangeSizeBytes(const KeyRange& keys) = 0;
+
 		virtual void addReadConflictRange(KeyRangeRef const& keys) = 0;
 		virtual void addReadConflictKey(KeyRef const& key) = 0;

--- a/bindings/flow/fdb_flow.vcxproj
+++ b/bindings/flow/fdb_flow.vcxproj
@ -1,152 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.1" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Condition="'$(Release)' != 'true' ">
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Release)' == 'true' ">
-    <PreprocessorDefinitions>FDB_CLEAN_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-  </PropertyGroup>
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|X64">
-      <Configuration>Debug</Configuration>
-      <Platform>X64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|X64">
-      <Configuration>Release</Configuration>
-      <Platform>X64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <ItemGroup>
-    <ActorCompiler Include="fdb_flow.actor.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="DirectoryPartition.h" />
-    <ClInclude Include="FDBLoanerTypes.h" />
-    <ClInclude Include="fdb_flow.h" />
-    <ClInclude Include="Tuple.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="Tuple.cpp" />
-    <ClInclude Include="IDirectory.h" />
-    <ClInclude Include="Subspace.h" />
-    <ClCompile Include="Subspace.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="HighContentionAllocator.h" />
-    <ActorCompiler Include="HighContentionAllocator.actor.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="DirectoryLayer.h" />
-    <ActorCompiler Include="DirectoryLayer.actor.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="DirectorySubspace.h" />
-    <ClCompile Include="DirectorySubspace.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ActorCompiler Include="Node.actor.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="no_intellisense.opt" />
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGUID>{2BA0A5E2-EB4C-4A32-948C-CBAABD77AF87}</ProjectGUID>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>fdb_flow</RootNamespace>
-  </PropertyGroup>
-  <PropertyGroup>
-    <OutDir>$(SolutionDir)bin\$(Configuration)\</OutDir>
-    <IntDir>$(SystemDrive)\temp\msvcfdb\$(Platform)$(Configuration)\$(MSBuildProjectName)\</IntDir>
-    <BuildLogFile>$(IntDir)\$(MSBuildProjectName).log</BuildLogFile>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|X64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|X64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(LocalAppData)\Microsoft\VisualStudio\10.0\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(LocalAppData)\Microsoft\VisualStudio\10.0\Microsoft.Cpp.$(Platform).user.props')" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">
-    <LinkIncremental>true</LinkIncremental>
-    <IncludePath>..\..\;C:\Program Files\boost_1_67_0;$(IncludePath)</IncludePath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|X64'">
-    <LinkIncremental>false</LinkIncremental>
-    <IncludePath>..\..\;C:\Program Files\boost_1_67_0;$(IncludePath)</IncludePath>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <MinimalRebuild>false</MinimalRebuild>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <Optimization>Disabled</Optimization>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PreprocessorDefinitions>TLS_DISABLED;WIN32;_WIN32_WINNT=0x0502;WINVER=0x0502;BOOST_ALL_NO_LIB;NTDDI_VERSION=0x05020000;_DEBUG;_HAS_ITERATOR_DEBUGGING=0;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\c</AdditionalIncludeDirectories>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <AdditionalOptions>/bigobj @..\..\flow/no_intellisense.opt %(AdditionalOptions)</AdditionalOptions>
-			<LanguageStandard>stdcpp17</LanguageStandard>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>Advapi32.lib</AdditionalDependencies>
-    </Link>
-    <Lib>
-      <AdditionalDependencies>$(TargetDir)flow.lib</AdditionalDependencies>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|X64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <Optimization>Full</Optimization>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>TLS_DISABLED;WIN32;_WIN32_WINNT=0x0502;WINVER=0x0502;BOOST_ALL_NO_LIB;NTDDI_VERSION=0x05020000;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\c</AdditionalIncludeDirectories>
-      <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
-      <EnablePREfast>false</EnablePREfast>
-      <AdditionalOptions>/bigobj @..\..\flow/no_intellisense.opt %(AdditionalOptions)</AdditionalOptions>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <MinimalRebuild>false</MinimalRebuild>
-			<LanguageStandard>stdcpp17</LanguageStandard>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>false</EnableCOMDATFolding>
-      <OptimizeReferences>false</OptimizeReferences>
-      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
-      <AdditionalDependencies>Advapi32.lib</AdditionalDependencies>
-      <AdditionalOptions>/LTCG %(AdditionalOptions)</AdditionalOptions>
-    </Link>
-    <Lib>
-      <AdditionalDependencies>$(TargetDir)flow.lib</AdditionalDependencies>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ImportGroup Label="ExtensionTargets">
-    <Import Project="..\..\flow\actorcompiler\ActorCompiler.targets" />
-  </ImportGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <Target Name="MyPreCompileSteps" AfterTargets="CLCompile">
-    <Exec Command="&quot;$(SolutionDir)bin\$(Configuration)\coveragetool.exe&quot; &quot;$(OutDir)coverage.$(TargetName).xml&quot; @(ActorCompiler -> '%(RelativeDir)%(Filename)%(Extension)', ' ') @(CLInclude -> '%(RelativeDir)%(Filename)%(Extension)', ' ') @(CLCompile -> '%(RelativeDir)%(Filename)%(Extension)', ' ')" />
-  </Target>
-</Project>
--- a/bindings/flow/local.mk
+++ b/bindings/flow/local.mk
@ -1,44 +0,0 @@
-#
-# local.mk
-#
-# This source file is part of the FoundationDB open source project
-#
-# Copyright 2013-2018 Apple Inc. and the FoundationDB project authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# -*- mode: makefile; -*-
-
-fdb_flow_CFLAGS := -Ibindings/c $(fdbrpc_CFLAGS)
-fdb_flow_LDFLAGS := -Llib -lfdb_c $(fdbrpc_LDFLAGS)
-fdb_flow_LIBS :=
-
-packages/fdb-flow-$(FLOWVER)-$(PLATFORM)-$(ARCH).tar.gz: fdb_flow
-	@echo "Packaging      fdb_flow"
-	@rm -rf packages/fdb-flow-$(FLOWVER)-$(PLATFORM)-$(ARCH)
-	@mkdir -p packages/fdb-flow-$(FLOWVER)-$(PLATFORM)-$(ARCH)/lib packages/fdb-flow-$(FLOWVER)-$(PLATFORM)-$(ARCH)/include/bindings/flow packages/fdb-flow-$(FLOWVER)-$(PLATFORM)-$(ARCH)/include/bindings/c/foundationdb
-	@cp lib/libfdb_flow.a packages/fdb-flow-$(FLOWVER)-$(PLATFORM)-$(ARCH)/lib
-	@find bindings/flow -name '*.h' -not -path 'bindings/flow/tester/*' -exec cp {} packages/fdb-flow-$(FLOWVER)-$(PLATFORM)-$(ARCH)/include/bindings/flow \;
-	@find bindings/c/foundationdb -name '*.h' -exec cp {} packages/fdb-flow-$(FLOWVER)-$(PLATFORM)-$(ARCH)/include/bindings/c/foundationdb \;
-	@tar czf packages/fdb-flow-$(FLOWVER)-$(PLATFORM)-$(ARCH).tar.gz -C packages fdb-flow-$(FLOWVER)-$(PLATFORM)-$(ARCH)
-	@rm -rf packages/fdb-flow-$(FLOWVER)-$(PLATFORM)-$(ARCH)
-
-FDB_FLOW: packages/fdb-flow-$(FLOWVER)-$(PLATFORM)-$(ARCH).tar.gz
-
-FDB_FLOW_clean:
-	@echo "Cleaning       fdb_flow package"
-	@rm -rf packages/fdb-flow-*.tar.gz
-
-packages: FDB_FLOW
-packages_clean: FDB_FLOW_clean
--- a/bindings/flow/tester/CMakeLists.txt
+++ b/bindings/flow/tester/CMakeLists.txt
@ -2,5 +2,5 @@ set(TEST_SRCS
  DirectoryTester.actor.cpp
  Tester.actor.cpp
  Tester.actor.h)
-add_flow_target(NAME fdb_flow_tester EXECUTABLE SRCS ${TEST_SRCS})
+add_flow_target(EXECUTABLE NAME fdb_flow_tester SRCS ${TEST_SRCS})
 target_link_libraries(fdb_flow_tester fdb_flow)
--- a/bindings/flow/tester/Tester.actor.cpp
+++ b/bindings/flow/tester/Tester.actor.cpp
@ -28,6 +28,7 @@
 #include "bindings/flow/FDBLoanerTypes.h"
 #include "fdbrpc/fdbrpc.h"
 #include "flow/DeterministicRandom.h"
+#include "flow/TLSConfig.actor.h"
 #include "flow/actorcompiler.h" // This must be the last #include.

 // Otherwise we have to type setupNetwork(), FDB::open(), etc.
@ -216,19 +217,19 @@ ACTOR Future< Standalone<RangeResultRef> > getRange(Reference<Transaction> tr, K
 	}
 }

-ACTOR static Future<Void> debugPrintRange(Reference<Transaction> tr, std::string subspace, std::string msg) {
-	if (!tr)
-		return Void();
-
-	Standalone<RangeResultRef> results = wait(getRange(tr, KeyRange(KeyRangeRef(subspace + '\x00', subspace + '\xff'))));
-	printf("==================================================DB:%s:%s, count:%d\n", msg.c_str(),
-	       StringRef(subspace).printable().c_str(), results.size());
-	for (auto & s : results) {
-		printf("=====key:%s, value:%s\n", StringRef(s.key).printable().c_str(), StringRef(s.value).printable().c_str());
-	}
-
-	return Void();
-}
+//ACTOR static Future<Void> debugPrintRange(Reference<Transaction> tr, std::string subspace, std::string msg) {
+//	if (!tr)
+//		return Void();
+//
+//	Standalone<RangeResultRef> results = wait(getRange(tr, KeyRange(KeyRangeRef(subspace + '\x00', subspace + '\xff'))));
+//	printf("==================================================DB:%s:%s, count:%d\n", msg.c_str(),
+//	       StringRef(subspace).printable().c_str(), results.size());
+//	for (auto & s : results) {
+//		printf("=====key:%s, value:%s\n", StringRef(s.key).printable().c_str(), StringRef(s.value).printable().c_str());
+//	}
+//
+//	return Void();
+//}

 ACTOR Future<Void> stackSub(FlowTesterStack* stack) {
 	if (stack->data.size() < 2)
@ -429,9 +430,8 @@ struct LogStackFunc : InstructionFunc {
 				wait(logStack(data, entries, prefix));
 				entries.clear();
 			}
-
-			wait(logStack(data, entries, prefix));
 		}
+		wait(logStack(data, entries, prefix));

 		return Void();
 	}
@ -638,6 +638,29 @@ struct GetFunc : InstructionFunc {
 const char* GetFunc::name = "GET";
 REGISTER_INSTRUCTION_FUNC(GetFunc);

+struct GetEstimatedRangeSize : InstructionFunc {
+	static const char* name;
+
+	ACTOR static Future<Void> call(Reference<FlowTesterData> data, Reference<InstructionData> instruction) {
+		state std::vector<StackItem> items = data->stack.pop(2);
+		if (items.size() != 2)
+			return Void();
+
+		Standalone<StringRef> s1 = wait(items[0].value);
+		state Standalone<StringRef> beginKey = Tuple::unpack(s1).getString(0);
+
+		Standalone<StringRef> s2 = wait(items[1].value);
+		state Standalone<StringRef> endKey = Tuple::unpack(s2).getString(0);
+		Future<int64_t> fsize = instruction->tr->getEstimatedRangeSizeBytes(KeyRangeRef(beginKey, endKey));
+		int64_t size = wait(fsize);
+		data->stack.pushTuple(LiteralStringRef("GOT_ESTIMATED_RANGE_SIZE"));
+
+		return Void();
+	}
+};
+const char* GetEstimatedRangeSize::name = "GET_ESTIMATED_RANGE_SIZE";
+REGISTER_INSTRUCTION_FUNC(GetEstimatedRangeSize);
+
 struct GetKeyFunc : InstructionFunc {
 	static const char* name;

@ -1603,6 +1626,7 @@ struct UnitTestsFunc : InstructionFunc {
 		tr->setOption(FDBTransactionOption::FDB_TR_OPTION_READ_LOCK_AWARE);
 		tr->setOption(FDBTransactionOption::FDB_TR_OPTION_LOCK_AWARE);
 		tr->setOption(FDBTransactionOption::FDB_TR_OPTION_INCLUDE_PORT_IN_ADDRESS);
+		tr->setOption(FDBTransactionOption::FDB_TR_OPTION_REPORT_CONFLICTING_KEYS);

 		Optional<FDBStandalone<ValueRef> > _ = wait(tr->get(LiteralStringRef("\xff")));
 		tr->cancel();
@ -1748,7 +1772,7 @@ ACTOR void startTest(std::string clusterFilename, StringRef prefix, int apiVersi
 		populateOpsThatCreateDirectories(); // FIXME

 		// This is "our" network
-		g_network = newNet2(false);
+		g_network = newNet2(TLSConfig());

 		ASSERT(!API::isAPIVersionSelected());
 		try {
@ -1791,9 +1815,9 @@ ACTOR void startTest(std::string clusterFilename, StringRef prefix, int apiVersi

 ACTOR void _test_versionstamp() {
 	try {
-		g_network = newNet2(false);
+		g_network = newNet2(TLSConfig());

-		API *fdb = FDB::API::selectAPIVersion(620);
+		API *fdb = FDB::API::selectAPIVersion(630);

 		fdb->setupNetwork();
 		startThread(networkThread, fdb);
--- a/bindings/flow/tester/fdb_flow_tester.vcxproj
+++ b/bindings/flow/tester/fdb_flow_tester.vcxproj
@ -1,131 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.1" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(SolutionDir)versions.target" />
-  <PropertyGroup Condition="'$(Release)' != 'true' ">
-    <PreReleaseDecoration>-PRERELEASE</PreReleaseDecoration>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Release)' == 'true' ">
-    <PreReleaseDecoration>
-    </PreReleaseDecoration>
-  </PropertyGroup>
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|X64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|X64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <ItemGroup>
-    <ActorCompiler Include="Tester.actor.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ActorCompiler Include="DirectoryTester.actor.cpp" />
-    <ActorCompiler Include="Tester.actor.cpp" />
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{086EB89C-CDBD-4ABE-8296-5CA224244C80}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>fdb_flow_tester</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|X64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|X64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>false</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|X64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|X64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">
-    <LinkIncremental>true</LinkIncremental>
-    <OutDir>$(SolutionDir)bin\$(Configuration)\</OutDir>
-    <IntDir>$(SystemDrive)\temp\msvcfdb\$(Platform)$(Configuration)\$(MSBuildProjectName)\</IntDir>
-    <IncludePath>$(IncludePath);../../../;C:\Program Files\boost_1_67_0</IncludePath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|X64'">
-    <LinkIncremental>false</LinkIncremental>
-    <OutDir>$(SolutionDir)bin\$(Configuration)\</OutDir>
-    <IntDir>$(SystemDrive)\temp\msvcfdb\$(Platform)$(Configuration)\$(MSBuildProjectName)\</IntDir>
-    <IncludePath>$(IncludePath);../;C:\Program Files\boost_1_67_0</IncludePath>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <PreprocessorDefinitions>FDB_VT_VERSION="$(Version)$(PreReleaseDecoration)";FDB_VT_PACKAGE_NAME="$(PackageName)";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-			<LanguageStandard>stdcpp17</LanguageStandard>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>TLS_DISABLED;WIN32;_WIN32_WINNT=_WIN32_WINNT_WS03;BOOST_ALL_NO_LIB;WINVER=_WIN32_WINNT_WS03;NTDDI_VERSION=NTDDI_WS03;BOOST_ALL_NO_LIB;_DEBUG;_HAS_ITERATOR_DEBUGGING=0;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <MinimalRebuild>false</MinimalRebuild>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <AdditionalOptions> @../../../flow/no_intellisense.opt %(AdditionalOptions)</AdditionalOptions>
-			<LanguageStandard>stdcpp17</LanguageStandard>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>$(SolutionDir)bin\$(Configuration)\fdbclient.lib;$(SolutionDir)bin\$(Configuration)\fdb_c.lib;$(SolutionDir)bin\$(Configuration)\fdb_flow.lib;Advapi32.lib</AdditionalDependencies>
-    </Link>
-    <PreBuildEvent>
-      <Command>
-      </Command>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|X64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>Full</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>TLS_DISABLED;WIN32;_WIN32_WINNT=_WIN32_WINNT_WS03;WINVER=_WIN32_WINNT_WS03;NTDDI_VERSION=NTDDI_WS03;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
-      <AdditionalOptions> @../flow/no_intellisense.opt %(AdditionalOptions)</AdditionalOptions>
-			<LanguageStandard>stdcpp17</LanguageStandard>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>false</EnableCOMDATFolding>
-      <OptimizeReferences>false</OptimizeReferences>
-      <AdditionalDependencies>$(SolutionDir)bin\$(Configuration)\fdbclient.lib;$(SolutionDir)bin\$(Configuration)\fdb_c.lib;$(SolutionDir)bin\$(Configuration)\fdb_flow.lib;Advapi32.lib</AdditionalDependencies>
-      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
-    </Link>
-    <PreBuildEvent>
-      <Command>
-      </Command>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ImportGroup Label="ExtensionTargets">
-    <Import Project="..\..\..\flow\actorcompiler\ActorCompiler.targets" />
-  </ImportGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-</Project>
--- a/bindings/flow/tester/fdb_flow_tester.vcxproj.filters
+++ b/bindings/flow/tester/fdb_flow_tester.vcxproj.filters
@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ActorCompiler Include="DirectoryTester.actor.cpp" />
-    <ActorCompiler Include="Tester.actor.cpp" />
-    <ActorCompiler Include="Tester.actor.h" />
-  </ItemGroup>
-</Project>
--- a/bindings/flow/tester/local.mk
+++ b/bindings/flow/tester/local.mk
@ -1,41 +0,0 @@
-#
-# local.mk
-#
-# This source file is part of the FoundationDB open source project
-#
-# Copyright 2013-2018 Apple Inc. and the FoundationDB project authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# -*- mode: makefile; -*-
-
-fdb_flow_tester_CFLAGS := -Ibindings/c $(fdbrpc_CFLAGS)
-fdb_flow_tester_LDFLAGS := -Llib $(fdbrpc_LDFLAGS) -lfdb_c
-fdb_flow_tester_LIBS := lib/libfdb_flow.a lib/libflow.a lib/libfdb_c.$(DLEXT)
-
-fdb_flow_tester: lib/libfdb_c.$(DLEXT)
-	@mkdir -p bindings/flow/bin
-	@rm -f bindings/flow/bin/fdb_flow_tester
-	@cp bin/fdb_flow_tester bindings/flow/bin/fdb_flow_tester
-
-fdb_flow_tester_clean: _fdb_flow_tester_clean
-
-_fdb_flow_tester_clean:
-	@rm -rf bindings/flow/bin
-
-ifeq ($(PLATFORM),linux)
-  fdb_flow_tester_LDFLAGS += -static-libstdc++ -static-libgcc -ldl -lpthread -lrt -lm
-else ifeq ($(PLATFORM),osx)
-  fdb_flow_tester_LDFLAGS += -lc++
-endif
--- a/bindings/go/CMakeLists.txt
+++ b/bindings/go/CMakeLists.txt
@ -99,6 +99,8 @@ function(build_go_package)
  endif()
  add_custom_command(OUTPUT ${outfile}
    COMMAND ${CMAKE_COMMAND} -E env ${go_env}
+            ${GO_EXECUTABLE} get -d ${GO_IMPORT_PATH}/${BGP_PATH} &&
+            ${CMAKE_COMMAND} -E env ${go_env}
            ${GO_EXECUTABLE} install ${GO_IMPORT_PATH}/${BGP_PATH}
    DEPENDS ${fdb_options_file}
    COMMENT "Building ${BGP_NAME}")
--- a/bindings/go/README.md
+++ b/bindings/go/README.md
@ -9,7 +9,7 @@ This package requires:
 - [Mono](http://www.mono-project.com/) (macOS or Linux) or [Visual Studio](https://www.visualstudio.com/) (Windows)  (build-time only)
 - FoundationDB C API 2.0.x-6.1.x (part of the [FoundationDB client packages](https://apple.github.io/foundationdb/downloads.html#c))

-Use of this package requires the selection of a FoundationDB API version at runtime. This package currently supports FoundationDB API versions 200-620.
+Use of this package requires the selection of a FoundationDB API version at runtime. This package currently supports FoundationDB API versions 200-630.

 To install this package, you can run the "fdb-go-install.sh" script (for versions 5.0.x and greater):

--- a/bindings/go/fdb-go-install.sh
+++ b/bindings/go/fdb-go-install.sh
@ -25,6 +25,9 @@ platform=$(uname)
 if [[ "${platform}" == "Darwin" ]] ; then
    FDBLIBDIR="${FDBLIBDIR:-/usr/local/lib}"
    libfdbc="libfdb_c.dylib"
+elif [[ "${platform}" == "FreeBSD" ]] ; then
+    FDBLIBDIR="${FDBLIBDIR:-/lib}"
+    libfdbc="libfdb_c.so"
 elif [[ "${platform}" == "Linux" ]] ; then
    libfdbc="libfdb_c.so"
    custom_libdir="${FDBLIBDIR:-}"
@ -248,8 +251,11 @@ else
            :
        elif [[ "${status}" -eq 0 ]] ; then
            echo "Building generated files."
+        if [[ "${platform}" == "FreeBSD" ]] ; then
+            cmd=( 'gmake' '-C' "${fdbdir}" 'bindings/c/foundationdb/fdb_c_options.g.h' )
+        else
            cmd=( 'make' '-C' "${fdbdir}" 'bindings/c/foundationdb/fdb_c_options.g.h' )
-
+        fi
            echo "${cmd[*]}"
            if ! "${cmd[@]}" ; then
                let status="${status} + 1"
--- a/bindings/go/include.mk
+++ b/bindings/go/include.mk
@ -1,103 +0,0 @@
-#
-# include.mk
-#
-# This source file is part of the FoundationDB open source project
-#
-# Copyright 2013-2018 Apple Inc. and the FoundationDB project authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-TARGETS += fdb_go fdb_go_tester
-CLEAN_TARGETS += fdb_go_clean fdb_go_tester_clean
-
-GOPATH := $(CURDIR)/bindings/go/build
-GO_IMPORT_PATH := github.com/apple/foundationdb/bindings/go/src
-GO_DEST := $(GOPATH)/src/$(GO_IMPORT_PATH)
-
-.PHONY: fdb_go fdb_go_path fdb_go_fmt fdb_go_fmt_check fdb_go_tester fdb_go_tester_clean
-
-# We only override if the environment didn't set it (this is used by
-# the fdbwebsite documentation build process)
-GODOC_DIR ?= bindings/go
-
-CGO_CFLAGS := -I$(CURDIR)/bindings/c
-CGO_LDFLAGS := -L$(CURDIR)/lib
-
-ifeq ($(PLATFORM),linux)
-  GOPLATFORM := linux_amd64
-else ifeq ($(PLATFORM),osx)
-  GOPLATFORM := darwin_amd64
-else
-  $(error Not prepared to compile on platform $(PLATFORM))
-endif
-
-GO_PACKAGE_OUTDIR := $(GOPATH)/pkg/$(GOPLATFORM)/$(GO_IMPORT_PATH)
-
-GO_PACKAGES := fdb fdb/tuple fdb/subspace fdb/directory
-GO_PACKAGE_OBJECTS := $(addprefix $(GO_PACKAGE_OUTDIR)/,$(GO_PACKAGES:=.a))
-
-GO_GEN := $(CURDIR)/bindings/go/src/fdb/generated.go
-GO_SRC := $(shell find $(CURDIR)/bindings/go/src -name '*.go') $(GO_GEN)
-
-fdb_go: $(GO_PACKAGE_OBJECTS) $(GO_SRC) fdb_go_fmt_check
-
-fdb_go_fmt: $(GO_SRC)
-	@echo "Formatting     fdb_go"
-	@gofmt -w $(GO_SRC)
-
-fdb_go_fmt_check: $(GO_SRC)
-	@echo "Checking       fdb_go"
-	@bash -c 'fmtoutstr=$$(gofmt -l $(GO_SRC)) ; if [[ -n "$${fmtoutstr}" ]] ; then echo "Detected go formatting violations for the following files:" ; echo "$${fmtoutstr}" ; echo "Try running: make fdb_go_fmt"; exit 1 ; fi'
-
-$(GO_DEST)/.stamp: $(GO_SRC)
-	@echo "Creating       fdb_go_path"
-	@mkdir -p $(GO_DEST)
-	@cp -r bindings/go/src/* $(GO_DEST)
-	@touch $(GO_DEST)/.stamp
-
-fdb_go_path: $(GO_DEST)/.stamp
-
-fdb_go_clean:
-	@echo "Cleaning       fdb_go"
-	@rm -rf $(GOPATH)
-
-fdb_go_tester: $(GOPATH)/bin/_stacktester
-
-fdb_go_tester_clean:
-	@echo "Cleaning       fdb_go_tester"
-	@rm -rf $(GOPATH)/bin
-
-$(GOPATH)/bin/_stacktester: $(GO_DEST)/.stamp $(GO_SRC) $(GO_PACKAGE_OBJECTS)
-	@echo "Compiling      $(basename $(notdir $@))"
-	@go install $(GO_IMPORT_PATH)/_stacktester
-
-$(GO_PACKAGE_OUTDIR)/fdb/tuple.a: $(GO_DEST)/.stamp $(GO_SRC) $(GO_PACKAGE_OUTDIR)/fdb.a
-	@echo "Compiling      fdb/tuple"
-	@go install $(GO_IMPORT_PATH)/fdb/tuple
-
-$(GO_PACKAGE_OUTDIR)/fdb/subspace.a: $(GO_DEST)/.stamp $(GO_SRC) $(GO_PACKAGE_OUTDIR)/fdb.a $(GO_PACKAGE_OUTDIR)/fdb/tuple.a
-	@echo "Compiling      fdb/subspace"
-	@go install $(GO_IMPORT_PATH)/fdb/subspace
-
-$(GO_PACKAGE_OUTDIR)/fdb/directory.a: $(GO_DEST)/.stamp $(GO_SRC) $(GO_PACKAGE_OUTDIR)/fdb.a $(GO_PACKAGE_OUTDIR)/fdb/tuple.a $(GO_PACKAGE_OUTDIR)/fdb/subspace.a
-	@echo "Compiling      fdb/directory"
-	@go install $(GO_IMPORT_PATH)/fdb/directory
-
-$(GO_PACKAGE_OUTDIR)/fdb.a: $(GO_DEST)/.stamp lib/libfdb_c.$(DLEXT) $(GO_SRC)
-	@echo "Compiling      fdb"
-	@go install $(GO_IMPORT_PATH)/fdb
-
-$(GO_GEN): bindings/go/src/_util/translate_fdb_options.go fdbclient/vexillographer/fdb.options
-	@echo "Building       $@"
-	@go run bindings/go/src/_util/translate_fdb_options.go < fdbclient/vexillographer/fdb.options > $@
--- a/bindings/go/src/_stacktester/stacktester.go
+++ b/bindings/go/src/_stacktester/stacktester.go
@ -569,6 +569,16 @@ func (sm *StackMachine) processInst(idx int, inst tuple.Tuple) {
 		}

 		sm.store(idx, res.(fdb.FutureByteSlice))
+	case op == "GET_ESTIMATED_RANGE_SIZE":
+		r := sm.popKeyRange()
+		_, e := rt.ReadTransact(func(rtr fdb.ReadTransaction) (interface{}, error) {
+			_ = rtr.GetEstimatedRangeSizeBytes(r).MustGet()
+			sm.store(idx, []byte("GOT_ESTIMATED_RANGE_SIZE"))
+			return nil, nil
+		})
+		if e != nil {
+			panic(e)
+		}
 	case op == "COMMIT":
 		sm.store(idx, sm.currentTransaction().Commit())
 	case op == "RESET":
--- a/bindings/go/src/fdb/cluster.go
+++ b/bindings/go/src/fdb/cluster.go
@ -22,7 +22,7 @@

 package fdb

-// #define FDB_API_VERSION 620
+// #define FDB_API_VERSION 630
 // #include <foundationdb/fdb_c.h>
 import "C"

--- a/bindings/go/src/fdb/database.go
+++ b/bindings/go/src/fdb/database.go
@ -22,7 +22,7 @@

 package fdb

-// #define FDB_API_VERSION 620
+// #define FDB_API_VERSION 630
 // #include <foundationdb/fdb_c.h>
 import "C"

--- a/bindings/go/src/fdb/directory/directoryPartition.go
+++ b/bindings/go/src/fdb/directory/directoryPartition.go
@ -45,6 +45,10 @@ func (dp directoryPartition) Pack(t tuple.Tuple) fdb.Key {
 	panic("cannot pack keys using the root of a directory partition")
 }

+func (dp directoryPartition) PackWithVersionstamp(t tuple.Tuple) (fdb.Key, error) {
+	panic("cannot pack keys using the root of a directory partition")
+}
+
 func (dp directoryPartition) Unpack(k fdb.KeyConvertible) (tuple.Tuple, error) {
 	panic("cannot unpack keys using the root of a directory partition")
 }
--- a/bindings/go/src/fdb/directory/directorySubspace.go
+++ b/bindings/go/src/fdb/directory/directorySubspace.go
@ -23,6 +23,8 @@
 package directory

 import (
+	"fmt"
+	"strings"
 	"github.com/apple/foundationdb/bindings/go/src/fdb"
 	"github.com/apple/foundationdb/bindings/go/src/fdb/subspace"
 )
@ -43,6 +45,18 @@ type directorySubspace struct {
 	layer []byte
 }

+// String implements the fmt.Stringer interface and returns human-readable
+// string representation of this object.
+func (ds directorySubspace) String() string {
+	var path string
+	if len(ds.path) > 0 {
+		path = "(" + strings.Join(ds.path, ",") + ")"
+	} else {
+		path = "nil"
+	}
+	return fmt.Sprintf("DirectorySubspace(%s, %s)", path, fdb.Printable(ds.Bytes()))
+}
+
 func (d directorySubspace) CreateOrOpen(t fdb.Transactor, path []string, layer []byte) (DirectorySubspace, error) {
 	return d.dl.CreateOrOpen(t, d.dl.partitionSubpath(d.path, path), layer)
 }
--- a/bindings/go/src/fdb/doc.go
+++ b/bindings/go/src/fdb/doc.go
@ -46,7 +46,7 @@ A basic interaction with the FoundationDB API is demonstrated below:

    func main() {
        // Different API versions may expose different runtime behaviors.
-        fdb.MustAPIVersion(620)
+        fdb.MustAPIVersion(630)

        // Open the default database from the system cluster
        db := fdb.MustOpenDefault()
@ -139,6 +139,16 @@ error. The above example may be rewritten as:
        return []string{valueOne, valueTwo}, nil
    })

+MustGet returns nil (which is different from empty slice []byte{}), when the
+key doesn't exist, and hence non-existence can be checked as follows:
+
+    val := tr.Get(fdb.Key("foobar")).MustGet()
+    if val == nil {
+      fmt.Println("foobar does not exist.")
+    } else {
+      fmt.Println("foobar exists.")
+    }
+
 Any panic that occurs during execution of the caller-provided function will be
 recovered by the (Database).Transact method. If the error is an FDB Error, it
 will either result in a retry of the function or be returned by Transact. If the
--- a/bindings/go/src/fdb/errors.go
+++ b/bindings/go/src/fdb/errors.go
@ -22,7 +22,7 @@

 package fdb

-// #define FDB_API_VERSION 620
+// #define FDB_API_VERSION 630
 // #include <foundationdb/fdb_c.h>
 import "C"

--- a/bindings/go/src/fdb/fdb.go
+++ b/bindings/go/src/fdb/fdb.go
@ -22,7 +22,7 @@

 package fdb

-// #define FDB_API_VERSION 620
+// #define FDB_API_VERSION 630
 // #include <foundationdb/fdb_c.h>
 // #include <stdlib.h>
 import "C"
@ -108,7 +108,7 @@ func (opt NetworkOptions) setOpt(code int, param []byte) error {
 // library, an error will be returned. APIVersion must be called prior to any
 // other functions in the fdb package.
 //
-// Currently, this package supports API versions 200 through 620.
+// Currently, this package supports API versions 200 through 630.
 //
 // Warning: When using the multi-version client API, setting an API version that
 // is not supported by a particular client library will prevent that client from
@ -116,7 +116,7 @@ func (opt NetworkOptions) setOpt(code int, param []byte) error {
 // the API version of your application after upgrading your client until the
 // cluster has also been upgraded.
 func APIVersion(version int) error {
-	headerVersion := 620
+	headerVersion := 630

 	networkMutex.Lock()
 	defer networkMutex.Unlock()
@ -128,7 +128,7 @@ func APIVersion(version int) error {
 		return errAPIVersionAlreadySet
 	}

-	if version < 200 || version > 620 {
+	if version < 200 || version > 630 {
 		return errAPIVersionNotSupported
 	}

--- a/bindings/go/src/fdb/fdb_darwin.go
+++ b/bindings/go/src/fdb/fdb_darwin.go
@ -0,0 +1,5 @@
+package fdb
+
+//#cgo CFLAGS: -I/usr/local/include/
+//#cgo LDFLAGS: -L/usr/local/lib/
+import "C"
--- a/bindings/go/src/fdb/fdb_windows.go
+++ b/bindings/go/src/fdb/fdb_windows.go
@ -0,0 +1,5 @@
+package fdb
+
+//#cgo CFLAGS: -I"C:/Program Files/foundationdb/include"
+//#cgo LDFLAGS: -L"C:/Program Files/foundationdb/bin" -lfdb_c
+import "C"
--- a/bindings/go/src/fdb/futures.go
+++ b/bindings/go/src/fdb/futures.go
@ -23,7 +23,7 @@
 package fdb

 //  #cgo LDFLAGS: -lfdb_c -lm
-//  #define FDB_API_VERSION 620
+//  #define FDB_API_VERSION 630
 //  #include <foundationdb/fdb_c.h>
 //  #include <string.h>
 //
@ -268,6 +268,7 @@ type futureKeyValueArray struct {
 	*future
 }

+//go:nocheckptr
 func stringRefToSlice(ptr unsafe.Pointer) []byte {
 	size := *((*C.int)(unsafe.Pointer(uintptr(ptr) + 8)))

--- a/bindings/go/src/fdb/generated.go
+++ b/bindings/go/src/fdb/generated.go
@ -88,6 +88,13 @@ func (o NetworkOptions) SetTraceFormat(param string) error {
 	return o.setOpt(34, []byte(param))
 }

+// Select clock source for trace files. now (default) or realtime are supported.
+//
+// Parameter: Trace clock source
+func (o NetworkOptions) SetTraceClockSource(param string) error {
+	return o.setOpt(35, []byte(param))
+}
+
 // Set internal tuning or debugging knobs
 //
 // Parameter: knob_name=knob_value
@ -297,7 +304,7 @@ func (o DatabaseOptions) SetTransactionTimeout(param int64) error {
 	return o.setOpt(500, int64ToBytes(param))
 }

-// Set a timeout in milliseconds which, when elapsed, will cause a transaction automatically to be cancelled. This sets the ``retry_limit`` option of each transaction created by this database. See the transaction option description for more information.
+// Set a maximum number of retries after which additional calls to ``onError`` will throw the most recently seen error code. This sets the ``retry_limit`` option of each transaction created by this database. See the transaction option description for more information.
 //
 // Parameter: number of times to retry
 func (o DatabaseOptions) SetTransactionRetryLimit(param int64) error {
@ -323,7 +330,7 @@ func (o DatabaseOptions) SetTransactionCausalReadRisky() error {
 	return o.setOpt(504, nil)
 }

-// Addresses returned by get_addresses_for_key include the port when enabled. This will be enabled by default in api version 700, and this option will be deprecated.
+// Addresses returned by get_addresses_for_key include the port when enabled. As of api version 630, this option is enabled by default and setting this has no effect.
 func (o DatabaseOptions) SetTransactionIncludePortInAddress() error {
 	return o.setOpt(505, nil)
 }
@ -343,7 +350,7 @@ func (o TransactionOptions) SetCausalReadDisable() error {
 	return o.setOpt(21, nil)
 }

-// Addresses returned by get_addresses_for_key include the port when enabled. This will be enabled by default in api version 700, and this option will be deprecated.
+// Addresses returned by get_addresses_for_key include the port when enabled. As of api version 630, this option is enabled by default and setting this has no effect.
 func (o TransactionOptions) SetIncludePortInAddress() error {
 	return o.setOpt(23, nil)
 }
@ -422,7 +429,7 @@ func (o TransactionOptions) SetDebugTransactionIdentifier(param string) error {
 	return o.setOpt(403, []byte(param))
 }

-// Enables tracing for this transaction and logs results to the client trace logs. The DEBUG_TRANSACTION_IDENTIFIER option must be set before using this option, and client trace logging must be enabled and to get log output.
+// Enables tracing for this transaction and logs results to the client trace logs. The DEBUG_TRANSACTION_IDENTIFIER option must be set before using this option, and client trace logging must be enabled to get log output.
 func (o TransactionOptions) SetLogTransaction() error {
 	return o.setOpt(404, nil)
 }
@ -472,7 +479,7 @@ func (o TransactionOptions) SetSnapshotRywDisable() error {
 	return o.setOpt(601, nil)
 }

-// The transaction can read and write to locked databases, and is resposible for checking that it took the lock.
+// The transaction can read and write to locked databases, and is responsible for checking that it took the lock.
 func (o TransactionOptions) SetLockAware() error {
 	return o.setOpt(700, nil)
 }
@ -505,13 +512,14 @@ const (
 	// small portion of data is transferred to the client initially (in order to
 	// minimize costs if the client doesn't read the entire range), and as the
 	// caller iterates over more items in the range larger batches will be
-	// transferred in order to minimize latency.
+	// transferred in order to minimize latency. After enough iterations, the
+	// iterator mode will eventually reach the same byte limit as ``WANT_ALL``
 	StreamingModeIterator StreamingMode = 0

 	// Infrequently used. The client has passed a specific row limit and wants
 	// that many rows delivered in a single batch. Because of iterator operation
 	// in client drivers make request batches transparent to the user, consider
-	// “WANT_ALL“ StreamingMode instead. A row limit must be specified if this
+	// ``WANT_ALL`` StreamingMode instead. A row limit must be specified if this
 	// mode is used.
 	StreamingModeExact StreamingMode = 1

@ -628,15 +636,15 @@ type ErrorPredicate int

 const (

-	// Returns “true“ if the error indicates the operations in the transactions
-	// should be retried because of transient error.
+	// Returns ``true`` if the error indicates the operations in the
+	// transactions should be retried because of transient error.
 	ErrorPredicateRetryable ErrorPredicate = 50000

-	// Returns “true“ if the error indicates the transaction may have succeeded,
-	// though not in a way the system can verify.
+	// Returns ``true`` if the error indicates the transaction may have
+	// succeeded, though not in a way the system can verify.
 	ErrorPredicateMaybeCommitted ErrorPredicate = 50001

-	// Returns “true“ if the error indicates the transaction has not committed,
-	// though in a way that can be retried.
+	// Returns ``true`` if the error indicates the transaction has not
+	// committed, though in a way that can be retried.
 	ErrorPredicateRetryableNotCommitted ErrorPredicate = 50002
 )
--- a/bindings/go/src/fdb/range.go
+++ b/bindings/go/src/fdb/range.go
@ -22,7 +22,7 @@

 package fdb

-// #define FDB_API_VERSION 620
+// #define FDB_API_VERSION 630
 // #include <foundationdb/fdb_c.h>
 import "C"

@ -54,7 +54,8 @@ type RangeOptions struct {
 	// Reverse indicates that the read should be performed in lexicographic
 	// (false) or reverse lexicographic (true) order. When Reverse is true and
 	// Limit is non-zero, the last Limit key-value pairs in the range are
-	// returned.
+	// returned. Reading ranges in reverse is supported natively by the
+	// database and should have minimal extra cost.
 	Reverse bool
 }

--- a/bindings/go/src/fdb/snapshot.go
+++ b/bindings/go/src/fdb/snapshot.go
@ -86,3 +86,11 @@ func (s Snapshot) GetReadVersion() FutureInt64 {
 func (s Snapshot) GetDatabase() Database {
 	return s.transaction.db
 }
+
+func (s Snapshot) GetEstimatedRangeSizeBytes(r ExactRange) FutureInt64 {
+	beginKey, endKey := r.FDBRangeKeys()
+	return s.getEstimatedRangeSizeBytes(
+		beginKey.FDBKey(),
+		endKey.FDBKey(),
+	)
+}
--- a/bindings/go/src/fdb/subspace/subspace.go
+++ b/bindings/go/src/fdb/subspace/subspace.go
@ -35,6 +35,8 @@ package subspace
 import (
 	"bytes"
 	"errors"
+	"fmt"
+
 	"github.com/apple/foundationdb/bindings/go/src/fdb"
 	"github.com/apple/foundationdb/bindings/go/src/fdb/tuple"
 )
@ -54,6 +56,15 @@ type Subspace interface {
 	// Subspace prepended.
 	Pack(t tuple.Tuple) fdb.Key

+	// PackWithVersionstamp returns the key encoding the specified tuple in
+	// the subspace so that it may be used as the key in fdb.Transaction's
+	// SetVersionstampedKey() method. The passed tuple must contain exactly
+	// one incomplete tuple.Versionstamp instance or the method will return
+	// with an error. The behavior here is the same as if one used the
+	// tuple.PackWithVersionstamp() method to appropriately pack together this
+	// subspace and the passed tuple.
+	PackWithVersionstamp(t tuple.Tuple) (fdb.Key, error)
+
 	// Unpack returns the Tuple encoded by the given key with the prefix of this
 	// Subspace removed. Unpack will return an error if the key is not in this
 	// Subspace or does not encode a well-formed Tuple.
@ -73,7 +84,7 @@ type Subspace interface {
 }

 type subspace struct {
-	b []byte
+	rawPrefix []byte
 }

 // AllKeys returns the Subspace corresponding to all keys in a FoundationDB
@ -96,36 +107,46 @@ func FromBytes(b []byte) Subspace {
 	return subspace{s}
 }

+// String implements the fmt.Stringer interface and return the subspace
+// as a human readable byte string provided by fdb.Printable.
+func (s subspace) String() string {
+	return fmt.Sprintf("Subspace(rawPrefix=%s)", fdb.Printable(s.rawPrefix))
+}
+
 func (s subspace) Sub(el ...tuple.TupleElement) Subspace {
 	return subspace{concat(s.Bytes(), tuple.Tuple(el).Pack()...)}
 }

 func (s subspace) Bytes() []byte {
-	return s.b
+	return s.rawPrefix
 }

 func (s subspace) Pack(t tuple.Tuple) fdb.Key {
-	return fdb.Key(concat(s.b, t.Pack()...))
+	return fdb.Key(concat(s.rawPrefix, t.Pack()...))
+}
+
+func (s subspace) PackWithVersionstamp(t tuple.Tuple) (fdb.Key, error) {
+	return t.PackWithVersionstamp(s.rawPrefix)
 }

 func (s subspace) Unpack(k fdb.KeyConvertible) (tuple.Tuple, error) {
 	key := k.FDBKey()
-	if !bytes.HasPrefix(key, s.b) {
+	if !bytes.HasPrefix(key, s.rawPrefix) {
 		return nil, errors.New("key is not in subspace")
 	}
-	return tuple.Unpack(key[len(s.b):])
+	return tuple.Unpack(key[len(s.rawPrefix):])
 }

 func (s subspace) Contains(k fdb.KeyConvertible) bool {
-	return bytes.HasPrefix(k.FDBKey(), s.b)
+	return bytes.HasPrefix(k.FDBKey(), s.rawPrefix)
 }

 func (s subspace) FDBKey() fdb.Key {
-	return fdb.Key(s.b)
+	return fdb.Key(s.rawPrefix)
 }

 func (s subspace) FDBRangeKeys() (fdb.KeyConvertible, fdb.KeyConvertible) {
-	return fdb.Key(concat(s.b, 0x00)), fdb.Key(concat(s.b, 0xFF))
+	return fdb.Key(concat(s.rawPrefix, 0x00)), fdb.Key(concat(s.rawPrefix, 0xFF))
 }

 func (s subspace) FDBRangeKeySelectors() (fdb.Selectable, fdb.Selectable) {
--- a/bindings/go/src/fdb/subspace/subspace_test.go
+++ b/bindings/go/src/fdb/subspace/subspace_test.go
@ -0,0 +1,15 @@
+package subspace
+
+import (
+	"fmt"
+	"testing"
+)
+
+func TestSubspaceString(t *testing.T) {
+	printed := fmt.Sprint(Sub([]byte("hello"), "world", 42, 0x99))
+	expected := "Subspace(rawPrefix=\\x01hello\\x00\\x02world\\x00\\x15*\\x15\\x99)"
+
+	if printed != expected {
+		t.Fatalf("printed subspace result differs, expected %v, got %v", expected, printed)
+	}
+}
--- a/bindings/go/src/fdb/transaction.go
+++ b/bindings/go/src/fdb/transaction.go
@ -22,7 +22,7 @@

 package fdb

-// #define FDB_API_VERSION 620
+// #define FDB_API_VERSION 630
 // #include <foundationdb/fdb_c.h>
 import "C"

@ -39,6 +39,7 @@ type ReadTransaction interface {
 	GetReadVersion() FutureInt64
 	GetDatabase() Database
 	Snapshot() Snapshot
+	GetEstimatedRangeSizeBytes(r ExactRange) FutureInt64

 	ReadTransactor
 }
@ -305,6 +306,28 @@ func (t Transaction) GetRange(r Range, options RangeOptions) RangeResult {
 	return t.getRange(r, options, false)
 }

+func (t *transaction) getEstimatedRangeSizeBytes(beginKey Key, endKey Key) FutureInt64 {
+	return &futureInt64{
+		future: newFuture(C.fdb_transaction_get_estimated_range_size_bytes(
+			t.ptr,
+			byteSliceToPtr(beginKey),
+			C.int(len(beginKey)),
+			byteSliceToPtr(endKey),
+			C.int(len(endKey)),
+		)),
+	}
+}
+
+// GetEstimatedRangeSizeBytes will get an estimate for the number of bytes
+// stored in the given range.
+func (t Transaction) GetEstimatedRangeSizeBytes(r ExactRange) FutureInt64 {
+	beginKey, endKey := r.FDBRangeKeys()
+	return t.getEstimatedRangeSizeBytes(
+		beginKey.FDBKey(),
+		endKey.FDBKey(),
+	)
+}
+
 func (t *transaction) getReadVersion() FutureInt64 {
 	return &futureInt64{
 		future: newFuture(C.fdb_transaction_get_read_version(t.ptr)),
@ -383,6 +406,9 @@ func (t *transaction) getApproximateSize() FutureInt64 {
 	}
 }

+// Returns a future that is the approximate transaction size so far in this
+// transaction, which is the summation of the estimated size of mutations,
+// read conflict ranges, and write conflict ranges.
 func (t Transaction) GetApproximateSize() FutureInt64 {
 	return t.getApproximateSize()
 }
--- a/bindings/go/src/fdb/tuple/tuple.go
+++ b/bindings/go/src/fdb/tuple/tuple.go
@ -43,6 +43,8 @@ import (
 	"fmt"
 	"math"
 	"math/big"
+	"strconv"
+	"strings"

 	"github.com/apple/foundationdb/bindings/go/src/fdb"
 )
@ -66,6 +68,48 @@ type TupleElement interface{}
 // packing T (modulo type normalization to []byte, uint64, and int64).
 type Tuple []TupleElement

+// String implements the fmt.Stringer interface and returns human-readable
+// string representation of this tuple. For most elements, we use the
+// object's default string representation.
+func (tuple Tuple) String() string {
+	sb := strings.Builder{}
+	printTuple(tuple, &sb)
+	return sb.String()
+}
+
+func printTuple(tuple Tuple, sb *strings.Builder) {
+	sb.WriteString("(")
+
+	for i, t := range tuple {
+		switch t := t.(type) {
+		case Tuple:
+			printTuple(t, sb)
+		case nil:
+			sb.WriteString("<nil>")
+		case string:
+			sb.WriteString(strconv.Quote(t))
+		case UUID:
+			sb.WriteString("UUID(")
+			sb.WriteString(t.String())
+			sb.WriteString(")")
+		case []byte:
+			sb.WriteString("b\"")
+			sb.WriteString(fdb.Printable(t))
+			sb.WriteString("\"")
+		default:
+			// For user-defined and standard types, we use standard Go
+			// printer, which itself uses Stringer interface.
+			fmt.Fprintf(sb, "%v", t)
+		}
+
+		if (i < len(tuple) - 1) {
+			sb.WriteString(", ")
+		}
+	}
+
+	sb.WriteString(")")
+}
+
 // UUID wraps a basic byte array as a UUID. We do not provide any special
 // methods for accessing or generating the UUID, but as Go does not provide
 // a built-in UUID type, this simple wrapper allows for other libraries
@ -73,6 +117,10 @@ type Tuple []TupleElement
 // an instance of this type.
 type UUID [16]byte

+func (uuid UUID) String() string {
+	return fmt.Sprintf("%x-%x-%x-%x-%x", uuid[0:4], uuid[4:6], uuid[6:8], uuid[8:10], uuid[10:])
+}
+
 // Versionstamp is struct for a FoundationDB verionstamp. Versionstamps are
 // 12 bytes long composed of a 10 byte transaction version and a 2 byte user
 // version. The transaction version is filled in at commit time and the user
@ -82,6 +130,11 @@ type Versionstamp struct {
 	UserVersion        uint16
 }

+// Returns a human-readable string for this Versionstamp.
+func (vs Versionstamp) String() string {
+	return fmt.Sprintf("Versionstamp(%s, %d)", fdb.Printable(vs.TransactionVersion[:]), vs.UserVersion)
+}
+
 var incompleteTransactionVersion = [10]byte{0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}

 const versionstampLength = 12
--- a/bindings/go/src/fdb/tuple/tuple_test.go
+++ b/bindings/go/src/fdb/tuple/tuple_test.go
@ -4,6 +4,7 @@ import (
 	"bytes"
 	"encoding/gob"
 	"flag"
+	"fmt"
 	"math/rand"
 	"os"
 	"testing"
@ -118,3 +119,38 @@ func BenchmarkTuplePacking(b *testing.B) {
 		})
 	}
 }
+
+func TestTupleString(t *testing.T) {
+	testCases :=[ ]struct {
+		input    Tuple
+		expected string
+	}{
+		{
+			Tuple{[]byte("hello"), "world", 42, 0x99},
+			"(b\"hello\", \"world\", 42, 153)",
+		},
+		{
+			Tuple{nil, Tuple{"Ok", Tuple{1, 2}, "Go"}, 42, 0x99},
+			"(<nil>, (\"Ok\", (1, 2), \"Go\"), 42, 153)",
+		},
+		{
+			Tuple{"Bool", true, false},
+			"(\"Bool\", true, false)",
+		},
+		{
+			Tuple{"UUID", testUUID},
+			"(\"UUID\", UUID(1100aabb-ccdd-eeff-1100-aabbccddeeff))",
+		},
+		{
+			Tuple{"Versionstamp", Versionstamp{[10]byte{0, 0, 0, 0xaa, 0, 0xbb, 0, 0xcc, 0, 0xdd}, 620}},
+			"(\"Versionstamp\", Versionstamp(\\x00\\x00\\x00\\xaa\\x00\\xbb\\x00\\xcc\\x00\\xdd, 620))",
+		},
+	}
+
+	for _, testCase := range testCases {
+		printed := fmt.Sprint(testCase.input)
+		if printed != testCase.expected {
+			t.Fatalf("printed tuple result differs, expected %v, got %v", testCase.expected, printed)
+		}
+	}
+}
--- a/bindings/java/CMakeLists.txt
+++ b/bindings/java/CMakeLists.txt
@ -56,6 +56,7 @@ set(JAVA_BINDING_SRCS
  src/main/com/apple/foundationdb/testing/Promise.java
  src/main/com/apple/foundationdb/testing/PerfMetric.java
  src/main/com/apple/foundationdb/tuple/ByteArrayUtil.java
+  src/main/com/apple/foundationdb/tuple/FastByteComparisons.java
  src/main/com/apple/foundationdb/tuple/IterableComparator.java
  src/main/com/apple/foundationdb/tuple/package-info.java
  src/main/com/apple/foundationdb/tuple/StringUtil.java
@ -169,8 +170,6 @@ file(WRITE ${MANIFEST_FILE} ${MANIFEST_TEXT})
 add_jar(fdb-java ${JAVA_BINDING_SRCS} ${GENERATED_JAVA_FILES} ${CMAKE_SOURCE_DIR}/LICENSE
  OUTPUT_DIR ${PROJECT_BINARY_DIR}/lib VERSION ${CMAKE_PROJECT_VERSION} MANIFEST ${MANIFEST_FILE})
 add_dependencies(fdb-java fdb_java_options fdb_java)
-add_jar(foundationdb-tests SOURCES ${JAVA_TESTS_SRCS} INCLUDE_JARS fdb-java)
-add_dependencies(foundationdb-tests fdb_java_options)

 # TODO[mpilman]: The java RPM will require some more effort (mostly on debian). However,
 # most people will use the fat-jar, so it is not clear how high this priority is.
@ -237,6 +236,16 @@ if(NOT OPEN_FOR_IDE)
    WORKING_DIRECTORY ${unpack_dir}
    DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/lib_copied
    COMMENT "Build ${target_jar}")
+  add_jar(foundationdb-tests SOURCES ${JAVA_TESTS_SRCS} INCLUDE_JARS fdb-java)
+  add_dependencies(foundationdb-tests fdb_java_options)
+  set(tests_jar ${jar_destination}/fdb-java-${CMAKE_PROJECT_VERSION}${prerelease_string}-tests.jar)
+  add_custom_command(OUTPUT ${tests_jar}
+    COMMAND ${CMAKE_COMMAND} -E copy foundationdb-tests.jar "${tests_jar}"
+    WORKING_DIRECTORY .
+    DEPENDS foundationdb-tests
+    COMMENT "Build ${tests_jar}")
+  add_custom_target(fdb-java-tests ALL DEPENDS ${tests_jar})
+  add_dependencies(fdb-java-tests foundationdb-tests)
  add_custom_target(fat-jar ALL DEPENDS ${target_jar})
  add_dependencies(fat-jar fdb-java)
  add_dependencies(fat-jar copy_lib)
--- a/bindings/java/JavaWorkload.cpp
+++ b/bindings/java/JavaWorkload.cpp
@ -19,7 +19,7 @@
 */

 #include <foundationdb/ClientWorkload.h>
-#define FDB_API_VERSION 620
+#define FDB_API_VERSION 630
 #include <foundationdb/fdb_c.h>

 #include <jni.h>
@ -368,9 +368,11 @@ struct JVM {
 		                 { { "send", "(JZ)V", reinterpret_cast<void*>(&promiseSend) } });
 		auto fdbClass = getClass("com/apple/foundationdb/FDB");
 		jmethodID selectMethod =
-		    env->GetStaticMethodID(fdbClass, "selectAPIVersion", "(IZ)Lcom/apple/foundationdb/FDB;");
+		    env->GetStaticMethodID(fdbClass, "selectAPIVersion", "(I)Lcom/apple/foundationdb/FDB;");
 		checkException();
-		env->CallStaticObjectMethod(fdbClass, selectMethod, jint(620), jboolean(false));
+		auto fdbInstance = env->CallStaticObjectMethod(fdbClass, selectMethod, jint(630));
+		checkException();
+		env->CallObjectMethod(fdbInstance, getMethod(fdbClass, "disableShutdownHook", "()V"));
 		checkException();
 	}

--- a/bindings/java/fdbJNI.cpp
+++ b/bindings/java/fdbJNI.cpp
@ -21,7 +21,7 @@
 #include <jni.h>
 #include <string.h>

-#define FDB_API_VERSION 620
+#define FDB_API_VERSION 630

 #include <foundationdb/fdb_c.h>

@ -36,6 +36,11 @@ static JavaVM* g_jvm = nullptr;
 static thread_local JNIEnv* g_thread_jenv = nullptr;  // Defined for the network thread once it is running, and for any thread that has called registerCallback
 static thread_local jmethodID g_IFutureCallback_call_methodID = JNI_NULL;
 static thread_local bool is_external = false;
+static jclass range_result_summary_class;
+static jclass range_result_class;
+static jclass string_class;
+static jmethodID range_result_init;
+static jmethodID range_result_summary_init;

 void detachIfExternalThread(void *ignore) {
 	if(is_external && g_thread_jenv != nullptr) {
@ -275,10 +280,9 @@ JNIEXPORT jobject JNICALL Java_com_apple_foundationdb_FutureStrings_FutureString
 		return JNI_NULL;
 	}

-	jclass str_clazz = jenv->FindClass("java/lang/String");
 	if( jenv->ExceptionOccurred() )
 		return JNI_NULL;
-	jobjectArray arr = jenv->NewObjectArray(count, str_clazz, JNI_NULL);
+	jobjectArray arr = jenv->NewObjectArray(count, string_class, JNI_NULL);
 	if( !arr ) {
 		if( !jenv->ExceptionOccurred() )
 			throwOutOfMem(jenv);
@ -306,13 +310,6 @@ JNIEXPORT jobject JNICALL Java_com_apple_foundationdb_FutureResults_FutureResult
 		throwParamNotNull(jenv);
 		return JNI_NULL;
 	}
-
-	jclass resultCls = jenv->FindClass("com/apple/foundationdb/RangeResultSummary");
-	if( jenv->ExceptionOccurred() )
-		return JNI_NULL;
-	jmethodID resultCtorId = jenv->GetMethodID(resultCls, "<init>", "([BIZ)V");
-	if( jenv->ExceptionOccurred() )
-		return JNI_NULL;
 
 	FDBFuture *f = (FDBFuture *)future;

@ -337,7 +334,7 @@ JNIEXPORT jobject JNICALL Java_com_apple_foundationdb_FutureResults_FutureResult
 		jenv->SetByteArrayRegion(lastKey, 0, kvs[count - 1].key_length, (jbyte *)kvs[count - 1].key);
 	}

-	jobject result = jenv->NewObject(resultCls, resultCtorId, lastKey, count, (jboolean)more);
+	jobject result = jenv->NewObject(range_result_summary_class, range_result_summary_init, lastKey, count, (jboolean)more);
 	if( jenv->ExceptionOccurred() )
 		return JNI_NULL;

@ -350,9 +347,6 @@ JNIEXPORT jobject JNICALL Java_com_apple_foundationdb_FutureResults_FutureResult
 		throwParamNotNull(jenv);
 		return JNI_NULL;
 	}
-
-	jclass resultCls = jenv->FindClass("com/apple/foundationdb/RangeResult");
-	jmethodID resultCtorId = jenv->GetMethodID(resultCls, "<init>", "([B[IZ)V");
 
 	FDBFuture *f = (FDBFuture *)future;

@ -414,7 +408,7 @@ JNIEXPORT jobject JNICALL Java_com_apple_foundationdb_FutureResults_FutureResult
 	jenv->ReleaseByteArrayElements(keyValueArray, (jbyte *)keyvalues_barr, 0);
 	jenv->ReleaseIntArrayElements(lengthArray, length_barr, 0);

-	jobject result = jenv->NewObject(resultCls, resultCtorId, keyValueArray, lengthArray, (jboolean)more);
+	jobject result = jenv->NewObject(range_result_class, range_result_init, keyValueArray, lengthArray, (jboolean)more);
 	if( jenv->ExceptionOccurred() )
 		return JNI_NULL;

@ -646,6 +640,35 @@ JNIEXPORT jlong JNICALL Java_com_apple_foundationdb_FDBTransaction_Transaction_1
 	return (jlong)f;
 }

+JNIEXPORT jlong JNICALL Java_com_apple_foundationdb_FDBTransaction_Transaction_1getEstimatedRangeSizeBytes(JNIEnv *jenv, jobject, jlong tPtr, 
+		jbyteArray beginKeyBytes, jbyteArray endKeyBytes) {
+	if( !tPtr || !beginKeyBytes || !endKeyBytes) {
+		throwParamNotNull(jenv);
+		return 0;
+	}
+	FDBTransaction *tr = (FDBTransaction *)tPtr;
+
+	uint8_t *startKey = (uint8_t *)jenv->GetByteArrayElements( beginKeyBytes, JNI_NULL );
+	if(!startKey) {
+		if( !jenv->ExceptionOccurred() )
+			throwRuntimeEx( jenv, "Error getting handle to native resources" );
+		return 0;
+	}
+
+	uint8_t *endKey = (uint8_t *)jenv->GetByteArrayElements(endKeyBytes, JNI_NULL);
+	if (!endKey) {
+		jenv->ReleaseByteArrayElements( beginKeyBytes, (jbyte *)startKey, JNI_ABORT );
+		if( !jenv->ExceptionOccurred() )
+			throwRuntimeEx( jenv, "Error getting handle to native resources" );
+		return 0;
+	}
+
+	FDBFuture *f = fdb_transaction_get_estimated_range_size_bytes( tr, startKey, jenv->GetArrayLength( beginKeyBytes ), endKey, jenv->GetArrayLength( endKeyBytes ) );
+	jenv->ReleaseByteArrayElements( beginKeyBytes, (jbyte *)startKey, JNI_ABORT );
+	jenv->ReleaseByteArrayElements( endKeyBytes, (jbyte *)endKey, JNI_ABORT );
+	return (jlong)f;
+}
+
 JNIEXPORT void JNICALL Java_com_apple_foundationdb_FDBTransaction_Transaction_1set(JNIEnv *jenv, jobject, jlong tPtr, jbyteArray keyBytes, jbyteArray valueBytes) {
 	if( !tPtr || !keyBytes || !valueBytes ) {
 		throwParamNotNull(jenv);
@ -1013,8 +1036,43 @@ JNIEXPORT void JNICALL Java_com_apple_foundationdb_FDB_Network_1stop(JNIEnv *jen
 }

 jint JNI_OnLoad(JavaVM *vm, void *reserved) {
+    JNIEnv *env;
 	g_jvm = vm;
-	return JNI_VERSION_1_1;
+	if (vm->GetEnv((void**)&env, JNI_VERSION_1_6) != JNI_OK) {
+		return JNI_ERR;
+	} else {
+		jclass local_range_result_class = env->FindClass("com/apple/foundationdb/RangeResult");
+		range_result_init = env->GetMethodID(local_range_result_class, "<init>", "([B[IZ)V");
+		range_result_class = (jclass) (env)->NewGlobalRef(local_range_result_class);
+
+		jclass local_range_result_summary_class = env->FindClass("com/apple/foundationdb/RangeResultSummary");
+		range_result_summary_init = env->GetMethodID(local_range_result_summary_class, "<init>", "([BIZ)V");
+		range_result_summary_class = (jclass) (env)->NewGlobalRef(local_range_result_summary_class);
+
+		jclass local_string_class = env->FindClass("java/lang/String");
+		string_class = (jclass) (env)->NewGlobalRef(local_string_class);
+
+		return JNI_VERSION_1_6;
+	}
+}
+
+// Is automatically called once the Classloader is destroyed
+void JNI_OnUnload(JavaVM *vm, void *reserved) {
+	JNIEnv* env;
+	if (vm->GetEnv((void**)&env, JNI_VERSION_1_6) != JNI_OK) {
+		return;
+	} else {
+		// delete global references so the GC can collect them
+		if (range_result_summary_class != NULL) {
+			env->DeleteGlobalRef(range_result_summary_class);
+		}
+		if (range_result_class != NULL) {
+			env->DeleteGlobalRef(range_result_class);
+		}
+		if (string_class != NULL) {
+			env->DeleteGlobalRef(string_class);
+		}
+	}
 }

 #ifdef __cplusplus
--- a/bindings/java/fdb_java.vcxproj
+++ b/bindings/java/fdb_java.vcxproj
@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.1" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(SolutionDir)versions.target" />
-  <PropertyGroup Condition="'$(Release)' != 'true' ">
-    <PreReleaseDecoration>-PRERELEASE</PreReleaseDecoration>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Release)' == 'true' ">
-    <PreprocessorDefinitions>FDB_CLEAN_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    <PreReleaseDecoration>
-    </PreReleaseDecoration>
-  </PropertyGroup>
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{9617584C-22E8-4272-934F-733F378BF6AE}</ProjectGuid>
-    <RootNamespace>java</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <IncludePath>..\..\;C:\Program Files\Java\jdk6\include\win32;C:\Program Files\Java\jdk6\include;C:\Program Files\boost_1_67_0;$(IncludePath)</IncludePath>
-    <OutDir>$(SolutionDir)bin\$(Configuration)\</OutDir>
-    <IntDir>$(SystemDrive)\temp\msvcfdb\$(Platform)$(Configuration)\$(MSBuildProjectName)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>$(SolutionDir)bin\$(Configuration)\fdb_c.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(SolutionDir)bindings\c</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>TLS_DISABLED;WIN32;_WIN32_WINNT=_WIN32_WINNT_WS03;BOOST_ALL_NO_LIB;WINVER=_WIN32_WINNT_WS03;NTDDI_VERSION=NTDDI_WS03;_DEBUG;_HAS_ITERATOR_DEBUGGING=0;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <AdditionalOptions>/bigobj "@$(SolutionDir)flow/no_intellisense.opt" %(AdditionalOptions)</AdditionalOptions>
-			<LanguageStandard>stdcpp17</LanguageStandard>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(SolutionDir)bindings\c</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>TLS_DISABLED;WIN32;_WIN32_WINNT=_WIN32_WINNT_WS03;BOOST_ALL_NO_LIB;WINVER=_WIN32_WINNT_WS03;NTDDI_VERSION=NTDDI_WS03;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <AdditionalOptions>/bigobj "@$(SolutionDir)flow/no_intellisense.opt" %(AdditionalOptions)</AdditionalOptions>
-			<LanguageStandard>stdcpp17</LanguageStandard>
-    </ClCompile>
-    <Link>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <SubSystem>Windows</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="fdbJNI.cpp" />
-  </ItemGroup>
-  <ImportGroup Label="ExtensionTargets" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <Target Name="AfterClean">
-    <ItemGroup>
-      <FilesToDelete Include="$(OutDir)fdb_java.dll-*">
-        <Visible>false</Visible>
-      </FilesToDelete>
-    </ItemGroup>
-    <Message Text="Cleaning old dll files" Importance="high" />
-    <Delete Files="@(FilesToDelete)" />
-  </Target>
-</Project>
--- a/bindings/java/local.mk
+++ b/bindings/java/local.mk
@ -1,222 +0,0 @@
-#
-# local.mk
-#
-# This source file is part of the FoundationDB open source project
-#
-# Copyright 2013-2018 Apple Inc. and the FoundationDB project authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# -*- mode: makefile; -*-
-
-fdb_java_LDFLAGS := -Llib
-fdb_java_CFLAGS := $(fdbclient_CFLAGS) -Ibindings/c
-
-# We only override if the environment didn't set it (this is used by
-# the fdbwebsite documentation build process)
-JAVADOC_DIR ?= bindings/java
-
-fdb_java_LIBS := lib/libfdb_c.$(DLEXT)
-
-ifeq ($(RELEASE),true)
-  JARVER = $(VERSION)
-  APPLEJARVER = $(VERSION)
-else
-  JARVER = $(VERSION)-PRERELEASE
-  APPLEJARVER = $(VERSION)-SNAPSHOT
-endif
-
-ifeq ($(PLATFORM),linux)
-  JAVA_HOME ?= /usr/lib/jvm/java-8-openjdk-amd64
-  fdb_java_CFLAGS += -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux
-  fdb_java_LDFLAGS += -static-libgcc
-
-  java_ARCH := amd64
-else ifeq ($(PLATFORM),osx)
-  JAVA_HOME ?= $(shell /usr/libexec/java_home)
-  fdb_java_CFLAGS += -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/darwin
-
-  java_ARCH := x86_64
-endif
-
-JAVA_GENERATED_SOURCES := bindings/java/src/main/com/apple/foundationdb/NetworkOptions.java bindings/java/src/main/com/apple/foundationdb/DatabaseOptions.java bindings/java/src/main/com/apple/foundationdb/TransactionOptions.java bindings/java/src/main/com/apple/foundationdb/StreamingMode.java bindings/java/src/main/com/apple/foundationdb/ConflictRangeType.java bindings/java/src/main/com/apple/foundationdb/MutationType.java bindings/java/src/main/com/apple/foundationdb/FDBException.java
-
-JAVA_SOURCES := $(JAVA_GENERATED_SOURCES) bindings/java/src/main/com/apple/foundationdb/*.java bindings/java/src/main/com/apple/foundationdb/async/*.java bindings/java/src/main/com/apple/foundationdb/tuple/*.java bindings/java/src/main/com/apple/foundationdb/directory/*.java bindings/java/src/main/com/apple/foundationdb/subspace/*.java bindings/java/src/test/com/apple/foundationdb/test/*.java
-
-fdb_java: bindings/java/foundationdb-client.jar bindings/java/foundationdb-tests.jar
-
-bindings/java/foundationdb-tests.jar: bindings/java/.classstamp
-	@echo "Building       $@"
-	@jar cf $@ -C bindings/java/classes/test com/apple/foundationdb
-
-bindings/java/foundationdb-client.jar: bindings/java/.classstamp lib/libfdb_java.$(DLEXT)
-	@echo "Building       $@"
-	@rm -rf bindings/java/classes/main/lib/$(PLATFORM)/$(java_ARCH)
-	@mkdir -p bindings/java/classes/main/lib/$(PLATFORM)/$(java_ARCH)
-	@cp lib/libfdb_java.$(DLEXT) bindings/java/classes/main/lib/$(PLATFORM)/$(java_ARCH)/libfdb_java.$(java_DLEXT)
-	@jar cf $@ -C bindings/java/classes/main com/apple/foundationdb -C bindings/java/classes/main lib
-
-fdb_java_jar_clean:
-	@rm -rf $(JAVA_GENERATED_SOURCES)
-	@rm -rf bindings/java/classes
-	@rm -f bindings/java/foundationdb-client.jar bindings/java/foundationdb-tests.jar bindings/java/.classstamp
-
-# Redefinition of a target already defined in generated.mk, but it's "okay" and the way things were done before.
-fdb_java_clean: fdb_java_jar_clean
-
-bindings/java/src/main/com/apple/foundationdb/StreamingMode.java: bin/vexillographer.exe fdbclient/vexillographer/fdb.options
-	@echo "Building       Java options"
-	@$(MONO) bin/vexillographer.exe fdbclient/vexillographer/fdb.options java $(@D)
-
-bindings/java/src/main/com/apple/foundationdb/MutationType.java: bindings/java/src/main/com/apple/foundationdb/StreamingMode.java
-	@true
-
-bindings/java/src/main/com/apple/foundationdb/ConflictRangeType.java: bindings/java/src/main/com/apple/foundationdb/StreamingMode.java
-	@true
-
-bindings/java/src/main/com/apple/foundationdb/FDBException.java: bindings/java/src/main/com/apple/foundationdb/StreamingMode.java
-	@true
-
-bindings/java/src/main/com/apple/foundationdb/%Options.java: bindings/java/src/main/com/apple/foundationdb/StreamingMode.java
-	@true
-
-bindings/java/src/main/overview.html: bindings/java/src/main/overview.html.in $(ALL_MAKEFILES) versions.target
-	@m4 -DVERSION=$(VERSION) $< > $@
-
-bindings/java/.classstamp: $(JAVA_SOURCES)
-	@echo "Compiling      Java source"
-	@rm -rf bindings/java/classes
-	@mkdir -p bindings/java/classes/main
-	@mkdir -p bindings/java/classes/test
-	@$(JAVAC) $(JAVAFLAGS) -d bindings/java/classes/main bindings/java/src/main/com/apple/foundationdb/*.java bindings/java/src/main/com/apple/foundationdb/async/*.java bindings/java/src/main/com/apple/foundationdb/tuple/*.java bindings/java/src/main/com/apple/foundationdb/directory/*.java bindings/java/src/main/com/apple/foundationdb/subspace/*.java
-	@$(JAVAC) $(JAVAFLAGS) -cp bindings/java/classes/main -d bindings/java/classes/test bindings/java/src/test/com/apple/foundationdb/test/*.java
-	@echo timestamp > bindings/java/.classstamp
-
-javadoc: $(JAVA_SOURCES) bindings/java/src/main/overview.html
-	@echo "Generating     Javadocs"
-	@mkdir -p $(JAVADOC_DIR)/javadoc/
-	@javadoc -quiet -public -notimestamp -source 1.8 -sourcepath bindings/java/src/main \
-		-overview bindings/java/src/main/overview.html -d $(JAVADOC_DIR)/javadoc/ \
-		-windowtitle "FoundationDB Java Client API" \
-		-doctitle "FoundationDB Java Client API" \
-		-link "http://docs.oracle.com/javase/8/docs/api" \
-		com.apple.foundationdb com.apple.foundationdb.async com.apple.foundationdb.tuple com.apple.foundationdb.directory com.apple.foundationdb.subspace
-
-javadoc_clean:
-	@rm -rf $(JAVADOC_DIR)/javadoc
-	@rm -f bindings/java/src/main/overview.html
-
-ifeq ($(PLATFORM),linux)
-
-  # We only need javadoc from one source
-  TARGETS += javadoc
-  CLEAN_TARGETS += javadoc_clean
-
-  # _release builds the lib on macOS and the jars (including the macOS lib) on Linux
-  TARGETS += fdb_java_release
-  CLEAN_TARGETS += fdb_java_release_clean
-
-  ifneq ($(FATJAR),)
-	packages/fdb-java-$(JARVER).jar: $(MAC_OBJ_JAVA) $(WINDOWS_OBJ_JAVA)
-  endif
-
-  bindings/java/pom.xml: bindings/java/pom.xml.in $(ALL_MAKEFILES) versions.target
-	@echo "Generating     $@"
-	@m4 -DVERSION=$(JARVER) -DNAME=fdb-java $< > $@
-
-  bindings/java/fdb-java-$(APPLEJARVER).pom: bindings/java/pom.xml
-	@echo "Copying        $@"
-	sed -e 's/-PRERELEASE/-SNAPSHOT/g' bindings/java/pom.xml > "$@"
-
-  packages/fdb-java-$(JARVER).jar: fdb_java versions.target
-	@echo "Building       $@"
-	@rm -f $@
-	@rm -rf packages/jar_regular
-	@mkdir -p packages/jar_regular
-	@cd packages/jar_regular && unzip -qq $(TOPDIR)/bindings/java/foundationdb-client.jar
-  ifneq ($(FATJAR),)
-	@mkdir -p packages/jar_regular/lib/windows/amd64
-	@mkdir -p packages/jar_regular/lib/osx/x86_64
-	@cp $(MAC_OBJ_JAVA) packages/jar_regular/lib/osx/x86_64/libfdb_java.jnilib
-	@cp $(WINDOWS_OBJ_JAVA) packages/jar_regular/lib/windows/amd64/fdb_java.dll
-  endif
-	@cd packages/jar_regular && jar cf $(TOPDIR)/$@ *
-	@rm -r packages/jar_regular
-	@cd bindings && jar uf $(TOPDIR)/$@ ../LICENSE
-
-  packages/fdb-java-$(JARVER)-tests.jar: fdb_java versions.target
-	@echo "Building       $@"
-	@rm -f $@
-	@cp $(TOPDIR)/bindings/java/foundationdb-tests.jar packages/fdb-java-$(JARVER)-tests.jar
-
-  packages/fdb-java-$(JARVER)-sources.jar: $(JAVA_GENERATED_SOURCES) versions.target
-	@echo "Building       $@"
-	@rm -f $@
-	@jar cf $(TOPDIR)/$@ -C bindings/java/src/main com/apple/foundationdb
-
-  packages/fdb-java-$(JARVER)-javadoc.jar: javadoc versions.target
-	@echo "Building       $@"
-	@rm -f $@
-	@cd $(JAVADOC_DIR)/javadoc/ && jar cf $(TOPDIR)/$@ *
-	@cd bindings && jar uf $(TOPDIR)/$@ ../LICENSE
-
-  packages/fdb-java-$(JARVER)-bundle.jar: packages/fdb-java-$(JARVER).jar packages/fdb-java-$(JARVER)-javadoc.jar packages/fdb-java-$(JARVER)-sources.jar bindings/java/pom.xml bindings/java/fdb-java-$(APPLEJARVER).pom versions.target
-	@echo "Building       $@"
-	@rm -f $@
-	@rm -rf packages/bundle_regular
-	@mkdir -p packages/bundle_regular
-	@cp packages/fdb-java-$(JARVER).jar packages/fdb-java-$(JARVER)-javadoc.jar packages/fdb-java-$(JARVER)-sources.jar bindings/java/fdb-java-$(APPLEJARVER).pom packages/bundle_regular
-	@cp bindings/java/pom.xml packages/bundle_regular/pom.xml
-	@cd packages/bundle_regular && jar cf $(TOPDIR)/$@ *
-	@rm -rf packages/bundle_regular
-
-  fdb_java_release: packages/fdb-java-$(JARVER)-bundle.jar packages/fdb-java-$(JARVER)-tests.jar
-
-  fdb_java_release_clean:
-	@echo "Cleaning       Java release"
-	@rm -f packages/fdb-java-*.jar packages/fdb-java-*-sources.jar bindings/java/pom.xml bindings/java/fdb-java-$(APPLEJARVER).pom
-
-  # Linux is where we build all the java packages
-  packages: fdb_java_release
-  packages_clean: fdb_java_release_clean
-
-  ifneq ($(FATJAR),)
-	MAC_OBJ_JAVA := lib/libfdb_java.jnilib-$(VERSION_ID)
-	WINDOWS_OBJ_JAVA := lib/fdb_java.dll-$(VERSION_ID)
-  endif
-
-else ifeq ($(PLATFORM),osx)
-
-  TARGETS += fdb_java_release
-  CLEAN_TARGETS += fdb_java_release_clean
-
-  fdb_java_release: lib/libfdb_java.$(DLEXT)
-	@mkdir -p lib
-	@rm -f lib/libfdb_java.$(java_DLEXT)-*
-	@cp lib/libfdb_java.$(DLEXT) lib/libfdb_java.$(java_DLEXT)-$(VERSION_ID)
-	@cp lib/libfdb_java.$(DLEXT)-debug lib/libfdb_java.$(java_DLEXT)-debug-$(VERSION_ID)
-
-  fdb_java_release_clean:
-	@rm -f lib/libfdb_java.$(DLEXT)-*
-	@rm -f lib/libfdb_java.$(java_DLEXT)-*
-
-  # macOS needs to put its java lib in packages
-  packages: fdb_java_lib_package
-
-  fdb_java_lib_package: fdb_java_release
-	mkdir -p packages
-	cp lib/libfdb_java.$(java_DLEXT)-$(VERSION_ID) packages
-	cp lib/libfdb_java.$(java_DLEXT)-debug-$(VERSION_ID) packages
-
-endif
--- a/bindings/java/src/junit/com/apple/foundationdb/tuple/ArrayUtilTests.java
+++ b/bindings/java/src/junit/com/apple/foundationdb/tuple/ArrayUtilTests.java
@ -304,4 +304,58 @@ public class ArrayUtilTests {
 		fail("Not yet implemented");
 	}

+	private static final int SAMPLE_COUNT = 1000000;
+	private static final int SAMPLE_MAX_SIZE = 2048;
+	private List<byte[]> unsafe;
+	private List<byte[]> java;
+	@Before
+	public void init() {
+		unsafe = new ArrayList(SAMPLE_COUNT);
+		java = new ArrayList(SAMPLE_COUNT);
+		Random random = new Random();
+		for (int i = 0; i <= SAMPLE_COUNT; i++) {
+			byte[] addition = new byte[random.nextInt(SAMPLE_MAX_SIZE)];
+			random.nextBytes(addition);
+			unsafe.add(addition);
+			java.add(addition);
+		}
+	}
+
+	@Test
+	public void testComparatorSort() {
+		Collections.sort(unsafe, FastByteComparisons.lexicographicalComparerUnsafeImpl());
+		Collections.sort(java, FastByteComparisons.lexicographicalComparerJavaImpl());
+		Assert.assertTrue(unsafe.equals(java));
+	}
+
+	@Test
+	public void testUnsafeComparison() {
+		for (int i =0; i< SAMPLE_COUNT; i++) {
+			Assert.assertEquals(FastByteComparisons.lexicographicalComparerUnsafeImpl().compare(unsafe.get(i), java.get(i)), 0);
+		}
+	}
+
+	@Test
+	public void testJavaComparison() {
+		for (int i =0; i< SAMPLE_COUNT; i++) {
+			Assert.assertEquals(FastByteComparisons.lexicographicalComparerJavaImpl().compare(unsafe.get(i), java.get(i)), 0);
+		}
+	}
+
+	@Test
+	public void testUnsafeComparisonWithOffet() {
+		for (int i =0; i< SAMPLE_COUNT; i++) {
+			if (unsafe.get(i).length > 5)
+				Assert.assertEquals(FastByteComparisons.lexicographicalComparerUnsafeImpl().compareTo(unsafe.get(i), 4, unsafe.get(i).length - 4,  java.get(i), 4, java.get(i).length - 4), 0);
+		}
+	}
+
+	@Test
+	public void testJavaComparisonWithOffset() {
+		for (int i =0; i< SAMPLE_COUNT; i++) {
+			if (unsafe.get(i).length > 5)
+				Assert.assertEquals(FastByteComparisons.lexicographicalComparerJavaImpl().compareTo(unsafe.get(i), 4, unsafe.get(i).length - 4,  java.get(i), 4, java.get(i).length - 4), 0);
+		}
+	}
+
 }
--- a/bindings/java/src/main/com/apple/foundationdb/FDB.java
+++ b/bindings/java/src/main/com/apple/foundationdb/FDB.java
@ -35,7 +35,7 @@ import java.util.concurrent.atomic.AtomicInteger;
 *   This call is required before using any other part of the API. The call allows
 *   an error to be thrown at this point to prevent client code from accessing a later library
 *   with incorrect assumptions from the current version. The API version documented here is version
- *   {@code 620}.<br><br>
+ *   {@code 630}.<br><br>
 *  FoundationDB encapsulates multiple versions of its interface by requiring
 *   the client to explicitly specify the version of the API it uses. The purpose
 *   of this design is to allow you to upgrade the server, client libraries, or
@ -85,6 +85,8 @@ public class FDB {
 	private volatile boolean netStarted = false;
 	private volatile boolean netStopped = false;
 	volatile boolean warnOnUnclosed = true;
+	private boolean useShutdownHook = true;
+	private Thread shutdownHook;
 	private final Semaphore netRunning = new Semaphore(1);
 	private final NetworkOptions options;

@ -104,15 +106,8 @@ public class FDB {
 	 * Called only once to create the FDB singleton.
 	 */
 	private FDB(int apiVersion) {
-		this(apiVersion, true);
-	}
-
-	private FDB(int apiVersion, boolean controlRuntime) {
 		this.apiVersion = apiVersion;
 		options = new NetworkOptions(this::Network_setOption);
-		if (controlRuntime) {
-			Runtime.getRuntime().addShutdownHook(new Thread(this::stopNetwork));
-		}
 	}

 	/**
@ -167,9 +162,9 @@ public class FDB {
 	 *  object.<br><br>
 	 *
 	 *  Warning: When using the multi-version client API, setting an API version that
-	 *   is not supported by a particular client library will prevent that client from 
+	 *   is not supported by a particular client library will prevent that client from
 	 *   being used to connect to the cluster. In particular, you should not advance
-	 *   the API version of your application after upgrading your client until the 
+	 *   the API version of your application after upgrading your client until the
 	 *   cluster has also been upgraded.
 	 *
 	 * @param version the API version required
@ -177,13 +172,6 @@ public class FDB {
 	 * @return the FoundationDB API object
 	 */
 	public static FDB selectAPIVersion(final int version) throws FDBException {
-		return selectAPIVersion(version, true);
-	}
-
-	/**
-	   This function is called from C++ if the VM is controlled directly from FDB
-	 */
-	private static synchronized FDB selectAPIVersion(final int version, boolean controlRuntime) throws FDBException {
 		if(singleton != null) {
 			if(version != singleton.getAPIVersion()) {
 				throw new IllegalArgumentException(
@ -193,13 +181,30 @@ public class FDB {
 		}
 		if(version < 510)
 			throw new IllegalArgumentException("API version not supported (minimum 510)");
-		if(version > 620)
-			throw new IllegalArgumentException("API version not supported (maximum 620)");
+		if(version > 630)
+			throw new IllegalArgumentException("API version not supported (maximum 630)");

 		Select_API_version(version);
-		FDB fdb = new FDB(version, controlRuntime);
+		singleton = new FDB(version);

-		return singleton = fdb;
+		return singleton;
+	}
+
+	/**
+	 * Disables shutdown hook that stops network thread upon process shutdown. This is useful if you need to run
+	 * your own shutdown hook that uses the FDB instance and you need to avoid race conditions
+	 * with the default shutdown hook. Replacement shutdown hook should stop the network thread manually
+	 * by calling {@link #stopNetwork}.
+	 */
+	public synchronized void disableShutdownHook() {
+		useShutdownHook = false;
+		if(shutdownHook != null) {
+			// If this method was called after network thread started and shutdown hook was installed,
+			// remove this hook
+			Runtime.getRuntime().removeShutdownHook(shutdownHook);
+			// Release thread reference for GC
+			shutdownHook = null;
+		}
 	}

 	/**
@ -405,6 +410,11 @@ public class FDB {
 		if(netStarted) {
 			return;
 		}
+		if(useShutdownHook) {
+			// Register shutdown hook that stops network thread if user did not opt out
+			shutdownHook = new Thread(this::stopNetwork, "fdb-shutdown-hook");
+			Runtime.getRuntime().addShutdownHook(shutdownHook);
+		}
 		Network_setup();
 		netStarted = true;

@ -497,4 +507,4 @@ public class FDB {
 	private native boolean Error_predicate(int predicate, int code);

 	private native long Database_create(String clusterFilePath) throws FDBException;
-}
+}
--- a/bindings/java/src/main/com/apple/foundationdb/FDBTransaction.java
+++ b/bindings/java/src/main/com/apple/foundationdb/FDBTransaction.java
@ -70,6 +70,16 @@ class FDBTransaction extends NativeObjectWrapper implements Transaction, OptionC
 			return getKey_internal(selector, true);
 		}

+		@Override
+		public CompletableFuture<Long> getEstimatedRangeSizeBytes(byte[] begin, byte[] end) {
+			return FDBTransaction.this.getEstimatedRangeSizeBytes(begin, end);
+		}
+
+		@Override
+		public CompletableFuture<Long> getEstimatedRangeSizeBytes(Range range) {
+			return FDBTransaction.this.getEstimatedRangeSizeBytes(range);
+		}
+
 		///////////////////
 		//  getRange -> KeySelectors
 		///////////////////
@ -257,6 +267,21 @@ class FDBTransaction extends NativeObjectWrapper implements Transaction, OptionC
 		}
 	}

+	@Override
+	public CompletableFuture<Long> getEstimatedRangeSizeBytes(byte[] begin, byte[] end) {
+		pointerReadLock.lock();
+		try {
+			return new FutureInt64(Transaction_getEstimatedRangeSizeBytes(getPtr(), begin, end), executor);
+		} finally {
+			pointerReadLock.unlock();
+		}
+	}
+
+	@Override
+	public CompletableFuture<Long> getEstimatedRangeSizeBytes(Range range) {
+		return this.getEstimatedRangeSizeBytes(range.begin, range.end);
+	}
+
 	///////////////////
 	//  getRange -> KeySelectors
 	///////////////////
@ -659,4 +684,5 @@ class FDBTransaction extends NativeObjectWrapper implements Transaction, OptionC
 	private native long Transaction_watch(long ptr, byte[] key) throws FDBException;
 	private native void Transaction_cancel(long cPtr);
 	private native long Transaction_getKeyLocations(long cPtr, byte[] key);
+	private native long Transaction_getEstimatedRangeSizeBytes(long cPtr, byte[] keyBegin, byte[] keyEnd);
 }
--- a/bindings/java/src/main/com/apple/foundationdb/ReadTransaction.java
+++ b/bindings/java/src/main/com/apple/foundationdb/ReadTransaction.java
@ -184,7 +184,9 @@ public interface ReadTransaction extends ReadTransactionContext {
 	 *  <i>first</i> keys in the range. Pass {@link #ROW_LIMIT_UNLIMITED} if this query
 	 *  should not limit the number of results. If {@code reverse} is {@code true} rows
 	 *  will be limited starting at the end of the range.
-	 * @param reverse return results starting at the end of the range in reverse order
+	 * @param reverse return results starting at the end of the range in reverse order.
+	 *  Reading ranges in reverse is supported natively by the database and should
+	 *  have minimal extra cost.
 	 *
 	 * @return a handle to access the results of the asynchronous call
 	 */
@ -205,11 +207,22 @@ public interface ReadTransaction extends ReadTransactionContext {
 	 *  <i>first</i> keys in the range. Pass {@link #ROW_LIMIT_UNLIMITED} if this query
 	 *  should not limit the number of results. If {@code reverse} is {@code true} rows
 	 *  will be limited starting at the end of the range.
-	 * @param reverse return results starting at the end of the range in reverse order
+	 * @param reverse return results starting at the end of the range in reverse order.
+	 *  Reading ranges in reverse is supported natively by the database and should
+	 *  have minimal extra cost.
 	 * @param mode provide a hint about how the results are to be used. This
 	 *  can provide speed improvements or efficiency gains based on the caller's
 	 *  knowledge of the upcoming access pattern.
 	 *
+	 * <p>
+	 *     When converting the result of this query to a list using {@link AsyncIterable#asList()} with the {@code ITERATOR} streaming
+	 *     mode, the query is automatically modified to fetch results in larger batches. This is done because it is
+	 *     known in advance that the {@link AsyncIterable#asList()} function will fetch all results in the range. If a limit is specified,
+	 *     the {@code EXACT} streaming mode will be used, and otherwise it will use {@code WANT_ALL}.
+	 *
+	 *     To achieve comparable performance when iterating over an entire range without using {@link AsyncIterable#asList()}, the same
+	 *     streaming mode would need to be used.
+	 * </p>
 	 * @return a handle to access the results of the asynchronous call
 	 */
 	AsyncIterable<KeyValue> getRange(KeySelector begin, KeySelector end,
@ -263,7 +276,9 @@ public interface ReadTransaction extends ReadTransactionContext {
 	 *  <i>first</i> keys in the range. Pass {@link #ROW_LIMIT_UNLIMITED} if this query
 	 *  should not limit the number of results. If {@code reverse} is {@code true} rows
 	 *  will be limited starting at the end of the range.
-	 * @param reverse return results starting at the end of the range in reverse order
+	 * @param reverse return results starting at the end of the range in reverse order.
+	 *  Reading ranges in reverse is supported natively by the database and should
+	 *  have minimal extra cost.
 	 *
 	 * @return a handle to access the results of the asynchronous call
 	 */
@ -284,11 +299,22 @@ public interface ReadTransaction extends ReadTransactionContext {
 	 *  <i>first</i> keys in the range. Pass {@link #ROW_LIMIT_UNLIMITED} if this query
 	 *  should not limit the number of results. If {@code reverse} is {@code true} rows
 	 *  will be limited starting at the end of the range.
-	 * @param reverse return results starting at the end of the range in reverse order
+	 * @param reverse return results starting at the end of the range in reverse order.
+	 *  Reading ranges in reverse is supported natively by the database and should
+	 *  have minimal extra cost.
 	 * @param mode provide a hint about how the results are to be used. This
 	 *  can provide speed improvements or efficiency gains based on the caller's
 	 *  knowledge of the upcoming access pattern.
 	 *
+	 * <p>
+	 *     When converting the result of this query to a list using {@link AsyncIterable#asList()} with the {@code ITERATOR} streaming
+	 *     mode, the query is automatically modified to fetch results in larger batches. This is done because it is
+	 *     known in advance that the {@link AsyncIterable#asList()} function will fetch all results in the range. If a limit is specified,
+	 *     the {@code EXACT} streaming mode will be used, and otherwise it will use {@code WANT_ALL}.
+	 *
+	 *     To achieve comparable performance when iterating over an entire range without using {@link AsyncIterable#asList()}, the same
+	 *     streaming mode would need to be used.
+	 * </p>
 	 * @return a handle to access the results of the asynchronous call
 	 */
 	AsyncIterable<KeyValue> getRange(byte[] begin, byte[] end,
@ -351,7 +377,9 @@ public interface ReadTransaction extends ReadTransactionContext {
 	 *  <i>first</i> keys in the range. Pass {@link #ROW_LIMIT_UNLIMITED} if this query
 	 *  should not limit the number of results. If {@code reverse} is {@code true} rows
 	 *  will be limited starting at the end of the range.
-	 * @param reverse return results starting at the end of the range in reverse order
+	 * @param reverse return results starting at the end of the range in reverse order.
+	 *  Reading ranges in reverse is supported natively by the database and should
+	 *  have minimal extra cost.
 	 *
 	 * @return a handle to access the results of the asynchronous call
 	 */
@ -375,16 +403,47 @@ public interface ReadTransaction extends ReadTransactionContext {
 	 *  <i>first</i> keys in the range. Pass {@link #ROW_LIMIT_UNLIMITED} if this query
 	 *  should not limit the number of results. If {@code reverse} is {@code true} rows
 	 *  will be limited starting at the end of the range.
-	 * @param reverse return results starting at the end of the range in reverse order
+	 * @param reverse return results starting at the end of the range in reverse order.
+	 *  Reading ranges in reverse is supported natively by the database and should
+	 *  have minimal extra cost.
 	 * @param mode provide a hint about how the results are to be used. This
 	 *  can provide speed improvements or efficiency gains based on the caller's
 	 *  knowledge of the upcoming access pattern.
 	 *
+	 * <p>
+	 *     When converting the result of this query to a list using {@link AsyncIterable#asList()} with the {@code ITERATOR} streaming
+	 *     mode, the query is automatically modified to fetch results in larger batches. This is done because it is
+	 *     known in advance that the {@link AsyncIterable#asList()} function will fetch all results in the range. If a limit is specified,
+	 *     the {@code EXACT} streaming mode will be used, and otherwise it will use {@code WANT_ALL}.
+	 *
+	 *     To achieve comparable performance when iterating over an entire range without using {@link AsyncIterable#asList()}, the same
+	 *     streaming mode would need to be used.
+	 * </p>
 	 * @return a handle to access the results of the asynchronous call
 	 */
 	AsyncIterable<KeyValue> getRange(Range range,
 			int limit, boolean reverse, StreamingMode mode);

+
+	/**
+	 * Gets an estimate for the number of bytes stored in the given range.
+	 *
+	 * @param begin the beginning of the range (inclusive)
+	 * @param end the end of the range (exclusive)
+	 *
+	 * @return a handle to access the results of the asynchronous call
+	 */
+	CompletableFuture<Long> getEstimatedRangeSizeBytes(byte[] begin, byte[] end);
+
+	/**
+	 * Gets an estimate for the number of bytes stored in the given range.
+	 *
+	 * @param range the range of the keys
+	 *
+	 * @return a handle to access the results of the asynchronous call
+	 */
+	CompletableFuture<Long> getEstimatedRangeSizeBytes(Range range);
+
 	/**
 	 * Returns a set of options that can be set on a {@code Transaction}
 	 *
--- a/bindings/java/src/main/com/apple/foundationdb/directory/DirectoryLayer.java
+++ b/bindings/java/src/main/com/apple/foundationdb/directory/DirectoryLayer.java
@ -817,9 +817,9 @@ public class DirectoryLayer implements Directory {

 	private static long unpackLittleEndian(byte[] bytes) {
 		assert bytes.length == 8;
-		int value = 0;
+		long value = 0;
 		for(int i = 0; i < 8; ++i) {
-			value += (bytes[i] << (i * 8));
+			value += (Byte.toUnsignedLong(bytes[i]) << (i * 8));
 		}
 		return value;
 	}
--- a/bindings/java/src/main/com/apple/foundationdb/tuple/ByteArrayUtil.java
+++ b/bindings/java/src/main/com/apple/foundationdb/tuple/ByteArrayUtil.java
@ -34,7 +34,7 @@ import com.apple.foundationdb.Transaction;
 *  {@link #printable(byte[])} for debugging non-text keys and values.
 *
 */
-public class ByteArrayUtil {
+public class ByteArrayUtil extends FastByteComparisons {

 	/**
 	 * Joins a set of byte arrays into a larger array. The {@code interlude} is placed
@ -135,11 +135,7 @@ public class ByteArrayUtil {
 		if(src.length < start + pattern.length)
 			return false;

-		for(int i = 0; i < pattern.length; i++)
-			if(pattern[i] != src[start + i])
-				return false;
-
-		return true;
+		return compareTo(src, start, pattern.length, pattern, 0, pattern.length) == 0;
 	}

 	/**
@ -307,14 +303,7 @@ public class ByteArrayUtil {
 	 *  {@code r}.
 	 */
 	public static int compareUnsigned(byte[] l, byte[] r) {
-		for(int idx = 0; idx < l.length && idx < r.length; ++idx) {
-			if(l[idx] != r[idx]) {
-				return (l[idx] & 0xFF) < (r[idx] & 0xFF) ? -1 : 1;
-			}
-		}
-		if(l.length == r.length)
-			return 0;
-		return l.length < r.length ? -1 : 1;
+		return compareTo(l, 0, l.length, r, 0, r.length);
 	}

 	/**
@ -328,15 +317,11 @@ public class ByteArrayUtil {
 	 * @return {@code true} if {@code array} starts with {@code prefix}
 	 */
 	public static boolean startsWith(byte[] array, byte[] prefix) {
+		// Short Circuit
 		if(array.length < prefix.length) {
 			return false;
 		}
-		for(int i = 0; i < prefix.length; ++i) {
-			if(prefix[i] != array[i]) {
-				return false;
-			}
-		}
-		return true;
+		return compareTo(array, 0, prefix.length, prefix, 0, prefix.length) == 0;
 	}

 	/**
--- a/bindings/java/src/main/com/apple/foundationdb/tuple/FastByteComparisons.java
+++ b/bindings/java/src/main/com/apple/foundationdb/tuple/FastByteComparisons.java
@ -0,0 +1,294 @@
+/*
+ * ByteArrayUtil.java
+ *
+ * This source file is part of the FoundationDB open source project
+ *
+ * Copyright 2013-2018 Apple Inc. and the FoundationDB project authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.apple.foundationdb.tuple;
+
+import java.lang.reflect.Field;
+import java.nio.ByteOrder;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.util.Comparator;
+
+import sun.misc.Unsafe;
+
+
+/**
+ * Utility code to do optimized byte-array comparison.
+ * This is borrowed and slightly modified from Guava's {@link UnsignedBytes}
+ * class to be able to compare arrays that start at non-zero offsets.
+ */
+abstract class FastByteComparisons {
+
+    private static final int UNSIGNED_MASK = 0xFF;
+    /**
+     * Lexicographically compare two byte arrays.
+     * 
+     * @param buffer1 left operand, expected to not be null
+     * @param buffer2 right operand, expected to not be null
+     * @param offset1 Where to start comparing in the left buffer, expected to be >= 0
+     * @param offset2 Where to start comparing in the right buffer, expected to be >= 0
+     * @param length1 How much to compare from the left buffer, expected to be >= 0
+     * @param length2 How much to compare from the right buffer, expected to be >= 0
+     * @return 0 if equal, < 0 if left is less than right, etc.
+     */
+    public static int compareTo(byte[] buffer1, int offset1, int length1,
+            byte[] buffer2, int offset2, int length2) {
+        return LexicographicalComparerHolder.BEST_COMPARER.compareTo(
+                buffer1, offset1, length1, buffer2, offset2, length2);
+    }
+    /**
+     * Interface for both the java and unsafe comparators + offset based comparisons.
+     * @param <T>
+     */
+    interface Comparer<T> extends Comparator<T> {
+        /**
+         * Lexicographically compare two byte arrays.
+         * 
+         * @param buffer1 left operand
+         * @param buffer2 right operand
+         * @param offset1 Where to start comparing in the left buffer
+         * @param offset2 Where to start comparing in the right buffer
+         * @param length1 How much to compare from the left buffer
+         * @param length2 How much to compare from the right buffer
+         * @return 0 if equal, < 0 if left is less than right, etc.
+         */
+        abstract public int compareTo(T buffer1, int offset1, int length1,
+                                      T buffer2, int offset2, int length2);
+    }
+
+    /**
+     * Pure Java Comparer
+     *
+     * @return
+     */
+    static Comparer<byte[]> lexicographicalComparerJavaImpl() {
+        return LexicographicalComparerHolder.PureJavaComparer.INSTANCE;
+    }
+
+    /**
+     * Unsafe Comparer
+     *
+     * @return
+     */
+    static Comparer<byte[]> lexicographicalComparerUnsafeImpl() {
+        return LexicographicalComparerHolder.UnsafeComparer.INSTANCE;
+    }
+
+
+    /**
+     * Provides a lexicographical comparer implementation; either a Java
+     * implementation or a faster implementation based on {@link Unsafe}.
+     *
+     * <p>Uses reflection to gracefully fall back to the Java implementation if
+     * {@code Unsafe} isn't available.
+     */
+    private static class LexicographicalComparerHolder {
+        static final String UNSAFE_COMPARER_NAME =
+                LexicographicalComparerHolder.class.getName() + "$UnsafeComparer";
+
+        static final Comparer<byte[]> BEST_COMPARER = getBestComparer();
+        /**
+         * Returns the Unsafe-using Comparer, or falls back to the pure-Java
+         * implementation if unable to do so.
+         */
+        static Comparer<byte[]> getBestComparer() {
+            String arch = System.getProperty("os.arch");
+            boolean unaligned = arch.equals("i386") || arch.equals("x86")
+                    || arch.equals("amd64") || arch.equals("x86_64");
+            if (!unaligned)
+                return lexicographicalComparerJavaImpl();
+            try {
+                Class<?> theClass = Class.forName(UNSAFE_COMPARER_NAME);
+
+                // yes, UnsafeComparer does implement Comparer<byte[]>
+                @SuppressWarnings("unchecked")
+                Comparer<byte[]> comparer =
+                        (Comparer<byte[]>) theClass.getEnumConstants()[0];
+                return comparer;
+            } catch (Throwable t) { // ensure we really catch *everything*
+                return lexicographicalComparerJavaImpl();
+            }
+        }
+
+        /**
+         * Java Comparer doing byte by byte comparisons
+         *
+         */
+        enum PureJavaComparer implements Comparer<byte[]> {
+            INSTANCE;
+
+            /**
+             *
+             * CompareTo looking at two buffers.
+             *
+             * @param buffer1 left operand
+             * @param buffer2 right operand
+             * @param offset1 Where to start comparing in the left buffer
+             * @param offset2 Where to start comparing in the right buffer
+             * @param length1 How much to compare from the left buffer
+             * @param length2 How much to compare from the right buffer
+             * @return 0 if equal, < 0 if left is less than right, etc.
+             */
+            @Override
+            public int compareTo(byte[] buffer1, int offset1, int length1,
+                                 byte[] buffer2, int offset2, int length2) {
+                // Short circuit equal case
+                if (buffer1 == buffer2 &&
+                        offset1 == offset2 &&
+                        length1 == length2) {
+                    return 0;
+                }
+                int end1 = offset1 + length1;
+                int end2 = offset2 + length2;
+                for (int i = offset1, j = offset2; i < end1 && j < end2; i++, j++) {
+                    int a = (buffer1[i] & UNSIGNED_MASK);
+                    int b = (buffer2[j] & UNSIGNED_MASK);
+                    if (a != b) {
+                        return a - b;
+                    }
+                }
+                return length1 - length2;
+            }
+
+            /**
+             * Supports Comparator
+             *
+             * @param o1
+             * @param o2
+             * @return comparison
+             */
+            @Override
+            public int compare(byte[] o1, byte[] o2) {
+                return compareTo(o1, 0, o1.length, o2, 0, o2.length);
+            }
+        }
+
+        /**
+         *
+         * Takes advantage of word based comparisons
+         *
+         */
+        @SuppressWarnings("unused") // used via reflection
+        enum UnsafeComparer implements Comparer<byte[]> {
+            INSTANCE;
+
+            static final Unsafe theUnsafe;
+
+            /**
+             * The offset to the first element in a byte array.
+             */
+            static final int BYTE_ARRAY_BASE_OFFSET;
+
+            @Override
+            public int compare(byte[] o1, byte[] o2) {
+                return compareTo(o1, 0, o1.length, o2, 0, o2.length);
+            }
+
+            static {
+                theUnsafe = (Unsafe) AccessController.doPrivileged(
+                        (PrivilegedAction<Object>) () -> {
+                            try {
+                                Field f = Unsafe.class.getDeclaredField("theUnsafe");
+                                f.setAccessible(true);
+                                return f.get(null);
+                            } catch (NoSuchFieldException e) {
+                                // It doesn't matter what we throw;
+                                // it's swallowed in getBestComparer().
+                                throw new Error();
+                            } catch (IllegalAccessException e) {
+                                throw new Error();
+                            }
+                        });
+
+                BYTE_ARRAY_BASE_OFFSET = theUnsafe.arrayBaseOffset(byte[].class);
+
+                // sanity check - this should never fail
+                if (theUnsafe.arrayIndexScale(byte[].class) != 1) {
+                    throw new AssertionError();
+                }
+            }
+
+            static final boolean LITTLE_ENDIAN =
+                    ByteOrder.nativeOrder().equals(ByteOrder.LITTLE_ENDIAN);
+
+            /**
+             * Lexicographically compare two arrays.
+             *
+             * @param buffer1 left operand
+             * @param buffer2 right operand
+             * @param offset1 Where to start comparing in the left buffer
+             * @param offset2 Where to start comparing in the right buffer
+             * @param length1 How much to compare from the left buffer
+             * @param length2 How much to compare from the right buffer
+             * @return 0 if equal, < 0 if left is less than right, etc.
+             */
+            @Override
+            public int compareTo(byte[] buffer1, int offset1, int length1,
+                                 byte[] buffer2, int offset2, int length2) {
+                // Short circuit equal case
+                if (buffer1 == buffer2 &&
+                        offset1 == offset2 &&
+                        length1 == length2) {
+                    return 0;
+                }
+                final int stride = 8;
+                final int minLength = Math.min(length1, length2);
+                int strideLimit = minLength & ~(stride - 1);
+                final long offset1Adj = offset1 + BYTE_ARRAY_BASE_OFFSET;
+                final long offset2Adj = offset2 + BYTE_ARRAY_BASE_OFFSET;
+                int i;
+
+                /*
+                 * Compare 8 bytes at a time. Benchmarking on x86 shows a stride of 8 bytes is no slower
+                 * than 4 bytes even on 32-bit. On the other hand, it is substantially faster on 64-bit.
+                 */
+                for (i = 0; i < strideLimit; i += stride) {
+                    long lw = theUnsafe.getLong(buffer1, offset1Adj + i);
+                    long rw = theUnsafe.getLong(buffer2, offset2Adj + i);
+                    if (lw != rw) {
+                        if(!LITTLE_ENDIAN) {
+                            return ((lw + Long.MIN_VALUE) < (rw + Long.MIN_VALUE)) ? -1 : 1;
+                        }
+
+                        /*
+                         * We want to compare only the first index where left[index] != right[index]. This
+                         * corresponds to the least significant nonzero byte in lw ^ rw, since lw and rw are
+                         * little-endian. Long.numberOfTrailingZeros(diff) tells us the least significant
+                         * nonzero bit, and zeroing out the first three bits of L.nTZ gives us the shift to get
+                         * that least significant nonzero byte. This comparison logic is based on UnsignedBytes
+                         * comparator from guava v21
+                         */
+                        int n = Long.numberOfTrailingZeros(lw ^ rw) & ~0x7;
+                        return ((int) ((lw >>> n) & UNSIGNED_MASK)) - ((int) ((rw >>> n) & UNSIGNED_MASK));
+                    }
+                }
+
+                // The epilogue to cover the last (minLength % stride) elements.
+                for (; i < minLength; i++) {
+                    int a = (buffer1[offset1 + i] & UNSIGNED_MASK);
+                    int b = (buffer2[offset2 + i] & UNSIGNED_MASK);
+                    if (a != b) {
+                        return a - b;
+                    }
+                }
+                return length1 - length2;
+            }
+        }
+    }
+}
--- a/bindings/java/src/main/overview.html.in
+++ b/bindings/java/src/main/overview.html.in
@ -13,7 +13,7 @@ and then added to your classpath.<br>
 <h1>Getting started</h1>
 To start using FoundationDB from Java, create an instance of the 
 {@link com.apple.foundationdb.FDB FoundationDB API interface} with the version of the
-API that you want to use (this release of the FoundationDB Java API supports versions between {@code 510} and {@code 620}).
+API that you want to use (this release of the FoundationDB Java API supports versions between {@code 510} and {@code 630}).
 With this API object you can then open {@link com.apple.foundationdb.Cluster Cluster}s and
 {@link com.apple.foundationdb.Database Database}s and start using
 {@link com.apple.foundationdb.Transaction Transaction}s.
@ -29,7 +29,7 @@ import com.apple.foundationdb.tuple.Tuple;

 public class Example {
  public static void main(String[] args) {
-    FDB fdb = FDB.selectAPIVersion(620);
+    FDB fdb = FDB.selectAPIVersion(630);

    try(Database db = fdb.open()) {
      // Run an operation on the database
--- a/bindings/java/src/test/com/apple/foundationdb/test/AbstractTester.java
+++ b/bindings/java/src/test/com/apple/foundationdb/test/AbstractTester.java
@ -27,7 +27,7 @@ import com.apple.foundationdb.Database;
 import com.apple.foundationdb.FDB;

 public abstract class AbstractTester {
-	public static final int API_VERSION = 620;
+	public static final int API_VERSION = 630;
 	protected static final int NUM_RUNS = 25;
 	protected static final Charset ASCII = Charset.forName("ASCII");

--- a/bindings/java/src/test/com/apple/foundationdb/test/AsyncStackTester.java
+++ b/bindings/java/src/test/com/apple/foundationdb/test/AsyncStackTester.java
@ -223,6 +223,12 @@ public class AsyncStackTester {
 				inst.push(inst.readTcx.readAsync(readTr -> readTr.get((byte[]) param)));
 			});
 		}
+		else if (op == StackOperation.GET_ESTIMATED_RANGE_SIZE) {
+			List<Object> params = inst.popParams(2).join();
+			return inst.readTr.getEstimatedRangeSizeBytes((byte[])params.get(0), (byte[])params.get(1)).thenAcceptAsync(size -> {
+				inst.push("GOT_ESTIMATED_RANGE_SIZE".getBytes());
+			}, FDB.DEFAULT_EXECUTOR);
+		}
 		else if(op == StackOperation.GET_RANGE) {
 			return inst.popParams(5).thenComposeAsync(params -> {
 				int limit = StackUtils.getInt(params.get(2));
@ -667,10 +673,7 @@ public class AsyncStackTester {
 			};

 			if(operations == null || ++currentOp == operations.size()) {
-				Transaction tr = db.createTransaction();
-
-				return tr.getRange(nextKey, endKey, 1000).asList()
-				.whenComplete((x, t) -> tr.close())
+				return db.readAsync(readTr -> readTr.getRange(nextKey, endKey, 1000).asList())
 				.thenComposeAsync(next -> {
 					if(next.size() < 1) {
 						//System.out.println("No key found after: " + ByteArrayUtil.printable(nextKey.getKey()));
--- a/bindings/java/src/test/com/apple/foundationdb/test/BlockingBenchmark.java
+++ b/bindings/java/src/test/com/apple/foundationdb/test/BlockingBenchmark.java
@ -33,7 +33,7 @@ public class BlockingBenchmark {
 	private static final int PARALLEL = 100;

 	public static void main(String[] args) throws InterruptedException {
-		FDB fdb = FDB.selectAPIVersion(620);
+		FDB fdb = FDB.selectAPIVersion(630);

 		// The cluster file DOES NOT need to be valid, although it must exist.
 		//  This is because the database is never really contacted in this test.
--- a/bindings/java/src/test/com/apple/foundationdb/test/ConcurrentGetSetGet.java
+++ b/bindings/java/src/test/com/apple/foundationdb/test/ConcurrentGetSetGet.java
@ -48,7 +48,7 @@ public class ConcurrentGetSetGet {
 	}

 	public static void main(String[] args) {
-		try(Database database = FDB.selectAPIVersion(620).open()) {
+		try(Database database = FDB.selectAPIVersion(630).open()) {
 			new ConcurrentGetSetGet().apply(database);
 		}
 	}
--- a/bindings/java/src/test/com/apple/foundationdb/test/DirectoryTest.java
+++ b/bindings/java/src/test/com/apple/foundationdb/test/DirectoryTest.java
@ -33,7 +33,7 @@ import com.apple.foundationdb.directory.DirectorySubspace;
 public class DirectoryTest {
 	public static void main(String[] args) throws Exception {
 		try {
-			FDB fdb = FDB.selectAPIVersion(620);
+			FDB fdb = FDB.selectAPIVersion(630);
 			try(Database db = fdb.open()) {
 				runTests(db);
 			}
--- a/bindings/java/src/test/com/apple/foundationdb/test/Example.java
+++ b/bindings/java/src/test/com/apple/foundationdb/test/Example.java
@ -26,7 +26,7 @@ import com.apple.foundationdb.tuple.Tuple;

 public class Example {
 	public static void main(String[] args) {
-		FDB fdb = FDB.selectAPIVersion(620);
+		FDB fdb = FDB.selectAPIVersion(630);

 		try(Database db = fdb.open()) {
 			// Run an operation on the database
--- a/bindings/java/src/test/com/apple/foundationdb/test/IterableTest.java
+++ b/bindings/java/src/test/com/apple/foundationdb/test/IterableTest.java
@ -31,7 +31,7 @@ public class IterableTest {
 	public static void main(String[] args) throws InterruptedException {
 		final int reps = 1000;
 		try {
-			FDB fdb = FDB.selectAPIVersion(620);
+			FDB fdb = FDB.selectAPIVersion(630);
 			try(Database db = fdb.open()) {
 				runTests(reps, db);
 			}
--- a/bindings/java/src/test/com/apple/foundationdb/test/LocalityTests.java
+++ b/bindings/java/src/test/com/apple/foundationdb/test/LocalityTests.java
@ -34,7 +34,7 @@ import com.apple.foundationdb.tuple.ByteArrayUtil;
 public class LocalityTests {

 	public static void main(String[] args) {
-		FDB fdb = FDB.selectAPIVersion(620);
+		FDB fdb = FDB.selectAPIVersion(630);
 		try(Database database = fdb.open(args[0])) {
 			try(Transaction tr = database.createTransaction()) {
 				String[] keyAddresses = LocalityUtil.getAddressesForKey(tr, "a".getBytes()).join();
--- a/bindings/java/src/test/com/apple/foundationdb/test/ParallelRandomScan.java
+++ b/bindings/java/src/test/com/apple/foundationdb/test/ParallelRandomScan.java
@ -43,7 +43,7 @@ public class ParallelRandomScan {
 	private static final int PARALLELISM_STEP = 5;

 	public static void main(String[] args) throws InterruptedException {
-		FDB api = FDB.selectAPIVersion(620);
+		FDB api = FDB.selectAPIVersion(630);
 		try(Database database = api.open(args[0])) {
 			for(int i = PARALLELISM_MIN; i <= PARALLELISM_MAX; i += PARALLELISM_STEP) {
 				runTest(database, i, ROWS, DURATION_MS);
--- a/bindings/java/src/test/com/apple/foundationdb/test/RangeTest.java
+++ b/bindings/java/src/test/com/apple/foundationdb/test/RangeTest.java
@ -34,7 +34,7 @@ import com.apple.foundationdb.Transaction;
 import com.apple.foundationdb.async.AsyncIterable;

 public class RangeTest {
-	private static final int API_VERSION = 620;
+	private static final int API_VERSION = 630;

 	public static void main(String[] args) {
 		System.out.println("About to use version " + API_VERSION);
--- a/bindings/java/src/test/com/apple/foundationdb/test/SerialInsertion.java
+++ b/bindings/java/src/test/com/apple/foundationdb/test/SerialInsertion.java
@ -34,7 +34,7 @@ public class SerialInsertion {
 	private static final int NODES = 1000000;

 	public static void main(String[] args) {
-		FDB api = FDB.selectAPIVersion(620);
+		FDB api = FDB.selectAPIVersion(630);
 		try(Database database = api.open()) {
 			long start = System.currentTimeMillis();

--- a/bindings/java/src/test/com/apple/foundationdb/test/SerialIteration.java
+++ b/bindings/java/src/test/com/apple/foundationdb/test/SerialIteration.java
@ -39,7 +39,7 @@ public class SerialIteration {
 	private static final int THREAD_COUNT = 1;

 	public static void main(String[] args) throws InterruptedException {
-		FDB api = FDB.selectAPIVersion(620);
+		FDB api = FDB.selectAPIVersion(630);
 		try(Database database = api.open(args[0])) {
 			for(int i = 1; i <= THREAD_COUNT; i++) {
 				runThreadedTest(database, i);
--- a/bindings/java/src/test/com/apple/foundationdb/test/SerialTest.java
+++ b/bindings/java/src/test/com/apple/foundationdb/test/SerialTest.java
@ -30,7 +30,7 @@ public class SerialTest {
 	public static void main(String[] args) throws InterruptedException {
 		final int reps = 1000;
 		try {
-			FDB fdb = FDB.selectAPIVersion(620);
+			FDB fdb = FDB.selectAPIVersion(630);
 			try(Database db = fdb.open()) {
 				runTests(reps, db);
 			}
--- a/bindings/java/src/test/com/apple/foundationdb/test/SnapshotTransactionTest.java
+++ b/bindings/java/src/test/com/apple/foundationdb/test/SnapshotTransactionTest.java
@ -39,7 +39,7 @@ public class SnapshotTransactionTest {
 	private static final Subspace SUBSPACE = new Subspace(Tuple.from("test", "conflict_ranges"));

 	public static void main(String[] args) {
-		FDB fdb = FDB.selectAPIVersion(620);
+		FDB fdb = FDB.selectAPIVersion(630);
 		try(Database db = fdb.open()) {
 			snapshotReadShouldNotConflict(db);
 			snapshotShouldNotAddConflictRange(db);
--- a/bindings/java/src/test/com/apple/foundationdb/test/StackOperation.java
+++ b/bindings/java/src/test/com/apple/foundationdb/test/StackOperation.java
@ -56,6 +56,7 @@ enum StackOperation {
 	GET_COMMITTED_VERSION,
 	GET_APPROXIMATE_SIZE,
 	GET_VERSIONSTAMP,
+	GET_ESTIMATED_RANGE_SIZE,
 	SET_READ_VERSION,
 	ON_ERROR,
 	SUB,
--- a/Show More
+++ b/Show More