Better name for bookmark wait setting

Renamed from `dbms.transaction.bookmark_await_timeout` to `dbms.transaction.bookmark_ready_timeout` because later better describes the concept.
neo4j · Jan 5, 2017 · fc0e252 · fc0e252
1 parent 85ed46c
commit fc0e252
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/community/bolt/src/main/java/org/neo4j/bolt/v1/runtime/LifecycleManagedBoltFactory.java b/community/bolt/src/main/java/org/neo4j/bolt/v1/runtime/LifecycleManagedBoltFactory.java
@@ -107,8 +107,8 @@ public BoltStateMachine newMachine( String connectionDescriptor, Runnable onClos
 
     private TransactionStateMachine.SPI createTxSpi( Clock clock )
     {
-        long bookmarkAwaitTimeout = config.get( GraphDatabaseSettings.bookmark_await_timeout );
+        long bookmarkReadyTimeout = config.get( GraphDatabaseSettings.bookmark_ready_timeout );
-        Duration txAwaitDuration = Duration.ofMillis( bookmarkAwaitTimeout );
+        Duration txAwaitDuration = Duration.ofMillis( bookmarkReadyTimeout );
 
         return new TransactionStateMachineSPI( gds, txBridge, queryExecutionEngine, transactionIdStore,
                 availabilityGuard, queryService, txAwaitDuration, clock );

diff --git a/community/kernel/src/main/java/org/neo4j/graphdb/factory/GraphDatabaseSettings.java b/community/kernel/src/main/java/org/neo4j/graphdb/factory/GraphDatabaseSettings.java
@@ -498,8 +498,8 @@ public abstract class GraphDatabaseSettings
             setting( "dbms.connectors.default_advertised_address", STRING, "localhost" );
 
     @Description( "The maximum amount of time to wait for the database state represented by the bookmark." )
-    public static final Setting<Long> bookmark_await_timeout = setting(
+    public static final Setting<Long> bookmark_ready_timeout = setting(
-            "dbms.transaction.bookmark_await_timeout", DURATION, "30s",
+            "dbms.transaction.bookmark_ready_timeout", DURATION, "30s",
             min( TimeUnit.SECONDS.toMillis( 1 ) ) );
 
     @Group("dbms.connector")

diff --git a/community/kernel/src/test/java/org/neo4j/graphdb/factory/GraphDatabaseSettingsTest.java b/community/kernel/src/test/java/org/neo4j/graphdb/factory/GraphDatabaseSettingsTest.java
@@ -224,8 +224,8 @@ public void shouldSupportMultipleBoltConnectorsWithDefaultAndCustomName() throws
     public void hasDefaultBookmarkAwaitTimeout()
     {
         Config config = Config.defaults();
-        long bookmarkAwaitTimeoutMs = config.get( GraphDatabaseSettings.bookmark_await_timeout );
+        long bookmarkReadyTimeoutMs = config.get( GraphDatabaseSettings.bookmark_ready_timeout );
-        assertEquals( TimeUnit.SECONDS.toMillis( 30 ), bookmarkAwaitTimeoutMs );
+        assertEquals( TimeUnit.SECONDS.toMillis( 30 ), bookmarkReadyTimeoutMs );
     }
 
     @Test
@@ -236,10 +236,10 @@ public void throwsForIllegalBookmarkAwaitTimeout()
         for ( String value : illegalValues )
         {
             Config config = Config.defaults();
-            config.augment( stringMap( GraphDatabaseSettings.bookmark_await_timeout.name(), value ) );
+            config.augment( stringMap( GraphDatabaseSettings.bookmark_ready_timeout.name(), value ) );
             try
             {
-                config.get( GraphDatabaseSettings.bookmark_await_timeout );
+                config.get( GraphDatabaseSettings.bookmark_ready_timeout );
                 fail( "Exception expected for value '" + value + "'" );
             }
             catch ( Exception e )