Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
为 GitLab 提交贡献
登录/注册
切换导航
H
h2database
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分枝图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
分枝图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
Administrator
h2database
Commits
0a6b0263
提交
0a6b0263
authored
9 年前
作者:
Thomas Mueller
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #152 from svladykin/table_engine
Table engine improvements
上级
dec792ce
c7579a70
master
noel-pr1
plus33-master
pr/267
stumc-Issue#576
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
无相关合并请求
隐藏空白字符变更
内嵌
并排
正在显示
4 个修改的文件
包含
24 行增加
和
13 行删除
+24
-13
Parser.java
h2/src/main/org/h2/command/Parser.java
+0
-2
Database.java
h2/src/main/org/h2/engine/Database.java
+17
-1
DbSettings.java
h2/src/main/org/h2/engine/DbSettings.java
+1
-1
Schema.java
h2/src/main/org/h2/schema/Schema.java
+6
-9
没有找到文件。
h2/src/main/org/h2/command/Parser.java
浏览文件 @
0a6b0263
...
...
@@ -5890,8 +5890,6 @@ public class Parser {
command
.
setTableEngineParams
(
tableEngineParams
);
}
}
}
else
if
(
database
.
getSettings
().
defaultTableEngine
!=
null
)
{
command
.
setTableEngine
(
database
.
getSettings
().
defaultTableEngine
);
}
// MySQL compatibility
if
(
readIf
(
"AUTO_INCREMENT"
))
{
...
...
This diff is collapsed.
Click to expand it.
h2/src/main/org/h2/engine/Database.java
浏览文件 @
0a6b0263
...
...
@@ -14,10 +14,10 @@ import java.util.HashSet;
import
java.util.Properties
;
import
java.util.Set
;
import
java.util.StringTokenizer
;
import
org.h2.api.DatabaseEventListener
;
import
org.h2.api.ErrorCode
;
import
org.h2.api.JavaObjectSerializer
;
import
org.h2.api.TableEngine
;
import
org.h2.command.CommandInterface
;
import
org.h2.command.ddl.CreateTableData
;
import
org.h2.command.dml.SetTypes
;
...
...
@@ -104,6 +104,7 @@ public class Database implements DataHandler {
private
final
HashMap
<
String
,
UserDataType
>
userDataTypes
=
New
.
hashMap
();
private
final
HashMap
<
String
,
UserAggregate
>
aggregates
=
New
.
hashMap
();
private
final
HashMap
<
String
,
Comment
>
comments
=
New
.
hashMap
();
private
final
HashMap
<
String
,
TableEngine
>
tableEngines
=
New
.
hashMap
();
private
final
Set
<
Session
>
userSessions
=
Collections
.
synchronizedSet
(
new
HashSet
<
Session
>());
...
...
@@ -2780,4 +2781,19 @@ public class Database implements DataHandler {
}
}
public
TableEngine
getTableEngine
(
String
tableEngine
)
{
assert
Thread
.
holdsLock
(
this
);
TableEngine
engine
=
tableEngines
.
get
(
tableEngine
);
if
(
engine
==
null
)
{
try
{
engine
=
(
TableEngine
)
JdbcUtils
.
loadUserClass
(
tableEngine
).
newInstance
();
}
catch
(
Exception
e
)
{
throw
DbException
.
convert
(
e
);
}
tableEngines
.
put
(
tableEngine
,
engine
);
}
return
engine
;
}
}
This diff is collapsed.
Click to expand it.
h2/src/main/org/h2/engine/DbSettings.java
浏览文件 @
0a6b0263
...
...
@@ -328,7 +328,7 @@ public class DbSettings extends SettingsBase {
* (default: null).<br />
* The default table engine to use for new tables.
*/
public
String
defaultTableEngine
=
get
(
"DEFAULT_TABLE_ENGINE"
,
null
);
public
final
String
defaultTableEngine
=
get
(
"DEFAULT_TABLE_ENGINE"
,
null
);
/**
* Database setting <code>MV_STORE</code>
...
...
This diff is collapsed.
Click to expand it.
h2/src/main/org/h2/schema/Schema.java
浏览文件 @
0a6b0263
...
...
@@ -8,7 +8,6 @@ package org.h2.schema;
import
java.util.ArrayList
;
import
java.util.HashMap
;
import
java.util.HashSet
;
import
org.h2.api.ErrorCode
;
import
org.h2.api.TableEngine
;
import
org.h2.command.ddl.CreateTableData
;
...
...
@@ -16,6 +15,7 @@ import org.h2.constraint.Constraint;
import
org.h2.engine.Database
;
import
org.h2.engine.DbObject
;
import
org.h2.engine.DbObjectBase
;
import
org.h2.engine.DbSettings
;
import
org.h2.engine.FunctionAlias
;
import
org.h2.engine.Session
;
import
org.h2.engine.SysProperties
;
...
...
@@ -568,18 +568,15 @@ public class Schema extends DbObjectBase {
}
data
.
schema
=
this
;
if
(
data
.
tableEngine
==
null
)
{
if
(
database
.
getSettings
().
mvStore
)
{
DbSettings
s
=
database
.
getSettings
();
if
(
s
.
defaultTableEngine
!=
null
)
{
data
.
tableEngine
=
s
.
defaultTableEngine
;
}
else
if
(
s
.
mvStore
)
{
data
.
tableEngine
=
MVTableEngine
.
class
.
getName
();
}
}
if
(
data
.
tableEngine
!=
null
)
{
TableEngine
engine
;
try
{
engine
=
(
TableEngine
)
JdbcUtils
.
loadUserClass
(
data
.
tableEngine
).
newInstance
();
}
catch
(
Exception
e
)
{
throw
DbException
.
convert
(
e
);
}
return
engine
.
createTable
(
data
);
return
database
.
getTableEngine
(
data
.
tableEngine
).
createTable
(
data
);
}
return
new
RegularTable
(
data
);
}
...
...
This diff is collapsed.
Click to expand it.
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论