thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-29 21:20:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Enabling -Wshadow [#CLICKHOUSE-2]

Browse Source
This commit is contained in:
Alexey Milovidov 2018-08-26 05:25:45 +03:00
parent 167d8ec529
commit 5f21f1ba7d
2 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
dbms/src/Common/ZooKeeper/ZooKeeperImpl.cpp
View File

@ -674,24 +674,24 @@ struct ZooKeeperMultiRequest final : MultiRequest, ZooKeeperRequest
for (const auto & generic_request : generic_requests) for (const auto & generic_request : generic_requests)
{ {
if (auto * concrete_request = dynamic_cast<const CreateRequest *>(generic_request.get())) if (auto * concrete_request_create = dynamic_cast<const CreateRequest *>(generic_request.get()))
{ {
auto create = std::make_shared<ZooKeeperCreateRequest>(*concrete_request); auto create = std::make_shared<ZooKeeperCreateRequest>(*concrete_request_create);
if (create->acls.empty()) if (create->acls.empty())
create->acls = default_acls; create->acls = default_acls;
requests.push_back(create); requests.push_back(create);
} }
else if (auto * concrete_request = dynamic_cast<const RemoveRequest *>(generic_request.get())) else if (auto * concrete_request_remove = dynamic_cast<const RemoveRequest *>(generic_request.get()))
{ {
requests.push_back(std::make_shared<ZooKeeperRemoveRequest>(*concrete_request)); requests.push_back(std::make_shared<ZooKeeperRemoveRequest>(*concrete_request_remove));
} }
else if (auto * concrete_request = dynamic_cast<const SetRequest *>(generic_request.get())) else if (auto * concrete_request_set = dynamic_cast<const SetRequest *>(generic_request.get()))
{ {
requests.push_back(std::make_shared<ZooKeeperSetRequest>(*concrete_request)); requests.push_back(std::make_shared<ZooKeeperSetRequest>(*concrete_request_set));
} }
else if (auto * concrete_request = dynamic_cast<const CheckRequest *>(generic_request.get())) else if (auto * concrete_request_check = dynamic_cast<const CheckRequest *>(generic_request.get()))
{ {
requests.push_back(std::make_shared<ZooKeeperCheckRequest>(*concrete_request)); requests.push_back(std::make_shared<ZooKeeperCheckRequest>(*concrete_request_check));
} }
else else
throw Exception("Illegal command as part of multi ZooKeeper request", ZBADARGUMENTS); throw Exception("Illegal command as part of multi ZooKeeper request", ZBADARGUMENTS);
@ -930,20 +930,20 @@ void ZooKeeper::connect(
if (!connected) if (!connected)
{ {
WriteBufferFromOwnString out; WriteBufferFromOwnString message;
out << "All connection tries failed while connecting to ZooKeeper. Addresses: "; message << "All connection tries failed while connecting to ZooKeeper. Addresses: ";
bool first = true; bool first = true;
for (const auto & address : addresses) for (const auto & address : addresses)
{ {
if (first) if (first)
first = false; first = false;
else else
out << ", "; message << ", ";
out << address.toString(); message << address.toString();
} }
out << fail_reasons.str() << "\n"; message << fail_reasons.str() << "\n";
throw Exception(out.str(), ZCONNECTIONLOSS); throw Exception(message.str(), ZCONNECTIONLOSS);
} }
} }
@ -953,7 +953,7 @@ void ZooKeeper::sendHandshake()
int32_t handshake_length = 44; int32_t handshake_length = 44;
int64_t last_zxid_seen = 0; int64_t last_zxid_seen = 0;
int32_t timeout = session_timeout.totalMilliseconds(); int32_t timeout = session_timeout.totalMilliseconds();
int64_t session_id = 0; int64_t previous_session_id = 0; /// We don't support session restore. So previous session_id is always zero.
constexpr int32_t passwd_len = 16; constexpr int32_t passwd_len = 16;
std::array<char, passwd_len> passwd {}; std::array<char, passwd_len> passwd {};
@ -961,7 +961,7 @@ void ZooKeeper::sendHandshake()
write(protocol_version); write(protocol_version);
write(last_zxid_seen); write(last_zxid_seen);
write(timeout); write(timeout);
write(session_id); write(previous_session_id);
write(passwd); write(passwd);
out->next(); out->next();
@ -1003,18 +1003,18 @@ void ZooKeeper::sendAuth(const String & scheme, const String & data)
request.write(*out); request.write(*out);
int32_t length; int32_t length;
XID xid; XID read_xid;
int64_t zxid; int64_t zxid;
int32_t err; int32_t err;
read(length); read(length);
size_t count_before_event = in->count(); size_t count_before_event = in->count();
read(xid); read(read_xid);
read(zxid); read(zxid);
read(err); read(err);
if (xid != auth_xid) if (read_xid != auth_xid)
throw Exception("Unexpected event recieved in reply to auth request: " + toString(xid), throw Exception("Unexpected event recieved in reply to auth request: " + toString(read_xid),
ZMARSHALLINGERROR); ZMARSHALLINGERROR);
int32_t actual_length = in->count() - count_before_event; int32_t actual_length = in->count() - count_before_event;
@ -1432,7 +1432,7 @@ void ZooKeeper::pushRequest(RequestInfo && info)
if (!info.request->xid) if (!info.request->xid)
{ {
info.request->xid = xid.fetch_add(1); info.request->xid = next_xid.fetch_add(1);
if (info.request->xid < 0) if (info.request->xid < 0)
throw Exception("XID overflow", ZSESSIONEXPIRED); throw Exception("XID overflow", ZSESSIONEXPIRED);
} }

2
dbms/src/Common/ZooKeeper/ZooKeeperImpl.h
View File

@ -179,7 +179,7 @@ private:
int64_t session_id = 0; int64_t session_id = 0;
std::atomic<XID> xid {1}; std::atomic<XID> next_xid {1};
std::atomic<bool> expired {false}; std::atomic<bool> expired {false};
std::mutex push_request_mutex; std::mutex push_request_mutex;