Denny Vrandecic has submitted this change and it was merged.

Change subject: Remove EntityTable from EntityInserter
......................................................................


Remove EntityTable from EntityInserter

We currently have no need to insert into this table.

Change-Id: I0245ea1bc344e69eeac887cca2f1c223113b2147
---
M QueryEngine/includes/SQLStore/EntityInserter.php
M QueryEngine/includes/SQLStore/Factory.php
M QueryEngine/tests/phpunit/SQLStore/EntityInserterTest.php
3 files changed, 2 insertions(+), 17 deletions(-)

Approvals:
  Denny Vrandecic: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/QueryEngine/includes/SQLStore/EntityInserter.php 
b/QueryEngine/includes/SQLStore/EntityInserter.php
index ea886fa..c306bd0 100644
--- a/QueryEngine/includes/SQLStore/EntityInserter.php
+++ b/QueryEngine/includes/SQLStore/EntityInserter.php
@@ -34,19 +34,16 @@
  */
 class EntityInserter {
 
-       private $entityTable;
        private $claimInserter;
        private $idFinder;
 
        /**
         * @since 0.1
         *
-        * @param EntityTable $entityTable
         * @param ClaimInserter $claimInserter
         * @param InternalEntityIdFinder $idFinder
         */
-       public function __construct( EntityTable $entityTable, ClaimInserter 
$claimInserter, InternalEntityIdFinder $idFinder ) {
-               $this->entityTable = $entityTable;
+       public function __construct( ClaimInserter $claimInserter, 
InternalEntityIdFinder $idFinder ) {
                $this->claimInserter = $claimInserter;
                $this->idFinder = $idFinder;
        }
@@ -57,8 +54,6 @@
         * @param Entity $entity
         */
        public function insertEntity( Entity $entity ) {
-               $this->entityTable->insertEntity( $entity );
-
                $internalSubjectId = $this->getInternalId( $entity->getId() );
 
                foreach ( $entity->getClaims() as $claim ) {
diff --git a/QueryEngine/includes/SQLStore/Factory.php 
b/QueryEngine/includes/SQLStore/Factory.php
index c00562c..24c9299 100644
--- a/QueryEngine/includes/SQLStore/Factory.php
+++ b/QueryEngine/includes/SQLStore/Factory.php
@@ -72,7 +72,6 @@
 
        public function newEntityInserter() {
                return new EntityInserter(
-                       $this->newEntityTable(),
                        $this->newClaimInserter(),
                        $this->getInternalEntityIdFinder()
                );
diff --git a/QueryEngine/tests/phpunit/SQLStore/EntityInserterTest.php 
b/QueryEngine/tests/phpunit/SQLStore/EntityInserterTest.php
index df36c1b..e0d19f8 100644
--- a/QueryEngine/tests/phpunit/SQLStore/EntityInserterTest.php
+++ b/QueryEngine/tests/phpunit/SQLStore/EntityInserterTest.php
@@ -48,15 +48,6 @@
         * @dataProvider entityProvider
         */
        public function testInsertEntity( Entity $entity ) {
-               $entityTable = $this
-                       ->getMockBuilder( 
'Wikibase\QueryEngine\SQLStore\EntityTable' )
-                       ->disableOriginalConstructor()
-                       ->getMock();
-
-               $entityTable->expects( $this->once() )
-                       ->method( 'insertEntity' )
-                       ->with( $this->equalTo( $entity ) );
-
                $claimInserter = $this
                        ->getMockBuilder( 
'Wikibase\QueryEngine\SQLStore\ClaimStore\ClaimInserter' )
                        ->disableOriginalConstructor()
@@ -84,7 +75,7 @@
                        )
                        ->will( $this->returnValue( 1234 ) );
 
-               $inserter = new EntityInserter( $entityTable, $claimInserter, 
$idFinder );
+               $inserter = new EntityInserter( $claimInserter, $idFinder );
 
                $inserter->insertEntity( $entity );
        }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0245ea1bc344e69eeac887cca2f1c223113b2147
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Jeroen De Dauw <jeroended...@gmail.com>
Gerrit-Reviewer: Anja Jentzsch <a...@anjeve.de>
Gerrit-Reviewer: Ataherivand <abraham.taheriv...@wikimedia.de>
Gerrit-Reviewer: Aude <aude.w...@gmail.com>
Gerrit-Reviewer: Daniel Kinzler <daniel.kinz...@wikimedia.de>
Gerrit-Reviewer: Daniel Werner <daniel.wer...@wikimedia.de>
Gerrit-Reviewer: Denny Vrandecic <denny.vrande...@wikimedia.de>
Gerrit-Reviewer: Henning Snater <henning.sna...@wikimedia.de>
Gerrit-Reviewer: Jens Ohlig <jens.oh...@wikimedia.de>
Gerrit-Reviewer: Jeroen De Dauw <jeroended...@gmail.com>
Gerrit-Reviewer: John Erling Blad <jeb...@gmail.com>
Gerrit-Reviewer: Lydia Pintscher <lydia.pintsc...@wikimedia.de>
Gerrit-Reviewer: Markus Kroetzsch <mar...@semantic-mediawiki.org>
Gerrit-Reviewer: Nikola Smolenski <smole...@eunet.rs>
Gerrit-Reviewer: Silke Meyer <silke.me...@wikimedia.de>
Gerrit-Reviewer: Tobias Gritschacher <tobias.gritschac...@wikimedia.de>
Gerrit-Reviewer: jenkins-bot

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

Reply via email to