Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove useless IDAsPathUpgrader #6782

Merged
merged 8 commits into from
Feb 9, 2023
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion dbms/src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ add_subdirectory (Storages)
add_subdirectory (Parsers)
add_subdirectory (IO)
add_subdirectory (Functions)
add_subdirectory (Interpreters)
add_subdirectory (AggregateFunctions)
add_subdirectory (Server)
add_subdirectory (Client)
Expand Down
4 changes: 2 additions & 2 deletions dbms/src/Common/CPUAffinityManager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@

#include <Common/CPUAffinityManager.h>
#include <Common/Exception.h>
#include <Common/Logger.h>
#include <Common/setThreadName.h>
#include <Poco/DirectoryIterator.h>
#include <Poco/Logger.h>
#include <Poco/Util/LayeredConfiguration.h>
#include <boost_wrapper/string.h>
#include <common/logger_useful.h>
Expand Down Expand Up @@ -75,7 +75,7 @@ CPUAffinityManager & CPUAffinityManager::getInstance()
CPUAffinityManager::CPUAffinityManager()
: query_cpu_percent(0)
, cpu_cores(0)
, log(&Poco::Logger::get("CPUAffinityManager"))
, log(Logger::get())
{}

#ifdef __linux__
Expand Down
8 changes: 5 additions & 3 deletions dbms/src/Common/CPUAffinityManager.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@

namespace Poco
{
class Logger;
namespace Util
{
class LayeredConfiguration;
Expand All @@ -33,10 +32,13 @@ class LayeredConfiguration;

namespace DB
{
class Logger;
using LoggerPtr = std::shared_ptr<Logger>;
namespace tests
{
class CPUAffinityManagerTest_CPUAffinityManager_Test;
}
} // namespace tests

struct CPUAffinityConfig
{
CPUAffinityConfig()
Expand Down Expand Up @@ -132,7 +134,7 @@ class CPUAffinityManager
MAYBE_UNUSED_MEMBER int cpu_cores;

std::vector<std::string> query_threads;
Poco::Logger * log;
LoggerPtr log;

CPUAffinityManager();
// Disable copy and move
Expand Down
1 change: 1 addition & 0 deletions dbms/src/Common/Config/ConfigProcessor.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
#include <Poco/ConsoleChannel.h>
#include <Poco/DirectoryIterator.h>
#include <Poco/File.h>
#include <Poco/Logger.h>
#include <Poco/Path.h>
#include <Poco/Util/AbstractConfiguration.h>
#include <common/logger_useful.h>
Expand Down
2 changes: 2 additions & 0 deletions dbms/src/Common/FileChecker.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,10 @@
#pragma once

#include <Poco/File.h>
#include <Poco/Logger.h>
#include <common/logger_useful.h>

#include <map>
#include <string>


Expand Down
2 changes: 1 addition & 1 deletion dbms/src/Common/LRUCache.h
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,7 @@ class LRUCache
{
// If queue.insert() throws exception, cells and queue will be in inconsistent.
cells.erase(it);
tryLogCurrentException(Logger::get("LRUCache"), "queue.insert throw exception");
tryLogCurrentException(Logger::get(), "queue.insert throw exception");
throw;
}
}
Expand Down
2 changes: 1 addition & 1 deletion dbms/src/Common/MyTime.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2647,7 +2647,7 @@ std::optional<UInt64> MyDateTimeParser::parseAsPackedUInt(const StringRef & str_
if (!f(ctx, my_time))
{
#ifndef NDEBUG
LOG_TRACE(&Poco::Logger::get("MyDateTimeParser"),
LOG_TRACE(Logger::get(),
"parse error, [str={}] [format={}] [parse_pos={}]",
ctx.view.toString(),
format,
Expand Down
3 changes: 1 addition & 2 deletions dbms/src/Common/getNumberOfCPUCores.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,8 @@ void computeAndSetNumberOfPhysicalCPUCores(UInt16 number_of_logical_cpu_cores_,
auto hardware_logical_cpu_cores = std::thread::hardware_concurrency();
UInt16 physical_cpu_cores = number_of_logical_cpu_cores_ / (hardware_logical_cpu_cores / number_of_hardware_physical_cores);
CPUCores::number_of_physical_cpu_cores = physical_cpu_cores > 0 ? physical_cpu_cores : 1;
auto log = DB::Logger::get("CPUCores");
LOG_INFO(
log,
DB::Logger::get(),
"logical cpu cores: {}, hardware logical cpu cores: {}, hardware physical cpu cores: {}, physical cpu cores: {}, number_of_physical_cpu_cores: {}",
number_of_logical_cpu_cores_,
hardware_logical_cpu_cores,
Expand Down
6 changes: 3 additions & 3 deletions dbms/src/Flash/Mpp/MPPHandler.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@ class MPPHandler
{
const mpp::DispatchTaskRequest & task_request;

Poco::Logger * log;
LoggerPtr log;

public:
MPPHandler(const mpp::DispatchTaskRequest & task_request_)
explicit MPPHandler(const mpp::DispatchTaskRequest & task_request_)
: task_request(task_request_)
, log(&Poco::Logger::get("MPPHandler"))
, log(Logger::get())
{}
grpc::Status execute(const ContextPtr & context, mpp::DispatchTaskResponse * response);
void handleError(const MPPTaskPtr & task, String error);
Expand Down
25 changes: 0 additions & 25 deletions dbms/src/Interpreters/CMakeLists.txt

This file was deleted.

Loading