Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
为 GitLab 提交贡献
登录/注册
切换导航
H
h2database
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分枝图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
分枝图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
Administrator
h2database
Commits
bcb9441c
提交
bcb9441c
authored
15 年前
作者:
Thomas Mueller
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Page store: improved error detection in the Recover tool.
上级
4dac660d
master
noel-pr1
plus33-master
pr/267
stumc-Issue#576
version-1.1.x
version-1.4.198
version-1.4.197
version-1.4.196
version-1.4.195
version-1.4.194
version-1.4.193
version-1.4.192
version-1.4.191
version-1.4.190
version-1.4.188
version-1.4.187
version-1.4.186
version-1.4.185
version-1.4.184
version-1.4.183
version-1.4.182
version-1.4.181
version-1.4.178
version-1.4.177
version-1.3
version-1.2
version-1.1
version-1.0
无相关合并请求
隐藏空白字符变更
内嵌
并排
正在显示
1 个修改的文件
包含
58 行增加
和
10 行删除
+58
-10
Recover.java
h2/src/main/org/h2/tools/Recover.java
+58
-10
没有找到文件。
h2/src/main/org/h2/tools/Recover.java
浏览文件 @
bcb9441c
...
...
@@ -89,6 +89,7 @@ public class Recover extends Tool implements DataHandler {
private
int
pageDataHead
;
private
int
pageSize
;
private
FileStore
store
;
private
int
[]
parents
;
/**
* Options are case sensitive. Supported options are:
...
...
@@ -815,7 +816,16 @@ public class Recover extends Tool implements DataHandler {
writer
.
println
(
"-- ERROR: page size; using "
+
pageSize
);
}
int
pageCount
=
(
int
)
(
length
/
pageSize
);
parents
=
new
int
[
pageCount
];
s
=
Data
.
create
(
this
,
pageSize
);
for
(
int
i
=
3
;
i
<
pageCount
;
i
++)
{
s
.
reset
();
store
.
seek
(
i
*
pageSize
);
store
.
readFully
(
s
.
getBytes
(),
0
,
32
);
s
.
readByte
();
s
.
readShortInt
();
parents
[
i
]
=
s
.
readInt
();
}
int
logKey
=
0
,
logFirstTrunkPage
=
0
,
logFirstDataPage
=
0
;
for
(
int
i
=
1
;;
i
++)
{
if
(
i
==
3
)
{
...
...
@@ -884,10 +894,12 @@ public class Recover extends Tool implements DataHandler {
pageTypeCount
[
type
]++;
int
parentPageId
=
s
.
readInt
();
setStorage
(
s
.
readVarInt
());
int
rowCount
=
s
.
readInt
();
// row count
s
.
readInt
();
int
entries
=
s
.
readShortInt
();
writer
.
println
(
"-- page "
+
page
+
": data node "
+
(
last
?
"(last)"
:
""
)
+
" parent: "
+
parentPageId
+
" entries: "
+
entries
+
" rowCount: "
+
rowCount
);
" entries: "
+
entries
);
dumpPageDataNode
(
writer
,
s
,
page
,
entries
);
break
;
}
// type 3
...
...
@@ -914,10 +926,8 @@ public class Recover extends Tool implements DataHandler {
int
parentPageId
=
s
.
readInt
();
setStorage
(
s
.
readVarInt
());
writer
.
println
(
"-- page "
+
page
+
": b-tree node"
+
(
last
?
"(last)"
:
""
)
+
" parent: "
+
parentPageId
+
"index: "
+
storageId
);
if
(
trace
)
{
dumpPageBtreeNode
(
writer
,
s
,
!
last
);
}
" index: "
+
storageId
);
dumpPageBtreeNode
(
writer
,
s
,
page
,
!
last
);
break
;
// type 6
case
Page
.
TYPE_FREE_LIST
:
...
...
@@ -1184,20 +1194,27 @@ public class Recover extends Tool implements DataHandler {
}
}
private
void
dumpPageBtreeNode
(
PrintWriter
writer
,
Data
s
,
boolean
positionOnly
)
{
private
void
dumpPageBtreeNode
(
PrintWriter
writer
,
Data
s
,
int
pageId
,
boolean
positionOnly
)
{
int
rowCount
=
s
.
readInt
();
int
entryCount
=
s
.
readShortInt
();
int
[]
children
=
new
int
[
entryCount
+
1
];
int
[]
offsets
=
new
int
[
entryCount
];
children
[
entryCount
]
=
s
.
readInt
();
int
rightmost
=
s
.
readInt
();
checkParent
(
writer
,
pageId
,
rightmost
);
children
[
entryCount
]
=
rightmost
;
int
empty
=
Integer
.
MAX_VALUE
;
for
(
int
i
=
0
;
i
<
entryCount
;
i
++)
{
children
[
i
]
=
s
.
readInt
();
int
child
=
s
.
readInt
();
checkParent
(
writer
,
pageId
,
child
);
children
[
i
]
=
child
;
int
off
=
s
.
readShortInt
();
empty
=
Math
.
min
(
off
,
empty
);
offsets
[
i
]
=
off
;
}
empty
=
empty
-
s
.
length
();
if
(!
trace
)
{
return
;
}
writer
.
println
(
"-- empty: "
+
empty
);
for
(
int
i
=
0
;
i
<
entryCount
;
i
++)
{
int
off
=
offsets
[
i
];
...
...
@@ -1275,6 +1292,35 @@ public class Recover extends Tool implements DataHandler {
}
}
private
void
checkParent
(
PrintWriter
writer
,
long
pageId
,
long
child
)
{
if
(
child
<
0
||
child
>=
parents
.
length
)
{
writer
.
println
(
"-- ERROR ["
+
pageId
+
"] child: "
+
child
+
" page count: "
+
parents
.
length
);
}
else
if
(
parents
[(
int
)
child
]
!=
pageId
)
{
writer
.
println
(
"-- ERROR ["
+
pageId
+
"] expected child: "
+
child
+
" got: "
+
parents
[(
int
)
child
]);
}
}
private
void
dumpPageDataNode
(
PrintWriter
writer
,
Data
s
,
long
pageId
,
int
entryCount
)
{
int
[]
children
=
new
int
[
entryCount
+
1
];
long
[]
keys
=
new
long
[
entryCount
];
int
child
=
s
.
readInt
();
children
[
entryCount
]
=
child
;
checkParent
(
writer
,
pageId
,
child
);
for
(
int
i
=
0
;
i
<
entryCount
;
i
++)
{
child
=
s
.
readInt
();
children
[
i
]
=
child
;
checkParent
(
writer
,
pageId
,
child
);
keys
[
i
]
=
s
.
readVarLong
();
}
if
(!
trace
)
{
return
;
}
for
(
int
i
=
0
;
i
<
entryCount
;
i
++)
{
writer
.
println
(
"-- ["
+
i
+
"] child: "
+
children
[
i
]
+
" key: "
+
keys
[
i
]);
}
writer
.
println
(
"-- ["
+
entryCount
+
"] child: "
+
children
[
entryCount
]);
}
private
void
dumpPageDataLeaf
(
PrintWriter
writer
,
Data
s
,
boolean
last
,
long
pageId
,
int
columnCount
,
int
entryCount
)
throws
SQLException
{
long
[]
keys
=
new
long
[
entryCount
];
int
[]
offsets
=
new
int
[
entryCount
];
...
...
@@ -1299,7 +1345,10 @@ public class Recover extends Tool implements DataHandler {
if
(!
last
)
{
DataPage
s2
=
DataPage
.
create
(
this
,
pageSize
);
s
.
setPos
(
pageSize
);
long
parent
=
pageId
;
while
(
true
)
{
checkParent
(
writer
,
parent
,
next
);
parent
=
next
;
store
.
seek
(
pageSize
*
next
);
store
.
readFully
(
s2
.
getBytes
(),
0
,
pageSize
);
s2
.
reset
();
...
...
@@ -1415,7 +1464,6 @@ public class Recover extends Tool implements DataHandler {
}
sb
.
append
(
");"
);
writer
.
println
(
sb
.
toString
());
writer
.
flush
();
if
(
storageId
==
0
)
{
try
{
SimpleRow
r
=
new
SimpleRow
(
data
);
...
...
This diff is collapsed.
Click to expand it.
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论