Ori.livneh has uploaded a new change for review. https://gerrit.wikimedia.org/r/291681
Change subject: Drop dependency on wikimedia/cdb ...................................................................... Drop dependency on wikimedia/cdb Unused as of Ib5407c560. Change-Id: I5ac86f190bd35d3c3d2783a4db56ce4c13e3bd4c --- M composer.json M composer.lock M multiversion/vendor/composer/autoload_classmap.php M multiversion/vendor/composer/installed.json D multiversion/vendor/wikimedia/cdb/COPYING D multiversion/vendor/wikimedia/cdb/README.md D multiversion/vendor/wikimedia/cdb/src/Exception.php D multiversion/vendor/wikimedia/cdb/src/Reader.php D multiversion/vendor/wikimedia/cdb/src/Reader/DBA.php D multiversion/vendor/wikimedia/cdb/src/Reader/PHP.php D multiversion/vendor/wikimedia/cdb/src/Util.php D multiversion/vendor/wikimedia/cdb/src/Writer.php D multiversion/vendor/wikimedia/cdb/src/Writer/DBA.php D multiversion/vendor/wikimedia/cdb/src/Writer/PHP.php 14 files changed, 3 insertions(+), 1,502 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/81/291681/1 diff --git a/composer.json b/composer.json index 78bc6c7..23d5667 100644 --- a/composer.json +++ b/composer.json @@ -3,8 +3,7 @@ "description": "MediaWiki configuration for the Wikimedia farm", "require": { "mongofill/mongofill": "dev-master", - "perftools/xhgui": "dev-master", - "wikimedia/cdb": "1.3.0" + "perftools/xhgui": "dev-master" }, "config": { "classmap-authoritative": true, diff --git a/composer.lock b/composer.lock index 5278bd8..79b2af6 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "02067c53f4e15c62e1e67257dc05133b", - "content-hash": "db07206335a834c3ec1e3abdbbbe1fb3", + "hash": "e52113abcd744e080be1709ea3449454", + "content-hash": "3b28444c4f548c82581db20afa6f4f99", "packages": [ { "name": "mongofill/mongofill", @@ -381,56 +381,6 @@ "templating" ], "time": "2016-01-25 21:22:18" - }, - { - "name": "wikimedia/cdb", - "version": "1.3.0", - "source": { - "type": "git", - "url": "https://github.com/wikimedia/cdb.git", - "reference": "68f8fd495ca94ca0e965dd511e234893c515bb95" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/wikimedia/cdb/zipball/68f8fd495ca94ca0e965dd511e234893c515bb95", - "reference": "68f8fd495ca94ca0e965dd511e234893c515bb95", - "shasum": "" - }, - "require": { - "php": ">=5.3.2" - }, - "require-dev": { - "jakub-onderka/php-parallel-lint": "0.9", - "mediawiki/mediawiki-codesniffer": "0.3.0", - "phpunit/phpunit": "4.6.*" - }, - "type": "library", - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "GPL-2.0+" - ], - "authors": [ - { - "name": "Tim Starling", - "email": "tstarl...@wikimedia.org" - }, - { - "name": "Chad Horohoe", - "email": "c...@wikimedia.org" - }, - { - "name": "Ori Livneh", - "email": "o...@wikimedia.org" - } - ], - "description": "Constant Database (CDB) wrapper library for PHP. Provides pure-PHP fallback when dba_* functions are absent.", - "homepage": "https://www.mediawiki.org/wiki/CDB", - "time": "2015-09-08 19:53:04" } ], "packages-dev": [], diff --git a/multiversion/vendor/composer/autoload_classmap.php b/multiversion/vendor/composer/autoload_classmap.php index 523a6e1..cc6c5a3 100644 --- a/multiversion/vendor/composer/autoload_classmap.php +++ b/multiversion/vendor/composer/autoload_classmap.php @@ -6,14 +6,6 @@ $baseDir = dirname(dirname($vendorDir)); return array( - 'Cdb\\Exception' => $vendorDir . '/wikimedia/cdb/src/Exception.php', - 'Cdb\\Reader' => $vendorDir . '/wikimedia/cdb/src/Reader.php', - 'Cdb\\Reader\\DBA' => $vendorDir . '/wikimedia/cdb/src/Reader/DBA.php', - 'Cdb\\Reader\\PHP' => $vendorDir . '/wikimedia/cdb/src/Reader/PHP.php', - 'Cdb\\Util' => $vendorDir . '/wikimedia/cdb/src/Util.php', - 'Cdb\\Writer' => $vendorDir . '/wikimedia/cdb/src/Writer.php', - 'Cdb\\Writer\\DBA' => $vendorDir . '/wikimedia/cdb/src/Writer/DBA.php', - 'Cdb\\Writer\\PHP' => $vendorDir . '/wikimedia/cdb/src/Writer/PHP.php', 'Mongo' => $vendorDir . '/mongofill/mongofill/src/Mongo.php', 'MongoBinData' => $vendorDir . '/mongofill/mongofill/src/MongoBinData.php', 'MongoClient' => $vendorDir . '/mongofill/mongofill/src/MongoClient.php', diff --git a/multiversion/vendor/composer/installed.json b/multiversion/vendor/composer/installed.json index 8ba707a..27a26c9 100644 --- a/multiversion/vendor/composer/installed.json +++ b/multiversion/vendor/composer/installed.json @@ -1,57 +1,5 @@ [ { - "name": "wikimedia/cdb", - "version": "1.3.0", - "version_normalized": "1.3.0.0", - "source": { - "type": "git", - "url": "https://github.com/wikimedia/cdb.git", - "reference": "68f8fd495ca94ca0e965dd511e234893c515bb95" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/wikimedia/cdb/zipball/68f8fd495ca94ca0e965dd511e234893c515bb95", - "reference": "68f8fd495ca94ca0e965dd511e234893c515bb95", - "shasum": "" - }, - "require": { - "php": ">=5.3.2" - }, - "require-dev": { - "jakub-onderka/php-parallel-lint": "0.9", - "mediawiki/mediawiki-codesniffer": "0.3.0", - "phpunit/phpunit": "4.6.*" - }, - "time": "2015-09-08 19:53:04", - "type": "library", - "installation-source": "dist", - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "GPL-2.0+" - ], - "authors": [ - { - "name": "Tim Starling", - "email": "tstarl...@wikimedia.org" - }, - { - "name": "Chad Horohoe", - "email": "c...@wikimedia.org" - }, - { - "name": "Ori Livneh", - "email": "o...@wikimedia.org" - } - ], - "description": "Constant Database (CDB) wrapper library for PHP. Provides pure-PHP fallback when dba_* functions are absent.", - "homepage": "https://www.mediawiki.org/wiki/CDB" - }, - { "name": "mongofill/mongofill", "version": "dev-master", "version_normalized": "9999999-dev", diff --git a/multiversion/vendor/wikimedia/cdb/COPYING b/multiversion/vendor/wikimedia/cdb/COPYING deleted file mode 100644 index d159169..0000000 --- a/multiversion/vendor/wikimedia/cdb/COPYING +++ /dev/null @@ -1,339 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Lesser General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - <one line to give the program's name and a brief idea of what it does.> - Copyright (C) <year> <name of author> - - 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. - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - <signature of Ty Coon>, 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. diff --git a/multiversion/vendor/wikimedia/cdb/README.md b/multiversion/vendor/wikimedia/cdb/README.md deleted file mode 100644 index 02c1b94..0000000 --- a/multiversion/vendor/wikimedia/cdb/README.md +++ /dev/null @@ -1,49 +0,0 @@ -[![Latest Stable Version]](https://packagist.org/packages/wikimedia/cdb) [![License]](https://packagist.org/packages/wikimedia/cdb) - -CDB functions for PHP -===================== - -[CDB][], short for "constant database", refers to a very fast and highly -reliable database system which uses a simple file with key value pairs. This -library wraps the CDB functionality exposed in PHP via the `dba_*` functions. -In cases where `dba_*` functions are not present or are not compiled with CDB -support, a pure-PHP implementation is provided for falling back. - -Additional documentation about the library can be found on -[MediaWiki.org](https://www.mediawiki.org/wiki/CDB). - - -Usage ------ - - // Reading a CDB file - $cdb = \Cdb\Reader::open( 'db.cdb' ); - $foo = $cdb->get( 'somekey' ); - - // Writing to a CDB file - $cdb = \Cdb\Writer::open( 'anotherdb.cdb' ); - $cdb->set( 'somekey', $foo ); - - -Running tests -------------- - - composer install --prefer-dist - composer test - - -History -------- - -This library was first introduced in [MediaWiki 1.16][] ([r52203][]). It was -split out of the MediaWiki codebase and published as an independent library -during the [MediaWiki 1.25][] development cycle. - - ---- -[CDB]: https://en.wikipedia.org/wiki/cdb_(software) -[MediaWiki 1.16]: https://www.mediawiki.org/wiki/MediaWiki_1.16 -[r52203]: https://www.mediawiki.org/wiki/Special:Code/MediaWiki/52203 -[MediaWiki 1.25]: https://www.mediawiki.org/wiki/MediaWiki_1.25 -[Latest Stable Version]: https://poser.pugx.org/wikimedia/cdb/v/stable.svg -[License]: https://poser.pugx.org/wikimedia/cdb/license.svg diff --git a/multiversion/vendor/wikimedia/cdb/src/Exception.php b/multiversion/vendor/wikimedia/cdb/src/Exception.php deleted file mode 100644 index 76a59da..0000000 --- a/multiversion/vendor/wikimedia/cdb/src/Exception.php +++ /dev/null @@ -1,28 +0,0 @@ -<?php - -namespace Cdb; - -/** - * 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 - */ - -/** - * Exception for Cdb errors. - */ -class Exception extends \Exception { -} diff --git a/multiversion/vendor/wikimedia/cdb/src/Reader.php b/multiversion/vendor/wikimedia/cdb/src/Reader.php deleted file mode 100644 index b1aaa02..0000000 --- a/multiversion/vendor/wikimedia/cdb/src/Reader.php +++ /dev/null @@ -1,102 +0,0 @@ -<?php - -namespace Cdb; - -/** - * Native CDB file reader and writer. - * - * 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 - */ - -/** - * Read from a CDB file. - * Native and pure PHP implementations are provided. - * http://cr.yp.to/cdb.html - */ -abstract class Reader { - /** - * The file handle - */ - protected $handle; - - /** - * Open a file and return a subclass instance - * - * @param string $fileName - * - * @return Reader - */ - public static function open( $fileName ) { - return self::haveExtension() ? - new Reader\DBA( $fileName ) : - new Reader\PHP( $fileName ); - } - - /** - * Returns true if the native extension is available - * - * @return bool - */ - public static function haveExtension() { - if ( !function_exists( 'dba_handlers' ) ) { - return false; - } - $handlers = dba_handlers(); - if ( !in_array( 'cdb', $handlers ) || !in_array( 'cdb_make', $handlers ) ) { - return false; - } - - return true; - } - - /** - * Create the object and open the file - * - * @param string $fileName - */ - abstract public function __construct( $fileName ); - - /** - * Close the file. Optional, you can just let the variable go out of scope. - */ - abstract public function close(); - - /** - * Get a value with a given key. Only string values are supported. - * - * @param string $key - */ - abstract public function get( $key ); - - /** - * Check whether key exists - * - * @param string $key - */ - abstract public function exists( $key ); - - /** - * Fetch first key - */ - abstract public function firstkey(); - - /** - * Fetch next key - */ - abstract public function nextkey(); -} diff --git a/multiversion/vendor/wikimedia/cdb/src/Reader/DBA.php b/multiversion/vendor/wikimedia/cdb/src/Reader/DBA.php deleted file mode 100644 index 62f1ad9..0000000 --- a/multiversion/vendor/wikimedia/cdb/src/Reader/DBA.php +++ /dev/null @@ -1,62 +0,0 @@ -<?php - -namespace Cdb\Reader; - -use Cdb\Exception; -use Cdb\Reader; - -/** - * DBA-based CDB reader/writer - * - * 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 - */ - -/** - * Reader class which uses the DBA extension - */ -class DBA extends Reader { - public function __construct( $fileName ) { - $this->handle = dba_open( $fileName, 'r-', 'cdb' ); - if ( !$this->handle ) { - throw new Exception( 'Unable to open CDB file "' . $fileName . '"' ); - } - } - - public function close() { - if ( isset( $this->handle ) ) { - dba_close( $this->handle ); - } - unset( $this->handle ); - } - - public function get( $key ) { - return dba_fetch( $key, $this->handle ); - } - - public function exists( $key ) { - return dba_exists( $key, $this->handle ); - } - - public function firstkey() { - return dba_firstkey( $this->handle ); - } - - public function nextkey() { - return dba_nextkey( $this->handle ); - } -} diff --git a/multiversion/vendor/wikimedia/cdb/src/Reader/PHP.php b/multiversion/vendor/wikimedia/cdb/src/Reader/PHP.php deleted file mode 100644 index 0f0d36e..0000000 --- a/multiversion/vendor/wikimedia/cdb/src/Reader/PHP.php +++ /dev/null @@ -1,304 +0,0 @@ -<?php - -namespace Cdb\Reader; - -use Cdb\Exception; -use Cdb\Reader; -use Cdb\Util; - -/** - * This is a port of D.J. Bernstein's CDB to PHP. It's based on the copy that - * appears in PHP 5.3. - * - * 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 - */ - -/** - * CDB reader class - */ -class PHP extends Reader { - - /** @var string The file name of the CDB file. **/ - protected $fileName; - - /** @var string First 2048b of CDB file, containing the hash table. **/ - protected $hashTable; - - /** @var int Offset in file where value of found key starts. **/ - protected $dataPos; - - /** @var int Byte length of found key's value. **/ - protected $dataLen; - - /** @var int File position indicator when iterating over keys. **/ - protected $keyIterPos = 2048; - - /** @var string Read buffer for CDB file. **/ - protected $buf; - - /** @var int File offset where read buffer starts. **/ - protected $bufStart; - - /** @var int File handle position indicator **/ - protected $filePos = 2048; - - /** - * Constructor. - * - * @param string $fileName - * @throws Exception If CDB file cannot be opened or if it contains fewer - * than 2048 bytes of data. - */ - public function __construct( $fileName ) { - $this->fileName = $fileName; - $this->handle = fopen( $fileName, 'rb' ); - if ( !$this->handle ) { - throw new Exception( 'Unable to open CDB file "' . $this->fileName . '".' ); - } - $this->hashTable = fread( $this->handle, 2048 ); - if ( strlen( $this->hashTable ) !== 2048 ) { - throw new Exception( 'CDB file contains fewer than 2048 bytes of data.' ); - } - } - - /** - * Close the handle on the CDB file. - */ - public function close() { - if ( isset( $this->handle ) ) { - fclose( $this->handle ); - } - unset( $this->handle ); - } - - /** - * Get the value of a key. - * - * @param mixed $key - * @return bool|string The key's value or false if not found. - */ - public function get( $key ) { - // strval is required - if ( $this->find( strval( $key ) ) ) { - return $this->read( $this->dataPos, $this->dataLen ); - } - - return false; - } - - /** - * Read data from the CDB file. - * - * @throws Exception When attempting to read past the end of the file. - * @param int $start Start reading from this position. - * @param int $len Number of bytes to read. - * @return string Read data. - */ - protected function read( $start, $len ) { - $end = $start + $len; - - // The first 2048 bytes are the lookup table, which is read into - // memory on initialization. - if ( $end <= 2048 ) { - return substr( $this->hashTable, $start, $len ); - } - - // Read data from the internal buffer first. - $bytes = ''; - if ( $this->buf && $start >= $this->bufStart ) { - $bytes .= substr( $this->buf, $start - $this->bufStart, $len ); - $bytesRead = strlen( $bytes ); - $len -= $bytesRead; - $start += $bytesRead; - } else { - $bytesRead = 0; - } - - if ( !$len ) { - return $bytes; - } - - // Many reads are sequential, so the file position indicator may - // already be in the right place, in which case we can avoid the - // call to fseek(). - if ( $start !== $this->filePos ) { - if ( fseek( $this->handle, $start ) === -1 ) { - // This can easily happen if the internal pointers are incorrect - throw new Exception( - 'Seek failed, file "' . $this->fileName . '" may be corrupted.' ); - } - } - - $buf = fread( $this->handle, max( $len, 1024 ) ); - if ( $buf === false ) { - $buf = ''; - } - - $bytes .= substr( $buf, 0, $len ); - if ( strlen( $bytes ) !== $len + $bytesRead ) { - throw new Exception( - 'Read from CDB file failed, file "' . $this->fileName . '" may be corrupted.' ); - } - - $this->filePos = $end; - $this->bufStart = $start; - $this->buf = $buf; - - return $bytes; - } - - /** - * Unpack an unsigned integer and throw an exception if it needs more than 31 bits. - * - * @param int $pos Position to read from. - * @throws Exception When the integer cannot be represented in 31 bits. - * @return int - */ - protected function readInt31( $pos = 0 ) { - $uint31 = $this->readInt32( $pos ); - if ( $uint31 > 0x7fffffff ) { - throw new Exception( - 'Error in CDB file "' . $this->fileName . '", integer too big.' ); - } - - return $uint31; - } - - /** - * Unpack a 32-bit integer. - * - * @param int $pos - * @return int - */ - protected function readInt32( $pos = 0 ) { - static $lookups; - - if ( !$lookups ) { - $lookups = array(); - for ( $i = 1; $i < 256; $i++ ) { - $lookups[ chr( $i ) ] = $i; - } - } - - $buf = $this->read( $pos, 4 ); - - $rv = 0; - - if ( $buf[0] !== "\x0" ) { - $rv = $lookups[ $buf[0] ]; - } - if ( $buf[1] !== "\x0" ) { - $rv |= ( $lookups[ $buf[1] ] << 8 ); - } - if ( $buf[2] !== "\x0" ) { - $rv |= ( $lookups[ $buf[2] ] << 16 ); - } - if ( $buf[3] !== "\x0" ) { - $rv |= ( $lookups[ $buf[3] ] << 24 ); - } - - return $rv; - } - - /** - * Search the CDB file for a key. - * - * Sets `dataLen` and `dataPos` properties if successful. - * - * @param string $key - * @return bool Whether the key was found. - */ - protected function find( $key ) { - $keyLen = strlen( $key ); - - $u = Util::hash( $key ); - $upos = ( $u << 3 ) & 2047; - $hashSlots = $this->readInt31( $upos + 4 ); - if ( !$hashSlots ) { - return false; - } - $hashPos = $this->readInt31( $upos ); - $keyHash = $u; - $u = Util::unsignedShiftRight( $u, 8 ); - $u = Util::unsignedMod( $u, $hashSlots ); - $u <<= 3; - $keyPos = $hashPos + $u; - - for ( $i = 0; $i < $hashSlots; $i++ ) { - $hash = $this->readInt32( $keyPos ); - $pos = $this->readInt31( $keyPos + 4 ); - if ( !$pos ) { - return false; - } - $keyPos += 8; - if ( $keyPos == $hashPos + ( $hashSlots << 3 ) ) { - $keyPos = $hashPos; - } - if ( $hash === $keyHash ) { - if ( $keyLen === $this->readInt31( $pos ) ) { - $dataLen = $this->readInt31( $pos + 4 ); - $dataPos = $pos + 8 + $keyLen; - $foundKey = $this->read( $pos + 8, $keyLen ); - if ( $foundKey === $key ) { - // Found - $this->dataLen = $dataLen; - $this->dataPos = $dataPos; - - return true; - } - } - } - } - - return false; - } - - /** - * Check if a key exists in the CDB file. - * - * @param string $key - * @return bool Whether the key exists. - */ - public function exists( $key ) { - return $this->find( strval( $key ) ); - } - - /** - * Get the first key from the CDB file and reset the key iterator. - * - * @return string Key. - */ - public function firstkey() { - $this->keyIterPos = 2048; - return $this->nextkey(); - } - - /** - * Get the next key from the CDB file. - * - * @return string Key. - */ - public function nextkey() { - $keyLen = $this->readInt31( $this->keyIterPos ); - $dataLen = $this->readInt31( $this->keyIterPos + 4 ); - $key = $this->read( $this->keyIterPos + 8, $keyLen ); - $this->keyIterPos += 8 + $keyLen + $dataLen; - - return $key; - } -} diff --git a/multiversion/vendor/wikimedia/cdb/src/Util.php b/multiversion/vendor/wikimedia/cdb/src/Util.php deleted file mode 100644 index fe19509..0000000 --- a/multiversion/vendor/wikimedia/cdb/src/Util.php +++ /dev/null @@ -1,100 +0,0 @@ -<?php - -namespace Cdb; - -/** - * This is a port of D.J. Bernstein's CDB to PHP. It's based on the copy that - * appears in PHP 5.3. Changes are: - * * Error returns replaced with exceptions - * * Exception thrown if sizes or offsets are between 2GB and 4GB - * * Some variables renamed - * - * 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 - */ - -/** - * Common functions for readers and writers - */ -class Util { - /** - * Take a modulo of a signed integer as if it were an unsigned integer. - * $b must be less than 0x40000000 and greater than 0 - * - * @param int $a - * @param int $b - * - * @return int - */ - public static function unsignedMod( $a, $b ) { - if ( $a & 0x80000000 ) { - $m = ( $a & 0x7fffffff ) % $b + 2 * ( 0x40000000 % $b ); - - return $m % $b; - } else { - return $a % $b; - } - } - - /** - * Shift a signed integer right as if it were unsigned - * @param int $a - * @param int $b - * @return int - */ - public static function unsignedShiftRight( $a, $b ) { - if ( $b == 0 ) { - return $a; - } - if ( $a & 0x80000000 ) { - return ( ( $a & 0x7fffffff ) >> $b ) | ( 0x40000000 >> ( $b - 1 ) ); - } else { - return $a >> $b; - } - } - - /** - * The CDB hash function. - * - * @param string $s - * - * @return int - */ - public static function hash( $s ) { - $h = 5381; - $len = strlen( $s ); - for ( $i = 0; $i < $len; $i++ ) { - $h5 = ( $h << 5 ) & 0xffffffff; - // Do a 32-bit sum - // Inlined here for speed - $sum = ( $h & 0x3fffffff ) + ( $h5 & 0x3fffffff ); - $h = - ( - ( $sum & 0x40000000 ? 1 : 0 ) - + ( $h & 0x80000000 ? 2 : 0 ) - + ( $h & 0x40000000 ? 1 : 0 ) - + ( $h5 & 0x80000000 ? 2 : 0 ) - + ( $h5 & 0x40000000 ? 1 : 0 ) - ) << 30 - | ( $sum & 0x3fffffff ); - $h ^= ord( $s[$i] ); - $h &= 0xffffffff; - } - - return $h; - } -} diff --git a/multiversion/vendor/wikimedia/cdb/src/Writer.php b/multiversion/vendor/wikimedia/cdb/src/Writer.php deleted file mode 100644 index 5321604..0000000 --- a/multiversion/vendor/wikimedia/cdb/src/Writer.php +++ /dev/null @@ -1,99 +0,0 @@ -<?php - -namespace Cdb; - -/** - * Native CDB file reader and writer. - * - * 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 - */ - -/** - * Write to a CDB file. - * Native and pure PHP implementations are provided. - * http://cr.yp.to/cdb.html - */ -abstract class Writer { - /** - * The file handle - */ - protected $handle; - - /** - * File we'll be writing to when we're done - * @var string - */ - protected $realFileName; - - /** - * File we write to temporarily until we're done - * @var string - */ - protected $tmpFileName; - - /** - * Open a writer and return a subclass instance. - * The user must have write access to the directory, for temporary file creation. - * - * @param string $fileName - * - * @return Writer - */ - public static function open( $fileName ) { - return Reader::haveExtension() ? - new Writer\DBA( $fileName ) : - new Writer\PHP( $fileName ); - } - - /** - * Create the object and open the file - * - * @param string $fileName - */ - abstract public function __construct( $fileName ); - - /** - * Set a key to a given value. The value will be converted to string. - * @param string $key - * @param string $value - */ - abstract public function set( $key, $value ); - - /** - * Close the writer object. You should call this function before the object - * goes out of scope, to write out the final hashtables. - */ - abstract public function close(); - - /** - * If the object goes out of scope, close it for sanity - */ - public function __destruct() { - if ( isset( $this->handle ) ) { - $this->close(); - } - } - - /** - * Are we running on Windows? - * @return bool - */ - protected function isWindows() { - return strtoupper( substr( PHP_OS, 0, 3 ) ) === 'WIN'; - } -} diff --git a/multiversion/vendor/wikimedia/cdb/src/Writer/DBA.php b/multiversion/vendor/wikimedia/cdb/src/Writer/DBA.php deleted file mode 100644 index 20d0adf..0000000 --- a/multiversion/vendor/wikimedia/cdb/src/Writer/DBA.php +++ /dev/null @@ -1,64 +0,0 @@ -<?php - -namespace Cdb\Writer; - -use Cdb\Exception; -use Cdb\Writer; - -/** - * DBA-based CDB reader/writer - * - * 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 - */ - -/** - * Writer class which uses the DBA extension - */ -class DBA extends Writer { - /** - * @throws Exception - */ - public function __construct( $fileName ) { - $this->realFileName = $fileName; - $this->tmpFileName = $fileName . '.tmp.' . mt_rand( 0, 0x7fffffff ); - $this->handle = dba_open( $this->tmpFileName, 'n', 'cdb_make' ); - if ( !$this->handle ) { - throw new Exception( 'Unable to open CDB file for write "' . $fileName . '"' ); - } - } - - public function set( $key, $value ) { - return dba_insert( $key, $value, $this->handle ); - } - - /** - * @throws Exception - */ - public function close() { - if ( isset( $this->handle ) ) { - dba_close( $this->handle ); - } - if ( $this->isWindows() ) { - unlink( $this->realFileName ); - } - if ( !rename( $this->tmpFileName, $this->realFileName ) ) { - throw new Exception( 'Unable to move the new CDB file into place.' ); - } - unset( $this->handle ); - } -} diff --git a/multiversion/vendor/wikimedia/cdb/src/Writer/PHP.php b/multiversion/vendor/wikimedia/cdb/src/Writer/PHP.php deleted file mode 100644 index 4676b5e..0000000 --- a/multiversion/vendor/wikimedia/cdb/src/Writer/PHP.php +++ /dev/null @@ -1,241 +0,0 @@ -<?php - -namespace Cdb\Writer; - -use Cdb\Exception; -use Cdb\Util; -use Cdb\Writer; - -/** - * This is a port of D.J. Bernstein's CDB to PHP. It's based on the copy that - * appears in PHP 5.3. Changes are: - * * Error returns replaced with exceptions - * * Exception thrown if sizes or offsets are between 2GB and 4GB - * * Some variables renamed - * - * 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 - */ - -/** - * CDB writer class - */ -class PHP extends Writer { - protected $hplist; - - protected $numentries; - - protected $pos; - - /** - * @param string $fileName - */ - public function __construct( $fileName ) { - $this->realFileName = $fileName; - $this->tmpFileName = $fileName . '.tmp.' . mt_rand( 0, 0x7fffffff ); - $this->handle = fopen( $this->tmpFileName, 'wb' ); - if ( !$this->handle ) { - $this->throwException( - 'Unable to open CDB file "' . $this->tmpFileName . '" for write.' ); - } - $this->hplist = array(); - $this->numentries = 0; - $this->pos = 2048; // leaving space for the pointer array, 256 * 8 - if ( fseek( $this->handle, $this->pos ) == -1 ) { - $this->throwException( 'fseek failed in file "' . $this->tmpFileName . '".' ); - } - } - - /** - * @param string $key - * @param string $value - */ - public function set( $key, $value ) { - if ( strval( $key ) === '' ) { - // DBA cross-check hack - return; - } - $this->addbegin( strlen( $key ), strlen( $value ) ); - $this->write( $key ); - $this->write( $value ); - $this->addend( strlen( $key ), strlen( $value ), Util::hash( $key ) ); - } - - /** - * @throws Exception - */ - public function close() { - $this->finish(); - if ( isset( $this->handle ) ) { - fclose( $this->handle ); - } - if ( $this->isWindows() && file_exists( $this->realFileName ) ) { - unlink( $this->realFileName ); - } - if ( !rename( $this->tmpFileName, $this->realFileName ) ) { - $this->throwException( 'Unable to move the new CDB file into place.' ); - } - unset( $this->handle ); - } - - /** - * @throws Exception - * @param string $buf - */ - protected function write( $buf ) { - $len = fwrite( $this->handle, $buf ); - if ( $len !== strlen( $buf ) ) { - $this->throwException( 'Error writing to CDB file "' . $this->tmpFileName . '".' ); - } - } - - /** - * @throws Exception - * @param int $len - */ - protected function posplus( $len ) { - $newpos = $this->pos + $len; - if ( $newpos > 0x7fffffff ) { - $this->throwException( - 'A value in the CDB file "' . $this->tmpFileName . '" is too large.' ); - } - $this->pos = $newpos; - } - - /** - * @param int $keylen - * @param int $datalen - * @param int $h - */ - protected function addend( $keylen, $datalen, $h ) { - $this->hplist[] = array( - 'h' => $h, - 'p' => $this->pos - ); - - $this->numentries++; - $this->posplus( 8 ); - $this->posplus( $keylen ); - $this->posplus( $datalen ); - } - - /** - * @throws Exception - * @param int $keylen - * @param int $datalen - */ - protected function addbegin( $keylen, $datalen ) { - if ( $keylen > 0x7fffffff ) { - $this->throwException( 'Key length too long in file "' . $this->tmpFileName . '".' ); - } - if ( $datalen > 0x7fffffff ) { - $this->throwException( 'Data length too long in file "' . $this->tmpFileName . '".' ); - } - $buf = pack( 'VV', $keylen, $datalen ); - $this->write( $buf ); - } - - /** - * @throws Exception - */ - protected function finish() { - // Hack for DBA cross-check - $this->hplist = array_reverse( $this->hplist ); - - // Calculate the number of items that will be in each hashtable - $counts = array_fill( 0, 256, 0 ); - foreach ( $this->hplist as $item ) { - ++$counts[255 & $item['h']]; - } - - // Fill in $starts with the *end* indexes - $starts = array(); - $pos = 0; - for ( $i = 0; $i < 256; ++$i ) { - $pos += $counts[$i]; - $starts[$i] = $pos; - } - - // Excessively clever and indulgent code to simultaneously fill $packedTables - // with the packed hashtables, and adjust the elements of $starts - // to actually point to the starts instead of the ends. - $packedTables = array_fill( 0, $this->numentries, false ); - foreach ( $this->hplist as $item ) { - $packedTables[--$starts[255 & $item['h']]] = $item; - } - - $final = ''; - for ( $i = 0; $i < 256; ++$i ) { - $count = $counts[$i]; - - // The size of the hashtable will be double the item count. - // The rest of the slots will be empty. - $len = $count + $count; - $final .= pack( 'VV', $this->pos, $len ); - - $hashtable = array(); - for ( $u = 0; $u < $len; ++$u ) { - $hashtable[$u] = array( 'h' => 0, 'p' => 0 ); - } - - // Fill the hashtable, using the next empty slot if the hashed slot - // is taken. - for ( $u = 0; $u < $count; ++$u ) { - $hp = $packedTables[$starts[$i] + $u]; - $where = Util::unsignedMod( - Util::unsignedShiftRight( $hp['h'], 8 ), $len ); - while ( $hashtable[$where]['p'] ) { - if ( ++$where == $len ) { - $where = 0; - } - } - $hashtable[$where] = $hp; - } - - // Write the hashtable - for ( $u = 0; $u < $len; ++$u ) { - $buf = pack( 'vvV', - $hashtable[$u]['h'] & 0xffff, - Util::unsignedShiftRight( $hashtable[$u]['h'], 16 ), - $hashtable[$u]['p'] ); - $this->write( $buf ); - $this->posplus( 8 ); - } - } - - // Write the pointer array at the start of the file - rewind( $this->handle ); - if ( ftell( $this->handle ) != 0 ) { - $this->throwException( 'Error rewinding to start of file "' . $this->tmpFileName . '".' ); - } - $this->write( $final ); - } - - /** - * Clean up the temp file and throw an exception - * - * @param string $msg - * @throws Exception - */ - protected function throwException( $msg ) { - if ( $this->handle ) { - fclose( $this->handle ); - unlink( $this->tmpFileName ); - } - throw new Exception( $msg ); - } -} -- To view, visit https://gerrit.wikimedia.org/r/291681 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5ac86f190bd35d3c3d2783a4db56ce4c13e3bd4c Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Ori.livneh <o...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits