[BUGFIX] Make ReferenceIndex caching optional

The runtime caches used in the ReferenceIndex class
added in TYPO3 8.7.2 should not be added by default
but included on a per-runtime basis when extensions
would use the ReferenceIndex. Otherwise this issue
might lead to side-effects.

For master/9.0 the caches are enabled by default.

Relates: #78634
Resolves: #81771
Releases: master, 8.7
Change-Id: If7ca173d93c05658bce5f57c38842555a439d2ea
Reviewed-on: https://review.typo3.org/53384
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Markus Klein <markus.klein@typo3.org>
Tested-by: Markus Klein <markus.klein@typo3.org>

diff --git a/typo3/sysext/backend/Classes/Command/ReferenceIndexUpdateCommand.php b/typo3/sysext/backend/Classes/Command/ReferenceIndexUpdateCommand.php
index 31c6c8a..b516e5e 100644 (file)
--- a/typo3/sysext/backend/Classes/Command/ReferenceIndexUpdateCommand.php
+++ b/typo3/sysext/backend/Classes/Command/ReferenceIndexUpdateCommand.php
@@ -56,6 +56,7 @@ class ReferenceIndexUpdateCommand extends Command
 
         /** @var ReferenceIndex $referenceIndex */
         $referenceIndex = GeneralUtility::makeInstance(ReferenceIndex::class);
+        $referenceIndex->enableRuntimeCache();
         $referenceIndex->updateIndex($isTestOnly, $isSilent);
     }
 }

