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

Merge pull request #4398 from yandex/zookeeper-size-limit

Browse Source 
Slightly raised up the limit on max string and array size received from ZooKeeper
This commit is contained in:
alesapin 2019-02-14 19:33:34 +03:00 committed by GitHub
commit 6d865b538e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,6 +14,11 @@
#include <array>
/// ZooKeeper has 1 MB node size and serialization limit by default,
/// but it can be raised up, so we have a slightly larger limit on our side.
#define MAX_STRING_OR_ARRAY_SIZE (1 << 28) /// 256 MiB
namespace ProfileEvents
{
extern const Event ZooKeeperInit;
@ -322,7 +327,6 @@ void read(bool & x, ReadBuffer & in)
void read(String & s, ReadBuffer & in)
{
static constexpr int32_t max_string_size = 1 << 20;
int32_t size = 0;
read(size, in);
@ -336,7 +340,7 @@ void read(String & s, ReadBuffer & in)
if (size < 0)
throw Exception("Negative size while reading string from ZooKeeper", ZMARSHALLINGERROR);
if (size > max_string_size)
if (size > MAX_STRING_OR_ARRAY_SIZE)
throw Exception("Too large string size while reading from ZooKeeper", ZMARSHALLINGERROR);
s.resize(size);
@ -369,12 +373,11 @@ void read(Stat & stat, ReadBuffer & in)
template <typename T> void read(std::vector<T> & arr, ReadBuffer & in)
{
static constexpr int32_t max_array_size = 1 << 20;
int32_t size = 0;
read(size, in);
if (size < 0)
throw Exception("Negative size while reading array from ZooKeeper", ZMARSHALLINGERROR);
if (size > max_array_size)
if (size > MAX_STRING_OR_ARRAY_SIZE)
throw Exception("Too large array size while reading from ZooKeeper", ZMARSHALLINGERROR);
arr.resize(size);
for (auto & elem : arr)