Merge "ApiQueryLogEvents: Add IGNORE INDEX to avoid MariaDB optimizer bug"

[lhc/web/wiklou.git] / tests / phpunit / includes / Storage / NameTableStoreTest.php

diff --git a/tests/phpunit/includes/Storage/NameTableStoreTest.php b/tests/phpunit/includes/Storage/NameTableStoreTest.php
index b5b2e0d..4c2494a 100644 (file)
--- a/tests/phpunit/includes/Storage/NameTableStoreTest.php
+++ b/tests/phpunit/includes/Storage/NameTableStoreTest.php
@@ -26,6 +26,10 @@ class NameTableStoreTest extends MediaWikiTestCase {
                parent::setUp();
        }
 
+       protected function addCoreDBData() {
+               // The default implementation causes the slot_roles to already have content. Skip that.
+       }
+
        private function populateTable( $values ) {
                $insertValues = [];
                foreach ( $values as $name ) {
@@ -139,6 +143,9 @@ class NameTableStoreTest extends MediaWikiTestCase {
                $name,
                $expectedId
        ) {
+               // Make sure the table is empty!
+               $this->truncateTable( 'slot_roles' );
+
                $this->populateTable( $existingValues );
                $store = $this->getNameTableSqlStore( $cacheBag, (int)$needsInsert, $selectCalls );
 
@@ -201,7 +208,7 @@ class NameTableStoreTest extends MediaWikiTestCase {
 
        public function provideGetName() {
                return [
-                       [ new HashBagOStuff(), 3, 3 ],
+                       [ new HashBagOStuff(), 3, 2 ],
                        [ new EmptyBagOStuff(), 3, 3 ],
                ];
        }
@@ -210,26 +217,27 @@ class NameTableStoreTest extends MediaWikiTestCase {
         * @dataProvider provideGetName
         */
        public function testGetName( $cacheBag, $insertCalls, $selectCalls ) {
+               // Check for operations to in-memory cache (IMC) and persistent cache (PC)
                $store = $this->getNameTableSqlStore( $cacheBag, $insertCalls, $selectCalls );
 
                // Get 1 ID and make sure getName returns correctly
-               $fooId = $store->acquireId( 'foo' );
-               $this->assertSame( 'foo', $store->getName( $fooId ) );
+               $fooId = $store->acquireId( 'foo' ); // regen PC, set IMC, update IMC, tombstone PC
+               $this->assertSame( 'foo', $store->getName( $fooId ) ); // use IMC
 
                // Get another ID and make sure getName returns correctly
-               $barId = $store->acquireId( 'bar' );
-               $this->assertSame( 'bar', $store->getName( $barId ) );
+               $barId = $store->acquireId( 'bar' ); // update IMC, tombstone PC
+               $this->assertSame( 'bar', $store->getName( $barId ) ); // use IMC
 
                // Blitz the cache and make sure it still returns
-               TestingAccessWrapper::newFromObject( $store )->tableCache = null;
-               $this->assertSame( 'foo', $store->getName( $fooId ) );
-               $this->assertSame( 'bar', $store->getName( $barId ) );
+               TestingAccessWrapper::newFromObject( $store )->tableCache = null; // clear IMC
+               $this->assertSame( 'foo', $store->getName( $fooId ) ); // regen interim PC, set IMC
+               $this->assertSame( 'bar', $store->getName( $barId ) ); // use IMC
 
                // Blitz the cache again and get another ID and make sure getName returns correctly
-               TestingAccessWrapper::newFromObject( $store )->tableCache = null;
-               $bazId = $store->acquireId( 'baz' );
-               $this->assertSame( 'baz', $store->getName( $bazId ) );
-               $this->assertSame( 'baz', $store->getName( $bazId ) );
+               TestingAccessWrapper::newFromObject( $store )->tableCache = null; // clear IMC
+               $bazId = $store->acquireId( 'baz' ); // set IMC using interim PC, update IMC, tombstone PC
+               $this->assertSame( 'baz', $store->getName( $bazId ) ); // uses IMC
+               $this->assertSame( 'baz', $store->getName( $bazId ) ); // uses IMC
        }
 
        public function testGetName_masterFallback() {
@@ -266,6 +274,21 @@ class NameTableStoreTest extends MediaWikiTestCase {
                $this->assertSame( $expected, TestingAccessWrapper::newFromObject( $store )->tableCache );
        }
 
+       public function testReloadMap() {
+               $this->populateTable( [ 'foo' ] );
+               $store = $this->getNameTableSqlStore( new HashBagOStuff(), 0, 2 );
+
+               // force load
+               $this->assertCount( 1, $store->getMap() );
+
+               // add more stuff to the table, so the cache gets out of sync
+               $this->populateTable( [ 'bar' ] );
+
+               $expected = [ 1 => 'foo', 2 => 'bar' ];
+               $this->assertSame( $expected, $store->reloadMap() );
+               $this->assertSame( $expected, $store->getMap() );
+       }
+
        public function testCacheRaceCondition() {
                $wanHashBag = new HashBagOStuff();
                $store1 = $this->getNameTableSqlStore( $wanHashBag, 1, 1 );