John Erling Blad has submitted this change and it was merged.
Change subject: Move TermIndex to lib.
......................................................................
Move TermIndex to lib.
This is in preparation for direct access to the term index from the client,
for use with finding properties by label.
Change-Id: Ia212cd0d57cc97310f49f6c5d56f9dcf90860789
---
M lib/WikibaseLib.php
R lib/includes/store/TermCombinationMatchFinder.php
R lib/includes/store/TermIndex.php
R lib/includes/store/TermMatchScoreCalculator.php
R lib/includes/store/sql/TermSqlIndex.php
M repo/Wikibase.php
M repo/includes/store/Store.php
7 files changed, 6 insertions(+), 6 deletions(-)
Approvals:
John Erling Blad: Verified; Looks good to me, approved
jenkins-bot: Checked
diff --git a/lib/WikibaseLib.php b/lib/WikibaseLib.php
index b9c0071..9bcfa5a 100644
--- a/lib/WikibaseLib.php
+++ b/lib/WikibaseLib.php
@@ -184,6 +184,10 @@
$wgAutoloadClasses['Wikibase\PropertyLookup'] = $dir .
'includes/store/PropertyLookup.php';
$wgAutoloadClasses['Wikibase\SiteLinkCache'] = $dir .
'includes/store/SiteLinkCache.php';
$wgAutoloadClasses['Wikibase\SiteLinkLookup'] = $dir .
'includes/store/SiteLinkLookup.php';
+$wgAutoloadClasses['Wikibase\TermIndex'] = $dir
. 'includes/store/TermIndex.php';
+$wgAutoloadClasses['Wikibase\TermCombinationMatchFinder'] = $dir .
'includes/store/TermCombinationMatchFinder.php';
+$wgAutoloadClasses['Wikibase\TermMatchScoreCalculator'] = $dir .
'includes/store/TermMatchScoreCalculator.php';
+$wgAutoloadClasses['Wikibase\TermSqlIndex'] = $dir .
'includes/store/sql/TermSqlIndex.php';
// includes/store/sql
$wgAutoloadClasses['Wikibase\CachingEntityLoader'] = $dir .
'includes/store/sql/CachingEntityLoader.php';
diff --git a/repo/includes/store/TermCombinationMatchFinder.php
b/lib/includes/store/TermCombinationMatchFinder.php
similarity index 100%
rename from repo/includes/store/TermCombinationMatchFinder.php
rename to lib/includes/store/TermCombinationMatchFinder.php
diff --git a/repo/includes/store/TermIndex.php
b/lib/includes/store/TermIndex.php
similarity index 100%
rename from repo/includes/store/TermIndex.php
rename to lib/includes/store/TermIndex.php
diff --git a/repo/includes/store/TermMatchScoreCalculator.php
b/lib/includes/store/TermMatchScoreCalculator.php
similarity index 100%
rename from repo/includes/store/TermMatchScoreCalculator.php
rename to lib/includes/store/TermMatchScoreCalculator.php
diff --git a/repo/includes/store/sql/TermSqlIndex.php
b/lib/includes/store/sql/TermSqlIndex.php
similarity index 100%
rename from repo/includes/store/sql/TermSqlIndex.php
rename to lib/includes/store/sql/TermSqlIndex.php
diff --git a/repo/Wikibase.php b/repo/Wikibase.php
index ad42325..793b41c 100644
--- a/repo/Wikibase.php
+++ b/repo/Wikibase.php
@@ -185,17 +185,13 @@
$wgAutoloadClasses['Wikibase\IdGenerator'] = $dir
. 'includes/store/IdGenerator.php';
$wgAutoloadClasses['Wikibase\Store'] = $dir
. 'includes/store/Store.php';
$wgAutoloadClasses['Wikibase\StoreFactory'] = $dir .
'includes/store/StoreFactory.php';
-$wgAutoloadClasses['Wikibase\TermIndex'] = $dir
. 'includes/store/TermIndex.php';
-$wgAutoloadClasses['Wikibase\TermCombinationMatchFinder'] = $dir .
'includes/store/TermCombinationMatchFinder.php';
-$wgAutoloadClasses['Wikibase\TermMatchScoreCalculator'] = $dir .
'includes/store/TermMatchScoreCalculator.php';
-$wgAutoloadClasses['Wikibase\TermSearchKeyBuilder'] = $dir .
'includes/store/sql/TermSearchKeyBuilder.php';
// includes/store/sql
$wgAutoloadClasses['Wikibase\SqlIdGenerator'] = $dir .
'includes/store/sql/SqlIdGenerator.php';
$wgAutoloadClasses['Wikibase\SqlStore'] = $dir
. 'includes/store/sql/SqlStore.php';
-$wgAutoloadClasses['Wikibase\TermSqlIndex'] = $dir .
'includes/store/sql/TermSqlIndex.php';
$wgAutoloadClasses['Wikibase\EntityPerPageTable'] = $dir .
'includes/store/sql/EntityPerPageTable.php';
$wgAutoloadClasses['Wikibase\DispatchStats'] = $dir .
'includes/store/sql/DispatchStats.php';
+$wgAutoloadClasses['Wikibase\TermSearchKeyBuilder'] = $dir .
'includes/store/sql/TermSearchKeyBuilder.php';
// includes/updates
$wgAutoloadClasses['Wikibase\EntityDeletionUpdate'] = $dir .
'includes/updates/EntityDeletionUpdate.php';
diff --git a/repo/includes/store/Store.php b/repo/includes/store/Store.php
index 0692913..b61037a 100644
--- a/repo/includes/store/Store.php
+++ b/repo/includes/store/Store.php
@@ -62,7 +62,7 @@
/**
* Returns a TermIndex for this store.
*
- * @since 0.1
+ * @since 0.4
*
* @return TermIndex
*/
--
To view, visit https://gerrit.wikimedia.org/r/55897
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia212cd0d57cc97310f49f6c5d56f9dcf90860789
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Daniel Kinzler <daniel.kinz...@wikimedia.de>
Gerrit-Reviewer: Aude <aude.w...@gmail.com>
Gerrit-Reviewer: John Erling Blad <john.b...@wikimedia.de>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
