Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Seek to the first one >= timestamp #6393

Merged
merged 3 commits into from
Feb 24, 2020
Merged

Seek to the first one >= timestamp #6393

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
251aa3c
seek to the first one >= timestamp
yjshen Feb 21, 2020
ce81080
Merge remote-tracking branch 'apache/master' into seek_by_time
yjshen Feb 22, 2020
e4be69a
fix test of wrong boundary
yjshen Feb 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...er/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentMessageFinder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ public void findMessages(final long timestamp, AsyncCallbacks.FindEntryCallback
MessageImpl msg = null;
try {
msg = MessageImpl.deserialize(entry.getDataBuffer());
return msg.getPublishTime() <= timestamp;
return msg.getPublishTime() < timestamp;
} catch (Exception e) {
log.error("[{}][{}] Error deserializing message for message position find", topicName, subName, e);
} finally {
Expand Down
2 changes: 1 addition & 1 deletion ...ker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentSubscription.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -654,7 +654,7 @@ public void findEntryComplete(Position position, Object ctx) {
"[{}][{}] Unable to find position for timestamp {}. Resetting cursor to first position {} in ledger",
topicName, subName, timestamp, finalPosition);
} else {
finalPosition = position;
finalPosition = position.getNext();
}
resetCursor(finalPosition, future);
}
Expand Down
22 changes: 11 additions & 11 deletions pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1595,14 +1595,14 @@ public void persistentTopicsCursorReset(String topicName) throws Exception {

int receivedAfterReset = 0;

for (int i = 4; i < 10; i++) {
for (int i = 5; i < 10; i++) {
Message<byte[]> message = consumer.receive();
consumer.acknowledge(message);
++receivedAfterReset;
String expected = "message-" + i;
assertEquals(message.getData(), expected.getBytes());
}
assertEquals(receivedAfterReset, 6);
assertEquals(receivedAfterReset, 5);

consumer.close();

Expand Down Expand Up @@ -1654,29 +1654,29 @@ public void persistentTopicsCursorResetAfterReset(String topicName) throws Excep

int receivedAfterReset = 0;

// Should received messages from 4-9
for (int i = 4; i < 10; i++) {
// Should received messages from 5-9
for (int i = 5; i < 10; i++) {
Message<byte[]> message = consumer.receive();
consumer.acknowledge(message);
++receivedAfterReset;
String expected = "message-" + i;
assertEquals(new String(message.getData()), expected);
}
assertEquals(receivedAfterReset, 6);
assertEquals(receivedAfterReset, 5);

// Reset at 2nd timestamp
receivedAfterReset = 0;
admin.topics().resetCursor(topicName, "my-sub", secondTimestamp);

// Should received messages from 7-9
for (int i = 7; i < 10; i++) {
// Should received messages from 8-9
for (int i = 8; i < 10; i++) {
Message<byte[]> message = consumer.receive();
consumer.acknowledge(message);
++receivedAfterReset;
String expected = "message-" + i;
assertEquals(new String(message.getData()), expected);
}
assertEquals(receivedAfterReset, 3);
assertEquals(receivedAfterReset, 2);

consumer.close();
admin.topics().deleteSubscription(topicName, "my-sub");
Expand Down Expand Up @@ -1724,14 +1724,14 @@ public void persistentTopicsCursorResetAndFailover() throws Exception {
.acknowledgmentGroupTime(0, TimeUnit.SECONDS).subscribe();

int receivedAfterReset = 0;
for (int i = 4; i < 10; i++) {
for (int i = 5; i < 10; i++) {
Message<byte[]> message = consumerA.receive(5, TimeUnit.SECONDS);
consumerA.acknowledge(message);
++receivedAfterReset;
String expected = "message-" + i;
assertEquals(message.getData(), expected.getBytes());
}
assertEquals(receivedAfterReset, 6);
assertEquals(receivedAfterReset, 5);

// Closing consumerA activates consumerB
consumerA.close();
Expand Down Expand Up @@ -1787,7 +1787,7 @@ public void partitionedTopicsCursorReset(String topicName) throws Exception {

Set<String> expectedMessages = Sets.newHashSet();
Set<String> receivedMessages = Sets.newHashSet();
for (int i = 4; i < 10; i++) {
for (int i = 5; i < 10; i++) {
Message<byte[]> message = consumer.receive();
consumer.acknowledge(message);
expectedMessages.add("message-" + i);
Expand Down
18 changes: 9 additions & 9 deletions pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/v1/V1_AdminApiTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1490,14 +1490,14 @@ public void persistentTopicsCursorReset(String topicName) throws Exception {

int receivedAfterReset = 0;

for (int i = 4; i < 10; i++) {
for (int i = 5; i < 10; i++) {
Message<byte[]> message = consumer.receive();
consumer.acknowledge(message);
++receivedAfterReset;
String expected = "message-" + i;
assertEquals(message.getData(), expected.getBytes());
}
assertEquals(receivedAfterReset, 6);
assertEquals(receivedAfterReset, 5);

consumer.close();

Expand Down Expand Up @@ -1549,29 +1549,29 @@ public void persistentTopicsCursorResetAfterReset(String topicName) throws Excep

int receivedAfterReset = 0;

// Should received messages from 4-9
for (int i = 4; i < 10; i++) {
// Should received messages from 5-9
for (int i = 5; i < 10; i++) {
Message<byte[]> message = consumer.receive();
consumer.acknowledge(message);
++receivedAfterReset;
String expected = "message-" + i;
assertEquals(new String(message.getData()), expected);
}
assertEquals(receivedAfterReset, 6);
assertEquals(receivedAfterReset, 5);

// Reset at 2nd timestamp
receivedAfterReset = 0;
admin.topics().resetCursor(topicName, "my-sub", secondTimestamp);

// Should received messages from 7-9
for (int i = 7; i < 10; i++) {
// Should received messages from 8-9
for (int i = 8; i < 10; i++) {
Message<byte[]> message = consumer.receive();
consumer.acknowledge(message);
++receivedAfterReset;
String expected = "message-" + i;
assertEquals(new String(message.getData()), expected);
}
assertEquals(receivedAfterReset, 3);
assertEquals(receivedAfterReset, 2);

consumer.close();
admin.topics().deleteSubscription(topicName, "my-sub");
Expand Down Expand Up @@ -1614,7 +1614,7 @@ public void partitionedTopicsCursorReset(String topicName) throws Exception {

Set<String> expectedMessages = Sets.newHashSet();
Set<String> receivedMessages = Sets.newHashSet();
for (int i = 4; i < 10; i++) {
for (int i = 5; i < 10; i++) {
Message<byte[]> message = consumer.receive();
consumer.acknowledge(message);
expectedMessages.add("message-" + i);
Expand Down
4 changes: 2 additions & 2 deletions pulsar-broker/src/test/java/org/apache/pulsar/broker/service/SubscriptionSeekTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ public void testSeekTime() throws Exception {

long currentTimestamp = System.currentTimeMillis();
consumer.seek(currentTimestamp);
assertEquals(sub.getNumberOfEntriesInBacklog(false), 1);
assertEquals(sub.getNumberOfEntriesInBacklog(false), 0);

// Wait for consumer to reconnect
Thread.sleep(1000);
Expand Down Expand Up @@ -187,7 +187,7 @@ public void testSeekTimeOnPartitionedTopic() throws Exception {
for (PersistentSubscription sub : subs) {
backlogs += sub.getNumberOfEntriesInBacklog(false);
}
assertEquals(backlogs, 2);
assertEquals(backlogs, 0);

// Wait for consumer to reconnect
Thread.sleep(1000);
Expand Down
2 changes: 1 addition & 1 deletion pulsar-broker/src/test/java/org/apache/pulsar/client/api/TopicReaderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -676,7 +676,7 @@ public void testReaderIsAbleToSeekWithTimeOnMiddleOfTopic() throws Exception {
reader.seek(l + plusTime);

Set<String> messageSet = Sets.newHashSet();
for (int i = halfMessages; i < numOfMessage; i++) {
for (int i = halfMessages + 1; i < numOfMessage; i++) {
Message<byte[]> message = reader.readNext();
String receivedMessage = new String(message.getData());
String expectedMessage = String.format("msg num %d", i);
Expand Down
4 changes: 2 additions & 2 deletions pulsar-broker/src/test/java/org/apache/pulsar/client/impl/ReaderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,8 +256,8 @@ public void testReaderWithTimeLong() throws Exception {
receivedMessageIds.add(msg.getMessageId());
}

assertEquals(receivedMessageIds.size(), totalMsg + 1);
assertEquals(receivedMessageIds.get(0), lastMsgId);
assertEquals(receivedMessageIds.size(), totalMsg);
assertEquals(receivedMessageIds.get(0), firstMsgId);

restartBroker();

Expand Down