[FLINK-31398][sql-gateway] OperationExecutor is no longer set context…

… classloader when executing statement.
apache · Mar 29, 2023 · 171b25b · 171b25b
1 parent 0dd9bcb
commit 171b25b
Showing 1 changed file with 10 additions and 17 deletions.
diff --git a/...way/src/main/java/org/apache/flink/table/gateway/service/operation/OperationExecutor.java b/...way/src/main/java/org/apache/flink/table/gateway/service/operation/OperationExecutor.java
@@ -90,7 +90,6 @@
 import org.apache.flink.util.ExceptionUtils;
 import org.apache.flink.util.FlinkException;
 import org.apache.flink.util.Preconditions;
-import org.apache.flink.util.TemporaryClassLoaderContext;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -182,23 +181,17 @@ public ResultFetcher configureSession(OperationHandle handle, String statement)
 
     public ResultFetcher executeStatement(OperationHandle handle, String statement) {
         // Instantiate the TableEnvironment lazily
-        // TODO: remove the usage of the context classloader until {@link
-        // HiveParserUtils}#getFunctionInfo use ResourceManager explicitly.
-        try (TemporaryClassLoaderContext ignored =
-                TemporaryClassLoaderContext.of(
-                        sessionContext.getSessionState().resourceManager.getUserClassLoader())) {
-            TableEnvironmentInternal tableEnv = getTableEnvironment();
-            List<Operation> parsedOperations = tableEnv.getParser().parse(statement);
-            if (parsedOperations.size() > 1) {
-                throw new UnsupportedOperationException(
-                        "Unsupported SQL statement! Execute statement only accepts a single SQL statement or "
-                                + "multiple 'INSERT INTO' statements wrapped in a 'STATEMENT SET' block.");
-            }
-            Operation op = parsedOperations.get(0);
-            return sessionContext.isStatementSetState()
-                    ? executeOperationInStatementSetState(tableEnv, handle, op)
-                    : executeOperation(tableEnv, handle, op);
+        TableEnvironmentInternal tableEnv = getTableEnvironment();
+        List<Operation> parsedOperations = tableEnv.getParser().parse(statement);
+        if (parsedOperations.size() > 1) {
+            throw new UnsupportedOperationException(
+                    "Unsupported SQL statement! Execute statement only accepts a single SQL statement or "
+                            + "multiple 'INSERT INTO' statements wrapped in a 'STATEMENT SET' block.");
         }
+        Operation op = parsedOperations.get(0);
+        return sessionContext.isStatementSetState()
+                ? executeOperationInStatementSetState(tableEnv, handle, op)
+                : executeOperation(tableEnv, handle, op);
     }
 
     public String getCurrentCatalog() {