diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/log/PhysicalTransactionCursor.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/log/PhysicalTransactionCursor.java index 28c6f6b74fc7..73c5b073594e 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/log/PhysicalTransactionCursor.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/log/PhysicalTransactionCursor.java @@ -92,7 +92,7 @@ public boolean next() throws IOException } LogEntryCommand command = entry.as(); - entries.add( command.getXaCommand() ); + entries.add( command.getCommand() ); } PhysicalTransactionRepresentation transaction = new PhysicalTransactionRepresentation( entries ); diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/log/entry/LogEntryCommand.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/log/entry/LogEntryCommand.java index 107efbcad626..4afa02fc4a85 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/log/entry/LogEntryCommand.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/log/entry/LogEntryCommand.java @@ -39,7 +39,7 @@ public LogEntryCommand( LogEntryVersion version, StorageCommand command ) this.command = command; } - public StorageCommand getXaCommand() + public StorageCommand getCommand() { return command; } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/PhysicalTransactionCursorTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/PhysicalTransactionCursorTest.java index c211fbf17550..a7a7c441756d 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/PhysicalTransactionCursorTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/PhysicalTransactionCursorTest.java @@ -115,7 +115,7 @@ public void shouldCallTheVisitorWithTheFoundTransaction() throws IOException // then PhysicalTransactionRepresentation txRepresentation = - new PhysicalTransactionRepresentation( singletonList( A_COMMAND_ENTRY.getXaCommand() ) ); + new PhysicalTransactionRepresentation( singletonList( A_COMMAND_ENTRY.getCommand() ) ); assertEquals( new CommittedTransactionRepresentation( A_START_ENTRY, txRepresentation, A_COMMIT_ENTRY ), cursor.get() @@ -136,7 +136,7 @@ public void shouldSkipCheckPoints() throws IOException // then PhysicalTransactionRepresentation txRepresentation = - new PhysicalTransactionRepresentation( singletonList( A_COMMAND_ENTRY.getXaCommand() ) ); + new PhysicalTransactionRepresentation( singletonList( A_COMMAND_ENTRY.getCommand() ) ); assertEquals( new CommittedTransactionRepresentation( A_START_ENTRY, txRepresentation, A_COMMIT_ENTRY ), cursor.get() diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/LogTruncationTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/LogTruncationTest.java index d7456322d7d5..03cdfd153a17 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/LogTruncationTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/LogTruncationTest.java @@ -199,7 +199,7 @@ private void assertHandlesLogTruncation( Command cmd ) throws IOException try { LogEntry logEntry = logEntryReader.readLogEntry( inMemoryChannel ); - StorageCommand command = ((LogEntryCommand) logEntry).getXaCommand(); + StorageCommand command = ((LogEntryCommand) logEntry).getCommand(); assertEquals( cmd, command ); } catch ( Exception e ) diff --git a/community/kernel/src/test/java/org/neo4j/test/mockito/matcher/LogMatchers.java b/community/kernel/src/test/java/org/neo4j/test/mockito/matcher/LogMatchers.java index 8c6c4e67967d..1fddf7f6084e 100644 --- a/community/kernel/src/test/java/org/neo4j/test/mockito/matcher/LogMatchers.java +++ b/community/kernel/src/test/java/org/neo4j/test/mockito/matcher/LogMatchers.java @@ -201,7 +201,7 @@ public boolean matchesSafely( LogEntryCommand commandEntry ) return false; } - Command command = (Command) commandEntry.getXaCommand(); + Command command = (Command) commandEntry.getCommand(); return command.getKey() == key && command.getClass().equals( commandClass ); } diff --git a/community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/explicit/IndexCreationTest.java b/community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/explicit/IndexCreationTest.java index 380219b9ac95..a646a92dfb6e 100644 --- a/community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/explicit/IndexCreationTest.java +++ b/community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/explicit/IndexCreationTest.java @@ -156,7 +156,7 @@ private void verifyThatIndexCreationTransactionIsTheFirstOne() throws Exception if ( startFound && entry instanceof LogEntryCommand ) { - commandsInFirstEntry.add( entry.as().getXaCommand() ); + commandsInFirstEntry.add( entry.as().getCommand() ); } if ( entry instanceof LogEntryCommit ) diff --git a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/state/machines/token/ReplicatedTokenRequestSerializer.java b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/state/machines/token/ReplicatedTokenRequestSerializer.java index 62519d99936c..02b8f7e9cb43 100644 --- a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/state/machines/token/ReplicatedTokenRequestSerializer.java +++ b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/state/machines/token/ReplicatedTokenRequestSerializer.java @@ -130,7 +130,7 @@ static Collection extractCommands( byte[] commandBytes ) { while ( (entryRead = (LogEntryCommand) reader.readLogEntry( channel )) != null ) { - commands.add( entryRead.getXaCommand() ); + commands.add( entryRead.getCommand() ); } } catch ( IOException e ) diff --git a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/state/machines/tx/ReplicatedTransactionFactory.java b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/state/machines/tx/ReplicatedTransactionFactory.java index be9440dcb9b1..24fa899aea0b 100644 --- a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/state/machines/tx/ReplicatedTransactionFactory.java +++ b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/state/machines/tx/ReplicatedTransactionFactory.java @@ -156,7 +156,7 @@ public static TransactionRepresentation read( NetworkReadableClosableChannelNett while ( (entryRead = (LogEntryCommand) reader.readLogEntry( channel )) != null ) { - commands.add( entryRead.getXaCommand() ); + commands.add( entryRead.getCommand() ); } PhysicalTransactionRepresentation tx = new PhysicalTransactionRepresentation( commands ); diff --git a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/catchup/tx/TxPullResponseEncodeDecodeTest.java b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/catchup/tx/TxPullResponseEncodeDecodeTest.java index 6654ce404f22..81d82df81918 100644 --- a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/catchup/tx/TxPullResponseEncodeDecodeTest.java +++ b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/catchup/tx/TxPullResponseEncodeDecodeTest.java @@ -63,7 +63,7 @@ private CommittedTransactionRepresentation newCommittedTransactionRepresentation new Command.NodeCommand( new NodeRecord( arbitraryRecordId ), new NodeRecord( arbitraryRecordId ) ); PhysicalTransactionRepresentation physicalTransactionRepresentation = - new PhysicalTransactionRepresentation( singletonList( new LogEntryCommand( command ).getXaCommand() ) ); + new PhysicalTransactionRepresentation( singletonList( new LogEntryCommand( command ).getCommand() ) ); physicalTransactionRepresentation.setHeader( new byte[]{}, 0, 0, 0, 0, 0, 0 ); LogEntryStart startEntry = new LogEntryStart( 0, 0, 0L, 0L, new byte[]{}, LogPosition.UNSPECIFIED ); diff --git a/enterprise/com/src/main/java/org/neo4j/com/Protocol.java b/enterprise/com/src/main/java/org/neo4j/com/Protocol.java index a6d01b33b8a4..1d211b166799 100644 --- a/enterprise/com/src/main/java/org/neo4j/com/Protocol.java +++ b/enterprise/com/src/main/java/org/neo4j/com/Protocol.java @@ -90,7 +90,7 @@ public TransactionRepresentation read( ChannelBuffer buffer, ByteBuffer temporar List commands = new LinkedList<>(); while ( (entryRead = (LogEntryCommand) reader.readLogEntry( channel )) != null ) { - commands.add( entryRead.getXaCommand() ); + commands.add( entryRead.getCommand() ); } PhysicalTransactionRepresentation toReturn = new PhysicalTransactionRepresentation( commands ); diff --git a/tools/src/main/java/org/neo4j/tools/dump/DumpLogicalLog.java b/tools/src/main/java/org/neo4j/tools/dump/DumpLogicalLog.java index 50b8c04935e1..0e62f46e6023 100644 --- a/tools/src/main/java/org/neo4j/tools/dump/DumpLogicalLog.java +++ b/tools/src/main/java/org/neo4j/tools/dump/DumpLogicalLog.java @@ -44,6 +44,7 @@ import org.neo4j.storageengine.api.StorageCommand; import org.neo4j.tools.dump.TransactionLogAnalyzer.Monitor; import org.neo4j.tools.dump.inconsistency.ReportInconsistencies; + import static java.util.TimeZone.getTimeZone; import static org.neo4j.helpers.Format.DEFAULT_TIME_ZONE; @@ -153,7 +154,7 @@ private boolean matches( LogEntry logEntry ) { if ( logEntry instanceof LogEntryCommand ) { - if ( matches( ((LogEntryCommand)logEntry).getXaCommand() ) ) + if ( matches( ((LogEntryCommand)logEntry).getCommand() ) ) { return true; } diff --git a/tools/src/main/java/org/neo4j/tools/txlog/CheckTxLogs.java b/tools/src/main/java/org/neo4j/tools/txlog/CheckTxLogs.java index e5dbf533ffe1..abe3f291de8d 100644 --- a/tools/src/main/java/org/neo4j/tools/txlog/CheckTxLogs.java +++ b/tools/src/main/java/org/neo4j/tools/txlog/CheckTxLogs.java @@ -207,7 +207,7 @@ private boolean scan( Physical LogEntry entry = logEntryCursor.get(); if ( entry instanceof LogEntryCommand ) { - StorageCommand command = ((LogEntryCommand) entry).getXaCommand(); + StorageCommand command = ((LogEntryCommand) entry).getCommand(); if ( check.commandClass().isInstance( command ) ) { long logVersion = logEntryCursor.getCurrentLogVersion(); diff --git a/tools/src/test/java/org/neo4j/tools/dump/TransactionLogAnalyzerTest.java b/tools/src/test/java/org/neo4j/tools/dump/TransactionLogAnalyzerTest.java index 1778849abcf1..8d39a147e419 100644 --- a/tools/src/test/java/org/neo4j/tools/dump/TransactionLogAnalyzerTest.java +++ b/tools/src/test/java/org/neo4j/tools/dump/TransactionLogAnalyzerTest.java @@ -232,7 +232,7 @@ private static void assertTransaction( LogEntry[] transactionEntries, long expec assertTrue( Arrays.toString( transactionEntries ), transactionEntries[0] instanceof LogEntryStart ); assertTrue( transactionEntries[1] instanceof LogEntryCommand ); LogEntryCommand command = transactionEntries[1].as(); - assertEquals( expectedId, ((Command.NodeCommand)command.getXaCommand()).getKey() ); + assertEquals( expectedId, ((Command.NodeCommand)command.getCommand()).getKey() ); assertTrue( transactionEntries[2] instanceof LogEntryCommit ); LogEntryCommit commit = transactionEntries[2].as(); assertEquals( expectedId, commit.getTxId() );