Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
为 GitLab 提交贡献
登录/注册
切换导航
H
h2database
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分枝图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
分枝图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
Administrator
h2database
Commits
18882d36
提交
18882d36
authored
14 年前
作者:
Thomas Mueller
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
LOB files were not deleted when running DROP ALL OBJECTS.
上级
7249a6bb
隐藏空白字符变更
内嵌
并排
正在显示
3 个修改的文件
包含
35 行增加
和
4 行删除
+35
-4
DropTable.java
h2/src/main/org/h2/command/ddl/DropTable.java
+0
-3
RegularTable.java
h2/src/main/org/h2/table/RegularTable.java
+3
-1
TestLob.java
h2/src/test/org/h2/test/db/TestLob.java
+32
-0
没有找到文件。
h2/src/main/org/h2/command/ddl/DropTable.java
浏览文件 @
18882d36
...
...
@@ -30,7 +30,6 @@ public class DropTable extends SchemaCommand {
private
String
tableName
;
private
Table
table
;
private
DropTable
next
;
private
int
dropTableId
;
private
int
dropAction
=
SysProperties
.
DROP_RESTRICT
?
ConstraintReferential
.
RESTRICT
:
ConstraintReferential
.
CASCADE
;
public
DropTable
(
Session
session
,
Schema
schema
)
{
...
...
@@ -68,7 +67,6 @@ public class DropTable extends SchemaCommand {
throw
DbException
.
get
(
ErrorCode
.
TABLE_OR_VIEW_NOT_FOUND_1
,
tableName
);
}
}
else
{
dropTableId
=
table
.
getId
();
session
.
getUser
().
checkRight
(
table
,
Right
.
ALL
);
if
(!
table
.
canDrop
())
{
throw
DbException
.
get
(
ErrorCode
.
CANNOT_DROP_TABLE_1
,
tableName
);
...
...
@@ -100,7 +98,6 @@ public class DropTable extends SchemaCommand {
table
.
setModified
();
Database
db
=
session
.
getDatabase
();
db
.
removeSchemaObject
(
session
,
table
);
db
.
getLobStorage
().
removeAllForTable
(
dropTableId
);
}
if
(
next
!=
null
)
{
next
.
executeDrop
();
...
...
This diff is collapsed.
Click to expand it.
h2/src/main/org/h2/table/RegularTable.java
浏览文件 @
18882d36
...
...
@@ -81,7 +81,6 @@ public class RegularTable extends TableBase {
for
(
Column
col
:
getColumns
())
{
if
(
DataType
.
isLargeObject
(
col
.
getType
()))
{
containsLargeObject
=
true
;
memoryPerRow
=
Row
.
MEMORY_CALCULATE
;
}
}
traceLock
=
database
.
getTrace
(
Trace
.
LOCK
);
...
...
@@ -646,6 +645,9 @@ public class RegularTable extends TableBase {
}
scanIndex
.
remove
(
session
);
database
.
removeMeta
(
session
,
getId
());
if
(
containsLargeObject
)
{
database
.
getLobStorage
().
removeAllForTable
(
getId
());
}
scanIndex
=
null
;
lockExclusive
=
null
;
lockShared
=
null
;
...
...
This diff is collapsed.
Click to expand it.
h2/src/test/org/h2/test/db/TestLob.java
浏览文件 @
18882d36
...
...
@@ -49,6 +49,7 @@ public class TestLob extends TestBase {
}
public
void
test
()
throws
Exception
{
testDropAllObjects
();
testDelete
();
testTempFilesDeleted
();
testAddLobRestart
();
...
...
@@ -82,6 +83,37 @@ public class TestLob extends TestBase {
FileSystem
.
getInstance
(
TEMP_DIR
).
deleteRecursive
(
TEMP_DIR
,
true
);
}
private
void
testDropAllObjects
()
throws
Exception
{
if
(
SysProperties
.
LOB_IN_DATABASE
||
config
.
memory
)
{
return
;
}
deleteDb
(
"lob"
);
Connection
conn
;
Statement
stat
;
conn
=
getConnection
(
"lob"
);
stat
=
conn
.
createStatement
();
stat
.
execute
(
"create table test(id int primary key, name clob)"
);
stat
.
execute
(
"insert into test values(1, space(10000))"
);
assertEquals
(
1
,
IOUtils
.
listFiles
(
getBaseDir
()
+
"/lob.lobs.db"
).
length
);
stat
.
execute
(
"drop table test"
);
assertEquals
(
0
,
IOUtils
.
listFiles
(
getBaseDir
()
+
"/lob.lobs.db"
).
length
);
stat
.
execute
(
"create table test(id int primary key, name clob)"
);
stat
.
execute
(
"insert into test values(1, space(10000))"
);
assertEquals
(
1
,
IOUtils
.
listFiles
(
getBaseDir
()
+
"/lob.lobs.db"
).
length
);
stat
.
execute
(
"drop all objects"
);
assertEquals
(
0
,
IOUtils
.
listFiles
(
getBaseDir
()
+
"/lob.lobs.db"
).
length
);
stat
.
execute
(
"create table test(id int primary key, name clob)"
);
stat
.
execute
(
"insert into test values(1, space(10000))"
);
assertEquals
(
1
,
IOUtils
.
listFiles
(
getBaseDir
()
+
"/lob.lobs.db"
).
length
);
stat
.
execute
(
"truncate table test"
);
assertEquals
(
0
,
IOUtils
.
listFiles
(
getBaseDir
()
+
"/lob.lobs.db"
).
length
);
conn
.
close
();
}
private
void
testDelete
()
throws
Exception
{
if
(!
SysProperties
.
LOB_IN_DATABASE
||
config
.
memory
)
{
return
;
...
...
This diff is collapsed.
Click to expand it.
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论