Commit Graph

900 Commits

Author SHA1 Message Date
Andrew Noyes e1f279ac98 Use the cmake LINKER feature
Described here: https://cmake.org/cmake/help/latest/command/add_link_options.html
2020-02-13 16:50:17 -08:00
Andrew Noyes aeba8f5caf Fix symbolify.py 2020-02-13 16:50:17 -08:00
Andrew Noyes f1357fd482 Control exported symbols on osx for cmake 2020-02-13 16:50:17 -08:00
Andrew Noyes b1b57aae05 Port ld arguments from Makefile 2020-02-13 16:50:17 -08:00
Xin Dong f43a5d614a Removed unnecessary codes in Java bindings. Cleaned up Go bindings a bit. 2020-02-12 14:57:40 -08:00
Xin Dong 6534539733 Fix the Go bindings build failure. 2020-02-12 14:57:40 -08:00
Xin Dong 2e1d03cbe7 Addressed AJ's review comments 2020-02-12 14:57:40 -08:00
Xin Dong bd19dd278e Apply suggestions from code review
Co-Authored-By: A.J. Beamon <ajbeamon@users.noreply.github.com>
2020-02-12 14:57:40 -08:00
Xin Dong d20ce99774 Resolved the review comment and renamed the functions 2020-02-12 14:57:40 -08:00
Xin Dong 5d30296db8 Alright this time fix the go build for real. 2020-02-12 14:57:40 -08:00
Xin Dong 3777b099ef Fix Go bindings build failure 2020-02-12 14:57:40 -08:00
Xin Dong 85c10d13a5 Exposed the byte sample function to the following bindings:
- Flow
- Java
- Go [ needs verify ]
- Python [ needs verify ]
- Ruby [ needs verify ]
2020-02-12 14:57:40 -08:00
Xin Dong 0c16d43c2f Added necessary plumbings to expose byte sample collected by storage servers to fdb_c library 2020-02-12 14:57:40 -08:00
mpilman 5a9d420cb7 Merge remote-tracking branch 'upstream/release-6.2' into release-merges/20200210 2020-02-10 10:02:05 -08:00
Markus Pilman e71fe44ee3
Merge branch 'master' into features/icc 2020-02-08 21:33:02 -08:00
Evan Tschannen 38d8d0d675 fixed simulation 2020-02-06 19:29:31 -08:00
Alex Miller 986905f3dd
Update bindings/python/tests/tester.py
Co-Authored-By: A.J. Beamon <ajbeamon@users.noreply.github.com>
2020-02-06 16:57:14 -08:00
Evan Tschannen 8449badb3e
Merge pull request #1868 from dongxinEric/fix/1827/error_instead_of_timeout
Send error back before put the GRV request with PRIORITY_BATCH into t…
2020-02-04 14:32:47 -08:00
Daniil GItelson 00a1d2c17c Java Binding: introduce FDB.disableShutdownHook 2020-02-04 23:19:36 +03:00
Daniil GItelson 25304e3587 Merge with official repository master 2020-02-04 21:53:05 +03:00
mpilman d09e07f1f5 Merge remote-tracking branch 'upstream/master' into features/icc 2020-02-04 10:26:18 -08:00
Vishesh Yadav becc01923a
Merge pull request #2626 from ajbeamon/update-api-version-to-700
Update API version to 700
2020-02-03 09:49:24 -08:00
Daniil GItelson a38827b4e6 Java Binding: add option to not close network thread on shutdown hook 2020-02-02 21:10:23 +03:00
Xin Dong e21426d12a Send error back to the GRV requests with batch priority when the cluster is saturated, instead of blindly enqueue the requests and let the client timeout. 2020-01-30 14:13:56 -08:00
A.J. Beamon 72f92626e4 Update API version to 700 2020-01-30 09:26:27 -08:00
sevki 53e388b993 bindings/go: explicit CFLAGS and LDFLAGS for windows
Added a windows specific version of this too.

Fixes:  #2299
2020-01-30 17:23:58 +00:00
A.J. Beamon 35b54672b7 Change FDBKeyValue's key and value members to have type uint8_t*. 2020-01-30 08:49:23 -08:00
sevki f35b586052 bindings/go: explicit CFLAGS and LDFLAGS for macOS
When applied these changes will tell the CGO toolchain on macOS
the default installation location for the headers and libs.

