Skip to content

Commit b3ea478

Browse files
dnestorodnestoro
authored
Merge pull request #43 from mhalbritter/mh/fix-h2-metadata
Fix H2 metadata
2 parents bf0d957 + f7bf1b8 commit b3ea478

File tree

5 files changed

+123
-78
lines changed

5 files changed

+123
-78
lines changed

‎metadata/com.h2database/h2/2.1.210/index.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
[
2-
"reflect-config.json"
2+
"reflect-config.json",
3+
"resource-config.json"
34
]

‎metadata/com.h2database/h2/2.1.210/reflect-config.json‎

Lines changed: 87 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -1,212 +1,225 @@
11
[
22
{
33
"condition": {
4-
"typeReachable": "org.h2.store.fs.FilePath"
4+
"typeReachable": "org.h2.mvstore.type.MetaType"
55
},
6-
"methods": [
6+
"name": "org.h2.mvstore.db.LobStorageMap$BlobMeta$Type",
7+
"fields": [
78
{
8-
"name": "<init>",
9-
"parameterTypes": []
9+
"name": "INSTANCE"
1010
}
11-
],
12-
"name": "org.h2.store.fs.FilePathDisk"
11+
]
1312
},
1413
{
1514
"condition": {
16-
"typeReachable": "org.h2.store.fs.FilePath"
15+
"typeReachable": "org.h2.mvstore.type.MetaType"
1716
},
18-
"methods": [
17+
"name": "org.h2.mvstore.db.LobStorageMap$BlobReference$Type",
18+
"fields": [
1919
{
20-
"name": "<init>",
21-
"parameterTypes": []
20+
"name": "INSTANCE"
2221
}
23-
],
24-
"name": "org.h2.store.fs.mem.FilePathMem"
22+
]
2523
},
2624
{
2725
"condition": {
28-
"typeReachable": "org.h2.store.fs.FilePath"
26+
"typeReachable": "org.h2.mvstore.type.MetaType"
2927
},
30-
"methods": [
28+
"name": "org.h2.mvstore.db.NullValueDataType",
29+
"fields": [
3130
{
32-
"name": "<init>",
33-
"parameterTypes": []
31+
"name": "INSTANCE"
3432
}
35-
],
36-
"name": "org.h2.store.fs.mem.FilePathMemLZF"
33+
]
3734
},
3835
{
3936
"condition": {
40-
"typeReachable": "org.h2.store.fs.FilePath"
37+
"typeReachable": "org.h2.mvstore.tx.VersionedValueType$Factory"
4138
},
39+
"name": "org.h2.mvstore.db.RowDataType$Factory",
4240
"methods": [
4341
{
4442
"name": "<init>",
4543
"parameterTypes": []
4644
}
47-
],
48-
"name": "org.h2.store.fs.niomem.FilePathNioMem"
45+
]
4946
},
5047
{
5148
"condition": {
52-
"typeReachable": "org.h2.store.fs.FilePath"
49+
"typeReachable": "org.h2.mvstore.type.MetaType"
5350
},
51+
"name": "org.h2.mvstore.tx.VersionedValueType$Factory",
5452
"methods": [
5553
{
5654
"name": "<init>",
5755
"parameterTypes": []
5856
}
59-
],
60-
"name": "org.h2.store.fs.niomem.FilePathNioMemLZF"
57+
]
6158
},
6259
{
6360
"condition": {
64-
"typeReachable": "org.h2.store.fs.FilePath"
61+
"typeReachable": "org.h2.mvstore.type.MetaType"
6562
},
66-
"methods": [
63+
"name": "org.h2.mvstore.type.ByteArrayDataType",
64+
"fields": [
6765
{
68-
"name": "<init>",
69-
"parameterTypes": []
66+
"name": "INSTANCE"
7067
}
71-
],
72-
"name": "org.h2.store.fs.split.FilePathSplit"
68+
]
69+
},
70+
{
71+
"condition": {
72+
"typeReachable": "org.h2.mvstore.type.MetaType"
73+
},
74+
"name": "org.h2.mvstore.type.LongDataType",
75+
"fields": [
76+
{
77+
"name": "INSTANCE"
78+
}
79+
]
7380
},
7481
{
7582
"condition": {
7683
"typeReachable": "org.h2.store.fs.FilePath"
7784
},
85+
"name": "org.h2.store.fs.async.FilePathAsync",
7886
"methods": [
7987
{
8088
"name": "<init>",
8189
"parameterTypes": []
8290
}
83-
],
84-
"name": "org.h2.store.fs.niomapped.FilePathNioMapped"
91+
]
8592
},
8693
{
8794
"condition": {
8895
"typeReachable": "org.h2.store.fs.FilePath"
8996
},
97+
"name": "org.h2.store.fs.disk.FilePathDisk",
9098
"methods": [
9199
{
92100
"name": "<init>",
93101
"parameterTypes": []
94102
}
95-
],
96-
"name": "org.h2.store.fs.async.FilePathAsync"
103+
]
97104
},
98105
{
99106
"condition": {
100107
"typeReachable": "org.h2.store.fs.FilePath"
101108
},
109+
"name": "org.h2.store.fs.mem.FilePathMem",
102110
"methods": [
103111
{
104112
"name": "<init>",
105113
"parameterTypes": []
106114
}
107-
],
108-
"name": "org.h2.store.fs.zip.FilePathZip"
115+
]
109116
},
110117
{
111118
"condition": {
112119
"typeReachable": "org.h2.store.fs.FilePath"
113120
},
121+
"name": "org.h2.store.fs.mem.FilePathMemLZF",
114122
"methods": [
115123
{
116124
"name": "<init>",
117125
"parameterTypes": []
118126
}
119-
],
120-
"name": "org.h2.store.fs.retry.FilePathRetryOnInterrupt"
127+
]
121128
},
122129
{
123130
"condition": {
124-
"typeReachable": "org.h2.mvstore.type.MetaType"
131+
"typeReachable": "org.h2.store.fs.FilePath"
125132
},
126-
"fields": [
133+
"name": "org.h2.store.fs.niomapped.FilePathNioMapped",
134+
"methods": [
127135
{
128-
"name": "INSTANCE"
136+
"name": "<init>",
137+
"parameterTypes": []
129138
}
130-
],
131-
"name": "org.h2.mvstore.type.ByteArrayDataType"
139+
]
132140
},
133141
{
134142
"condition": {
135-
"typeReachable": "org.h2.mvstore.type.MetaType"
143+
"typeReachable": "org.h2.store.fs.FilePath"
136144
},
137-
"fields": [
145+
"name": "org.h2.store.fs.niomem.FilePathNioMem",
146+
"methods": [
138147
{
139-
"name": "INSTANCE"
148+
"name": "<init>",
149+
"parameterTypes": []
140150
}
141-
],
142-
"name": "org.h2.mvstore.type.LongDataType"
151+
]
143152
},
144153
{
145154
"condition": {
146-
"typeReachable": "org.h2.mvstore.type.MetaType"
155+
"typeReachable": "org.h2.store.fs.FilePath"
147156
},
148-
"fields": [
157+
"name": "org.h2.store.fs.niomem.FilePathNioMemLZF",
158+
"methods": [
149159
{
150-
"name": "INSTANCE"
160+
"name": "<init>",
161+
"parameterTypes": []
151162
}
152-
],
153-
"name": "org.h2.mvstore.type.StringDataType"
163+
]
154164
},
155165
{
156166
"condition": {
157-
"typeReachable": "org.h2.mvstore.type.MetaType"
167+
"typeReachable": "org.h2.store.fs.FilePath"
158168
},
159-
"fields": [
169+
"name": "org.h2.store.fs.retry.FilePathRetryOnInterrupt",
170+
"methods": [
160171
{
161-
"name": "INSTANCE"
172+
"name": "<init>",
173+
"parameterTypes": []
162174
}
163-
],
164-
"name": "org.h2.mvstore.db.NullValueDataType"
175+
]
165176
},
166177
{
167178
"condition": {
168-
"typeReachable": "org.h2.mvstore.type.MetaType"
179+
"typeReachable": "org.h2.store.fs.FilePath"
169180
},
170-
"fields": [
181+
"name": "org.h2.store.fs.split.FilePathSplit",
182+
"methods": [
171183
{
172-
"name": "INSTANCE"
184+
"name": "<init>",
185+
"parameterTypes": []
173186
}
174-
],
175-
"name": "org.h2.mvstore.db.LobStorageMap$BlobReference$Type"
187+
]
176188
},
177189
{
178190
"condition": {
179-
"typeReachable": "org.h2.mvstore.type.MetaType"
191+
"typeReachable": "org.h2.store.fs.FilePath"
180192
},
181-
"fields": [
193+
"name": "org.h2.store.fs.zip.FilePathZip",
194+
"methods": [
182195
{
183-
"name": "INSTANCE"
196+
"name": "<init>",
197+
"parameterTypes": []
184198
}
185-
],
186-
"name": "org.h2.mvstore.db.LobStorageMap$BlobMeta$Type"
199+
]
187200
},
188201
{
189202
"condition": {
190-
"typeReachable": "org.h2.mvstore.type.MetaType"
203+
"typeReachable": "org.h2.util.MathUtils"
191204
},
205+
"name": "sun.security.provider.SHA",
192206
"methods": [
193207
{
194208
"name": "<init>",
195209
"parameterTypes": []
196210
}
197-
],
198-
"name": "org.h2.mvstore.tx.VersionedValueType$Factory"
211+
]
199212
},
200213
{
201214
"condition": {
202-
"typeReachable": "org.h2.mvstore.type.MetaType"
215+
"typeReachable": "org.h2.util.MathUtils"
203216
},
217+
"name": "sun.security.provider.SecureRandom",
204218
"methods": [
205219
{
206220
"name": "<init>",
207221
"parameterTypes": []
208222
}
209-
],
210-
"name": "org.h2.mvstore.db.RowDataType$Factory"
223+
]
211224
}
212225
]

