Use int64 for timestamp

apache · Apr 18, 2019 · 52832fe · 52832fe
1 parent d5e1ebc
commit 52832fe
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/...va/org/apache/pulsar/broker/service/persistent/PersistentDispatcherMultipleConsumers.java b/...va/org/apache/pulsar/broker/service/persistent/PersistentDispatcherMultipleConsumers.java
@@ -688,7 +688,7 @@ private boolean hasMessagesToReplay() {
         return false;
     }
 
-    private Set<PositionImpl> getMessagesToReplayNow(int maxMessagesToRead) {
+    private synchronized Set<PositionImpl> getMessagesToReplayNow(int maxMessagesToRead) {
         if (!messagesToRedeliver.isEmpty()) {
             return messagesToRedeliver.items(maxMessagesToRead,
                     (ledgerId, entryId) -> new PositionImpl(ledgerId, entryId));
@@ -697,7 +697,7 @@ private Set<PositionImpl> getMessagesToReplayNow(int maxMessagesToRead) {
         }
     }
 
-    public long getNumberOfDelayedMessages() {
+    public synchronized long getNumberOfDelayedMessages() {
         if (delayedDeliveryTracker.isPresent()) {
             return delayedDeliveryTracker.get().getNumberOfDelayedMessages();
         } else {

diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/api/proto/PulsarApi.java b/pulsar-common/src/main/java/org/apache/pulsar/common/api/proto/PulsarApi.java
diff --git a/pulsar-common/src/main/proto/PulsarApi.proto b/pulsar-common/src/main/proto/PulsarApi.proto
@@ -114,7 +114,7 @@ message MessageMetadata {
 	optional bool partition_key_b64_encoded = 17 [ default = false ];
 
 	// Mark the message to be delivered at or after the specified timestamp
-	optional uint64 deliver_at_time = 18;
+	optional int64 deliver_at_time = 18;
 }