I've recently started playing around with FDB go bindings on my mac.
I've followed the tutorial to set everything up but whilst doing so
I've started getting some error messages like so:

     /Users/sevki/go/pkg/mod/github.com/apple/foundationdb/bindings/go@v0.0.0-20200125010749-6945a6ea0141/src/fdb/cluster.go:26:11: fatal error: 'foundationdb/fdb_c.h' file not found
      #include <foundationdb/fdb_c.h>
                ^~~~~~~~~~~~~~~~~~~~~~

These errors are most probably caused by me unsetting LDFLAGS, CFLAGS
globally as the installer installs the header files and the libraries
to sane default locations.

However, I believe explicitly telling the CGO toolchain here is a
better experience for using this library. While unsetting LDFLAGS
and CFLAGS is not a very smart thing to do, some IDEs and other build
tools make it very hard to pass environment variables to set in this
context.
2020-01-30 13:54:54 +00:00
Xin Dong 68f6e7be97 Added some java docs and changed some texts in fdboptions for further comparision and clarification around .asList() and .iterator() 2020-01-29 14:01:54 -08:00
Vishesh Yadav bfcdf6bc88
Merge pull request #2243 from canardleteer/go-pack-with-versionstamp
Add PackWithVersionstamp to Go Subpace & Directory bindings.
2020-01-27 08:34:20 -08:00
Alex Miller 4ceae8c83a Ban generators in 7.0.0 2020-01-23 16:40:14 -08:00
Vishesh Yadav b5c1c8cdd0
Merge pull request #2560 from ajbeamon/java-bindingtester-error-retry
Add retry loop to Java binding tester instruction reader
2020-01-23 09:54:43 -08:00
Alex Miller 62baf6d121 Merge remote-tracking branch 'upstream/master' into pyfdbgenerators 2020-01-22 18:05:05 -08:00
Sam Gwydir 7662273cd8 clang-format mako 2020-01-17 14:43:02 -08:00
A.J. Beamon 389ea1ca64
Merge pull request #2514 from kaomakino/kaomakino/mako
Add periodical debug transaction tracing
2020-01-17 13:28:19 -08:00
A.J. Beamon 341e74eaf2 Add retry loop to Java binding tester instruction reader 2020-01-17 11:59:44 -08:00
Kao Makino c5908a2adb Add periodical debug transaction tracing and parameterize trace format 2020-01-17 10:33:09 -08:00
Alex Miller 8a44c5e08d
Merge pull request #2469 from vishesh/task/documentation
godoc: How to check for non-existing keys from Go bindings
2020-01-16 14:55:52 -08:00
Alvin Moore 77cb8d2890 Removed LICENSE file from python bindings 2020-01-16 13:59:48 -08:00
Evan Tschannen 99ded328f0 update version to 6.2.14 2020-01-15 23:02:18 -08:00
Alvin Moore 7628d04fb9 Merge branch 'release-6.2' of github.com:apple/foundationdb into release_6.2_merge
# Conflicts:
#	documentation/sphinx/source/release-notes.rst
2020-01-09 07:21:16 -08:00
Vishesh Yadav 069ca18df5
Update with review suggestion.
Co-Authored-By: Alex Miller <35046903+alexmiller-apple@users.noreply.github.com>
2020-01-08 18:12:40 -08:00
Alex Miller b100094ba8
Merge pull request #2439 from kaomakino/patch-1
Update mako.rst
2020-01-08 17:10:25 -08:00
Alvin Moore fdbe9e4419 Moved the STATIC_LIBRARY and EXECUTABLE keyword to the beginning of the function argument list 2020-01-08 16:02:03 -08:00
A.J. Beamon cc8194a2f4 Python 3 fix; disallow creating partitions using the high-contention allocator in comparison tests due to non-determinism. 2020-01-02 11:45:21 -08:00
Alvin Moore 06e7bc061d
Merge pull request #2500 from apple/release-6.2
Merge Release 6.2 Into Master
2019-12-23 15:00:34 -08:00
Alvin Moore 6acf04bb72 Ensured that the cmake variable is always initialized/set to some value when compared and thereby has an expected value 2019-12-23 11:50:01 -08:00
Alvin Moore 93c1810ad8
Merge pull request #2496 from apple/release-6.2
Merge Release 6.2 Into Master
2019-12-23 10:17:23 -08:00
Alvin Moore 3ce3e1e06e Changed the name of the rpm packages to conform to the existing names when building release project 2019-12-22 20:11:40 -08:00
Alvin Moore c0614bc037
Merge pull request #2492 from apple/release-6.2
Release 6.2 Merge Into Master
2019-12-20 15:21:33 -08:00
Alvin Moore c7fc72af39 Changed the name of the java jar to conform with the existing prerelease nomenclature 2019-12-20 12:23:28 -08:00
A.J. Beamon f97129e9ac Filter future_version errors in the binding tester 2019-12-20 11:22:23 -08:00
Alvin Moore e226f41665 Added -PRERELEASE suffix to flow package 2019-12-20 09:36:48 -08:00
A.J. Beamon 45700c535a
Merge pull request #2472 from vishesh/doc-compare-and-clear-6.2
DocBlitz: atomic compare and clear
2019-12-19 09:04:48 -08:00
Alvin Moore 21390c493a Merge branch 'release-6.2' of github.com:apple/foundationdb into release_6.2_merge
Resolved merge by keeping new test file from master branch: SampleNoSimAttrition.txt adding new constraint from Release branch about existing test file: SimpleExternalTest.txt

