Merge "Database transaction flushing cleanups"

diff --combined includes/WatchedItemStore.php
index b8a47fa,92cdee5..cf18fab
--- 1/includes/WatchedItemStore.php
--- 2/includes/WatchedItemStore.php
+++ b/includes/WatchedItemStore.php
@@@ -741,6 -741,7 +741,7 @@@ class WatchedItemStore implements Stats
                                        global $wgUpdateRowsPerQuery;
  
                                        $dbw = $this->getConnection( DB_MASTER );
+                                       $factory = wfGetLBFactory();
  
                                        $watchersChunks = array_chunk( $watchers, $wgUpdateRowsPerQuery );
                                        foreach ( $watchersChunks as $watchersChunk ) {
@@@ -754,16 -755,14 +755,16 @@@
                                                        ], $fname
                                                );
                                                if ( count( $watchersChunks ) > 1 ) {
-                                                       $dbw->commit( __METHOD__, 'flush' );
-                                                       wfGetLBFactory()->waitForReplication( [ 'wiki' => $dbw->getWikiID() ] );
+                                                       $factory->commitMasterChanges( __METHOD__ );
+                                                       $factory->waitForReplication( [ 'wiki' => $dbw->getWikiID() ] );
                                                }
                                        }
                                        $this->uncacheLinkTarget( $target );
  
                                        $this->reuseConnection( $dbw );
 -                              }
 +                              },
 +                              DeferredUpdates::POSTSEND,
 +                              $dbw
                        );
                }
  

diff --combined includes/db/Database.php
index 5023acd,3ea2cda..78975ff
--- 1/includes/db/Database.php
--- 2/includes/db/Database.php
+++ b/includes/db/Database.php
@@@ -703,7 -703,7 +703,7 @@@ abstract class DatabaseBase implements 
                                                " performing implicit commit before closing connection!" );
                                }
  
-                               $this->commit( __METHOD__, 'flush' );
+                               $this->commit( __METHOD__, self::FLUSHING_INTERNAL );
                        }
  
                        $closed = $this->closeConnection();
@@@ -1864,7 -1864,7 +1864,7 @@@
        /**
         * Gets an array of aliased table names
         *
 -       * @param array $tables Array( [alias] => table )
 +       * @param array $tables [ [alias] => table ]
         * @return string[] See tableNameWithAlias()
         */
        public function tableNamesWithAlias( $tables ) {
@@@ -1898,7 -1898,7 +1898,7 @@@
        /**
         * Gets an array of aliased field names
         *
 -       * @param array $fields Array( [alias] => field )
 +       * @param array $fields [ [alias] => field ]
         * @return string[] See fieldNameWithAlias()
         */
        public function fieldNamesWithAlias( $fields ) {
@@@ -2651,7 -2651,7 +2651,7 @@@
                }
  
                if ( !$this->mTrxAtomicLevels && $this->mTrxAutomaticAtomic ) {
-                       $this->commit( $fname, 'flush' );
+                       $this->commit( $fname, self::FLUSHING_INTERNAL );
                }
        }
  
@@@ -2746,7 -2746,7 +2746,7 @@@
                        );
                }
  
-               if ( $flush === 'flush' ) {
+               if ( $flush === self::FLUSHING_INTERNAL || $flush === self::FLUSHING_ALL_PEERS ) {
                        if ( !$this->mTrxLevel ) {
                                return; // nothing to do
                        } elseif ( !$this->mTrxAutomatic ) {
@@@ -2796,7 -2796,7 +2796,7 @@@
        }
  
        final public function rollback( $fname = __METHOD__, $flush = '' ) {
-               if ( $flush !== 'flush' ) {
+               if ( $flush !== self::FLUSHING_INTERNAL && $flush !== self::FLUSHING_ALL_PEERS ) {
                        if ( !$this->mTrxLevel ) {
                                wfWarn( "$fname: No transaction to rollback, something got out of sync!" );
                                return; // nothing to do
@@@ -3302,11 -3302,11 +3302,11 @@@
                }
  
                $unlocker = new ScopedCallback( function () use ( $lockKey, $fname ) {
-                       $this->commit( __METHOD__, 'flush' );
+                       $this->commit( __METHOD__, self::FLUSHING_INTERNAL );
                        $this->unlock( $lockKey, $fname );
                } );
  
-               $this->commit( __METHOD__, 'flush' );
+               $this->commit( __METHOD__, self::FLUSHING_INTERNAL );
  
                return $unlocker;
        }