Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
2 changes: 1 addition & 1 deletion contrib/kvproto
5 changes: 3 additions & 2 deletions dbms/src/Client/Connection.h
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,8 @@ class Connection : private boost::noncopyable
setDescription();
}

virtual ~Connection(){};
virtual ~Connection() = default;
;

/// Set throttler of network traffic. One throttler could be used for multiple connections to limit total traffic.
void setThrottler(const ThrottlerPtr & throttler_)
Expand Down Expand Up @@ -268,7 +269,7 @@ class Connection : private boost::noncopyable
class LoggerWrapper
{
public:
LoggerWrapper(Connection & parent_)
explicit LoggerWrapper(Connection & parent_)
: log(nullptr)
, parent(parent_)
{
Expand Down
3 changes: 1 addition & 2 deletions dbms/src/Common/ExternalTable.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
#pragma once

#include <Client/Connection.h>
#include <Common/HTMLForm.h>
#include <DataStreams/AsynchronousBlockInputStream.h>
#include <DataTypes/DataTypeFactory.h>
#include <IO/ReadBufferFromFile.h>
Expand Down Expand Up @@ -195,7 +194,7 @@ class ExternalTablesHandler : public Poco::Net::PartHandler
, params(params_)
{}

void handlePart(const Poco::Net::MessageHeader & header, std::istream & stream)
void handlePart(const Poco::Net::MessageHeader & header, std::istream & stream) override
{
/// The buffer is initialized here, not in the virtual function initReadBuffer
read_buffer = std::make_unique<ReadBufferFromIStream>(stream);
Expand Down
56 changes: 0 additions & 56 deletions dbms/src/Common/HTMLForm.h

This file was deleted.

8 changes: 1 addition & 7 deletions dbms/src/Core/Defines.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,13 @@
#include <common/defines.h>
#include <common/types.h>

#define DBMS_NAME "ClickHouse"
#define DBMS_NAME "TiFlash"
#define DBMS_VERSION_MAJOR 1
#define DBMS_VERSION_MINOR 1

#define DBMS_DEFAULT_HOST "localhost"
#define DBMS_DEFAULT_PORT 9000
#define DBMS_DEFAULT_SECURE_PORT 9440
#define DBMS_DEFAULT_HTTP_PORT 8123
#define DBMS_DEFAULT_CONNECT_TIMEOUT_SEC 10
#define DBMS_DEFAULT_CONNECT_TIMEOUT_WITH_FAILOVER_MS 50
#define DBMS_DEFAULT_SEND_TIMEOUT_SEC 300
Expand Down Expand Up @@ -104,17 +103,12 @@ static constexpr UInt64 DEFAULT_DISAGG_TASK_TIMEOUT_SEC = 5 * 60;

#define DEFAULT_QUERY_LOG_FLUSH_INTERVAL_MILLISECONDS 7500

#define DEFAULT_HTTP_READ_BUFFER_TIMEOUT 1800
#define DEFAULT_HTTP_READ_BUFFER_CONNECTION_TIMEOUT 1

#define PLATFORM_NOT_SUPPORTED "The only supported platforms are x86_64 and AArch64 (work in progress)"

#define DEFAULT_MARK_CACHE_SIZE (1ULL * 1024 * 1024 * 1024)

#define DEFAULT_METRICS_PORT 8234

#define DEFAULT_HTTP_PORT 8123

#if !defined(__x86_64__) && !defined(__aarch64__)
// #error PLATFORM_NOT_SUPPORTED
#endif
10 changes: 0 additions & 10 deletions dbms/src/Dictionaries/DictionarySourceFactory.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
#include <Dictionaries/DictionaryStructure.h>
#include <Dictionaries/ExecutableDictionarySource.h>
#include <Dictionaries/FileDictionarySource.h>
#include <Dictionaries/HTTPDictionarySource.h>
#include <Dictionaries/LibraryDictionarySource.h>
#include <IO/HTTPCommon.h>
#include <Poco/Logger.h>
Expand Down Expand Up @@ -143,15 +142,6 @@ DictionarySourcePtr DictionarySourceFactory::create(

return std::make_unique<ExecutableDictionarySource>(dict_struct, config, config_prefix + ".executable", sample_block, context);
}
else if ("http" == source_type)
{
if (dict_struct.has_expressions)
throw Exception{
"Dictionary source of type `http` does not support attribute expressions",
ErrorCodes::LOGICAL_ERROR};

return std::make_unique<HTTPDictionarySource>(dict_struct, config, config_prefix + ".http", sample_block, context);
}
else if ("library" == source_type)
{
return std::make_unique<LibraryDictionarySource>(dict_struct, config, config_prefix + ".library", sample_block, context);
Expand Down
171 changes: 0 additions & 171 deletions dbms/src/Dictionaries/HTTPDictionarySource.cpp

This file was deleted.

Loading