[TASK] Make use of the caching framework

Use the caching framework with the PHP file caching front end
to cache field information.

Resolves: #28797

Change-Id: I275086ecf759af90182e057cc652dc744ead8027

diff --git a/typo3/sysext/dbal/class.ux_t3lib_db.php b/typo3/sysext/dbal/class.ux_t3lib_db.php
index 7519612..6f3cd6a 100644 (file)
--- a/typo3/sysext/dbal/class.ux_t3lib_db.php
+++ b/typo3/sysext/dbal/class.ux_t3lib_db.php
@@ -83,6 +83,13 @@ class ux_t3lib_DB extends t3lib_DB {
        var $cache_fieldType = array(); // field types for tables/fields
        var $cache_primaryKeys = array(); // primary keys
 
+       /**
+        * The cache identifier for the field information cache
+        *
+        * @var string
+        */
+       protected $cacheIdentifier = 't3lib_db_fieldInfo';
+
        /**
         * SQL parser
         *
@@ -171,9 +178,8 @@ class ux_t3lib_DB extends t3lib_DB {
         * @return void
         */
        public function clearCachedFieldInfo() {
-               if (file_exists(PATH_typo3conf . 'temp_fieldInfo.php')) {
-                       unlink(PATH_typo3conf . 'temp_fieldInfo.php');
-               }
+               $phpCodeCache = t3lib_div::makeInstance('t3lib_cache_Manager')->getCache('cache_phpcode');
+               $phpCodeCache->flushByTag('t3lib_db');
        }
 
        /**
@@ -182,30 +188,26 @@ class ux_t3lib_DB extends t3lib_DB {
         * @return void
         */
        public function cacheFieldInfo() {
-               // try to fetch cached file first
-               // file is removed when admin_query() is called
-               if (file_exists(PATH_typo3conf . 'temp_fieldInfo.php')) {
-                       $fdata = unserialize(t3lib_div::getUrl(PATH_typo3conf . 'temp_fieldInfo.php'));
-                       $this->cache_autoIncFields = $fdata['incFields'];
-                       $this->cache_fieldType = $fdata['fieldTypes'];
-                       $this->cache_primaryKeys = $fdata['primaryKeys'];
+               $phpCodeCache = t3lib_div::makeInstance('t3lib_cache_Manager')->getCache('cache_phpcode');
+                       // try to fetch cache
+                       // cache is flushed when admin_query() is called
+               if ($phpCodeCache->has($this->cacheIdentifier)) {
+                       $fieldInformation = $phpCodeCache->requireOnce($this->cacheIdentifier);
+                       $this->cache_autoIncFields = $fieldInformation['incFields'];
+                       $this->cache_fieldType = $fieldInformation['fieldTypes'];
+                       $this->cache_primaryKeys = $fieldInformation['primaryKeys'];
                } else {
                        $this->analyzeCoreTables();
                        $this->analyzeCachingTables();
                        $this->analyzeExtensionTables();
 
-                       $cachedFieldInfo = array('incFields' => $this->cache_autoIncFields, 'fieldTypes' => $this->cache_fieldType, 'primaryKeys' => $this->cache_primaryKeys);
-                       $cachedFieldInfo = serialize($this->mapCachedFieldInfo($cachedFieldInfo));
-
-                       // write serialized content to file
-                       t3lib_div::writeFile(PATH_typo3conf . 'temp_fieldInfo.php', $cachedFieldInfo);
+                       $completeFieldInformation = $this->getCompleteFieldInformation();
 
-                       if (strcmp(t3lib_div::getUrl(PATH_typo3conf . 'temp_fieldInfo.php'), $cachedFieldInfo)) {
-                               throw new RuntimeException(
-                                       'typo3conf/temp_fieldInfo.php was NOT updated properly (written content didn\'t match file content) - maybe write access problem?',
-                                       1310027297
-                               );
-                       }
+                       $phpCodeCache->set(
+                               $this->cacheIdentifier,
+                               $this->getCacheableString($completeFieldInformation),
+                               array('t3lib_db')
+            );
                }
        }
 
@@ -284,6 +286,31 @@ class ux_t3lib_DB extends t3lib_DB {
                $this->analyzeFields($parsedSql);
        }
 
+       /**
+        * Returns all field information gathered during
+        * analyzing all tables and fields.
+        *
+        * @return array
+        */
+       protected function getCompleteFieldInformation() {
+               return array('incFields' => $this->cache_autoIncFields, 'fieldTypes' => $this->cache_fieldType, 'primaryKeys' => $this->cache_primaryKeys);
+       }
+
+       /**
+        * Creates a PHP code representation of the array that can be cached
+        * in the PHP code cache.
+        *
+        * @param array $fieldInformation
+        * @return string
+        */
+       protected function getCacheableString(array $fieldInformation) {
+               $cacheString = 'return ';
+               $cacheString .= var_export($fieldInformation, TRUE);
+               $cacheString .= ';';
+
+               return $cacheString;
+       }
+
        /**
         * Analyzes fields and adds the extracted information to the field type, auto increment and primary key info caches.
         *
@@ -2911,7 +2938,7 @@ class ux_t3lib_DB extends t3lib_DB {
                                case 'CREATETABLE':
                                case 'ALTERTABLE':
                                case 'DROPTABLE':
-                                       if (file_exists(PATH_typo3conf . 'temp_fieldInfo.php')) unlink(PATH_typo3conf . 'temp_fieldInfo.php');
+                                       $this->clearCachedFieldInfo();
                                        $this->map_genericQueryParsed($parsedQuery);
                                        break;
                                case 'INSERT':