Move copyValueListToArrayWriter method to ValueList

facebookincubator · Mar 25, 2024 · 6ed8a1b · 6ed8a1b
1 parent 0517ccc
commit 6ed8a1b
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 20 deletions.
diff --git a/velox/exec/tests/SimpleArrayAggAggregate.cpp b/velox/exec/tests/SimpleArrayAggAggregate.cpp
@@ -25,26 +25,6 @@ using namespace facebook::velox::exec;
 namespace facebook::velox::aggregate {
 
 namespace {
-
-// Write ValueList accumulators to Array-typed intermediate or final result
-// vectors.
-// TODO: This API only works if it is the only logic writing to `writer`.
-template <typename T>
-void copyValueListToArrayWriter(ArrayWriter<T>& writer, ValueList& elements) {
-  writer.resetLength();
-  auto size = elements.size();
-  if (size == 0) {
-    return;
-  }
-  writer.reserve(size);
-
-  ValueListReader reader(elements);
-  for (vector_size_t i = 0; i < size; ++i) {
-    reader.next(*writer.elementsVector(), writer.valuesOffset() + i);
-  }
-  writer.resize(size);
-}
-
 class ArrayAggAggregate {
  public:
   // Type(s) of input vector(s) wrapped in Row.

diff --git a/velox/functions/lib/aggregates/ValueList.h b/velox/functions/lib/aggregates/ValueList.h
@@ -19,9 +19,12 @@
 #include "velox/common/memory/HashStringAllocator.h"
 #include "velox/exec/Aggregate.h"
 #include "velox/expression/ComplexViewTypes.h"
+#include "velox/expression/ComplexWriterTypes.h"
 #include "velox/vector/ComplexVector.h"
 #include "velox/vector/DecodedVector.h"
 
+using namespace facebook::velox::exec;
+
 namespace facebook::velox::aggregate {
 
 // Represents a list of values, including nulls, for an array/map/distinct value
@@ -132,4 +135,23 @@ class ValueListReader {
   vector_size_t pos_{0};
 };
 
+// Write ValueList accumulators to Array-typed intermediate or final result
+// vectors.
+// TODO: This API only works if it is the only logic writing to `writer`.
+template <typename T>
+void copyValueListToArrayWriter(ArrayWriter<T>& writer, ValueList& elements) {
+  writer.resetLength();
+  auto size = elements.size();
+  if (size == 0) {
+    return;
+  }
+  writer.reserve(size);
+
+  ValueListReader reader(elements);
+  for (vector_size_t i = 0; i < size; ++i) {
+    reader.next(*writer.elementsVector(), writer.valuesOffset() + i);
+  }
+  writer.resize(size);
+}
+
 } // namespace facebook::velox::aggregate