Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
为 GitLab 提交贡献
登录/注册
切换导航
H
h2database
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分枝图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
分枝图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
Administrator
h2database
Commits
337f0a4f
提交
337f0a4f
authored
11月 05, 2014
作者:
Thomas Mueller
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
MVStore: support for concurrent reads and writes is now enabled by default.
上级
a17b66d1
全部展开
隐藏空白字符变更
内嵌
并排
正在显示
6 个修改的文件
包含
177 行增加
和
453 行删除
+177
-453
ConcurrentArrayList.java
h2/src/main/org/h2/mvstore/ConcurrentArrayList.java
+0
-1
MVMap.java
h2/src/main/org/h2/mvstore/MVMap.java
+50
-116
MVMapConcurrent.java
h2/src/main/org/h2/mvstore/MVMapConcurrent.java
+3
-71
MVStore.java
h2/src/main/org/h2/mvstore/MVStore.java
+2
-3
Page.java
h2/src/main/org/h2/mvstore/Page.java
+83
-209
MVRTreeMap.java
h2/src/main/org/h2/mvstore/rtree/MVRTreeMap.java
+39
-53
没有找到文件。
h2/src/main/org/h2/mvstore/ConcurrentArrayList.java
浏览文件 @
337f0a4f
...
...
@@ -8,7 +8,6 @@ package org.h2.mvstore;
import
java.util.Arrays
;
import
java.util.Iterator
;
/**
* A very simple array list that supports concurrent access.
* Internally, it uses immutable objects.
...
...
h2/src/main/org/h2/mvstore/MVMap.java
浏览文件 @
337f0a4f
...
...
@@ -21,6 +21,15 @@ import org.h2.util.New;
/**
* A stored map.
* <p>
* Read operations can happen concurrently with all other
* operations, without risk of corruption.
* <p>
* Write operations first read the relevant area from disk to memory
* concurrently, and only then modify the data. The in-memory part of write
* operations is synchronized. For scalable concurrent in-memory write
* operations, the map should be split into multiple smaller sub-maps that are
* then synchronized independently.
*
* @param <K> the key class
* @param <V> the value class
...
...
@@ -43,11 +52,6 @@ public class MVMap<K, V> extends AbstractMap<K, V>
*/
protected
volatile
long
writeVersion
;
/**
* This version is set during a write operation.
*/
protected
volatile
long
currentWriteVersion
=
-
1
;
private
int
id
;
private
long
createVersion
;
private
final
DataType
keyType
;
...
...
@@ -99,21 +103,6 @@ public class MVMap<K, V> extends AbstractMap<K, V>
this
.
writeVersion
=
store
.
getCurrentVersion
();
}
/**
* Create a copy of a page, if the write version is higher than the current
* version. If a copy is created, the old page is marked as deleted.
*
* @param p the page
* @param writeVersion the write version
* @return a page with the given write version
*/
protected
Page
copyOnWrite
(
Page
p
,
long
writeVersion
)
{
if
(
p
.
getVersion
()
==
writeVersion
)
{
return
p
;
}
return
p
.
copy
(
writeVersion
);
}
/**
* Add or replace a key-value pair.
*
...
...
@@ -126,16 +115,12 @@ public class MVMap<K, V> extends AbstractMap<K, V>
public
synchronized
V
put
(
K
key
,
V
value
)
{
DataUtils
.
checkArgument
(
value
!=
null
,
"The value may not be null"
);
beforeWrite
();
try
{
long
v
=
writeVersion
;
Page
p
=
copyOnWrite
(
root
,
v
);
p
=
splitRootIfNeeded
(
p
,
v
);
Object
result
=
put
(
p
,
v
,
key
,
value
);
newRoot
(
p
);
return
(
V
)
result
;
}
finally
{
afterWrite
();
}
long
v
=
writeVersion
;
Page
p
=
root
.
copy
(
v
);
p
=
splitRootIfNeeded
(
p
,
v
);
Object
result
=
put
(
p
,
v
,
key
,
value
);
newRoot
(
p
);
return
(
V
)
result
;
}
/**
...
...
@@ -155,14 +140,13 @@ public class MVMap<K, V> extends AbstractMap<K, V>
Page
split
=
p
.
split
(
at
);
Object
[]
keys
=
{
k
};
Page
.
PageReference
[]
children
=
{
new
Page
.
PageReference
(
p
,
p
.
getPos
()),
new
Page
.
PageReference
(
split
,
split
.
getPos
()),
new
Page
.
PageReference
(
p
,
p
.
getPos
()
,
p
.
getTotalCount
()
),
new
Page
.
PageReference
(
split
,
split
.
getPos
()
,
split
.
getTotalCount
()
),
};
long
[]
counts
=
{
p
.
getTotalCount
(),
split
.
getTotalCount
()
};
p
=
Page
.
create
(
this
,
writeVersion
,
1
,
keys
,
null
,
2
,
children
,
counts
,
totalCount
,
0
,
0
);
keys
,
null
,
children
,
totalCount
,
0
);
return
p
;
}
...
...
@@ -191,21 +175,19 @@ public class MVMap<K, V> extends AbstractMap<K, V>
}
else
{
index
++;
}
Page
c
=
copyOnWrite
(
p
.
getChildPage
(
index
),
writeVersion
);
Page
c
=
p
.
getChildPage
(
index
).
copy
(
writeVersion
);
if
(
c
.
getMemory
()
>
store
.
getPageSplitSize
()
&&
c
.
getKeyCount
()
>
1
)
{
// split on the way down
int
at
=
c
.
getKeyCount
()
/
2
;
Object
k
=
c
.
getKey
(
at
);
Page
split
=
c
.
split
(
at
);
p
.
setChild
(
index
,
split
);
p
.
setCounts
(
index
,
split
);
p
.
insertNode
(
index
,
k
,
c
);
// now we are not sure where to add
return
put
(
p
,
writeVersion
,
key
,
value
);
}
p
.
setChild
(
index
,
c
);
Object
result
=
put
(
c
,
writeVersion
,
key
,
value
);
p
.
setC
ounts
(
index
,
c
);
p
.
setC
hild
(
index
,
c
);
return
result
;
}
...
...
@@ -510,12 +492,8 @@ public class MVMap<K, V> extends AbstractMap<K, V>
@Override
public
synchronized
void
clear
()
{
beforeWrite
();
try
{
root
.
removeAllRecursive
();
newRoot
(
Page
.
createEmpty
(
this
,
writeVersion
));
}
finally
{
afterWrite
();
}
root
.
removeAllRecursive
();
newRoot
(
Page
.
createEmpty
(
this
,
writeVersion
));
}
/**
...
...
@@ -537,22 +515,24 @@ public class MVMap<K, V> extends AbstractMap<K, V>
* @return the old value if the key existed, or null otherwise
*/
@Override
public
synchronized
V
remove
(
Object
key
)
{
@SuppressWarnings
(
"unchecked"
)
public
V
remove
(
Object
key
)
{
beforeWrite
();
try
{
long
v
=
writeVersion
;
Page
p
=
copyOnWrite
(
root
,
v
);
@SuppressWarnings
(
"unchecked"
)
V
result
=
(
V
)
remove
(
p
,
v
,
key
);
V
result
=
get
(
key
);
if
(
result
==
null
)
{
return
null
;
}
long
v
=
writeVersion
;
synchronized
(
this
)
{
Page
p
=
root
.
copy
(
v
);
result
=
(
V
)
remove
(
p
,
v
,
key
);
if
(!
p
.
isLeaf
()
&&
p
.
getTotalCount
()
==
0
)
{
p
.
removePage
();
p
=
Page
.
createEmpty
(
this
,
p
.
getVersion
());
}
newRoot
(
p
);
return
result
;
}
finally
{
afterWrite
();
}
return
result
;
}
/**
...
...
@@ -664,18 +644,16 @@ public class MVMap<K, V> extends AbstractMap<K, V>
index
++;
}
Page
cOld
=
p
.
getChildPage
(
index
);
Page
c
=
c
opyOnWrite
(
cOld
,
writeVersion
);
Page
c
=
c
Old
.
copy
(
writeVersion
);
result
=
remove
(
c
,
writeVersion
,
key
);
if
(
result
==
null
||
c
.
getTotalCount
()
!=
0
)
{
// no change, or
// there are more nodes
p
.
setChild
(
index
,
c
);
p
.
setCounts
(
index
,
c
);
}
else
{
// this child was deleted
if
(
p
.
getKeyCount
()
==
0
)
{
p
.
setChild
(
index
,
c
);
p
.
setCounts
(
index
,
c
);
c
.
removePage
();
}
else
{
p
.
remove
(
index
);
...
...
@@ -975,25 +953,21 @@ public class MVMap<K, V> extends AbstractMap<K, V>
*/
void
rollbackTo
(
long
version
)
{
beforeWrite
();
try
{
if
(
version
<=
createVersion
)
{
// the map is removed later
}
else
if
(
root
.
getVersion
()
>=
version
)
{
while
(
true
)
{
Page
last
=
oldRoots
.
peekLast
();
if
(
last
==
null
)
{
break
;
}
// slow, but rollback is not a common operation
oldRoots
.
removeLast
(
last
);
root
=
last
;
if
(
root
.
getVersion
()
<
version
)
{
break
;
}
if
(
version
<=
createVersion
)
{
// the map is removed later
}
else
if
(
root
.
getVersion
()
>=
version
)
{
while
(
true
)
{
Page
last
=
oldRoots
.
peekLast
();
if
(
last
==
null
)
{
break
;
}
// slow, but rollback is not a common operation
oldRoots
.
removeLast
(
last
);
root
=
last
;
if
(
root
.
getVersion
()
<
version
)
{
break
;
}
}
}
finally
{
afterWrite
();
}
}
...
...
@@ -1056,45 +1030,7 @@ public class MVMap<K, V> extends AbstractMap<K, V>
throw
DataUtils
.
newUnsupportedOperationException
(
"This map is read-only"
);
}
checkConcurrentWrite
();
store
.
beforeWrite
();
currentWriteVersion
=
writeVersion
;
}
/**
* Check that no write operation is in progress.
*/
protected
void
checkConcurrentWrite
()
{
if
(
currentWriteVersion
!=
-
1
)
{
// try to detect concurrent modification
// on a best-effort basis
throw
DataUtils
.
newConcurrentModificationException
(
getName
());
}
}
/**
* This method is called after writing to the map (whether or not the write
* operation was successful).
*/
protected
void
afterWrite
()
{
currentWriteVersion
=
-
1
;
}
/**
* If there is a concurrent update to the given version, wait until it is
* finished.
*
* @param version the read version
*/
protected
void
waitUntilWritten
(
long
version
)
{
if
(
readOnly
)
{
throw
DataUtils
.
newIllegalStateException
(
DataUtils
.
ERROR_INTERNAL
,
"Waiting for writes to a read-only map"
);
}
while
(
currentWriteVersion
==
version
)
{
Thread
.
yield
();
}
}
@Override
...
...
@@ -1267,7 +1203,6 @@ public class MVMap<K, V> extends AbstractMap<K, V>
void
copyFrom
(
MVMap
<
K
,
V
>
sourceMap
)
{
beforeWrite
();
newRoot
(
copy
(
sourceMap
.
root
,
null
));
afterWrite
();
}
private
Page
copy
(
Page
source
,
CursorPos
parent
)
{
...
...
@@ -1276,11 +1211,10 @@ public class MVMap<K, V> extends AbstractMap<K, V>
Page
child
=
target
;
for
(
CursorPos
p
=
parent
;
p
!=
null
;
p
=
p
.
parent
)
{
p
.
page
.
setChild
(
p
.
index
,
child
);
p
.
page
=
copyOnWrite
(
p
.
page
,
writeVersion
);
p
.
page
=
p
.
page
.
copy
(
writeVersion
);
child
=
p
.
page
;
if
(
p
.
parent
==
null
)
{
newRoot
(
p
.
page
);
afterWrite
();
beforeWrite
();
}
}
...
...
h2/src/main/org/h2/mvstore/MVMapConcurrent.java
浏览文件 @
337f0a4f
...
...
@@ -9,17 +9,10 @@ import org.h2.mvstore.type.DataType;
import
org.h2.mvstore.type.ObjectDataType
;
/**
* A stored map. Read operations can happen concurrently with all other
* operations, without risk of corruption.
* <p>
* Write operations first read the relevant area from disk to memory
* concurrently, and only then modify the data. The in-memory part of write
* operations is synchronized. For scalable concurrent in-memory write
* operations, the map should be split into multiple smaller sub-maps that are
* then synchronized independently.
* A class used for backward compatibility.
*
* @param <K> the key
class
* @param <V> the value
class
* @param <K> the key
type
* @param <V> the value
type
*/
public
class
MVMapConcurrent
<
K
,
V
>
extends
MVMap
<
K
,
V
>
{
...
...
@@ -27,67 +20,6 @@ public class MVMapConcurrent<K, V> extends MVMap<K, V> {
super
(
keyType
,
valueType
);
}
@Override
protected
Page
copyOnWrite
(
Page
p
,
long
writeVersion
)
{
return
p
.
copy
(
writeVersion
);
}
@Override
protected
void
checkConcurrentWrite
()
{
// ignore (writes are synchronized)
}
@Override
@SuppressWarnings
(
"unchecked"
)
public
V
put
(
K
key
,
V
value
)
{
beforeWrite
();
try
{
// even if the result is the same, we still update the value
// (otherwise compact doesn't work)
get
(
key
);
long
v
=
writeVersion
;
synchronized
(
this
)
{
Page
p
=
copyOnWrite
(
root
,
v
);
p
=
splitRootIfNeeded
(
p
,
v
);
V
result
=
(
V
)
put
(
p
,
v
,
key
,
value
);
newRoot
(
p
);
return
result
;
}
}
finally
{
afterWrite
();
}
}
@Override
protected
void
waitUntilWritten
(
long
version
)
{
// no need to wait
}
@Override
@SuppressWarnings
(
"unchecked"
)
public
V
remove
(
Object
key
)
{
beforeWrite
();
try
{
V
result
=
get
(
key
);
if
(
result
==
null
)
{
return
null
;
}
long
v
=
writeVersion
;
synchronized
(
this
)
{
Page
p
=
copyOnWrite
(
root
,
v
);
result
=
(
V
)
remove
(
p
,
v
,
key
);
if
(!
p
.
isLeaf
()
&&
p
.
getTotalCount
()
==
0
)
{
p
.
removePage
();
p
=
Page
.
createEmpty
(
this
,
p
.
getVersion
());
}
newRoot
(
p
);
}
return
result
;
}
finally
{
afterWrite
();
}
}
/**
* A builder for this class.
*
...
...
h2/src/main/org/h2/mvstore/MVStore.java
浏览文件 @
337f0a4f
...
...
@@ -190,7 +190,7 @@ public class MVStore {
* The metadata map. Write access to this map needs to be synchronized on
* the store.
*/
private
MVMap
Concurrent
<
String
,
String
>
meta
;
private
MVMap
<
String
,
String
>
meta
;
private
final
ConcurrentHashMap
<
Integer
,
MVMap
<?,
?>>
maps
=
new
ConcurrentHashMap
<
Integer
,
MVMap
<?,
?>>();
...
...
@@ -283,7 +283,7 @@ public class MVStore {
}
o
=
config
.
get
(
"backgroundExceptionHandler"
);
this
.
backgroundExceptionHandler
=
(
UncaughtExceptionHandler
)
o
;
meta
=
new
MVMap
Concurrent
<
String
,
String
>(
StringDataType
.
INSTANCE
,
meta
=
new
MVMap
<
String
,
String
>(
StringDataType
.
INSTANCE
,
StringDataType
.
INSTANCE
);
HashMap
<
String
,
Object
>
c
=
New
.
hashMap
();
c
.
put
(
"id"
,
0
);
...
...
@@ -1010,7 +1010,6 @@ public class MVStore {
continue
;
}
if
(
v
>=
0
&&
v
>=
lastStoredVersion
)
{
m
.
waitUntilWritten
(
storeVersion
);
MVMap
<?,
?>
r
=
m
.
openVersion
(
storeVersion
);
if
(
r
.
getRoot
().
getPos
()
==
0
)
{
changed
.
add
(
r
);
...
...
h2/src/main/org/h2/mvstore/Page.java
浏览文件 @
337f0a4f
差异被折叠。
点击展开。
h2/src/main/org/h2/mvstore/rtree/MVRTreeMap.java
浏览文件 @
337f0a4f
...
...
@@ -121,7 +121,7 @@ public class MVRTreeMap<V> extends MVMap<SpatialKey, V> {
}
@Override
protected
Object
remove
(
Page
p
,
long
writeVersion
,
Object
key
)
{
protected
synchronized
Object
remove
(
Page
p
,
long
writeVersion
,
Object
key
)
{
Object
result
=
null
;
if
(
p
.
isLeaf
())
{
for
(
int
i
=
0
;
i
<
p
.
getKeyCount
();
i
++)
{
...
...
@@ -139,11 +139,10 @@ public class MVRTreeMap<V> extends MVMap<SpatialKey, V> {
// this will mark the old page as deleted
// so we need to update the parent in any case
// (otherwise the old page might be deleted again)
Page
c
=
c
opyOnWrite
(
cOld
,
writeVersion
);
Page
c
=
c
Old
.
copy
(
writeVersion
);
long
oldSize
=
c
.
getTotalCount
();
result
=
remove
(
c
,
writeVersion
,
key
);
p
.
setChild
(
i
,
c
);
p
.
setCounts
(
i
,
c
);
if
(
oldSize
==
c
.
getTotalCount
())
{
continue
;
}
...
...
@@ -190,45 +189,39 @@ public class MVRTreeMap<V> extends MVMap<SpatialKey, V> {
putOrAdd
(
key
,
value
,
true
);
}
private
Object
putOrAdd
(
SpatialKey
key
,
V
value
,
boolean
alwaysAdd
)
{
private
synchronized
Object
putOrAdd
(
SpatialKey
key
,
V
value
,
boolean
alwaysAdd
)
{
beforeWrite
();
try
{
long
v
=
writeVersion
;
Page
p
=
copyOnWrite
(
root
,
v
);
Object
result
;
if
(
alwaysAdd
||
get
(
key
)
==
null
)
{
if
(
p
.
getMemory
()
>
store
.
getPageSplitSize
()
&&
p
.
getKeyCount
()
>
1
)
{
// only possible if this is the root, else we would have
// split earlier (this requires pageSplitSize is fixed)
long
totalCount
=
p
.
getTotalCount
();
Page
split
=
split
(
p
,
v
);
Object
k1
=
getBounds
(
p
);
Object
k2
=
getBounds
(
split
);
Object
[]
keys
=
{
k1
,
k2
};
Page
.
PageReference
[]
children
=
{
new
Page
.
PageReference
(
p
,
p
.
getPos
()),
new
Page
.
PageReference
(
split
,
split
.
getPos
()),
new
Page
.
PageReference
(
null
,
0
)
};
long
[]
counts
=
{
p
.
getTotalCount
(),
split
.
getTotalCount
(),
0
};
p
=
Page
.
create
(
this
,
v
,
2
,
keys
,
null
,
3
,
children
,
counts
,
totalCount
,
0
,
0
);
// now p is a node; continues
}
add
(
p
,
v
,
key
,
value
);
result
=
null
;
}
else
{
result
=
set
(
p
,
v
,
key
,
value
);
long
v
=
writeVersion
;
Page
p
=
root
.
copy
(
v
);
Object
result
;
if
(
alwaysAdd
||
get
(
key
)
==
null
)
{
if
(
p
.
getMemory
()
>
store
.
getPageSplitSize
()
&&
p
.
getKeyCount
()
>
3
)
{
// only possible if this is the root, else we would have
// split earlier (this requires pageSplitSize is fixed)
long
totalCount
=
p
.
getTotalCount
();
Page
split
=
split
(
p
,
v
);
Object
k1
=
getBounds
(
p
);
Object
k2
=
getBounds
(
split
);
Object
[]
keys
=
{
k1
,
k2
};
Page
.
PageReference
[]
children
=
{
new
Page
.
PageReference
(
p
,
p
.
getPos
(),
p
.
getTotalCount
()),
new
Page
.
PageReference
(
split
,
split
.
getPos
(),
split
.
getTotalCount
()),
new
Page
.
PageReference
(
null
,
0
,
0
)
};
p
=
Page
.
create
(
this
,
v
,
keys
,
null
,
children
,
totalCount
,
0
);
// now p is a node; continues
}
newRoot
(
p
);
re
turn
result
;
}
finally
{
afterWrite
(
);
add
(
p
,
v
,
key
,
value
);
re
sult
=
null
;
}
else
{
result
=
set
(
p
,
v
,
key
,
value
);
}
newRoot
(
p
);
return
result
;
}
/**
...
...
@@ -252,10 +245,9 @@ public class MVRTreeMap<V> extends MVMap<SpatialKey, V> {
if
(
contains
(
p
,
i
,
key
))
{
Page
c
=
p
.
getChildPage
(
i
);
if
(
get
(
c
,
key
)
!=
null
)
{
c
=
c
opyOnWrite
(
c
,
writeVersion
);
c
=
c
.
copy
(
writeVersion
);
Object
result
=
set
(
c
,
writeVersion
,
key
,
value
);
p
.
setChild
(
i
,
c
);
p
.
setCounts
(
i
,
c
);
return
result
;
}
}
...
...
@@ -290,14 +282,12 @@ public class MVRTreeMap<V> extends MVMap<SpatialKey, V> {
}
}
}
Page
c
=
copyOnWrite
(
p
.
getChildPage
(
index
),
writeVersion
);
if
(
c
.
getMemory
()
>
store
.
getPageSplitSize
()
&&
c
.
getKeyCount
()
>
1
)
{
Page
c
=
p
.
getChildPage
(
index
).
copy
(
writeVersion
);
if
(
c
.
getMemory
()
>
store
.
getPageSplitSize
()
&&
c
.
getKeyCount
()
>
4
)
{
// split on the way down
Page
split
=
split
(
c
,
writeVersion
);
p
=
copyOnWrite
(
p
,
writeVersion
);
p
.
setKey
(
index
,
getBounds
(
c
));
p
.
setChild
(
index
,
c
);
p
.
setCounts
(
index
,
c
);
p
.
insertNode
(
index
,
getBounds
(
split
),
split
);
// now we are not sure where to add
add
(
p
,
writeVersion
,
key
,
value
);
...
...
@@ -308,7 +298,6 @@ public class MVRTreeMap<V> extends MVMap<SpatialKey, V> {
keyType
.
increaseBounds
(
bounds
,
key
);
p
.
setKey
(
index
,
bounds
);
p
.
setChild
(
index
,
c
);
p
.
setCounts
(
index
,
c
);
}
private
Page
split
(
Page
p
,
long
writeVersion
)
{
...
...
@@ -412,20 +401,17 @@ public class MVRTreeMap<V> extends MVMap<SpatialKey, V> {
private
Page
newPage
(
boolean
leaf
,
long
writeVersion
)
{
Object
[]
values
;
Page
.
PageReference
[]
refs
;
long
[]
c
;
if
(
leaf
)
{
values
=
new
Object
[
4
]
;
values
=
Page
.
EMPTY_OBJECT_ARRAY
;
refs
=
null
;
c
=
null
;
}
else
{
values
=
null
;
refs
=
new
Page
.
PageReference
[]
{
new
Page
.
PageReference
(
null
,
0
)};
c
=
new
long
[
1
];
new
Page
.
PageReference
(
null
,
0
,
0
)};
}
return
Page
.
create
(
this
,
writeVersion
,
0
,
new
Object
[
4
]
,
values
,
leaf
?
0
:
1
,
refs
,
c
,
0
,
0
,
0
);
Page
.
EMPTY_OBJECT_ARRAY
,
values
,
refs
,
0
,
0
);
}
private
static
void
move
(
Page
source
,
Page
target
,
int
sourceIndex
)
{
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论