Skip to content

[FLINK-39687] [sql-gateway] Fix URI dependency conversion in SessionContext #28529

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.

Sign up for GitHub

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

Open
qiuyanjun888 wants to merge 2 commits into
base: master
Choose a base branch
from
+65 −1
Open

[FLINK-39687] [sql-gateway] Fix URI dependency conversion in SessionContext #28529

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1d04ab2
[FLINK-39687][sql-gateway] Fix URI dependency conversion in SessionCo…
qiuyanjun888 Jun 25, 2026
70a206b
[FLINK-39687][sql-gateway] Address schemeless dependency URI review
qiuyanjun888 Jun 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 18 additions & 1 deletion ...-gateway/src/main/java/org/apache/flink/table/gateway/service/context/SessionContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,8 @@
import javax.annotation.Nullable;

import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URI;
import java.net.URL;
import java.net.URLClassLoader;
import java.nio.file.Path;
Expand Down Expand Up @@ -304,7 +306,7 @@ public static SessionContext create(
initializeConfiguration(defaultContext, environment, sessionId);
final MutableURLClassLoader userClassLoader =
FlinkUserCodeClassLoaders.create(
defaultContext.getDependencies().toArray(new URL[0]),
getDependencyURLs(defaultContext),
SessionContext.class.getClassLoader(),
configuration);
final ResourceManager resourceManager = new ResourceManager(configuration, userClassLoader);
Expand All @@ -318,6 +320,21 @@ public static SessionContext create(
new OperationManager(operationExecutorService));
}

private static URL[] getDependencyURLs(DefaultContext defaultContext) {
return defaultContext.getDependencies().stream()
.map(SessionContext::toURL)
.toArray(URL[]::new);
}

private static URL toURL(URI uri) {
try {
return uri.toURL();
} catch (MalformedURLException | IllegalArgumentException e) {
throw new SqlGatewayException(
String.format("Failed to convert dependency URI '%s' to URL.", uri), e);
}
}

// ------------------------------------------------------------------------------------------------------------------
// Helpers
// ------------------------------------------------------------------------------------------------------------------
Expand Down
47 changes: 47 additions & 0 deletions ...eway/src/test/java/org/apache/flink/table/gateway/service/context/SessionContextTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
import org.apache.flink.table.gateway.api.session.SessionEnvironment;
import org.apache.flink.table.gateway.api.session.SessionHandle;
import org.apache.flink.table.gateway.api.utils.MockedEndpointVersion;
import org.apache.flink.table.gateway.api.utils.SqlGatewayException;
import org.apache.flink.table.gateway.api.utils.ThreadUtils;

import org.junit.jupiter.api.AfterAll;
Expand All @@ -40,6 +41,7 @@
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;

import java.net.URI;
import java.nio.file.Path;
import java.util.Arrays;
import java.util.Collections;
Expand All @@ -54,6 +56,7 @@
import static org.apache.flink.table.api.config.TableConfigOptions.TABLE_SQL_DIALECT;
import static org.apache.flink.table.catalog.CommonCatalogOptions.TABLE_CATALOG_STORE_KIND;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;

/** Test {@link SessionContext}. */
class SessionContextTest {
Expand Down Expand Up @@ -146,6 +149,50 @@ void testSetAndResetArbitraryKey() {
.matches((conf) -> !conf.containsKey("aa") && !conf.containsKey("bb"));
}

@Test
void testCreateContextWithDependencies(@TempDir Path dependencyDirectory) throws Exception {
DefaultContext defaultContext =
new DefaultContext(
new Configuration(),
Collections.singletonList(dependencyDirectory.toUri()));
SessionEnvironment environment =
SessionEnvironment.newBuilder()
.setSessionEndpointVersion(MockedEndpointVersion.V1)
.build();

SessionContext context =
SessionContext.create(
defaultContext, SessionHandle.create(), environment, EXECUTOR_SERVICE);
try {
assertThat(context.getUserClassloader().getURLs())
.contains(dependencyDirectory.toUri().toURL());
} finally {
context.close();
}
}

@Test
void testCreateContextWrapsSchemelessDependencyUri() {
DefaultContext defaultContext =
new DefaultContext(
new Configuration(), Collections.singletonList(URI.create("foo.jar")));
SessionEnvironment environment =
SessionEnvironment.newBuilder()
.setSessionEndpointVersion(MockedEndpointVersion.V1)
.build();

assertThatThrownBy(
() ->
SessionContext.create(
defaultContext,
SessionHandle.create(),
environment,
EXECUTOR_SERVICE))
.isInstanceOf(SqlGatewayException.class)
.hasMessageContaining("Failed to convert dependency URI 'foo.jar' to URL.")
.hasCauseInstanceOf(IllegalArgumentException.class);
}

@Test
void testCreateContextWithListeners() {
assertThat(
Expand Down