From 0dae260a9ce5f86154c10d17ad00a7cf257392e6 Mon Sep 17 00:00:00 2001
From: Cai Yudong <yudong.cai@zilliz.com>
Date: Mon, 27 Dec 2021 14:12:11 +0800
Subject: [PATCH] [skip e2e] Re-organize header files included under query
 (#14272)

Signed-off-by: yudong.cai <yudong.cai@zilliz.com>
---
 internal/core/src/query/SearchOnGrowing.h  |  7 -------
 internal/core/src/query/SearchOnSealed.cpp | 12 +++++-------
 internal/core/src/query/SearchOnSealed.h   |  8 +++++++-
 3 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/internal/core/src/query/SearchOnGrowing.h b/internal/core/src/query/SearchOnGrowing.h
index e33be8a654..1651331ed9 100644
--- a/internal/core/src/query/SearchOnGrowing.h
+++ b/internal/core/src/query/SearchOnGrowing.h
@@ -11,17 +11,10 @@
 
 #pragma once
 
-#include <deque>
-#include <optional>
-#include <boost/dynamic_bitset.hpp>
-
 #include "segcore/SegmentGrowingImpl.h"
 
 namespace milvus::query {
 
-using BitsetChunk = boost::dynamic_bitset<>;
-using BitsetSimple = std::deque<BitsetChunk>;
-
 void
 SearchOnGrowing(const segcore::SegmentGrowingImpl& segment,
                 int64_t ins_barrier,
diff --git a/internal/core/src/query/SearchOnSealed.cpp b/internal/core/src/query/SearchOnSealed.cpp
index 2dee79aaa7..49da2a9bfb 100644
--- a/internal/core/src/query/SearchOnSealed.cpp
+++ b/internal/core/src/query/SearchOnSealed.cpp
@@ -9,18 +9,16 @@
 // is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
 // or implied. See the License for the specific language governing permissions and limitations under the License
 
-//
-// Created by mike on 12/26/20.
-//
+#include <boost_ext/dynamic_bitset_ext.hpp>
+#include <cmath>
 
-#include "query/SearchOnSealed.h"
-#include <knowhere/index/vector_index/VecIndex.h>
+#include "knowhere/index/vector_index/VecIndex.h"
 #include "knowhere/index/vector_index/ConfAdapter.h"
 #include "knowhere/index/vector_index/ConfAdapterMgr.h"
 #include "knowhere/index/vector_index/helpers/IndexParameter.h"
 #include "knowhere/index/vector_index/adapter/VectorAdapter.h"
-#include <boost_ext/dynamic_bitset_ext.hpp>
-#include <cmath>
+#include "query/SearchOnSealed.h"
+#include "utils/Utils.h"
 
 namespace milvus::query {
 
diff --git a/internal/core/src/query/SearchOnSealed.h b/internal/core/src/query/SearchOnSealed.h
index f54cd7c698..0bc6f096bb 100644
--- a/internal/core/src/query/SearchOnSealed.h
+++ b/internal/core/src/query/SearchOnSealed.h
@@ -11,12 +11,18 @@
 
 #pragma once
 
-#include "segcore/SealedIndexingRecord.h"
+#include <deque>
+#include <boost/dynamic_bitset.hpp>
+
 #include "query/PlanNode.h"
 #include "query/SearchOnGrowing.h"
+#include "segcore/SealedIndexingRecord.h"
 
 namespace milvus::query {
 
+using BitsetChunk = boost::dynamic_bitset<>;
+using BitsetSimple = std::deque<BitsetChunk>;
+
 aligned_vector<uint8_t>
 AssembleNegBitset(const BitsetSimple& bitmap_simple);