[doris] branch dev-1.1.2 updated: [dev-1.1.2](spark-load)Spark load supports string type data import

[yiguolei]

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

yiguolei pushed a commit to branch dev-1.1.2
in repository https://gitbox.apache.org/repos/asf/doris.git


The following commit(s) were added to refs/heads/dev-1.1.2 by this push:
     new 509f901d9b [dev-1.1.2](spark-load)Spark load supports string type data 
import
509f901d9b is described below

commit 509f901d9b4cb3409f07e14e7da32bbe8d6737a8
Author: yiguolei <yiguo...@gmail.com>
AuthorDate: Wed Aug 24 14:44:00 2022 +0800

    [dev-1.1.2](spark-load)Spark load supports string type data import
---
 .../src/main/java/org/apache/doris/load/loadv2/dpp/SparkDpp.java     | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git 
a/fe/spark-dpp/src/main/java/org/apache/doris/load/loadv2/dpp/SparkDpp.java 
b/fe/spark-dpp/src/main/java/org/apache/doris/load/loadv2/dpp/SparkDpp.java
index 4e78c63d8b..df79a7338e 100644
--- a/fe/spark-dpp/src/main/java/org/apache/doris/load/loadv2/dpp/SparkDpp.java
+++ b/fe/spark-dpp/src/main/java/org/apache/doris/load/loadv2/dpp/SparkDpp.java
@@ -403,13 +403,11 @@ public final class SparkDpp implements 
java.io.Serializable {
                     return false;
                 }
                 break;
-<<<<<<< HEAD
-=======
             case "STRING":
             case "TEXT":
                 // TODO(zjf) padding string type
                 int strDataSize = 0;
-                if (srcValue != null && (strDataSize = 
srcValue.toString().getBytes(StandardCharsets.UTF_8).length)
+                if (srcValue != null && (strDataSize = 
srcValue.toString().getBytes(java.nio.charset.StandardCharsets.UTF_8).length)
                         > DppUtils.STRING_LENGTH_LIMIT) {
                     LOG.warn(String.format("The string type is limited to a 
maximum of %s bytes."
                                     + " column_name:%s,input_str[%s],actual 
length:%s",
@@ -419,7 +417,6 @@ public final class SparkDpp implements java.io.Serializable 
{
                 break;
             default:
                 return true;
->>>>>>> 915d8989c ([feature](spark-load)Spark load supports string type data 
import (#11927))
         }
         return true;
     }


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org