jenkins-bot has submitted this change and it was merged.
Change subject: New Wikidata Build - 2016-06-14T10:00:01+0000
......................................................................
New Wikidata Build - 2016-06-14T10:00:01+0000
Change-Id: I9ac6b593bd18e9912324dfa03caf933f3ac204ee
---
M composer.lock
M extensions/MediaInfo/i18n/ksh.json
M extensions/Wikibase/client/i18n/tyv.json
M extensions/Wikibase/client/i18n/zgh.json
M extensions/Wikibase/client/includes/Usage/Sql/EntityUsageTable.php
M
extensions/Wikibase/client/tests/phpunit/includes/Usage/Sql/EntityUsageTableTest.php
M
extensions/Wikibase/client/tests/phpunit/includes/Usage/UsageLookupContractTester.php
M vendor/composer/installed.json
8 files changed, 81 insertions(+), 27 deletions(-)
Approvals:
JanZerebecki: Looks good to me, approved
jenkins-bot: Verified
diff --git a/composer.lock b/composer.lock
index e90a0fe..031042f 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1417,7 +1417,7 @@
"source": {
"type": "git",
"url":
"https://gerrit.wikimedia.org/r/mediawiki/extensions/WikibaseMediaInfo";,
- "reference": "a369fd1b559d8c2c984e8bfef79ae909e943c93b"
+ "reference": "c7cba6c70ac9063ea828a4c1c73ee6317c5256b0"
},
"require": {
"php": ">=5.5.0",
@@ -1463,7 +1463,7 @@
"issues": "https://phabricator.wikimedia.org/";,
"irc": "irc://irc.freenode.net/wikidata"
},
- "time": "2016-06-11 20:25:26"
+ "time": "2016-06-13 21:00:17"
},
{
"name": "wikibase/quality",
@@ -1569,12 +1569,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
- "reference": "40098e682dabdc0d716bc5cca701304aa4335c42"
+ "reference": "c26161dca668dd7310efe8148e5327ed85fcbc25"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/40098e682dabdc0d716bc5cca701304aa4335c42";,
- "reference": "40098e682dabdc0d716bc5cca701304aa4335c42",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/c26161dca668dd7310efe8148e5327ed85fcbc25";,
+ "reference": "c26161dca668dd7310efe8148e5327ed85fcbc25",
"shasum": ""
},
"require": {
@@ -1646,7 +1646,7 @@
"wikibaserepo",
"wikidata"
],
- "time": "2016-06-11 20:25:09"
+ "time": "2016-06-14 02:14:54"
},
{
"name": "wikibase/wikimedia-badges",
diff --git a/extensions/MediaInfo/i18n/ksh.json
b/extensions/MediaInfo/i18n/ksh.json
index 78e2e26..5c1c9c3 100644
--- a/extensions/MediaInfo/i18n/ksh.json
+++ b/extensions/MediaInfo/i18n/ksh.json
@@ -4,5 +4,6 @@
"Purodha"
]
},
+ "wikibase-entity-mediainfo": "Mehdije-Dahte",
"wikibasemediainfo-desc": "E Zohsatzprojramm zom Zohsatzprojramm
WikkiBase, öm de stroktorehrte Matta_Dahte för Mehdje_Datteije ze verwallde."
}
diff --git a/extensions/Wikibase/client/i18n/tyv.json
b/extensions/Wikibase/client/i18n/tyv.json
index f7e156f..99ba2e7 100644
--- a/extensions/Wikibase/client/i18n/tyv.json
+++ b/extensions/Wikibase/client/i18n/tyv.json
@@ -2,11 +2,12 @@
"@metadata": {
"authors": [
"Agilight",
- "Монгуш Салим"
+ "Монгуш Салим",
+ "Көпек"
]
},
"wikibase-comment-update": "{{grammar:genitive|{{WBREPONAME}}}}
элементини өскертип каан",
"wikibase-dataitem": "элемент",
- "wikibase-editlinks": "Шөлүлгелерни эдер",
+ "wikibase-editlinks": "Айтыгны эдери",
"wikibase-editlinkstitle": "Дылдар аразының шөлүлгелерин эдер"
}
diff --git a/extensions/Wikibase/client/i18n/zgh.json
b/extensions/Wikibase/client/i18n/zgh.json
index f9a22c9..c8beeef 100644
--- a/extensions/Wikibase/client/i18n/zgh.json
+++ b/extensions/Wikibase/client/i18n/zgh.json
@@ -4,5 +4,7 @@
"Amara-Amaziɣ"
]
},
- "wikibase-editlinks": "ⵙⵏⴼⵍ ⵉⵙⵖⵓⵏⵏ"
+ "wikibase-editlinks": "ⵙⵏⴼⵍ ⵉⵙⵖⵓⵏⵏ",
+ "wikibase-rc-hide-wikidata-hide": "ⵙⵙⵏⵜⵍ",
+ "wikibase-rc-hide-wikidata-show": "ⵙⴽⵏ"
}
diff --git a/extensions/Wikibase/client/includes/Usage/Sql/EntityUsageTable.php
b/extensions/Wikibase/client/includes/Usage/Sql/EntityUsageTable.php
index e6392d5..b70a777 100644
--- a/extensions/Wikibase/client/includes/Usage/Sql/EntityUsageTable.php
+++ b/extensions/Wikibase/client/includes/Usage/Sql/EntityUsageTable.php
@@ -356,15 +356,49 @@
* @return string[]
*/
private function getUsedEntityIdStrings( array $idStrings ) {
- $where = array( 'eu_entity_id' => $idStrings );
+ // Note: We need to use one (sub)query per entity here, per
T116404
+ $subQueries = $this->getUsedEntityIdStringsQueries( $idStrings
);
- return $this->connection->selectFieldValues(
- $this->tableName,
- 'eu_entity_id',
- $where,
- __METHOD__,
- array( 'DISTINCT' )
- );
+ $values = [];
+ if ( $this->connection->getType() === 'mysql' ) {
+ // On MySQL we can UNION all queries and run them at
once
+ $sql = $this->connection->unionQueries( $subQueries,
false );
+
+ $res = $this->connection->query( $sql, __METHOD__ );
+ foreach ( $res as $row ) {
+ $values[] = $row->eu_entity_id;
+ }
+ } else {
+ foreach ( $subQueries as $sql ) {
+ $res = $this->connection->query( $sql,
__METHOD__ );
+ if ( $res->numRows() ) {
+ $values[] =
$res->current()->eu_entity_id;
+ }
+ }
+ }
+
+ return $values;
+ }
+
+ /**
+ * @param string[] $idStrings
+ *
+ * @return string[]
+ */
+ private function getUsedEntityIdStringsQueries( array $idStrings ) {
+ $subQueries = [];
+
+ foreach ( $idStrings as $idString ) {
+ $subQueries[] = $this->connection->selectSQLText(
+ $this->tableName,
+ 'eu_entity_id',
+ [ 'eu_entity_id' => $idString ],
+ '',
+ [ 'LIMIT' => 1 ]
+ );
+ }
+
+ return $subQueries;
}
/**
diff --git
a/extensions/Wikibase/client/tests/phpunit/includes/Usage/Sql/EntityUsageTableTest.php
b/extensions/Wikibase/client/tests/phpunit/includes/Usage/Sql/EntityUsageTableTest.php
index 8c490bf..473292b 100644
---
a/extensions/Wikibase/client/tests/phpunit/includes/Usage/Sql/EntityUsageTableTest.php
+++
b/extensions/Wikibase/client/tests/phpunit/includes/Usage/Sql/EntityUsageTableTest.php
@@ -304,9 +304,17 @@
$this->assertEmpty( $usageTable->getUnusedEntities( array( $q4
) ), 'Q4 should not be unused' );
- $unused = $usageTable->getUnusedEntities( array( $q4, $q6 ) );
+ $entityIds = array( $q4, $q6 );
+ if ( wfGetDB( DB_SLAVE )->getType() === 'mysql' ) {
+ // On MySQL we use UNIONs on the table… as the table is
temporary that
+ // doesn't work in unit tests.
+ //
https://dev.mysql.com/doc/refman/5.7/en/temporary-table-problems.html
+ $entityIds = array( $q6 );
+ }
+
+ $unused = $usageTable->getUnusedEntities( $entityIds );
$this->assertCount( 1, $unused );
- $this->assertEquals( $q6, reset( $unused ), 'Q6 shouold be
unused' );
+ $this->assertEquals( $q6, reset( $unused ), 'Q6 should be
unused' );
}
/**
diff --git
a/extensions/Wikibase/client/tests/phpunit/includes/Usage/UsageLookupContractTester.php
b/extensions/Wikibase/client/tests/phpunit/includes/Usage/UsageLookupContractTester.php
index 332a839..5dfad66 100644
---
a/extensions/Wikibase/client/tests/phpunit/includes/Usage/UsageLookupContractTester.php
+++
b/extensions/Wikibase/client/tests/phpunit/includes/Usage/UsageLookupContractTester.php
@@ -170,9 +170,17 @@
Assert::assertEmpty( $this->lookup->getUnusedEntities( array(
$q4 ) ), 'Q4 should not be unused' );
- $unused = $this->lookup->getUnusedEntities( array( $q4, $q6 ) );
+ $entityIds = array( $q4, $q6 );
+ if ( wfGetDB( DB_SLAVE )->getType() === 'mysql' ) {
+ // On MySQL we use UNIONs on the table… as the table is
temporary that
+ // doesn't work in unit tests.
+ //
https://dev.mysql.com/doc/refman/5.7/en/temporary-table-problems.html
+ $entityIds = array( $q6 );
+ }
+
+ $unused = $this->lookup->getUnusedEntities( $entityIds );
Assert::assertCount( 1, $unused );
- Assert::assertEquals( $q6, reset( $unused ), 'Q6 shouold be
unused' );
+ Assert::assertEquals( $q6, reset( $unused ), 'Q6 should be
unused' );
}
/**
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index c0b719c..913a79e 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -1345,12 +1345,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
- "reference": "40098e682dabdc0d716bc5cca701304aa4335c42"
+ "reference": "c26161dca668dd7310efe8148e5327ed85fcbc25"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/40098e682dabdc0d716bc5cca701304aa4335c42";,
- "reference": "40098e682dabdc0d716bc5cca701304aa4335c42",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/c26161dca668dd7310efe8148e5327ed85fcbc25";,
+ "reference": "c26161dca668dd7310efe8148e5327ed85fcbc25",
"shasum": ""
},
"require": {
@@ -1383,7 +1383,7 @@
"jakub-onderka/php-parallel-lint": "0.9.2",
"mediawiki/mediawiki-codesniffer": "0.4.0|0.5.0"
},
- "time": "2016-06-11 20:25:09",
+ "time": "2016-06-14 02:14:54",
"type": "mediawiki-extension",
"installation-source": "dist",
"autoload": {
@@ -1640,7 +1640,7 @@
"source": {
"type": "git",
"url":
"https://gerrit.wikimedia.org/r/mediawiki/extensions/WikibaseMediaInfo";,
- "reference": "a369fd1b559d8c2c984e8bfef79ae909e943c93b"
+ "reference": "c7cba6c70ac9063ea828a4c1c73ee6317c5256b0"
},
"require": {
"php": ">=5.5.0",
@@ -1654,7 +1654,7 @@
"mediawiki/mediawiki-codesniffer": "0.6.0",
"phpunit/phpunit": "~4.8"
},
- "time": "2016-06-11 20:25:26",
+ "time": "2016-06-13 21:00:17",
"type": "mediawiki-extension",
"installation-source": "source",
"autoload": {
--
To view, visit https://gerrit.wikimedia.org/r/294275
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9ac6b593bd18e9912324dfa03caf933f3ac204ee
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikidata
Gerrit-Branch: master
Gerrit-Owner: WikidataBuilder <[email protected]>
Gerrit-Reviewer: Addshore <[email protected]>
Gerrit-Reviewer: Aude <[email protected]>
Gerrit-Reviewer: JanZerebecki <[email protected]>
Gerrit-Reviewer: Siebrand <[email protected]>
Gerrit-Reviewer: Tobias Gritschacher <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
