From 37f33d7b9b2ee907aeef856f0746f3b8f6505485 Mon Sep 17 00:00:00 2001 From: MishaDemianenko Date: Thu, 19 Oct 2017 18:53:00 +0200 Subject: [PATCH] Flatten LogEntryCommit hierarchy. Remove phase mentioning. --- .../main/java/org/neo4j/helpers/Format.java | 30 ++++++------- .../log/PhysicalLogicalTransactionStore.java | 4 +- .../log/entry/LogEntryByteCodes.java | 2 +- .../transaction/log/entry/LogEntryCommit.java | 23 ++++++++-- .../log/entry/LogEntryParsersV2_3.java | 6 +-- .../transaction/log/entry/LogEntryWriter.java | 4 +- .../transaction/log/entry/OnePhaseCommit.java | 43 ------------------- .../java/org/neo4j/kernel/RecoveryTest.java | 6 +-- .../PhysicalTransactionCursorTest.java | 3 +- .../log/BatchingTransactionAppenderTest.java | 5 +-- .../log/TransactionPositionLocatorTest.java | 3 +- .../entry/LogEntryParserDispatcherV6Test.java | 4 +- .../entry/VersionAwareLogEntryReaderTest.java | 4 +- .../TransactionAppenderStressTest.java | 10 ++--- .../RecoveryProgressIndicatorTest.java | 4 +- .../test/mockito/matcher/LogMatchers.java | 6 +-- .../tx/ChunkedTransactionStreamTest.java | 4 +- .../tx/TransactionLogCatchUpWriterTest.java | 4 +- .../catchup/tx/TxPullRequestHandlerTest.java | 4 +- .../tx/TxPullResponseEncodeDecodeTest.java | 4 +- .../neo4j/com/MadeUpServerImplementation.java | 5 +-- .../com/storecopy/ResponsePackerTest.java | 4 +- ...sactionCommittingResponseUnpackerTest.java | 4 +- .../neo4j/ha/upgrade/MasterClientTest.java | 4 +- .../dump/log/TransactionLogEntryCursor.java | 5 ++- .../log/TransactionLogEntryCursorTest.java | 8 ++-- 26 files changed, 84 insertions(+), 119 deletions(-) delete mode 100644 community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/log/entry/OnePhaseCommit.java diff --git a/community/kernel/src/main/java/org/neo4j/helpers/Format.java b/community/kernel/src/main/java/org/neo4j/helpers/Format.java index 81e98bd4e0245..f65e8a140686a 100644 --- a/community/kernel/src/main/java/org/neo4j/helpers/Format.java +++ b/community/kernel/src/main/java/org/neo4j/helpers/Format.java @@ -29,6 +29,20 @@ public class Format { + /** + * Default time zone is UTC (+00:00) so that comparing timestamped logs from different + * sources is an easier task. + */ + public static final TimeZone DEFAULT_TIME_ZONE = TimeZone.getTimeZone( "UTC" ); + public static final String DATE_FORMAT = "yyyy-MM-dd HH:mm:ss.SSSZ"; + public static final String TIME_FORMAT = "HH:mm:ss.SSS"; + + private static final String[] BYTE_SIZES = { "B", "kB", "MB", "GB" }; + + private static final ThreadLocalFormat DATE = new ThreadLocalFormat( DATE_FORMAT ); + private static final ThreadLocalFormat TIME = new ThreadLocalFormat( TIME_FORMAT ); + private static int KB = (int) ByteUnit.kibiBytes( 1 ); + public static String date() { return date( DEFAULT_TIME_ZONE ); @@ -89,8 +103,6 @@ public static String time( Date date, TimeZone timeZone ) return TIME.format( date, timeZone ); } - private static int KB = (int) ByteUnit.kibiBytes( 1 ); - public static String bytes( long bytes ) { double size = bytes; @@ -181,20 +193,6 @@ private Format() // No instances } - private static final String[] BYTE_SIZES = { "B", "kB", "MB", "GB" }; - - public static final String DATE_FORMAT = "yyyy-MM-dd HH:mm:ss.SSSZ"; - public static final String TIME_FORMAT = "HH:mm:ss.SSS"; - - /** - * Default time zone is UTC (+00:00) so that comparing timestamped logs from different - * sources is an easier task. - */ - public static final TimeZone DEFAULT_TIME_ZONE = TimeZone.getTimeZone( "UTC" ); - - private static final ThreadLocalFormat DATE = new ThreadLocalFormat( DATE_FORMAT ); - private static final ThreadLocalFormat TIME = new ThreadLocalFormat( TIME_FORMAT ); - private static class ThreadLocalFormat extends ThreadLocal { private final String format; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/log/PhysicalLogicalTransactionStore.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/log/PhysicalLogicalTransactionStore.java index 8318f0ee91b6d..1a3df5560cc1f 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/log/PhysicalLogicalTransactionStore.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/log/PhysicalLogicalTransactionStore.java @@ -37,7 +37,7 @@ import static org.neo4j.kernel.impl.transaction.log.TransactionIdStore.BASE_TX_CHECKSUM; import static org.neo4j.kernel.impl.transaction.log.TransactionIdStore.BASE_TX_COMMIT_TIMESTAMP; import static org.neo4j.kernel.impl.transaction.log.TransactionIdStore.BASE_TX_ID; -import static org.neo4j.kernel.impl.transaction.log.entry.LogEntryByteCodes.TX_1P_COMMIT; +import static org.neo4j.kernel.impl.transaction.log.entry.LogEntryByteCodes.TX_COMMIT; import static org.neo4j.kernel.impl.transaction.log.entry.LogEntryByteCodes.TX_START; public class PhysicalLogicalTransactionStore implements LogicalTransactionStore @@ -178,7 +178,7 @@ public boolean visit( LogPosition position, ReadableClosablePositionAwareChannel case TX_START: startEntry = logEntry.as(); break; - case TX_1P_COMMIT: + case TX_COMMIT: LogEntryCommit commit = logEntry.as(); if ( commit.getTxId() == startTransactionId ) { diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/log/entry/LogEntryByteCodes.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/log/entry/LogEntryByteCodes.java index ca7748fe7c5fc..06a09e39652ee 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/log/entry/LogEntryByteCodes.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/log/entry/LogEntryByteCodes.java @@ -29,6 +29,6 @@ private LogEntryByteCodes() // Real entries public static final byte TX_START = (byte) 1; public static final byte COMMAND = (byte) 3; - public static final byte TX_1P_COMMIT = (byte) 5; + public static final byte TX_COMMIT = (byte) 5; public static final byte CHECK_POINT = (byte) 7; } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/log/entry/LogEntryCommit.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/log/entry/LogEntryCommit.java index e35b1bcd5e872..7f899c506767a 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/log/entry/LogEntryCommit.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/log/entry/LogEntryCommit.java @@ -23,18 +23,26 @@ import org.neo4j.helpers.Format; -public abstract class LogEntryCommit extends AbstractLogEntry +import static org.neo4j.kernel.impl.transaction.log.entry.LogEntryByteCodes.TX_COMMIT; +import static org.neo4j.kernel.impl.transaction.log.entry.LogEntryVersion.CURRENT; + +public class LogEntryCommit extends AbstractLogEntry { private final long txId; private final long timeWritten; protected final String name; - LogEntryCommit( LogEntryVersion version, byte type, long txId, long timeWritten, String name ) + public LogEntryCommit( long txId, long timeWritten ) + { + this( CURRENT, txId, timeWritten ); + } + + public LogEntryCommit( LogEntryVersion version, long txId, long timeWritten ) { - super( version, type ); + super( version, TX_COMMIT ); this.txId = txId; this.timeWritten = timeWritten; - this.name = name; + this.name = "Commit"; } public long getTxId() @@ -59,6 +67,13 @@ public String toString( TimeZone timeZone ) return name + "[txId=" + getTxId() + ", " + timestamp( getTimeWritten(), timeZone ) + "]"; } + @Override + @SuppressWarnings( "unchecked" ) + public T as() + { + return (T) this; + } + @Override public boolean equals( Object o ) { diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/log/entry/LogEntryParsersV2_3.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/log/entry/LogEntryParsersV2_3.java index 4f0fcc54c13b1..b1176c18618a6 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/log/entry/LogEntryParsersV2_3.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/log/entry/LogEntryParsersV2_3.java @@ -84,7 +84,7 @@ public boolean skip() } }, - TX_1P_COMMIT + TX_COMMIT { @Override public LogEntry parse( LogEntryVersion version, ReadableClosableChannel channel, LogPositionMarker marker, @@ -92,13 +92,13 @@ public LogEntry parse( LogEntryVersion version, ReadableClosableChannel channel, { long txId = channel.getLong(); long timeWritten = channel.getLong(); - return new OnePhaseCommit( version, txId, timeWritten ); + return new LogEntryCommit( version, txId, timeWritten ); } @Override public byte byteCode() { - return LogEntryByteCodes.TX_1P_COMMIT; + return LogEntryByteCodes.TX_COMMIT; } @Override diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/log/entry/LogEntryWriter.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/log/entry/LogEntryWriter.java index a7b45d49229fd..0d872cfe7da63 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/log/entry/LogEntryWriter.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/log/entry/LogEntryWriter.java @@ -30,7 +30,7 @@ import static org.neo4j.kernel.impl.transaction.log.entry.LogEntryByteCodes.CHECK_POINT; import static org.neo4j.kernel.impl.transaction.log.entry.LogEntryByteCodes.COMMAND; -import static org.neo4j.kernel.impl.transaction.log.entry.LogEntryByteCodes.TX_1P_COMMIT; +import static org.neo4j.kernel.impl.transaction.log.entry.LogEntryByteCodes.TX_COMMIT; import static org.neo4j.kernel.impl.transaction.log.entry.LogEntryByteCodes.TX_START; import static org.neo4j.kernel.impl.transaction.log.entry.LogEntryVersion.CURRENT; @@ -64,7 +64,7 @@ public void writeStartEntry( int masterId, int authorId, long timeWritten, long public void writeCommitEntry( long transactionId, long timeWritten ) throws IOException { - writeLogEntryHeader( TX_1P_COMMIT ); + writeLogEntryHeader( TX_COMMIT ); channel.putLong( transactionId ).putLong( timeWritten ); } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/log/entry/OnePhaseCommit.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/log/entry/OnePhaseCommit.java deleted file mode 100644 index f480dc24e8109..0000000000000 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/log/entry/OnePhaseCommit.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright (c) 2002-2017 "Neo Technology," - * Network Engine for Objects in Lund AB [http://neotechnology.com] - * - * This file is part of Neo4j. - * - * Neo4j is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.neo4j.kernel.impl.transaction.log.entry; - -import static org.neo4j.kernel.impl.transaction.log.entry.LogEntryByteCodes.TX_1P_COMMIT; -import static org.neo4j.kernel.impl.transaction.log.entry.LogEntryVersion.CURRENT; - -public class OnePhaseCommit extends LogEntryCommit -{ - public OnePhaseCommit( long txId, long timeWritten ) - { - this( CURRENT, txId, timeWritten ); - } - - public OnePhaseCommit( LogEntryVersion version, long txId, long timeWritten ) - { - super( version, TX_1P_COMMIT, txId, timeWritten, "Commit" ); - } - - @Override - @SuppressWarnings( "unchecked" ) - public T as() - { - return (T) this; - } -} diff --git a/community/kernel/src/test/java/org/neo4j/kernel/RecoveryTest.java b/community/kernel/src/test/java/org/neo4j/kernel/RecoveryTest.java index 404b6c6a878c0..ead78c01e64b7 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/RecoveryTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/RecoveryTest.java @@ -51,10 +51,10 @@ import org.neo4j.kernel.impl.transaction.log.TransactionMetadataCache; import org.neo4j.kernel.impl.transaction.log.entry.CheckPoint; import org.neo4j.kernel.impl.transaction.log.entry.LogEntry; +import org.neo4j.kernel.impl.transaction.log.entry.LogEntryCommit; import org.neo4j.kernel.impl.transaction.log.entry.LogEntryReader; import org.neo4j.kernel.impl.transaction.log.entry.LogEntryStart; import org.neo4j.kernel.impl.transaction.log.entry.LogEntryWriter; -import org.neo4j.kernel.impl.transaction.log.entry.OnePhaseCommit; import org.neo4j.kernel.impl.transaction.log.entry.VersionAwareLogEntryReader; import org.neo4j.kernel.impl.util.monitoring.SilentProgressReporter; import org.neo4j.kernel.lifecycle.LifeSupport; @@ -123,7 +123,7 @@ public void shouldRecoverExistingData() throws Exception writer.writeStartEntry( 0, 1, 2L, 3L, new byte[0] ); lastCommittedTxStartEntry = new LogEntryStart( 0, 1, 2L, 3L, new byte[0], lastCommittedTxPosition ); writer.writeCommitEntry( 4L, 5L ); - lastCommittedTxCommitEntry = new OnePhaseCommit( 4L, 5L ); + lastCommittedTxCommitEntry = new LogEntryCommit( 4L, 5L ); // check point pointing to the previously committed transaction writer.writeCheckPointEntry( lastCommittedTxPosition ); @@ -135,7 +135,7 @@ public void shouldRecoverExistingData() throws Exception expectedStartEntry = new LogEntryStart( 0, 1, 6L, 4L, new byte[0], marker.newPosition() ); writer.writeCommitEntry( 5L, 7L ); - expectedCommitEntry = new OnePhaseCommit( 5L, 7L ); + expectedCommitEntry = new LogEntryCommit( 5L, 7L ); return true; } ); 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 b123d4da39379..c211fbf175503 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 @@ -36,7 +36,6 @@ import org.neo4j.kernel.impl.transaction.log.entry.LogEntryCommit; import org.neo4j.kernel.impl.transaction.log.entry.LogEntryReader; import org.neo4j.kernel.impl.transaction.log.entry.LogEntryStart; -import org.neo4j.kernel.impl.transaction.log.entry.OnePhaseCommit; import static java.util.Collections.singletonList; import static org.junit.Assert.assertEquals; @@ -56,7 +55,7 @@ public class PhysicalTransactionCursorTest private static final LogEntry NULL_ENTRY = null; private static final CheckPoint A_CHECK_POINT_ENTRY = new CheckPoint( LogPosition.UNSPECIFIED ); private static final LogEntryStart A_START_ENTRY = new LogEntryStart( 0, 0, 0L, 0L, null, LogPosition.UNSPECIFIED ); - private static final LogEntryCommit A_COMMIT_ENTRY = new OnePhaseCommit( 42, 0 ); + private static final LogEntryCommit A_COMMIT_ENTRY = new LogEntryCommit( 42, 0 ); private static final LogEntryCommand A_COMMAND_ENTRY = new LogEntryCommand( new Command.NodeCommand( new NodeRecord( 42 ), new NodeRecord( 42 ) ) ); private PhysicalTransactionCursor cursor; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/BatchingTransactionAppenderTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/BatchingTransactionAppenderTest.java index 85428f243a7d3..f43847830d32e 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/BatchingTransactionAppenderTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/BatchingTransactionAppenderTest.java @@ -36,7 +36,6 @@ import org.neo4j.kernel.impl.transaction.log.entry.LogEntryCommit; import org.neo4j.kernel.impl.transaction.log.entry.LogEntryReader; import org.neo4j.kernel.impl.transaction.log.entry.LogEntryStart; -import org.neo4j.kernel.impl.transaction.log.entry.OnePhaseCommit; import org.neo4j.kernel.impl.transaction.log.entry.VersionAwareLogEntryReader; import org.neo4j.kernel.impl.transaction.tracing.LogAppendEvent; import org.neo4j.kernel.impl.transaction.tracing.LogCheckPointEvent; @@ -165,7 +164,7 @@ public void shouldAppendCommittedTransactions() throws Exception LogEntryStart start = new LogEntryStart( 0, 0, 0L, latestCommittedTxWhenStarted, null, LogPosition.UNSPECIFIED ); - LogEntryCommit commit = new OnePhaseCommit( nextTxId, 0L ); + LogEntryCommit commit = new LogEntryCommit( nextTxId, 0L ); CommittedTransactionRepresentation transaction = new CommittedTransactionRepresentation( start, transactionRepresentation, commit ); @@ -213,7 +212,7 @@ public void shouldNotAppendCommittedTransactionsWhenTooFarAhead() throws Excepti LogEntryStart start = new LogEntryStart( 0, 0, 0L, latestCommittedTxWhenStarted, null, LogPosition.UNSPECIFIED ); - LogEntryCommit commit = new OnePhaseCommit( latestCommittedTxWhenStarted + 2, 0L ); + LogEntryCommit commit = new LogEntryCommit( latestCommittedTxWhenStarted + 2, 0L ); CommittedTransactionRepresentation transaction = new CommittedTransactionRepresentation( start, transactionRepresentation, commit ); diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/TransactionPositionLocatorTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/TransactionPositionLocatorTest.java index 0f332378b29dc..5aa42f5edcaf0 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/TransactionPositionLocatorTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/TransactionPositionLocatorTest.java @@ -29,7 +29,6 @@ import org.neo4j.kernel.impl.transaction.log.entry.LogEntryCommit; import org.neo4j.kernel.impl.transaction.log.entry.LogEntryReader; import org.neo4j.kernel.impl.transaction.log.entry.LogEntryStart; -import org.neo4j.kernel.impl.transaction.log.entry.OnePhaseCommit; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -52,7 +51,7 @@ public class TransactionPositionLocatorTest private final LogEntryStart start = new LogEntryStart( 0, 0, 0, 0, null, startPosition ); private final LogEntryCommand command = new LogEntryCommand( new Command.NodeCommand( new NodeRecord( 42 ), new NodeRecord( 42 ) ) ); - private final LogEntryCommit commit = new OnePhaseCommit( txId, System.currentTimeMillis() ); + private final LogEntryCommit commit = new LogEntryCommit( txId, System.currentTimeMillis() ); @Test public void shouldFindTransactionLogPosition() throws IOException diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/entry/LogEntryParserDispatcherV6Test.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/entry/LogEntryParserDispatcherV6Test.java index 7023413c98229..d7acb49b51ffb 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/entry/LogEntryParserDispatcherV6Test.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/entry/LogEntryParserDispatcherV6Test.java @@ -71,7 +71,7 @@ public void shouldParserStartEntry() throws IOException public void shouldParserOnePhaseCommitEntry() throws IOException { // given - final LogEntryCommit commit = new OnePhaseCommit( version, 42, 21 ); + final LogEntryCommit commit = new LogEntryCommit( version, 42, 21 ); final InMemoryClosableChannel channel = new InMemoryClosableChannel(); channel.putLong( commit.getTxId() ); @@ -80,7 +80,7 @@ public void shouldParserOnePhaseCommitEntry() throws IOException channel.getCurrentPosition( marker ); // when - final LogEntryParser parser = version.entryParser( LogEntryByteCodes.TX_1P_COMMIT ); + final LogEntryParser parser = version.entryParser( LogEntryByteCodes.TX_COMMIT ); final LogEntry logEntry = parser.parse( version, channel, marker, commandReader ); // then diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/entry/VersionAwareLogEntryReaderTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/entry/VersionAwareLogEntryReaderTest.java index 47779bb59a8dc..3228369021fea 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/entry/VersionAwareLogEntryReaderTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/entry/VersionAwareLogEntryReaderTest.java @@ -69,11 +69,11 @@ public void shouldReadACommitLogEntry() throws IOException { // given LogEntryVersion version = LogEntryVersion.CURRENT; - final LogEntryCommit commit = new OnePhaseCommit( version, 42, 21 ); + final LogEntryCommit commit = new LogEntryCommit( version, 42, 21 ); final InMemoryClosableChannel channel = new InMemoryClosableChannel(); channel.put( version.byteCode() ); - channel.put( LogEntryByteCodes.TX_1P_COMMIT ); + channel.put( LogEntryByteCodes.TX_COMMIT ); channel.putLong( commit.getTxId() ); channel.putLong( commit.getTimeWritten() ); diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/stresstest/TransactionAppenderStressTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/stresstest/TransactionAppenderStressTest.java index eb08bb46dfc04..481fa7964668e 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/stresstest/TransactionAppenderStressTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/stresstest/TransactionAppenderStressTest.java @@ -38,16 +38,14 @@ import org.neo4j.kernel.impl.transaction.log.TransactionIdStore; import org.neo4j.kernel.impl.transaction.log.entry.LogEntry; import org.neo4j.kernel.impl.transaction.log.entry.LogEntryByteCodes; +import org.neo4j.kernel.impl.transaction.log.entry.LogEntryCommit; import org.neo4j.kernel.impl.transaction.log.entry.LogEntryReader; -import org.neo4j.kernel.impl.transaction.log.entry.OnePhaseCommit; import org.neo4j.kernel.impl.transaction.log.entry.VersionAwareLogEntryReader; import org.neo4j.kernel.impl.transaction.log.stresstest.workload.Runner; import org.neo4j.test.rule.TestDirectory; -import static org.junit.Assert.assertEquals; - import static java.util.concurrent.TimeUnit.SECONDS; - +import static org.junit.Assert.assertEquals; import static org.neo4j.function.Suppliers.untilTimeExpired; public class TransactionAppenderStressTest @@ -126,9 +124,9 @@ public long parseAllTxLogs() throws IOException LogEntry logEntry = reader.readLogEntry( channel ); for ( ; logEntry != null; logEntry = reader.readLogEntry( channel ) ) { - if ( logEntry.getType() == LogEntryByteCodes.TX_1P_COMMIT ) + if ( logEntry.getType() == LogEntryByteCodes.TX_COMMIT ) { - txId = logEntry.as().getTxId(); + txId = logEntry.as().getTxId(); } } } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/recovery/RecoveryProgressIndicatorTest.java b/community/kernel/src/test/java/org/neo4j/kernel/recovery/RecoveryProgressIndicatorTest.java index 4807f7a2ac039..df8056c7b19c8 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/recovery/RecoveryProgressIndicatorTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/recovery/RecoveryProgressIndicatorTest.java @@ -28,7 +28,7 @@ import org.neo4j.kernel.impl.transaction.CommittedTransactionRepresentation; import org.neo4j.kernel.impl.transaction.log.LogPosition; import org.neo4j.kernel.impl.transaction.log.TransactionCursor; -import org.neo4j.kernel.impl.transaction.log.entry.OnePhaseCommit; +import org.neo4j.kernel.impl.transaction.log.entry.LogEntryCommit; import org.neo4j.kernel.impl.util.monitoring.ProgressReporter; import static org.junit.Assert.assertEquals; @@ -61,7 +61,7 @@ public void reportProgressOnRecovery() throws Throwable when( transactionCursor.next() ).thenAnswer( new NextTransactionAnswer( transactionsToRecover ) ); when( reverseTransactionCursor.get() ).thenReturn( transactionRepresentation ); when( transactionCursor.get() ).thenReturn( transactionRepresentation ); - when( transactionRepresentation.getCommitEntry() ).thenReturn( new OnePhaseCommit( lastCommittedTransactionId, 1L ) ); + when( transactionRepresentation.getCommitEntry() ).thenReturn( new LogEntryCommit( lastCommittedTransactionId, 1L ) ); when( recoveryService.getRecoveryStartInformation() ).thenReturn( startInformation ); when( recoveryService.getTransactionsInReverseOrder( recoveryStartPosition ) ).thenReturn( reverseTransactionCursor ); 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 ae1d2b94b4fb7..99340db9084b4 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 @@ -41,9 +41,9 @@ import org.neo4j.kernel.impl.transaction.log.entry.CheckPoint; import org.neo4j.kernel.impl.transaction.log.entry.LogEntry; import org.neo4j.kernel.impl.transaction.log.entry.LogEntryCommand; +import org.neo4j.kernel.impl.transaction.log.entry.LogEntryCommit; import org.neo4j.kernel.impl.transaction.log.entry.LogEntryStart; import org.neo4j.kernel.impl.transaction.log.entry.LogHeader; -import org.neo4j.kernel.impl.transaction.log.entry.OnePhaseCommit; import org.neo4j.kernel.impl.transaction.log.entry.VersionAwareLogEntryReader; import org.neo4j.kernel.impl.util.IOCursorAsResourceIterable; @@ -153,10 +153,10 @@ public void describeTo( Description description ) public static Matcher commitEntry( final long txId ) { - return new TypeSafeMatcher() + return new TypeSafeMatcher() { @Override - public boolean matchesSafely( OnePhaseCommit onePC ) + public boolean matchesSafely( LogEntryCommit onePC ) { return onePC != null && onePC.getTxId() == txId; } diff --git a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/catchup/tx/ChunkedTransactionStreamTest.java b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/catchup/tx/ChunkedTransactionStreamTest.java index 3c8f4957aa23a..6e6f3caede014 100644 --- a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/catchup/tx/ChunkedTransactionStreamTest.java +++ b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/catchup/tx/ChunkedTransactionStreamTest.java @@ -27,7 +27,7 @@ import org.neo4j.causalclustering.identity.StoreId; import org.neo4j.cursor.IOCursor; import org.neo4j.kernel.impl.transaction.CommittedTransactionRepresentation; -import org.neo4j.kernel.impl.transaction.log.entry.OnePhaseCommit; +import org.neo4j.kernel.impl.transaction.log.entry.LogEntryCommit; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -82,7 +82,7 @@ public void shouldStreamTransactions() throws Exception private CommittedTransactionRepresentation tx( long txId ) { CommittedTransactionRepresentation tx = mock( CommittedTransactionRepresentation.class ); - when( tx.getCommitEntry() ).thenReturn( new OnePhaseCommit( txId, 0 ) ); + when( tx.getCommitEntry() ).thenReturn( new LogEntryCommit( txId, 0 ) ); return tx; } } diff --git a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/catchup/tx/TransactionLogCatchUpWriterTest.java b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/catchup/tx/TransactionLogCatchUpWriterTest.java index 3e7e3905720f9..60f16eefb8c20 100644 --- a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/catchup/tx/TransactionLogCatchUpWriterTest.java +++ b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/catchup/tx/TransactionLogCatchUpWriterTest.java @@ -43,9 +43,9 @@ import org.neo4j.kernel.impl.transaction.log.ReadableClosablePositionAwareChannel; import org.neo4j.kernel.impl.transaction.log.ReadableLogChannel; import org.neo4j.kernel.impl.transaction.log.entry.InvalidLogEntryHandler; +import org.neo4j.kernel.impl.transaction.log.entry.LogEntryCommit; import org.neo4j.kernel.impl.transaction.log.entry.LogEntryReader; import org.neo4j.kernel.impl.transaction.log.entry.LogEntryStart; -import org.neo4j.kernel.impl.transaction.log.entry.OnePhaseCommit; import org.neo4j.kernel.impl.transaction.log.entry.VersionAwareLogEntryReader; import org.neo4j.kernel.lifecycle.Lifespan; import org.neo4j.kernel.monitoring.Monitors; @@ -178,6 +178,6 @@ private static CommittedTransactionRepresentation tx( int id ) { return new CommittedTransactionRepresentation( new LogEntryStart( id, id, id, id - 1, new byte[]{}, LogPosition.UNSPECIFIED ), - Commands.transactionRepresentation( createNode( 0 ) ), new OnePhaseCommit( id, id ) ); + Commands.transactionRepresentation( createNode( 0 ) ), new LogEntryCommit( id, id ) ); } } diff --git a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/catchup/tx/TxPullRequestHandlerTest.java b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/catchup/tx/TxPullRequestHandlerTest.java index a76a80dae8a29..8f3b74912da57 100644 --- a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/catchup/tx/TxPullRequestHandlerTest.java +++ b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/catchup/tx/TxPullRequestHandlerTest.java @@ -35,8 +35,8 @@ import org.neo4j.kernel.impl.transaction.log.NoSuchTransactionException; import org.neo4j.kernel.impl.transaction.log.TransactionCursor; import org.neo4j.kernel.impl.transaction.log.TransactionIdStore; +import org.neo4j.kernel.impl.transaction.log.entry.LogEntryCommit; import org.neo4j.kernel.impl.transaction.log.entry.LogEntryStart; -import org.neo4j.kernel.impl.transaction.log.entry.OnePhaseCommit; import org.neo4j.kernel.monitoring.Monitors; import org.neo4j.logging.AssertableLogProvider; @@ -163,7 +163,7 @@ private static CommittedTransactionRepresentation tx( int id ) { return new CommittedTransactionRepresentation( new LogEntryStart( id, id, id, id - 1, new byte[]{}, LogPosition.UNSPECIFIED ), - Commands.transactionRepresentation( createNode( 0 ) ), new OnePhaseCommit( id, id ) ); + Commands.transactionRepresentation( createNode( 0 ) ), new LogEntryCommit( id, id ) ); } private static TransactionCursor txCursor( Cursor cursor ) 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 df90a4ac18f83..6654ce404f22e 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 @@ -29,8 +29,8 @@ import org.neo4j.kernel.impl.transaction.log.LogPosition; import org.neo4j.kernel.impl.transaction.log.PhysicalTransactionRepresentation; import org.neo4j.kernel.impl.transaction.log.entry.LogEntryCommand; +import org.neo4j.kernel.impl.transaction.log.entry.LogEntryCommit; import org.neo4j.kernel.impl.transaction.log.entry.LogEntryStart; -import org.neo4j.kernel.impl.transaction.log.entry.OnePhaseCommit; import static java.util.Collections.singletonList; import static org.junit.Assert.assertEquals; @@ -67,7 +67,7 @@ private CommittedTransactionRepresentation newCommittedTransactionRepresentation physicalTransactionRepresentation.setHeader( new byte[]{}, 0, 0, 0, 0, 0, 0 ); LogEntryStart startEntry = new LogEntryStart( 0, 0, 0L, 0L, new byte[]{}, LogPosition.UNSPECIFIED ); - OnePhaseCommit commitEntry = new OnePhaseCommit( 42, 0 ); + LogEntryCommit commitEntry = new LogEntryCommit( 42, 0 ); return new CommittedTransactionRepresentation( startEntry, physicalTransactionRepresentation, commitEntry ); } diff --git a/enterprise/com/src/test/java/org/neo4j/com/MadeUpServerImplementation.java b/enterprise/com/src/test/java/org/neo4j/com/MadeUpServerImplementation.java index 5356ff399ee63..06d73f980843a 100644 --- a/enterprise/com/src/test/java/org/neo4j/com/MadeUpServerImplementation.java +++ b/enterprise/com/src/test/java/org/neo4j/com/MadeUpServerImplementation.java @@ -25,7 +25,6 @@ import java.util.ArrayList; import java.util.Collection; -import org.neo4j.helpers.collection.Visitor; import org.neo4j.kernel.impl.store.StoreId; import org.neo4j.kernel.impl.store.record.NodeRecord; import org.neo4j.kernel.impl.transaction.CommittedTransactionRepresentation; @@ -33,8 +32,8 @@ import org.neo4j.kernel.impl.transaction.command.Command.NodeCommand; import org.neo4j.kernel.impl.transaction.log.PhysicalTransactionRepresentation; import org.neo4j.kernel.impl.transaction.log.TransactionIdStore; +import org.neo4j.kernel.impl.transaction.log.entry.LogEntryCommit; import org.neo4j.kernel.impl.transaction.log.entry.LogEntryStart; -import org.neo4j.kernel.impl.transaction.log.entry.OnePhaseCommit; import org.neo4j.storageengine.api.StorageCommand; public class MadeUpServerImplementation implements MadeUpCommunicationInterface @@ -106,7 +105,7 @@ protected CommittedTransactionRepresentation createTransaction( long txId ) return new CommittedTransactionRepresentation( new LogEntryStart( 0, 0, 0, 0, new byte[0], null ), transaction( txId ), - new OnePhaseCommit( txId, 0 ) ); + new LogEntryCommit( txId, 0 ) ); } private TransactionRepresentation transaction( long txId ) diff --git a/enterprise/com/src/test/java/org/neo4j/com/storecopy/ResponsePackerTest.java b/enterprise/com/src/test/java/org/neo4j/com/storecopy/ResponsePackerTest.java index 66edf9214c99a..7bb1baed280cf 100644 --- a/enterprise/com/src/test/java/org/neo4j/com/storecopy/ResponsePackerTest.java +++ b/enterprise/com/src/test/java/org/neo4j/com/storecopy/ResponsePackerTest.java @@ -35,7 +35,7 @@ import org.neo4j.kernel.impl.transaction.log.LogicalTransactionStore; import org.neo4j.kernel.impl.transaction.log.TransactionCursor; import org.neo4j.kernel.impl.transaction.log.TransactionIdStore; -import org.neo4j.kernel.impl.transaction.log.entry.OnePhaseCommit; +import org.neo4j.kernel.impl.transaction.log.entry.LogEntryCommit; import static org.hamcrest.Matchers.lessThanOrEqualTo; import static org.junit.Assert.assertEquals; @@ -124,7 +124,7 @@ public CommittedTransactionRepresentation get() public boolean next() throws IOException { transaction = new CommittedTransactionRepresentation( null, null, - new OnePhaseCommit( txId++, 0 ) ); + new LogEntryCommit( txId++, 0 ) ); return true; } diff --git a/enterprise/com/src/test/java/org/neo4j/com/storecopy/TransactionCommittingResponseUnpackerTest.java b/enterprise/com/src/test/java/org/neo4j/com/storecopy/TransactionCommittingResponseUnpackerTest.java index a003df4c0d27a..d15d9cf5f4ba0 100644 --- a/enterprise/com/src/test/java/org/neo4j/com/storecopy/TransactionCommittingResponseUnpackerTest.java +++ b/enterprise/com/src/test/java/org/neo4j/com/storecopy/TransactionCommittingResponseUnpackerTest.java @@ -40,8 +40,8 @@ import org.neo4j.kernel.impl.store.StoreId; import org.neo4j.kernel.impl.transaction.CommittedTransactionRepresentation; import org.neo4j.kernel.impl.transaction.log.PhysicalTransactionRepresentation; +import org.neo4j.kernel.impl.transaction.log.entry.LogEntryCommit; import org.neo4j.kernel.impl.transaction.log.entry.LogEntryStart; -import org.neo4j.kernel.impl.transaction.log.entry.OnePhaseCommit; import org.neo4j.kernel.impl.transaction.tracing.CommitEvent; import org.neo4j.kernel.lifecycle.LifeRule; import org.neo4j.storageengine.api.TransactionApplicationMode; @@ -175,7 +175,7 @@ private CommittedTransactionRepresentation tx( long id, long commitTimestamp ) return new CommittedTransactionRepresentation( new LogEntryStart( 0, 0, 0, 0, new byte[0], UNSPECIFIED ), representation, - new OnePhaseCommit( id, commitTimestamp ) ); + new LogEntryCommit( id, commitTimestamp ) ); } private long timestamp( int txNbr, int txCount, long batchLength ) diff --git a/enterprise/ha/src/test/java/org/neo4j/ha/upgrade/MasterClientTest.java b/enterprise/ha/src/test/java/org/neo4j/ha/upgrade/MasterClientTest.java index 1ecc18aa50c34..2447e9714a86d 100644 --- a/enterprise/ha/src/test/java/org/neo4j/ha/upgrade/MasterClientTest.java +++ b/enterprise/ha/src/test/java/org/neo4j/ha/upgrade/MasterClientTest.java @@ -56,9 +56,9 @@ import org.neo4j.kernel.impl.transaction.command.Commands; import org.neo4j.kernel.impl.transaction.log.LogPosition; import org.neo4j.kernel.impl.transaction.log.ReadableClosablePositionAwareChannel; +import org.neo4j.kernel.impl.transaction.log.entry.LogEntryCommit; import org.neo4j.kernel.impl.transaction.log.entry.LogEntryReader; import org.neo4j.kernel.impl.transaction.log.entry.LogEntryStart; -import org.neo4j.kernel.impl.transaction.log.entry.OnePhaseCommit; import org.neo4j.kernel.impl.transaction.log.entry.VersionAwareLogEntryReader; import org.neo4j.kernel.impl.transaction.tracing.CommitEvent; import org.neo4j.kernel.lifecycle.LifeRule; @@ -231,7 +231,7 @@ private static CommittedTransactionRepresentation committedTransactionRepresenta return new CommittedTransactionRepresentation( new LogEntryStart( id, id, id, id - 1, new byte[]{}, LogPosition.UNSPECIFIED ), Commands.transactionRepresentation( createNode( 0 ) ), - new OnePhaseCommit( id, id ) ); + new LogEntryCommit( id, id ) ); } private static Config masterConfig() diff --git a/tools/src/main/java/org/neo4j/tools/dump/log/TransactionLogEntryCursor.java b/tools/src/main/java/org/neo4j/tools/dump/log/TransactionLogEntryCursor.java index b78d70b9120e4..0f770f3958ada 100644 --- a/tools/src/main/java/org/neo4j/tools/dump/log/TransactionLogEntryCursor.java +++ b/tools/src/main/java/org/neo4j/tools/dump/log/TransactionLogEntryCursor.java @@ -25,8 +25,9 @@ import org.neo4j.cursor.IOCursor; import org.neo4j.kernel.impl.transaction.log.entry.LogEntry; + import static org.neo4j.kernel.impl.transaction.log.entry.LogEntryByteCodes.CHECK_POINT; -import static org.neo4j.kernel.impl.transaction.log.entry.LogEntryByteCodes.TX_1P_COMMIT; +import static org.neo4j.kernel.impl.transaction.log.entry.LogEntryByteCodes.TX_COMMIT; /** * Groups {@link LogEntry} instances transaction by transaction @@ -67,7 +68,7 @@ public boolean next() throws IOException private static boolean isBreakPoint( LogEntry entry ) { byte type = entry.getType(); - return type == TX_1P_COMMIT || type == CHECK_POINT; + return type == TX_COMMIT || type == CHECK_POINT; } @Override diff --git a/tools/src/test/java/org/neo4j/tools/dump/log/TransactionLogEntryCursorTest.java b/tools/src/test/java/org/neo4j/tools/dump/log/TransactionLogEntryCursorTest.java index a660ee98cd13e..955cb1ba15202 100644 --- a/tools/src/test/java/org/neo4j/tools/dump/log/TransactionLogEntryCursorTest.java +++ b/tools/src/test/java/org/neo4j/tools/dump/log/TransactionLogEntryCursorTest.java @@ -40,7 +40,7 @@ import static org.mockito.Mockito.when; import static org.neo4j.kernel.impl.transaction.log.entry.LogEntryByteCodes.CHECK_POINT; import static org.neo4j.kernel.impl.transaction.log.entry.LogEntryByteCodes.COMMAND; -import static org.neo4j.kernel.impl.transaction.log.entry.LogEntryByteCodes.TX_1P_COMMIT; +import static org.neo4j.kernel.impl.transaction.log.entry.LogEntryByteCodes.TX_COMMIT; import static org.neo4j.kernel.impl.transaction.log.entry.LogEntryByteCodes.TX_START; public class TransactionLogEntryCursorTest @@ -50,10 +50,10 @@ public void shouldDeliverIntactTransactions() throws IOException { // GIVEN // tx 1 - List tx1 = makeTransaction( TX_START, COMMAND, TX_1P_COMMIT ); + List tx1 = makeTransaction( TX_START, COMMAND, TX_COMMIT ); // tx 2 - List tx2 = makeTransaction( TX_START, COMMAND, COMMAND, TX_1P_COMMIT ); + List tx2 = makeTransaction( TX_START, COMMAND, COMMAND, TX_COMMIT ); // All transactions @@ -78,7 +78,7 @@ public void deliverTransactionsWithoutEnd() throws IOException { // GIVEN // tx 1 - List tx1 = makeTransaction( TX_START, COMMAND, COMMAND, COMMAND, TX_1P_COMMIT ); + List tx1 = makeTransaction( TX_START, COMMAND, COMMAND, COMMAND, TX_COMMIT ); // tx 2 List tx2 = makeTransaction( TX_START, COMMAND, COMMAND );