From 596a0a234febe120c1aa211e3c580d762f98f0ce Mon Sep 17 00:00:00 2001 From: Tobias Lindaaker Date: Tue, 3 Jan 2017 17:44:58 +0100 Subject: [PATCH] All time fileds should be in millis --- .../main/java/org/neo4j/kernel/api/ExecutingQuery.java | 4 ++-- .../java/org/neo4j/kernel/api/ExecutingQueryTest.java | 4 ++-- .../enterprise/builtinprocs/QueryStatusResult.java | 8 ++++---- .../builtinprocs/ListQueriesProcedureTest.java | 9 +++++---- 4 files changed, 13 insertions(+), 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 index 7385216b48ec7..447c986dbc4ac 100644 --- 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 index 1ff4abfacb511..ed4e03a14f441 100644 --- 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/enterprise/kernel/src/main/java/org/neo4j/kernel/enterprise/builtinprocs/QueryStatusResult.java b/enterprise/kernel/src/main/java/org/neo4j/kernel/enterprise/builtinprocs/QueryStatusResult.java index b3efda1678eb1..9e04977fb1688 100644 --- a/enterprise/kernel/src/main/java/org/neo4j/kernel/enterprise/builtinprocs/QueryStatusResult.java +++ b/enterprise/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 status; public final long waitTimeMillis; public final Map 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 txMetaData, - long cpuTimeMicros, + long cpuTimeMillis, Map 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/enterprise/kernel/src/test/java/org/neo4j/kernel/enterprise/builtinprocs/ListQueriesProcedureTest.java b/enterprise/kernel/src/test/java/org/neo4j/kernel/enterprise/builtinprocs/ListQueriesProcedureTest.java index f4e9f8d961f96..7cb8fcf7b34a6 100644 --- a/enterprise/kernel/src/test/java/org/neo4j/kernel/enterprise/builtinprocs/ListQueriesProcedureTest.java +++ b/enterprise/kernel/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 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 ) ); }