PHPLIB-1115: Fix waitForSnapshot() for MongoDB 7.0+

This fixes a bug in the original implementation where the method would return even if the query did not match a document. Instead, we should retry if either the query fails to match or a SnapshotUnavailable error is raised.

This issue was only discovered due to increased snapshot latency in MongoDB 7.0-dev. In previous versions, the snapshot was always available by the subsequent queries in testSnapshotQueries(), which uses waitForSnapshot().

Additionally, usleep() is added to avoid spamming the server with retry attempts. The TODO item for hrtime() was also removed, as there's no significant benefit to using it in this context and it's return types are not as convenient as microtime().

Author: jmikola

tests/DocumentationExamplesTest.php

@@ -19,6 +19,7 @@
 use function microtime;
 use function ob_end_clean;
 use function ob_start;
+use function usleep;
 use function var_dump;
 use function version_compare;
 
@@ -1973,27 +1974,21 @@ private function waitForSnapshot(string $databaseName, string $collectionName):
         $collection = new Collection($this->manager, $databaseName, $collectionName);
         $session = $this->manager->startSession(['snapshot' => true]);
 
-        /* Retry until a snapshot query succeeds or ten seconds elapse,
-         * whichwever comes first.
-         *
-         * TODO: use hrtime() once the library requires PHP 7.3+ */
+        // Retry until a snapshot query succeeds or ten seconds elapse.
         $retryUntil = microtime(true) + 10;
 
         do {
             try {
-                $collection->aggregate(
-                    [['$match' => ['_id' => ['$exists' => true]]]],
-                    ['session' => $session]
-                );
-
-                break;
+                if ($collection->findOne([], ['session' => $session]) !== null) {
+                    break;
+                }
             } catch (CommandException $e) {
-                if ($e->getCode() === 246 /* SnapshotUnavailable */) {
-                    continue;
+                if ($e->getCode() !== 246 /* SnapshotUnavailable */) {
+                    throw $e;
                 }
-
-                throw $e;
             }
+
+            usleep(1000);
         } while (microtime(true) < $retryUntil);
     }