Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove UIDGenerator, deprecated since 1.35

Browse source 
Change-Id: I5e47ecd560218df7e48af68e6aee351bc2a57823
This commit is contained in:
Ebrahim Byagowi 2024-09-04 05:04:37 +03:30
parent 2a9b9675e2
commit f903bae012
5 changed files with 4 additions and 188 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
RELEASE-NOTES-1.43
View file

@ -237,6 +237,7 @@ because of Phabricator reports.
provides is specific to certain handlers implemented in MediaWiki core.
* MediaWikiIntegrationTestCase::addCoreDBData(), deprecated since 1.41, has
been removed.
* UIDGenerator, deprecated since 1.35, has been removed.
* TablePager::getBody(), final and deprecated since 1.24, has been removed.
Use ::getBodyOutput() or ::getFullOutput() instead.
* ImportableUploadRevisionImporter::downloadSource(), deprecated in 1.31, is now

1
autoload.php
View file

@ -3128,7 +3128,6 @@ $wgAutoloadLocalClasses = [
'TrivialMediaHandlerState' => __DIR__ . '/includes/media/TrivialMediaHandlerState.php',
'UDPRCFeedEngine' => __DIR__ . '/includes/recentchanges/RCFeed/UDPRCFeedEngine.php',
'UDPTransport' => __DIR__ . '/includes/libs/UDPTransport.php',
'UIDGenerator' => __DIR__ . '/includes/utils/UIDGenerator.php',
'UcdXmlReader' => __DIR__ . '/maintenance/language/generateCollationData.php',
'Undelete' => __DIR__ . '/maintenance/undelete.php',
'UnifiedDiffFormatter' => __DIR__ . '/includes/libs/Diff/UnifiedDiffFormatter.php',

4
includes/externalstore/ExternalStoreMwstore.php
View file

@ -19,6 +19,7 @@
*/
use MediaWiki\FileBackend\FileBackendGroup;
use MediaWiki\MediaWikiServices;
use MediaWiki\WikiMap\WikiMap;
use Wikimedia\FileBackend\FileBackend;
@ -97,7 +98,8 @@ class ExternalStoreMwstore extends ExternalStoreMedium {
// Get three random base 36 characters to act as shard directories
$rand = Wikimedia\base_convert( (string)mt_rand( 0, 46655 ), 10, 36, 3 );
// Make sure ID is roughly lexicographically increasing for performance
$id = str_pad( UIDGenerator::newTimestampedUID128( 32 ), 26, '0', STR_PAD_LEFT );
$gen = MediaWikiServices::getInstance()->getGlobalIdGenerator();
$id = str_pad( $gen->newTimestampedUID128( 32 ), 26, '0', STR_PAD_LEFT );
// Segregate items by DB domain ID for the sake of bookkeeping
$domain = $this->isDbDomainExplicit
? $this->dbDomain

177
includes/utils/UIDGenerator.php
View file

@ -1,177 +0,0 @@
<?php
/**
* This file deals with UID generation.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
* http://www.gnu.org/copyleft/gpl.html
*
* @file
*/
use MediaWiki\MediaWikiServices;
use Wikimedia\UUID\GlobalIdGenerator;
/**
* Class for getting statistically unique IDs
*
* @since 1.21
* @deprecated Since 1.35; use GlobalIdGenerator instead
*/
class UIDGenerator {
/** @var int B/C constant (deprecated since 1.35) */
public const QUICK_RAND = 0; // b/c
/** @var int B/C constant (deprecated since 1.35) */
public const QUICK_VOLATILE = GlobalIdGenerator::QUICK_VOLATILE;
/**
* Get a statistically unique 88-bit unsigned integer ID string.
* The bits of the UID are prefixed with the time (down to the millisecond).
*
* These IDs are suitable as values for the shard key of distributed data.
* If a column uses these as values, it should be declared UNIQUE to handle collisions.
* New rows almost always have higher UIDs, which makes B-TREE updates on INSERT fast.
* They can also be stored "DECIMAL(27) UNSIGNED" or BINARY(11) in MySQL.
*
* UID generation is serialized on each server (as the node ID is for the whole machine).
*
* @param int $base Specifies a base other than 10
* @return string Number
* @throws RuntimeException
*/
public static function newTimestampedUID88( $base = 10 ) {
$gen = MediaWikiServices::getInstance()->getGlobalIdGenerator();
return $gen->newTimestampedUID88( $base );
}
/**
* Get a statistically unique 128-bit unsigned integer ID string.
* The bits of the UID are prefixed with the time (down to the millisecond).
*
* These IDs are suitable as globally unique IDs, without any enforced uniqueness.
* New rows almost always have higher UIDs, which makes B-TREE updates on INSERT fast.
* They can also be stored as "DECIMAL(39) UNSIGNED" or BINARY(16) in MySQL.
*
* UID generation is serialized on each server (as the node ID is for the whole machine).
*
* @param int $base Specifies a base other than 10
* @return string Number
* @throws RuntimeException
*/
public static function newTimestampedUID128( $base = 10 ) {
$gen = MediaWikiServices::getInstance()->getGlobalIdGenerator();
return $gen->newTimestampedUID128( $base );
}
/**
* Return an RFC4122 compliant v1 UUID
*
* @return string
* @throws RuntimeException
* @since 1.27
*/
public static function newUUIDv1() {
$gen = MediaWikiServices::getInstance()->getGlobalIdGenerator();
return $gen->newUUIDv1();
}
/**
* Return an RFC4122 compliant v1 UUID
*
* @return string 32 hex characters with no hyphens
* @throws RuntimeException
* @since 1.27
*/
public static function newRawUUIDv1() {
$gen = MediaWikiServices::getInstance()->getGlobalIdGenerator();
return $gen->newRawUUIDv1();
}
/**
* Get timestamp in a specified format from UUIDv1
*
* @param string $uuid the UUID to get the timestamp from
* @param int $format the format to convert the timestamp to. Default: TS_MW
* @return string|false timestamp in requested format or false
*/
public static function getTimestampFromUUIDv1( string $uuid, int $format = TS_MW ) {
$gen = MediaWikiServices::getInstance()->getGlobalIdGenerator();
return $gen->getTimestampFromUUIDv1( $uuid, $format );
}
/**
* Return an RFC4122 compliant v4 UUID
*
* @param int $flags Bitfield (unused)
* @return string
* @throws RuntimeException
*/
public static function newUUIDv4( $flags = 0 ) {
$gen = MediaWikiServices::getInstance()->getGlobalIdGenerator();
return $gen->newUUIDv4();
}
/**
* Return an RFC4122 compliant v4 UUID
*
* @param int $flags Bitfield (unused)
* @return string 32 hex characters with no hyphens
* @throws RuntimeException
*/
public static function newRawUUIDv4( $flags = 0 ) {
$gen = MediaWikiServices::getInstance()->getGlobalIdGenerator();
return $gen->newRawUUIDv4();
}
/**
* Return an ID that is sequential *only* for this node and bucket
*
* These IDs are suitable for per-host sequence numbers, e.g. for some packet protocols.
* If UIDGenerator::QUICK_VOLATILE is used the counter might reset on server restart.
*
* @param string $bucket Arbitrary bucket name (should be ASCII)
* @param int $bits Bit size (<=48) of resulting numbers before wrap-around
* @param int $flags (supports UIDGenerator::QUICK_VOLATILE)
* @return float Integer value as float
* @since 1.23
*/
public static function newSequentialPerNodeID( $bucket, $bits = 48, $flags = 0 ) {
$gen = MediaWikiServices::getInstance()->getGlobalIdGenerator();
return $gen->newSequentialPerNodeID( $bucket, $bits, $flags );
}
/**
* Return IDs that are sequential *only* for this node and bucket
*
* @see UIDGenerator::newSequentialPerNodeID()
* @param string $bucket Arbitrary bucket name (should be ASCII)
* @param int $bits Bit size (16 to 48) of resulting numbers before wrap-around
* @param int $count Number of IDs to return
* @param int $flags (supports UIDGenerator::QUICK_VOLATILE)
* @return array Ordered list of float integer values
* @since 1.23
*/
public static function newSequentialPerNodeIDs( $bucket, $bits, $count, $flags = 0 ) {
$gen = MediaWikiServices::getInstance()->getGlobalIdGenerator();
return $gen->newSequentialPerNodeIDs( $bucket, $bits, $count, $flags );
}
}

9
tests/phpunit/integration/includes/libs/uuid/GlobalIdGeneratorTest.php
View file

@ -126,15 +126,6 @@ class GlobalIdGeneratorTest extends PHPUnit\Framework\TestCase {
"UID $id has the right format"
);
}
for ( $i = 0; $i < 100; $i++ ) {
$id = $this->globalIdGenerator->newRawUUIDv4( UIDGenerator::QUICK_RAND );
$this->assertMatchesRegularExpression(
'!^[0-9a-f]{12}4[0-9a-f]{3}[89ab][0-9a-f]{15}$!',
$id,
"UID $id has the right format"
);
}
}
public function testNewSequentialID() {