From 2a6fdb87e6e18823600050fba11948bbb0f62fde Mon Sep 17 00:00:00 2001
From: Xiaoxuan Meng <xiaoxmeng@meta.com>
Date: Tue, 28 Jan 2025 14:18:48 -0800
Subject: [PATCH] refactor: Consolidate subfield filter definitions (#2)

Summary:
Pull Request resolved: https://github.com/facebookexperimental/verax/pull/2

X-link: https://github.com/facebookincubator/velox/pull/12184

There are multiple definitions of subfield filters in velox and consolidate them in Filter.h

Reviewed By: Yuhta

Differential Revision: D68719054

fbshipit-source-id: 7085c7ad803980d960e32ce4a981bd4a722558e9
---
 verax/connectors/hive/HiveConnectorMetadata.cpp | 2 +-
 verax/tests/VeloxSql.cpp                        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/verax/connectors/hive/HiveConnectorMetadata.cpp b/verax/connectors/hive/HiveConnectorMetadata.cpp
index 1742574..e83d3ff 100644
--- a/verax/connectors/hive/HiveConnectorMetadata.cpp
+++ b/verax/connectors/hive/HiveConnectorMetadata.cpp
@@ -77,7 +77,7 @@ ConnectorTableHandlePtr HiveConnectorMetadata::createTableHandle(
   }
   auto dataColumns = ROW(std::move(names), std::move(types));
   std::vector<core::TypedExprPtr> remainingConjuncts;
-  SubfieldFilters subfieldFilters;
+  common::SubfieldFilters subfieldFilters;
   for (auto& typedExpr : filters) {
     try {
       auto pair = velox::exec::toSubfieldFilter(typedExpr, &evaluator);
diff --git a/verax/tests/VeloxSql.cpp b/verax/tests/VeloxSql.cpp
index 0381bc6..2a7b134 100644
--- a/verax/tests/VeloxSql.cpp
+++ b/verax/tests/VeloxSql.cpp
@@ -302,7 +302,7 @@ class VeloxRunner {
       const std::vector<std::string>& columnNames) {
     using namespace connector::hive;
     auto handle = std::make_shared<HiveTableHandle>(
-        kHiveConnectorId, name, true, SubfieldFilters{}, nullptr);
+        kHiveConnectorId, name, true, common::SubfieldFilters{}, nullptr);
     std::unordered_map<std::string, std::shared_ptr<connector::ColumnHandle>>
         assignments;