[fix][runtime] Add binary function

Author: githubgxll

parser/src/main/java/io/dingodb/expr/parser/DefaultFunFactory.java

@@ -42,6 +42,7 @@
 import io.dingodb.expr.runtime.op.aggregation.SingleValueAgg;
 import io.dingodb.expr.runtime.op.aggregation.Sum0Agg;
 import io.dingodb.expr.runtime.op.aggregation.SumAgg;
+import io.dingodb.expr.runtime.op.binary.BinaryFunFactory;
 import io.dingodb.expr.runtime.op.collection.ArrayConstructorOpFactory;
 import io.dingodb.expr.runtime.op.collection.ListConstructorOpFactory;
 import io.dingodb.expr.runtime.op.collection.MapConstructorOpFactory;
@@ -259,6 +260,7 @@ public DefaultFunFactory(@NonNull ExprConfig config) {
         registerBinaryFun(Locate2FunFactory.NAME, Exprs.LOCATE2);
         registerTertiaryFun(Locate3FunFactory.NAME, Exprs.LOCATE3);
         registerUnaryFun(HexFunFactory.NAME, Exprs.HEX);
+        registerUnaryFun(BinaryFunFactory.NAME, Exprs.BINARY);
         registerBinaryFun(NumberFormatFunFactory.NAME, Exprs.FORMAT);
         registerBinaryFun(MatchesFunFactory.NAME, Exprs.MATCHES);
         registerBinaryFun(MatchesIgnoreCaseFunFactory.NAME, Exprs.MATCHES_NC);

runtime/src/main/java/io/dingodb/expr/runtime/expr/Exprs.java

@@ -55,6 +55,7 @@
 import io.dingodb.expr.runtime.op.arithmetic.NegOpFactory;
 import io.dingodb.expr.runtime.op.arithmetic.PosOpFactory;
 import io.dingodb.expr.runtime.op.arithmetic.SubOpFactory;
+import io.dingodb.expr.runtime.op.binary.BinaryFunFactory;
 import io.dingodb.expr.runtime.op.cast.BoolCastOpFactory;
 import io.dingodb.expr.runtime.op.cast.BytesCastOpFactory;
 import io.dingodb.expr.runtime.op.cast.DateCastOpFactory;
@@ -271,6 +272,7 @@ public final class Exprs {
     public static final Locate2FunFactory LOCATE2 = Locate2FunFactory.INSTANCE;
     public static final Locate3FunFactory LOCATE3 = Locate3FunFactory.INSTANCE;
     public static final HexFunFactory HEX = HexFunFactory.INSTANCE;
+    public static final BinaryFunFactory BINARY = BinaryFunFactory.INSTANCE;
     public static final NumberFormatFunFactory FORMAT = NumberFormatFunFactory.INSTANCE;
     public static final MatchesFunFactory MATCHES = MatchesFunFactory.INSTANCE;
     public static final MatchesIgnoreCaseFunFactory MATCHES_NC = MatchesIgnoreCaseFunFactory.INSTANCE;

runtime/src/main/java/io/dingodb/expr/runtime/expr/Val.java

@@ -29,6 +29,7 @@
 import io.dingodb.expr.runtime.EvalContext;
 import io.dingodb.expr.runtime.ExprCompiler;
 import io.dingodb.expr.runtime.ExprConfig;
+import io.dingodb.expr.runtime.op.binary.BinaryFunFactory;
 import io.dingodb.expr.runtime.op.string.HexFunFactory;
 import io.dingodb.expr.runtime.utils.CodecUtils;
 import lombok.EqualsAndHashCode;
@@ -169,7 +170,7 @@ private String smartToString(Object obj) {
             return wrapByFun(TimestampType.NAME, toSecond(((Timestamp) obj).getTime(), 3).toString());
         }
         if (obj instanceof byte[]) {
-            return wrapByFun(HexFunFactory.NAME, "'" + CodecUtils.bytesToHexString((byte[]) obj) + "'");
+            return wrapByFun(BinaryFunFactory.NAME, "'" + CodecUtils.bytesToHexString((byte[]) obj) + "'");
         }
         return obj.toString();
     }

runtime/src/main/java/io/dingodb/expr/runtime/op/binary/BinaryFun.java

@@ -0,0 +1,45 @@
+/*
+ * Copyright 2021 DataCanvas
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.dingodb.expr.runtime.op.binary;
+
+import io.dingodb.expr.annotations.Operators;
+import io.dingodb.expr.common.type.Type;
+import io.dingodb.expr.common.type.Types;
+import io.dingodb.expr.runtime.op.UnaryOp;
+import io.dingodb.expr.runtime.utils.CodecUtils;
+import org.checkerframework.checker.nullness.qual.NonNull;
+
+@Operators
+abstract class BinaryFun extends UnaryOp {
+    public static final String NAME = "BINARY";
+
+    private static final long serialVersionUID = 7550168473179742157L;
+
+    static byte @NonNull [] binary(@NonNull String value) {
+        return CodecUtils.hexStringToBytes(value);
+    }
+
+    @Override
+    public final Type getType() {
+        return Types.BYTES;
+    }
+
+    @Override
+    public @NonNull String getName() {
+        return NAME;
+    }
+}

test/src/test/java/io/dingodb/expr/test/TestToString.java

@@ -122,7 +122,7 @@ public class TestToString {
             arguments("or(false, null, false)", "BOOL(NULL)"),
             arguments("or(null, c, null)", "BOOL(NULL) || $[2]"),
             arguments("or(false, null, a, b, c)", "OR(BOOL(NULL), CASTBOOL($[0]), CASTBOOL($[1]), $[2])"),
-            arguments("bytes('abc')", "HEX('616263')"),
+            arguments("bytes('abc')", "BINARY('616263')"),
             arguments("case(100)", "100"),
             arguments("case(true, 1, 100)", "1"),
             arguments("case(false, 1, true, 2, 100)", "2")