Merge "MCR: replace slot_inherited with slot_origin"

diff --combined includes/Storage/RevisionStore.php
index 2e3103c,1b933c3..584142b
--- 1/includes/Storage/RevisionStore.php
--- 2/includes/Storage/RevisionStore.php
+++ b/includes/Storage/RevisionStore.php
@@@ -594,16 -594,17 +594,17 @@@ class RevisionStor
  
                if ( $current ) {
                        $fields = [
-                               'page'       => $title->getArticleID(),
-                               'user_text'  => $user->getName(),
-                               'user'       => $user->getId(),
-                               'actor'      => $user->getActorId(),
-                               'comment'    => $comment,
-                               'minor_edit' => $minor,
-                               'text_id'    => $current->rev_text_id,
-                               'parent_id'  => $current->page_latest,
-                               'len'        => $current->rev_len,
-                               'sha1'       => $current->rev_sha1
+                               'page'        => $title->getArticleID(),
+                               'user_text'   => $user->getName(),
+                               'user'        => $user->getId(),
+                               'actor'       => $user->getActorId(),
+                               'comment'     => $comment,
+                               'minor_edit'  => $minor,
+                               'text_id'     => $current->rev_text_id,
+                               'parent_id'   => $current->page_latest,
+                               'slot_origin' => $current->page_latest,
+                               'len'         => $current->rev_len,
+                               'sha1'        => $current->rev_sha1
                        ];
  
                        if ( $this->contentHandlerUseDB ) {
@@@ -771,6 -772,11 +772,11 @@@
                                $mainSlotRow->content_address = 'tt:' . $row->rev_text_id;
                        }
  
+                       // This is used by null-revisions
+                       $mainSlotRow->slot_origin = isset( $row->slot_origin )
+                               ? intval( $row->slot_origin )
+                               : null;
+ 
                        if ( isset( $row->old_text ) ) {
                                // this happens when the text-table gets joined directly, in the pre-1.30 schema
                                $blobData = isset( $row->old_text ) ? strval( $row->old_text ) : null;
@@@ -798,6 -804,9 +804,9 @@@
                        $mainSlotRow->slot_content_id = isset( $row['text_id'] )
                                ? intval( $row['text_id'] )
                                : null;
+                       $mainSlotRow->slot_origin = isset( $row['slot_origin'] )
+                               ? intval( $row['slot_origin'] )
+                               : null;
                        $mainSlotRow->content_address = isset( $row['text_id'] )
                                ? 'tt:' . intval( $row['text_id'] )
                                : null;
@@@ -835,9 -844,11 +844,11 @@@
                        throw new MWException( 'Revision constructor passed invalid row format.' );
                }
  
-               // With the old schema, the content changes with every revision.
-               // ...except for null-revisions. Would be nice if we could detect them.
-               $mainSlotRow->slot_inherited = 0;
+               // With the old schema, the content changes with every revision,
+               // except for null-revisions.
+               if ( !isset( $mainSlotRow->slot_origin ) ) {
+                       $mainSlotRow->slot_origin = $mainSlotRow->slot_revision_id;
+               }
  
                if ( $mainSlotRow->model_name === null ) {
                        $mainSlotRow->model_name = function ( SlotRecord $slot ) use ( $title ) {
@@@ -1044,10 -1055,9 +1055,10 @@@
         * @return RevisionRecord|null
         */
        public function getRevisionByTimestamp( $title, $timestamp ) {
 +              $db = $this->getDBConnection( DB_REPLICA );
                return $this->newRevisionFromConds(
                        [
 -                              'rev_timestamp' => $timestamp,
 +                              'rev_timestamp' => $db->timestamp( $timestamp ),
                                'page_namespace' => $title->getNamespace(),
                                'page_title' => $title->getDBkey()
                        ],

diff --combined includes/installer/MssqlUpdater.php
index 1d9991f,a70cab1..908dc94
--- 1/includes/installer/MssqlUpdater.php
--- 2/includes/installer/MssqlUpdater.php
+++ b/includes/installer/MssqlUpdater.php
@@@ -112,13 -112,13 +112,14 @@@ class MssqlUpdater extends DatabaseUpda
  
                        // 1.31
                        [ 'addTable', 'slots', 'patch-slots.sql' ],
+                       [ 'addField', 'slots', 'slot_origin', 'patch-slot-origin.sql' ],
                        [ 'addTable', 'content', 'patch-content.sql' ],
                        [ 'addTable', 'slot_roles', 'patch-slot_roles.sql' ],
                        [ 'addTable', 'content_models', 'patch-content_models.sql' ],
                        [ 'migrateArchiveText' ],
                        [ 'addTable', 'actor', 'patch-actor-table.sql' ],
                        [ 'migrateActors' ],
 +                      [ 'modifyField', 'revision', 'rev_text_id', 'patch-rev_text_id-default.sql' ],
                ];
        }
  

diff --combined includes/installer/MysqlUpdater.php
index 1d1f500,46ff747..710cebf
--- 1/includes/installer/MysqlUpdater.php
--- 2/includes/installer/MysqlUpdater.php
+++ b/includes/installer/MysqlUpdater.php
@@@ -332,13 -332,13 +332,14 @@@ class MysqlUpdater extends DatabaseUpda
  
                        // 1.31
                        [ 'addTable', 'slots', 'patch-slots.sql' ],
+                       [ 'addField', 'slots', 'slot_origin', 'patch-slot-origin.sql' ],
                        [ 'addTable', 'content', 'patch-content.sql' ],
                        [ 'addTable', 'slot_roles', 'patch-slot_roles.sql' ],
                        [ 'addTable', 'content_models', 'patch-content_models.sql' ],
                        [ 'migrateArchiveText' ],
                        [ 'addTable', 'actor', 'patch-actor-table.sql' ],
                        [ 'migrateActors' ],
 +                      [ 'modifyField', 'revision', 'rev_text_id', 'patch-rev_text_id-default.sql' ],
                ];
        }
  

diff --combined includes/installer/SqliteUpdater.php
index 112b517,d396ce2..7ed6f86
--- 1/includes/installer/SqliteUpdater.php
--- 2/includes/installer/SqliteUpdater.php
+++ b/includes/installer/SqliteUpdater.php
@@@ -198,11 -198,11 +198,12 @@@ class SqliteUpdater extends DatabaseUpd
                        [ 'addTable', 'content', 'patch-content.sql' ],
                        [ 'addTable', 'content_models', 'patch-content_models.sql' ],
                        [ 'addTable', 'slots', 'patch-slots.sql' ],
+                       [ 'addField', 'slots', 'slot_origin', 'patch-slot-origin.sql' ],
                        [ 'addTable', 'slot_roles', 'patch-slot_roles.sql' ],
                        [ 'migrateArchiveText' ],
                        [ 'addTable', 'actor', 'patch-actor-table.sql' ],
                        [ 'migrateActors' ],
 +                      [ 'modifyField', 'revision', 'rev_text_id', 'patch-rev_text_id-default.sql' ],
                ];
        }
  

