Use java.time.Clock instead of org.neo4j.helpers.Clock in kernel tran…

…saction stuff and releated tests

community/common/src/main/java/org/neo4j/time/FakeClock.java

@@ -50,6 +50,12 @@ public Instant instant()
         return Instant.ofEpochMilli( millis );
     }
 
+    @Override
+    public long millis()
+    {
+        return millis;
+    }
+
     public FakeClock forward( long delta, TimeUnit unit )
     {
         millis += unit.toMillis( delta );

community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/spi/v3_0/TransactionBoundQueryContextTest.scala

@@ -20,6 +20,7 @@
 package org.neo4j.cypher.internal.spi.v3_0
 
 import java.net.URL
+import java.time.Clock
 
 import org.mockito.Mockito._
 import org.neo4j.cypher.internal.compiler.v3_0.helpers.DynamicIterable
@@ -31,7 +32,6 @@ import org.neo4j.cypher.javacompat.internal.GraphDatabaseCypherService
 import org.neo4j.graphdb._
 import org.neo4j.graphdb.config.Setting
 import org.neo4j.graphdb.factory.GraphDatabaseSettings
-import org.neo4j.helpers.Clock
 import org.neo4j.kernel.api._
 import org.neo4j.kernel.api.security.AccessMode
 import org.neo4j.kernel.impl.api.{KernelStatement, KernelTransactionImplementation}
@@ -57,7 +57,7 @@ class TransactionBoundQueryContextTest extends CypherFunSuite {
     outerTx = mock[InternalTransaction]
     val kernelTransaction = mock[KernelTransactionImplementation]
     when(kernelTransaction.mode()).thenReturn(AccessMode.Static.FULL)
-    statement = new KernelStatement(kernelTransaction, null, null, null, new Procedures(), Clock.SYSTEM_CLOCK, 1L)
+    statement = new KernelStatement(kernelTransaction, null, null, null, new Procedures(), Clock.systemUTC, 1L)
   }
 
   override def afterEach() {

community/kernel/src/main/java/org/neo4j/kernel/NeoStoreDataSource.java

@@ -23,6 +23,7 @@
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.time.Clock;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
@@ -34,7 +35,6 @@
 import org.neo4j.graphdb.ResourceIterator;
 import org.neo4j.graphdb.config.Setting;
 import org.neo4j.graphdb.factory.GraphDatabaseSettings;
-import org.neo4j.helpers.Clock;
 import org.neo4j.helpers.Exceptions;
 import org.neo4j.helpers.collection.Visitor;
 import org.neo4j.io.fs.FileSystemAbstraction;
@@ -662,7 +662,7 @@ public long getTimestampForVersion( long version ) throws IOException
 
         long timeMillisThreshold = config.get( GraphDatabaseSettings.check_point_interval_time );
         TimeCheckPointThreshold timeCheckPointThreshold =
-                new TimeCheckPointThreshold( timeMillisThreshold, Clock.SYSTEM_CLOCK );
+                new TimeCheckPointThreshold( timeMillisThreshold, Clock.systemUTC() );
 
         CheckPointThreshold threshold =
                 CheckPointThresholds.or( countCommittedTransactionThreshold, timeCheckPointThreshold );
@@ -797,7 +797,7 @@ private KernelModule buildKernel( TransactionAppender appender,
         KernelTransactions kernelTransactions = life.add( new KernelTransactions( statementLocksFactory,
                 constraintIndexCreator, statementOperations, schemaWriteGuard, transactionHeaderInformationFactory,
                 transactionCommitProcess, indexConfigStore, legacyIndexProviderLookup, hooks, transactionMonitor,
-                life, tracers, storageEngine, procedures, transactionIdStore, config, Clock.SYSTEM_CLOCK ) );
+                life, tracers, storageEngine, procedures, transactionIdStore, config, Clock.systemUTC() ) );
 
         final Kernel kernel = new Kernel( kernelTransactions, hooks, databaseHealth, transactionMonitor, procedures,
                 config );

community/kernel/src/main/java/org/neo4j/kernel/guard/GuardTimeoutException.java

@@ -24,9 +24,9 @@ public class GuardTimeoutException extends GuardException
 
     private final long overtime;
 
-    public GuardTimeoutException( final long overtime )
+    public GuardTimeoutException(String message, final long overtime )
     {
-        super( String.format( "timeout occured (overtime=%d)", overtime ) );
+        super( message );
         this.overtime = overtime;
     }
 

community/kernel/src/main/java/org/neo4j/kernel/guard/TimeoutGuard.java

@@ -19,9 +19,9 @@
  */
 package org.neo4j.kernel.guard;
 
+import java.time.Clock;
 import java.util.function.Supplier;
 
-import org.neo4j.helpers.Clock;
 import org.neo4j.kernel.impl.api.KernelStatement;
 import org.neo4j.kernel.impl.api.KernelTransactionImplementation;
 import org.neo4j.logging.Log;
@@ -51,13 +51,14 @@ private void check (KernelTransactionImplementation transaction)
 
     private void check( Supplier<Long> completionTimeSupplier, String timeoutDescription )
     {
-        long now = clock.currentTimeMillis();
-        long transactionCompletionTime = completionTimeSupplier.get();
-        if ( transactionCompletionTime < now )
+        long now = clock.millis();
+        long completionTime = completionTimeSupplier.get();
+        if ( completionTime < now )
         {
-            final long overtime = now - transactionCompletionTime;
-            log.warn( timeoutDescription + " ( Overtime: " + overtime + " ms)." );
-            throw new GuardTimeoutException( overtime );
+            final long overtime = now - completionTime;
+            String message = timeoutDescription + " (Overtime: " + overtime + " ms).";
+            log.warn( message );
+            throw new GuardTimeoutException(message, overtime );
         }
     }
 

community/kernel/src/main/java/org/neo4j/kernel/impl/api/KernelStatement.java

@@ -19,10 +19,11 @@
  */
 package org.neo4j.kernel.impl.api;
 
+import java.time.Clock;
+
 import org.neo4j.graphdb.NotInTransactionException;
 import org.neo4j.graphdb.TransactionTerminatedException;
 import org.neo4j.graphdb.security.AuthorizationViolationException;
-import org.neo4j.helpers.Clock;
 import org.neo4j.kernel.api.DataWriteOperations;
 import org.neo4j.kernel.api.ReadOperations;
 import org.neo4j.kernel.api.SchemaWriteOperations;
@@ -170,7 +171,6 @@ void assertOpen()
     void initialize( StatementLocks statementLocks )
     {
         this.statementLocks = statementLocks;
-        this.timeoutMillis = clock.currentTimeMillis();
     }
 
     public StatementLocks locks()
@@ -182,7 +182,7 @@ final void acquire()
     {
         if ( referenceCount++ == 0 )
         {
-            startTimeMillis = clock.currentTimeMillis();
+            startTimeMillis = clock.millis();
             storeStatement.acquire();
         }
     }

community/kernel/src/main/java/org/neo4j/kernel/impl/api/KernelTransactionImplementation.java

@@ -19,6 +19,7 @@
  */
 package org.neo4j.kernel.impl.api;
 
+import java.time.Clock;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.concurrent.locks.Lock;
@@ -27,7 +28,6 @@
 
 import org.neo4j.collection.pool.Pool;
 import org.neo4j.graphdb.TransactionTerminatedException;
-import org.neo4j.helpers.Clock;
 import org.neo4j.kernel.api.KernelTransaction;
 import org.neo4j.kernel.api.KeyReadTokenNameLookup;
 import org.neo4j.kernel.api.exceptions.ConstraintViolationTransactionFailureException;
@@ -219,7 +219,7 @@ public KernelTransactionImplementation initialize(
         this.terminationReason = null;
         this.closing = closed = failure = success = beforeHookInvoked = false;
         this.writeState = TransactionWriteState.NONE;
-        this.startTimeMillis = clock.currentTimeMillis();
+        this.startTimeMillis = clock.millis();
         this.lastTransactionIdWhenStarted = lastCommittedTx;
         this.lastTransactionTimestampWhenStarted = lastTimeStamp;
         this.transactionEvent = tracer.beginTransaction();
@@ -573,7 +573,7 @@ private void commit() throws TransactionFailureException
                     PhysicalTransactionRepresentation transactionRepresentation =
                             new PhysicalTransactionRepresentation( extractedCommands );
                     TransactionHeaderInformation headerInformation = headerInformationFactory.create();
-                    long timeCommitted = clock.currentTimeMillis();
+                    long timeCommitted = clock.millis();
                     transactionRepresentation.setHeader( headerInformation.getAdditionalHeader(),
                             headerInformation.getMasterId(),
                             headerInformation.getAuthorId(),

community/kernel/src/main/java/org/neo4j/kernel/impl/api/KernelTransactions.java

@@ -19,6 +19,7 @@
  */
 package org.neo4j.kernel.impl.api;
 
+import java.time.Clock;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
@@ -30,7 +31,6 @@
 import org.neo4j.graphdb.DatabaseShutdownException;
 import org.neo4j.graphdb.config.Setting;
 import org.neo4j.graphdb.factory.GraphDatabaseSettings;
-import org.neo4j.helpers.Clock;
 import org.neo4j.kernel.api.KernelTransaction;
 import org.neo4j.kernel.api.KernelTransactionHandle;
 import org.neo4j.kernel.api.exceptions.Status;
@@ -269,7 +269,7 @@ private void assertDatabaseIsRunning()
     @Override
     public KernelTransactionsSnapshot get()
     {
-        return new KernelTransactionsSnapshot( activeTransactions(), clock.currentTimeMillis() );
+        return new KernelTransactionsSnapshot( activeTransactions(), clock.millis() );
     }
 
     /**

community/kernel/src/main/java/org/neo4j/kernel/impl/factory/DataSourceModule.java

@@ -20,6 +20,7 @@
 package org.neo4j.kernel.impl.factory;
 
 import java.io.File;
+import java.time.Clock;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Supplier;
 
@@ -31,7 +32,6 @@
 import org.neo4j.graphdb.Relationship;
 import org.neo4j.graphdb.RelationshipType;
 import org.neo4j.graphdb.factory.GraphDatabaseSettings;
-import org.neo4j.helpers.Clock;
 import org.neo4j.io.fs.FileSystemAbstraction;
 import org.neo4j.io.pagecache.PageCache;
 import org.neo4j.kernel.AvailabilityGuard;
@@ -263,7 +263,7 @@ private Guard buildGuard( Dependencies deps, Config config, LogService logging )
 
     private TimeoutGuard createTimeoutGuard( LogService logging )
     {
-        return new TimeoutGuard( logging.getInternalLog( TimeoutGuard.class ), Clock.SYSTEM_CLOCK );
+        return new TimeoutGuard( logging.getInternalLog( TimeoutGuard.class ), Clock.systemUTC() );
     }
 
     protected RelationshipProxy.RelationshipActions createRelationshipActions(

community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/log/checkpoint/TimeCheckPointThreshold.java

@@ -19,7 +19,7 @@
  */
 package org.neo4j.kernel.impl.transaction.log.checkpoint;
 
-import org.neo4j.helpers.Clock;
+import java.time.Clock;
 
 public class TimeCheckPointThreshold extends AbstractCheckPointThreshold
 {
@@ -33,7 +33,7 @@ public TimeCheckPointThreshold( long timeMillisThreshold, Clock clock )
     {
         this.timeMillisThreshold = timeMillisThreshold;
         this.clock = clock;
-        this.nextCheckPointTime = clock.currentTimeMillis() + timeMillisThreshold;
+        this.nextCheckPointTime = clock.millis() + timeMillisThreshold;
 
     }
 
@@ -47,7 +47,7 @@ public void initialize( long transactionId )
     protected boolean thresholdReached( long lastCommittedTransactionId )
     {
         return lastCommittedTransactionId > lastCheckPointedTransactionId &&
-               clock.currentTimeMillis() >= nextCheckPointTime;
+               clock.millis() >= nextCheckPointTime;
     }
 
     @Override
@@ -59,7 +59,7 @@ protected String description()
     @Override
     public void checkPointHappened( long transactionId )
     {
-        nextCheckPointTime = clock.currentTimeMillis() + timeMillisThreshold;
+        nextCheckPointTime = clock.millis() + timeMillisThreshold;
         lastCheckPointedTransactionId = transactionId;
     }
 }

community/kernel/src/test/java/org/neo4j/kernel/api/KernelTransactionFactory.java

@@ -19,10 +19,10 @@
  */
 package org.neo4j.kernel.api;
 
+import java.time.Clock;
 import java.util.function.Supplier;
 
 import org.neo4j.collection.pool.Pool;
-import org.neo4j.helpers.Clock;
 import org.neo4j.kernel.api.security.AccessMode;
 import org.neo4j.kernel.impl.api.KernelTransactionImplementation;
 import org.neo4j.kernel.impl.api.SchemaWriteGuard;
@@ -84,7 +84,7 @@ static Instances kernelTransactionWithInternals( AccessMode accessMode )
                 mock( TransactionRepresentationCommitProcess.class ), mock( TransactionMonitor.class ),
                 mock( Supplier.class ),
                 mock( Pool.class ),
-                Clock.SYSTEM_CLOCK,
+                Clock.systemUTC(),
                 TransactionTracer.NULL,
                 storageEngine, false, 1L );
 

community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelStatementTest.java

@@ -21,8 +21,9 @@
 
 import org.junit.Test;
 
+import java.time.Clock;
+
 import org.neo4j.graphdb.TransactionTerminatedException;
-import org.neo4j.helpers.Clock;
 import org.neo4j.kernel.api.exceptions.Status;
 import org.neo4j.kernel.api.security.AccessMode;
 import org.neo4j.kernel.impl.proc.Procedures;
@@ -42,7 +43,7 @@ public void shouldThrowTerminateExceptionWhenTransactionTerminated() throws Exce
         when( transaction.mode() ).thenReturn( AccessMode.Static.FULL );
 
         KernelStatement statement = new KernelStatement(
-            transaction, null, null, mock( StorageStatement.class ), null, Clock.SYSTEM_CLOCK, 1L );
+            transaction, null, null, mock( StorageStatement.class ), null, Clock.systemUTC(), 1L );
         statement.acquire();
 
         statement.readOperations().nodeExists( 0 );
@@ -54,7 +55,7 @@ public void shouldReleaseStorageStatementWhenForceClosed() throws Exception
         // given
         StorageStatement storeStatement = mock( StorageStatement.class );
         KernelStatement statement = new KernelStatement( mock( KernelTransactionImplementation.class ),
-                null, null, storeStatement, new Procedures(), Clock.SYSTEM_CLOCK, 1L );
+                null, null, storeStatement, new Procedures(), Clock.systemUTC(), 1L );
         statement.acquire();
 
         // when

