mirror of
https://github.com/ClickHouse/ClickHouse.git
synced 2024-10-05 08:00:51 +00:00
Merge branch 'master' of https://github.com/yandex/ClickHouse into CLICKHOUSE-2720
This commit is contained in:
commit
1d2db84e73
1
.gitignore
vendored
1
.gitignore
vendored
@ -43,6 +43,7 @@ cmake-build-*
|
||||
# Python cache
|
||||
*.pyc
|
||||
__pycache__
|
||||
*.pytest_cache
|
||||
|
||||
# ignore generated files
|
||||
*-metrika-yandex
|
||||
|
@ -116,7 +116,7 @@ MutableColumnPtr ColumnVector<T>::cloneResized(size_t size) const
|
||||
memcpy(&new_col.data[0], &data[0], count * sizeof(data[0]));
|
||||
|
||||
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);
|
||||
|
@ -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)
|
||||
: 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))
|
||||
{
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user