[INLONG-11125][SDK] Transform OperatorTools support parseBytes

apache · Sep 15, 2024 · bbe2a7a · bbe2a7a
1 parent 6203004
commit bbe2a7a
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 10 deletions.
diff --git a/...form-sdk/src/main/java/org/apache/inlong/sdk/transform/process/function/Sha2Function.java b/...form-sdk/src/main/java/org/apache/inlong/sdk/transform/process/function/Sha2Function.java
@@ -26,7 +26,6 @@
 import net.sf.jsqlparser.expression.Function;
 import org.apache.commons.codec.digest.DigestUtils;
 
-import java.nio.charset.StandardCharsets;
 import java.util.List;
 
 import static org.apache.commons.codec.digest.MessageDigestAlgorithms.SHA_224;
@@ -56,18 +55,18 @@ public Object parse(SourceData sourceData, int rowIndex, Context context) {
         if (msgObj == null || lenObj == null) {
             return null;
         }
-        String msg = msgObj.toString();
+        byte[] msgBytes = OperatorTools.parseBytes(msgObj);
         int len = Integer.parseInt(lenObj.toString());
         switch (len) {
             case 0:
             case 256:
-                return DigestUtils.sha256Hex(msg.getBytes(StandardCharsets.UTF_8));
+                return DigestUtils.sha256Hex(msgBytes);
             case 224:
-                return new DigestUtils(SHA_224).digestAsHex(msg.getBytes(StandardCharsets.UTF_8));
+                return new DigestUtils(SHA_224).digestAsHex(msgBytes);
             case 384:
-                return DigestUtils.sha384Hex(msg.getBytes(StandardCharsets.UTF_8));
+                return DigestUtils.sha384Hex(msgBytes);
             case 512:
-                return DigestUtils.sha512Hex(msg.getBytes(StandardCharsets.UTF_8));
+                return DigestUtils.sha512Hex(msgBytes);
             default:
                 return null;
         }

diff --git a/...sform-sdk/src/main/java/org/apache/inlong/sdk/transform/process/function/ShaFunction.java b/...sform-sdk/src/main/java/org/apache/inlong/sdk/transform/process/function/ShaFunction.java
@@ -25,8 +25,6 @@
 import net.sf.jsqlparser.expression.Function;
 import org.apache.commons.codec.digest.DigestUtils;
 
-import java.nio.charset.StandardCharsets;
-
 /**
  * ShaFunction
  * description: sha(string): Compute the SHA-1 160 bit checksum of a string.
@@ -48,7 +46,6 @@ public Object parse(SourceData sourceData, int rowIndex, Context context) {
         if (msgObj == null) {
             return null;
         }
-        String msg = msgObj.toString();
-        return DigestUtils.sha1Hex(msg.getBytes(StandardCharsets.UTF_8));
+        return DigestUtils.sha1Hex(OperatorTools.parseBytes(msgObj));
     }
 }
diff --git a/...orm-sdk/src/main/java/org/apache/inlong/sdk/transform/process/operator/OperatorTools.java b/...orm-sdk/src/main/java/org/apache/inlong/sdk/transform/process/operator/OperatorTools.java
@@ -32,6 +32,7 @@
 
 import java.lang.reflect.Constructor;
 import java.math.BigDecimal;
+import java.nio.charset.StandardCharsets;
 import java.sql.Date;
 import java.sql.Timestamp;
 import java.util.Map;
@@ -148,6 +149,14 @@ public static Timestamp parseTimestamp(Object value) {
         }
     }
 
+    public static byte[] parseBytes(Object value) {
+        if (value instanceof byte[]) {
+            return (byte[]) value;
+        } else {
+            return (String.valueOf(value)).getBytes(StandardCharsets.UTF_8);
+        }
+    }
+
     /**
      * compareValue
      * @param left