diff options
Diffstat (limited to 'vendor/wikimedia/cdb')
| -rw-r--r-- | vendor/wikimedia/cdb/COPYING | 183 | ||||
| -rw-r--r-- | vendor/wikimedia/cdb/Doxyfile | 32 | ||||
| -rw-r--r-- | vendor/wikimedia/cdb/README.md | 31 | ||||
| -rw-r--r-- | vendor/wikimedia/cdb/composer.json | 26 | ||||
| -rw-r--r-- | vendor/wikimedia/cdb/doc/README | 1 | ||||
| -rw-r--r-- | vendor/wikimedia/cdb/src/Reader.php | 17 | ||||
| -rw-r--r-- | vendor/wikimedia/cdb/src/Reader/DBA.php | 13 | ||||
| -rw-r--r-- | vendor/wikimedia/cdb/src/Reader/PHP.php | 286 | ||||
| -rw-r--r-- | vendor/wikimedia/cdb/src/Writer.php | 2 | ||||
| -rw-r--r-- | vendor/wikimedia/cdb/src/Writer/DBA.php | 1 | ||||
| -rw-r--r-- | vendor/wikimedia/cdb/src/Writer/PHP.php | 1 | ||||
| -rw-r--r-- | vendor/wikimedia/cdb/test/CdbTest.php | 95 |
12 files changed, 324 insertions, 364 deletions
diff --git a/vendor/wikimedia/cdb/COPYING b/vendor/wikimedia/cdb/COPYING index 019694a9..d159169d 100644 --- a/vendor/wikimedia/cdb/COPYING +++ b/vendor/wikimedia/cdb/COPYING @@ -1,65 +1,65 @@ -== GNU GENERAL PUBLIC LICENSE == + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 -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. -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 -=== Preamble === - -The licenses for most software are designed to take away your + 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 Library General Public License instead.) You can apply it to +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 + 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 + 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 + 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 + 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 + 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 + 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 + The precise terms and conditions for copying, distribution and modification follow. -== TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION == + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION -'''0.''' This License applies to any program or other work which contains + 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" @@ -76,7 +76,7 @@ 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 + 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 @@ -87,29 +87,29 @@ 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 + 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.) + 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, @@ -131,26 +131,26 @@ 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, + 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, + 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, + 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.) + 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 @@ -169,7 +169,7 @@ 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 + 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. @@ -177,7 +177,7 @@ 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 + 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 @@ -186,7 +186,7 @@ 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 + 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 @@ -194,7 +194,7 @@ 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 + 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 @@ -226,7 +226,7 @@ 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 + 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 @@ -234,7 +234,7 @@ 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 + 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. @@ -247,7 +247,7 @@ 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 + 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 @@ -255,9 +255,9 @@ 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 === + NO WARRANTY -'''11.''' BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS 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 @@ -267,7 +267,7 @@ 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 + 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 @@ -277,47 +277,45 @@ 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''' + END OF TERMS AND CONDITIONS -== How to Apply These Terms to Your New Programs == + How to Apply These Terms to Your New Programs -If you develop a new program, and you want it to be of the greatest + 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 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> + <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 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 + 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. + 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 @@ -328,15 +326,14 @@ 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 + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. - Ty Coon, President of Vice + <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 Library General +library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. diff --git a/vendor/wikimedia/cdb/Doxyfile b/vendor/wikimedia/cdb/Doxyfile deleted file mode 100644 index e77e75ae..00000000 --- a/vendor/wikimedia/cdb/Doxyfile +++ /dev/null @@ -1,32 +0,0 @@ -# Configuration file for Doxygen - -PROJECT_NAME = CDB -PROJECT_BRIEF = CDB functions for PHP - -OUTPUT_DIRECTORY = doc - -JAVADOC_AUTOBRIEF = YES -QT_AUTOBRIEF = YES - -WARN_NO_PARAMDOC = YES - -INPUT = README.md src/ -FILE_PATTERNS = *.php -RECURSIVE = YES -# Requires doxygen 1.8.3+ -USE_MDFILE_AS_MAINPAGE = README.md - -HTML_DYNAMIC_SECTIONS = YES -GENERATE_TREEVIEW = YES -TREEVIEW_WIDTH = 250 - -GENERATE_LATEX = NO - -HAVE_DOT = YES -DOT_FONTNAME = Helvetica -DOT_FONTSIZE = 10 -TEMPLATE_RELATIONS = YES -CALL_GRAPH = NO -CALLER_GRAPH = NO -# Makes dot run faster. Requires graphviz >1.8.10 -DOT_MULTI_TARGETS = YES diff --git a/vendor/wikimedia/cdb/README.md b/vendor/wikimedia/cdb/README.md index e4ef4498..02c1b94c 100644 --- a/vendor/wikimedia/cdb/README.md +++ b/vendor/wikimedia/cdb/README.md @@ -1,4 +1,4 @@ -[](https://packagist.org/packages/cdb/cdb) [](https://packagist.org/packages/cdb/cdb) +[![Latest Stable Version]](https://packagist.org/packages/wikimedia/cdb) [![License]](https://packagist.org/packages/wikimedia/cdb) CDB functions for PHP ===================== @@ -9,30 +9,28 @@ 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). +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' ); + // 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 ); -// Writing to a CDB file -$cdb = \Cdb\Writer::open( 'anotherdb.cdb' ); -$cdb->set( 'somekey', $foo ); -``` Running tests ------------- -``` -composer install --prefer-dist -cd test -../vendor/phpunit/phpunit/phpunit . -``` + composer install --prefer-dist + composer test + History ------- @@ -41,8 +39,11 @@ 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/vendor/wikimedia/cdb/composer.json b/vendor/wikimedia/cdb/composer.json deleted file mode 100644 index 2134d2f7..00000000 --- a/vendor/wikimedia/cdb/composer.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "name": "wikimedia/cdb", - "description": "Constant Database (CDB) wrapper library for PHP. Provides pure-PHP fallback when dba_* functions are absent.", - "license": "GPL-2.0", - "homepage": "https://www.mediawiki.org/wiki/CDB", - "authors": [ - { - "name": "Tim Starling", - "email": "tstarling@wikimedia.org" - }, - { - "name": "Chad Horohoe", - "email": "chad@wikimedia.org" - } - ], - "minimum-stability": "dev", - "require": { - "php": ">=5.3.2" - }, - "require-dev": { - "phpunit/phpunit": "*" - }, - "autoload": { - "classmap": ["src/"] - } -} diff --git a/vendor/wikimedia/cdb/doc/README b/vendor/wikimedia/cdb/doc/README deleted file mode 100644 index 15ee3b71..00000000 --- a/vendor/wikimedia/cdb/doc/README +++ /dev/null @@ -1 +0,0 @@ -Placeholder for doxygen documentation diff --git a/vendor/wikimedia/cdb/src/Reader.php b/vendor/wikimedia/cdb/src/Reader.php index 2df06ab3..b1aaa022 100644 --- a/vendor/wikimedia/cdb/src/Reader.php +++ b/vendor/wikimedia/cdb/src/Reader.php @@ -82,4 +82,21 @@ abstract class Reader { * @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/vendor/wikimedia/cdb/src/Reader/DBA.php b/vendor/wikimedia/cdb/src/Reader/DBA.php index 838bf6e0..62f1ad99 100644 --- a/vendor/wikimedia/cdb/src/Reader/DBA.php +++ b/vendor/wikimedia/cdb/src/Reader/DBA.php @@ -1,6 +1,7 @@ <?php namespace Cdb\Reader; + use Cdb\Exception; use Cdb\Reader; @@ -46,4 +47,16 @@ class DBA extends Reader { 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/vendor/wikimedia/cdb/src/Reader/PHP.php b/vendor/wikimedia/cdb/src/Reader/PHP.php index 57b7d8ca..0f0d36ef 100644 --- a/vendor/wikimedia/cdb/src/Reader/PHP.php +++ b/vendor/wikimedia/cdb/src/Reader/PHP.php @@ -1,16 +1,14 @@ <?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. Changes are: - * * Error returns replaced with exceptions - * * Exception thrown if sizes or offsets are between 2GB and 4GB - * * Some variables renamed + * 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 @@ -34,33 +32,37 @@ use Cdb\Util; * CDB reader class */ class PHP extends Reader { - /** The filename */ + + /** @var string The file name of the CDB file. **/ protected $fileName; - /* number of hash slots searched under this key */ - protected $loop; + /** @var string First 2048b of CDB file, containing the hash table. **/ + protected $hashTable; - /* initialized if loop is nonzero */ - protected $khash; + /** @var int Offset in file where value of found key starts. **/ + protected $dataPos; - /* initialized if loop is nonzero */ - protected $kpos; + /** @var int Byte length of found key's value. **/ + protected $dataLen; - /* initialized if loop is nonzero */ - protected $hpos; + /** @var int File position indicator when iterating over keys. **/ + protected $keyIterPos = 2048; - /* initialized if loop is nonzero */ - protected $hslots; + /** @var string Read buffer for CDB file. **/ + protected $buf; - /* initialized if findNext() returns true */ - protected $dpos; + /** @var int File offset where read buffer starts. **/ + protected $bufStart; - /* initialized if cdb_findnext() returns 1 */ - protected $dlen; + /** @var int File handle position indicator **/ + protected $filePos = 2048; /** + * Constructor. + * * @param string $fileName - * @throws Exception + * @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; @@ -68,9 +70,15 @@ class PHP extends Reader { if ( !$this->handle ) { throw new Exception( 'Unable to open CDB file "' . $this->fileName . '".' ); } - $this->findStart(); + $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 ); @@ -79,127 +87,180 @@ class PHP extends Reader { } /** + * Get the value of a key. + * * @param mixed $key - * @return bool|string + * @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->dlen, $this->dpos ); + return $this->read( $this->dataPos, $this->dataLen ); } return false; } /** - * @param string $key - * @param int $pos - * @return bool + * 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 match( $key, $pos ) { - $buf = $this->read( strlen( $key ), $pos ); + protected function read( $start, $len ) { + $end = $start + $len; - return $buf === $key; - } + // The first 2048 bytes are the lookup table, which is read into + // memory on initialization. + if ( $end <= 2048 ) { + return substr( $this->hashTable, $start, $len ); + } - protected function findStart() { - $this->loop = 0; - } + // 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; + } - /** - * @throws Exception - * @param int $length - * @param int $pos - * @return string - */ - protected function read( $length, $pos ) { - if ( fseek( $this->handle, $pos ) == -1 ) { - // This can easily happen if the internal pointers are incorrect - throw new Exception( - 'Seek failed, file "' . $this->fileName . '" may be corrupted.' ); + 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.' ); + } } - if ( $length == 0 ) { - return ''; + $buf = fread( $this->handle, max( $len, 1024 ) ); + if ( $buf === false ) { + $buf = ''; } - $buf = fread( $this->handle, $length ); - if ( $buf === false || strlen( $buf ) !== $length ) { + $bytes .= substr( $buf, 0, $len ); + if ( strlen( $bytes ) !== $len + $bytesRead ) { throw new Exception( 'Read from CDB file failed, file "' . $this->fileName . '" may be corrupted.' ); } - return $buf; + $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 string $s - * @throws Exception - * @return mixed + * 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 unpack31( $s ) { - $data = unpack( 'V', $s ); - if ( $data[1] > 0x7fffffff ) { + 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 $data[1]; + return $uint31; } /** - * Unpack a 32-bit signed integer - * @param string $s + * Unpack a 32-bit integer. + * + * @param int $pos * @return int */ - protected function unpackSigned( $s ) { - $data = unpack( 'va/vb', $s ); + protected function readInt32( $pos = 0 ) { + static $lookups; + + if ( !$lookups ) { + $lookups = array(); + for ( $i = 1; $i < 256; $i++ ) { + $lookups[ chr( $i ) ] = $i; + } + } - return $data['a'] | ( $data['b'] << 16 ); + $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 + * @return bool Whether the key was found. */ - protected function findNext( $key ) { - if ( !$this->loop ) { - $u = Util::hash( $key ); - $buf = $this->read( 8, ( $u << 3 ) & 2047 ); - $this->hslots = $this->unpack31( substr( $buf, 4 ) ); - if ( !$this->hslots ) { - return false; - } - $this->hpos = $this->unpack31( substr( $buf, 0, 4 ) ); - $this->khash = $u; - $u = Util::unsignedShiftRight( $u, 8 ); - $u = Util::unsignedMod( $u, $this->hslots ); - $u <<= 3; - $this->kpos = $this->hpos + $u; - } + protected function find( $key ) { + $keyLen = strlen( $key ); - while ( $this->loop < $this->hslots ) { - $buf = $this->read( 8, $this->kpos ); - $pos = $this->unpack31( substr( $buf, 4 ) ); + $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; } - $this->loop += 1; - $this->kpos += 8; - if ( $this->kpos == $this->hpos + ( $this->hslots << 3 ) ) { - $this->kpos = $this->hpos; + $keyPos += 8; + if ( $keyPos == $hashPos + ( $hashSlots << 3 ) ) { + $keyPos = $hashPos; } - $u = $this->unpackSigned( substr( $buf, 0, 4 ) ); - if ( $u === $this->khash ) { - $buf = $this->read( 8, $pos ); - $keyLen = $this->unpack31( substr( $buf, 0, 4 ) ); - if ( $keyLen == strlen( $key ) && $this->match( $key, $pos + 8 ) ) { - // Found - $this->dlen = $this->unpack31( substr( $buf, 4 ) ); - $this->dpos = $pos + 8 + $keyLen; - - return true; + 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; + } } } } @@ -208,13 +269,36 @@ class PHP extends Reader { } /** - * @param mixed $key - * @return bool + * Check if a key exists in the CDB file. + * + * @param string $key + * @return bool Whether the key exists. */ - protected function find( $key ) { - $this->findStart(); + 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 $this->findNext( $key ); + return $key; } } - diff --git a/vendor/wikimedia/cdb/src/Writer.php b/vendor/wikimedia/cdb/src/Writer.php index b994ec67..53216041 100644 --- a/vendor/wikimedia/cdb/src/Writer.php +++ b/vendor/wikimedia/cdb/src/Writer.php @@ -94,6 +94,6 @@ abstract class Writer { * @return bool */ protected function isWindows() { - return substr( php_uname(), 0, 7 ) == 'Windows'; + return strtoupper( substr( PHP_OS, 0, 3 ) ) === 'WIN'; } } diff --git a/vendor/wikimedia/cdb/src/Writer/DBA.php b/vendor/wikimedia/cdb/src/Writer/DBA.php index eb525f4c..20d0adfb 100644 --- a/vendor/wikimedia/cdb/src/Writer/DBA.php +++ b/vendor/wikimedia/cdb/src/Writer/DBA.php @@ -1,6 +1,7 @@ <?php namespace Cdb\Writer; + use Cdb\Exception; use Cdb\Writer; diff --git a/vendor/wikimedia/cdb/src/Writer/PHP.php b/vendor/wikimedia/cdb/src/Writer/PHP.php index 68c6b760..4676b5e4 100644 --- a/vendor/wikimedia/cdb/src/Writer/PHP.php +++ b/vendor/wikimedia/cdb/src/Writer/PHP.php @@ -1,6 +1,7 @@ <?php namespace Cdb\Writer; + use Cdb\Exception; use Cdb\Util; use Cdb\Writer; diff --git a/vendor/wikimedia/cdb/test/CdbTest.php b/vendor/wikimedia/cdb/test/CdbTest.php deleted file mode 100644 index 920fc111..00000000 --- a/vendor/wikimedia/cdb/test/CdbTest.php +++ /dev/null @@ -1,95 +0,0 @@ -<?php - -namespace Cdb\Test; -use Cdb\Reader; -use Cdb\Writer; - -/** - * Test the CDB reader/writer - * @covers Cdb\Writer\PHP - * @covers Cdb\Writer\DBA - */ -class CdbTest extends \PHPUnit_Framework_TestCase { - /** @var string */ - private $phpCdbFile, $dbaCdbFile; - - protected function setUp() { - parent::setUp(); - if ( !Reader::haveExtension() ) { - $this->markTestSkipped( 'Native CDB support is not available.' ); - } - $temp = sys_get_temp_dir(); - if ( !is_writable( $temp ) ) { - $this->markTestSkipped( "Temp dir [$temp] isn't writable." ); - } - $this->phpCdbFile = tempnam( $temp, get_class( $this ) . '_' ); - $this->dbaCdbFile = tempnam( $temp, get_class( $this ) . '_' ); - } - - /** - * Make a random-ish string - * @return string - */ - private static function randomString() { - $len = mt_rand( 0, 10 ); - $s = ''; - for ( $j = 0; $j < $len; $j++ ) { - $s .= chr( mt_rand( 0, 255 ) ); - } - - return $s; - } - - public function testCdbWrite() { - $w1 = new Writer\PHP( $this->phpCdbFile ); - $w2 = new Writer\DBA( $this->dbaCdbFile ); - - $data = array(); - for ( $i = 0; $i < 1000; $i++ ) { - $key = self::randomString(); - $value = self::randomString(); - $w1->set( $key, $value ); - $w2->set( $key, $value ); - - if ( !isset( $data[$key] ) ) { - $data[$key] = $value; - } - } - - $w1->close(); - $w2->close(); - - $this->assertEquals( - md5_file( $this->phpCdbFile ), - md5_file( $this->dbaCdbFile ), - 'same hash' - ); - - $r1 = new Reader\PHP( $this->phpCdbFile ); - $r2 = new Reader\DBA( $this->dbaCdbFile ); - - foreach ( $data as $key => $value ) { - if ( $key === '' ) { - // Known bug - continue; - } - $v1 = $r1->get( $key ); - $v2 = $r2->get( $key ); - - $v1 = $v1 === false ? '(not found)' : $v1; - $v2 = $v2 === false ? '(not found)' : $v2; - - # cdbAssert( 'Mismatch', $key, $v1, $v2 ); - $this->cdbAssert( "PHP error", $key, $v1, $value ); - $this->cdbAssert( "DBA error", $key, $v2, $value ); - } - } - - private function cdbAssert( $msg, $key, $v1, $v2 ) { - $this->assertEquals( - $v2, - $v1, - $msg . ', k=' . bin2hex( $key ) - ); - } -} |