fixed testkit test for test_Session_run

Author: p123-stack

src/Bolt/BoltConnection.php

@@ -319,7 +319,7 @@ public function close(): void
         try {
             if ($this->isOpen()) {
                 if ($this->isStreaming()) {
-                    $this->consumeResults();
+                    $this->discardUnconsumedResults();
                 }
 
                 $message = $this->messageFactory->createGoodbyeMessage();
@@ -405,4 +405,30 @@ private function assertNoFailure(Response $response): void
             throw Neo4jException::fromBoltResponse($response);
         }
     }
+
+    /**
+     * Discard unconsumed results - sends DISCARD to server for each subscribed result.
+     */
+    public function discardUnconsumedResults(): void
+    {
+        $this->logger?->log(LogLevel::DEBUG, 'Discarding unconsumed results');
+
+        $this->subscribedResults = array_values(array_filter(
+            $this->subscribedResults,
+            static fn (WeakReference $ref): bool => $ref->get() !== null
+        ));
+
+        if (!empty($this->subscribedResults)) {
+            try {
+                $this->discard(null);
+                $this->logger?->log(LogLevel::DEBUG, 'Sent DISCARD ALL for unconsumed results');
+            } catch (Throwable $e) {
+                $this->logger?->log(LogLevel::ERROR, 'Failed to discard results', [
+                    'exception' => $e->getMessage(),
+                ]);
+            }
+        }
+
+        $this->subscribedResults = [];
+    }
 }

src/Bolt/Session.php

@@ -39,6 +39,8 @@
  */
 final class Session implements SessionInterface
 {
+    /** @var list<BoltConnection> */
+    private array $usedConnections = [];
     /** @psalm-readonly */
     private readonly BookmarkHolder $bookmarkHolder;
 
@@ -178,6 +180,7 @@ private function acquireConnection(TransactionConfiguration $config, SessionConf
             $timeout = ($timeout < 30) ? 30 : $timeout;
             $connection->setTimeout($timeout + 2);
         }
+        $this->usedConnections[] = $connection;
 
         return $connection;
     }
@@ -217,6 +220,14 @@ public function getLastBookmark(): Bookmark
         return $this->bookmarkHolder->getBookmark();
     }
 
+    public function close(): void
+    {
+        foreach ($this->usedConnections as $connection) {
+            $connection->discardUnconsumedResults();
+        }
+        $this->usedConnections = [];
+    }
+
     private function getLogger(): ?Neo4jLogger
     {
         return $this->pool->getLogger();

src/Types/CypherList.php

@@ -42,17 +42,19 @@ class CypherList implements CypherSequence, Iterator, ArrayAccess
      * @use CypherSequenceTrait<TValue>
      */
     use CypherSequenceTrait;
+    private ?int $qid = null;
 
     /**
      * @param iterable<mixed, TValue>|callable():Generator<mixed, TValue> $iterable
      *
      * @psalm-mutation-free
      */
-    public function __construct(iterable|callable $iterable = [])
+    public function __construct(iterable|callable $iterable = [], ?int $qid = null)
     {
         if (is_array($iterable)) {
             $iterable = new ArrayIterator($iterable);
         }
+        $this->qid = $qid;
 
         $this->generator = static function () use ($iterable): Generator {
             $i = 0;
@@ -425,4 +427,9 @@ public function each(callable $callable): self
 
         return $this;
     }
+
+    public function getQid(): ?int
+    {
+        return $this->qid;
+    }
 }

testkit-backend/src/Handlers/AbstractRunner.php

@@ -47,7 +47,7 @@ public function __construct(MainRepository $repository, LoggerInterface $logger)
         $this->logger = $logger;
     }
 
-    public function handle($request): ResultResponse
+    public function handle($request): ResultResponse|DriverErrorResponse
     {
         $session = $this->getRunner($request);
         $id = Uuid::v4();
@@ -80,12 +80,11 @@ public function handle($request): ResultResponse
             return new ResultResponse($id, $result->isEmpty() ? [] : $result->first()->keys());
         } catch (Neo4jException $exception) {
             $this->logger->debug($exception->__toString());
-            $this->repository->addRecords($id, new DriverErrorResponse(
+
+            return new DriverErrorResponse(
                 $this->getId($request),
                 $exception
-            ));
-
-            return new ResultResponse($id, []);
+            );
         } // NOTE: all other exceptions will be caught in the Backend
     }
 

testkit-backend/src/Handlers/SessionClose.php

@@ -35,6 +35,11 @@ public function __construct(MainRepository $repository)
      */
     public function handle($request): SessionResponse
     {
+        $session = $this->repository->getSession($request->getSessionId());
+
+        if ($session !== null) {
+            $session->close();
+        }
         $this->repository->removeSession($request->getSessionId());
 
         return new SessionResponse($request->getSessionId());

testkit-backend/testkit.sh

@@ -75,11 +75,17 @@ EXIT_CODE=0
 
 #stub
 #test-basic-query
+#python3 -m unittest tests.stub.basic_query.test_basic_query.TestBasicQuery.test_4x4_populates_node_element_id_with_id
+#python3 -m unittest tests.stub.basic_query.test_basic_query.TestBasicQuery.test_5x0_populates_node_element_id_with_string
+#python3 -m unittest tests.stub.basic_query.test_basic_query.TestBasicQuery.test_4x4_populates_rel_element_id_with_id
+#python3 -m unittest tests.stub.basic_query.test_basic_query.TestBasicQuery.test_4x4_populates_path_element_ids_with_long
 
-python3 -m unittest tests.stub.basic_query.test_basic_query.TestBasicQuery.test_4x4_populates_node_element_id_with_id
-python3 -m unittest tests.stub.basic_query.test_basic_query.TestBasicQuery.test_5x0_populates_node_element_id_with_string
-python3 -m unittest tests.stub.basic_query.test_basic_query.TestBasicQuery.test_4x4_populates_rel_element_id_with_id
-python3 -m unittest tests.stub.basic_query.test_basic_query.TestBasicQuery.test_4x4_populates_path_element_ids_with_long
+
+#test-session-run
+python3 -m unittest tests.stub.session_run.test_session_run.TestSessionRun.test_discard_on_session_close_untouched_result
+python3 -m unittest tests.stub.session_run.test_session_run.TestSessionRun.test_discard_on_session_close_unfinished_result
+python3 -m unittest tests.stub.session_run.test_session_run.TestSessionRun.test_no_discard_on_session_close_finished_result
+python3 -m unittest tests.stub.session_run.test_session_run.TestSessionRun.test_raises_error_on_session_run
 
 
 exit $EXIT_CODE