mirror of https://github.com/apache/cassandra
Fix ReadCommand serializedSize() using incorrect epoch
patch by Aleksey Yeschenko; reviewed by Alex Petrov for CASSANDRA-21438
This commit is contained in:
parent
f67f4ead45
commit
ef6367ed10
|
|
@ -1,4 +1,5 @@
|
|||
6.0-alpha2
|
||||
* Fix ReadCommand serializedSize() using incorrect epoch (CASSANDRA-21438)
|
||||
* Allocation improvements in ProtocolVersion, StorageProxy and MerkleTree (CASSANDRA-21199)
|
||||
* Don’t leave autocompaction disabled during bootstrap and replace (CASSANDRA-21236)
|
||||
* Make nodetool abortbootstrap more robust (CASSANDRA-21235)
|
||||
|
|
|
|||
|
|
@ -1520,7 +1520,7 @@ public abstract class ReadCommand extends AbstractReadQuery
|
|||
return 2 // kind + flags
|
||||
+ (command.isDigestQuery() ? TypeSizes.sizeofUnsignedVInt(command.digestVersion()) : 0)
|
||||
+ command.metadata().id.serializedSize()
|
||||
+ (version >= MessagingService.VERSION_60 ? Epoch.serializer.serializedSize(command.metadata().epoch) : 0)
|
||||
+ (version >= MessagingService.VERSION_60 ? Epoch.serializer.serializedSize(command.serializedAtEpoch) : 0)
|
||||
+ TypeSizes.INT_SIZE // command.nowInSec() is serialized as uint
|
||||
+ ColumnFilter.serializer.serializedSize(command.columnFilter(), version)
|
||||
+ RowFilter.serializer.serializedSize(command.rowFilter(), version)
|
||||
|
|
|
|||
Loading…
Reference in New Issue