From fbdade0434bc7fbe2753bf1dcb43576f054554f4 Mon Sep 17 00:00:00 2001 From: Andrew Noyes Date: Wed, 27 May 2020 23:52:08 +0000 Subject: [PATCH] Remove warning about combining ryw-disabled w/ versionstamped keys We test this combination now (#3067), and don't know of any reason why this shouldn't work --- documentation/sphinx/source/api-c.rst | 2 -- documentation/sphinx/source/api-common.rst.inc | 3 --- documentation/sphinx/source/api-python.rst | 2 -- documentation/sphinx/source/api-ruby.rst | 2 -- 4 files changed, 9 deletions(-) diff --git a/documentation/sphinx/source/api-c.rst b/documentation/sphinx/source/api-c.rst index 4bfdb54d6c..5c7cdd2c5d 100644 --- a/documentation/sphinx/source/api-c.rst +++ b/documentation/sphinx/source/api-c.rst @@ -700,8 +700,6 @@ Applications must provide error handling and an appropriate retry loop around th |atomic-versionstamps-2| - |atomic-set-versionstamped-key-2| - .. warning :: |atomic-versionstamps-tuple-warning-key| ``FDB_MUTATION_TYPE_SET_VERSIONSTAMPED_VALUE`` diff --git a/documentation/sphinx/source/api-common.rst.inc b/documentation/sphinx/source/api-common.rst.inc index 39e09a83d0..6bce920a45 100644 --- a/documentation/sphinx/source/api-common.rst.inc +++ b/documentation/sphinx/source/api-common.rst.inc @@ -132,9 +132,6 @@ .. |atomic-set-versionstamped-key-1| replace:: Transforms ``key`` using a versionstamp for the transaction. This key must be at least 14 bytes long. The final 4 bytes will be interpreted as a 32-bit little-endian integer denoting an index into the key at which to perform the transformation, and then trimmed off the key. The 10 bytes in the key beginning at the index will be overwritten with the versionstamp. If the index plus 10 bytes points past the end of the key, the result will be an error. Sets the transformed key in the database to ``param``. -.. |atomic-set-versionstamped-key-2| replace:: - This operation is not compatible with |read-your-writes-disable-option| and will generate an error if used with it. - .. |atomic-set-versionstamped-value| replace:: Transforms ``param`` using a versionstamp for the transaction. This parameter must be at least 14 bytes long. The final 4 bytes will be interpreted as a 32-bit little-endian integer denoting an index into the parameter at which to perform the transformation, and then trimmed off the key. The 10 bytes in the parameter beginning at the index will be overwritten with the versionstamp. If the index plus 10 bytes points past the end of the parameter, the result will be an error. Sets ``key`` in the database to the transformed parameter. diff --git a/documentation/sphinx/source/api-python.rst b/documentation/sphinx/source/api-python.rst index 7245b849a1..fb75d3516d 100644 --- a/documentation/sphinx/source/api-python.rst +++ b/documentation/sphinx/source/api-python.rst @@ -678,8 +678,6 @@ In each of the methods below, ``param`` should be a string appropriately packed |atomic-versionstamps-2| - |atomic-set-versionstamped-key-2| - .. warning :: |atomic-versionstamps-tuple-warning-key| .. method:: Transaction.set_versionstamped_value(key, param) diff --git a/documentation/sphinx/source/api-ruby.rst b/documentation/sphinx/source/api-ruby.rst index 77ae67ceac..df73cf6dc4 100644 --- a/documentation/sphinx/source/api-ruby.rst +++ b/documentation/sphinx/source/api-ruby.rst @@ -627,8 +627,6 @@ In each of the methods below, ``param`` should be a string appropriately packed |atomic-versionstamps-2| - |atomic-set-versionstamped-key-2| - .. warning :: |atomic-versionstamps-tuple-warning-key| .. method:: Transaction.set_versionstamped_value(key, param) -> nil