提交 d8ca4345 编写于 作者: A Alexey Milovidov

Fixed style violations [#CLICKHOUSE-2]

上级 29e40f00
......@@ -87,7 +87,8 @@ void ODBCDriver2BlockOutputStream::writePrefix()
void registerOutputFormatODBCDriver2(FormatFactory & factory)
{
factory.registerOutputFormat(
"ODBCDriver2", [](WriteBuffer & buf, const Block & sample, const Context &, const FormatSettings & format_settings) {
"ODBCDriver2", [](WriteBuffer & buf, const Block & sample, const Context &, const FormatSettings & format_settings)
{
return std::make_shared<ODBCDriver2BlockOutputStream>(buf, sample, format_settings);
});
}
......
......@@ -583,7 +583,7 @@ public:
size_t getNumberOfArguments() const override { return 1; }
DataTypePtr getReturnTypeImpl(const DataTypes & /*arguments */) const override
DataTypePtr getReturnTypeImpl(const DataTypes & /*arguments */) const override
{ return std::make_shared<DataTypeNumber<ToType>>(); }
bool useDefaultImplementationForConstants() const override { return true; }
......
......@@ -118,7 +118,7 @@ void SelectStreamFactory::createForShard(
}
else
emplace_local_stream(); /// Let it fail the usual way.
return;
}
......
......@@ -228,8 +228,8 @@ void ExternalLoader::reloadFromConfigFiles(const bool throw_on_error, const bool
throw;
}
}
/// erase removed from config loadable objects
/// erase removed from config loadable objects
std::list<std::string> removed_loadable_objects;
for (const auto & loadable : loadable_objects)
{
......@@ -261,7 +261,7 @@ void ExternalLoader::reloadFromConfigFile(const std::string & config_path, const
if (force_reload || last_modified > config_last_modified)
{
auto config = config_repository->load(config_path);
loadable_objects_defined_in_config[config_path].clear();
/// Definitions of loadable objects may have changed, recreate all of them
......@@ -295,7 +295,7 @@ void ExternalLoader::reloadFromConfigFile(const std::string & config_path, const
LOG_WARNING(log, config_path << ": " + config_settings.external_name + " name cannot be empty");
continue;
}
loadable_objects_defined_in_config[config_path].emplace(name);
if (!loadable_name.empty() && name != loadable_name)
continue;
......
......@@ -91,7 +91,7 @@ StoragePtr StorageFactory::get(
{
throw Exception(
"Engine " + name + " doesn't support SETTINGS clause. "
"Currently only the MergeTree family of engines and Kafka engine supports it",
"Currently only the MergeTree family of engines and Kafka engine supports it",
ErrorCodes::BAD_ARGUMENTS);
}
......
......@@ -43,7 +43,6 @@ public:
void shutdown() override;
void checkTableCanBeDropped() const override;
void checkPartitionCanBeDropped(const ASTPtr & partition) override;
BlockInputStreams read(
......
......@@ -131,7 +131,7 @@ void StorageMergeTree::checkTableCanBeDropped() const
void StorageMergeTree::checkPartitionCanBeDropped(const ASTPtr & partition)
{
const_cast<MergeTreeData &>(getData()).recalculateColumnSizes();
const String partition_id = data.getPartitionIDFromQuery(partition, context);
auto parts_to_remove = data.getDataPartsVectorInPartition(MergeTreeDataPartState::Committed, partition_id);
......
......@@ -3356,12 +3356,12 @@ void StorageReplicatedMergeTree::checkTableCanBeDropped() const
void StorageReplicatedMergeTree::checkPartitionCanBeDropped(const ASTPtr & partition)
{
const_cast<MergeTreeData &>(getData()).recalculateColumnSizes();
const String partition_id = data.getPartitionIDFromQuery(partition, context);
auto parts_to_remove = data.getDataPartsVectorInPartition(MergeTreeDataPartState::Committed, partition_id);
UInt64 partition_size = 0;
for (const auto & part : parts_to_remove)
{
partition_size += part->bytes_on_disk;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册