Aude has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/99645


Change subject: Use setting for property info table cache key
......................................................................

Use setting for property info table cache key

Change-Id: Ie2948759ee811f1a02f93d8bfbd6f341c4f309db
---
M client/includes/store/sql/DirectSqlStore.php
M repo/includes/store/sql/SqlStore.php
2 files changed, 2 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/45/99645/1

diff --git a/client/includes/store/sql/DirectSqlStore.php 
b/client/includes/store/sql/DirectSqlStore.php
index 71719d1..7a581e5 100644
--- a/client/includes/store/sql/DirectSqlStore.php
+++ b/client/includes/store/sql/DirectSqlStore.php
@@ -327,10 +327,7 @@
        protected function newPropertyInfoTable() {
                if ( Settings::get( 'usePropertyInfoTable' ) ) {
                        $table = new PropertyInfoTable( true, $this->repoWiki );
-
-                       //TODO: get cache type etc from config
-                       //TODO: better version ID from config!
-                       $key = $this->repoWiki . 
'/Wikibase/CachingPropertyInfoStore/' . WBL_VERSION;
+                       $key = $this->cachePrefix . ':CachingPropertyInfoStore';
                        return new CachingPropertyInfoStore( $table, 
wfGetMainCache(), 3600, $key );
                } else {
                        // dummy info store
diff --git a/repo/includes/store/sql/SqlStore.php 
b/repo/includes/store/sql/SqlStore.php
index b86035e..6c204e5 100644
--- a/repo/includes/store/sql/SqlStore.php
+++ b/repo/includes/store/sql/SqlStore.php
@@ -382,10 +382,7 @@
        protected function newPropertyInfoTable() {
                if ( Settings::get( 'usePropertyInfoTable' ) ) {
                        $table = new PropertyInfoTable( false );
-
-                       //TODO: get cache type etc from config
-                       //TODO: better version ID from config!
-                       $key = wfWikiID() . 
'/Wikibase/CachingPropertyInfoStore/' . WBL_VERSION;
+                       $key = $this->cachePrefix . ':CachingPropertyInfoStore';
                        return new CachingPropertyInfoStore( $table, 
wfGetMainCache(), 3600, $key );
                } else {
                        // dummy info store

-- 
To view, visit https://gerrit.wikimedia.org/r/99645
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie2948759ee811f1a02f93d8bfbd6f341c4f309db
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Aude <aude.w...@gmail.com>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to