You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@linkis.apache.org by ca...@apache.org on 2022/08/30 14:06:56 UTC
[incubator-linkis] branch dev-1.3.0 updated: Fix issue toSting SOF #3143
This is an automated email from the ASF dual-hosted git repository.
casion pushed a commit to branch dev-1.3.0
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
The following commit(s) were added to refs/heads/dev-1.3.0 by this push:
new f9bf23ab5 Fix issue toSting SOF #3143
new 7582efe82 Merge pull request #3144 from WeDataSphere/dev-1.3.0-bug-gix
f9bf23ab5 is described below
commit f9bf23ab517ae76e76db49b20a1ae14648e43209
Author: peacewong <wp...@gmail.com>
AuthorDate: Tue Aug 30 20:18:31 2022 +0800
Fix issue toSting SOF #3143
---
.../apache/linkis/storage/resultset/StorageResultSetWriter.scala | 5 +++--
.../linkis/storage/script/writer/StorageScriptFsWriter.scala | 2 +-
.../computation/executor/cs/CSTableResultSetWriter.scala | 9 ++++-----
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/linkis-commons/linkis-storage/src/main/scala/org/apache/linkis/storage/resultset/StorageResultSetWriter.scala b/linkis-commons/linkis-storage/src/main/scala/org/apache/linkis/storage/resultset/StorageResultSetWriter.scala
index 2aaf6de81..c5f798264 100644
--- a/linkis-commons/linkis-storage/src/main/scala/org/apache/linkis/storage/resultset/StorageResultSetWriter.scala
+++ b/linkis-commons/linkis-storage/src/main/scala/org/apache/linkis/storage/resultset/StorageResultSetWriter.scala
@@ -145,8 +145,9 @@ class StorageResultSetWriter[K <: MetaData, V <: Record](
}
def closeFs: Unit = {
- if (fs != null)
+ if (fs != null) {
fs.close()
+ }
}
override def close(): Unit = {
@@ -172,7 +173,7 @@ class StorageResultSetWriter[K <: MetaData, V <: Record](
case _ =>
outputStream.flush()
}
- }(s"$toString Error encounters when flush result set ")
+ }(s"Error encounters when flush result set ")
}
}
diff --git a/linkis-commons/linkis-storage/src/main/scala/org/apache/linkis/storage/script/writer/StorageScriptFsWriter.scala b/linkis-commons/linkis-storage/src/main/scala/org/apache/linkis/storage/script/writer/StorageScriptFsWriter.scala
index 8ad4825fa..c415753c9 100644
--- a/linkis-commons/linkis-storage/src/main/scala/org/apache/linkis/storage/script/writer/StorageScriptFsWriter.scala
+++ b/linkis-commons/linkis-storage/src/main/scala/org/apache/linkis/storage/script/writer/StorageScriptFsWriter.scala
@@ -82,7 +82,7 @@ class StorageScriptFsWriter(
case _ =>
outputStream.flush()
}
- }(s"$toString Error encounters when flush script ")
+ }(s"Error encounters when flush script ")
}
def getInputStream(): InputStream = {
diff --git a/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/cs/CSTableResultSetWriter.scala b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/cs/CSTableResultSetWriter.scala
index 0d7272e11..5b39812a8 100644
--- a/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/cs/CSTableResultSetWriter.scala
+++ b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/cs/CSTableResultSetWriter.scala
@@ -18,7 +18,7 @@
package org.apache.linkis.engineconn.computation.executor.cs
import org.apache.linkis.common.io.FsPath
-import org.apache.linkis.common.utils.Logging
+import org.apache.linkis.common.utils.{Logging, Utils}
import org.apache.linkis.cs.client.service.CSTableService
import org.apache.linkis.cs.common.entity.metadata.{CSColumn, CSTable}
import org.apache.linkis.storage.resultset.StorageResultSetWriter
@@ -40,11 +40,10 @@ class CSTableResultSetWriter(
with Logging {
override def toString: String = {
- try {
+ Utils.tryCatch {
registerToCS
- } catch {
- case t: Throwable =>
- logger.info("Failed to register tmp table", t)
+ } { case t: Throwable =>
+ logger.info("Failed to register tmp table", t)
}
super.toString
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org