Skip to content

Commit

Permalink
Merge pull request #11498 from MishaDemianenko/3.4-report-direct-bytes
Browse files Browse the repository at this point in the history 
Report direct allocated bytes in transaction status report
  • Loading branch information
@MishaDemianenko
MishaDemianenko committed Apr 11, 2018
2 parents 0c860c9 + 4a752e0 commit d614915
Show file tree
Hide file tree
Showing 2 changed files with 50 additions and 11 deletions.
2 changes: 1 addition & 1 deletion community/kernel/src/main/java/org/neo4j/kernel/impl/api/TransactionExecutionStatistic.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ public TransactionExecutionStatistic( KernelTransactionImplementation tx, System
KernelTransactionImplementation.Statistics statistics = tx.getStatistics();
this.waitTimeMillis = NANOSECONDS.toMillis( statistics.getWaitingTimeNanos( nowNanos ) );
this.heapAllocatedBytes = nullIfNegative( statistics.heapAllocatedBytes() );
this.directAllocatedBytes = nullIfNegative( statistics.heapAllocatedBytes() );
this.directAllocatedBytes = nullIfNegative( statistics.directAllocatedBytes() );
this.cpuTimeMillis = nullIfNegative( statistics.cpuTimeMillis() );
this.pageFaults = statistics.totalTransactionPageCacheFaults();
this.pageHits = statistics.totalTransactionPageCacheHits();
Expand Down
59 changes: 49 additions & 10 deletions ...l/src/test/java/org/neo4j/kernel/enterprise/builtinprocs/TransactionStatusResultTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,20 +29,42 @@
import java.util.concurrent.atomic.AtomicReference;
import java.util.stream.Stream;

import org.neo4j.collection.pool.Pool;
import org.neo4j.io.pagecache.tracing.cursor.PageCursorTracer;
import org.neo4j.io.pagecache.tracing.cursor.PageCursorTracerSupplier;
import org.neo4j.io.pagecache.tracing.cursor.context.EmptyVersionContextSupplier;
import org.neo4j.kernel.api.KernelTransaction;
import org.neo4j.kernel.api.KernelTransactionHandle;
import org.neo4j.kernel.api.exceptions.InvalidArgumentsException;
import org.neo4j.kernel.api.explicitindex.AutoIndexing;
import org.neo4j.kernel.api.query.ExecutingQuery;
import org.neo4j.kernel.api.query.QuerySnapshot;
import org.neo4j.kernel.api.txstate.ExplicitIndexTransactionState;
import org.neo4j.kernel.impl.api.KernelTransactionImplementation;
import org.neo4j.kernel.impl.api.SchemaState;
import org.neo4j.kernel.impl.api.SchemaWriteGuard;
import org.neo4j.kernel.impl.api.StatementOperationParts;
import org.neo4j.kernel.impl.api.TestKernelTransactionHandle;
import org.neo4j.kernel.impl.api.TransactionCommitProcess;
import org.neo4j.kernel.impl.api.TransactionExecutionStatistic;
import org.neo4j.kernel.impl.api.TransactionHooks;
import org.neo4j.kernel.impl.api.index.IndexingService;
import org.neo4j.kernel.impl.api.state.ConstraintIndexCreator;
import org.neo4j.kernel.impl.constraints.StandardConstraintSemantics;
import org.neo4j.kernel.impl.factory.CanWrite;
import org.neo4j.kernel.impl.index.ExplicitIndexStore;
import org.neo4j.kernel.impl.locking.ActiveLock;
import org.neo4j.kernel.impl.locking.LockTracer;
import org.neo4j.kernel.impl.locking.ResourceTypes;
import org.neo4j.kernel.impl.newapi.DefaultCursors;
import org.neo4j.kernel.impl.proc.Procedures;
import org.neo4j.kernel.impl.query.clientconnection.HttpConnectionInfo;
import org.neo4j.kernel.impl.transaction.TransactionHeaderInformationFactory;
import org.neo4j.kernel.impl.transaction.TransactionStats;
import org.neo4j.kernel.impl.transaction.tracing.TransactionTracer;
import org.neo4j.resources.CpuClock;
import org.neo4j.resources.HeapAllocation;
import org.neo4j.storageengine.api.StorageEngine;
import org.neo4j.time.Clocks;
import org.neo4j.time.SystemNanoClock;
import org.neo4j.values.virtual.VirtualValues;
Expand All @@ -53,8 +75,9 @@
import static java.util.concurrent.TimeUnit.MILLISECONDS;
import static org.apache.commons.lang3.StringUtils.EMPTY;
import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.RETURNS_MOCKS;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import static org.neo4j.kernel.impl.util.collection.CollectionsFactorySupplier.ON_HEAP;

public class TransactionStatusResultTest
{
Expand Down Expand Up @@ -123,6 +146,7 @@ private void checkTransactionStatusWithoutQueries( TransactionStatusResult statu
assertEquals( 0L, statusResult.waitTimeMillis );
assertEquals( Long.valueOf( 1809 ), statusResult.idleTimeMillis );
assertEquals( Long.valueOf( 1 ), statusResult.allocatedBytes );
assertEquals( Long.valueOf( 0 ), statusResult.allocatedDirectBytes );
assertEquals( 0L, statusResult.pageHits );
assertEquals( 0L, statusResult.pageFaults );
}
Expand All @@ -147,6 +171,7 @@ private void checkTransactionStatus( TransactionStatusResult statusResult, Strin
assertEquals( 0L, statusResult.waitTimeMillis );
assertEquals( Long.valueOf( 1809 ), statusResult.idleTimeMillis );
assertEquals( Long.valueOf( 1 ), statusResult.allocatedBytes );
assertEquals( Long.valueOf( 0 ), statusResult.allocatedDirectBytes );
assertEquals( 0, statusResult.pageHits );
assertEquals( 0, statusResult.pageFaults );
}
Expand Down Expand Up @@ -188,14 +213,29 @@ public Stream<ActiveLock> activeLocks()
@Override
public TransactionExecutionStatistic transactionStatistic()
{
KernelTransactionImplementation transaction = mock( KernelTransactionImplementation.class );
TestStatistics statistics =
new TestStatistics( transaction, new AtomicReference<>( new CountingCpuClock() ),
new AtomicReference<>( new CountingHeapAllocation() ) );
statistics.init( Thread.currentThread().getId(), PageCursorTracer.NULL );
when( transaction.getStatistics() ).thenReturn( statistics );
return new TransactionExecutionStatistic( transaction, Clocks.fakeClock().forward( 2010, MILLISECONDS ),
200 );
KernelTransactionImplementation transaction = new KernelTransactionImplementation(
mock( StatementOperationParts.class ), mock( SchemaWriteGuard.class ), new TransactionHooks(),
mock( ConstraintIndexCreator.class ), new Procedures(), TransactionHeaderInformationFactory.DEFAULT,
mock( TransactionCommitProcess.class ), new TransactionStats(), () -> mock( ExplicitIndexTransactionState.class ),
mock( Pool.class ), Clocks.fakeClock(),
new AtomicReference<>( CpuClock.NOT_AVAILABLE ), new AtomicReference<>( HeapAllocation.NOT_AVAILABLE ),
TransactionTracer.NULL,
LockTracer.NONE, PageCursorTracerSupplier.NULL,
mock( StorageEngine.class, RETURNS_MOCKS ), new CanWrite(),
mock( DefaultCursors.class ), AutoIndexing.UNSUPPORTED, mock( ExplicitIndexStore.class ),
EmptyVersionContextSupplier.EMPTY, ON_HEAP, new StandardConstraintSemantics(), mock( SchemaState.class),
mock( IndexingService.class ) )
{
@Override
public Statistics getStatistics()
{
TestStatistics statistics = new TestStatistics( this, new AtomicReference<>( new CountingCpuClock() ),
new AtomicReference<>( new CountingHeapAllocation() ) );
statistics.init( Thread.currentThread().getId(), PageCursorTracer.NULL );
return statistics;
}
};
return new TransactionExecutionStatistic( transaction, Clocks.fakeClock().forward( 2010, MILLISECONDS ), 200 );
}
}

Expand All @@ -211,7 +251,6 @@ protected void init( long threadId, PageCursorTracer pageCursorTracer )
AtomicReference<HeapAllocation> heapAllocationRef )
{
super( transaction, cpuClockRef, heapAllocationRef );

}
}

Expand Down

0 comments on commit d614915

Please sign in to comment.