Move ValueList to functions/lib/aggregates for Spark reuse

facebookincubator · Mar 22, 2024 · 4d961e6 · 4d961e6
1 parent 1ed8075
commit 4d961e6
Show file tree

Hide file tree

Showing 11 changed files with 21 additions and 11 deletions.
diff --git a/velox/exec/tests/SimpleArrayAggAggregate.cpp b/velox/exec/tests/SimpleArrayAggAggregate.cpp
@@ -18,7 +18,7 @@
 #include "velox/exec/SimpleAggregateAdapter.h"
 #include "velox/expression/FunctionSignature.h"
 #include "velox/expression/VectorWriters.h"
-#include "velox/functions/prestosql/aggregates/ValueList.h"
+#include "velox/functions/lib/aggregates/ValueList.h"
 
 using namespace facebook::velox::exec;
 

diff --git a/velox/functions/lib/aggregates/CMakeLists.txt b/velox/functions/lib/aggregates/CMakeLists.txt
@@ -15,7 +15,7 @@
 add_library(
   velox_functions_aggregates
   AverageAggregateBase.cpp CentralMomentsAggregatesBase.cpp
-  SingleValueAccumulator.cpp ValueSet.cpp)
+  SingleValueAccumulator.cpp ValueList.cpp ValueSet.cpp)
 
 target_link_libraries(velox_functions_aggregates velox_exec
                       velox_presto_serializer Folly::folly)

diff --git a/...ctions/prestosql/aggregates/ValueList.cpp → velox/functions/lib/aggregates/ValueList.cpp b/...ctions/prestosql/aggregates/ValueList.cpp → velox/functions/lib/aggregates/ValueList.cpp
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "velox/functions/prestosql/aggregates/ValueList.h"
+#include "velox/functions/lib/aggregates/ValueList.h"
 #include "velox/exec/ContainerRowSerde.h"
 
 namespace facebook::velox::aggregate {

diff --git a/...unctions/prestosql/aggregates/ValueList.h → velox/functions/lib/aggregates/ValueList.h b/...unctions/prestosql/aggregates/ValueList.h → velox/functions/lib/aggregates/ValueList.h
diff --git a/velox/functions/lib/aggregates/tests/CMakeLists.txt b/velox/functions/lib/aggregates/tests/CMakeLists.txt
@@ -13,3 +13,17 @@
 # limitations under the License.
 
 add_subdirectory(utils)
+
+add_executable(velox_functions_aggregates_test ValueListTest.cpp)
+
+add_test(NAME velox_functions_aggregates_test
+         COMMAND velox_functions_aggregates_test)
+
+target_link_libraries(
+  velox_functions_aggregates_test
+  velox_functions_aggregates
+  velox_functions_test_lib
+  Folly::folly
+  gtest
+  gtest_main
+  glog::glog)
diff --git a/...stosql/aggregates/tests/ValueListTest.cpp → ...ns/lib/aggregates/tests/ValueListTest.cpp b/...stosql/aggregates/tests/ValueListTest.cpp → ...ns/lib/aggregates/tests/ValueListTest.cpp
@@ -13,10 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "velox/functions/prestosql/aggregates/ValueList.h"
 #include <gtest/gtest.h>
+#include "velox/functions/lib/aggregates/ValueList.h"
 #include "velox/functions/prestosql/tests/utils/FunctionBaseTest.h"
-#include "velox/vector/tests/utils/VectorMaker.h"
 
 using namespace facebook::velox;
 using namespace facebook::velox::test;

diff --git a/velox/functions/prestosql/aggregates/ArrayAggAggregate.cpp b/velox/functions/prestosql/aggregates/ArrayAggAggregate.cpp
@@ -15,9 +15,8 @@
  */
 #include "velox/exec/ContainerRowSerde.h"
 #include "velox/expression/FunctionSignature.h"
+#include "velox/functions/lib/aggregates/ValueList.h"
 #include "velox/functions/prestosql/aggregates/AggregateNames.h"
-#include "velox/functions/prestosql/aggregates/ValueList.h"
-#include "velox/vector/ComplexVector.h"
 
 namespace facebook::velox::aggregate::prestosql {
 namespace {

diff --git a/velox/functions/prestosql/aggregates/CMakeLists.txt b/velox/functions/prestosql/aggregates/CMakeLists.txt
@@ -45,7 +45,6 @@ add_library(
   SetAggregates.cpp
   SumAggregate.cpp
   SumDataSizeForStatsAggregate.cpp
-  ValueList.cpp
   VarianceAggregates.cpp)
 
 target_link_libraries(

diff --git a/velox/functions/prestosql/aggregates/MapAccumulator.h b/velox/functions/prestosql/aggregates/MapAccumulator.h
@@ -19,7 +19,7 @@
 #include "velox/common/memory/HashStringAllocator.h"
 #include "velox/exec/AddressableNonNullValueList.h"
 #include "velox/exec/Strings.h"
-#include "velox/functions/prestosql/aggregates/ValueList.h"
+#include "velox/functions/lib/aggregates/ValueList.h"
 #include "velox/vector/ComplexVector.h"
 #include "velox/vector/DecodedVector.h"
 #include "velox/vector/FlatVector.h"

diff --git a/velox/functions/prestosql/aggregates/MultiMapAggAggregate.cpp b/velox/functions/prestosql/aggregates/MultiMapAggAggregate.cpp
@@ -16,8 +16,8 @@
 #include "velox/exec/AddressableNonNullValueList.h"
 #include "velox/exec/Aggregate.h"
 #include "velox/exec/Strings.h"
+#include "velox/functions/lib/aggregates/ValueList.h"
 #include "velox/functions/prestosql/aggregates/AggregateNames.h"
-#include "velox/functions/prestosql/aggregates/ValueList.h"
 #include "velox/vector/FlatVector.h"
 
 namespace facebook::velox::aggregate::prestosql {

diff --git a/velox/functions/prestosql/aggregates/tests/CMakeLists.txt b/velox/functions/prestosql/aggregates/tests/CMakeLists.txt
@@ -47,7 +47,6 @@ add_executable(
   SetUnionTest.cpp
   SumDataSizeForStatsTest.cpp
   SumTest.cpp
-  ValueListTest.cpp
   VarianceAggregationTest.cpp)
 
 add_test(