Fix casting a string to a string. (#584)

vesoft-inc · Jul 12, 2021 · 8537a34 · 8537a34
1 parent fa5a8bd
commit 8537a34
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/src/common/expression/TypeCastingExpression.cpp b/src/common/expression/TypeCastingExpression.cpp
@@ -79,7 +79,11 @@ const Value& TypeCastingExpression::eval(ExpressionContext& ctx) {
             break;
         }
         case Value::Type::STRING: {
-            result_.setStr(val.toString());
+            if (val.isStr()) {
+                result_.setStr(val.moveStr());
+            } else {
+                result_.setStr(val.toString());
+            }
             break;
         }
         default: {

diff --git a/src/common/expression/test/TypeCastingExpressionTest.cpp b/src/common/expression/test/TypeCastingExpressionTest.cpp
@@ -138,6 +138,13 @@ TEST_F(TypeCastingExpressionTest, TypeCastTest) {
         EXPECT_EQ(eval.type(), Value::Type::STRING);
         EXPECT_EQ(eval, "0.23");
     }
+    {
+        auto typeCast = TypeCastingExpression::make(
+            &pool, Value::Type::STRING, ConstantExpression::make(&pool, "ABC"));
+        auto eval = Expression::eval(typeCast, gExpCtxt);
+        EXPECT_EQ(eval.type(), Value::Type::STRING);
+        EXPECT_EQ(eval, "ABC");
+    }
     {
         auto typeCast = TypeCastingExpression::make(
             &pool, Value::Type::SET, ConstantExpression::make(&pool, 23));