Enhance compareTo

BewareMyPower · BewareMyPower · commit c48ab8661701 · 2022-11-21T14:21:28.000+08:00
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/PersistentAcknowledgmentsGroupingTracker.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/PersistentAcknowledgmentsGroupingTracker.java
@@ -663,13 +663,18 @@ public synchronized void reset() {
     }
 
     public synchronized int compareTo(MessageId messageId) {
-        // The position of a message in the batch (BatchMessageIdImpl) must precede the batch itself (MessageIdImpl)
         if (this.messageId instanceof BatchMessageIdImpl && (!(messageId instanceof BatchMessageIdImpl))) {
-            int result = ((BatchMessageIdImpl) this.messageId).toMessageIdImpl().compareTo(messageId);
-            return (result == 0) ? -1 : result;
+            final BatchMessageIdImpl lhs = (BatchMessageIdImpl) this.messageId;
+            final MessageIdImpl rhs = (MessageIdImpl) messageId;
+            return MessageIdImpl.messageIdCompare(
+                    lhs.getLedgerId(), lhs.getEntryId(), lhs.getPartitionIndex(), lhs.getBatchIndex(),
+                    rhs.getLedgerId(), rhs.getEntryId(), rhs.getPartitionIndex(), Integer.MAX_VALUE);
         } else if (messageId instanceof BatchMessageIdImpl && (!(this.messageId instanceof BatchMessageIdImpl))){
-            int result = this.messageId.compareTo(((BatchMessageIdImpl) messageId).toMessageIdImpl());
-            return (result == 0) ? 1 : result;
+            final MessageIdImpl lhs = this.messageId;
+            final BatchMessageIdImpl rhs = (BatchMessageIdImpl) messageId;
+            return MessageIdImpl.messageIdCompare(
+                    lhs.getLedgerId(), lhs.getEntryId(), lhs.getPartitionIndex(), Integer.MAX_VALUE,
+                    rhs.getLedgerId(), rhs.getEntryId(), rhs.getPartitionIndex(), rhs.getBatchIndex());
         } else {
             return this.messageId.compareTo(messageId);
         }
