tweak(OOI) improve select for update / broadcast hub behavior

tine-groupware · Aug 13, 2024 · 884a860 · 884a860
1 parent 18d08e2
commit 884a860
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 6 deletions.
diff --git a/tine20/OnlyOfficeIntegrator/Controller.php b/tine20/OnlyOfficeIntegrator/Controller.php
@@ -6,7 +6,7 @@
  * @subpackage   Controller
  * @license      http://www.gnu.org/licenses/agpl.html AGPL Version 3
  * @author       Cornelius Weiß <c.weiss@metaways.de>
- * @copyright    Copyright (c) 2018-2023 Metaways Infosystems GmbH (http://www.metaways.de)
+ * @copyright    Copyright (c) 2018-2024 Metaways Infosystems GmbH (http://www.metaways.de)
  *
  */
 
@@ -485,12 +485,16 @@ protected function processStatus3(string $token): bool
 
     protected function processStatus4($token)
     {
+        $forUpdateRaii = Tinebase_Backend_Sql_SelectForUpdateHook::getRAII(
+            OnlyOfficeIntegrator_Controller_AccessToken::getInstance()->getBackend()
+        );
         $raii = Tinebase_RAII::getTransactionManagerRAII();
         $allTokens = OnlyOfficeIntegrator_Controller_AccessToken::getInstance()->search(
             Tinebase_Model_Filter_FilterGroup::getFilterForModel(OnlyOfficeIntegrator_Model_AccessToken::class, [
                 ['field' => OnlyOfficeIntegrator_Model_AccessToken::FLDS_TOKEN, 'operator' => 'equals', 'value' => $token],
                 ['field' => OnlyOfficeIntegrator_Model_AccessToken::FLDS_INVALIDATED, 'operator' => 'equals', 'value' => Tinebase_Model_Filter_Bool::VALUE_NOTSET],
             ]));
+        unset($forUpdateRaii);
 
         foreach ($allTokens as $tokenRecord) {
             $tokenRecord->{OnlyOfficeIntegrator_Model_AccessToken::FLDS_INVALIDATED} = 1;

diff --git a/tine20/OnlyOfficeIntegrator/Controller/AccessToken.php b/tine20/OnlyOfficeIntegrator/Controller/AccessToken.php
@@ -6,7 +6,7 @@
  * @subpackage  Controller
  * @license     http://www.gnu.org/licenses/agpl.html AGPL Version 3
  * @author      Paul Mehrer <p.mehrer@metaways.de>
- * @copyright   Copyright (c) 2019-2023 Metaways Infosystems GmbH (http://www.metaways.de)
+ * @copyright   Copyright (c) 2019-2024 Metaways Infosystems GmbH (http://www.metaways.de)
  *
  */
 
@@ -290,22 +290,32 @@ protected function _inspectAfterCreate($_createdRecord, Tinebase_Record_Interfac
     {
         parent::_inspectAfterCreate($_createdRecord, $_record);
 
+        static $bhCache = [];
         if ($_createdRecord->{OnlyOfficeIntegrator_Model_AccessToken::FLDS_NODE_REVISION} != OnlyOfficeIntegrator_Model_AccessToken::TEMP_FILE_REVISION &&
                 Tinebase_BroadcastHub::getInstance()->isActive()) {
-            $node = Tinebase_FileSystem::getInstance()->get($_createdRecord->{OnlyOfficeIntegrator_Model_AccessToken::FLDS_NODE_ID});
-            Tinebase_BroadcastHub::getInstance()->pushAfterCommit('update', get_class($node), $node->getId(), $node->getContainerId());
+            $nodeId = $_createdRecord->{OnlyOfficeIntegrator_Model_AccessToken::FLDS_NODE_ID};
+            if (!isset($bhCache[$nodeId])) {
+                $bhCache[$nodeId] = true;
+                $node = Tinebase_FileSystem::getInstance()->get($nodeId);
+                Tinebase_BroadcastHub::getInstance()->pushAfterCommit('update', get_class($node), $node->getId(), $node->getContainerId());
+            }
         }
     }
 
     protected function _inspectAfterUpdate($updatedRecord, $record, $currentRecord)
     {
         parent::_inspectAfterUpdate($updatedRecord, $record, $currentRecord);
 
+        static $bhCache = [];
         if ($updatedRecord->{OnlyOfficeIntegrator_Model_AccessToken::FLDS_NODE_REVISION} != OnlyOfficeIntegrator_Model_AccessToken::TEMP_FILE_REVISION &&
                 Tinebase_BroadcastHub::getInstance()->isActive()) {
             try {
-                $node = Tinebase_FileSystem::getInstance()->get($updatedRecord->{OnlyOfficeIntegrator_Model_AccessToken::FLDS_NODE_ID});
-                Tinebase_BroadcastHub::getInstance()->pushAfterCommit('update', get_class($node), $node->getId(), $node->getContainerId());
+                $nodeId = $updatedRecord->{OnlyOfficeIntegrator_Model_AccessToken::FLDS_NODE_ID};
+                if (!isset($bhCache[$nodeId])) {
+                    $bhCache[$nodeId] = true;
+                    $node = Tinebase_FileSystem::getInstance()->get($nodeId);
+                    Tinebase_BroadcastHub::getInstance()->pushAfterCommit('update', get_class($node), $node->getId(), $node->getContainerId());
+                }
             // file might have been deleted -> ignore tenf
             } catch (Tinebase_Exception_NotFound $tenf) {}
         }