This is an automated email from the ASF dual-hosted git repository.
lizhimin pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/rocketmq.git
The following commit(s) were added to refs/heads/develop by this push:
new 62be041617 [ISSUE #7948] Prevent invoking the queryMessage method lead
to OOM (#9265)
62be041617 is described below
commit 62be0416179344c02a19dc0d15421d2dbfdab3ba
Author: half <[email protected]>
AuthorDate: Wed Mar 26 10:31:02 2025 +0800
[ISSUE #7948] Prevent invoking the queryMessage method lead to OOM (#9265)
Co-authored-by: yangxiaohui <[email protected]>
---
.../apache/rocketmq/store/index/IndexService.java | 3 +-
.../rocketmq/store/index/IndexServiceTest.java | 49 ++++++++++++++++++++++
2 files changed, 50 insertions(+), 2 deletions(-)
diff --git
a/store/src/main/java/org/apache/rocketmq/store/index/IndexService.java
b/store/src/main/java/org/apache/rocketmq/store/index/IndexService.java
index ef5d21ac7c..2d325ee13a 100644
--- a/store/src/main/java/org/apache/rocketmq/store/index/IndexService.java
+++ b/store/src/main/java/org/apache/rocketmq/store/index/IndexService.java
@@ -164,11 +164,10 @@ public class IndexService {
}
public QueryOffsetResult queryOffset(String topic, String key, int maxNum,
long begin, long end) {
- List<Long> phyOffsets = new ArrayList<>(maxNum);
-
long indexLastUpdateTimestamp = 0;
long indexLastUpdatePhyoffset = 0;
maxNum = Math.min(maxNum,
this.defaultMessageStore.getMessageStoreConfig().getMaxMsgsNumBatch());
+ List<Long> phyOffsets = new ArrayList<>(maxNum);
try {
this.readWriteLock.readLock().lock();
if (!this.indexFileList.isEmpty()) {
diff --git
a/store/src/test/java/org/apache/rocketmq/store/index/IndexServiceTest.java
b/store/src/test/java/org/apache/rocketmq/store/index/IndexServiceTest.java
new file mode 100644
index 0000000000..057bbfd0e1
--- /dev/null
+++ b/store/src/test/java/org/apache/rocketmq/store/index/IndexServiceTest.java
@@ -0,0 +1,49 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.rocketmq.store.index;
+
+import org.apache.rocketmq.common.BrokerConfig;
+import org.apache.rocketmq.store.DefaultMessageStore;
+import org.apache.rocketmq.store.config.MessageStoreConfig;
+import org.apache.rocketmq.store.stats.BrokerStatsManager;
+import org.junit.Test;
+
+import java.util.concurrent.ConcurrentHashMap;
+
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+
+
+public class IndexServiceTest {
+
+ @Test
+ public void testQueryOffsetThrow() throws Exception {
+ assertDoesNotThrow(() -> {
+ DefaultMessageStore store = new DefaultMessageStore(
+ new MessageStoreConfig(),
+ new BrokerStatsManager(new BrokerConfig()),
+ null,
+ new BrokerConfig(),
+ new ConcurrentHashMap<>()
+ );
+
+ IndexService indexService = new IndexService(store);
+ indexService.queryOffset("test", "", Integer.MAX_VALUE, 10, 100);
+ });
+ }
+
+}
