thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-12-14 02:12:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix code style

Browse Source
This commit is contained in:
taiyang-li 2022-02-16 12:23:06 +08:00
parent dec083ab44
commit f19f0d847f
1 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/Storages/Hive/HiveFile.cpp
View File

@ -1,23 +1,12 @@
<<<<<<< HEAD
#include <Storages/Hive/HiveFile.h> #include <Storages/Hive/HiveFile.h>
=======
#include <Common/config.h>
>>>>>>> d9558cbca4... add minmax index for hivengine; remove libhdfspp dependency for hive engine
#if USE_HIVE #if USE_HIVE
#include <boost/algorithm/string/case_conv.hpp> #include <boost/algorithm/string/case_conv.hpp>
<<<<<<< HEAD
#include <fmt/core.h>
#include <arrow/api.h>
=======
#include <boost/algorithm/string/classification.hpp> #include <boost/algorithm/string/classification.hpp>
#include <boost/algorithm/string/trim.hpp> #include <boost/algorithm/string/trim.hpp>
#include <arrow/adapters/orc/adapter.h> #include <arrow/adapters/orc/adapter.h>
#include <arrow/io/memory.h> #include <arrow/io/memory.h>
>>>>>>> d9558cbca4... add minmax index for hivengine; remove libhdfspp dependency for hive engine
#include <arrow/io/api.h> #include <arrow/io/api.h>
#include <arrow/api.h> #include <arrow/api.h>
#include <arrow/status.h> #include <arrow/status.h>
@ -35,11 +24,6 @@
#include <Storages/MergeTree/IMergeTreeDataPart.h> #include <Storages/MergeTree/IMergeTreeDataPart.h>
#include <Storages/MergeTree/KeyCondition.h> #include <Storages/MergeTree/KeyCondition.h>
namespace ErrorCodes
{
extern const int NOT_IMPLEMENTED;
}
namespace DB namespace DB
{ {