Update ReplicatedMergeTreeSink.cpp

tavplubix · web-flow · commit ae8d7a557b74 · 2023-10-30T15:43:48.000+01:00
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeSink.cpp b/src/Storages/MergeTree/ReplicatedMergeTreeSink.cpp
@@ -928,8 +928,13 @@ std::pair<std::vector<String>, bool> ReplicatedMergeTreeSinkImpl<async_insert>::
         }
         else if (multi_code == Coordination::Error::ZNONODE && zkutil::getFailedOpIndex(multi_code, responses) == block_unlock_op_idx)
         {
+            if (block_number_lock)
+                throw Exception(ErrorCodes::QUERY_WAS_CANCELLED,
+                            "Insert query (for block {}) was canceled by concurrent ALTER PARTITION or TRUNCATE", block_number_lock->getPath());
+
+            chassert(!existing_part_name.empty());
             throw Exception(ErrorCodes::QUERY_WAS_CANCELLED,
-                            "Insert query (for block {}) was cancelled by concurrent ALTER PARTITION", block_number_lock->getPath());
+                            "Insert query (for existing part {}, deduplicated) was canceled by concurrent ALTER PARTITION, TRUNCATE, or the part became outdated", existing_part_name);
         }
         else if (Coordination::isHardwareError(multi_code))
         {

Original file line number	Diff line number	Diff line change
`@@ -928,8 +928,13 @@ std::pair<std::vector<String>, bool> ReplicatedMergeTreeSinkImpl<async_insert>::`
`928`	`928`	`}`
`929`	`929`	`else if (multi_code == Coordination::Error::ZNONODE && zkutil::getFailedOpIndex(multi_code, responses) == block_unlock_op_idx)`
`930`	`930`	`{`
	`931`	`+ if (block_number_lock)`
	`932`	`+ throw Exception(ErrorCodes::QUERY_WAS_CANCELLED,`
	`933`	`+ "Insert query (for block {}) was canceled by concurrent ALTER PARTITION or TRUNCATE", block_number_lock->getPath());`
	`934`	`+`
	`935`	`+ chassert(!existing_part_name.empty());`
`931`	`936`	`throw Exception(ErrorCodes::QUERY_WAS_CANCELLED,`
`932`		`- "Insert query (for block {}) was cancelled by concurrent ALTER PARTITION", block_number_lock->getPath());`
	`937`	`+ "Insert query (for existing part {}, deduplicated) was canceled by concurrent ALTER PARTITION, TRUNCATE, or the part became outdated", existing_part_name);`
`933`	`938`	`}`
`934`	`939`	`else if (Coordination::isHardwareError(multi_code))`
`935`	`940`	`{`