-
-
Notifications
You must be signed in to change notification settings - Fork 6
feat(trino): Add 481 #1518
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
Merged
Merged
feat(trino): Add 481 #1518
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
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 hidden or 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 hidden or 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,5 +1,5 @@ | ||
| [metadata.registries] | ||
| "oci.stackable.tech" = { namespace = "sdp" } | ||
|
|
||
| [versions."479".local-images] | ||
| java-base = "25" | ||
| [versions."481".local-images] | ||
| java-base = "25" # Same version as the "trino" image |
This file contains hidden or 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,5 +1,8 @@ | ||
| [versions."361".local-images] | ||
| java-devel = "24" | ||
| java-devel = "24" # Same version as Trino 477 | ||
|
|
||
| [versions."386".local-images] | ||
| java-devel = "25" | ||
| java-devel = "25" # Same version as Trino 479 | ||
|
|
||
| [versions."424".local-images] | ||
| java-devel = "25" # Same version as Trino 481 |
35 changes: 35 additions & 0 deletions
35
...ift/stackable/patches/424/0001-Apply-max-response-header-size-to-Jetty-maxResponseH.patch
This file contains hidden or 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,35 @@ | ||
| From 359fe4dbf5154df20701cea742177bd874949009 Mon Sep 17 00:00:00 2001 | ||
| From: Lukas Krug <lukas.krug@stackable.tech> | ||
| Date: Wed, 27 May 2026 21:58:48 +0200 | ||
| Subject: Apply max response header size to Jetty maxResponseHeaderSize | ||
|
|
||
| --- | ||
| .../src/main/java/io/airlift/http/server/HttpServer.java | 2 +- | ||
| .../src/main/java/io/airlift/http/server/HttpServerConfig.java | 1 + | ||
| 2 files changed, 2 insertions(+), 1 deletion(-) | ||
|
|
||
| diff --git a/http-server/src/main/java/io/airlift/http/server/HttpServer.java b/http-server/src/main/java/io/airlift/http/server/HttpServer.java | ||
| index 49a7de9374..fe3fa345aa 100644 | ||
| --- a/http-server/src/main/java/io/airlift/http/server/HttpServer.java | ||
| +++ b/http-server/src/main/java/io/airlift/http/server/HttpServer.java | ||
| @@ -204,7 +204,7 @@ public class HttpServer | ||
| baseHttpConfiguration.setRequestHeaderSize(toIntExact(config.getMaxRequestHeaderSize().toBytes())); | ||
| } | ||
| if (config.getMaxResponseHeaderSize() != null) { | ||
| - baseHttpConfiguration.setResponseHeaderSize(toIntExact(config.getMaxResponseHeaderSize().toBytes())); | ||
| + baseHttpConfiguration.setMaxResponseHeaderSize(toIntExact(config.getMaxResponseHeaderSize().toBytes())); | ||
| } | ||
| if (config.getOutputBufferSize() != null) { | ||
| baseHttpConfiguration.setOutputBufferSize(toIntExact(config.getOutputBufferSize().toBytes())); | ||
| diff --git a/http-server/src/main/java/io/airlift/http/server/HttpServerConfig.java b/http-server/src/main/java/io/airlift/http/server/HttpServerConfig.java | ||
| index ee53d470f6..3abbfeaabb 100644 | ||
| --- a/http-server/src/main/java/io/airlift/http/server/HttpServerConfig.java | ||
| +++ b/http-server/src/main/java/io/airlift/http/server/HttpServerConfig.java | ||
| @@ -387,6 +387,7 @@ public class HttpServerConfig | ||
| return this; | ||
| } | ||
|
|
||
| + @MaxDataSize("1GB") | ||
| public DataSize getMaxResponseHeaderSize() | ||
| { | ||
| return maxResponseHeaderSize; |
This file contains hidden or 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,2 @@ | ||
| mirror = "https://github.com/stackabletech/airlift.git" | ||
| base = "9714f9095cea760f8a195f15c44a7f4f909ff23c" |
This file contains hidden or 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 hidden or 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,11 +1,11 @@ | ||
| [versions."477".local-images] | ||
| java-devel = "24" | ||
| # Airlift version comes from <dep.airlift.version> in | ||
| # https://github.com/trinodb/trino/blob/477/pom.xml | ||
| "trino/airlift" = "361" | ||
| java-devel = "24" # Same version as the "trino" image | ||
| "trino/airlift" = "361" # https://github.com/trinodb/trino/blob/477/pom.xml#L184 (dep.airlift.version) | ||
|
|
||
| [versions."479".local-images] | ||
| java-devel = "25" | ||
| # Airlift version comes from <dep.airlift.version> in | ||
| # https://github.com/trinodb/trino/blob/479/pom.xml | ||
| "trino/airlift" = "386" | ||
| java-devel = "25" # Same version as the "trino" image | ||
| "trino/airlift" = "386" # https://github.com/trinodb/trino/blob/479/pom.xml#L185 (dep.airlift.version) | ||
|
|
||
| [versions."481".local-images] | ||
| java-devel = "25" # Same version as the "trino" image | ||
| "trino/airlift" = "424" # https://github.com/trinodb/trino/blob/481/pom.xml#L188 (dep.airlift.version) |
This file contains hidden or 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 hidden or 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
38 changes: 38 additions & 0 deletions
38
trino/trino/stackable/patches/481/0001-Add-CycloneDX-plugin.patch
This file contains hidden or 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,38 @@ | ||
| From 8a2396b467657c4f6fefc6a213148af062d45064 Mon Sep 17 00:00:00 2001 | ||
| From: Lukas Voetmand <lukas.voetmand@stackable.tech> | ||
| Date: Fri, 6 Sep 2024 17:53:52 +0200 | ||
| Subject: Add CycloneDX plugin | ||
|
|
||
| --- | ||
| pom.xml | 18 ++++++++++++++++++ | ||
| 1 file changed, 18 insertions(+) | ||
|
|
||
| diff --git a/pom.xml b/pom.xml | ||
| index 06089658e13..64211354c06 100644 | ||
| --- a/pom.xml | ||
| +++ b/pom.xml | ||
| @@ -2841,6 +2841,24 @@ | ||
| </excludes> | ||
| </configuration> | ||
| </plugin> | ||
| + <plugin> | ||
| + <groupId>org.cyclonedx</groupId> | ||
| + <artifactId>cyclonedx-maven-plugin</artifactId> | ||
| + <version>2.9.1</version> | ||
| + <configuration> | ||
| + <projectType>application</projectType> | ||
| + <schemaVersion>1.6</schemaVersion> | ||
| + <skipNotDeployed>false</skipNotDeployed> | ||
| + </configuration> | ||
| + <executions> | ||
| + <execution> | ||
| + <goals> | ||
| + <goal>makeBom</goal> | ||
| + </goals> | ||
| + <phase>package</phase> | ||
| + </execution> | ||
| + </executions> | ||
| + </plugin> | ||
| </plugins> | ||
| </build> | ||
|
|
44 changes: 44 additions & 0 deletions
44
...ino/stackable/patches/481/0002-Disable-web-ui-code-checking-because-flow-v0.241.0-f.patch
This file contains hidden or 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,44 @@ | ||
| From 25c453b54fcf184934d3057d4f57606ddf8594ea Mon Sep 17 00:00:00 2001 | ||
| From: dervoeti <lukas.krug@stackable.tech> | ||
| Date: Wed, 18 Jun 2025 14:05:10 +0200 | ||
| Subject: Disable web-ui code checking, because flow v0.241.0 for non-x86 | ||
| systems requires glibc 2.35, as of 2026-06-02 our UBI image comes with glibc | ||
| 2.34. This patch can likely be removed once we ship a newer version of glibc. | ||
|
|
||
| --- | ||
| core/trino-web-ui/pom.xml | 22 ---------------------- | ||
| 1 file changed, 22 deletions(-) | ||
|
|
||
| diff --git a/core/trino-web-ui/pom.xml b/core/trino-web-ui/pom.xml | ||
| index 986d69101b2..3eb18fc3a2d 100644 | ||
| --- a/core/trino-web-ui/pom.xml | ||
| +++ b/core/trino-web-ui/pom.xml | ||
| @@ -104,28 +104,6 @@ | ||
| <workingDirectory>src/main/resources/webapp/src</workingDirectory> | ||
| </configuration> | ||
| </execution> | ||
| - <execution> | ||
| - <id>check (webapp)</id> | ||
| - <goals> | ||
| - <goal>npm</goal> | ||
| - </goals> | ||
| - <phase>verify</phase> | ||
| - <configuration> | ||
| - <arguments>run ${frontend.check.goal}</arguments> | ||
| - <workingDirectory>src/main/resources/webapp/src</workingDirectory> | ||
| - </configuration> | ||
| - </execution> | ||
| - <execution> | ||
| - <id>check (webapp-preview)</id> | ||
| - <goals> | ||
| - <goal>npm</goal> | ||
| - </goals> | ||
| - <phase>verify</phase> | ||
| - <configuration> | ||
| - <arguments>run ${frontend.check.goal}</arguments> | ||
| - <workingDirectory>src/main/resources/webapp-preview</workingDirectory> | ||
| - </configuration> | ||
| - </execution> | ||
| <execution> | ||
| <id>package (webapp-preview)</id> | ||
| <goals> |
This file contains hidden or 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,2 @@ | ||
| mirror = "https://github.com/stackabletech/trino.git" | ||
| base = "c4ac66cb4f86728b48f15b10d6ab3c1aa0166d3c" |
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.
Uh oh!
There was an error while loading. Please reload this page.