Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
_Walt
Rocketmq
提交
f18dc038
R
Rocketmq
项目概览
_Walt
/
Rocketmq
与 Fork 源项目一致
Fork自
Apache RocketMQ / Rocketmq
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
Rocketmq
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
f18dc038
编写于
11月 02, 2017
作者:
Y
yukon
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[ROCKETMQ-270] Move flush position forward to first MappedFile whose start offset is non-zero.
上级
1a88fe09
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
25 addition
and
5 deletion
+25
-5
store/src/main/java/org/apache/rocketmq/store/MappedFileQueue.java
.../main/java/org/apache/rocketmq/store/MappedFileQueue.java
+2
-2
store/src/test/java/org/apache/rocketmq/store/MappedFileQueueTest.java
...t/java/org/apache/rocketmq/store/MappedFileQueueTest.java
+23
-3
未找到文件。
store/src/main/java/org/apache/rocketmq/store/MappedFileQueue.java
浏览文件 @
f18dc038
...
@@ -421,7 +421,7 @@ public class MappedFileQueue {
...
@@ -421,7 +421,7 @@ public class MappedFileQueue {
public
boolean
flush
(
final
int
flushLeastPages
)
{
public
boolean
flush
(
final
int
flushLeastPages
)
{
boolean
result
=
true
;
boolean
result
=
true
;
MappedFile
mappedFile
=
this
.
findMappedFileByOffset
(
this
.
flushedWhere
,
false
);
MappedFile
mappedFile
=
this
.
findMappedFileByOffset
(
this
.
flushedWhere
,
this
.
flushedWhere
==
0
);
if
(
mappedFile
!=
null
)
{
if
(
mappedFile
!=
null
)
{
long
tmpTimeStamp
=
mappedFile
.
getStoreTimestamp
();
long
tmpTimeStamp
=
mappedFile
.
getStoreTimestamp
();
int
offset
=
mappedFile
.
flush
(
flushLeastPages
);
int
offset
=
mappedFile
.
flush
(
flushLeastPages
);
...
@@ -438,7 +438,7 @@ public class MappedFileQueue {
...
@@ -438,7 +438,7 @@ public class MappedFileQueue {
public
boolean
commit
(
final
int
commitLeastPages
)
{
public
boolean
commit
(
final
int
commitLeastPages
)
{
boolean
result
=
true
;
boolean
result
=
true
;
MappedFile
mappedFile
=
this
.
findMappedFileByOffset
(
this
.
committedWhere
,
false
);
MappedFile
mappedFile
=
this
.
findMappedFileByOffset
(
this
.
committedWhere
,
this
.
committedWhere
==
0
);
if
(
mappedFile
!=
null
)
{
if
(
mappedFile
!=
null
)
{
int
offset
=
mappedFile
.
commit
(
commitLeastPages
);
int
offset
=
mappedFile
.
commit
(
commitLeastPages
);
long
where
=
mappedFile
.
getFileFromOffset
()
+
offset
;
long
where
=
mappedFile
.
getFileFromOffset
()
+
offset
;
...
...
store/src/test/java/org/apache/rocketmq/store/MappedFileQueueTest.java
浏览文件 @
f18dc038
...
@@ -20,9 +20,7 @@ package org.apache.rocketmq.store;
...
@@ -20,9 +20,7 @@ package org.apache.rocketmq.store;
import
java.io.File
;
import
java.io.File
;
import
java.nio.ByteBuffer
;
import
java.nio.ByteBuffer
;
import
java.util.Arrays
;
import
java.util.Arrays
;
import
org.apache.rocketmq.common.UtilAll
;
import
org.apache.rocketmq.common.UtilAll
;
import
org.apache.rocketmq.store.config.MessageStoreConfig
;
import
org.junit.After
;
import
org.junit.After
;
import
org.junit.Test
;
import
org.junit.Test
;
...
@@ -47,7 +45,7 @@ public class MappedFileQueueTest {
...
@@ -47,7 +45,7 @@ public class MappedFileQueueTest {
}
}
@Test
@Test
public
void
test
_f
indMappedFileByOffset
()
{
public
void
test
F
indMappedFileByOffset
()
{
// four-byte string.
// four-byte string.
final
String
fixedMsg
=
"abcd"
;
final
String
fixedMsg
=
"abcd"
;
...
@@ -97,6 +95,28 @@ public class MappedFileQueueTest {
...
@@ -97,6 +95,28 @@ public class MappedFileQueueTest {
mappedFileQueue
.
destroy
();
mappedFileQueue
.
destroy
();
}
}
@Test
public
void
testFindMappedFileByOffset_StartOffsetIsNonZero
()
{
MappedFileQueue
mappedFileQueue
=
new
MappedFileQueue
(
"target/unit_test_store/b/"
,
1024
,
null
);
//Start from a non-zero offset
MappedFile
mappedFile
=
mappedFileQueue
.
getLastMappedFile
(
1024
);
assertThat
(
mappedFile
).
isNotNull
();
assertThat
(
mappedFileQueue
.
findMappedFileByOffset
(
1025
)).
isEqualTo
(
mappedFile
);
assertThat
(
mappedFileQueue
.
findMappedFileByOffset
(
0
)).
isNull
();
assertThat
(
mappedFileQueue
.
findMappedFileByOffset
(
123
,
false
)).
isNull
();
assertThat
(
mappedFileQueue
.
findMappedFileByOffset
(
123
,
true
)).
isEqualTo
(
mappedFile
);
assertThat
(
mappedFileQueue
.
findMappedFileByOffset
(
0
,
false
)).
isNull
();
assertThat
(
mappedFileQueue
.
findMappedFileByOffset
(
0
,
true
)).
isEqualTo
(
mappedFile
);
mappedFileQueue
.
shutdown
(
1000
);
mappedFileQueue
.
destroy
();
}
@Test
@Test
public
void
testAppendMessage
()
{
public
void
testAppendMessage
()
{
final
String
fixedMsg
=
"0123456789abcdef"
;
final
String
fixedMsg
=
"0123456789abcdef"
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录