# Conflicts:
#	tests/CMakeLists.txt
2019-12-18 09:05:08 -08:00
Vishesh Yadav 5c48a105c5 docs: Document CompareAndClear atomic op 2019-12-16 13:53:52 -08:00
Vishesh Yadav f30ded1fac godoc: How to check for non-existing keys from Go bindings 2019-12-16 11:25:18 -08:00
Alvin Moore 0c4c93a041 Ensured that the name of the packages within cmake remains the same as that within make 2019-12-16 00:11:52 -08:00
Alvin Moore 413cafe368 Modified compilation and package names to conform to existing compilation options and packaging names
Modifications to existing standards (even when wrong should be made outside of port to cmake)
2019-12-15 07:13:46 -08:00
A.J. Beamon 48c0c3d67c
Merge pull request #2460 from apple/release-6.2
Release 6.2 Merge Into Master
2019-12-13 14:11:08 -08:00
A.J. Beamon 000f7ff2a0
Merge pull request #2457 from gauravvnera/doc_blitz_clear_range
DocBlitz : Clarify Documentation for clear_range API
2019-12-13 12:36:24 -08:00
gauravvnera 83da581314 addressed review comments 2019-12-14 00:10:25 +05:30
gauravvnera f788ba5f85 Add keyAfter method to Java bindings 2019-12-13 19:25:43 +05:30
gauravvnera b734afb50f Clarify Documentation for clear_range 2019-12-13 09:22:36 +05:30
gauravvnera 1dedd3df56 Clarify Documentation for clear_range 2019-12-13 09:18:57 +05:30
A.J. Beamon e23dfa83e1 Fix go formatting 2019-12-12 15:04:30 -08:00
A.J. Beamon 3cc3f1d2ad Note that range reads are supported natively by the database and have little cost over regular range reads. 2019-12-12 10:50:21 -08:00
Alvin Moore 3bf971ba8b Merge branch 'release-6.2' of github.com:apple/foundationdb into release_6.2_merge
# Conflicts:
#	documentation/sphinx/source/release-notes.rst
#	fdbserver/storageserver.actor.cpp
2019-12-12 07:13:12 -08:00
Alvin Moore bdc16def8e
Merge pull request #2437 from AlvinMooreSr/publish_cmake
CMake Publishing Changes
2019-12-12 06:50:04 -08:00
Xin Dong 8016d02699 Added documents explaining the at-most-once guarantee provided by add callbacks function 2019-12-11 14:45:39 -08:00
Kao Makino b8ce7dde5f
Update bindings/c/test/mako/mako.rst
Co-Authored-By: Andrew Noyes <anoyes34@gmail.com>
2019-12-10 17:56:44 -08:00
Kao Makino 71f4e70a5d
Update mako.rst 2019-12-10 14:34:10 -08:00
A.J. Beamon d09e3e1d96 Apply go fmt. 2019-12-10 13:42:30 -08:00
A.J. Beamon bdbc97c452 Add docuentation about opening connections to multiple clusters 2019-12-10 12:38:37 -08:00
Alvin Moore 53ea319ec7 Added support for publishing jni library to the packages/lib directory 2019-12-10 11:44:45 -08:00
Kao Makino 38c3adbb84 Mako: fix minor bugs 2019-12-07 00:31:14 +00:00
chaoguang eacfdf6da3 Add a simple workload, ReportConflictingKeysWorkload, to test correctness of the API and performance overhead added to the resovler. 2019-12-06 16:21:03 -08:00
chaoguang edf52e8c97 First version for reporting conflicting keys 2019-12-02 13:45:39 -08:00
Evan Tschannen 4de60fc437 Merge branch 'release-6.2'
# Conflicts:
#	documentation/sphinx/source/release-notes.rst
#	fdbserver/TLogServer.actor.cpp
2019-11-01 15:48:04 -07:00
Evan Tschannen 0953bf376d fixed Javadoc headings 2019-10-25 13:38:04 -07:00
Kao Makino 48aa55699a Cleanup mako c-binding benchmark 2019-10-24 18:14:55 +00:00
canardleteer d715e2909c Use the python module to guide PackWithVersionstamp's documentation. 2019-10-21 19:57:01 -07:00
canardleteer 7503f2f46c Remove unnecessary test 2019-10-19 14:11:05 -07:00
canardleteer 2e5e168d01 Add PackWithVersionstamp to Go Subpace & Directory bindings. 2019-10-15 14:19:04 -07:00
chaoguang e7b97c393d added zipfian distribution to mako workload 2019-10-15 01:14:21 -07:00
Vishesh Yadav b9a8e60318
Merge pull request #2091 from ajbeamon/binding-tester-python3
Update binding tester to use Python 3
2019-10-08 15:54:07 -07:00
Vishesh Yadav 62972b523c
Merge pull request #2133 from kaomakino/kaomakino/mako
Mako benchmark:  Add variable throttling
2019-10-08 15:26:52 -07:00
Balachandar Namasivayam 493d39be7a Revert "Removed unnecessary and ununed libraries from compilation command. Inclusion of this will produce an error with certain compilers such as Clang"
This reverts commit b10f3ad7a1.
2019-10-03 18:24:43 -07:00
Meng Xu d0147e5e5d Merge branch 'release-6.2' into mengxu/merge-release620-to-master-v3
Resolved Conflicts:
	documentation/sphinx/source/release-notes.rst
	fdbserver/DataDistribution.actor.cpp
	versions.target
