Fix ColumnExpression encode and decode unmatch (#4413)

Co-authored-by: shylock <[email protected]> Co-authored-by: Sophie <[email protected]>
vesoft-inc · Jul 18, 2022 · 930afc1 · 930afc1
1 parent 2dd6f15
commit 930afc1
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/src/common/expression/ColumnExpression.cpp b/src/common/expression/ColumnExpression.cpp
@@ -38,7 +38,7 @@ void ColumnExpression::writeTo(Encoder &encoder) const {
 }
 
 void ColumnExpression::resetFrom(Decoder &decoder) {
-  index_ = decoder.readValue().getInt();
+  index_ = decoder.readSize();
 }
 
 }  // namespace nebula
diff --git a/src/common/expression/test/ColumnExpressionTest.cpp b/src/common/expression/test/ColumnExpressionTest.cpp
@@ -53,6 +53,25 @@ TEST_F(ExpressionTest, ColumnExpression) {
     auto eval = Expression::eval(expr, gExpCtxt);
     EXPECT_EQ(eval, 1);
   }
+  // test encode and decode
+  {
+    auto originExpr = ColumnExpression::make(&pool, 0);
+    auto str = Expression::encode(*originExpr);
+    auto decodeExpr = Expression::decode(&pool, str);
+    EXPECT_EQ(*decodeExpr, *originExpr);
+  }
+  {
+    auto originExpr = ColumnExpression::make(&pool, -1);
+    auto str = Expression::encode(*originExpr);
+    auto decodeExpr = Expression::decode(&pool, str);
+    EXPECT_EQ(*decodeExpr, *originExpr);
+  }
+  {
+    auto originExpr = ColumnExpression::make(&pool, 1);
+    auto str = Expression::encode(*originExpr);
+    auto decodeExpr = Expression::decode(&pool, str);
+    EXPECT_EQ(*decodeExpr, *originExpr);
+  }
 }
 
 }  // namespace nebula