Skip to content

Commit

Permalink
Reference Phase enum through interface instead of implementing class
Browse files Browse the repository at this point in the history
  • Loading branch information
@burqen
burqen committed Feb 7, 2019
1 parent 8e8290f commit cc9a583
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 24 deletions.
4 changes: 2 additions & 2 deletions community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/MultipleIndexPopulator.java
View file
Expand Up @@ -360,7 +360,7 @@ void flushAll()

protected void flush( IndexPopulation population )
{
phaseTracker.enterPhase( LoggingPhaseTracker.Phase.WRITE );
phaseTracker.enterPhase( PhaseTracker.Phase.WRITE );
doFlush( population );
}

Expand Down Expand Up @@ -563,7 +563,7 @@ private void onUpdate( IndexEntryUpdate<?> update )

void flip( boolean verifyBeforeFlipping ) throws FlipFailedKernelException
{
phaseTracker.enterPhase( LoggingPhaseTracker.Phase.FLIP );
phaseTracker.enterPhase( PhaseTracker.Phase.FLIP );
flipper.flip( () ->
{
populatorLock.lock();
Expand Down
3 changes: 1 addition & 2 deletions .../java/org/neo4j/kernel/impl/transaction/state/storeview/PropertyAwareEntityStoreScan.java
View file
Expand Up @@ -27,7 +27,6 @@
import org.neo4j.io.IOUtils;
import org.neo4j.kernel.api.index.IndexEntryUpdate;
import org.neo4j.kernel.impl.api.index.EntityUpdates;
import org.neo4j.kernel.impl.api.index.LoggingPhaseTracker;
import org.neo4j.kernel.impl.api.index.MultipleIndexPopulator;
import org.neo4j.kernel.impl.api.index.PhaseTracker;
import org.neo4j.kernel.impl.api.index.StoreScan;
Expand Down Expand Up @@ -110,7 +109,7 @@ public void run() throws FAILURE
continueScanning = true;
while ( continueScanning && entityIdIterator.hasNext() )
{
phaseTracker.enterPhase( LoggingPhaseTracker.Phase.SCAN );
phaseTracker.enterPhase( PhaseTracker.Phase.SCAN );
long id = entityIdIterator.next();
try ( Lock ignored = lockFunction.apply( id ) )
{
Expand Down
40 changes: 20 additions & 20 deletions community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/LoggingPhaseTrackerTest.java
View file
Expand Up @@ -43,15 +43,15 @@ public void shouldLogSingleTime() throws InterruptedException
{
LoggingPhaseTracker phaseTracker = getPhaseTracker();

phaseTracker.enterPhase( LoggingPhaseTracker.Phase.SCAN );
phaseTracker.enterPhase( PhaseTracker.Phase.SCAN );
sleep( 100 );
phaseTracker.stop();

EnumMap<LoggingPhaseTracker.Phase,LoggingPhaseTracker.Logger> times = phaseTracker.times();
for ( LoggingPhaseTracker.Phase phase : times.keySet() )
EnumMap<PhaseTracker.Phase,LoggingPhaseTracker.Logger> times = phaseTracker.times();
for ( PhaseTracker.Phase phase : times.keySet() )
{
LoggingPhaseTracker.Logger logger = times.get( phase );
if ( phase == LoggingPhaseTracker.Phase.SCAN )
if ( phase == PhaseTracker.Phase.SCAN )
{
assertTrue( logger.totalTime >= TimeUnit.MILLISECONDS.toNanos( 100 ) );
assertTrue( logger.totalTime < TimeUnit.MILLISECONDS.toNanos( 500 ) );
Expand All @@ -68,18 +68,18 @@ public void shouldLogMultipleTimes() throws InterruptedException
{
LoggingPhaseTracker phaseTracker = getPhaseTracker();

phaseTracker.enterPhase( LoggingPhaseTracker.Phase.SCAN );
phaseTracker.enterPhase( PhaseTracker.Phase.SCAN );
sleep( 100 );
phaseTracker.enterPhase( LoggingPhaseTracker.Phase.WRITE );
phaseTracker.enterPhase( PhaseTracker.Phase.WRITE );
sleep( 100 );
phaseTracker.stop();

EnumMap<LoggingPhaseTracker.Phase,LoggingPhaseTracker.Logger> times = phaseTracker.times();
for ( LoggingPhaseTracker.Phase phase : times.keySet() )
EnumMap<PhaseTracker.Phase,LoggingPhaseTracker.Logger> times = phaseTracker.times();
for ( PhaseTracker.Phase phase : times.keySet() )
{
LoggingPhaseTracker.Logger logger = times.get( phase );
if ( phase == LoggingPhaseTracker.Phase.SCAN ||
phase == LoggingPhaseTracker.Phase.WRITE )
if ( phase == PhaseTracker.Phase.SCAN ||
phase == PhaseTracker.Phase.WRITE )
{
assertTrue( logger.totalTime >= TimeUnit.MILLISECONDS.toNanos( 100 ) );
assertTrue( logger.totalTime < TimeUnit.MILLISECONDS.toNanos( 500 ) );
Expand All @@ -96,12 +96,12 @@ public void shouldAccumulateTimes() throws InterruptedException
{
LoggingPhaseTracker phaseTracker = getPhaseTracker();

phaseTracker.enterPhase( LoggingPhaseTracker.Phase.SCAN );
phaseTracker.enterPhase( PhaseTracker.Phase.SCAN );
sleep( 100 );
phaseTracker.enterPhase( LoggingPhaseTracker.Phase.WRITE );
LoggingPhaseTracker.Logger scanLogger = phaseTracker.times().get( LoggingPhaseTracker.Phase.SCAN );
phaseTracker.enterPhase( PhaseTracker.Phase.WRITE );
LoggingPhaseTracker.Logger scanLogger = phaseTracker.times().get( PhaseTracker.Phase.SCAN );
long firstCount = scanLogger.totalTime;
phaseTracker.enterPhase( LoggingPhaseTracker.Phase.SCAN );
phaseTracker.enterPhase( PhaseTracker.Phase.SCAN );
sleep( 100 );
phaseTracker.stop();

Expand All @@ -115,7 +115,7 @@ public void throwIfEnterAfterStop()
phaseTracker.stop();
try
{
phaseTracker.enterPhase( LoggingPhaseTracker.Phase.SCAN );
phaseTracker.enterPhase( PhaseTracker.Phase.SCAN );
fail( "Should have failed" );
}
catch ( IllegalStateException e )
Expand All @@ -131,11 +131,11 @@ public void mustReportMain() throws InterruptedException
AssertableLogProvider logProvider = new AssertableLogProvider( true );
Log log = logProvider.getLog( IndexPopulationJob.class );
PhaseTracker phaseTracker = getPhaseTracker( log );
phaseTracker.enterPhase( LoggingPhaseTracker.Phase.SCAN );
phaseTracker.enterPhase( PhaseTracker.Phase.SCAN );
sleep( 100 );
phaseTracker.enterPhase( LoggingPhaseTracker.Phase.WRITE );
phaseTracker.enterPhase( PhaseTracker.Phase.WRITE );
sleep( 100 );
phaseTracker.enterPhase( LoggingPhaseTracker.Phase.FLIP );
phaseTracker.enterPhase( PhaseTracker.Phase.FLIP );
sleep( 100 );

// when
Expand Down Expand Up @@ -164,11 +164,11 @@ public void mustReportPeriod() throws InterruptedException
AssertableLogProvider logProvider = new AssertableLogProvider( true );
Log log = logProvider.getLog( IndexPopulationJob.class );
PhaseTracker phaseTracker = getPhaseTracker( 1, log );
phaseTracker.enterPhase( LoggingPhaseTracker.Phase.SCAN );
phaseTracker.enterPhase( PhaseTracker.Phase.SCAN );

// when
sleep( 1000 );
phaseTracker.enterPhase( LoggingPhaseTracker.Phase.WRITE );
phaseTracker.enterPhase( PhaseTracker.Phase.WRITE );

// then
//noinspection unchecked
Expand Down

0 comments on commit cc9a583

Please sign in to comment.