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

Modify according to review opinion

Browse Source
This commit is contained in:
TCeason 2021-04-13 09:46:33 +08:00
parent 472c131420
commit 87aa904440
3 changed files with 9 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Core/Settings.h
View File

@ -445,8 +445,8 @@ class IColumn;
M(Bool, database_replicated_always_detach_permanently, false, "Execute DETACH TABLE as DETACH TABLE PERMANENTLY if database engine is Replicated", 0) \
M(DistributedDDLOutputMode, distributed_ddl_output_mode, DistributedDDLOutputMode::THROW, "Format of distributed DDL query result", 0) \
M(UInt64, distributed_ddl_entry_format_version, 1, "Version of DDL entry to write into ZooKeeper", 0) \
M(UInt64, max_read_mysql_rows, DEFAULT_BLOCK_SIZE, "Limit maximum rows when MaterializeMySQL flush history data. 0 -> Disable it.", 0) \
M(UInt64, max_read_mysql_bytes, (DEFAULT_INSERT_BLOCK_SIZE * 256), "Limit maximum bytes when MaterializeMySQL flush history data. 0 -> Disable it.", 0) \
M(UInt64, max_read_mysql_rows, DEFAULT_BLOCK_SIZE, "Limit maximum number of rows when MaterializeMySQL should flush history data. If equal to 0, this setting is disabled", 0) \
M(UInt64, max_read_mysql_bytes, (DEFAULT_INSERT_BLOCK_SIZE * 256), "Limit maximum number of bytes when MaterializeMySQL should flush history data. If equal to 0, this setting is disabled", 0) \
\
/** Obsolete settings that do nothing but left for compatibility reasons. Remove each one after half a year of obsolescence. */ \
\

20
src/Formats/MySQLBlockInputStream.cpp
View File

@ -30,27 +30,13 @@ namespace ErrorCodes
extern const int NOT_IMPLEMENTED;
}
StreamSettings::StreamSettings(const Settings & settings)
{
max_read_mysql_rows = settings.max_read_mysql_rows;
max_read_bytes_size = settings.max_read_mysql_bytes;
}
StreamSettings::StreamSettings(const Settings & settings, bool auto_close_, bool fetch_by_name_)
: auto_close(auto_close_)
, fetch_by_name(fetch_by_name_)
{
max_read_mysql_rows = settings.max_read_mysql_rows;
max_read_bytes_size = settings.max_read_mysql_bytes;
}
StreamSettings::StreamSettings(const Settings & settings, bool auto_close_, bool fetch_by_name_, size_t max_retry_)
: auto_close(auto_close_)
: max_read_mysql_rows(settings.max_read_mysql_rows)
, max_read_bytes_size(settings.max_read_mysql_bytes)
, auto_close(auto_close_)
, fetch_by_name(fetch_by_name_)
, default_num_tries_on_connection_loss(max_retry_)
{
max_read_mysql_rows = settings.max_read_mysql_rows;
max_read_bytes_size = settings.max_read_mysql_bytes;
}
MySQLBlockInputStream::Connection::Connection(

10
src/Formats/MySQLBlockInputStream.h
View File

@ -15,13 +15,11 @@ struct StreamSettings
{
size_t max_read_mysql_rows;
size_t max_read_bytes_size;
bool auto_close = false;
bool fetch_by_name = false;
size_t default_num_tries_on_connection_loss = 5;
bool auto_close;
bool fetch_by_name;
size_t default_num_tries_on_connection_loss;
StreamSettings(const Settings & settings);
StreamSettings(const Settings & settings, bool auto_close_, bool fetch_by_name_);
StreamSettings(const Settings & settings, bool auto_close_, bool fetch_by_name_, size_t max_retry_);
StreamSettings(const Settings & settings, bool auto_close_ = false, bool fetch_by_name_ = false, size_t max_retry_ = 5);
};