You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@linkis.apache.org by pe...@apache.org on 2023/03/14 06:49:38 UTC

[linkis] branch dev-1.3.2 updated: fix export data charset not working (#4363)

This is an automated email from the ASF dual-hosted git repository.

peacewong pushed a commit to branch dev-1.3.2
in repository https://gitbox.apache.org/repos/asf/linkis.git


The following commit(s) were added to refs/heads/dev-1.3.2 by this push:
     new 3664f2230 fix export data charset not working (#4363)
3664f2230 is described below

commit 3664f223071d06af7da47e24a324cb5714bbe7e2
Author: Casion <ca...@gmail.com>
AuthorDate: Tue Mar 14 14:49:32 2023 +0800

    fix export data charset not working (#4363)
---
 .../apache/linkis/engineplugin/spark/imexport/CsvRelation.scala   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/linkis-engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/imexport/CsvRelation.scala b/linkis-engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/imexport/CsvRelation.scala
index 4e033a524..c042b843a 100644
--- a/linkis-engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/imexport/CsvRelation.scala
+++ b/linkis-engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/imexport/CsvRelation.scala
@@ -217,7 +217,7 @@ class CsvRelation(@transient private val source: Map[String, Any]) extends Seria
         } else {
           new BufferedOutputStream(fs.append(filesystemPath))
         }
-        bufferedOutputStream.write("\n".getBytes())
+        bufferedOutputStream.write("\n".getBytes(encoding))
         bufferedOutputStream
       }
     } else {
@@ -233,17 +233,17 @@ class CsvRelation(@transient private val source: Map[String, Any]) extends Seria
         header ++= col.name ++ fieldDelimiter
       }
       if (hasHeader) {
-        out.write(header.substring(0, header.lastIndexOf(fieldDelimiter)).getBytes)
+        out.write(header.substring(0, header.lastIndexOf(fieldDelimiter)).getBytes(encoding))
       } else {
         if (iterator.hasNext) {
-          out.write(getLine(schema, iterator.next()).getBytes)
+          out.write(getLine(schema, iterator.next()).getBytes(encoding))
           index += 1
         }
       }
 
       while (index < Int.MaxValue && iterator.hasNext) {
         val msg = "\n" + getLine(schema, iterator.next())
-        out.write(msg.getBytes())
+        out.write(msg.getBytes(encoding))
         index += 1
       }
       // warn(s"Fetched ${df.columns.length} col(s) : ${index} row(s).")


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org