Merge pull request #10659 from ClickHouse/fix_multiple_simultaneous_alters

alexey-milovidov · web-flow · commit 5eebe8cf5376 · 2020-05-04T21:43:32.000+03:00
Fix alter-mutations assignment
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeQueue.cpp b/src/Storages/MergeTree/ReplicatedMergeTreeQueue.cpp
@@ -1861,10 +1861,17 @@ std::optional<std::pair<Int64, int>> ReplicatedMergeTreeMergePredicate::getDesir
     for (auto [mutation_version, mutation_status] : in_partition->second)
     {
         max_version = mutation_version;
-        if (mutation_version > current_version && mutation_status->entry->alter_version != -1)
+        if (mutation_status->entry->isAlterMutation())
         {
-            alter_version = mutation_status->entry->alter_version;
-            break;
+            /// We want to assign mutations for part which version is bigger
+            /// than part current version. But it doesn't make sence to assign
+            /// more fresh versions of alter-mutations if previous alter still
+            /// not done because alters execute one by one in strict order.
+            if (mutation_version > current_version || !mutation_status->is_done)
+            {
+                alter_version = mutation_status->entry->alter_version;
+                break;
+            }
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -1861,10 +1861,17 @@ std::optional<std::pair<Int64, int>> ReplicatedMergeTreeMergePredicate::getDesir`
`1861`	`1861`	`for (auto [mutation_version, mutation_status] : in_partition->second)`
`1862`	`1862`	`{`
`1863`	`1863`	`max_version = mutation_version;`
`1864`		`- if (mutation_version > current_version && mutation_status->entry->alter_version != -1)`
	`1864`	`+ if (mutation_status->entry->isAlterMutation())`
`1865`	`1865`	`{`
`1866`		`- alter_version = mutation_status->entry->alter_version;`
`1867`		`- break;`
	`1866`	`+ /// We want to assign mutations for part which version is bigger`
	`1867`	`+ /// than part current version. But it doesn't make sence to assign`
	`1868`	`+ /// more fresh versions of alter-mutations if previous alter still`
	`1869`	`+ /// not done because alters execute one by one in strict order.`
	`1870`	`+ if (mutation_version > current_version \|\| !mutation_status->is_done)`
	`1871`	`+ {`
	`1872`	`+ alter_version = mutation_status->entry->alter_version;`
	`1873`	`+ break;`
	`1874`	`+ }`
`1868`	`1875`	`}`
`1869`	`1876`	`}`
`1870`	`1877`