Skip to content

Commit

Permalink
Fix post rebase compilation.
Browse files Browse the repository at this point in the history
  • Loading branch information
@MishaDemianenko
MishaDemianenko committed Oct 3, 2017
1 parent eb04e08 commit 857b1b5
Showing 1 changed file with 8 additions and 9 deletions.
17 changes: 8 additions & 9 deletions community/kernel/src/test/java/org/neo4j/kernel/RecoveryCorruptedTransactionLogIT.java
View file
Expand Up @@ -19,8 +19,6 @@
*/ */
package org.neo4j.kernel; package org.neo4j.kernel;


import com.google.common.collect.HashMultiset;
import com.google.common.collect.Multiset;
import org.junit.After; import org.junit.After;
import org.junit.Before; import org.junit.Before;
import org.junit.Rule; import org.junit.Rule;
Expand All @@ -41,6 +39,7 @@
import org.neo4j.graphdb.Node; import org.neo4j.graphdb.Node;
import org.neo4j.graphdb.RelationshipType; import org.neo4j.graphdb.RelationshipType;
import org.neo4j.graphdb.Transaction; import org.neo4j.graphdb.Transaction;
import org.neo4j.helpers.collection.MultiSet;
import org.neo4j.io.fs.StoreChannel; import org.neo4j.io.fs.StoreChannel;
import org.neo4j.kernel.impl.store.record.NodeRecord; import org.neo4j.kernel.impl.store.record.NodeRecord;
import org.neo4j.kernel.impl.store.record.PropertyRecord; import org.neo4j.kernel.impl.store.record.PropertyRecord;
Expand Down Expand Up @@ -170,7 +169,7 @@ public void recoverFirstCorruptedTransactionSingleFileNoCheckpoint() throws IOEx
" position LogPosition{logVersion=0, byteOffset=16} are unreadable and will be truncated." ); " position LogPosition{logVersion=0, byteOffset=16} are unreadable and will be truncated." );


assertEquals( 0, logFiles.getHighestLogVersion() ); assertEquals( 0, logFiles.getHighestLogVersion() );
Multiset<Class> logEntriesDistribution = getLogEntriesDistribution( logFiles, versionRepository ); MultiSet<Class> logEntriesDistribution = getLogEntriesDistribution( logFiles, versionRepository );
assertEquals( 1, logEntriesDistribution.size() ); assertEquals( 1, logEntriesDistribution.size() );
assertEquals( 1, logEntriesDistribution.count( CheckPoint.class ) ); assertEquals( 1, logEntriesDistribution.count( CheckPoint.class ) );
} }
Expand Down Expand Up @@ -208,7 +207,7 @@ public void recoverNotAFirstCorruptedTransactionSingleFileNoCheckpoint() throws
"Any later transaction after LogPosition{logVersion=0, byteOffset=6245} are unreadable and will be truncated." ); "Any later transaction after LogPosition{logVersion=0, byteOffset=6245} are unreadable and will be truncated." );


assertEquals( 0, logFiles.getHighestLogVersion() ); assertEquals( 0, logFiles.getHighestLogVersion() );
Multiset<Class> logEntriesDistribution = getLogEntriesDistribution( logFiles, versionRepository ); MultiSet<Class> logEntriesDistribution = getLogEntriesDistribution( logFiles, versionRepository );
assertEquals( 1, logEntriesDistribution.count( CheckPoint.class ) ); assertEquals( 1, logEntriesDistribution.count( CheckPoint.class ) );
assertEquals( numberOfTransactions, recoveryMonitor.getNumberOfRecoveredTransactions() ); assertEquals( numberOfTransactions, recoveryMonitor.getNumberOfRecoveredTransactions() );
assertEquals( originalFileLength, highestLogFile.length() ); assertEquals( originalFileLength, highestLogFile.length() );
Expand Down Expand Up @@ -249,7 +248,7 @@ public void recoverNotAFirstCorruptedTransactionMultipleFilesNoCheckpoints() thr
"Any later transaction after LogPosition{logVersion=3, byteOffset=4632} are unreadable and will be truncated." ); "Any later transaction after LogPosition{logVersion=3, byteOffset=4632} are unreadable and will be truncated." );


