Move Database and subclasses to Rdbms namespace

[lhc/web/wiklou.git] / includes / libs / rdbms / connectionmanager / SessionConsistentConnectionManager.php

diff --git a/includes/libs/rdbms/connectionmanager/SessionConsistentConnectionManager.php b/includes/libs/rdbms/connectionmanager/SessionConsistentConnectionManager.php
index 02972e5..30b1fb4 100644 (file)
--- a/includes/libs/rdbms/connectionmanager/SessionConsistentConnectionManager.php
+++ b/includes/libs/rdbms/connectionmanager/SessionConsistentConnectionManager.php
@@ -2,20 +2,17 @@
 
 namespace Wikimedia\Rdbms;
 
-use Database;
-use DBConnRef;
-
 /**
  * Database connection manager.
  *
- * This manages access to master and slave databases. It also manages state that indicates whether
- * the slave databases are possibly outdated after a write operation, and thus the master database
+ * This manages access to master and replica databases. It also manages state that indicates whether
+ * the replica databases are possibly outdated after a write operation, and thus the master database
  * should be used for subsequent read operations.
  *
  * @note: Services that access overlapping sets of database tables, or interact with logically
  * related sets of data in the database, should share a SessionConsistentConnectionManager.
  * Services accessing unrelated sets of information may prefer to not share a
- * SessionConsistentConnectionManager, so they can still perform read operations against slave
+ * SessionConsistentConnectionManager, so they can still perform read operations against replica
  * databases after a (unrelated, per the assumption) write operation to the master database.
  * Generally, sharing a SessionConsistentConnectionManager improves consistency (by avoiding race
  * conditions due to replication lag), but can reduce performance (by directing more read
@@ -37,7 +34,6 @@ class SessionConsistentConnectionManager extends ConnectionManager {
        /**
         * Forces all future calls to getReadConnection() to return a write connection.
         * Use this before performing read operations that are critical for a future update.
-        * Calling beginAtomicSection() implies a call to prepareForUpdates().
         *
         * @since 1.29
         */
@@ -95,24 +91,4 @@ class SessionConsistentConnectionManager extends ConnectionManager {
                return parent::getWriteConnectionRef();
        }
 
-       /**
-        * Begins an atomic section and returns a database connection to the master DB, for updating.
-        *
-        * @since 1.29
-        *
-        * @note: This causes all future calls to getReadConnection() to return a connection
-        * to the master DB, even after commitAtomicSection() or rollbackAtomicSection() have
-        * been called.
-        *
-        * @param string $fname
-        *
-        * @return Database
-        */
-       public function beginAtomicSection( $fname ) {
-               // Once we have written to master, do not read from replica.
-               $this->prepareForUpdates();
-
-               return parent::beginAtomicSection( $fname );
-       }
-
 }