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

Revert accident change

Browse Source
This commit is contained in:
alesapin 2022-02-08 14:05:01 +03:00
parent 3af6012cb4
commit b47b0eb1dc
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Storages/MergeTree/IMergeTreeDataPart.cpp
View File

@ -1187,7 +1187,7 @@ std::optional<bool> IMergeTreeDataPart::keepSharedDataInDecoupledStorage() const
if (force_keep_shared_data)
return true;
return !storage.unlockSharedData(*this, is_temp ? relative_path : name);
return !storage.unlockSharedData(*this);
}
void IMergeTreeDataPart::remove() const

4
tests/queries/0_stateless/01509_parallel_quorum_and_merge_long.sh
View File

@ -1,6 +1,8 @@
#!/usr/bin/env bash
# Tags: long, no-replicated-database
# Tags: long, no-replicated-database, no-s3-storage
# Tag no-replicated-database: Fails due to additional replicas or shards
# Tag no-s3-storage: Merge assigned to replica 2, but replication queues are stopped for it
set -e