diff --git a/be/src/agent/cgroups_mgr.cpp b/be/src/agent/cgroups_mgr.cpp index 6c73ee9b94ba69..edb274f7a3cef7 100644 --- a/be/src/agent/cgroups_mgr.cpp +++ b/be/src/agent/cgroups_mgr.cpp @@ -29,7 +29,6 @@ #include #include -#include "boost/filesystem.hpp" #include "common/logging.h" #include "olap/data_dir.h" #include "olap/storage_engine.h" diff --git a/be/src/agent/pusher.cpp b/be/src/agent/pusher.cpp index 90e3ad22b69b4a..4fba068b56a3bf 100644 --- a/be/src/agent/pusher.cpp +++ b/be/src/agent/pusher.cpp @@ -27,7 +27,6 @@ #include #include "agent/cgroups_mgr.h" -#include "boost/filesystem.hpp" #include "boost/lexical_cast.hpp" #include "gen_cpp/AgentService_types.h" #include "http/http_client.h" diff --git a/be/src/exec/odbc_connector.h b/be/src/exec/odbc_connector.h index 1e92022a626e77..e63f4b4600d3a8 100644 --- a/be/src/exec/odbc_connector.h +++ b/be/src/exec/odbc_connector.h @@ -47,7 +47,7 @@ struct ODBCConnectorParam { // Because the DataBinding have the mem alloc, so // this class should not be copyable -struct DataBinding : public boost::noncopyable { +struct DataBinding { SQLSMALLINT target_type; SQLINTEGER buffer_length; SQLLEN strlen_or_ind; @@ -56,6 +56,9 @@ struct DataBinding : public boost::noncopyable { DataBinding() = default; ~DataBinding() { free(target_value_ptr); } + DataBinding(const DataBinding&) = delete; + DataBinding& operator=(const DataBinding&) = delete; + }; // ODBC Connector for scan data from ODBC diff --git a/be/src/olap/schema_change.h b/be/src/olap/schema_change.h index 543081d3d1ca6b..452c341af08966 100644 --- a/be/src/olap/schema_change.h +++ b/be/src/olap/schema_change.h @@ -180,7 +180,7 @@ class SchemaChangeWithSorting : public SchemaChange { DISALLOW_COPY_AND_ASSIGN(SchemaChangeWithSorting); }; -class SchemaChangeHandler : public boost::noncopyable { +class SchemaChangeHandler { public: static SchemaChangeHandler* instance() { return &_s_instance; } @@ -244,6 +244,8 @@ class SchemaChangeHandler : public boost::noncopyable { private: SchemaChangeHandler() : _mem_tracker(MemTracker::CreateTracker(-1, "SchemaChange")) {} virtual ~SchemaChangeHandler() {} + SchemaChangeHandler(const SchemaChangeHandler&) = delete; + SchemaChangeHandler& operator=(const SchemaChangeHandler&) = delete; std::shared_ptr _mem_tracker; static SchemaChangeHandler _s_instance; diff --git a/be/src/olap/task/engine_batch_load_task.cpp b/be/src/olap/task/engine_batch_load_task.cpp index a2545e2adaef95..8d1b6d2a1737ae 100644 --- a/be/src/olap/task/engine_batch_load_task.cpp +++ b/be/src/olap/task/engine_batch_load_task.cpp @@ -27,7 +27,6 @@ #include #include "agent/cgroups_mgr.h" -#include "boost/filesystem.hpp" #include "boost/lexical_cast.hpp" #include "gen_cpp/AgentService_types.h" #include "http/http_client.h" diff --git a/be/src/util/bitmap_value.h b/be/src/util/bitmap_value.h index b89569a4f8fb23..c228c0c88f1dec 100644 --- a/be/src/util/bitmap_value.h +++ b/be/src/util/bitmap_value.h @@ -31,6 +31,7 @@ #include #include "common/logging.h" +#include "udf/udf.h" #include "util/coding.h" namespace doris { @@ -1287,14 +1288,14 @@ class BitmapValue { return true; } - BigIntVal minimum() { + doris_udf::BigIntVal minimum() { switch (_type) { case SINGLE: - return BigIntVal(_sv); + return doris_udf::BigIntVal(_sv); case BITMAP: - return BigIntVal(_bitmap.minimum()); + return doris_udf::BigIntVal(_bitmap.minimum()); default: - return BigIntVal::null(); + return doris_udf::BigIntVal::null(); } } diff --git a/be/test/exprs/bitmap_function_test.cpp b/be/test/exprs/bitmap_function_test.cpp index 5c7e57c66fd846..9485ce1a02448b 100644 --- a/be/test/exprs/bitmap_function_test.cpp +++ b/be/test/exprs/bitmap_function_test.cpp @@ -220,21 +220,25 @@ TEST_F(BitmapFunctionsTest, bitmap_count) { TEST_F(BitmapFunctionsTest, bitmap_min) { BigIntVal result = BitmapFunctions::bitmap_min(ctx, StringVal::null()); - ASSERT_TRUE(result.is_null()); + ASSERT_TRUE(result.is_null); - StringVal empty_str = convert_bitmap_to_string(ctx, BitmapValue()); + BitmapValue bitmap1; + StringVal empty_str = convert_bitmap_to_string(ctx, bitmap1); result = BitmapFunctions::bitmap_min(ctx, empty_str); - ASSERT_TRUE(result.is_null()); + ASSERT_TRUE(result.is_null); - StringVal bitmap_str = convert_bitmap_to_string(ctx, BitmapValue(1024)); + BitmapValue bitmap2 = BitmapValue(1024); + StringVal bitmap_str = convert_bitmap_to_string(ctx, bitmap2); result = BitmapFunctions::bitmap_min(ctx, bitmap_str); ASSERT_EQ(BigIntVal(1024), result); - bitmap_str = convert_bitmap_to_string(ctx, BitmapValue({1024, 1})); + BitmapValue bitmap3 = BitmapValue({1024, 1}); + bitmap_str = convert_bitmap_to_string(ctx, bitmap3); result = BitmapFunctions::bitmap_min(ctx, bitmap_str); ASSERT_EQ(BigIntVal(1), result); - bitmap_str = convert_bitmap_to_string(ctx, BitmapValue({1024, 3, 2})); + BitmapValue bitmap4 = BitmapValue({1024, 3, 2}); + bitmap_str = convert_bitmap_to_string(ctx, bitmap4); result = BitmapFunctions::bitmap_min(ctx, bitmap_str); ASSERT_EQ(BigIntVal(2), result); }