bereng commented on code in PR #2464:
URL: https://github.com/apache/cassandra/pull/2464#discussion_r1271909923
##########
src/java/org/apache/cassandra/db/DeletionTime.java:
##########
@@ -195,42 +195,90 @@ public static Serializer getSerializer(Version version)
return legacySerializer;
}
- // Serializer for Usigned Integer ldt
+ /* Serializer for Usigned Integer ldt
+ *
+ * ldt is encoded as a uint in seconds since unix epoch, it can go up o
2106-02-07T06:28:13+00:00 only.
+ * mfda is a positive timestamp. We use the sign bit to enconde LIVE
DeletionTimes
+ */
public static class Serializer implements ISerializer<DeletionTime>
{
+ // We use the sign bit to signal LIVE DeletionTimes
+ private final static int IS_LIVE_DELETION = 0b1000_0000;
+
public void serialize(DeletionTime delTime, DataOutputPlus out) throws
IOException
{
- out.writeInt(delTime.localDeletionTimeUnsignedInteger);
- out.writeLong(delTime.markedForDeleteAt());
+ if (delTime == LIVE)
+ out.writeByte(IS_LIVE_DELETION);
+ else
+ {
+ // The sign bit is zero here, so we can write a long directly
+ out.writeLong(delTime.markedForDeleteAt());
+ out.writeInt(delTime.localDeletionTimeUnsignedInteger);
+ }
}
public DeletionTime deserialize(DataInputPlus in) throws IOException
{
- int localDeletionTimeUnsignedInteger = in.readInt();
- long mfda = in.readLong();
- return mfda == Long.MIN_VALUE && localDeletionTimeUnsignedInteger
== Cell.NO_DELETION_TIME_UNSIGNED_INTEGER
- ? LIVE
- : new DeletionTime(mfda, localDeletionTimeUnsignedInteger);
+ int flags = in.readByte();
+ if ((flags & IS_LIVE_DELETION) != 0)
+ return LIVE;
+ else
+ {
+ // Read the remaining 7 bytes
+ int bytes1 = in.readByte();
+ int bytes2 = in.readShort();
+ int bytes4 = in.readInt();
+
+ long mfda = readBytesToMFDA(flags, bytes1, bytes2, bytes4);
+ int localDeletionTimeUnsignedInteger = in.readInt();
+
+ return new DeletionTime(mfda,
localDeletionTimeUnsignedInteger);
+ }
}
public DeletionTime deserialize(ByteBuffer buf, int offset)
{
- int localDeletionTimeUnsignedInteger = buf.getInt(offset);
- long mfda = buf.getLong(offset + 4);
- return mfda == Long.MIN_VALUE && localDeletionTimeUnsignedInteger
== Cell.NO_DELETION_TIME_UNSIGNED_INTEGER
- ? LIVE
- : new DeletionTime(mfda, localDeletionTimeUnsignedInteger);
+ int flags = buf.get(offset);
+ if ((flags & IS_LIVE_DELETION) != 0)
+ return LIVE;
+ else
+ {
+ long mfda = buf.getLong(offset);
+ int localDeletionTimeUnsignedInteger = buf.getInt(offset + 8);
Review Comment:
^Yes yes and yes. I hate magic numbers.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
