From a7c103f24df5c340dcaa5fdcd9252a3340f28df4 Mon Sep 17 00:00:00 2001 From: Brad Jorsch Date: Thu, 22 Feb 2018 10:39:02 -0500 Subject: [PATCH] RevisionStore: Remove reference to unimplemented 'ar' blob address schema It was thought that an 'ar:' schema for SqlBlobStore addresses would be needed to support archive rows from before MediaWiki 1.5 that still stored the text in ar_text and ar_flags instead of using the text table and ar_text_id. But this schema was never actually implemented. Now I5608c6b6 has migrated that content to the text table and ar_text_id, and I18f1c740b will remove the database fields entirely. So there's no reason to ever implement this schema. Change-Id: Ic449478c244bb13a8c5139e20488e876c0a793bb --- includes/Storage/RevisionStore.php | 2 -- includes/Storage/SqlBlobStore.php | 1 - 2 files changed, 3 deletions(-) diff --git a/includes/Storage/RevisionStore.php b/includes/Storage/RevisionStore.php index e7c9060411..2992211630 100644 --- a/includes/Storage/RevisionStore.php +++ b/includes/Storage/RevisionStore.php @@ -740,8 +740,6 @@ class RevisionStore if ( isset( $row->rev_text_id ) && $row->rev_text_id > 0 ) { $mainSlotRow->cont_address = 'tt:' . $row->rev_text_id; - } elseif ( isset( $row->ar_id ) ) { - $mainSlotRow->cont_address = 'ar:' . $row->ar_id; } if ( isset( $row->old_text ) ) { diff --git a/includes/Storage/SqlBlobStore.php b/includes/Storage/SqlBlobStore.php index 031cb587ed..b890e5acaa 100644 --- a/includes/Storage/SqlBlobStore.php +++ b/includes/Storage/SqlBlobStore.php @@ -299,7 +299,6 @@ class SqlBlobStore implements IDBAccessObject, BlobStore { list( $schema, $id, ) = self::splitBlobAddress( $blobAddress ); //TODO: MCR: also support 'ex' schema with ExternalStore URLs, plus flags encoded in the URL! - //TODO: MCR: also support 'ar' schema for content blobs in old style archive rows! if ( $schema === 'tt' ) { $textId = intval( $id ); } else { -- 2.20.1