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

simplify code

Browse Source
This commit is contained in:
Nikita Mikhaylov 2020-03-17 19:50:22 +03:00
parent 784ac0059f
commit 6a991783f4
2 changed files with 1 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dbms/programs/copier/Aliases.h
View File

@ -2,7 +2,6 @@
#include <Interpreters/Cluster.h>
namespace DB
{
using ConfigurationPtr = Poco::AutoPtr<Poco::Util::AbstractConfiguration>;

21
dbms/programs/copier/ClusterCopier.cpp
View File

@ -45,13 +45,6 @@ void ClusterCopier::init()
for (auto & task_table : task_cluster->table_tasks)
{
task_table.cluster_pull = context.getCluster(task_table.cluster_pull_name);
auto pull_shards_info = task_table.cluster_pull->getShardsInfo();
for (auto & shard_info : pull_shards_info)
{
std::cout << "current_shard " << toString(shard_info.shard_num) << "has remote connections "
<< toString(shard_info.hasRemoteConnections()) << std::endl;
}
std::cout << "CLUSTER PULL " << std::endl;
task_table.cluster_push = context.getCluster(task_table.cluster_push_name);
task_table.initShards(task_cluster->random_engine);
}
@ -417,19 +410,7 @@ bool ClusterCopier::checkPartitionPieceIsClean(
if (zookeeper->exists(task_status_path, &stat))
task_start_clock = LogicalClock(stat.mzxid);
/// If statement for readability.
LOG_INFO(log, "clean_state_clock.is_stale() " << clean_state_clock.is_stale());
LOG_INFO(log, "clean_state_clock.is_clean() " << clean_state_clock.is_clean());
if (clean_state_clock.is_clean() && (!task_start_clock.hasHappened() || clean_state_clock.discovery_zxid <= task_start_clock))
{
return true;
}
else
{
return false;
}
return clean_state_clock.is_clean() && (!task_start_clock.hasHappened() || clean_state_clock.discovery_zxid <= task_start_clock);
}