Skip to content

[ISSUE #S5] Clamp negative maxNum in IndexService.queryOffset #11099

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

Open
zjncs wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

[ISSUE #S5] Clamp negative maxNum in IndexService.queryOffset #11099

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 4 additions & 1 deletion store/src/main/java/org/apache/rocketmq/store/index/IndexService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,10 @@ public QueryOffsetResult queryOffset(String topic, String key, int maxNum, long
public QueryOffsetResult queryOffset(String topic, String key, int maxNum, long begin, long end, String indexType) {
long indexLastUpdateTimestamp = 0;
long indexLastUpdatePhyoffset = 0;
maxNum = Math.min(maxNum, this.defaultMessageStore.getMessageStoreConfig().getMaxMsgsNumBatch());
// maxNum comes from the request header and is only checked for null,
// so a negative value must be clamped here instead of blowing up the
// ArrayList allocation below with an IllegalArgumentException.
maxNum = Math.min(Math.max(maxNum, 0), this.defaultMessageStore.getMessageStoreConfig().getMaxMsgsNumBatch());
List<Long> phyOffsets = new ArrayList<>(maxNum);
try {
this.readWriteLock.readLock().lock();
Expand Down
7 changes: 7 additions & 0 deletions store/src/test/java/org/apache/rocketmq/store/index/IndexServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,4 +81,11 @@ public void testQueryOffsetWithZeroMaxNum() {
assertNotNull(result);
assertEquals(Collections.emptyList(), result.getPhyOffsets());
}

@Test
public void testQueryOffsetWithNegativeMaxNum() {
QueryOffsetResult result = indexService.queryOffset("test", "testKey", -1, 0, 100);
assertNotNull(result);
assertEquals(Collections.emptyList(), result.getPhyOffsets());
}
}