-
Notifications
You must be signed in to change notification settings - Fork 327
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Enable std-database in native image #12068
Merged
Merged
Changes from 8 commits
Commits
Show all changes
19 commits
Select commit
Hold shift + click to select a range
5ff52a9
Enable std-database in native image
hubertp 016d400
Workaround for sqlite-jdbc NI properies bug
hubertp fddac02
fmt
hubertp 0e52149
Towards error-free Table_Tests
hubertp a4110e7
More reflect updates to make NI happy
hubertp 7f2eff2
Segfaults in NI
hubertp 882870d
Pass all Table_Tests except for Excel_Spec
hubertp a40c4d2
Make sure `awt` is included in NI resource configs
hubertp 020ad48
fix moduledeps inconsistency
hubertp af11ff7
Re-shufflings, de-duplication in resource configs
hubertp 529a036
Merge branch 'develop' into wip/hubert/12006-table-tests-ni
hubertp 3fa9622
legal
hubertp 178d3d3
Remove xalan bundle
hubertp ad024e3
PR review
hubertp 44e097e
nit
hubertp 5061dd0
Update table's reflect config
hubertp 75938ea
Potentially fix Windows NI failures
hubertp 581482a
Workaround java.awt dependency via substitution
hubertp 94c8f83
fmt
hubertp File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...e/runner/src/main/resources/META-INF/native-image/org/enso/runner/native-image.properties
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
Args=--features=org.enso.runner.EnsoLibraryFeature | ||
Args=--features=org.enso.runner.EnsoLibraryFeature,org.sqlite.nativeimage.SqliteJdbcFeature |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
14 changes: 14 additions & 0 deletions
14
...s/database/src/main/resources/META-INF/native-image/org/enso/database/reflect-config.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
[ | ||
{ | ||
"name":"org.enso.table.util.NamingProperties" | ||
}, | ||
{ | ||
"name":"java.sql.ParameterMetaData", | ||
"methods":[ | ||
{ | ||
"name":"getParameterCount", | ||
"parameterTypes":[] | ||
} | ||
] | ||
} | ||
] |
29 changes: 29 additions & 0 deletions
29
std-bits/table/src/main/resources/META-INF/native-image/org/enso/table/jni-config.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
[ | ||
{ | ||
"name":"java.awt.Color", | ||
"fields":[{"name":"value"}] | ||
}, | ||
{ | ||
"name":"java.awt.GraphicsEnvironment", | ||
hubertp marked this conversation as resolved.
Show resolved
Hide resolved
|
||
"methods":[{"name":"isHeadless","parameterTypes":[] }] | ||
}, | ||
{ | ||
"name":"java.lang.Boolean", | ||
"methods":[{"name":"getBoolean","parameterTypes":["java.lang.String"] }] | ||
}, | ||
{ | ||
"name":"java.lang.Class", | ||
"methods":[{"name":"getClassLoader","parameterTypes":[] }] | ||
}, | ||
{ | ||
"name":"java.lang.ClassLoader", | ||
"methods":[{"name":"loadClass","parameterTypes":["java.lang.String"] }] | ||
}, | ||
{ | ||
"name":"java.lang.System", | ||
"methods":[{"name":"load","parameterTypes":["java.lang.String"] }] | ||
}, | ||
{ | ||
"name":"jdk.internal.loader.ClassLoaders$AppClassLoader" | ||
} | ||
] |
18 changes: 18 additions & 0 deletions
18
std-bits/table/src/main/resources/META-INF/native-image/org/enso/table/proxy-config.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
[ | ||
{ | ||
"interfaces":["org.enso.table.util.NamingProperties"] | ||
}, | ||
{ | ||
"interfaces":["java.util.function.BiFunction"] | ||
}, | ||
{ | ||
"interfaces":["org.enso.table.data.mask.SliceRange"] | ||
}, | ||
{ | ||
"interfaces":["org.enso.table.data.table.join.lookup.LookupColumnDescription"] | ||
}, | ||
{ | ||
"interfaces":["org.enso.table.util.FunctionWithException"] | ||
} | ||
] | ||
|
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Including
java.desktop
is undesirable. What can we do to remove it?java.awt.Color
usage with a substitution?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I would prefer the last option. Configuration is rather fragile and it is easier to improve it incrementally than push it in one go.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Go on, get this in. Otherwise we need to deal #12073 (comment) forever. Once this change is in, we can polish it more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
quarkus-poi
doesn't work out-of-the-box. It seems it relies on the fact that one builds it for redhat base image:https://github.com/quarkiverse/quarkus-poi?tab=readme-ov-file#docker