diff --git a/modules/accord b/modules/accord index 527094c69a..37c957c719 160000 --- a/modules/accord +++ b/modules/accord @@ -1 +1 @@ -Subproject commit 527094c69ad23319b058917b1c8974d01c5d86e6 +Subproject commit 37c957c719491634f081b39900ebf708079ef3ee diff --git a/src/java/org/apache/cassandra/index/accord/CheckpointIntervalArrayIndex.java b/src/java/org/apache/cassandra/index/accord/CheckpointIntervalArrayIndex.java index 411c3fb5ec..664fe16093 100644 --- a/src/java/org/apache/cassandra/index/accord/CheckpointIntervalArrayIndex.java +++ b/src/java/org/apache/cassandra/index/accord/CheckpointIntervalArrayIndex.java @@ -615,6 +615,8 @@ public class CheckpointIntervalArrayIndex }, (i1, i2, i3, i4, startIdx, endIdx) -> { try { + if (startIdx == endIdx) + return; reader.maybeSeek(indexInput, stats, SortedListReader.SeekReason.SCAN, reader.fileOffsetStart(startIdx)); for (int i = startIdx; i < endIdx; i++) { diff --git a/src/java/org/apache/cassandra/service/accord/serializers/ReadDataSerializers.java b/src/java/org/apache/cassandra/service/accord/serializers/ReadDataSerializers.java index 163e8f65f2..00728a68f9 100644 --- a/src/java/org/apache/cassandra/service/accord/serializers/ReadDataSerializers.java +++ b/src/java/org/apache/cassandra/service/accord/serializers/ReadDataSerializers.java @@ -81,7 +81,6 @@ public class ReadDataSerializers { CommandSerializers.txnId.serialize(msg.txnId, out, version); KeySerializers.participants.serialize(msg.readScope, out, version); - out.writeUnsignedVInt(msg.executeAtEpoch); CommandSerializers.timestamp.serialize(msg.executeAt, out, version); KeySerializers.fullRoute.serialize(msg.route, out, version); CommandSerializers.partialTxn.serialize(msg.txn, out, version); @@ -97,7 +96,6 @@ public class ReadDataSerializers return ApplyThenWaitUntilApplied.SerializerSupport.create( CommandSerializers.txnId.deserialize(in, version), KeySerializers.participants.deserialize(in, version), - in.readUnsignedVInt(), CommandSerializers.timestamp.deserialize(in, version), KeySerializers.fullRoute.deserialize(in, version), CommandSerializers.partialTxn.deserialize(in, version), @@ -112,7 +110,6 @@ public class ReadDataSerializers { return CommandSerializers.txnId.serializedSize(msg.txnId, version) + KeySerializers.participants.serializedSize(msg.readScope, version) - + TypeSizes.sizeofUnsignedVInt(msg.executeAtEpoch) + CommandSerializers.timestamp.serializedSize(msg.executeAt, version) + KeySerializers.fullRoute.serializedSize(msg.route, version) + CommandSerializers.partialTxn.serializedSize(msg.txn, version)