Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
为 GitLab 提交贡献
登录/注册
切换导航
H
h2database
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分枝图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
分枝图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
Administrator
h2database
Commits
d16d3a16
提交
d16d3a16
authored
11月 18, 2015
作者:
S.Vladykin
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' of
https://github.com/h2database/h2database
into row
上级
dc31cd5f
f21d0c31
隐藏空白字符变更
内嵌
并排
正在显示
3 个修改的文件
包含
24 行增加
和
45 行删除
+24
-45
TestAnnotationProcessor.java
h2/src/test/org/h2/test/ap/TestAnnotationProcessor.java
+1
-1
TestFunctions.java
h2/src/test/org/h2/test/db/TestFunctions.java
+0
-43
Build.java
h2/src/tools/org/h2/build/Build.java
+23
-1
没有找到文件。
h2/src/test/org/h2/test/ap/TestAnnotationProcessor.java
浏览文件 @
d16d3a16
...
@@ -45,7 +45,7 @@ public class TestAnnotationProcessor extends AbstractProcessor {
...
@@ -45,7 +45,7 @@ public class TestAnnotationProcessor extends AbstractProcessor {
}
}
public
SourceVersion
getSupportedSourceVersion
()
{
public
SourceVersion
getSupportedSourceVersion
()
{
return
SourceVersion
.
RELEASE_6
;
return
SourceVersion
.
latest
()
;
}
}
@Override
@Override
...
...
h2/src/test/org/h2/test/db/TestFunctions.java
浏览文件 @
d16d3a16
...
@@ -1782,49 +1782,6 @@ public class TestFunctions extends TestBase implements AggregateFunction {
...
@@ -1782,49 +1782,6 @@ public class TestFunctions extends TestBase implements AggregateFunction {
}
}
private
void
testAnnotationProcessorsOutput
()
throws
SQLException
{
private
void
testAnnotationProcessorsOutput
()
throws
SQLException
{
testAnnotationProcessorsOutput_emptyKey
();
testAnnotationProcessorsOutput_invalidKey
();
testAnnotationProcessorsOutput_oneInvalidKey
();
testAnnotationProcessorsOutput_warnAndError
();
}
private
void
testAnnotationProcessorsOutput_emptyKey
()
throws
SQLException
{
try
{
System
.
setProperty
(
TestAnnotationProcessor
.
MESSAGES_KEY
,
""
);
callCompiledFunction
(
"test_atp_empty_key"
);
}
finally
{
System
.
clearProperty
(
TestAnnotationProcessor
.
MESSAGES_KEY
);
}
}
private
void
testAnnotationProcessorsOutput_invalidKey
()
throws
SQLException
{
try
{
System
.
setProperty
(
TestAnnotationProcessor
.
MESSAGES_KEY
,
"invalid"
);
callCompiledFunction
(
"test_atp_invalid_key"
);
fail
();
}
catch
(
JdbcSQLException
e
)
{
assertEquals
(
ErrorCode
.
SYNTAX_ERROR_1
,
e
.
getErrorCode
());
assertContains
(
e
.
getMessage
(),
"'invalid'"
);
}
finally
{
System
.
clearProperty
(
TestAnnotationProcessor
.
MESSAGES_KEY
);
}
}
private
void
testAnnotationProcessorsOutput_oneInvalidKey
()
throws
SQLException
{
try
{
System
.
setProperty
(
TestAnnotationProcessor
.
MESSAGES_KEY
,
"invalid,foo"
);
callCompiledFunction
(
"test_atp_one_invalid_key"
);
fail
();
}
catch
(
JdbcSQLException
e
)
{
assertEquals
(
ErrorCode
.
SYNTAX_ERROR_1
,
e
.
getErrorCode
());
assertContains
(
e
.
getMessage
(),
"enum"
);
assertContains
(
e
.
getMessage
(),
"Kind.invalid"
);
}
finally
{
System
.
clearProperty
(
TestAnnotationProcessor
.
MESSAGES_KEY
);
}
}
private
void
testAnnotationProcessorsOutput_warnAndError
()
throws
SQLException
{
try
{
try
{
System
.
setProperty
(
TestAnnotationProcessor
.
MESSAGES_KEY
,
"WARNING,foo1|ERROR,foo2"
);
System
.
setProperty
(
TestAnnotationProcessor
.
MESSAGES_KEY
,
"WARNING,foo1|ERROR,foo2"
);
callCompiledFunction
(
"test_atp_warn_and_error"
);
callCompiledFunction
(
"test_atp_warn_and_error"
);
...
...
h2/src/tools/org/h2/build/Build.java
浏览文件 @
d16d3a16
...
@@ -14,7 +14,6 @@ import java.net.Socket;
...
@@ -14,7 +14,6 @@ import java.net.Socket;
import
java.util.HashMap
;
import
java.util.HashMap
;
import
java.util.TreeMap
;
import
java.util.TreeMap
;
import
java.util.Map.Entry
;
import
java.util.Map.Entry
;
import
org.h2.build.code.SwitchSource
;
import
org.h2.build.code.SwitchSource
;
import
org.h2.build.doc.XMLParser
;
import
org.h2.build.doc.XMLParser
;
...
@@ -401,6 +400,23 @@ public class Build extends BuildBase {
...
@@ -401,6 +400,23 @@ public class Build extends BuildBase {
writeFile
(
new
File
(
fileName
),
checksums
.
getBytes
());
writeFile
(
new
File
(
fileName
),
checksums
.
getBytes
());
}
}
private
static
String
canonicalPath
(
File
file
)
{
try
{
return
file
.
getCanonicalPath
();
}
catch
(
IOException
e
)
{
throw
new
RuntimeException
(
e
);
}
}
private
FileList
excludeTestMetaInfFiles
(
FileList
files
)
{
FileList
testMetaInfFiles
=
files
(
"src/test/META-INF"
);
int
basePathLength
=
canonicalPath
(
new
File
(
"src/test"
)).
length
();
for
(
File
file
:
testMetaInfFiles
)
{
files
=
files
.
exclude
(
canonicalPath
(
file
).
substring
(
basePathLength
+
1
));
}
return
files
;
}
/**
/**
* Create the regular h2.jar file.
* Create the regular h2.jar file.
*/
*/
...
@@ -424,6 +440,7 @@ public class Build extends BuildBase {
...
@@ -424,6 +440,7 @@ public class Build extends BuildBase {
exclude
(
"*.sh"
).
exclude
(
"*.sh"
).
exclude
(
"*.txt"
).
exclude
(
"*.txt"
).
exclude
(
"*.DS_Store"
);
exclude
(
"*.DS_Store"
);
files
=
excludeTestMetaInfFiles
(
files
);
jar
(
"bin/h2"
+
getJarSuffix
(),
files
,
"temp"
);
jar
(
"bin/h2"
+
getJarSuffix
(),
files
,
"temp"
);
filter
(
"src/installer/h2.sh"
,
"bin/h2.sh"
,
"h2.jar"
,
"h2"
+
getJarSuffix
());
filter
(
"src/installer/h2.sh"
,
"bin/h2.sh"
,
"h2.jar"
,
"h2"
+
getJarSuffix
());
filter
(
"src/installer/h2.bat"
,
"bin/h2.bat"
,
"h2.jar"
,
"h2"
+
getJarSuffix
());
filter
(
"src/installer/h2.bat"
,
"bin/h2.bat"
,
"h2.jar"
,
"h2"
+
getJarSuffix
());
...
@@ -455,6 +472,7 @@ public class Build extends BuildBase {
...
@@ -455,6 +472,7 @@ public class Build extends BuildBase {
exclude
(
"*.sh"
).
exclude
(
"*.sh"
).
exclude
(
"*.txt"
).
exclude
(
"*.txt"
).
exclude
(
"*.DS_Store"
);
exclude
(
"*.DS_Store"
);
files
=
excludeTestMetaInfFiles
(
files
);
files
.
add
(
new
File
(
"temp/org/h2/tools/DeleteDbFiles.class"
));
files
.
add
(
new
File
(
"temp/org/h2/tools/DeleteDbFiles.class"
));
files
.
add
(
new
File
(
"temp/org/h2/tools/CompressTool.class"
));
files
.
add
(
new
File
(
"temp/org/h2/tools/CompressTool.class"
));
jar
(
"bin/h2android"
+
getJarSuffix
(),
files
,
"temp"
);
jar
(
"bin/h2android"
+
getJarSuffix
(),
files
,
"temp"
);
...
@@ -479,6 +497,7 @@ public class Build extends BuildBase {
...
@@ -479,6 +497,7 @@ public class Build extends BuildBase {
exclude
(
"*.sh"
).
exclude
(
"*.sh"
).
exclude
(
"*.txt"
).
exclude
(
"*.txt"
).
exclude
(
"*.DS_Store"
);
exclude
(
"*.DS_Store"
);
files
=
excludeTestMetaInfFiles
(
files
);
long
kb
=
jar
(
"bin/h2-client"
+
getJarSuffix
(),
files
,
"temp"
);
long
kb
=
jar
(
"bin/h2-client"
+
getJarSuffix
(),
files
,
"temp"
);
if
(
kb
<
350
||
kb
>
450
)
{
if
(
kb
<
350
||
kb
>
450
)
{
throw
new
RuntimeException
(
"Expected file size 350 - 450 KB, got: "
+
kb
);
throw
new
RuntimeException
(
"Expected file size 350 - 450 KB, got: "
+
kb
);
...
@@ -493,6 +512,7 @@ public class Build extends BuildBase {
...
@@ -493,6 +512,7 @@ public class Build extends BuildBase {
manifestMVStore
();
manifestMVStore
();
FileList
files
=
files
(
"temp"
);
FileList
files
=
files
(
"temp"
);
files
.
exclude
(
"*.DS_Store"
);
files
.
exclude
(
"*.DS_Store"
);
files
=
excludeTestMetaInfFiles
(
files
);
jar
(
"bin/h2-mvstore"
+
getJarSuffix
(),
files
,
"temp"
);
jar
(
"bin/h2-mvstore"
+
getJarSuffix
(),
files
,
"temp"
);
}
}
...
@@ -525,6 +545,7 @@ public class Build extends BuildBase {
...
@@ -525,6 +545,7 @@ public class Build extends BuildBase {
exclude
(
"*.sh"
).
exclude
(
"*.sh"
).
exclude
(
"*.txt"
).
exclude
(
"*.txt"
).
exclude
(
"*.DS_Store"
);
exclude
(
"*.DS_Store"
);
files
=
excludeTestMetaInfFiles
(
files
);
files
.
add
(
new
File
(
"temp/org/h2/tools/DeleteDbFiles.class"
));
files
.
add
(
new
File
(
"temp/org/h2/tools/DeleteDbFiles.class"
));
files
.
add
(
new
File
(
"temp/org/h2/tools/CompressTool.class"
));
files
.
add
(
new
File
(
"temp/org/h2/tools/CompressTool.class"
));
jar
(
"bin/h2small"
+
getJarSuffix
(),
files
,
"temp"
);
jar
(
"bin/h2small"
+
getJarSuffix
(),
files
,
"temp"
);
...
@@ -540,6 +561,7 @@ public class Build extends BuildBase {
...
@@ -540,6 +561,7 @@ public class Build extends BuildBase {
FileList
files
=
files
(
"temp/org/h2/jaqu"
);
FileList
files
=
files
(
"temp/org/h2/jaqu"
);
files
.
addAll
(
files
(
"temp/META-INF/MANIFEST.MF"
));
files
.
addAll
(
files
(
"temp/META-INF/MANIFEST.MF"
));
files
.
exclude
(
"*.DS_Store"
);
files
.
exclude
(
"*.DS_Store"
);
files
=
excludeTestMetaInfFiles
(
files
);
jar
(
"bin/h2jaqu"
+
getJarSuffix
(),
files
,
"temp"
);
jar
(
"bin/h2jaqu"
+
getJarSuffix
(),
files
,
"temp"
);
}
}
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论