thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-10-05 16:10:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/yandex/ClickHouse into CLICKHOUSE-2720

Browse Source
This commit is contained in:
Ivan Blinkov 2018-05-04 15:39:38 +03:00
commit 1d2db84e73
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -43,6 +43,7 @@ cmake-build-*
# Python cache # Python cache
*.pyc *.pyc
__pycache__ __pycache__
*.pytest_cache
# ignore generated files # ignore generated files
*-metrika-yandex *-metrika-yandex

2
dbms/src/Columns/ColumnVector.cpp
View File

@ -116,7 +116,7 @@ MutableColumnPtr ColumnVector<T>::cloneResized(size_t size) const
memcpy(&new_col.data[0], &data[0], count * sizeof(data[0])); memcpy(&new_col.data[0], &data[0], count * sizeof(data[0]));
if (size > count) if (size > count)
memset(&new_col.data[count], static_cast<int>(value_type()), size - count); memset(&new_col.data[count], static_cast<int>(value_type()), (size - count) * sizeof(value_type));
} }
return std::move(res); return std::move(res);

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

@ -775,7 +775,7 @@ size_t KeeperMultiException::getFailedOpIndex(int32_t code, const Responses & re
KeeperMultiException::KeeperMultiException(int32_t code, const Requests & requests, const Responses & responses) KeeperMultiException::KeeperMultiException(int32_t code, const Requests & requests, const Responses & responses)
: KeeperException("Transaction failed at op #" + std::to_string(getFailedOpIndex(code, responses)), code), : KeeperException("Transaction failed at op #" + std::to_string(getFailedOpIndex(code, responses)), code),
requests(requests), responses(responses) requests(requests), responses(responses), failed_op_index(getFailedOpIndex(code, responses))
{ {
} }