2019-10-02 13:22:56 -07:00
A.J. Beamon 0bf7fdb450 Merge branch 'release-6.1' into merge-release-6.1-into-release-6.2
# Conflicts:
#	bindings/c/fdb_c.cpp
#	documentation/sphinx/source/release-notes.rst
2019-09-30 13:37:46 -07:00
A.J. Beamon 88c63637d3 Remove DLLEXPORT from various functions. Don't call public functions from the C bindings, as that has a bad interaction with the multi-version API. 2019-09-27 15:33:44 -07:00
A.J. Beamon e2f4d19c34 Don't export the fdb_future_get_version_v619 symbol. Mark fdb_future_get_version as a removed function. 2019-09-27 15:31:09 -07:00
Kao Makino 45e7406ddc Add variable throttling 2019-09-23 20:02:23 +00:00
Evan Tschannen b495cc697b Merge branch 'release-6.2'
# Conflicts:
#	CMakeLists.txt
#	documentation/sphinx/source/release-notes.rst
#	versions.target
2019-09-13 09:25:08 -07:00
Alvin Moore b10f3ad7a1 Removed unnecessary and ununed libraries from compilation command. Inclusion of this will produce an error with certain compilers such as Clang
Added the `-c` option to specify the source files being compiled. Exclusion of this will produce and error with certain compilers such as gcc 9.1
2019-09-12 11:08:01 -07:00
A.J. Beamon a84b6b8570 Fix versionstamp ordering in Python3 2019-09-11 10:39:01 -07:00
A.J. Beamon aa0d99c15e Update binding tester to use python3 2019-09-11 10:36:02 -07:00
Kao Makino e5bbaa293a Add FLOW_TCP_NODELAY and FLOW_TCP_QUICKACK (Linux-only) knobs 2019-09-10 20:13:15 +00:00
Andrew Noyes 95c6c9618e Update documentation and testers for new options 2019-09-05 16:40:12 -07:00
A.J. Beamon 5cf05214fd Update generated.go with new options 2019-07-29 18:41:28 -07:00
Ryan Worl fbb83a98db Remove stray KeepAlive, use new Close method to free RangeIterator resources 2019-07-29 08:40:15 -04:00
Ryan Worl a031a12150 Remove finalizers in favor of copying and destroying the native resources immediately.
Except for futureKeyValueArray, all futures which allocate native heap resources (other than the futures themselves) will allocate Go resources and copy from native to Go, then destroy the native heap resources.
2019-07-29 08:30:10 -04:00
Evan Tschannen b509a441e7 Merge branch 'master' into feature-skip-confirm
# Conflicts:
#	bindings/flow/tester/Tester.actor.cpp
#	bindings/go/src/_stacktester/stacktester.go
#	bindings/java/src/test/com/apple/foundationdb/test/AsyncStackTester.java
#	bindings/java/src/test/com/apple/foundationdb/test/StackTester.java
#	bindings/python/tests/tester.py
#	bindings/ruby/tests/tester.rb
#	documentation/sphinx/source/api-c.rst
#	documentation/sphinx/source/api-python.rst
#	documentation/sphinx/source/api-ruby.rst
#	documentation/sphinx/source/data-modeling.rst
#	documentation/sphinx/source/developer-guide.rst
#	fdbclient/vexillographer/fdb.options
#	fdbserver/MasterProxyServer.actor.cpp
2019-07-27 15:08:13 -07:00
A.J. Beamon cbc913f902 When run through external means (such as the binding tester), the size limits tests should not change db level defaults. 2019-07-19 09:03:11 -07:00
A.J. Beamon bc5c65e5ab
Merge pull request #1756 from jzhou77/db-option
Add transaction getApproximateSize() API
2019-07-19 08:33:24 -07:00
Alec Grieser a26980682d
Merge pull request #1835 from TWarszawski/master
Add more information to the java binding jar's MANIFEST.
2019-07-18 14:01:46 -07:00
Jingyu Zhou 7fd772803e Better handle API version in mako.c
Only use fdb_future_get_int64 for API version >= 620.
2019-07-18 13:47:43 -07:00
A.J. Beamon 93be69b6a3 Increase the API version to 620. 2019-07-18 10:56:05 -07:00
Todd Warszawski 24c7960c12 Removing uneccessary attributes from MANIFEST 2019-07-16 12:46:40 -07:00
TWarszawski b0a6e2d2c4
Update bindings/java/CMakeLists.txt
Fix Specification-Title

