From c6f4a8517274e834e05c9c75d44235fe8c366692 Mon Sep 17 00:00:00 2001 From: gaoyan Date: Tue, 12 Mar 2024 16:41:48 +0800 Subject: [PATCH] [Bug] fix rs filesystem some problem (#3234) Co-authored-by: gaoyan1998 --- .../src/main/java/org/dinky/url/ResourceFileSystem.java | 6 +++--- dinky-core/src/main/java/org/dinky/explainer/Explainer.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dinky-client/dinky-client-base/src/main/java/org/dinky/url/ResourceFileSystem.java b/dinky-client/dinky-client-base/src/main/java/org/dinky/url/ResourceFileSystem.java index 2b66b6c48f..009ee2d50c 100644 --- a/dinky-client/dinky-client-base/src/main/java/org/dinky/url/ResourceFileSystem.java +++ b/dinky-client/dinky-client-base/src/main/java/org/dinky/url/ResourceFileSystem.java @@ -21,6 +21,7 @@ import org.dinky.resource.BaseResourceManager; +import org.apache.flink.api.common.io.InputStreamFSInputWrapper; import org.apache.flink.core.fs.BlockLocation; import org.apache.flink.core.fs.FSDataInputStream; import org.apache.flink.core.fs.FSDataOutputStream; @@ -28,7 +29,6 @@ import org.apache.flink.core.fs.FileSystem; import org.apache.flink.core.fs.FileSystemKind; import org.apache.flink.core.fs.Path; -import org.apache.flink.core.fs.local.LocalDataInputStream; import org.apache.flink.core.fs.local.LocalFileStatus; import java.io.File; @@ -91,7 +91,7 @@ public FSDataInputStream open(Path f, int bufferSize) throws IOException { @Override public FSDataInputStream open(Path f) throws IOException { - return new LocalDataInputStream(getFile(f)); + return new InputStreamFSInputWrapper(BASE_RESOURCE_MANAGER.readFile(f.getPath())); } @Override @@ -142,6 +142,6 @@ public FileSystemKind getKind() { } public static ResourceFileSystem getSharedInstance() { - return INSTANCE; + return getInstance(); } } diff --git a/dinky-core/src/main/java/org/dinky/explainer/Explainer.java b/dinky-core/src/main/java/org/dinky/explainer/Explainer.java index 1a7b7c0ded..884d440591 100644 --- a/dinky-core/src/main/java/org/dinky/explainer/Explainer.java +++ b/dinky-core/src/main/java/org/dinky/explainer/Explainer.java @@ -215,7 +215,7 @@ public ExplainResult explainSql(String statement) { String error = StrFormatter.format( "Exception in executing FlinkSQL:\n{}\n{}", SqlUtil.addLineNumber(item.getValue()), - e.getMessage()); + LogUtil.getError(e)); resultBuilder .error(error) .explainTrue(false)