assertEquals( 3, logFiles.getHighestLogVersion() ); assertEquals( 3, logFiles.getHighestLogVersion() );
Multiset<Class> logEntriesDistribution = getLogEntriesDistribution( logFiles, versionRepository ); MultiSet<Class> logEntriesDistribution = getLogEntriesDistribution( logFiles, versionRepository );
assertEquals( 1, logEntriesDistribution.count( CheckPoint.class ) ); assertEquals( 1, logEntriesDistribution.count( CheckPoint.class ) );
assertEquals( numberOfTransactions, recoveryMonitor.getNumberOfRecoveredTransactions() ); assertEquals( numberOfTransactions, recoveryMonitor.getNumberOfRecoveredTransactions() );
assertEquals( originalFileLength, highestLogFile.length() ); assertEquals( originalFileLength, highestLogFile.length() );
Expand Down Expand Up @@ -287,7 +286,7 @@ public void recoverNotAFirstCorruptedTransactionMultipleFilesMultipleCheckpoints
"Any later transaction after LogPosition{logVersion=3, byteOffset=4650} are unreadable and will be truncated." ); "Any later transaction after LogPosition{logVersion=3, byteOffset=4650} are unreadable and will be truncated." );


assertEquals( 3, logFiles.getHighestLogVersion() ); assertEquals( 3, logFiles.getHighestLogVersion() );
Multiset<Class> logEntriesDistribution = getLogEntriesDistribution( logFiles, versionRepository ); MultiSet<Class> logEntriesDistribution = getLogEntriesDistribution( logFiles, versionRepository );
assertEquals( 4, logEntriesDistribution.count( CheckPoint.class ) ); assertEquals( 4, logEntriesDistribution.count( CheckPoint.class ) );
assertEquals( transactionsToRecover, recoveryMonitor.getNumberOfRecoveredTransactions() ); assertEquals( transactionsToRecover, recoveryMonitor.getNumberOfRecoveredTransactions() );
assertEquals( originalFileLength, highestLogFile.length() ); assertEquals( originalFileLength, highestLogFile.length() );
Expand Down Expand Up @@ -319,7 +318,7 @@ public void recoverFirstCorruptedTransactionAfterCheckpointInLastLogFile() throw
"are unreadable and will be truncated." ); "are unreadable and will be truncated." );


assertEquals( 5, logFiles.getHighestLogVersion() ); assertEquals( 5, logFiles.getHighestLogVersion() );
Multiset<Class> logEntriesDistribution = getLogEntriesDistribution( logFiles, versionRepository ); MultiSet<Class> logEntriesDistribution = getLogEntriesDistribution( logFiles, versionRepository );
assertEquals( 1, logEntriesDistribution.count( CheckPoint.class ) ); assertEquals( 1, logEntriesDistribution.count( CheckPoint.class ) );
assertEquals( originalFileLength, highestLogFile.length() ); assertEquals( originalFileLength, highestLogFile.length() );
} }
Expand Down Expand Up @@ -407,7 +406,7 @@ private PositiveLogFilesBasedLogVersionRepository addCorruptedCommandsToLastLogF
return versionRepository; return versionRepository;
} }


private Multiset<Class> getLogEntriesDistribution( PhysicalLogFiles logFiles, private MultiSet<Class> getLogEntriesDistribution( PhysicalLogFiles logFiles,
PositiveLogFilesBasedLogVersionRepository versionRepository ) throws IOException PositiveLogFilesBasedLogVersionRepository versionRepository ) throws IOException
{ {
try ( Lifespan lifespan = new Lifespan() ) try ( Lifespan lifespan = new Lifespan() )
Expand All @@ -420,7 +419,7 @@ private Multiset<Class> getLogEntriesDistribution( PhysicalLogFiles logFiles,
LogPosition fileStartPosition = new LogPosition( 0, LogHeader.LOG_HEADER_SIZE ); LogPosition fileStartPosition = new LogPosition( 0, LogHeader.LOG_HEADER_SIZE );
VersionAwareLogEntryReader entryReader = new VersionAwareLogEntryReader(); VersionAwareLogEntryReader entryReader = new VersionAwareLogEntryReader();


Multiset<Class> multiset = HashMultiset.create(); MultiSet<Class> multiset = new MultiSet<>();
ReadableLogChannel fileReader = physicalLogFile.getReader( fileStartPosition ); ReadableLogChannel fileReader = physicalLogFile.getReader( fileStartPosition );
LogEntry logEntry = entryReader.readLogEntry( fileReader ); LogEntry logEntry = entryReader.readLogEntry( fileReader );
while ( logEntry != null ) while ( logEntry != null )
Expand Down

0 comments on commit 857b1b5

Please sign in to comment.