From 07a3051f0e04b167c1e362012f4fa16a2d1141ca Mon Sep 17 00:00:00 2001
From: Andrew Noyes <anoyes34@gmail.com>
Date: Mon, 3 Feb 2020 09:52:32 -0800
Subject: [PATCH 1/4] Enable include_port_in_address by default for api version
 700

Resolves #2607
---
 documentation/sphinx/source/api-common.rst.inc | 4 ++--
 fdbclient/NativeAPI.actor.cpp                  | 4 ++--
 fdbclient/NativeAPI.actor.h                    | 1 -
 fdbclient/vexillographer/fdb.options           | 4 ++--
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/documentation/sphinx/source/api-common.rst.inc b/documentation/sphinx/source/api-common.rst.inc
index 65a5885c30..cd2dacf478 100644
--- a/documentation/sphinx/source/api-common.rst.inc
+++ b/documentation/sphinx/source/api-common.rst.inc
@@ -331,7 +331,7 @@
 
 .. |option-db-include-port-in-address-blurb| replace::
 
-    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. Enabling this option is equivalent to calling |include-port-in-address-transaction-option| on each transaction created by this database.
+    Addresses returned by get_addresses_for_key include the port when enabled. This option is now enabled by default and setting this has no effect.
 
 .. |option-db-snapshot-ryw-enable-blurb| replace::
 
@@ -374,7 +374,7 @@
 
 .. |option-include-port-in-address-blurb| replace::
 
-    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. One can set this for all transactions by calling |include-port-in-address-database-option|.
+    Addresses returned by get_addresses_for_key include the port when enabled. This option is now enabled by default and setting this has no effect.
 
 .. |option-causal-write-risky-blurb| replace::
 
