This commit is contained in:
Alexey Milovidov 2020-04-10 20:23:45 +03:00
parent 7cafdba9c7
commit 39bbc1071b
2 changed files with 3 additions and 3 deletions

View File

@ -104,7 +104,7 @@ INSTANTIATE_TEST_SUITE_P(Basic,
DateLUT::instance("Europe/Minsk")
},
{
"When scale is 0, subsecond part is 0 despite beeing present in string.",
"When scale is 0, subsecond part is 0 despite being present in string.",
"2019-09-16 19:20:17.123",
1568650817ULL,
0,

View File

@ -1758,7 +1758,7 @@ bool ReplicatedMergeTreeMergePredicate::operator()(
{
if (out_reason)
*out_reason = "There are " + toString(covered.size()) + " parts (from " + covered.front()
+ " to " + covered.back() + ") that are still not present or beeing processed by "
+ " to " + covered.back() + ") that are still not present or being processed by "
+ " other background process on this replica between " + left->name + " and " + right->name;
return false;
}
@ -1791,7 +1791,7 @@ std::optional<std::pair<Int64, int>> ReplicatedMergeTreeMergePredicate::getDesir
/// the part (checked by querying queue.virtual_parts), we can confidently assign a mutation to
/// version X for this part.
/// We cannot mutate part if it's beeing inserted with quorum and it's not
/// We cannot mutate part if it's being inserted with quorum and it's not
/// already reached.
if (part->name == inprogress_quorum_part)
return {};