Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
为 GitLab 提交贡献
登录/注册
切换导航
H
h2database
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分枝图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
分枝图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
Administrator
h2database
Commits
4f64bcd2
提交
4f64bcd2
authored
7 年前
作者:
Evgenij Ryazanov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Replace conditions that check Constants.VERSION_MINOR with constants
上级
82ffee2e
隐藏空白字符变更
内嵌
并排
正在显示
5 个修改的文件
包含
29 行增加
和
31 行删除
+29
-31
DbSettings.java
h2/src/main/org/h2/engine/DbSettings.java
+2
-2
SysProperties.java
h2/src/main/org/h2/engine/SysProperties.java
+6
-9
TestAll.java
h2/src/test/org/h2/test/TestAll.java
+1
-1
TestCases.java
h2/src/test/org/h2/test/db/TestCases.java
+19
-18
TestSpaceReuse.java
h2/src/test/org/h2/test/db/TestSpaceReuse.java
+1
-1
没有找到文件。
h2/src/main/org/h2/engine/DbSettings.java
浏览文件 @
4f64bcd2
...
...
@@ -329,10 +329,10 @@ public class DbSettings extends SettingsBase {
/**
* Database setting <code>MV_STORE</code>
* (default:
false for version 1.3, true for version 1.4
).<br />
* (default:
true
).<br />
* Use the MVStore storage engine.
*/
public
boolean
mvStore
=
get
(
"MV_STORE"
,
Constants
.
VERSION_MINOR
>=
4
);
public
boolean
mvStore
=
get
(
"MV_STORE"
,
true
);
/**
* Database setting <code>COMPRESS</code>
...
...
This diff is collapsed.
Click to expand it.
h2/src/main/org/h2/engine/SysProperties.java
浏览文件 @
4f64bcd2
...
...
@@ -332,12 +332,11 @@ public class SysProperties {
/**
* System property <code>h2.oldStyleOuterJoin</code>
* (default:
true for version 1.3, false for version 1.4
).<br />
* (default:
false
).<br />
* Limited support for the old-style Oracle outer join with "(+)".
*/
public
static
final
boolean
OLD_STYLE_OUTER_JOIN
=
Utils
.
getProperty
(
"h2.oldStyleOuterJoin"
,
Constants
.
VERSION_MINOR
<
4
);
Utils
.
getProperty
(
"h2.oldStyleOuterJoin"
,
false
);
/**
* System property {@code h2.oldResultSetGetObject}, {@code true} by default.
...
...
@@ -439,13 +438,12 @@ public class SysProperties {
/**
* System property <code>h2.sortBinaryUnsigned</code>
* (default:
false with version 1.3, true with version 1.4
).<br />
* (default:
true
).<br />
* Whether binary data should be sorted in unsigned mode
* (0xff is larger than 0x00).
*/
public
static
final
boolean
SORT_BINARY_UNSIGNED
=
Utils
.
getProperty
(
"h2.sortBinaryUnsigned"
,
Constants
.
VERSION_MINOR
>=
4
);
Utils
.
getProperty
(
"h2.sortBinaryUnsigned"
,
true
);
/**
* System property <code>h2.sortNullsHigh</code> (default: false).<br />
...
...
@@ -493,13 +491,12 @@ public class SysProperties {
/**
* System property <code>h2.implicitRelativePath</code>
* (default:
true for version 1.3, false for version 1.4
).<br />
* (default:
false
).<br />
* If disabled, relative paths in database URLs need to be written as
* jdbc:h2:./test instead of jdbc:h2:test.
*/
public
static
final
boolean
IMPLICIT_RELATIVE_PATH
=
Utils
.
getProperty
(
"h2.implicitRelativePath"
,
Constants
.
VERSION_MINOR
<
4
);
Utils
.
getProperty
(
"h2.implicitRelativePath"
,
false
);
/**
* System property <code>h2.urlMap</code> (default: null).<br />
...
...
This diff is collapsed.
Click to expand it.
h2/src/test/org/h2/test/TestAll.java
浏览文件 @
4f64bcd2
...
...
@@ -286,7 +286,7 @@ java org.h2.test.TestAll timer
/**
* Whether the MVStore storage is used.
*/
public
boolean
mvStore
=
Constants
.
VERSION_MINOR
>=
4
;
public
boolean
mvStore
=
true
;
/**
* If the test should run with many rows.
...
...
This diff is collapsed.
Click to expand it.
h2/src/test/org/h2/test/db/TestCases.java
浏览文件 @
4f64bcd2
...
...
@@ -20,7 +20,7 @@ import java.util.List;
import
java.util.Random
;
import
java.util.concurrent.TimeUnit
;
import
org.h2.api.ErrorCode
;
import
org.h2.engine.
Constant
s
;
import
org.h2.engine.
SysPropertie
s
;
import
org.h2.store.fs.FileUtils
;
import
org.h2.test.TestBase
;
...
...
@@ -1265,23 +1265,21 @@ public class TestCases extends TestBase {
Statement
stat
=
conn
.
createStatement
();
ResultSet
rs
;
// test the default (SIGNED)
if
(
Constants
.
VERSION_MINOR
<
4
)
{
stat
.
execute
(
"create table bin( x binary(1) );"
);
stat
.
execute
(
"insert into bin(x) values (x'09'),(x'0a'),(x'99'),(x'aa');"
);
rs
=
stat
.
executeQuery
(
"select * from bin order by x;"
);
rs
.
next
();
assertEquals
(
"99"
,
rs
.
getString
(
1
));
rs
.
next
();
assertEquals
(
"aa"
,
rs
.
getString
(
1
));
rs
.
next
();
assertEquals
(
"09"
,
rs
.
getString
(
1
));
rs
.
next
();
assertEquals
(
"0a"
,
rs
.
getString
(
1
));
stat
.
execute
(
"drop table bin"
);
}
// test UNSIGNED mode
// test the SIGNED mode
stat
.
execute
(
"SET BINARY_COLLATION SIGNED"
);
stat
.
execute
(
"create table bin( x binary(1) );"
);
stat
.
execute
(
"insert into bin(x) values (x'09'),(x'0a'),(x'99'),(x'aa');"
);
rs
=
stat
.
executeQuery
(
"select * from bin order by x;"
);
rs
.
next
();
assertEquals
(
"99"
,
rs
.
getString
(
1
));
rs
.
next
();
assertEquals
(
"aa"
,
rs
.
getString
(
1
));
rs
.
next
();
assertEquals
(
"09"
,
rs
.
getString
(
1
));
rs
.
next
();
assertEquals
(
"0a"
,
rs
.
getString
(
1
));
stat
.
execute
(
"drop table bin"
);
// test UNSIGNED mode (default)
stat
.
execute
(
"SET BINARY_COLLATION UNSIGNED"
);
stat
.
execute
(
"create table bin( x binary(1) );"
);
stat
.
execute
(
"insert into bin(x) values (x'09'),(x'0a'),(x'99'),(x'aa');"
);
...
...
@@ -1294,6 +1292,9 @@ public class TestCases extends TestBase {
assertEquals
(
"99"
,
rs
.
getString
(
1
));
rs
.
next
();
assertEquals
(
"aa"
,
rs
.
getString
(
1
));
stat
.
execute
(
"drop table bin"
);
stat
.
execute
(
"SET BINARY_COLLATION "
+
(
SysProperties
.
SORT_BINARY_UNSIGNED
?
"UNSIGNED"
:
"SIGNED"
));
conn
.
close
();
}
...
...
This diff is collapsed.
Click to expand it.
h2/src/test/org/h2/test/db/TestSpaceReuse.java
浏览文件 @
4f64bcd2
...
...
@@ -45,7 +45,7 @@ public class TestSpaceReuse extends TestBase {
conn
.
createStatement
().
execute
(
"delete from t"
);
conn
.
close
();
String
fileName
=
getBaseDir
()
+
"/spaceReuse"
;
if
(
Constants
.
VERSION_MINOR
>=
4
)
{
if
(
config
.
mvStore
)
{
fileName
+=
Constants
.
SUFFIX_MV_FILE
;
}
else
{
fileName
+=
Constants
.
SUFFIX_PAGE_FILE
;
...
...
This diff is collapsed.
Click to expand it.
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论