diff --git a/typo3/sysext/core/Classes/DataHandling/DataHandler.php b/typo3/sysext/core/Classes/DataHandling/DataHandler.php
index 7e8844c..ff269b5 100644 (file)
--- a/typo3/sysext/core/Classes/DataHandling/DataHandler.php
+++ b/typo3/sysext/core/Classes/DataHandling/DataHandler.php
@@ -4145,6 +4145,7 @@ class DataHandler implements LoggerAwareInterface
                     if (@is_file($copyDestName)) {
                         /** @var ReferenceIndex $sysRefObj */
                         $sysRefObj = GeneralUtility::makeInstance(ReferenceIndex::class);
+                        $sysRefObj->enableRuntimeCache();
                         $error = $sysRefObj->setReferenceValue($rteFileRecord['hash'], PathUtility::stripPathSitePrefix($copyDestName), false, true);
                         if ($error) {
                             $this->newlog(ReferenceIndex::class . '::setReferenceValue(): ' . $error, 1);
@@ -5256,6 +5257,7 @@ class DataHandler implements LoggerAwareInterface
         // Use reference index object to find files in fields:
         /** @var ReferenceIndex $refIndexObj */
         $refIndexObj = GeneralUtility::makeInstance(ReferenceIndex::class);
+        $refIndexObj->enableRuntimeCache();
         $files = $refIndexObj->getRelations_procFiles($dataValue, $dsArr['TCEforms']['config'], $PA['uid']);
         // Traverse files and delete them if the field is a regular file field (and not a file_reference field)
         if (is_array($files) && $dsArr['TCEforms']['config']['internal_type'] === 'file') {
@@ -7260,6 +7262,7 @@ class DataHandler implements LoggerAwareInterface
         if (BackendUtility::isTableWorkspaceEnabled($table)) {
             $refIndexObj->setWorkspaceId($this->BE_USER->workspace);
         }
+        $refIndexObj->enableRuntimeCache();
         $refIndexObj->updateRefIndexTable($table, $id);
     }
 

diff --git a/typo3/sysext/core/Classes/Database/ReferenceIndex.php b/typo3/sysext/core/Classes/Database/ReferenceIndex.php
index 01b3c0d..5720305 100644 (file)
--- a/typo3/sysext/core/Classes/Database/ReferenceIndex.php
+++ b/typo3/sysext/core/Classes/Database/ReferenceIndex.php
@@ -150,6 +150,12 @@ class ReferenceIndex implements LoggerAwareInterface
      */
     protected $runtimeCache = null;
 
+    /**
+     * Enables $runtimeCache and $recordCache
+     * @var bool
+     */
+    protected $useRuntimeCache = false;
+
     /**
      * Constructor
      */
@@ -216,7 +222,7 @@ class ReferenceIndex implements LoggerAwareInterface
 
         // Fetch tableRelationFields and save them in cache if not there yet
         $cacheId = static::$cachePrefixTableRelationFields . $tableName;
-        if (!$this->runtimeCache->has($cacheId)) {
+        if (!$this->useRuntimeCache || !$this->runtimeCache->has($cacheId)) {
             $tableRelationFields = $this->fetchTableRelationFields($tableName);
             $this->runtimeCache->set($cacheId, $tableRelationFields);
         } else {
@@ -1477,6 +1483,10 @@ class ReferenceIndex implements LoggerAwareInterface
      * - Relations may change during indexing, which is why only the origin record is cached and all relations are re-process even when repeating
      *   indexing of the same origin record
      *
+     * Please note that the cache is disabled by default but can be enabled using $this->enableRuntimeCaches()
+     * due to possible side-effects while handling references that were changed during one single
+     * request.
+     *
      * @param string $tableName
      * @param int $uid
      * @return array|false
@@ -1484,13 +1494,15 @@ class ReferenceIndex implements LoggerAwareInterface
     protected function getRecordRawCached(string $tableName, int $uid)
     {
         $recordCacheId = $tableName . ':' . $uid;
-        if (!isset($this->recordCache[$recordCacheId])) {
+        if (!$this->useRuntimeCache || !isset($this->recordCache[$recordCacheId])) {
 
             // Fetch fields of the table which might contain relations
             $cacheId = static::$cachePrefixTableRelationFields . $tableName;
-            if (!$this->runtimeCache->has($cacheId)) {
+            if (!$this->useRuntimeCache || !$this->runtimeCache->has($cacheId)) {
                 $tableRelationFields = $this->fetchTableRelationFields($tableName);
-                $this->runtimeCache->set($cacheId, $tableRelationFields);
+                if ($this->useRuntimeCache) {
+                    $this->runtimeCache->set($cacheId, $tableRelationFields);
+                }
             } else {
                 $tableRelationFields = $this->runtimeCache->get($cacheId);
             }
@@ -1579,6 +1591,24 @@ class ReferenceIndex implements LoggerAwareInterface
         return true;
     }
 
+    /**
+     * Enables the runtime-based caches
+     * Could lead to side effects, depending if the reference index instance is run multiple times
+     * while records would be changed.
+     */
+    public function enableRuntimeCache()
+    {
+        $this->useRuntimeCache = true;
+    }
+
+    /**
+     * Disables the runtime-based cache
+     */
+    public function disableRuntimeCache()
+    {
+        $this->useRuntimeCache = false;
+    }
+
     /**
      * Returns the current BE user.
      *

diff --git a/typo3/sysext/core/Classes/Database/RelationHandler.php b/typo3/sysext/core/Classes/Database/RelationHandler.php
index 07e7379..b507456 100644 (file)
--- a/typo3/sysext/core/Classes/Database/RelationHandler.php
+++ b/typo3/sysext/core/Classes/Database/RelationHandler.php
@@ -1312,6 +1312,7 @@ class RelationHandler
             if (BackendUtility::isTableWorkspaceEnabled($table)) {
                 $refIndexObj->setWorkspaceId($this->getWorkspaceId());
             }
+            $refIndexObj->enableRuntimeCache();
             $statisticsArray = $refIndexObj->updateRefIndexTable($table, $id);
         }
         return $statisticsArray;

diff --git a/typo3/sysext/core/Classes/Resource/Index/FileIndexRepository.php b/typo3/sysext/core/Classes/Resource/Index/FileIndexRepository.php
index 1f44acc..d7ffd22 100644 (file)
--- a/typo3/sysext/core/Classes/Resource/Index/FileIndexRepository.php
+++ b/typo3/sysext/core/Classes/Resource/Index/FileIndexRepository.php
@@ -553,6 +553,7 @@ class FileIndexRepository implements SingletonInterface
     {
         /** @var $refIndexObj ReferenceIndex */
         $refIndexObj = GeneralUtility::makeInstance(ReferenceIndex::class);
+        $refIndexObj->enableRuntimeCache();
         $refIndexObj->updateRefIndexTable($this->table, $id);
     }
 

diff --git a/typo3/sysext/extbase/Classes/Persistence/Generic/Backend.php b/typo3/sysext/extbase/Classes/Persistence/Generic/Backend.php
index cd9a393..63ec1c4 100644 (file)
--- a/typo3/sysext/extbase/Classes/Persistence/Generic/Backend.php
+++ b/typo3/sysext/extbase/Classes/Persistence/Generic/Backend.php
@@ -148,6 +148,7 @@ class Backend implements \TYPO3\CMS\Extbase\Persistence\Generic\BackendInterface
     {
         $this->configurationManager = $configurationManager;
         $this->referenceIndex = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Core\Database\ReferenceIndex::class);
+        $this->referenceIndex->enableRuntimeCache();
         $this->aggregateRootObjects = new \TYPO3\CMS\Extbase\Persistence\ObjectStorage();
         $this->deletedEntities = new \TYPO3\CMS\Extbase\Persistence\ObjectStorage();
         $this->changedEntities = new \TYPO3\CMS\Extbase\Persistence\ObjectStorage();

diff --git a/typo3/sysext/impexp/Classes/Export.php b/typo3/sysext/impexp/Classes/Export.php
index cdbf8ee..d1b837c 100644 (file)
--- a/typo3/sysext/impexp/Classes/Export.php
+++ b/typo3/sysext/impexp/Classes/Export.php
@@ -324,6 +324,7 @@ class Export extends ImportExport
                         $this->dat['header']['pid_lookup'][$row['pid']][$table][$row['uid']] = 1;
                         // Initialize reference index object:
                         $refIndexObj = GeneralUtility::makeInstance(ReferenceIndex::class);
+                        $refIndexObj->enableRuntimeCache();
                         // Yes to workspace overlays for exporting....
                         $refIndexObj->WSOL = true;
                         $relations = $refIndexObj->getRelations($table, $row);

diff --git a/typo3/sysext/lowlevel/Classes/Controller/DatabaseIntegrityController.php b/typo3/sysext/lowlevel/Classes/Controller/DatabaseIntegrityController.php
index 6e8a8df..d8934a9 100644 (file)
--- a/typo3/sysext/lowlevel/Classes/Controller/DatabaseIntegrityController.php
+++ b/typo3/sysext/lowlevel/Classes/Controller/DatabaseIntegrityController.php
@@ -318,6 +318,7 @@ class DatabaseIntegrityController
             $testOnly = (bool)GeneralUtility::_GP('_check');
             // Call the functionality
             $refIndexObj = GeneralUtility::makeInstance(ReferenceIndex::class);
+            $refIndexObj->enableRuntimeCache();
             list(, $bodyContent) = $refIndexObj->updateIndex($testOnly);
             $this->view->assign('content', str_replace('##LF##', '<br />', $bodyContent));
         }