‎metadata/com.h2database/h2/2.1.210/resource-config.json‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{
2+
"bundles": [],
3+
"resources": {
4+
"includes": [
5+
{
6+
"condition": {
7+
"typeReachable": "org.h2.util.Utils"
8+
},
9+
"pattern": "\\Qorg/h2/util/data.zip\\E"
10+
}
11+
]
12+
}
13+
}

‎tests/src/com.h2database/h2/2.1.210/build.gradle‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,17 @@ dependencies {
1919
}
2020

2121
graalvmNative {
22-
binaries {
23-
test {
24-
buildArgs.add('--allow-incomplete-classpath')
22+
agent {
23+
defaultMode = "conditional"
24+
modes {
25+
conditional {
26+
userCodeFilterPath = "user-code-filter.json"
27+
}
28+
}
29+
metadataCopy {
30+
mergeWithExisting = true
31+
inputTaskNames.add("test")
32+
outputDirectories.add("src/test/resources/META-INF/native-image/com.h2database/h2")
2533
}
2634
}
2735
}

‎tests/src/com.h2database/h2/2.1.210/user-code-filter.json‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"rules": [
3+
{
4+
"excludeClasses": "**"
5+
},
6+
{
7+
"includeClasses": "org.h2.**"
8+
}
9+
]
10+
}

0 commit comments

Comments
 (0)