Merge branch '0.3' into 0.4

* 0.3: runWithContextClassLoader in getNextPage to solve classloader issue
JingsongLi · Mar 19, 2023 · f09ea51 · f09ea51
2 parents 0fefe29 + 9c493a8
commit f09ea51
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/src/main/java/org/apache/flink/table/store/trino/TrinoPageSourceBase.java b/src/main/java/org/apache/flink/table/store/trino/TrinoPageSourceBase.java
@@ -53,6 +53,7 @@
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.function.Supplier;
 
 import static io.airlift.slice.Slices.wrappedBuffer;
 import static io.trino.spi.StandardErrorCode.GENERIC_INTERNAL_ERROR;
@@ -109,11 +110,13 @@ public boolean isFinished() {
 
     @Override
     public Page getNextPage() {
-        try {
-            return nextPage();
-        } catch (IOException e) {
-            throw new UncheckedIOException(e);
-        }
+        return ClassLoaderUtils.runWithContextClassLoader(() -> {
+            try {
+                return nextPage();
+            } catch (IOException e) {
+                throw new UncheckedIOException(e);
+            }
+        }, TrinoPageSourceBase.class.getClassLoader());
     }
 
     private Page nextPage() throws IOException {