Merge "Revert "Introduce RevisionStoreFactory & Tests""

diff --combined includes/MediaWikiServices.php
index 7cc2462,ce43f0e..a756d50
--- 1/includes/MediaWikiServices.php
--- 2/includes/MediaWikiServices.php
+++ b/includes/MediaWikiServices.php
@@@ -21,7 -21,6 +21,6 @@@ use MediaWiki\Storage\NameTableStore
  use MediaWiki\Storage\RevisionFactory;
  use MediaWiki\Storage\RevisionLookup;
  use MediaWiki\Storage\RevisionStore;
- use MediaWiki\Storage\RevisionStoreFactory;
  use OldRevisionImporter;
  use UploadRevisionImporter;
  use Wikimedia\Rdbms\LBFactory;
@@@ -467,14 -466,6 +466,14 @@@ class MediaWikiServices extends Service
                return $this->getService( 'StatsdDataFactory' );
        }
  
 +      /**
 +       * @since 1.32
 +       * @return IBufferingStatsdDataFactory
 +       */
 +      public function getPerDbNameStatsdDataFactory() {
 +              return $this->getService( 'PerDbNameStatsdDataFactory' );
 +      }
 +
        /**
         * @since 1.27
         * @return EventRelayerGroup
@@@ -768,14 -759,6 +767,6 @@@
                return $this->getService( 'RevisionStore' );
        }
  
-       /**
-        * @since 1.32
-        * @return RevisionStoreFactory
-        */
-       public function getRevisionStoreFactory() {
-               return $this->getService( 'RevisionStoreFactory' );
-       }
- 
        /**
         * @since 1.31
         * @return RevisionLookup

diff --combined includes/ServiceWiring.php
index 9c2be7e,425b789..6da537d
--- 1/includes/ServiceWiring.php
--- 2/includes/ServiceWiring.php
+++ b/includes/ServiceWiring.php
@@@ -46,7 -46,7 +46,7 @@@ use MediaWiki\Preferences\DefaultPrefer
  use MediaWiki\Shell\CommandFactory;
  use MediaWiki\Storage\BlobStoreFactory;
  use MediaWiki\Storage\NameTableStore;
- use MediaWiki\Storage\RevisionStoreFactory;
+ use MediaWiki\Storage\RevisionStore;
  use MediaWiki\Storage\SqlBlobStore;
  use Wikimedia\ObjectFactory;
  
@@@ -128,14 -128,6 +128,14 @@@ return 
                );
        },
  
 +      'PerDbNameStatsdDataFactory' => function ( MediaWikiServices $services ) {
 +              $config = $services->getMainConfig();
 +              $wiki = $config->get( 'DBname' );
 +              return new BufferingStatsdDataFactory(
 +                      rtrim( $services->getMainConfig()->get( 'StatsdMetricPrefix' ), '.' ) . $wiki
 +              );
 +      },
 +
        'EventRelayerGroup' => function ( MediaWikiServices $services ) {
                return new EventRelayerGroup( $services->getMainConfig()->get( 'EventRelayerConfig' ) );
        },
@@@ -471,15 -463,10 +471,10 @@@
        },
  
        'RevisionStore' => function ( MediaWikiServices $services ) {
-               return $services->getRevisionStoreFactory()->getRevisionStore();
-       },
- 
-       'RevisionStoreFactory' => function ( MediaWikiServices $services ) {
                /** @var SqlBlobStore $blobStore */
                $blobStore = $services->getService( '_SqlBlobStore' );
-               $config = $services->getMainConfig();
  
-               $store = new RevisionStoreFactory(
+               $store = new RevisionStore(
                        $services->getDBLoadBalancer(),
                        $blobStore,
                        $services->getMainWANObjectCache(),
@@@ -487,11 -474,14 +482,14 @@@
                        $services->getContentModelStore(),
                        $services->getSlotRoleStore(),
                        $services->getMainConfig()->get( 'MultiContentRevisionSchemaMigrationStage' ),
-                       $services->getActorMigration(),
-                       LoggerFactory::getInstance( 'RevisionStore' ),
-                       $config->get( 'ContentHandlerUseDB' )
+                       $services->getActorMigration()
                );
  
+               $store->setLogger( LoggerFactory::getInstance( 'RevisionStore' ) );
+ 
+               $config = $services->getMainConfig();
+               $store->setContentHandlerUseDB( $config->get( 'ContentHandlerUseDB' ) );
+ 
                return $store;
        },
  

diff --combined tests/phpunit/includes/MediaWikiServicesTest.php
index 41368ce,dfee8c3..093cb07
--- 1/tests/phpunit/includes/MediaWikiServicesTest.php
--- 2/tests/phpunit/includes/MediaWikiServicesTest.php
+++ b/tests/phpunit/includes/MediaWikiServicesTest.php
@@@ -16,7 -16,6 +16,6 @@@ use MediaWiki\Storage\NameTableStore
  use MediaWiki\Storage\RevisionFactory;
  use MediaWiki\Storage\RevisionLookup;
  use MediaWiki\Storage\RevisionStore;
- use MediaWiki\Storage\RevisionStoreFactory;
  use MediaWiki\Storage\SqlBlobStore;
  
  /**
@@@ -315,8 -314,6 +314,8 @@@ class MediaWikiServicesTest extends Med
                        'SiteStore' => [ 'SiteStore', SiteStore::class ],
                        'SiteLookup' => [ 'SiteLookup', SiteLookup::class ],
                        'StatsdDataFactory' => [ 'StatsdDataFactory', IBufferingStatsdDataFactory::class ],
 +                      'PerDbNameStatsdDataFactory' =>
 +                              [ 'PerDbNameStatsdDataFactory', IBufferingStatsdDataFactory::class ],
                        'InterwikiLookup' => [ 'InterwikiLookup', InterwikiLookup::class ],
                        'EventRelayerGroup' => [ 'EventRelayerGroup', EventRelayerGroup::class ],
                        'SearchEngineFactory' => [ 'SearchEngineFactory', SearchEngineFactory::class ],
@@@ -349,7 -346,6 +348,6 @@@
                        'BlobStore' => [ 'BlobStore', BlobStore::class ],
                        '_SqlBlobStore' => [ '_SqlBlobStore', SqlBlobStore::class ],
                        'RevisionStore' => [ 'RevisionStore', RevisionStore::class ],
-                       'RevisionStoreFactory' => [ 'RevisionStoreFactory', RevisionStoreFactory::class ],
                        'RevisionLookup' => [ 'RevisionLookup', RevisionLookup::class ],
                        'RevisionFactory' => [ 'RevisionFactory', RevisionFactory::class ],
                        'ContentModelStore' => [ 'ContentModelStore', NameTableStore::class ],