diff --git a/fdbclient/NativeAPI.actor.cpp b/fdbclient/NativeAPI.actor.cpp
index c17bb53149..80304174f6 100644
--- a/fdbclient/NativeAPI.actor.cpp
+++ b/fdbclient/NativeAPI.actor.cpp
@@ -2175,7 +2175,7 @@ ACTOR Future<Standalone<VectorRef<const char*>>> getAddressesForKeyActor(Key key
 
 	Standalone<VectorRef<const char*>> addresses;
 	for (auto i : ssi) {
-		std::string ipString = options.includePort ? i.address().toString() : i.address().ip.toString();
+		std::string ipString = i.address().toString();
 		char* c_string = new (addresses.arena()) char[ipString.length()+1];
 		strcpy(c_string, ipString.c_str());
 		addresses.push_back(addresses.arena(), c_string);
@@ -2987,7 +2987,7 @@ void Transaction::setOption( FDBTransactionOptions::Option option, Optional<Stri
 
 		case FDBTransactionOptions::INCLUDE_PORT_IN_ADDRESS:
 			validateOptionValue(value, false);
-			options.includePort = true;
+			// This option has no effect as of api version 700.
 			break;
 
 		default:
diff --git a/fdbclient/NativeAPI.actor.h b/fdbclient/NativeAPI.actor.h
index 0eb470969f..3fff15a978 100644
--- a/fdbclient/NativeAPI.actor.h
+++ b/fdbclient/NativeAPI.actor.h
@@ -131,7 +131,6 @@ struct TransactionOptions {
 	bool lockAware : 1;
 	bool readOnly : 1;
 	bool firstInBatch : 1;
-	bool includePort : 1;
 
 	TransactionOptions(Database const& cx);
 	TransactionOptions();
diff --git a/fdbclient/vexillographer/fdb.options b/fdbclient/vexillographer/fdb.options
index 890dea4864..c307bca958 100644
--- a/fdbclient/vexillographer/fdb.options
+++ b/fdbclient/vexillographer/fdb.options
@@ -172,7 +172,7 @@ description is not currently required but encouraged.
             description="The read version will be committed, and usually will be the latest committed, but might not be the latest committed in the event of a simultaneous fault and misbehaving clock."
             defaultFor="20"/>
     <Option name="transaction_include_port_in_address" code="505"
-            description="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."
+            description="Addresses returned by get_addresses_for_key include the port when enabled. This is option is now enabled by default and setting this has no effect."
             defaultFor="23"/>
   </Scope>
   
@@ -183,7 +183,7 @@ description is not currently required but encouraged.
             description="The read version will be committed, and usually will be the latest committed, but might not be the latest committed in the event of a simultaneous fault and misbehaving clock."/>
     <Option name="causal_read_disable" code="21" />
     <Option name="include_port_in_address" code="23"
-            description="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." />
+            description="Addresses returned by get_addresses_for_key include the port when enabled. This option is now enabled by default and setting this has no effect." />
     <Option name="next_write_no_write_conflict_range" code="30"
             description="The next write performed on this transaction will not generate a write conflict range. As a result, other transactions which read the key(s) being modified by the next write will not conflict with this transaction. Care needs to be taken when using this option on a transaction that is shared between multiple threads. When setting this option, write conflict ranges will be disabled on the next write operation, regardless of what thread it is on." />
     <Option name="commit_on_first_proxy" code="40"

From 2ce887012c4b9571fd0e4dcad0150b720f0122d5 Mon Sep 17 00:00:00 2001
From: Andrew Noyes <anoyes34@gmail.com>
Date: Mon, 3 Feb 2020 15:25:30 -0800
Subject: [PATCH 2/4] Respect api version for include_port_in_address

---
 documentation/sphinx/source/api-common.rst.inc |  4 ++--
 fdbclient/NativeAPI.actor.cpp                  |  7 +++++--
 fdbclient/NativeAPI.actor.h                    |  1 +
 fdbclient/vexillographer/fdb.options           |  4 ++--
 fdbserver/workloads/MemoryLifetime.actor.cpp   |  3 ++-
 flow/network.cpp                               | 10 ++++++++++
 flow/network.h                                 |  3 ++-
 7 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/documentation/sphinx/source/api-common.rst.inc b/documentation/sphinx/source/api-common.rst.inc
index cd2dacf478..29644d94dc 100644
--- a/documentation/sphinx/source/api-common.rst.inc
+++ b/documentation/sphinx/source/api-common.rst.inc
@@ -331,7 +331,7 @@
 
 .. |option-db-include-port-in-address-blurb| replace::
 
-    Addresses returned by get_addresses_for_key include the port when enabled. This option is now enabled by default and setting this has no effect.
+    Addresses returned by get_addresses_for_key include the port when enabled. As of api version 700, this option is enabled by default and setting this has no effect.
 
 .. |option-db-snapshot-ryw-enable-blurb| replace::
 
@@ -374,7 +374,7 @@
 
 .. |option-include-port-in-address-blurb| replace::
 
-    Addresses returned by get_addresses_for_key include the port when enabled. This option is now enabled by default and setting this has no effect.
+    Addresses returned by get_addresses_for_key include the port when enabled. As of api version 700, this option is enabled by default and setting this has no effect.
 
 .. |option-causal-write-risky-blurb| replace::
 
diff --git a/fdbclient/NativeAPI.actor.cpp b/fdbclient/NativeAPI.actor.cpp
index 80304174f6..c16d3e0e5b 100644
--- a/fdbclient/NativeAPI.actor.cpp
+++ b/fdbclient/NativeAPI.actor.cpp
@@ -2175,7 +2175,7 @@ ACTOR Future<Standalone<VectorRef<const char*>>> getAddressesForKeyActor(Key key
 
 	Standalone<VectorRef<const char*>> addresses;
 	for (auto i : ssi) {
-		std::string ipString = i.address().toString();
+		std::string ipString = options.includePort ? i.address().toString() : i.address().ip.toString();
 		char* c_string = new (addresses.arena()) char[ipString.length()+1];
 		strcpy(c_string, ipString.c_str());
 		addresses.push_back(addresses.arena(), c_string);
@@ -2432,6 +2432,9 @@ void TransactionOptions::reset(Database const& cx) {
 	maxBackoff = CLIENT_KNOBS->DEFAULT_MAX_BACKOFF;
 	sizeLimit = CLIENT_KNOBS->TRANSACTION_SIZE_LIMIT;
 	lockAware = cx->lockAware;
+	if (cx->apiVersionAtLeast(700)) {
+		includePort = true;
+	}
 }
 
 void Transaction::reset() {
@@ -2987,7 +2990,7 @@ void Transaction::setOption( FDBTransactionOptions::Option option, Optional<Stri
 
 		case FDBTransactionOptions::INCLUDE_PORT_IN_ADDRESS:
 			validateOptionValue(value, false);
-			// This option has no effect as of api version 700.
+			options.includePort = true;
 			break;
 
 		default:
diff --git a/fdbclient/NativeAPI.actor.h b/fdbclient/NativeAPI.actor.h
index 3fff15a978..0eb470969f 100644
--- a/fdbclient/NativeAPI.actor.h
+++ b/fdbclient/NativeAPI.actor.h
@@ -131,6 +131,7 @@ struct TransactionOptions {
 	bool lockAware : 1;
 	bool readOnly : 1;
 	bool firstInBatch : 1;
+	bool includePort : 1;
 
 	TransactionOptions(Database const& cx);
 	TransactionOptions();
diff --git a/fdbclient/vexillographer/fdb.options b/fdbclient/vexillographer/fdb.options
index c307bca958..c7a7b03aeb 100644
--- a/fdbclient/vexillographer/fdb.options
+++ b/fdbclient/vexillographer/fdb.options
@@ -172,7 +172,7 @@ description is not currently required but encouraged.
             description="The read version will be committed, and usually will be the latest committed, but might not be the latest committed in the event of a simultaneous fault and misbehaving clock."
             defaultFor="20"/>
     <Option name="transaction_include_port_in_address" code="505"
-            description="Addresses returned by get_addresses_for_key include the port when enabled. This is option is now enabled by default and setting this has no effect."
+            description="Addresses returned by get_addresses_for_key include the port when enabled. As of api version 700, this option is enabled by default and setting this has no effect."
             defaultFor="23"/>
   </Scope>
   
@@ -183,7 +183,7 @@ description is not currently required but encouraged.
             description="The read version will be committed, and usually will be the latest committed, but might not be the latest committed in the event of a simultaneous fault and misbehaving clock."/>
     <Option name="causal_read_disable" code="21" />
     <Option name="include_port_in_address" code="23"
-            description="Addresses returned by get_addresses_for_key include the port when enabled. This option is now enabled by default and setting this has no effect." />
+            description="Addresses returned by get_addresses_for_key include the port when enabled. As of api version 700, this option is enabled by default and setting this has no effect." />
     <Option name="next_write_no_write_conflict_range" code="30"
             description="The next write performed on this transaction will not generate a write conflict range. As a result, other transactions which read the key(s) being modified by the next write will not conflict with this transaction. Care needs to be taken when using this option on a transaction that is shared between multiple threads. When setting this option, write conflict ranges will be disabled on the next write operation, regardless of what thread it is on." />
     <Option name="commit_on_first_proxy" code="40"
diff --git a/fdbserver/workloads/MemoryLifetime.actor.cpp b/fdbserver/workloads/MemoryLifetime.actor.cpp
index 82c2daec10..d992d07dae 100644
--- a/fdbserver/workloads/MemoryLifetime.actor.cpp
+++ b/fdbserver/workloads/MemoryLifetime.actor.cpp
@@ -26,6 +26,7 @@
 #include "fdbserver/workloads/BulkSetup.actor.h"
 #include "fdbclient/ReadYourWrites.h"
 #include "flow/actorcompiler.h"  // This must be the last #include.
+#include "network.h"
 
 struct MemoryLifetime : KVWorkload {
 	double testDuration;
@@ -151,7 +152,7 @@ struct MemoryLifetime : KVWorkload {
 					wait( delay(0.01) );
 					//we cannot check the contents like other operations so just touch all the values to make sure we dont crash
 					for (int i = 0; i < getAddress_res1.size(); i++) {
-						ASSERT(IPAddress::parse(getAddress_res1[i]).present());
+						ASSERT(NetworkAddress::parseOptional(getAddress_res1[i]).present());
 					}
 				}
 				if(now() - startTime > self->testDuration)
diff --git a/flow/network.cpp b/flow/network.cpp
index 82c848b5ce..de78c1307e 100644
--- a/flow/network.cpp
+++ b/flow/network.cpp
@@ -18,6 +18,7 @@
  * limitations under the License.
  */
 
+#include "Arena.h"
 #include "boost/asio.hpp"
 
 #include "flow/network.h"
@@ -98,6 +99,15 @@ NetworkAddress NetworkAddress::parse( std::string const& s ) {
 	}
 }
 
+Optional<NetworkAddress> NetworkAddress::parseOptional(std::string const& s) {
+	try {
+		return NetworkAddress::parse(s);
+	} catch (Error& e) {
+		ASSERT(e.code() == error_code_connection_string_invalid);
+		return Optional<NetworkAddress>();
+	}
+}
+
 std::vector<NetworkAddress> NetworkAddress::parseList( std::string const& addrs ) {
 	// Split addrs on ',' and parse them individually
 	std::vector<NetworkAddress> coord;
diff --git a/flow/network.h b/flow/network.h
index 21ef3ed92d..28fe78d5c9 100644
--- a/flow/network.h
+++ b/flow/network.h
@@ -225,7 +225,8 @@ struct NetworkAddress {
 	bool isTLS() const { return (flags & FLAG_TLS) != 0; }
 	bool isV6() const { return ip.isV6(); }
 
-	static NetworkAddress parse( std::string const& );
+	static NetworkAddress parse(std::string const&); // May throw connection_string_invalid
+	static Optional<NetworkAddress> parseOptional(std::string const&);
 	static std::vector<NetworkAddress> parseList( std::string const& );
 	std::string toString() const;
 

From 9400766be9ffc6bff8f7253a48d7d1d789defa8c Mon Sep 17 00:00:00 2001
From: Andrew Noyes <anoyes34@gmail.com>
Date: Mon, 3 Feb 2020 15:39:06 -0800
Subject: [PATCH 3/4] Remove include for Make build

IWYU would not be pleased :(
---
 fdbserver/workloads/MemoryLifetime.actor.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/fdbserver/workloads/MemoryLifetime.actor.cpp b/fdbserver/workloads/MemoryLifetime.actor.cpp
index d992d07dae..29e3d180f0 100644
--- a/fdbserver/workloads/MemoryLifetime.actor.cpp
+++ b/fdbserver/workloads/MemoryLifetime.actor.cpp
@@ -26,7 +26,6 @@
 #include "fdbserver/workloads/BulkSetup.actor.h"
 #include "fdbclient/ReadYourWrites.h"
 #include "flow/actorcompiler.h"  // This must be the last #include.
-#include "network.h"
 
 struct MemoryLifetime : KVWorkload {
 	double testDuration;

From e95e04f650d18c2f8d43d258da2dd1052a5b2bdc Mon Sep 17 00:00:00 2001
From: Andrew Noyes <anoyes34@gmail.com>
Date: Tue, 4 Feb 2020 09:56:47 -0800
Subject: [PATCH 4/4] Remove include-port-in-address from sphinx source

---
 documentation/sphinx/source/api-c.rst           |  2 --
 documentation/sphinx/source/api-common.rst.inc  |  8 --------
 documentation/sphinx/source/api-python.rst      | 10 ----------
 documentation/sphinx/source/api-ruby.rst        | 10 ----------
 documentation/sphinx/source/data-modeling.rst   |  2 --
 documentation/sphinx/source/developer-guide.rst |  2 --
 6 files changed, 34 deletions(-)

diff --git a/documentation/sphinx/source/api-c.rst b/documentation/sphinx/source/api-c.rst
index f3fe41a64f..90826ef80f 100644
--- a/documentation/sphinx/source/api-c.rst
+++ b/documentation/sphinx/source/api-c.rst
@@ -51,8 +51,6 @@
 .. |timeout-database-option| replace:: FIXME
 .. |causal-read-risky-transaction-option| replace:: FIXME
 .. |causal-read-risky-database-option| replace:: FIXME
-.. |include-port-in-address-database-option| replace:: FIXME
-.. |include-port-in-address-transaction-option| replace:: FIXME
 .. |transaction-logging-max-field-length-database-option| replace:: FIXME
 .. |transaction-logging-max-field-length-transaction-option| replace:: FIXME
 
diff --git a/documentation/sphinx/source/api-common.rst.inc b/documentation/sphinx/source/api-common.rst.inc
index 29644d94dc..1e88f2608f 100644
--- a/documentation/sphinx/source/api-common.rst.inc
+++ b/documentation/sphinx/source/api-common.rst.inc
@@ -329,10 +329,6 @@
 
     Transactions do not require the strict causal consistency guarantee that FoundationDB provides by default.  The read version will be committed, and usually will be the latest committed, but might not be the latest committed in the event of a simultaneous fault and misbehaving clock. Enabling this option is equivalent to calling |causal-read-risky-transaction-option| on each transaction created by this database.
 
-.. |option-db-include-port-in-address-blurb| replace::
-
-    Addresses returned by get_addresses_for_key include the port when enabled. As of api version 700, this option is enabled by default and setting this has no effect.
-
 .. |option-db-snapshot-ryw-enable-blurb| replace::
 
     If this option has been set an equal or more times with this database than the disable option, snapshot reads *will* see the effects of prior writes in the same transaction. Enabling this option is equivalent to calling |snapshot-ryw-enable-transaction-option| on each transaction created by this database.
@@ -372,10 +368,6 @@
 
     This transaction does not require the strict causal consistency guarantee that FoundationDB provides by default.  The read version will be committed, and usually will be the latest committed, but might not be the latest committed in the event of a simultaneous fault and misbehaving clock. One can set this for all transactions by calling |causal-read-risky-database-option|.
 
-.. |option-include-port-in-address-blurb| replace::
-
-    Addresses returned by get_addresses_for_key include the port when enabled. As of api version 700, this option is enabled by default and setting this has no effect.
-
 .. |option-causal-write-risky-blurb| replace::
 
     The application either knows that this transaction will be self-conflicting (at least one read overlaps at least one set or clear), or is willing to accept a small risk that the transaction could be committed a second time after its commit apparently succeeds.  This option provides a small performance benefit.
diff --git a/documentation/sphinx/source/api-python.rst b/documentation/sphinx/source/api-python.rst
index c9e7f834b6..27601e9d5e 100644
--- a/documentation/sphinx/source/api-python.rst
+++ b/documentation/sphinx/source/api-python.rst
@@ -26,7 +26,6 @@
 .. |max-retry-delay-database-option| replace:: :func:`Database.options.set_transaction_max_retry_delay`
 .. |transaction-size-limit-database-option| replace:: :func:`Database.options.set_transaction_size_limit`
 .. |causal-read-risky-database-option| replace:: :func:`Database.options.set_transaction_causal_read_risky`
-.. |include-port-in-address-database-option| replace:: :func:`Database.options.set_transaction_include_port_in_address`
 .. |transaction-logging-max-field-length-database-option| replace:: :func:`Database.options.set_transaction_logging_max_field_length`
 .. |snapshot-ryw-enable-database-option| replace:: :func:`Database.options.set_snapshot_ryw_enable`
 .. |snapshot-ryw-disable-database-option| replace:: :func:`Database.options.set_snapshot_ryw_disable`
@@ -39,7 +38,6 @@
 .. |snapshot-ryw-enable-transaction-option| replace:: :func:`Transaction.options.set_snapshot_ryw_enable`
 .. |snapshot-ryw-disable-transaction-option| replace:: :func:`Transaction.options.set_snapshot_ryw_disable`
 .. |causal-read-risky-transaction-option| replace:: :func:`Transaction.options.set_causal_read_risky`
-.. |include-port-in-address-transaction-option| replace:: :func:`Transaction.options.set_include_port_in_address`
 .. |transaction-logging-max-field-length-transaction-option| replace:: :func:`Transaction.options.set_transaction_logging_max_field_length`
 .. |lazy-iterator-object| replace:: generator
 .. |key-meth| replace:: :meth:`Subspace.key`
@@ -400,10 +398,6 @@ Database options
 
     |option-db-causal-read-risky-blurb|
 
-.. method:: Database.options.set_transaction_include_port_in_address()
-
-    |option-db-include-port-in-address-blurb|
-    
 .. method:: Database.options.set_transaction_logging_max_field_length(size_limit)
 
     |option-db-tr-transaction-logging-max-field-length-blurb|
@@ -829,10 +823,6 @@ Transaction options
 
     |option-causal-read-risky-blurb|
 
-.. method:: Transaction.options.set_include_port_in_address
-
-    |option-include-port-in-address-blurb|
-
 .. method:: Transaction.options.set_causal_write_risky
 
     |option-causal-write-risky-blurb|
diff --git a/documentation/sphinx/source/api-ruby.rst b/documentation/sphinx/source/api-ruby.rst
index 70226e7fc6..cc02f5eeb3 100644
--- a/documentation/sphinx/source/api-ruby.rst
+++ b/documentation/sphinx/source/api-ruby.rst
@@ -24,7 +24,6 @@
 .. |max-retry-delay-database-option| replace:: :meth:`Database.options.set_transaction_max_retry_delay`
 .. |transaction-size-limit-database-option| replace:: :func:`Database.options.set_transaction_size_limit`
 .. |causal-read-risky-database-option| replace:: :meth:`Database.options.set_transaction_causal_read_risky`
-.. |include-port-in-address-database-option| replace:: :meth:`Database.options.set_transaction_include_port_in_address`
 .. |snapshot-ryw-enable-database-option| replace:: :meth:`Database.options.set_snapshot_ryw_enable`
 .. |snapshot-ryw-disable-database-option| replace:: :meth:`Database.options.set_snapshot_ryw_disable`
 .. |transaction-logging-max-field-length-database-option| replace:: :meth:`Database.options.set_transaction_logging_max_field_length`
@@ -37,7 +36,6 @@
 .. |snapshot-ryw-enable-transaction-option| replace:: :meth:`Transaction.options.set_snapshot_ryw_enable`
 .. |snapshot-ryw-disable-transaction-option| replace:: :meth:`Transaction.options.set_snapshot_ryw_disable`
 .. |causal-read-risky-transaction-option| replace:: :meth:`Transaction.options.set_causal_read_risky`
-.. |include-port-in-address-transaction-option| replace:: :meth:`Transaction.options.set_include_port_in_address`
 .. |transaction-logging-max-field-length-transaction-option| replace:: :meth:`Transaction.options.set_transaction_logging_max_field_length`
 .. |lazy-iterator-object| replace:: :class:`Enumerator`
 .. |key-meth| replace:: :meth:`Subspace.key`
@@ -392,10 +390,6 @@ Database options
 
     |option-db-causal-read-risky-blurb|
 
-.. method:: Database.options.set_transaction_include_port_in_address() -> nil
-
-    |option-db-include-port-in-address-blurb|
-
 .. method:: Database.options.set_transaction_logging_max_field_length(size_limit) -> nil
 
     |option-db-tr-transaction-logging-max-field-length-blurb|
@@ -771,10 +765,6 @@ Transaction options
 
     |option-causal-read-risky-blurb|
 
-.. method:: Transaction.options.set_include_port_in_address() -> nil
-
-    |option-include-port-in-address-blurb|
-
 .. method:: Transaction.options.set_causal_write_risky() -> nil
 
     |option-causal-write-risky-blurb|
diff --git a/documentation/sphinx/source/data-modeling.rst b/documentation/sphinx/source/data-modeling.rst
index 24f3aad203..d57845540e 100644
--- a/documentation/sphinx/source/data-modeling.rst
+++ b/documentation/sphinx/source/data-modeling.rst
@@ -53,8 +53,6 @@
 .. |timeout-database-option| replace:: FIXME
 .. |causal-read-risky-database-option| replace:: FIXME
 .. |causal-read-risky-transaction-option| replace:: FIXME
-.. |include-port-in-address-database-option| replace:: FIXME
-.. |include-port-in-address-transaction-option| replace:: FIXME
 .. |transaction-logging-max-field-length-transaction-option| replace:: FIXME
 .. |transaction-logging-max-field-length-database-option| replace:: FIXME
 
diff --git a/documentation/sphinx/source/developer-guide.rst b/documentation/sphinx/source/developer-guide.rst
index 5cda16c32a..ef1496f5c8 100644
--- a/documentation/sphinx/source/developer-guide.rst
+++ b/documentation/sphinx/source/developer-guide.rst
@@ -53,8 +53,6 @@
 .. |timeout-database-option| replace:: FIXME
 .. |causal-read-risky-database-option| replace:: FIXME
 .. |causal-read-risky-transaction-option| replace:: FIXME
-.. |include-port-in-address-database-option| replace:: FIXME
-.. |include-port-in-address-transaction-option| replace:: FIXME
 .. |transaction-logging-max-field-length-transaction-option| replace:: FIXME
 .. |transaction-logging-max-field-length-database-option| replace:: FIXME