diff --git a/core/.idea/.name b/core/.idea/.name
new file mode 100644
index 0000000..0f31176
--- /dev/null
+++ b/core/.idea/.name
@@ -0,0 +1 @@
+core
\ No newline at end of file
diff --git a/core/.idea/codeStyleSettings.xml b/core/.idea/codeStyleSettings.xml
new file mode 100644
index 0000000..1129f00
--- /dev/null
+++ b/core/.idea/codeStyleSettings.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
diff --git a/core/.idea/core.iml b/core/.idea/core.iml
new file mode 100644
index 0000000..45dcf39
--- /dev/null
+++ b/core/.idea/core.iml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/core/.idea/encodings.xml b/core/.idea/encodings.xml
new file mode 100644
index 0000000..e206d70
--- /dev/null
+++ b/core/.idea/encodings.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/core/.idea/misc.xml b/core/.idea/misc.xml
new file mode 100644
index 0000000..1162f43
--- /dev/null
+++ b/core/.idea/misc.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/core/.idea/modules.xml b/core/.idea/modules.xml
new file mode 100644
index 0000000..8e03155
--- /dev/null
+++ b/core/.idea/modules.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
diff --git a/core/.idea/scopes/scope_settings.xml b/core/.idea/scopes/scope_settings.xml
new file mode 100644
index 0000000..922003b
--- /dev/null
+++ b/core/.idea/scopes/scope_settings.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/core/.idea/vcs.xml b/core/.idea/vcs.xml
new file mode 100644
index 0000000..2e0588c
--- /dev/null
+++ b/core/.idea/vcs.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
diff --git a/core/.idea/workspace.xml b/core/.idea/workspace.xml
new file mode 100644
index 0000000..b3b2b34
--- /dev/null
+++ b/core/.idea/workspace.xml
@@ -0,0 +1,292 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Code style issuesJavaScript
+
+
+ JavaScript
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ false
+
+
+
+
+ 1363625961850
+ 1363625961850
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/core/modules/views/lib/Drupal/views/ViewsDataCache.php b/core/modules/views/lib/Drupal/views/ViewsDataCache.php
index 15e338c..5daa972 100644
--- a/core/modules/views/lib/Drupal/views/ViewsDataCache.php
+++ b/core/modules/views/lib/Drupal/views/ViewsDataCache.php
@@ -31,6 +31,13 @@ class ViewsDataCache implements DestructableInterface {
protected $cacheBackend;
/**
+ * The configuration factory object.
+ *
+ * @var \Drupal\Core\Config\ConfigFactory
+ */
+ protected $config;
+
+ /**
* Storage for the data itself.
*
* @var array
@@ -38,87 +45,91 @@ class ViewsDataCache implements DestructableInterface {
protected $storage = array();
/**
- * The configuration factory object.
+ * An array of requested tables.
*
- * @var \Drupal\Core\Config\ConfigFactory
+ * @var array
*/
- protected $config;
+ protected $requestedTables = array();
/**
- * The current language code.
+ * Whether the data has been fully loaded in this request.
*
- * @var string
+ * @var bool
*/
- protected $langcode;
+ protected $fullyLoaded = FALSE;
/**
- * Whether the data has been fully loaded in this request.
+ * Whether views data has been rebuilt. This is set when getData() doesn't
+ * return anything from cache.
*
* @var bool
*/
- protected $fullyLoaded = FALSE;
+ protected $rebuildAll = FALSE;
/**
* Whether or not to skip data caching and rebuild data each time.
*
* @var bool
*/
- protected $skipCache;
+ protected $skipCache = FALSE;
/**
- * Whether the cache should be rebuilt. This is set when getData() is called.
+ * The current language code.
*
- * @var bool
+ * @var string
*/
- protected $rebuildCache;
+ protected $langcode;
public function __construct(CacheBackendInterface $cache_backend, ConfigFactory $config) {
- $this->config = $config;
$this->cacheBackend = $cache_backend;
$this->langcode = language(LANGUAGE_TYPE_INTERFACE)->langcode;
- $this->skipCache = $this->config->get('views.settings')->get('skip_cache');
+ $this->skipCache = $config->get('views.settings')->get('skip_cache');
}
/**
- * Gets cached data for a particular key, or rebuilds if necessary.
+ * Gets data for a particular table, or all tables.
*
* @param string|null $key
- * The key of the cache entry to retrieve. Defaults to NULL.
+ * The key of the cache entry to retrieve. Defaults to NULL, this will
+ * return all table data.
*
* @return array $data
- * The cached data.
+ * An array of table data.
*/
public function get($key = NULL) {
if ($key) {
+ $from_cache = FALSE;
if (!isset($this->storage[$key])) {
+ // Prepare a cache ID.
$cid = $this->baseCid . ':' . $key;
- $data = $this->cacheGet($cid);
- if (!empty($data->data)) {
+
+ if ($data = $this->cacheGet($cid)) {
$this->storage[$key] = $data->data;
+ $from_cache = TRUE;
}
else {
// No cache entry, rebuild.
$this->storage = $this->getData();
- $this->fullyLoaded = TRUE;
}
}
+
if (isset($this->storage[$key])) {
+ if (!$from_cache) {
+ // Add this table to a list of requested tables, as it's table cache
+ // entry was not found.
+ array_push($this->requestedTables, $key);
+ }
+
return $this->storage[$key];
}
+
// If the key is invalid, return an empty array.
return array();
}
else {
if (!$this->fullyLoaded) {
- $data = $this->cacheGet($this->baseCid);
- if (!empty($data->data)) {
- $this->storage = $data->data;
- }
- else {
- $this->storage = $this->getData();
- }
- $this->fullyLoaded = TRUE;
+ $this->storage = $this->getData();
}
}
@@ -128,19 +139,17 @@ public function get($key = NULL) {
/**
* Sets the data in the cache backend for a cache key.
*
- * @param string $key
- * The cache key to set.
+ * @param string $cid
+ * The cache ID to set. The language code will be appended to the key.
* @param mixed $value
* The value to set for this key.
*/
- public function set($key, $value) {
+ protected function set($cid, $value) {
if ($this->skipCache) {
return FALSE;
}
- $key .= ':' . $this->langcode;
-
- $this->cacheBackend->set($key, $value);
+ $this->cacheBackend->set($this->prepareCid($key), $value);
}
/**
@@ -158,26 +167,47 @@ protected function cacheGet($cid) {
return FALSE;
}
- $cid .= ':' . $this->langcode;
+ return $this->cacheBackend->get($this->prepareCid($cid));
+ }
- return $this->cacheBackend->get($cid);
+ /**
+ * Prepares the cache ID by appending a language code.
+ *
+ * @param string $cid
+ * The cache ID to prepare.
+ *
+ * @return string
+ * The prepared cache ID.
+ */
+ protected function prepareCid($cid) {
+ return $cid .= ':' . $this->langcode;
}
/**
* Gets all data invoked by hook_views_data().
*
+ * This is requested from the cache before being rebuilt.
+ *
* @return array
* An array of all data.
*/
protected function getData() {
- $data = module_invoke_all('views_data');
- drupal_alter('views_data', $data);
+ $this->fullyLoaded = TRUE;
- $this->processEntityTypes($data);
+ if ($data = $this->cacheGet($this->baseCid)) {
+ return $data->data;
+ }
+ else {
+ $data = module_invoke_all('views_data');
+ drupal_alter('views_data', $data);
+
+ $this->processEntityTypes($data);
- $this->rebuildCache = TRUE;
+ // Set as TRUE, so all table data will be cached.
+ $this->rebuildAll = TRUE;
- return $data;
+ return $data;
+ }
}
/**
@@ -245,13 +275,16 @@ public function fetchBaseTables() {
* Implements \Drupal\Core\DestructableInterface::destruct().
*/
public function destruct() {
- if ($this->rebuildCache && !empty($this->storage)) {
- // Keep a record with all data.
- $this->set($this->baseCid, $this->storage);
- // Save data in seperate cache entries.
- foreach ($this->storage as $table => $data) {
+ if (!empty($this->storage)) {
+ if ($this->rebuildAll) {
+ // Keep a record with all data.
+ $this->set($this->baseCid, $this->storage);
+ }
+
+ // Save data in seperate, per table cache entries.
+ foreach ($this->requestedTables as $table) {
$cid = $this->baseCid . ':' . $table;
- $this->set($cid, $data);
+ $this->set($cid, $this->storage[$table]);
}
}
}