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

Miscellaneous [#CLICKHOUSE-2]

Browse Source
This commit is contained in:
Alexey Milovidov 2018-07-10 16:43:01 +03:00
parent f8b53280a0
commit 8e0ae12b4e
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -47,7 +47,7 @@ public:
KeeperMultiException(int32_t code, const Requests & requests, const Responses & responses); KeeperMultiException(int32_t code, const Requests & requests, const Responses & responses);
private: private:
size_t getFailedOpIndex(int32_t code, const Responses & responses) const; static size_t getFailedOpIndex(int32_t code, const Responses & responses);
}; };
}; };

4
dbms/src/Common/ZooKeeper/ZooKeeper.cpp
View File

@ -815,7 +815,7 @@ int32_t ZooKeeper::tryMultiNoThrow(const Requests & requests, Responses & respon
} }
size_t KeeperMultiException::getFailedOpIndex(int32_t code, const Responses & responses) const size_t KeeperMultiException::getFailedOpIndex(int32_t code, const Responses & responses)
{ {
if (responses.empty()) if (responses.empty())
throw DB::Exception("Responses for multi transaction is empty", DB::ErrorCodes::LOGICAL_ERROR); throw DB::Exception("Responses for multi transaction is empty", DB::ErrorCodes::LOGICAL_ERROR);
@ -838,10 +838,10 @@ KeeperMultiException::KeeperMultiException(int32_t code, const Requests & reques
{ {
} }
std::string KeeperMultiException::getPathForFirstFailedOp() const std::string KeeperMultiException::getPathForFirstFailedOp() const
{ {
return requests[failed_op_index]->getPath(); return requests[failed_op_index]->getPath();
} }
void KeeperMultiException::check(int32_t code, const Requests & requests, const Responses & responses) void KeeperMultiException::check(int32_t code, const Requests & requests, const Responses & responses)

1
dbms/src/DataStreams/AddingDefaultBlockOutputStream.cpp
View File

@ -4,6 +4,7 @@
#include <DataTypes/NestedUtils.h> #include <DataTypes/NestedUtils.h>
#include <DataTypes/DataTypeArray.h> #include <DataTypes/DataTypeArray.h>
#include <Columns/ColumnArray.h> #include <Columns/ColumnArray.h>
#include <Interpreters/evaluateMissingDefaults.h>
#include <Core/Block.h> #include <Core/Block.h>

1
dbms/src/DataStreams/AddingDefaultBlockOutputStream.h
View File

@ -4,7 +4,6 @@
#include <Columns/ColumnConst.h> #include <Columns/ColumnConst.h>
#include <Storages/ColumnDefault.h> #include <Storages/ColumnDefault.h>
#include <Interpreters/Context.h> #include <Interpreters/Context.h>
#include <Interpreters/evaluateMissingDefaults.h>
namespace DB namespace DB