All time fileds should be in millis

neo4j · Jan 3, 2017 · 596a0a2 · 596a0a2
1 parent 46f7ef5
commit 596a0a2
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 12 deletions.
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/ExecutingQuery.java b/community/kernel/src/main/java/org/neo4j/kernel/api/ExecutingQuery.java
@@ -143,9 +143,9 @@ public long elapsedTimeMillis()
     /**
      * @return the CPU time used by the query, in nanoseconds.
      */
-    public long cpuTimeMicros()
+    public long cpuTimeMillis()
     {
-        return NANOSECONDS.toMicros( cpuClock.cpuTimeNanos( threadExecutingTheQuery ) - cpuTimeNanosWhenQueryStarted );
+        return NANOSECONDS.toMillis( cpuClock.cpuTimeNanos( threadExecutingTheQuery ) - cpuTimeNanosWhenQueryStarted );
     }
 
     public long waitTimeMillis()

diff --git a/community/kernel/src/test/java/org/neo4j/kernel/api/ExecutingQueryTest.java b/community/kernel/src/test/java/org/neo4j/kernel/api/ExecutingQueryTest.java
@@ -119,10 +119,10 @@ public void shouldReportCpuTime() throws Exception
         cpuClock.add( 60, TimeUnit.MILLISECONDS );
 
         // when
-        long cpuTime = query.cpuTimeMicros();
+        long cpuTime = query.cpuTimeMillis();
 
         // then
-        assertEquals( 60_000, cpuTime );
+        assertEquals( 60, cpuTime );
     }
 
     private LockWaitEvent lock( String resourceType, long resourceId )

diff --git a/...rise/kernel/src/main/java/org/neo4j/kernel/enterprise/builtinprocs/QueryStatusResult.java b/...rise/kernel/src/main/java/org/neo4j/kernel/enterprise/builtinprocs/QueryStatusResult.java
@@ -44,7 +44,7 @@ public class QueryStatusResult
     public final String startTime;
     public final String elapsedTime;
     public final String connectionDetails;
-    public final long cpuTimeMicros;
+    public final long cpuTimeMillis;
     public final Map<String,Object> status;
     public final long waitTimeMillis;
     public final Map<String,Object> metaData;
@@ -60,7 +60,7 @@ public class QueryStatusResult
                 q.elapsedTimeMillis(),
                 q.querySource(),
                 q.metaData(),
-                q.cpuTimeMicros(),
+                q.cpuTimeMillis(),
                 q.status(),
                 q.waitTimeMillis() );
     }
@@ -74,7 +74,7 @@ private QueryStatusResult(
             long elapsedTime,
             QuerySource querySource,
             Map<String,Object> txMetaData,
-            long cpuTimeMicros,
+            long cpuTimeMillis,
             Map<String,Object> status,
             long waitTimeMillis
     ) {
@@ -86,7 +86,7 @@ private QueryStatusResult(
         this.elapsedTime = formatInterval( elapsedTime );
         this.connectionDetails = querySource.toString();
         this.metaData = txMetaData;
-        this.cpuTimeMicros = cpuTimeMicros;
+        this.cpuTimeMillis = cpuTimeMillis;
         this.status = status;
         this.waitTimeMillis = waitTimeMillis;
     }

diff --git a/...rnel/src/test/java/org/neo4j/kernel/enterprise/builtinprocs/ListQueriesProcedureTest.java b/...rnel/src/test/java/org/neo4j/kernel/enterprise/builtinprocs/ListQueriesProcedureTest.java
@@ -37,6 +37,7 @@
 import static java.util.concurrent.TimeUnit.SECONDS;
 import static org.hamcrest.CoreMatchers.instanceOf;
 import static org.hamcrest.Matchers.greaterThan;
+import static org.hamcrest.Matchers.greaterThanOrEqualTo;
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -102,8 +103,8 @@ public void shouldProvideElapsedCpuTime() throws Exception
             Map<String,Object> data = getQueryListing( "MATCH (n) SET n.v = n.v + 1" );
 
             // then
-            assertTrue( "should contain a 'cpuTimeMicros' field", data.containsKey( "cpuTimeMicros" ) );
-            Object cpuTime1 = data.get( "cpuTimeMicros" );
+            assertTrue( "should contain a 'cpuTimeMillis' field", data.containsKey( "cpuTimeMillis" ) );
+            Object cpuTime1 = data.get( "cpuTimeMillis" );
             assertThat( cpuTime1, instanceOf( Long.class ) );
             assertTrue( "should contain a 'status' field", data.containsKey( "status" ) );
             Object status = data.get( "status" );
@@ -121,8 +122,8 @@ public void shouldProvideElapsedCpuTime() throws Exception
             data = getQueryListing( "MATCH (n) SET n.v = n.v + 1" );
 
             // then
-            Long cpuTime2 = (Long) data.get( "cpuTimeMicros" );
-            assertThat( cpuTime2, greaterThan( (Long) cpuTime1 ) );
+            Long cpuTime2 = (Long) data.get( "cpuTimeMillis" );
+            assertThat( cpuTime2, greaterThanOrEqualTo( (Long) cpuTime1 ) );
             Long waitTime2 = (Long) data.get( "waitTimeMillis" );
             assertThat( waitTime2, greaterThan( (Long) waitTime1 ) );
         }