Co-Authored-By: Alec Grieser <alloc@apple.com>
2019-07-16 11:22:10 -07:00
Jingyu Zhou 14cb21285f Remove futureGetVersion in C binding and FutureVersion in Python binding 2019-07-16 10:46:07 -07:00
Jingyu Zhou 94563464cb
Update bindings/c/foundationdb/fdb_c.h
Co-Authored-By: A.J. Beamon <ajbeamon@users.noreply.github.com>
2019-07-16 10:15:47 -07:00
Evan Tschannen 7390df35a1 updated binding testers to set causalReadRisky 2019-07-15 11:39:03 -07:00
Todd Warszawski af35061200 Addressing reviewer comments. 2019-07-15 08:51:22 -07:00
Evan Tschannen c4c9e6cee7 fixed compiler errors 2019-07-12 18:28:41 -07:00
Evan Tschannen 02de53160d only skip confirm epoch live if CAUSAL_READ_RISKY is enabled
time checked on the proxy should be less than the time waited by the master to account for clock speed differences
setting REQUIRED_MIN_RECOVERY_DURATION and ENFORCED_MIN_RECOVERY_DURATION to 0 will go back to the old behavior
2019-07-12 17:58:16 -07:00
Jingyu Zhou 562bf6511a Fix approximate size calculation 2019-07-12 16:53:37 -07:00
A.J. Beamon d5051b08dd Make trace event field lengths (and total event sizes) default knobified and configurable. Add a transaction option to control the field length of transaction debug logging. Make the program start command line field less likely to be truncated. 2019-07-12 16:12:35 -07:00
Jingyu Zhou 990c205f70 Push a string to stack for getApproximateSize in binding testers
Because different bindings may issue different limit for get_range calls, it is
impossible to return the same size value for getApproximateSize API. So we just
push a string to make sure binding test results are the same. Use another unit
test to make sure the sizes got back are monotonically increasing.
2019-07-12 14:15:20 -07:00
Jingyu Zhou 9c3591ff43 Fix python3 test failure
Both key and value has to be of type bytes.
2019-07-12 10:15:40 -07:00
Jingyu Zhou 2dcc3cfd0a Deprecate fdb_future_get_version for version 620
Use fdb_future_get_int64 in all bindings.
2019-07-11 21:17:31 -07:00
Jingyu Zhou b2a89c8b77 Address review comments for PR #1756
Use fdb_future_get_int64 for language bindings and get rid of using Version
with getApproximateSize API.
2019-07-11 16:41:29 -07:00
Jingyu Zhou a82662a3bc
Update bindings/c/foundationdb/fdb_c.h
Co-Authored-By: A.J. Beamon <ajbeamon@users.noreply.github.com>
2019-07-11 14:00:47 -07:00
Todd Warszawski ada31e7dcc Add more information to MANIFEST in jar. 2019-07-11 13:20:15 -07:00
Jingyu Zhou a8cd25bc46 Fix python3 test failure
Both key and value has to be of type bytes.
2019-07-10 21:55:24 -07:00
Jingyu Zhou 55d1d62ee3 Fix python tests and use 620 version for C test 2019-07-10 15:19:49 -07:00
Jingyu Zhou 20ed0bf802 Add get_approximate_size python unit test 2019-07-10 15:03:24 -07:00
Jingyu Zhou c70a426f04 Update approximate size calculation 2019-07-10 15:00:50 -07:00
Jingyu Zhou 5d1437c8e0 Push int directly to stack for getApproximateSize 2019-07-10 15:00:50 -07:00
Jingyu Zhou 0802df2c8f Convert size from int to string before pushing onto stack
Using int is troublesome because the size of int can be different from the
desired 64 bits. So, using a string representation seems to be more consistent.
2019-07-10 14:58:35 -07:00
Jingyu Zhou 9d12843a26 Push size as tuple to stack 2019-07-10 14:58:35 -07:00
Jingyu Zhou 78a5838312 Address reivew comments for PR #1756 2019-07-10 14:58:07 -07:00
Jingyu Zhou 14f7082428 Update binding API test documentation for GET_APPROXIMATE_SIZE 2019-07-10 14:58:07 -07:00
Jingyu Zhou d5aaba3b15 Minor code fix 2019-07-10 14:58:07 -07:00
Jingyu Zhou 7d6a317f2c Fix a type error 2019-07-10 14:58:07 -07:00
Jingyu Zhou 0ad2d2d16e Add binding test for getApproximateSize API 2019-07-10 14:58:07 -07:00
Jingyu Zhou cc47641bd3 Fix flow binding to use int64_t for get_approximate_size 2019-07-10 14:58:07 -07:00
Jingyu Zhou c17b314c3b Add a C binding unit test for fdb_transaction_get_approximate_size 2019-07-10 14:58:07 -07:00
Jingyu Zhou 8ef8b59fcc Use ThreadFuture for getApproximateSize
Change return type to int64_t and fix C and Python binding to use the correct
type.
2019-07-10 14:58:07 -07:00
Jingyu Zhou c91e712576 Add Python txn get_approximate_size API and test 2019-07-10 14:57:39 -07:00
Jingyu Zhou 4c0e824456 Include unactorcompiler.h at the end of *.actor.h 2019-07-10 14:51:52 -07:00
Jingyu Zhou 4a15be3643 Code format for fdbJNI.cpp 2019-07-10 14:51:52 -07:00
Jingyu Zhou c50a675bf0 Add transaction getApproximateSize() API
The size is the summation of expected size of mutations, read conflict ranges,
and write conflict ranges.
2019-07-10 14:51:52 -07:00
A.J. Beamon 15ecba59db Merge branch 'master' into fix-mvc-default-options
# Conflicts:
#	documentation/sphinx/source/release-notes.rst
2019-07-09 15:28:12 -07:00
Evan Tschannen ec11ef024b
Merge pull request #1798 from ajbeamon/merge-release-6.1-into-master
Merge release 6.1 into master
2019-07-08 09:02:56 -07:00
A.J. Beamon 2a56e011ea Merge branch 'release-6.1' into merge-release-6.1-into-master
# Conflicts:
#	documentation/sphinx/source/release-notes.rst
#	fdbserver/DataDistribution.actor.cpp
2019-07-05 13:52:29 -07:00
Alex Miller 8e1ab6e7db Merge remote-tracking branch 'upstream/master' into flowlock-api 2019-06-28 17:32:54 -07:00
A.J. Beamon c6df30deb3 Move size_limit.py to size_limit_tests.py 2019-06-28 13:24:56 -07:00
A.J. Beamon 2035b36257 Make default and persistent options specifyable via annotations to fdb.options. Fix some issues with persisting these options in the multi-version client. Make size limit option not persistent. 2019-06-28 13:24:32 -07:00
Alex Miller 40b290b7de If `func` throws, then `ret` will never be assigned, and accessed later.
Thus we now initiailize it with None so that it will always have a
value.
2019-06-27 18:57:58 -07:00