Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
为 GitLab 提交贡献
登录/注册
切换导航
H
h2database
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分枝图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
分枝图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
Administrator
h2database
Commits
d476faca
提交
d476faca
authored
10 年前
作者:
Thomas Mueller
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
MVStore compaction
上级
35b32304
隐藏空白字符变更
内嵌
并排
正在显示
3 个修改的文件
包含
80 行增加
和
57 行删除
+80
-57
MVMap.java
h2/src/main/org/h2/mvstore/MVMap.java
+11
-2
MVStore.java
h2/src/main/org/h2/mvstore/MVStore.java
+46
-50
TestConcurrent.java
h2/src/test/org/h2/test/store/TestConcurrent.java
+23
-5
没有找到文件。
h2/src/main/org/h2/mvstore/MVMap.java
浏览文件 @
d476faca
...
@@ -72,7 +72,7 @@ public class MVMap<K, V> extends AbstractMap<K, V>
...
@@ -72,7 +72,7 @@ public class MVMap<K, V> extends AbstractMap<K, V>
* @param mapId the map id
* @param mapId the map id
* @return the metadata key
* @return the metadata key
*/
*/
public
static
String
getMapRootKey
(
int
mapId
)
{
static
String
getMapRootKey
(
int
mapId
)
{
return
"root."
+
Integer
.
toHexString
(
mapId
);
return
"root."
+
Integer
.
toHexString
(
mapId
);
}
}
...
@@ -82,7 +82,7 @@ public class MVMap<K, V> extends AbstractMap<K, V>
...
@@ -82,7 +82,7 @@ public class MVMap<K, V> extends AbstractMap<K, V>
* @param mapId the map id
* @param mapId the map id
* @return the metadata key
* @return the metadata key
*/
*/
public
static
String
getMapKey
(
int
mapId
)
{
static
String
getMapKey
(
int
mapId
)
{
return
"map."
+
Integer
.
toHexString
(
mapId
);
return
"map."
+
Integer
.
toHexString
(
mapId
);
}
}
...
@@ -837,6 +837,9 @@ public class MVMap<K, V> extends AbstractMap<K, V>
...
@@ -837,6 +837,9 @@ public class MVMap<K, V> extends AbstractMap<K, V>
// an inner node page that is in one of the chunks,
// an inner node page that is in one of the chunks,
// but only points to chunks that are not in the set:
// but only points to chunks that are not in the set:
// if no child was changed, we need to do that now
// if no child was changed, we need to do that now
// (this is not needed if anyway one of the children
// was changed, as this would have updated this
// page as well)
Page
p2
=
p
;
Page
p2
=
p
;
while
(!
p2
.
isLeaf
())
{
while
(!
p2
.
isLeaf
())
{
p2
=
p2
.
getChildPage
(
0
);
p2
=
p2
.
getChildPage
(
0
);
...
@@ -955,6 +958,12 @@ public class MVMap<K, V> extends AbstractMap<K, V>
...
@@ -955,6 +958,12 @@ public class MVMap<K, V> extends AbstractMap<K, V>
return
store
;
return
store
;
}
}
/**
* Get the map id. Please note the map id may be different after compacting
* a store.
*
* @return the map id
*/
public
int
getId
()
{
public
int
getId
()
{
return
id
;
return
id
;
}
}
...
...
This diff is collapsed.
Click to expand it.
h2/src/main/org/h2/mvstore/MVStore.java
浏览文件 @
d476faca
...
@@ -242,6 +242,8 @@ public class MVStore {
...
@@ -242,6 +242,8 @@ public class MVStore {
private
int
autoCompactFillRate
;
private
int
autoCompactFillRate
;
private
long
autoCompactLastFileOpCount
;
private
long
autoCompactLastFileOpCount
;
private
Object
compactSync
=
new
Object
();
/**
/**
* Create and open the store.
* Create and open the store.
...
@@ -833,15 +835,23 @@ public class MVStore {
...
@@ -833,15 +835,23 @@ public class MVStore {
}
}
return
c
;
return
c
;
}
}
boolean
isChunkKnown
(
long
pos
)
{
int
chunkId
=
DataUtils
.
getPageChunkId
(
pos
);
return
chunks
.
containsKey
(
chunkId
);
}
private
Chunk
getChunkIfFound
(
long
pos
)
{
private
Chunk
getChunkIfFound
(
long
pos
)
{
int
chunkId
=
DataUtils
.
getPageChunkId
(
pos
);
int
chunkId
=
DataUtils
.
getPageChunkId
(
pos
);
Chunk
c
=
chunks
.
get
(
chunkId
);
Chunk
c
=
chunks
.
get
(
chunkId
);
if
(
c
==
null
)
{
if
(
c
==
null
)
{
if
(!
Thread
.
holdsLock
(
this
))
{
if
(!
Thread
.
holdsLock
(
this
))
{
// it could also be unsynchronized metadata
// access (if synchronization on this was forgotten)
throw
DataUtils
.
newIllegalStateException
(
throw
DataUtils
.
newIllegalStateException
(
DataUtils
.
ERROR_INTERNAL
,
DataUtils
.
ERROR_INTERNAL
,
"Unsynchronized metadata read"
);
"Chunk {0} no longer exists"
,
chunkId
);
}
}
String
s
=
meta
.
get
(
Chunk
.
getMetaKey
(
chunkId
));
String
s
=
meta
.
get
(
Chunk
.
getMetaKey
(
chunkId
));
if
(
s
==
null
)
{
if
(
s
==
null
)
{
...
@@ -1551,16 +1561,18 @@ public class MVStore {
...
@@ -1551,16 +1561,18 @@ public class MVStore {
* @return if a chunk was re-written
* @return if a chunk was re-written
*/
*/
public
boolean
compact
(
int
targetFillRate
,
int
write
)
{
public
boolean
compact
(
int
targetFillRate
,
int
write
)
{
checkOpen
();
synchronized
(
compactSync
)
{
ArrayList
<
Chunk
>
old
;
checkOpen
();
synchronized
(
this
)
{
ArrayList
<
Chunk
>
old
;
old
=
compactGetOldChunks
(
targetFillRate
,
write
);
synchronized
(
this
)
{
}
old
=
compactGetOldChunks
(
targetFillRate
,
write
);
if
(
old
==
null
||
old
.
size
()
==
0
)
{
}
return
false
;
if
(
old
==
null
||
old
.
size
()
==
0
)
{
return
false
;
}
compactRewrite
(
old
);
return
true
;
}
}
compactRewrite
(
old
);
return
true
;
}
}
private
ArrayList
<
Chunk
>
compactGetOldChunks
(
int
targetFillRate
,
int
write
)
{
private
ArrayList
<
Chunk
>
compactGetOldChunks
(
int
targetFillRate
,
int
write
)
{
...
@@ -1655,22 +1667,26 @@ public class MVStore {
...
@@ -1655,22 +1667,26 @@ public class MVStore {
MVMap
<
Object
,
Object
>
map
=
(
MVMap
<
Object
,
Object
>)
m
;
MVMap
<
Object
,
Object
>
map
=
(
MVMap
<
Object
,
Object
>)
m
;
map
.
rewrite
(
set
);
map
.
rewrite
(
set
);
}
}
meta
.
rewrite
(
set
);
commitAndSave
();
commitAndSave
();
boolean
a
gain
=
false
;
boolean
commitA
gain
=
false
;
for
(
Chunk
c
:
old
)
{
for
(
Chunk
c
:
old
)
{
if
(
c
.
maxLenLive
>
0
)
{
// a concurrent commit could free up the chunk
// not cleared - that means bookkeeping of live pages
// so we wait for any commits to finish
// is broken; copyLive will fix this
if
(
c
.
maxLenLive
==
0
)
{
again
=
true
;
continue
;
copyLive
(
c
);
}
}
// not cleared - that means bookkeeping of live pages
// may be broken; copyLive will fix this
compactFixLive
(
c
);
commitAgain
=
true
;
}
}
if
(
a
gain
)
{
if
(
commitA
gain
)
{
commitAndSave
();
commitAndSave
();
}
}
}
}
private
void
co
py
Live
(
Chunk
chunk
)
{
private
void
co
mpactFix
Live
(
Chunk
chunk
)
{
long
start
=
chunk
.
block
*
BLOCK_SIZE
;
long
start
=
chunk
.
block
*
BLOCK_SIZE
;
int
length
=
chunk
.
len
*
BLOCK_SIZE
;
int
length
=
chunk
.
len
*
BLOCK_SIZE
;
ByteBuffer
buff
=
fileStore
.
readFully
(
start
,
length
);
ByteBuffer
buff
=
fileStore
.
readFully
(
start
,
length
);
...
@@ -1683,7 +1699,6 @@ public class MVStore {
...
@@ -1683,7 +1699,6 @@ public class MVStore {
int
pagesRemaining
=
chunk
.
pageCount
;
int
pagesRemaining
=
chunk
.
pageCount
;
markMetaChanged
();
markMetaChanged
();
boolean
mapNotOpen
=
false
;
boolean
mapNotOpen
=
false
;
int
changeCount
=
0
;
while
(
pagesRemaining
--
>
0
)
{
while
(
pagesRemaining
--
>
0
)
{
int
offset
=
buff
.
position
();
int
offset
=
buff
.
position
();
int
pageLength
=
buff
.
getInt
();
int
pageLength
=
buff
.
getInt
();
...
@@ -1704,43 +1719,27 @@ public class MVStore {
...
@@ -1704,43 +1719,27 @@ public class MVStore {
// chunk is not removed
// chunk is not removed
mapNotOpen
=
true
;
mapNotOpen
=
true
;
}
}
buff
.
position
(
offset
+
pageLength
);
continue
;
}
buff
.
position
(
offset
);
Page
page
=
new
Page
(
map
,
0
);
int
limit
=
buff
.
limit
();
page
.
read
(
buff
,
chunk
.
id
,
buff
.
position
(),
length
);
buff
.
limit
(
limit
);
int
type
=
page
.
isLeaf
()
?
0
:
1
;
long
pos
=
DataUtils
.
getPagePos
(
chunk
.
id
,
offset
,
pageLength
,
type
);
page
.
setPos
(
pos
);
Object
k
=
map
.
getLiveKey
(
page
);
if
(
k
!=
null
)
{
Object
value
=
map
.
get
(
k
);
if
(
value
!=
null
)
{
map
.
replace
(
k
,
value
,
value
);
changeCount
++;
}
}
}
buff
.
position
(
offset
+
pageLength
);
}
}
if
(!
mapNotOpen
&&
changeCount
==
0
)
{
if
(!
mapNotOpen
)
{
// if all maps are open
, but no changes were made,
// if all maps are open
// then live bookkeeping is wrong, and we anyway
// then live bookkeeping is wrong, and we anyway
// remove the chunk
// remove the chunk
// (but we first need to check that there are no
// (but we first need to check that there are no
// pending changes)
// pending changes)
boolean
pendingChanges
=
false
;
for
(
HashMap
<
Integer
,
Chunk
>
e
:
freedPageSpace
.
values
())
{
for
(
HashMap
<
Integer
,
Chunk
>
e
:
freedPageSpace
.
values
())
{
synchronized
(
e
)
{
synchronized
(
e
)
{
for
(
int
x
:
e
.
keySet
())
{
for
(
int
x
:
e
.
keySet
())
{
if
(
x
==
chunk
.
id
)
{
if
(
x
==
chunk
.
id
)
{
changeCount
++
;
pendingChanges
=
true
;
break
;
break
;
}
}
}
}
}
}
}
}
if
(
changeCount
==
0
)
{
if
(
!
pendingChanges
)
{
// bookkeeping is broken for this chunk:
// bookkeeping is broken for this chunk:
// fix it
// fix it
registerFreePage
(
currentVersion
,
chunk
.
id
,
registerFreePage
(
currentVersion
,
chunk
.
id
,
...
@@ -1797,7 +1796,7 @@ public class MVStore {
...
@@ -1797,7 +1796,7 @@ public class MVStore {
if
(
pos
==
0
)
{
if
(
pos
==
0
)
{
// the value could be smaller than 0 because
// the value could be smaller than 0 because
// in some cases a page is allocated,
// in some cases a page is allocated,
// but never stored
// but never stored
, so we need to use max
unsavedMemory
=
Math
.
max
(
0
,
unsavedMemory
-
memory
);
unsavedMemory
=
Math
.
max
(
0
,
unsavedMemory
-
memory
);
return
;
return
;
}
}
...
@@ -1907,8 +1906,11 @@ public class MVStore {
...
@@ -1907,8 +1906,11 @@ public class MVStore {
* according to various tests this does not always work as expected
* according to various tests this does not always work as expected
* depending on the operating system and hardware.
* depending on the operating system and hardware.
* <p>
* <p>
* The retention time needs to be long enough to allow reading old chunks
* while traversing over the entries of a map.
* <p>
* This setting is not persisted.
* This setting is not persisted.
*
*
* @param ms how many milliseconds to retain old chunks (0 to overwrite them
* @param ms how many milliseconds to retain old chunks (0 to overwrite them
* as early as possible)
* as early as possible)
*/
*/
...
@@ -2307,12 +2309,6 @@ public class MVStore {
...
@@ -2307,12 +2309,6 @@ public class MVStore {
// use a lower fill rate if there were any file operations
// use a lower fill rate if there were any file operations
int
fillRate
=
fileOps
?
autoCompactFillRate
/
3
:
autoCompactFillRate
;
int
fillRate
=
fileOps
?
autoCompactFillRate
/
3
:
autoCompactFillRate
;
compact
(
fillRate
,
autoCommitMemory
);
compact
(
fillRate
,
autoCommitMemory
);
;
// TODO find out why this doesn't work
// if (!fileOps) {
// // if there were no file operations at all,
// // compact the file by moving chunks
// compactMoveChunks(autoCompactFillRate, autoCommitMemory);
// }
autoCompactLastFileOpCount
=
fileStore
.
getWriteCount
()
+
fileStore
.
getReadCount
();
autoCompactLastFileOpCount
=
fileStore
.
getWriteCount
()
+
fileStore
.
getReadCount
();
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
if
(
backgroundExceptionHandler
!=
null
)
{
if
(
backgroundExceptionHandler
!=
null
)
{
...
...
This diff is collapsed.
Click to expand it.
h2/src/test/org/h2/test/store/TestConcurrent.java
浏览文件 @
d476faca
...
@@ -62,9 +62,12 @@ public class TestConcurrent extends TestMVStore {
...
@@ -62,9 +62,12 @@ public class TestConcurrent extends TestMVStore {
}
}
private
void
testConcurrentAutoCommitAndChange
()
throws
InterruptedException
{
private
void
testConcurrentAutoCommitAndChange
()
throws
InterruptedException
{
String
fileName
=
"memFS:testConcurrentChangeAndBackgroundCompact"
;
FileUtils
.
delete
(
fileName
);
final
MVStore
s
=
new
MVStore
.
Builder
().
fileName
(
final
MVStore
s
=
new
MVStore
.
Builder
().
fileName
(
"memFS:testConcurrentChangeAndBackgroundCompact"
).
open
();
fileName
).
open
();
s
.
setRetentionTime
(
0
);
s
.
setRetentionTime
(
10000
);
s
.
setAutoCommitDelay
(
1
);
Task
task
=
new
Task
()
{
Task
task
=
new
Task
()
{
@Override
@Override
public
void
call
()
throws
Exception
{
public
void
call
()
throws
Exception
{
...
@@ -125,9 +128,13 @@ public class TestConcurrent extends TestMVStore {
...
@@ -125,9 +128,13 @@ public class TestConcurrent extends TestMVStore {
}
}
private
void
testConcurrentChangeAndCompact
()
throws
InterruptedException
{
private
void
testConcurrentChangeAndCompact
()
throws
InterruptedException
{
String
fileName
=
"memFS:testConcurrentChangeAndBackgroundCompact"
;
FileUtils
.
delete
(
fileName
);
final
MVStore
s
=
new
MVStore
.
Builder
().
fileName
(
final
MVStore
s
=
new
MVStore
.
Builder
().
fileName
(
"memFS:testConcurrentChangeAndBackgroundCompact"
).
autoCommitDisabled
().
open
();
fileName
).
s
.
setRetentionTime
(
0
);
pageSplitSize
(
10
).
autoCommitDisabled
().
open
();
s
.
setRetentionTime
(
10000
);
Task
task
=
new
Task
()
{
Task
task
=
new
Task
()
{
@Override
@Override
public
void
call
()
throws
Exception
{
public
void
call
()
throws
Exception
{
...
@@ -137,15 +144,26 @@ public class TestConcurrent extends TestMVStore {
...
@@ -137,15 +144,26 @@ public class TestConcurrent extends TestMVStore {
}
}
};
};
task
.
execute
();
task
.
execute
();
Task
task2
=
new
Task
()
{
@Override
public
void
call
()
throws
Exception
{
while
(!
stop
)
{
s
.
compact
(
100
,
1024
*
1024
);
}
}
};
task2
.
execute
();
Thread
.
sleep
(
1
);
Thread
.
sleep
(
1
);
for
(
int
i
=
0
;
!
task
.
isFinished
()
&&
i
<
1000
;
i
++)
{
for
(
int
i
=
0
;
!
task
.
isFinished
()
&&
!
task2
.
isFinished
()
&&
i
<
1000
;
i
++)
{
MVMap
<
Integer
,
Integer
>
map
=
s
.
openMap
(
"d"
+
(
i
%
3
));
MVMap
<
Integer
,
Integer
>
map
=
s
.
openMap
(
"d"
+
(
i
%
3
));
// MVMap<Integer, Integer> map = s.openMap("d" + (i % 3),
// MVMap<Integer, Integer> map = s.openMap("d" + (i % 3),
// new MVMapConcurrent.Builder<Integer, Integer>());
// new MVMapConcurrent.Builder<Integer, Integer>());
map
.
put
(
0
,
i
);
map
.
put
(
0
,
i
);
map
.
get
(
0
);
s
.
commit
();
s
.
commit
();
}
}
task
.
get
();
task
.
get
();
task2
.
get
();
s
.
close
();
s
.
close
();
}
}
...
...
This diff is collapsed.
Click to expand it.
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论