diff --combined maintenance/mssql/tables.sql
index dbdcb24,b948772..ddc5517
--- 1/maintenance/mssql/tables.sql
--- 2/maintenance/mssql/tables.sql
+++ b/maintenance/mssql/tables.sql
@@@ -191,7 -191,7 +191,7 @@@ INSERT INTO /*_*/page (page_namespace, 
  CREATE TABLE /*_*/revision (
     rev_id INT NOT NULL UNIQUE IDENTITY(0,1),
     rev_page INT NOT NULL REFERENCES /*_*/page(page_id) ON DELETE CASCADE,
 -   rev_text_id INT  NOT NULL, -- FK added later
 +   rev_text_id INT NOT NULL CONSTRAINT DF_rev_text_id DEFAULT 0, -- FK added later
     rev_comment NVARCHAR(255) NOT NULL CONSTRAINT DF_rev_comment DEFAULT '',
     rev_user INT REFERENCES /*_*/mwuser(user_id) ON DELETE SET NULL,
     rev_user_text NVARCHAR(255) NOT NULL DEFAULT '',
@@@ -311,14 -311,15 +311,15 @@@ CREATE TABLE /*_*/slots 
    -- reference to content_id
    slot_content_id bigint unsigned NOT NULL CONSTRAINT FK_slots_content_id FOREIGN KEY REFERENCES content(content_id),
  
-   -- whether the content is inherited (1) or new in this revision (0)
-   slot_inherited tinyint unsigned NOT NULL CONSTRAINT DF_slot_inherited DEFAULT 0,
+   -- The revision ID of the revision that originated the slot's content.
+   -- To find revisions that changed slots, look for slot_origin = slot_revision_id.
+   slot_origin bigint NOT NULL,
  
    CONSTRAINT PK_slots PRIMARY KEY (slot_revision_id, slot_role_id)
  );
  
  -- Index for finding revisions that modified a specific slot
- CREATE INDEX /*i*/slot_role_inherited ON /*_*/slots (slot_revision_id, slot_role_id, slot_inherited);
+ CREATE INDEX /*i*/slot_revision_origin_role ON /*_*/slots (slot_revision_id, slot_origin, slot_role_id);
  
  --
  -- The content table represents content objects. It's primary purpose is to provide the necessary

diff --combined maintenance/tables.sql
index 1ccc7ce,4120a64..90c559a
--- 1/maintenance/tables.sql
--- 2/maintenance/tables.sql
+++ b/maintenance/tables.sql
@@@ -365,7 -365,7 +365,7 @@@ CREATE TABLE /*_*/revision 
    -- It's possible for multiple revisions to use the same text,
    -- for instance revisions where only metadata is altered
    -- or a rollback to a previous version.
 -  rev_text_id int unsigned NOT NULL,
 +  rev_text_id int unsigned NOT NULL default 0,
  
    -- Text comment summarizing the change. Deprecated in favor of
    -- revision_comment_temp.revcomment_comment_id.
@@@ -676,14 -676,15 +676,15 @@@ CREATE TABLE /*_*/slots 
    -- reference to content_id
    slot_content_id bigint unsigned NOT NULL,
  
-   -- whether the content is inherited (1) or new in this revision (0)
-   slot_inherited tinyint unsigned NOT NULL DEFAULT 0,
+   -- The revision ID of the revision that originated the slot's content.
+   -- To find revisions that changed slots, look for slot_origin = slot_revision_id.
+   slot_origin bigint unsigned NOT NULL,
  
    PRIMARY KEY ( slot_revision_id, slot_role_id )
  ) /*$wgDBTableOptions*/;
  
  -- Index for finding revisions that modified a specific slot
- CREATE INDEX /*i*/slot_role_inherited ON /*_*/slots (slot_revision_id, slot_role_id, slot_inherited);
+ CREATE INDEX /*i*/slot_revision_origin_role ON /*_*/slots (slot_revision_id, slot_origin, slot_role_id);
  
  --
  -- The content table represents content objects. It's primary purpose is to provide the necessary
@@@ -1835,7 -1836,7 +1836,7 @@@ CREATE TABLE /*_*/change_tag 
    ct_rev_id int unsigned NULL,
    -- Tag applied
    ct_tag varchar(255) NOT NULL,
 -  -- Parameters for the tag, presently unused
 +  -- Parameters for the tag; used by some extensions
    ct_params blob NULL
  ) /*$wgDBTableOptions*/;