From 4ad7c20550bc7c314e733c89ab3bcff9268cf655 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E8=BF=90=E6=9D=A5?= <hnwyllmm@126.com>
Date: Tue, 19 Nov 2024 20:07:47 +0800
Subject: [PATCH] fix compile bug

---
 src/common/lang/ranges.h                        |   1 +
 .../sql/operator/group_by_physical_operator.cpp |   3 ++-
 src/observer/storage/common/meta_util.cpp       |   3 +--
 src/observer/storage/index/.bplus_tree.h.swp    | Bin 16384 -> 0 bytes
 4 files changed, 4 insertions(+), 3 deletions(-)
 delete mode 100644 src/observer/storage/index/.bplus_tree.h.swp

diff --git a/src/common/lang/ranges.h b/src/common/lang/ranges.h
index 839876e8b..fcc287714 100644
--- a/src/common/lang/ranges.h
+++ b/src/common/lang/ranges.h
@@ -10,6 +10,7 @@ See the Mulan PSL v2 for more details. */
 
 #pragma once
 
+#include <algorithm>
 #include <ranges>
 
 namespace ranges = std::ranges;
diff --git a/src/observer/sql/operator/group_by_physical_operator.cpp b/src/observer/sql/operator/group_by_physical_operator.cpp
index c925a82b6..75301f2b6 100644
--- a/src/observer/sql/operator/group_by_physical_operator.cpp
+++ b/src/observer/sql/operator/group_by_physical_operator.cpp
@@ -13,6 +13,7 @@ See the Mulan PSL v2 for more details. */
 //
 
 #include "common/log/log.h"
+#include "common/lang/ranges.h"
 #include "sql/operator/group_by_physical_operator.h"
 #include "sql/expr/expression_tuple.h"
 #include "sql/expr/composite_tuple.h"
@@ -36,7 +37,7 @@ void GroupByPhysicalOperator::create_aggregator_list(AggregatorList &aggregator_
 {
   aggregator_list.clear();
   aggregator_list.reserve(aggregate_expressions_.size());
-  ranges::for_each(aggregate_expressions_, [&aggregator_list](Expression *expr) {
+  std::ranges::for_each(aggregate_expressions_, [&aggregator_list](Expression *expr) {
     auto *aggregate_expr = static_cast<AggregateExpr *>(expr);
     aggregator_list.emplace_back(aggregate_expr->create_aggregator());
   });
diff --git a/src/observer/storage/common/meta_util.cpp b/src/observer/storage/common/meta_util.cpp
index 1d7117dcb..267d0adf4 100644
--- a/src/observer/storage/common/meta_util.cpp
+++ b/src/observer/storage/common/meta_util.cpp
@@ -12,8 +12,7 @@ See the Mulan PSL v2 for more details. */
 //
 
 #include "storage/common/meta_util.h"
-
-using namespace std;
+#include "common/lang/filesystem.h"
 
 string db_meta_file(const char *base_dir, const char *db_name)
 {
diff --git a/src/observer/storage/index/.bplus_tree.h.swp b/src/observer/storage/index/.bplus_tree.h.swp
deleted file mode 100644
index 8858137b253ea277e40faf520f61542e4d2667c0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 16384
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