fix ut

apache · Mar 5, 2024 · 5bdd9fa · 5bdd9fa
1 parent 3a28733
commit 5bdd9fa
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 4 deletions.
diff --git a/cpp/velox/substrait/VeloxToSubstraitExpr.cc b/cpp/velox/substrait/VeloxToSubstraitExpr.cc
@@ -541,9 +541,6 @@ const ::substrait::Expression_Literal_List& VeloxToSubstraitExprConvertor::toSub
   ::substrait::Expression_Literal_List* listLiteral =
       google::protobuf::Arena::CreateMessage<::substrait::Expression_Literal_List>(&arena);
   auto size = arrayVector->sizeAt(row);
-  if (size == 0) {
-    return *listLiteral;
-  }
   auto offset = arrayVector->offsetAt(row);
   if (arrayVector->elements()->isScalar()) {
     VELOX_DYNAMIC_SCALAR_TYPE_DISPATCH(
@@ -581,7 +578,14 @@ const ::substrait::Expression_Literal& VeloxToSubstraitExprConvertor::toSubstrai
     auto encoding = constantVector->valueVector()->encoding();
     if (encoding == VectorEncoding::Simple::ARRAY) {
       auto arrayVector = constantVector->valueVector()->as<ArrayVector>();
-      substraitField->mutable_list()->MergeFrom(toSubstraitLiteralList(arena, arrayVector, constantVector->index()));
+      auto row = constantVector->index();
+      auto size = arrayVector->sizeAt(row);
+      if (size == 0) {
+        substraitField->mutable_empty_list()->MergeFrom(
+          toSubstraitLiteralEmptyList(arena, arrayVector->elements()->type()));
+      } else {
+        substraitField->mutable_list()->MergeFrom(toSubstraitLiteralList(arena, arrayVector, row));
+      }
       return *substraitField;
     }
   }
@@ -606,4 +610,13 @@ const ::substrait::Expression_Literal& VeloxToSubstraitExprConvertor::toSubstrai
   return *substraitField;
 }
 
+const ::substrait::Type_List& VeloxToSubstraitExprConvertor::toSubstraitLiteralEmptyList(
+    google::protobuf::Arena& arena,
+    const velox::TypePtr& type) {
+  ::substrait::Type_List* emptyListLiteral =
+      google::protobuf::Arena::CreateMessage<::substrait::Type_List>(&arena);
+  emptyListLiteral->mutable_type()->MergeFrom(typeConvertor_->toSubstraitType(arena, type));
+  return *emptyListLiteral;
+}
+
 } // namespace gluten
diff --git a/cpp/velox/substrait/VeloxToSubstraitExpr.h b/cpp/velox/substrait/VeloxToSubstraitExpr.h
@@ -92,6 +92,10 @@ class VeloxToSubstraitExprConvertor {
   const ::substrait::Expression_Literal_List&
   toSubstraitLiteralList(google::protobuf::Arena& arena, const ArrayVector* arrayVector, vector_size_t row);
 
+  /// Convert an empty Velox array vector to Substrait Literal Empty List.
+  const ::substrait::Type_List&
+  toSubstraitLiteralEmptyList(google::protobuf::Arena& arena, const velox::TypePtr& type);
+
   /// Convert values in Velox complex vector to Substrait Literal.
   const ::substrait::Expression_Literal& toSubstraitLiteralComplex(
       google::protobuf::Arena& arena,