community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelTransactionImplementationTest.java

@@ -359,7 +359,7 @@ public void shouldAllowTerminatingFromADifferentThread() throws Exception
     public void shouldUseStartTimeAndTxIdFromWhenStartingTxAsHeader() throws Exception
     {
         // GIVEN a transaction starting at one point in time
-        long startingTime = clock.currentTimeMillis();
+        long startingTime = clock.millis();
         when( legacyIndexState.hasChanges() ).thenReturn( true );
         doAnswer( invocation ->
         {

community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelTransactionTerminationTest.java

@@ -33,7 +33,6 @@
 
 import org.neo4j.collection.pool.Pool;
 import org.neo4j.graphdb.TransactionTerminatedException;
-import org.neo4j.helpers.FakeClock;
 import org.neo4j.kernel.api.KernelTransaction;
 import org.neo4j.kernel.api.exceptions.Status;
 import org.neo4j.kernel.api.exceptions.TransactionFailureException;
@@ -47,6 +46,7 @@
 import org.neo4j.kernel.impl.transaction.TransactionMonitor;
 import org.neo4j.kernel.impl.transaction.tracing.TransactionTracer;
 import org.neo4j.storageengine.api.StorageEngine;
+import org.neo4j.time.FakeClock;
 
 import static org.hamcrest.Matchers.instanceOf;
 import static org.junit.Assert.assertEquals;

community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelTransactionTestBase.java

@@ -24,7 +24,6 @@
 import java.util.function.Supplier;
 
 import org.neo4j.collection.pool.Pool;
-import org.neo4j.helpers.FakeClock;
 import org.neo4j.kernel.api.KernelTransaction.Type;
 import org.neo4j.kernel.api.exceptions.TransactionFailureException;
 import org.neo4j.kernel.api.security.AccessMode;
@@ -44,6 +43,7 @@
 import org.neo4j.storageengine.api.StorageEngine;
 import org.neo4j.storageengine.api.StoreReadLayer;
 import org.neo4j.storageengine.api.TransactionApplicationMode;
+import org.neo4j.time.FakeClock;
 
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;

community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelTransactionsTest.java

@@ -21,6 +21,7 @@
 
 import org.junit.Test;
 
+import java.time.Clock;
 import java.util.Collection;
 import java.util.concurrent.Callable;
 import java.util.concurrent.CountDownLatch;
@@ -33,7 +34,6 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReferenceArray;
 
-import org.neo4j.helpers.Clock;
 import org.neo4j.kernel.api.KernelTransaction;
 import org.neo4j.kernel.api.KernelTransactionHandle;
 import org.neo4j.kernel.api.exceptions.Status;
@@ -450,12 +450,12 @@ private static KernelTransactions newKernelTransactions( Locks locks, StorageEng
                     TransactionHeaderInformationFactory.DEFAULT,
                     commitProcess, null, null, new TransactionHooks(), mock( TransactionMonitor.class ), life,
                     tracers, storageEngine, new Procedures(), transactionIdStore, Config.empty(),
-                    Clock.SYSTEM_CLOCK );
+                    Clock.systemUTC() );
         }
         return new KernelTransactions( statementLocksFactory, null, null, null,
                 TransactionHeaderInformationFactory.DEFAULT,
                 commitProcess, null, null, new TransactionHooks(), mock( TransactionMonitor.class ), life,
-                tracers, storageEngine, new Procedures(), transactionIdStore, Config.empty(), Clock.SYSTEM_CLOCK );
+                tracers, storageEngine, new Procedures(), transactionIdStore, Config.empty(), Clock.systemUTC() );
     }
 
     private static TransactionCommitProcess newRememberingCommitProcess( final TransactionRepresentation[] slot )