refactor and add id/isRev/receive

src/Core/AbstractCoResult.php

@@ -3,7 +3,6 @@
 namespace Swoft\Core;
 
 use Swoft\Pool\ConnectionInterface;
-use Swoft\Pool\PoolInterface;
 
 /**
  * The result of cor
@@ -15,11 +14,6 @@ abstract class AbstractCoResult implements ResultInterface
      */
     protected $connection;
 
-    /**
-     * @var PoolInterface
-     */
-    protected $pool;
-
     /**
      * @var string
      */
@@ -28,13 +22,11 @@ abstract class AbstractCoResult implements ResultInterface
     /**
      * AbstractCorResult constructor.
      *
-     * @param mixed         $connection
-     * @param string        $profileKey
-     * @param PoolInterface $pool
+     * @param mixed  $connection
+     * @param string $profileKey
      */
-    public function __construct(ConnectionInterface $connection = null, string $profileKey = '', PoolInterface $pool = null)
+    public function __construct($connection = null, string $profileKey = '')
     {
-        $this->pool       = $pool;
         $this->connection = $connection;
         $this->profileKey = $profileKey;
     }
@@ -48,15 +40,16 @@ public function __construct(ConnectionInterface $connection = null, string $prof
      */
     public function recv($defer = false)
     {
-        $result = $this->connection->recv();
+        if ($this->connection instanceof ConnectionInterface) {
+            $result = $this->connection->receive();
+            $this->connection->release();
 
-        // 重置延迟设置
-        if ($defer) {
-            $this->connection->setDefer(false);
+            return $result;
         }
 
-        if ($this->pool !== null) {
-            $this->pool->release($this->connection);
+        $result = $this->connection->recv();
+        if ($defer) {
+            $this->connection->setDefer(false);
         }
 
         return $result;

src/Core/AbstractDataResult.php

@@ -3,23 +3,17 @@
 namespace Swoft\Core;
 
 use Swoft\Pool\ConnectionInterface;
-use Swoft\Pool\PoolInterface;
 
 /**
  * Sync result
  */
 abstract class AbstractDataResult implements ResultInterface
 {
     /**
-     * @var ConnectionInterface
+     * @var mixed
      */
     protected $connection;
 
-    /**
-     * @var PoolInterface
-     */
-    protected $pool;
-
     /**
      * @var mixed
      */
@@ -28,14 +22,25 @@ abstract class AbstractDataResult implements ResultInterface
     /**
      * AbstractDataResult constructor.
      *
-     * @param mixed               $data
-     * @param ConnectionInterface $connection
-     * @param PoolInterface       $pool
+     * @param mixed $data
+     * @param mixed $connection
      */
-    public function __construct($data, ConnectionInterface $connection = null, PoolInterface $pool = null)
+    public function __construct($data, $connection = null)
     {
         $this->data       = $data;
-        $this->pool       = $pool;
         $this->connection = $connection;
     }
+
+    /**
+     * @return void
+     */
+    protected function release()
+    {
+        if ($this->connection instanceof ConnectionInterface) {
+            $this->connection->release();
+        }
+
+        return;
+    }
+
 }

src/Core/RequestContext.php

@@ -124,6 +124,49 @@ public static function getContextDataByKey(string $key, $default = null)
         return $default;
     }
 
+    /**
+     * Update context data by child key
+     *
+     * @param string $key
+     * @param string $child
+     * @param mixed  $val
+     */
+    public static function setContextDataByChildKey(string $key, string $child, $val)
+    {
+        $coroutineId = self::getCoroutineId();
+        self::$context[$coroutineId][self::DATA_KEY][$key][$child] = $val;
+    }
+
+    /**
+     * Get context data by child key
+     *
+     * @param string $key
+     * @param string $child
+     * @param mixed  $default
+     * @return mixed
+     */
+    public static function getContextDataByChildKey(string $key, string $child, $default = null)
+    {
+        $coroutineId = self::getCoroutineId();
+        if (isset(self::$context[$coroutineId][self::DATA_KEY][$key][$child])) {
+            return self::$context[$coroutineId][self::DATA_KEY][$key][$child];
+        }
+
+        return $default;
+    }
+
+    /**
+     * Get context data by child key
+     *
+     * @param string $key
+     * @param string $child
+     */
+    public static function removeContextDataByChildKey(string $key, string $child)
+    {
+        $coroutineId = self::getCoroutineId();
+        unset(self::$context[$coroutineId][self::DATA_KEY][$key][$child]);
+    }
+
     /**
      * Get Current Request Log ID
      *

src/Event/AppEvent.php

@@ -22,6 +22,11 @@ class AppEvent
      */
     const RESOURCE_RELEASE = 'resourceRelease';
 
+    /**
+     * Resource transaction event behind application
+     */
+    const TRANSACTION_RELEASE = 'transactionRelease';
+
     /**
      * Worker start event
      */

src/Event/Events/TransactionReleaseEvent.php

@@ -0,0 +1,44 @@
+<?php
+
+namespace Swoft\Event\Events;
+
+use Swoft\Event\Event;
+
+/**
+ * TransactionEvent
+ */
+class TransactionReleaseEvent extends Event
+{
+    /**
+     * @var \SplStack[]
+     */
+    private $tsStacks;
+
+    /**
+     * @var []
+     */
+    private $connections;
+
+    public function __construct($name = null, array $tsStacks, array &$connections)
+    {
+        parent::__construct($name);
+        $this->tsStacks = $tsStacks;
+        $this->connections = $connections;
+    }
+
+    /**
+     * @return \SplStack[]
+     */
+    public function getTsStacks(): array
+    {
+        return $this->tsStacks;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getConnections()
+    {
+        return $this->connections;
+    }
+}

src/Event/Listeners/ResourceReleaseListener.php

@@ -0,0 +1,55 @@
+<?php
+
+namespace Swoft\Event\Listeners;
+
+use Swoft\App;
+use Swoft\Bean\Annotation\Listener;
+use Swoft\Core\RequestContext;
+use Swoft\Event\AppEvent;
+use Swoft\Event\EventHandlerInterface;
+use Swoft\Event\EventInterface;
+use Swoft\Event\Events\TransactionReleaseEvent;
+use Swoft\Helper\PoolHelper;
+use Swoft\Log\Log;
+
+/**
+ * Resource release listener
+ *
+ * @Listener(AppEvent::RESOURCE_RELEASE)
+ */
+class ResourceReleaseListener implements EventHandlerInterface
+{
+    /**
+     * @param \Swoft\Event\EventInterface $event
+     * @throws \Swoft\Redis\Exception\RedisException
+     */
+    public function handle(EventInterface $event)
+    {
+        $contextTsKey = PoolHelper::getContextTsKey();
+        $connectionKey = PoolHelper::getContextCntKey();
+        $tsStacks     = RequestContext::getContextDataByKey($contextTsKey, []);
+        $connections   = RequestContext::getContextDataByKey($connectionKey, []);
+
+        if (empty($connections)) {
+            return;
+        }
+
+        /* @var \Swoft\Pool\ConnectionInterface $connection */
+        foreach ($connections as $connection){
+            if (App::isCoContext() && !$connection->isRecv()) {
+                $connection->receive();
+            }
+        }
+
+        if (!empty($tsStacks)) {
+            $event = new TransactionReleaseEvent(AppEvent::TRANSACTION_RELEASE, $tsStacks, $connections);
+            App::trigger($event);
+        }
+
+        /* @var \Swoft\Pool\ConnectionInterface $connection */
+        foreach ($connections as $connectionId => $connection) {
+            Log::error(sprintf('%s connection is not released ，forget to getResult() or em->close', get_class($connection)));
+            $connection->release(true);
+        }
+    }
+}

src/Helper/PoolHelper.php

@@ -0,0 +1,39 @@
+<?php
+
+namespace Swoft\Helper;
+
+use Swoft\Core\Coroutine;
+
+/**
+ * PoolHelper
+ */
+class PoolHelper
+{
+    /**
+     * @return string
+     */
+    public static function getContextCntKey(): string
+    {
+        return sprintf('connectioins');
+    }
+
+    /**
+     * @return string
+     */
+    public static function getContextTsKey(): string
+    {
+        return sprintf('transactions');
+    }
+
+    /**
+     * @param string $poolId
+     *
+     * @return string
+     */
+    public static function getCidPoolId(string $poolId)
+    {
+        $cid = Coroutine::id();
+
+        return sprintf('%d-%s', $cid, $poolId);
+    }
+}