Revert "fix(sharding): prevent node divergence during join"

This reverts commit e098010.

Author: donhardman

src/Plugin/Sharding/Cluster.php

@@ -247,24 +247,14 @@ public static function areAllShardingClustersPrimary(Client $client): bool {
 	 * @return static
 	 */
 	public function addNodeIds(Queue $queue, array $nodeIds, ?string $operationGroup = null): static {
-		$baseWaitForId = $queue->getWaitForId();
 		foreach ($nodeIds as $node) {
 			$this->nodes->add($node);
-			// A node that previously held this cluster still has a stale copy persisted on disk
-			// (cluster state survives a restart). A plain JOIN is then rejected with "cluster
-			// already exists" and the node never state-transfers the writes it missed while down,
-			// so it diverges (keeps fewer rows). Drop any local copy first — a no-op on a brand
-			// new node, tolerated in Queue — then JOIN so the node gets a fresh SST from the
-			// donor ({$this->nodeId}, the surviving data holder).
-			$queue->setWaitForId($baseWaitForId);
-			$deleteId = $queue->add($node, "DELETE CLUSTER {$this->name}", '', $operationGroup);
-			$queue->setWaitForId($deleteId);
+			// TODO: the pass is the subject to remove
 			$query = "JOIN CLUSTER {$this->name} at '{$this->nodeId}' '{$this->name}' as " .
 				'path';
 			$rollback = "DELETE CLUSTER {$this->name}";
 			$queue->add($node, $query, $rollback, $operationGroup);
 		}
-		$queue->setWaitForId($baseWaitForId);
 		return $this;
 	}
 

src/Plugin/Sharding/Queue.php

@@ -64,14 +64,6 @@ public function resetWaitForId(): static {
 		return $this;
 	}
 
-	/**
-	 * Read the wait-for id currently applied to newly added items
-	 * @return int
-	 */
-	public function getWaitForId(): int {
-		return $this->waitForId;
-	}
-
 	/**
 	 * Add new query for requested node to the queue
 	 * @param string $nodeId
@@ -226,14 +218,6 @@ protected function handleQuery(Node $node, array $query): bool {
 			$status = $this->handleAlterClusterDropTableError($query['query'], $res);
 		}
 
-		// Special handling for DELETE CLUSTER: when we proactively clear a node's stale local
-		// copy before re-JOIN, a brand-new node has no such cluster ("unknown cluster"). That
-		// is exactly the desired post-state, not a failure — otherwise the item deadlocks the
-		// JOIN that waits on it.
-		if ($status === 'error' && $this->isDeleteClusterQuery($query['query'])) {
-			$status = $this->handleDeleteClusterError($res);
-		}
-
 		Buddy::debugvv("[{$node->id}] Queue query result [$status]: " . json_encode($res));
 
 		$duration = (int)((microtime(true) - $mt) * 1000);
@@ -447,32 +431,6 @@ protected function handleAlterClusterDropTableError(string $query, Struct $error
 		return 'error';
 	}
 
-	/**
-	 * Whether the query is a DELETE CLUSTER statement
-	 * @param string $query
-	 * @return bool
-	 */
-	protected function isDeleteClusterQuery(string $query): bool {
-		return (bool)preg_match('/^\s*DELETE\s+CLUSTER\s+/i', $query);
-	}
-
-	/**
-	 * A DELETE CLUSTER that fails because the cluster is not present locally has already
-	 * reached its intended state (no stale copy), so treat it as processed.
-	 * @param Struct<int|string,mixed> $errorResult
-	 * @return string
-	 */
-	protected function handleDeleteClusterError(Struct $errorResult): string {
-		/** @var array{error?:string}|array{0?:array{error?:string}} $arr */
-		$arr = $errorResult;
-		$error = (string)($arr['error'] ?? ($arr[0]['error'] ?? ''));
-		if (stripos($error, 'unknown cluster') !== false || stripos($error, 'no such cluster') !== false) {
-			Buddy::debugvv('DELETE CLUSTER: cluster not present locally, marking as processed');
-			return 'processed';
-		}
-		return 'error';
-	}
-
 	/**
 	 * Handle error for ALTER CLUSTER ADD TABLE by checking if query is still running
 	 * or if tables are already synced in cluster