Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
为 GitLab 提交贡献
登录/注册
切换导航
H
h2database
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分枝图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
分枝图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
Administrator
h2database
Commits
0d3a6cc7
提交
0d3a6cc7
authored
15 年前
作者:
Thomas Mueller
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Page store: shrink the log
上级
94484549
全部展开
隐藏空白字符变更
内嵌
并排
正在显示
6 个修改的文件
包含
292 行增加
和
110 行删除
+292
-110
roadmap.html
h2/src/docsrc/html/roadmap.html
+1
-0
DataReader.java
h2/src/main/org/h2/store/DataReader.java
+149
-0
PageLog.java
h2/src/main/org/h2/store/PageLog.java
+99
-86
PageStore.java
h2/src/main/org/h2/store/PageStore.java
+6
-7
Recover.java
h2/src/main/org/h2/tools/Recover.java
+14
-17
TestTwoPhaseCommit.java
h2/src/test/org/h2/test/db/TestTwoPhaseCommit.java
+23
-0
没有找到文件。
h2/src/docsrc/html/roadmap.html
浏览文件 @
0d3a6cc7
...
...
@@ -451,6 +451,7 @@ See also <a href="build.html#providing_patches">Providing Patches</a>.
</li><li>
Issue 107: Prefer using the ORDER BY index if LIMIT is used.
</li><li>
Support reading sequences using DatabaseMetaData.getTables(null, null, null, new String[]{"SEQUENCE"}).
See PostgreSQL.
</li><li>
Add option to enable TCP_NODELAY using Socket.setTcpNoDelay(true).
</li></ul>
<h2>
Not Planned
</h2>
...
...
This diff is collapsed.
Click to expand it.
h2/src/main/org/h2/store/DataReader.java
0 → 100644
浏览文件 @
0d3a6cc7
/*
* Copyright 2004-2009 H2 Group. Multiple-Licensed under the H2 License,
* Version 1.0, and under the Eclipse Public License, Version 1.0
* (http://h2database.com/html/license.html).
* Initial Developer: H2 Group
*/
package
org
.
h2
.
store
;
import
java.io.EOFException
;
import
java.io.IOException
;
import
java.io.InputStream
;
import
org.h2.util.IOUtils
;
/**
* This class is backed by an input stream and supports reading values and
* variable size data.
*/
public
class
DataReader
{
private
static
final
EOFException
EOF
=
new
EOFException
();
private
InputStream
in
;
/**
* Create a new data reader.
*
* @param in the input stream
*/
public
DataReader
(
InputStream
in
)
{
this
.
in
=
in
;
}
/**
* Read a byte.
*
* @return the byte
*/
public
byte
read
()
throws
IOException
{
int
x
=
in
.
read
();
if
(
x
<
0
)
{
throw
EOF
;
}
return
(
byte
)
x
;
}
/**
* Read a variable size integer.
*
* @return the value
*/
public
int
readVarInt
()
throws
IOException
{
int
b
=
read
();
if
(
b
>=
0
)
{
return
b
;
}
int
x
=
b
&
0x7f
;
b
=
read
();
if
(
b
>=
0
)
{
return
x
|
(
b
<<
7
);
}
x
|=
(
b
&
0x7f
)
<<
7
;
b
=
read
();
if
(
b
>=
0
)
{
return
x
|
(
b
<<
14
);
}
x
|=
(
b
&
0x7f
)
<<
14
;
b
=
read
();
if
(
b
>=
0
)
{
return
x
|
b
<<
21
;
}
return
x
|
((
b
&
0x7f
)
<<
21
)
|
(
read
()
<<
28
);
}
/**
* Read a variable size long.
*
* @return the value
*/
public
long
readVarLong
()
throws
IOException
{
long
x
=
read
();
if
(
x
>=
0
)
{
return
x
;
}
x
&=
0x7f
;
for
(
int
s
=
7
;;
s
+=
7
)
{
long
b
=
read
();
x
|=
(
b
&
0x7f
)
<<
s
;
if
(
b
>=
0
)
{
return
x
;
}
}
}
/**
* Read an integer.
*
* @return the value
*/
public
int
readInt
()
throws
IOException
{
return
(
read
()
<<
24
)
+
((
read
()
&
0xff
)
<<
16
)
+
((
read
()
&
0xff
)
<<
8
)
+
(
read
()
&
0xff
);
}
/**
* Read a long.
*
* @return the value
*/
public
long
readLong
()
throws
IOException
{
return
((
long
)
(
readInt
())
<<
32
)
+
(
readInt
()
&
0xffffffff
L
);
}
/**
* Read a number of bytes.
*
* @param buff the target buffer
* @param offset the offset within the target buffer
* @param len the number of bytes to read
*/
public
void
readFully
(
byte
[]
buff
,
int
offset
,
int
len
)
throws
IOException
{
int
got
=
IOUtils
.
readFully
(
in
,
buff
,
offset
,
len
);
if
(
got
<
len
)
{
throw
EOF
;
}
}
/**
* Read a string from the stream.
*
* @return the string
*/
public
String
readString
()
throws
IOException
{
int
len
=
readVarInt
();
return
readString
(
len
);
}
private
String
readString
(
int
len
)
throws
IOException
{
char
[]
chars
=
new
char
[
len
];
for
(
int
i
=
0
;
i
<
len
;
i
++)
{
int
x
=
read
()
&
0xff
;
if
(
x
<
0x80
)
{
chars
[
i
]
=
(
char
)
x
;
}
else
if
(
x
>=
0xe0
)
{
chars
[
i
]
=
(
char
)
(((
x
&
0xf
)
<<
12
)
+
((
read
()
&
0x3f
)
<<
6
)
+
(
read
()
&
0x3f
));
}
else
{
chars
[
i
]
=
(
char
)
(((
x
&
0x1f
)
<<
6
)
+
(
read
()
&
0x3f
));
}
}
return
new
String
(
chars
);
}
}
This diff is collapsed.
Click to expand it.
h2/src/main/org/h2/store/PageLog.java
浏览文件 @
0d3a6cc7
差异被折叠。
点击展开。
h2/src/main/org/h2/store/PageStore.java
浏览文件 @
0d3a6cc7
...
...
@@ -79,16 +79,15 @@ import org.h2.value.ValueString;
*/
public
class
PageStore
implements
CacheWriter
{
// TODO fix page format of ..
// TODO log: use varInt / varLong
// TODO check commit delay
// TODO record: replace getPos() with long getKey() in page store
// TODO long primary keys don't use delegating index yet (setPos(): int)
// TODO update: only log the key and changed values
// TODO implement checksum; 0 for empty pages
// TODO undo log: (option) fully compress empty pages
// TODO undo log: don't store empty space between head and data
// TODO undo log: lzf compression
// TODO long primary keys don't use delegating index yet (setPos(): int)
// TODO maybe remove parent pointer
// TODO update: only log the key and changed values
// TODO maybe remove some parent pointers
// TODO index creation: use less space (ordered, split at insertion point)
// TODO test running out of disk space (using a special file system)
...
...
This diff is collapsed.
Click to expand it.
h2/src/main/org/h2/tools/Recover.java
浏览文件 @
0d3a6cc7
...
...
@@ -36,6 +36,7 @@ import org.h2.security.SHA256;
import
org.h2.store.Data
;
import
org.h2.store.DataHandler
;
import
org.h2.store.DataPage
;
import
org.h2.store.DataReader
;
import
org.h2.store.DiskFile
;
import
org.h2.store.FileLister
;
import
org.h2.store.FileStore
;
...
...
@@ -56,7 +57,6 @@ import org.h2.util.ObjectArray;
import
org.h2.util.RandomUtils
;
import
org.h2.util.SmallLRUCache
;
import
org.h2.util.StatementBuilder
;
import
org.h2.util.StringUtils
;
import
org.h2.util.TempFileDeleter
;
import
org.h2.util.Tool
;
import
org.h2.value.Value
;
...
...
@@ -899,7 +899,7 @@ public class Recover extends Tool implements DataHandler {
private
void
dumpPageLogStream
(
PrintWriter
writer
,
int
logFirstTrunkPage
,
int
logFirstDataPage
)
throws
IOException
,
SQLException
{
Data
s
=
Data
.
create
(
this
,
pageSize
);
Data
InputStream
in
=
new
DataInputStream
(
Data
Reader
in
=
new
DataReader
(
new
PageInputStream
(
writer
,
this
,
store
,
logFirstTrunkPage
,
logFirstDataPage
,
pageSize
)
);
while
(
true
)
{
...
...
@@ -908,44 +908,41 @@ public class Recover extends Tool implements DataHandler {
break
;
}
if
(
x
==
PageLog
.
UNDO
)
{
int
pageId
=
in
.
readInt
();
in
.
readFully
(
new
byte
[
pageSize
]);
int
pageId
=
in
.
read
Var
Int
();
in
.
readFully
(
new
byte
[
pageSize
]
,
0
,
pageSize
);
writer
.
println
(
"-- undo page "
+
pageId
);
}
else
if
(
x
==
PageLog
.
ADD
||
x
==
PageLog
.
REMOVE
)
{
int
sessionId
=
in
.
readInt
();
setStorage
(
in
.
readInt
());
int
sessionId
=
in
.
read
Var
Int
();
setStorage
(
in
.
read
Var
Int
());
Row
row
=
PageLog
.
readRow
(
in
,
s
);
writer
.
println
(
"-- session "
+
sessionId
+
" table "
+
storageId
+
" "
+
(
x
==
PageLog
.
ADD
?
"add"
:
"remove"
)
+
" "
+
row
.
toString
());
}
else
if
(
x
==
PageLog
.
TRUNCATE
)
{
int
sessionId
=
in
.
readInt
();
setStorage
(
in
.
readInt
());
int
sessionId
=
in
.
read
Var
Int
();
setStorage
(
in
.
read
Var
Int
());
writer
.
println
(
"-- session "
+
sessionId
+
" table "
+
storageId
+
" truncate"
);
}
else
if
(
x
==
PageLog
.
COMMIT
)
{
int
sessionId
=
in
.
readInt
();
int
sessionId
=
in
.
read
Var
Int
();
writer
.
println
(
"-- commit "
+
sessionId
);
}
else
if
(
x
==
PageLog
.
ROLLBACK
)
{
int
sessionId
=
in
.
readInt
();
int
sessionId
=
in
.
read
Var
Int
();
writer
.
println
(
"-- rollback "
+
sessionId
);
}
else
if
(
x
==
PageLog
.
PREPARE_COMMIT
)
{
int
sessionId
=
in
.
readInt
();
int
len
=
in
.
readInt
();
byte
[]
t
=
new
byte
[
len
];
in
.
readFully
(
t
);
String
transaction
=
StringUtils
.
utf8Decode
(
t
);
int
sessionId
=
in
.
readVarInt
();
String
transaction
=
in
.
readString
();
writer
.
println
(
"-- prepare commit "
+
sessionId
+
" "
+
transaction
);
}
else
if
(
x
==
PageLog
.
NOOP
)
{
// nothing to do
}
else
if
(
x
==
PageLog
.
CHECKPOINT
)
{
writer
.
println
(
"-- checkpoint"
);
}
else
if
(
x
==
PageLog
.
FREE_LOG
)
{
int
size
=
in
.
readInt
();
int
size
=
in
.
read
Var
Int
();
StringBuilder
buff
=
new
StringBuilder
(
"-- free"
);
for
(
int
i
=
0
;
i
<
size
;
i
++)
{
buff
.
append
(
' '
).
append
(
in
.
readInt
());
buff
.
append
(
' '
).
append
(
in
.
read
Var
Int
());
}
writer
.
println
(
buff
);
}
else
{
...
...
This diff is collapsed.
Click to expand it.
h2/src/test/org/h2/test/db/TestTwoPhaseCommit.java
浏览文件 @
0d3a6cc7
...
...
@@ -43,9 +43,32 @@ public class TestTwoPhaseCommit extends TestBase {
prepare
();
openWith
(
false
);
test
(
false
);
testLargeTransactionName
();
deleteDb
(
"twoPhaseCommit"
);
}
private
void
testLargeTransactionName
()
throws
SQLException
{
if
(!
config
.
pageStore
)
{
return
;
}
Connection
conn
=
getConnection
(
"twoPhaseCommit"
);
Statement
stat
=
conn
.
createStatement
();
conn
.
setAutoCommit
(
false
);
stat
.
execute
(
"CREATE TABLE TEST2(ID INT)"
);
String
name
=
"tx12345678"
;
try
{
for
(
int
i
=
0
;;
i
++)
{
stat
.
execute
(
"INSERT INTO TEST2 VALUES(1)"
);
name
+=
"x"
;
stat
.
execute
(
"PREPARE COMMIT "
+
name
);
}
}
catch
(
SQLException
e
)
{
assertKnownException
(
e
);
}
conn
.
close
();
}
private
void
test
(
boolean
rolledBack
)
throws
SQLException
{
Connection
conn
=
getConnection
(
"twoPhaseCommit"
);
Statement
stat
=
conn
.
createStatement
();
...
...
This diff is collapsed.
Click to expand it.
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论