Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
为 GitLab 提交贡献
登录/注册
切换导航
H
h2database
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分枝图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
分枝图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
Administrator
h2database
Commits
1c75fd78
提交
1c75fd78
authored
8月 26, 2015
作者:
Thomas Mueller Graf
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
LIRS cache: keep more non-resident entries
上级
11ef3490
显示空白字符变更
内嵌
并排
正在显示
2 个修改的文件
包含
27 行增加
和
23 行删除
+27
-23
CacheLongKeyLIRS.java
h2/src/main/org/h2/mvstore/cache/CacheLongKeyLIRS.java
+14
-11
TestCacheLongKeyLIRS.java
h2/src/test/org/h2/test/store/TestCacheLongKeyLIRS.java
+13
-12
没有找到文件。
h2/src/main/org/h2/mvstore/cache/CacheLongKeyLIRS.java
浏览文件 @
1c75fd78
...
@@ -55,7 +55,7 @@ public class CacheLongKeyLIRS<V> {
...
@@ -55,7 +55,7 @@ public class CacheLongKeyLIRS<V> {
private
final
int
segmentShift
;
private
final
int
segmentShift
;
private
final
int
segmentMask
;
private
final
int
segmentMask
;
private
final
int
stackMoveDistance
;
private
final
int
stackMoveDistance
;
private
final
double
nonResidentQueueSize
;
private
final
int
nonResidentQueueSize
;
/**
/**
* Create a new cache with the given memory size.
* Create a new cache with the given memory size.
...
@@ -535,7 +535,7 @@ public class CacheLongKeyLIRS<V> {
...
@@ -535,7 +535,7 @@ public class CacheLongKeyLIRS<V> {
* The number of entries in the non-resident queue, as a factor of the
* The number of entries in the non-resident queue, as a factor of the
* number of entries in the map.
* number of entries in the map.
*/
*/
private
final
double
nonResidentQueueSize
;
private
final
int
nonResidentQueueSize
;
/**
/**
* The stack of recently referenced elements. This includes all hot
* The stack of recently referenced elements. This includes all hot
...
@@ -581,7 +581,7 @@ public class CacheLongKeyLIRS<V> {
...
@@ -581,7 +581,7 @@ public class CacheLongKeyLIRS<V> {
* @param nonResidentQueueSize the non-resident queue size factor
* @param nonResidentQueueSize the non-resident queue size factor
*/
*/
Segment
(
long
maxMemory
,
int
stackMoveDistance
,
int
len
,
Segment
(
long
maxMemory
,
int
stackMoveDistance
,
int
len
,
double
nonResidentQueueSize
)
{
int
nonResidentQueueSize
)
{
setMaxMemory
(
maxMemory
);
setMaxMemory
(
maxMemory
);
this
.
stackMoveDistance
=
stackMoveDistance
;
this
.
stackMoveDistance
=
stackMoveDistance
;
this
.
nonResidentQueueSize
=
nonResidentQueueSize
;
this
.
nonResidentQueueSize
=
nonResidentQueueSize
;
...
@@ -904,7 +904,8 @@ public class CacheLongKeyLIRS<V> {
...
@@ -904,7 +904,8 @@ public class CacheLongKeyLIRS<V> {
e
.
memory
=
0
;
e
.
memory
=
0
;
addToQueue
(
queue2
,
e
);
addToQueue
(
queue2
,
e
);
// the size of the non-resident-cold entries needs to be limited
// the size of the non-resident-cold entries needs to be limited
int
maxQueue2Size
=
(
int
)
(
nonResidentQueueSize
*
mapSize
);
int
maxQueue2Size
=
nonResidentQueueSize
*
(
mapSize
-
queue2Size
);
if
(
maxQueue2Size
>=
0
)
{
while
(
queue2Size
>
maxQueue2Size
)
{
while
(
queue2Size
>
maxQueue2Size
)
{
e
=
queue2
.
queuePrev
;
e
=
queue2
.
queuePrev
;
int
hash
=
getHash
(
e
.
key
);
int
hash
=
getHash
(
e
.
key
);
...
@@ -912,6 +913,7 @@ public class CacheLongKeyLIRS<V> {
...
@@ -912,6 +913,7 @@ public class CacheLongKeyLIRS<V> {
}
}
}
}
}
}
}
private
void
convertOldestHotToCold
()
{
private
void
convertOldestHotToCold
()
{
// the last entry of the stack is known to be hot
// the last entry of the stack is known to be hot
...
@@ -1165,15 +1167,16 @@ public class CacheLongKeyLIRS<V> {
...
@@ -1165,15 +1167,16 @@ public class CacheLongKeyLIRS<V> {
public
int
segmentCount
=
16
;
public
int
segmentCount
=
16
;
/**
/**
* How many other item are to be moved to the top of the stack before the current item is moved.
* How many other item are to be moved to the top of the stack before
* the current item is moved.
*/
*/
public
int
stackMoveDistance
=
32
;
public
int
stackMoveDistance
=
32
;
/**
/**
* The number of entries in the non-resident queue, as a factor of the
* The number of entries in the non-resident queue, as a factor of the
* number of entries in the map.
* number of
all other
entries in the map.
*/
*/
public
double
nonResidentQueueSize
=
0.5
;
public
int
nonResidentQueueSize
=
3
;
}
}
...
...
h2/src/test/org/h2/test/store/TestCacheLongKeyLIRS.java
浏览文件 @
1c75fd78
...
@@ -114,7 +114,8 @@ public class TestCacheLongKeyLIRS extends TestBase {
...
@@ -114,7 +114,8 @@ public class TestCacheLongKeyLIRS extends TestBase {
assertEquals
(
63
,
test
.
size
()
-
test
.
sizeHot
());
assertEquals
(
63
,
test
.
size
()
-
test
.
sizeHot
());
// at most as many non-resident elements
// at most as many non-resident elements
// as there are entries in the stack
// as there are entries in the stack
assertEquals
(
999
,
test
.
sizeNonResident
());
assertEquals
(
1000
,
test
.
size
());
assertEquals
(
1000
,
test
.
sizeNonResident
());
}
}
private
void
verifyMapSize
(
int
elements
,
int
expectedMapSize
)
{
private
void
verifyMapSize
(
int
elements
,
int
expectedMapSize
)
{
...
@@ -323,8 +324,8 @@ public class TestCacheLongKeyLIRS extends TestBase {
...
@@ -323,8 +324,8 @@ public class TestCacheLongKeyLIRS extends TestBase {
test
.
put
(
i
,
10
*
i
);
test
.
put
(
i
,
10
*
i
);
}
}
assertEquals
(
100
,
test
.
size
());
assertEquals
(
100
,
test
.
size
());
assertEquals
(
99
,
test
.
sizeNonResident
());
assertEquals
(
200
,
test
.
sizeNonResident
());
assertEquals
(
9
3
,
test
.
sizeHot
());
assertEquals
(
9
0
,
test
.
sizeHot
());
}
}
private
void
testLimitNonResident
()
{
private
void
testLimitNonResident
()
{
...
@@ -332,8 +333,8 @@ public class TestCacheLongKeyLIRS extends TestBase {
...
@@ -332,8 +333,8 @@ public class TestCacheLongKeyLIRS extends TestBase {
for
(
int
i
=
0
;
i
<
20
;
i
++)
{
for
(
int
i
=
0
;
i
<
20
;
i
++)
{
test
.
put
(
i
,
10
*
i
);
test
.
put
(
i
,
10
*
i
);
}
}
verify
(
test
,
"mem: 4 stack: 19 18 17 16 3 2 1 "
+
verify
(
test
,
"mem: 4 stack: 19 18 17 16
15 14 13 12 11 10
3 2 1 "
+
"cold: 19 non-resident: 18 17 16"
);
"cold: 19 non-resident: 18 17 16
15 14 13 12 11 10
"
);
}
}
private
void
testLimitMemory
()
{
private
void
testLimitMemory
()
{
...
@@ -344,21 +345,21 @@ public class TestCacheLongKeyLIRS extends TestBase {
...
@@ -344,21 +345,21 @@ public class TestCacheLongKeyLIRS extends TestBase {
verify
(
test
,
"mem: 4 stack: 4 3 2 1 cold: 4 non-resident: 0"
);
verify
(
test
,
"mem: 4 stack: 4 3 2 1 cold: 4 non-resident: 0"
);
assertTrue
(
""
+
test
.
getUsedMemory
(),
test
.
getUsedMemory
()
<=
4
);
assertTrue
(
""
+
test
.
getUsedMemory
(),
test
.
getUsedMemory
()
<=
4
);
test
.
put
(
6
,
60
,
3
);
test
.
put
(
6
,
60
,
3
);
verify
(
test
,
"mem: 4 stack: 6
3 cold: 6 non-resident: 2 1
"
);
verify
(
test
,
"mem: 4 stack: 6
4 3 cold: 6 non-resident: 2 1 4
"
);
assertTrue
(
""
+
test
.
getUsedMemory
(),
test
.
getUsedMemory
()
<=
4
);
assertTrue
(
""
+
test
.
getUsedMemory
(),
test
.
getUsedMemory
()
<=
4
);
test
.
put
(
7
,
70
,
3
);
test
.
put
(
7
,
70
,
3
);
verify
(
test
,
"mem: 4 stack: 7 6 3 cold: 7 non-resident: 6 2"
);
verify
(
test
,
"mem: 4 stack: 7 6 3 cold: 7 non-resident: 6 2
1
"
);
assertTrue
(
""
+
test
.
getUsedMemory
(),
test
.
getUsedMemory
()
<=
4
);
assertTrue
(
""
+
test
.
getUsedMemory
(),
test
.
getUsedMemory
()
<=
4
);
test
.
put
(
8
,
80
,
4
);
test
.
put
(
8
,
80
,
4
);
verify
(
test
,
"mem: 4 stack: 8 cold: non-resident:
3
"
);
verify
(
test
,
"mem: 4 stack: 8 cold: non-resident:"
);
assertTrue
(
""
+
test
.
getUsedMemory
(),
test
.
getUsedMemory
()
<=
4
);
assertTrue
(
""
+
test
.
getUsedMemory
(),
test
.
getUsedMemory
()
<=
4
);
}
}
private
void
testScanResistance
()
{
private
void
testScanResistance
()
{
boolean
log
=
false
;
boolean
log
=
false
;
int
size
=
20
;
int
size
=
20
;
// cache size 11 (10 hot,
1
cold)
// cache size 11 (10 hot,
2
cold)
CacheLongKeyLIRS
<
Integer
>
test
=
createCache
(
size
/
2
+
1
);
CacheLongKeyLIRS
<
Integer
>
test
=
createCache
(
size
/
2
+
2
);
// init the cache with some dummy entries
// init the cache with some dummy entries
for
(
int
i
=
0
;
i
<
size
;
i
++)
{
for
(
int
i
=
0
;
i
<
size
;
i
++)
{
test
.
put
(-
i
,
-
i
*
10
);
test
.
put
(-
i
,
-
i
*
10
);
...
@@ -394,10 +395,10 @@ public class TestCacheLongKeyLIRS extends TestBase {
...
@@ -394,10 +395,10 @@ public class TestCacheLongKeyLIRS extends TestBase {
}
}
verify
(
test
,
null
);
verify
(
test
,
null
);
}
}
// ensure 0..9 are hot, 10..1
8 are not resident, 19 is
cold
// ensure 0..9 are hot, 10..1
7 are not resident, 18..19 are
cold
for
(
int
i
=
0
;
i
<
size
;
i
++)
{
for
(
int
i
=
0
;
i
<
size
;
i
++)
{
Integer
x
=
test
.
get
(
i
);
Integer
x
=
test
.
get
(
i
);
if
(
i
<
size
/
2
||
i
==
size
-
1
)
{
if
(
i
<
size
/
2
||
i
==
size
-
1
||
i
==
size
-
2
)
{
assertTrue
(
"i: "
+
i
,
x
!=
null
);
assertTrue
(
"i: "
+
i
,
x
!=
null
);
assertEquals
(
i
*
10
,
x
.
intValue
());
assertEquals
(
i
*
10
,
x
.
intValue
());
}
else
{
}
else
{
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论