mirror of
https://github.com/python/cpython.git
synced 2026-03-20 03:41:06 +00:00
Merged revisions 51434-53004 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r51434 | neal.norwitz | 2006-08-21 20:20:10 +0200 (Mon, 21 Aug 2006) | 1 line Fix a couple of ssize-t issues reported by Alexander Belopolsky on python-dev ........ r51439 | neal.norwitz | 2006-08-21 21:47:08 +0200 (Mon, 21 Aug 2006) | 6 lines Patch #1542451: disallow continue anywhere under a finally I'm undecided if this should be backported to 2.5 or 2.5.1. Armin suggested to wait (I'm of the same opinion). Thomas W thinks it's fine to go in 2.5. ........ r51443 | neal.norwitz | 2006-08-21 22:16:24 +0200 (Mon, 21 Aug 2006) | 4 lines Handle a few more error conditions. Klocwork 301 and 302. Will backport. ........ r51450 | neal.norwitz | 2006-08-22 00:21:19 +0200 (Tue, 22 Aug 2006) | 5 lines Patch #1541585: fix buffer overrun when performing repr() on a unicode string in a build with wide unicode (UCS-4) support. This code could be improved, so add an XXX comment. ........ r51456 | neal.norwitz | 2006-08-22 01:44:48 +0200 (Tue, 22 Aug 2006) | 1 line Try to get the windows bots working again with the new peephole.c ........ r51461 | anthony.baxter | 2006-08-22 09:36:59 +0200 (Tue, 22 Aug 2006) | 1 line patch for documentation for recent uuid changes (from ping) ........ r51473 | neal.norwitz | 2006-08-22 15:56:56 +0200 (Tue, 22 Aug 2006) | 1 line Alexander Belopolsky pointed out that pos is a size_t ........ r51489 | jeremy.hylton | 2006-08-22 22:46:00 +0200 (Tue, 22 Aug 2006) | 2 lines Expose column offset information in parse trees. ........ r51497 | andrew.kuchling | 2006-08-23 01:13:43 +0200 (Wed, 23 Aug 2006) | 1 line Move functional howto into trunk ........ r51515 | jeremy.hylton | 2006-08-23 20:37:43 +0200 (Wed, 23 Aug 2006) | 2 lines Baby steps towards better tests for tokenize ........ r51525 | alex.martelli | 2006-08-23 22:42:02 +0200 (Wed, 23 Aug 2006) | 6 lines x**2 should about equal x*x (including for a float x such that the result is inf) but didn't; added a test to test_float to verify that, and ignored the ERANGE value for errno in the pow operation to make the new test pass (with help from Marilyn Davis at the Google Python Sprint -- thanks!). ........ r51526 | jeremy.hylton | 2006-08-23 23:14:03 +0200 (Wed, 23 Aug 2006) | 20 lines Bug fixes large and small for tokenize. Small: Always generate a NL or NEWLINE token following a COMMENT token. The old code did not generate an NL token if the comment was on a line by itself. Large: The output of untokenize() will now match the input exactly if it is passed the full token sequence. The old, crufty output is still generated if a limited input sequence is provided, where limited means that it does not include position information for tokens. Remaining bug: There is no CONTINUATION token (\) so there is no way for untokenize() to handle such code. Also, expanded the number of doctests in hopes of eventually removing the old-style tests that compare against a golden file. Bug fix candidate for Python 2.5.1. (Sigh.) ........ r51527 | jeremy.hylton | 2006-08-23 23:26:46 +0200 (Wed, 23 Aug 2006) | 5 lines Replace dead code with an assert. Now that COMMENT tokens are reliably followed by NL or NEWLINE, there is never a need to add extra newlines in untokenize. ........ r51530 | alex.martelli | 2006-08-24 00:17:59 +0200 (Thu, 24 Aug 2006) | 7 lines Reverting the patch that tried to fix the issue whereby x**2 raises OverflowError while x*x succeeds and produces infinity; apparently these inconsistencies cannot be fixed across ``all'' platforms and there's a widespread feeling that therefore ``every'' platform should keep suffering forevermore. Ah well. ........ r51565 | thomas.wouters | 2006-08-24 20:40:20 +0200 (Thu, 24 Aug 2006) | 6 lines Fix SF bug #1545837: array.array borks on deepcopy. array.__deepcopy__() needs to take an argument, even if it doesn't actually use it. Will backport to 2.5 and 2.4 (if applicable.) ........ r51580 | martin.v.loewis | 2006-08-25 02:03:34 +0200 (Fri, 25 Aug 2006) | 3 lines Patch #1545507: Exclude ctypes package in Win64 MSI file. Will backport to 2.5. ........ r51589 | neal.norwitz | 2006-08-25 03:52:49 +0200 (Fri, 25 Aug 2006) | 1 line importing types is not necessary if we use isinstance ........ r51604 | thomas.heller | 2006-08-25 09:27:33 +0200 (Fri, 25 Aug 2006) | 3 lines Port _ctypes.pyd to win64 on AMD64. ........ r51605 | thomas.heller | 2006-08-25 09:34:51 +0200 (Fri, 25 Aug 2006) | 3 lines Add missing file for _ctypes.pyd port to win64 on AMD64. ........ r51606 | thomas.heller | 2006-08-25 11:26:33 +0200 (Fri, 25 Aug 2006) | 6 lines Build _ctypes.pyd for win AMD64 into the MSVC project file. Since MSVC doesn't know about .asm files, a helper batch file is needed to find ml64.exe in predefined locations. The helper script hardcodes the path to the MS Platform SDK. ........ r51608 | armin.rigo | 2006-08-25 14:44:28 +0200 (Fri, 25 Aug 2006) | 4 lines The regular expression engine in '_sre' can segfault when interpreting bogus bytecode. It is unclear whether this is a real bug or a "won't fix" case like bogus_code_obj.py. ........ r51617 | tim.peters | 2006-08-26 00:05:39 +0200 (Sat, 26 Aug 2006) | 2 lines Whitespace normalization. ........ r51618 | tim.peters | 2006-08-26 00:06:44 +0200 (Sat, 26 Aug 2006) | 2 lines Add missing svn:eol-style property to text files. ........ r51619 | tim.peters | 2006-08-26 00:26:21 +0200 (Sat, 26 Aug 2006) | 3 lines A new test here relied on preserving invisible trailing whitespace in expected output. Stop that. ........ r51624 | jack.diederich | 2006-08-26 20:42:06 +0200 (Sat, 26 Aug 2006) | 4 lines - Move functions common to all path modules into genericpath.py and have the OS speicifc path modules import them. - Have os2emxpath import common functions fron ntpath instead of using copies ........ r51642 | neal.norwitz | 2006-08-29 07:40:58 +0200 (Tue, 29 Aug 2006) | 1 line Fix a couple of typos. ........ r51647 | marc-andre.lemburg | 2006-08-29 12:34:12 +0200 (Tue, 29 Aug 2006) | 5 lines Fix a buglet in the error reporting (SF bug report #1546372). This should probably go into Python 2.5 or 2.5.1 as well. ........ r51663 | armin.rigo | 2006-08-31 10:51:06 +0200 (Thu, 31 Aug 2006) | 3 lines Doc fix: hashlib objects don't always return a digest of 16 bytes. Backport candidate for 2.5. ........ r51664 | nick.coghlan | 2006-08-31 14:00:43 +0200 (Thu, 31 Aug 2006) | 1 line Fix the wrongheaded implementation of context management in the decimal module and add unit tests. (python-dev discussion is ongoing regarding what we do about Python 2.5) ........ r51665 | nick.coghlan | 2006-08-31 14:51:25 +0200 (Thu, 31 Aug 2006) | 1 line Remove the old decimal context management tests from test_contextlib (guess who didn't run the test suite before committing...) ........ r51669 | brett.cannon | 2006-08-31 20:54:26 +0200 (Thu, 31 Aug 2006) | 4 lines Make sure memory is properly cleaned up in file_init. Backport candidate. ........ r51671 | brett.cannon | 2006-08-31 23:47:52 +0200 (Thu, 31 Aug 2006) | 2 lines Fix comment about indentation level in C files. ........ r51674 | brett.cannon | 2006-09-01 00:42:37 +0200 (Fri, 01 Sep 2006) | 3 lines Have pre-existing C files use 8 spaces indents (to match old PEP 7 style), but have all new files use 4 spaces (to match current PEP 7 style). ........ r51676 | fred.drake | 2006-09-01 05:57:19 +0200 (Fri, 01 Sep 2006) | 3 lines - SF patch #1550263: Enhance and correct unittest docs - various minor cleanups for improved consistency ........ r51677 | georg.brandl | 2006-09-02 00:30:52 +0200 (Sat, 02 Sep 2006) | 2 lines evalfile() should be execfile(). ........ r51681 | neal.norwitz | 2006-09-02 04:43:17 +0200 (Sat, 02 Sep 2006) | 1 line SF #1547931, fix typo (missing and). Will backport to 2.5 ........ r51683 | neal.norwitz | 2006-09-02 04:50:35 +0200 (Sat, 02 Sep 2006) | 1 line Bug #1548092: fix curses.tparm seg fault on invalid input. Needs backport to 2.5.1 and earlier. ........ r51684 | neal.norwitz | 2006-09-02 04:58:13 +0200 (Sat, 02 Sep 2006) | 4 lines Bug #1550714: fix SystemError from itertools.tee on negative value for n. Needs backport to 2.5.1 and earlier. ........ r51685 | nick.coghlan | 2006-09-02 05:54:17 +0200 (Sat, 02 Sep 2006) | 1 line Make decimal.ContextManager a private implementation detail of decimal.localcontext() ........ r51686 | nick.coghlan | 2006-09-02 06:04:18 +0200 (Sat, 02 Sep 2006) | 1 line Further corrections to the decimal module context management documentation ........ r51688 | raymond.hettinger | 2006-09-02 19:07:23 +0200 (Sat, 02 Sep 2006) | 1 line Fix documentation nits for decimal context managers. ........ r51690 | neal.norwitz | 2006-09-02 20:51:34 +0200 (Sat, 02 Sep 2006) | 1 line Add missing word in comment ........ r51691 | neal.norwitz | 2006-09-02 21:40:19 +0200 (Sat, 02 Sep 2006) | 7 lines Hmm, this test has failed at least twice recently on the OpenBSD and Debian sparc buildbots. Since this goes through a lot of tests and hits the disk a lot it could be slow (especially if NFS is involved). I'm not sure if that's the problem, but printing periodic msgs shouldn't hurt. The code was stolen from test_compiler. ........ r51693 | nick.coghlan | 2006-09-03 03:02:00 +0200 (Sun, 03 Sep 2006) | 1 line Fix final documentation nits before backporting decimal module fixes to 2.5 ........ r51694 | nick.coghlan | 2006-09-03 03:06:07 +0200 (Sun, 03 Sep 2006) | 1 line Typo fix for decimal docs ........ r51697 | nick.coghlan | 2006-09-03 03:20:46 +0200 (Sun, 03 Sep 2006) | 1 line NEWS entry on trunk for decimal module changes ........ r51704 | raymond.hettinger | 2006-09-04 17:32:48 +0200 (Mon, 04 Sep 2006) | 1 line Fix endcase for str.rpartition() ........ r51716 | tim.peters | 2006-09-05 04:18:09 +0200 (Tue, 05 Sep 2006) | 12 lines "Conceptual" merge of rev 51711 from the 2.5 branch. i_divmod(): As discussed on Python-Dev, changed the overflow checking to live happily with recent gcc optimizations that assume signed integer arithmetic never overflows. This differs from the corresponding change on the 2.5 and 2.4 branches, using a less obscure approach, but one that /may/ tickle platform idiocies in their definitions of LONG_MIN. The 2.4 + 2.5 change avoided introducing a dependence on LONG_MIN, at the cost of substantially goofier code. ........ r51717 | tim.peters | 2006-09-05 04:21:19 +0200 (Tue, 05 Sep 2006) | 2 lines Whitespace normalization. ........ r51719 | tim.peters | 2006-09-05 04:22:17 +0200 (Tue, 05 Sep 2006) | 2 lines Add missing svn:eol-style property to text files. ........ r51720 | neal.norwitz | 2006-09-05 04:24:03 +0200 (Tue, 05 Sep 2006) | 2 lines Fix SF bug #1546288, crash in dict_equal. ........ r51721 | neal.norwitz | 2006-09-05 04:25:41 +0200 (Tue, 05 Sep 2006) | 1 line Fix SF #1552093, eval docstring typo (3 ps in mapping) ........ r51724 | neal.norwitz | 2006-09-05 04:35:08 +0200 (Tue, 05 Sep 2006) | 1 line This was found by Guido AFAIK on p3yk (sic) branch. ........ r51725 | neal.norwitz | 2006-09-05 04:36:20 +0200 (Tue, 05 Sep 2006) | 1 line Add a NEWS entry for str.rpartition() change ........ r51728 | neal.norwitz | 2006-09-05 04:57:01 +0200 (Tue, 05 Sep 2006) | 1 line Patch #1540470, for OpenBSD 4.0. Backport candidate for 2.[34]. ........ r51729 | neal.norwitz | 2006-09-05 05:53:08 +0200 (Tue, 05 Sep 2006) | 12 lines Bug #1520864 (again): unpacking singleton tuples in list comprehensions and generator expressions (x for x, in ... ) works again. Sigh, I only fixed for loops the first time, not list comps and genexprs too. I couldn't find any more unpacking cases where there is a similar bug lurking. This code should be refactored to eliminate the duplication. I'm sure the listcomp/genexpr code can be refactored. I'm not sure if the for loop can re-use any of the same code though. Will backport to 2.5 (the only place it matters). ........ r51731 | neal.norwitz | 2006-09-05 05:58:26 +0200 (Tue, 05 Sep 2006) | 1 line Add a comment about some refactoring. (There's probably more that should be done.) I will reformat this file in the next checkin due to the inconsistent tabs/spaces. ........ r51732 | neal.norwitz | 2006-09-05 06:00:12 +0200 (Tue, 05 Sep 2006) | 1 line M-x untabify ........ r51737 | hyeshik.chang | 2006-09-05 14:07:09 +0200 (Tue, 05 Sep 2006) | 7 lines Fix a few bugs on cjkcodecs found by Oren Tirosh: - gbk and gb18030 codec now handle U+30FB KATAKANA MIDDLE DOT correctly. - iso2022_jp_2 codec now encodes into G0 for KS X 1001, GB2312 codepoints to conform the standard. - iso2022_jp_3 and iso2022_jp_2004 codec can encode JIS X 2013:2 codepoints now. ........ r51738 | hyeshik.chang | 2006-09-05 14:14:57 +0200 (Tue, 05 Sep 2006) | 2 lines Fix a typo: 2013 -> 0213 ........ r51740 | georg.brandl | 2006-09-05 14:44:58 +0200 (Tue, 05 Sep 2006) | 3 lines Bug #1552618: change docs of dict.has_key() to reflect recommendation to use "in". ........ r51742 | andrew.kuchling | 2006-09-05 15:02:40 +0200 (Tue, 05 Sep 2006) | 1 line Rearrange example a bit, and show rpartition() when separator is not found ........ r51744 | andrew.kuchling | 2006-09-05 15:15:41 +0200 (Tue, 05 Sep 2006) | 1 line [Bug #1525469] SimpleXMLRPCServer still uses the sys.exc_{value,type} module-level globals instead of calling sys.exc_info(). Reported by Russell Warren ........ r51745 | andrew.kuchling | 2006-09-05 15:19:18 +0200 (Tue, 05 Sep 2006) | 3 lines [Bug #1526834] Fix crash in pdb when you do 'b f('; the function name was placed into a regex pattern and the unbalanced paren caused re.compile() to report an error ........ r51751 | kristjan.jonsson | 2006-09-05 19:58:12 +0200 (Tue, 05 Sep 2006) | 6 lines Update the PCBuild8 solution. Facilitate cross-compilation by having binaries in separate Win32 and x64 directories. Rationalized configs by making proper use of platforms/configurations. Remove pythoncore_pgo project. Add new PGIRelease and PGORelease configurations to perform Profile Guided Optimisation. Removed I64 support, but this can be easily added by copying the x64 platform settings. ........ r51758 | gustavo.niemeyer | 2006-09-06 03:58:52 +0200 (Wed, 06 Sep 2006) | 3 lines Fixing #1531862: Do not close standard file descriptors in the subprocess module. ........ r51760 | neal.norwitz | 2006-09-06 05:58:34 +0200 (Wed, 06 Sep 2006) | 1 line Revert 51758 because it broke all the buildbots ........ r51762 | georg.brandl | 2006-09-06 08:03:59 +0200 (Wed, 06 Sep 2006) | 3 lines Bug #1551427: fix a wrong NULL pointer check in the win32 version of os.urandom(). ........ r51765 | georg.brandl | 2006-09-06 08:09:31 +0200 (Wed, 06 Sep 2006) | 3 lines Bug #1550983: emit better error messages for erroneous relative imports (if not in package and if beyond toplevel package). ........ r51767 | neal.norwitz | 2006-09-06 08:28:06 +0200 (Wed, 06 Sep 2006) | 1 line with and as are now keywords. There are some generated files I can't recreate. ........ r51770 | georg.brandl | 2006-09-06 08:50:05 +0200 (Wed, 06 Sep 2006) | 5 lines Bug #1542051: Exceptions now correctly call PyObject_GC_UnTrack. Also make sure that every exception class has __module__ set to 'exceptions'. ........ r51785 | georg.brandl | 2006-09-06 22:05:58 +0200 (Wed, 06 Sep 2006) | 2 lines Fix missing import of the types module in logging.config. ........ r51789 | marc-andre.lemburg | 2006-09-06 22:40:22 +0200 (Wed, 06 Sep 2006) | 3 lines Add news item for bug fix of SF bug report #1546372. ........ r51797 | gustavo.niemeyer | 2006-09-07 02:48:33 +0200 (Thu, 07 Sep 2006) | 3 lines Fixed subprocess bug #1531862 again, after removing tests offending buildbot ........ r51798 | raymond.hettinger | 2006-09-07 04:42:48 +0200 (Thu, 07 Sep 2006) | 1 line Fix refcounts and add error checks. ........ r51803 | nick.coghlan | 2006-09-07 12:50:34 +0200 (Thu, 07 Sep 2006) | 1 line Fix the speed regression in inspect.py by adding another cache to speed up getmodule(). Patch #1553314 ........ r51805 | ronald.oussoren | 2006-09-07 14:03:10 +0200 (Thu, 07 Sep 2006) | 2 lines Fix a glaring error and update some version numbers. ........ r51814 | andrew.kuchling | 2006-09-07 15:56:23 +0200 (Thu, 07 Sep 2006) | 1 line Typo fix ........ r51815 | andrew.kuchling | 2006-09-07 15:59:38 +0200 (Thu, 07 Sep 2006) | 8 lines [Bug #1552726] Avoid repeatedly polling in interactive mode -- only put a timeout on the select() if an input hook has been defined. Patch by Richard Boulton. This select() code is only executed with readline 2.1, or if READLINE_CALLBACKS is defined. Backport candidate for 2.5, 2.4, probably earlier versions too. ........ r51816 | armin.rigo | 2006-09-07 17:06:00 +0200 (Thu, 07 Sep 2006) | 2 lines Add a warning notice on top of the generated grammar.txt. ........ r51819 | thomas.heller | 2006-09-07 20:56:28 +0200 (Thu, 07 Sep 2006) | 5 lines Anonymous structure fields that have a bit-width specified did not work, and they gave a strange error message from PyArg_ParseTuple: function takes exactly 2 arguments (3 given). With tests. ........ r51820 | thomas.heller | 2006-09-07 21:09:54 +0200 (Thu, 07 Sep 2006) | 4 lines The cast function did not accept c_char_p or c_wchar_p instances as first argument, and failed with a 'bad argument to internal function' error message. ........ r51827 | nick.coghlan | 2006-09-08 12:04:38 +0200 (Fri, 08 Sep 2006) | 1 line Add missing NEWS entry for rev 51803 ........ r51828 | andrew.kuchling | 2006-09-08 15:25:23 +0200 (Fri, 08 Sep 2006) | 1 line Add missing word ........ r51829 | andrew.kuchling | 2006-09-08 15:35:49 +0200 (Fri, 08 Sep 2006) | 1 line Explain SQLite a bit more clearly ........ r51830 | andrew.kuchling | 2006-09-08 15:36:36 +0200 (Fri, 08 Sep 2006) | 1 line Explain SQLite a bit more clearly ........ r51832 | andrew.kuchling | 2006-09-08 16:02:45 +0200 (Fri, 08 Sep 2006) | 1 line Use native SQLite types ........ r51833 | andrew.kuchling | 2006-09-08 16:03:01 +0200 (Fri, 08 Sep 2006) | 1 line Use native SQLite types ........ r51835 | andrew.kuchling | 2006-09-08 16:05:10 +0200 (Fri, 08 Sep 2006) | 1 line Fix typo in example ........ r51837 | brett.cannon | 2006-09-09 09:11:46 +0200 (Sat, 09 Sep 2006) | 6 lines Remove the __unicode__ method from exceptions. Allows unicode() to be called on exception classes. Would require introducing a tp_unicode slot to make it work otherwise. Fixes bug #1551432 and will be backported. ........ r51854 | neal.norwitz | 2006-09-11 06:24:09 +0200 (Mon, 11 Sep 2006) | 8 lines Forward port of 51850 from release25-maint branch. As mentioned on python-dev, reverting patch #1504333 because it introduced an infinite loop in rev 47154. This patch also adds a test to prevent the regression. ........ r51855 | neal.norwitz | 2006-09-11 06:28:16 +0200 (Mon, 11 Sep 2006) | 5 lines Properly handle a NULL returned from PyArena_New(). (Also fix some whitespace) Klocwork #364. ........ r51856 | neal.norwitz | 2006-09-11 06:32:57 +0200 (Mon, 11 Sep 2006) | 1 line Add a "crasher" taken from the sgml bug report referenced in the comment ........ r51858 | georg.brandl | 2006-09-11 11:38:35 +0200 (Mon, 11 Sep 2006) | 12 lines Forward-port of rev. 51857: Building with HP's cc on HP-UX turned up a couple of problems. _PyGILState_NoteThreadState was declared as static inconsistently. Make it static as it's not necessary outside of this module. Some tests failed because errno was reset to 0. (I think the tests that failed were at least: test_fcntl and test_mailbox). Ensure that errno doesn't change after a call to Py_END_ALLOW_THREADS. This only affected debug builds. ........ r51865 | martin.v.loewis | 2006-09-12 21:49:20 +0200 (Tue, 12 Sep 2006) | 2 lines Forward-port 51862: Add sgml_input.html. ........ r51866 | andrew.kuchling | 2006-09-12 22:50:23 +0200 (Tue, 12 Sep 2006) | 1 line Markup typo fix ........ r51867 | andrew.kuchling | 2006-09-12 23:09:02 +0200 (Tue, 12 Sep 2006) | 1 line Some editing, markup fixes ........ r51868 | andrew.kuchling | 2006-09-12 23:21:51 +0200 (Tue, 12 Sep 2006) | 1 line More wordsmithing ........ r51877 | andrew.kuchling | 2006-09-14 13:22:18 +0200 (Thu, 14 Sep 2006) | 1 line Make --help mention that -v can be supplied multiple times ........ r51878 | andrew.kuchling | 2006-09-14 13:28:50 +0200 (Thu, 14 Sep 2006) | 1 line Rewrite help message to remove some of the parentheticals. (There were a lot of them.) ........ r51883 | ka-ping.yee | 2006-09-15 02:34:19 +0200 (Fri, 15 Sep 2006) | 2 lines Fix grammar errors and improve clarity. ........ r51885 | georg.brandl | 2006-09-15 07:22:24 +0200 (Fri, 15 Sep 2006) | 3 lines Correct elementtree module index entry. ........ r51889 | fred.drake | 2006-09-15 17:18:04 +0200 (Fri, 15 Sep 2006) | 4 lines - fix module name in links in formatted documentation - minor markup cleanup (forward-ported from release25-maint revision 51888) ........ r51891 | fred.drake | 2006-09-15 18:11:27 +0200 (Fri, 15 Sep 2006) | 3 lines revise explanation of returns_unicode to reflect bool values and to include the default value (merged from release25-maint revision 51890) ........ r51897 | martin.v.loewis | 2006-09-16 19:36:37 +0200 (Sat, 16 Sep 2006) | 2 lines Patch #1557515: Add RLIMIT_SBSIZE. ........ r51903 | ronald.oussoren | 2006-09-17 20:42:53 +0200 (Sun, 17 Sep 2006) | 2 lines Port of revision 51902 in release25-maint to the trunk ........ r51904 | ronald.oussoren | 2006-09-17 21:23:27 +0200 (Sun, 17 Sep 2006) | 3 lines Tweak Mac/Makefile in to ensure that pythonw gets rebuild when the major version of python changes (2.5 -> 2.6). Bug #1552935. ........ r51913 | guido.van.rossum | 2006-09-18 23:36:16 +0200 (Mon, 18 Sep 2006) | 2 lines Make this thing executable. ........ r51920 | gregory.p.smith | 2006-09-19 19:35:04 +0200 (Tue, 19 Sep 2006) | 5 lines Fixes a bug with bsddb.DB.stat where the flags and txn keyword arguments are transposed. (reported by Louis Zechtzer) ..already committed to release24-maint ..needs committing to release25-maint ........ r51926 | brett.cannon | 2006-09-20 20:34:28 +0200 (Wed, 20 Sep 2006) | 3 lines Accidentally didn't commit Misc/NEWS entry on when __unicode__() was removed from exceptions. ........ r51927 | brett.cannon | 2006-09-20 20:43:13 +0200 (Wed, 20 Sep 2006) | 6 lines Allow exceptions to be directly sliced again (e.g., ``BaseException(1,2,3)[0:2]``). Discovered in Python 2.5.0 by Thomas Heller and reported to python-dev. This should be backported to 2.5 . ........ r51928 | brett.cannon | 2006-09-20 21:28:35 +0200 (Wed, 20 Sep 2006) | 2 lines Make python.vim output more deterministic. ........ r51949 | walter.doerwald | 2006-09-21 17:09:55 +0200 (Thu, 21 Sep 2006) | 2 lines Fix typo. ........ r51950 | jack.diederich | 2006-09-21 19:50:26 +0200 (Thu, 21 Sep 2006) | 5 lines * regression bug, count_next was coercing a Py_ssize_t to an unsigned Py_size_t which breaks negative counts * added test for negative numbers will backport to 2.5.1 ........ r51953 | jack.diederich | 2006-09-21 22:34:49 +0200 (Thu, 21 Sep 2006) | 1 line added itertools.count(-n) fix ........ r51971 | neal.norwitz | 2006-09-22 10:16:26 +0200 (Fri, 22 Sep 2006) | 10 lines Fix %zd string formatting on Mac OS X so it prints negative numbers. In addition to testing positive numbers, verify negative numbers work in configure. In order to avoid compiler warnings on OS X 10.4, also change the order of the check for the format character to use (PY_FORMAT_SIZE_T) in the sprintf format for Py_ssize_t. This patch changes PY_FORMAT_SIZE_T from "" to "l" if it wasn't defined at configure time. Need to verify the buildbot results. Backport candidate (if everyone thinks this patch can't be improved). ........ r51972 | neal.norwitz | 2006-09-22 10:18:10 +0200 (Fri, 22 Sep 2006) | 7 lines Bug #1557232: fix seg fault with def f((((x)))) and def f(((x),)). These tests should be improved. Hopefully this fixes variations when flipping back and forth between fpdef and fplist. Backport candidate. ........ r51975 | neal.norwitz | 2006-09-22 10:47:23 +0200 (Fri, 22 Sep 2006) | 4 lines Mostly revert this file to the same version as before. Only force setting of PY_FORMAT_SIZE_T to "l" for Mac OSX. I don't know a better define to use. This should get rid of the warnings on other platforms and Mac too. ........ r51986 | fred.drake | 2006-09-23 02:26:31 +0200 (Sat, 23 Sep 2006) | 1 line add boilerplate "What's New" document so the docs will build ........ r51987 | neal.norwitz | 2006-09-23 06:11:38 +0200 (Sat, 23 Sep 2006) | 1 line Remove extra semi-colons reported by Johnny Lee on python-dev. Backport if anyone cares. ........ r51989 | neal.norwitz | 2006-09-23 20:11:58 +0200 (Sat, 23 Sep 2006) | 1 line SF Bug #1563963, add missing word and cleanup first sentance ........ r51990 | brett.cannon | 2006-09-23 21:53:20 +0200 (Sat, 23 Sep 2006) | 3 lines Make output on test_strptime() be more verbose in face of failure. This is in hopes that more information will help debug the failing test on HPPA Ubuntu. ........ r51991 | georg.brandl | 2006-09-24 12:36:01 +0200 (Sun, 24 Sep 2006) | 2 lines Fix webbrowser.BackgroundBrowser on Windows. ........ r51993 | georg.brandl | 2006-09-24 14:35:36 +0200 (Sun, 24 Sep 2006) | 4 lines Fix a bug in the parser's future statement handling that led to "with" not being recognized as a keyword after, e.g., this statement: from __future__ import division, with_statement ........ r51995 | georg.brandl | 2006-09-24 14:50:24 +0200 (Sun, 24 Sep 2006) | 4 lines Fix a bug in traceback.format_exception_only() that led to an error being raised when print_exc() was called without an exception set. In version 2.4, this printed "None", restored that behavior. ........ r52000 | armin.rigo | 2006-09-25 17:16:26 +0200 (Mon, 25 Sep 2006) | 2 lines Another crasher. ........ r52011 | brett.cannon | 2006-09-27 01:38:24 +0200 (Wed, 27 Sep 2006) | 2 lines Make the error message for when the time data and format do not match clearer. ........ r52014 | andrew.kuchling | 2006-09-27 18:37:30 +0200 (Wed, 27 Sep 2006) | 1 line Add news item for rev. 51815 ........ r52018 | andrew.kuchling | 2006-09-27 21:23:05 +0200 (Wed, 27 Sep 2006) | 1 line Make examples do error checking on Py_InitModule ........ r52032 | brett.cannon | 2006-09-29 00:10:14 +0200 (Fri, 29 Sep 2006) | 2 lines Very minor grammatical fix in a comment. ........ r52048 | george.yoshida | 2006-09-30 07:14:02 +0200 (Sat, 30 Sep 2006) | 4 lines SF bug #1567976 : fix typo Will backport to 2.5. ........ r52051 | gregory.p.smith | 2006-09-30 08:08:20 +0200 (Sat, 30 Sep 2006) | 2 lines wording change ........ r52053 | georg.brandl | 2006-09-30 09:24:48 +0200 (Sat, 30 Sep 2006) | 2 lines Bug #1567375: a minor logical glitch in example description. ........ r52056 | georg.brandl | 2006-09-30 09:31:57 +0200 (Sat, 30 Sep 2006) | 3 lines Bug #1565661: in webbrowser, split() the command for the default GNOME browser in case it is a command with args. ........ r52058 | georg.brandl | 2006-09-30 10:43:30 +0200 (Sat, 30 Sep 2006) | 4 lines Patch #1567691: super() and new.instancemethod() now don't accept keyword arguments any more (previously they accepted them, but didn't use them). ........ r52061 | georg.brandl | 2006-09-30 11:03:42 +0200 (Sat, 30 Sep 2006) | 3 lines Bug #1566800: make sure that EnvironmentError can be called with any number of arguments, as was the case in Python 2.4. ........ r52063 | georg.brandl | 2006-09-30 11:06:45 +0200 (Sat, 30 Sep 2006) | 2 lines Bug #1566663: remove obsolete example from datetime docs. ........ r52065 | georg.brandl | 2006-09-30 11:13:21 +0200 (Sat, 30 Sep 2006) | 3 lines Bug #1566602: correct failure of posixpath unittest when $HOME ends with a slash. ........ r52068 | georg.brandl | 2006-09-30 12:58:01 +0200 (Sat, 30 Sep 2006) | 3 lines Bug #1457823: cgi.(Sv)FormContentDict's constructor now takes keep_blank_values and strict_parsing keyword arguments. ........ r52069 | georg.brandl | 2006-09-30 13:06:47 +0200 (Sat, 30 Sep 2006) | 3 lines Bug #1560617: in pyclbr, return full module name not only for classes, but also for functions. ........ r52072 | georg.brandl | 2006-09-30 13:17:34 +0200 (Sat, 30 Sep 2006) | 3 lines Bug #1556784: allow format strings longer than 127 characters in datetime's strftime function. ........ r52075 | georg.brandl | 2006-09-30 13:22:28 +0200 (Sat, 30 Sep 2006) | 3 lines Bug #1446043: correctly raise a LookupError if an encoding name given to encodings.search_function() contains a dot. ........ r52078 | georg.brandl | 2006-09-30 14:02:57 +0200 (Sat, 30 Sep 2006) | 3 lines Bug #1546052: clarify that PyString_FromString(AndSize) copies the string pointed to by its parameter. ........ r52080 | georg.brandl | 2006-09-30 14:16:03 +0200 (Sat, 30 Sep 2006) | 3 lines Convert test_import to unittest. ........ r52083 | kurt.kaiser | 2006-10-01 23:16:45 +0200 (Sun, 01 Oct 2006) | 5 lines Some syntax errors were being caught by tokenize during the tabnanny check, resulting in obscure error messages. Do the syntax check first. Bug 1562716, 1562719 ........ r52084 | kurt.kaiser | 2006-10-01 23:54:37 +0200 (Sun, 01 Oct 2006) | 3 lines Add comment explaining that error msgs may be due to user code when running w/o subprocess. ........ r52086 | martin.v.loewis | 2006-10-02 16:55:51 +0200 (Mon, 02 Oct 2006) | 3 lines Fix test for uintptr_t. Fixes #1568842. Will backport. ........ r52089 | martin.v.loewis | 2006-10-02 17:20:37 +0200 (Mon, 02 Oct 2006) | 3 lines Guard uintptr_t test with HAVE_STDINT_H, test for stdint.h. Will backport. ........ r52100 | vinay.sajip | 2006-10-03 20:02:37 +0200 (Tue, 03 Oct 2006) | 1 line Documentation omitted the additional parameter to LogRecord.__init__ which was added in 2.5. (See SF #1569622). ........ r52101 | vinay.sajip | 2006-10-03 20:20:26 +0200 (Tue, 03 Oct 2006) | 1 line Documentation clarified to mention optional parameters. ........ r52102 | vinay.sajip | 2006-10-03 20:21:56 +0200 (Tue, 03 Oct 2006) | 1 line Modified LogRecord.__init__ to make the func parameter optional. (See SF #1569622). ........ r52121 | brett.cannon | 2006-10-03 23:58:55 +0200 (Tue, 03 Oct 2006) | 2 lines Fix minor typo in a comment. ........ r52123 | brett.cannon | 2006-10-04 01:23:14 +0200 (Wed, 04 Oct 2006) | 2 lines Convert test_imp over to unittest. ........ r52128 | barry.warsaw | 2006-10-04 04:06:36 +0200 (Wed, 04 Oct 2006) | 3 lines decode_rfc2231(): As Christian Robottom Reis points out, it makes no sense to test for parts > 3 when we use .split(..., 2). ........ r52129 | jeremy.hylton | 2006-10-04 04:24:52 +0200 (Wed, 04 Oct 2006) | 9 lines Fix for SF bug 1569998: break permitted inside try. The compiler was checking that there was something on the fblock stack, but not that there was a loop on the stack. Fixed that and added a test for the specific syntax error. Bug fix candidate. ........ r52130 | martin.v.loewis | 2006-10-04 07:47:34 +0200 (Wed, 04 Oct 2006) | 4 lines Fix integer negation and absolute value to not rely on undefined behaviour of the C compiler anymore. Will backport to 2.5 and 2.4. ........ r52135 | martin.v.loewis | 2006-10-04 11:21:20 +0200 (Wed, 04 Oct 2006) | 1 line Forward port r52134: Add uuids for 2.4.4. ........ r52137 | armin.rigo | 2006-10-04 12:23:57 +0200 (Wed, 04 Oct 2006) | 3 lines Compilation problem caused by conflicting typedefs for uint32_t (unsigned long vs. unsigned int). ........ r52139 | armin.rigo | 2006-10-04 14:17:45 +0200 (Wed, 04 Oct 2006) | 23 lines Forward-port of r52136,52138: a review of overflow-detecting code. * unified the way intobject, longobject and mystrtoul handle values around -sys.maxint-1. * in general, trying to entierely avoid overflows in any computation involving signed ints or longs is extremely involved. Fixed a few simple cases where a compiler might be too clever (but that's all guesswork). * more overflow checks against bad data in marshal.c. * 2.5 specific: fixed a number of places that were still confusing int and Py_ssize_t. Some of them could potentially have caused "real-world" breakage. * list.pop(x): fixing overflow issues on x was messy. I just reverted to PyArg_ParseTuple("n"), which does the right thing. (An obscure test was trying to give a Decimal to list.pop()... doesn't make sense any more IMHO) * trying to write a few tests... ........ r52147 | andrew.kuchling | 2006-10-04 15:42:43 +0200 (Wed, 04 Oct 2006) | 6 lines Cause a PyObject_Malloc() failure to trigger a MemoryError, and then add 'if (PyErr_Occurred())' checks to various places so that NULL is returned properly. 2.4 backport candidate. ........ r52148 | martin.v.loewis | 2006-10-04 17:25:28 +0200 (Wed, 04 Oct 2006) | 1 line Add MSVC8 project files to create wininst-8.exe. ........ r52196 | brett.cannon | 2006-10-06 00:02:31 +0200 (Fri, 06 Oct 2006) | 7 lines Clarify what "re-initialization" means for init_builtin() and init_dynamic(). Also remove warning about re-initialization as possibly raising an execption as both call _PyImport_FindExtension() which pulls any module that was already imported from the Python process' extension cache and just copies the __dict__ into the module stored in sys.modules. ........ r52200 | fred.drake | 2006-10-06 02:03:45 +0200 (Fri, 06 Oct 2006) | 3 lines - update links - remove Sleepycat name now that they have been bought ........ r52204 | andrew.kuchling | 2006-10-06 12:41:01 +0200 (Fri, 06 Oct 2006) | 1 line Case fix ........ r52208 | georg.brandl | 2006-10-06 14:46:08 +0200 (Fri, 06 Oct 2006) | 3 lines Fix name. ........ r52211 | andrew.kuchling | 2006-10-06 15:18:26 +0200 (Fri, 06 Oct 2006) | 1 line [Bug #1545341] Allow 'classifier' parameter to be a tuple as well as a list. Will backport. ........ r52212 | armin.rigo | 2006-10-06 18:33:22 +0200 (Fri, 06 Oct 2006) | 4 lines A very minor bug fix: this code looks like it is designed to accept any hue value and do the modulo itself, except it doesn't quite do it in all cases. At least, the "cannot get here" comment was wrong. ........ r52213 | andrew.kuchling | 2006-10-06 20:51:55 +0200 (Fri, 06 Oct 2006) | 1 line Comment grammar ........ r52218 | skip.montanaro | 2006-10-07 13:05:02 +0200 (Sat, 07 Oct 2006) | 6 lines Note that the excel_tab class is registered as the "excel-tab" dialect. Fixes 1572471. Make a similar change for the excel class and clean up references to the Dialects and Formatting Parameters section in a few places. ........ r52221 | georg.brandl | 2006-10-08 09:11:54 +0200 (Sun, 08 Oct 2006) | 3 lines Add missing NEWS entry for rev. 52129. ........ r52223 | hyeshik.chang | 2006-10-08 15:48:34 +0200 (Sun, 08 Oct 2006) | 3 lines Bug #1572832: fix a bug in ISO-2022 codecs which may cause segfault when encoding non-BMP unicode characters. (Submitted by Ray Chason) ........ r52227 | ronald.oussoren | 2006-10-08 19:37:58 +0200 (Sun, 08 Oct 2006) | 4 lines Add version number to the link to the python documentation in /Developer/Documentation/Python, better for users that install multiple versions of python. ........ r52229 | ronald.oussoren | 2006-10-08 19:40:02 +0200 (Sun, 08 Oct 2006) | 2 lines Fix for bug #1570284 ........ r52233 | ronald.oussoren | 2006-10-08 19:49:52 +0200 (Sun, 08 Oct 2006) | 6 lines MacOSX: distutils changes the values of BASECFLAGS and LDFLAGS when using a universal build of python on OSX 10.3 to ensure that those flags can be used to compile code (the universal build uses compiler flags that aren't supported on 10.3). This patches gives the same treatment to CFLAGS, PY_CFLAGS and BLDSHARED. ........ r52236 | ronald.oussoren | 2006-10-08 19:51:46 +0200 (Sun, 08 Oct 2006) | 5 lines MacOSX: The universal build requires that users have the MacOSX10.4u SDK installed to build extensions. This patch makes distutils emit a warning when the compiler should use an SDK but that SDK is not installed, hopefully reducing some confusion. ........ r52238 | ronald.oussoren | 2006-10-08 20:18:26 +0200 (Sun, 08 Oct 2006) | 3 lines MacOSX: add more logic to recognize the correct startup file to patch to the shell profile patching post-install script. ........ r52242 | andrew.kuchling | 2006-10-09 19:10:12 +0200 (Mon, 09 Oct 2006) | 1 line Add news item for rev. 52211 change ........ r52245 | andrew.kuchling | 2006-10-09 20:05:19 +0200 (Mon, 09 Oct 2006) | 1 line Fix wording in comment ........ r52251 | georg.brandl | 2006-10-09 21:03:06 +0200 (Mon, 09 Oct 2006) | 2 lines Patch #1572724: fix typo ('=' instead of '==') in _msi.c. ........ r52255 | barry.warsaw | 2006-10-09 21:43:24 +0200 (Mon, 09 Oct 2006) | 2 lines List gc.get_count() in the module docstring. ........ r52257 | martin.v.loewis | 2006-10-09 22:44:25 +0200 (Mon, 09 Oct 2006) | 1 line Bug #1565150: Fix subsecond processing for os.utime on Windows. ........ r52268 | ronald.oussoren | 2006-10-10 09:55:06 +0200 (Tue, 10 Oct 2006) | 2 lines MacOSX: fix permission problem in the generated installer ........ r52293 | georg.brandl | 2006-10-12 09:38:04 +0200 (Thu, 12 Oct 2006) | 2 lines Bug #1575746: fix typo in property() docs. ........ r52295 | georg.brandl | 2006-10-12 09:57:21 +0200 (Thu, 12 Oct 2006) | 3 lines Bug #813342: Start the IDLE subprocess with -Qnew if the parent is started with that option. ........ r52297 | georg.brandl | 2006-10-12 10:22:53 +0200 (Thu, 12 Oct 2006) | 2 lines Bug #1565919: document set types in the Language Reference. ........ r52299 | georg.brandl | 2006-10-12 11:20:33 +0200 (Thu, 12 Oct 2006) | 3 lines Bug #1550524: better heuristics to find correct class definition in inspect.findsource(). ........ r52301 | georg.brandl | 2006-10-12 11:47:12 +0200 (Thu, 12 Oct 2006) | 4 lines Bug #1548891: The cStringIO.StringIO() constructor now encodes unicode arguments with the system default encoding just like the write() method does, instead of converting it to a raw buffer. ........ r52303 | georg.brandl | 2006-10-12 13:14:40 +0200 (Thu, 12 Oct 2006) | 2 lines Bug #1546628: add a note about urlparse.urljoin() and absolute paths. ........ r52305 | georg.brandl | 2006-10-12 13:27:59 +0200 (Thu, 12 Oct 2006) | 3 lines Bug #1545497: when given an explicit base, int() did ignore NULs embedded in the string to convert. ........ r52307 | georg.brandl | 2006-10-12 13:41:11 +0200 (Thu, 12 Oct 2006) | 3 lines Add a note to fpectl docs that it's not built by default (bug #1556261). ........ r52309 | georg.brandl | 2006-10-12 13:46:57 +0200 (Thu, 12 Oct 2006) | 3 lines Bug #1560114: the Mac filesystem does have accurate information about the case of filenames. ........ r52311 | georg.brandl | 2006-10-12 13:59:27 +0200 (Thu, 12 Oct 2006) | 2 lines Small grammar fix, thanks Sjoerd. ........ r52313 | georg.brandl | 2006-10-12 14:03:07 +0200 (Thu, 12 Oct 2006) | 2 lines Fix tarfile depending on buggy int('1\0', base) behavior. ........ r52315 | georg.brandl | 2006-10-12 14:33:07 +0200 (Thu, 12 Oct 2006) | 2 lines Bug #1283491: follow docstring convention wrt. keyword-able args in sum(). ........ r52316 | georg.brandl | 2006-10-12 15:08:16 +0200 (Thu, 12 Oct 2006) | 3 lines Bug #1560179: speed up posixpath.(dir|base)name ........ r52327 | brett.cannon | 2006-10-14 08:36:45 +0200 (Sat, 14 Oct 2006) | 3 lines Clean up the language of a sentence relating to the connect() function and user-defined datatypes. ........ r52332 | neal.norwitz | 2006-10-14 23:33:38 +0200 (Sat, 14 Oct 2006) | 3 lines Update the peephole optimizer to remove more dead code (jumps after returns) and inline jumps to returns. ........ r52333 | martin.v.loewis | 2006-10-15 09:54:40 +0200 (Sun, 15 Oct 2006) | 4 lines Patch #1576954: Update VC6 build directory; remove redundant files in VC7. Will backport to 2.5. ........ r52335 | martin.v.loewis | 2006-10-15 10:43:33 +0200 (Sun, 15 Oct 2006) | 1 line Patch #1576166: Support os.utime for directories on Windows NT+. ........ r52336 | martin.v.loewis | 2006-10-15 10:51:22 +0200 (Sun, 15 Oct 2006) | 2 lines Patch #1577551: Add ctypes and ET build support for VC6. Will backport to 2.5. ........ r52338 | martin.v.loewis | 2006-10-15 11:35:51 +0200 (Sun, 15 Oct 2006) | 1 line Loosen the test for equal time stamps. ........ r52339 | martin.v.loewis | 2006-10-15 11:43:39 +0200 (Sun, 15 Oct 2006) | 2 lines Bug #1567666: Emulate GetFileAttributesExA for Win95. Will backport to 2.5. ........ r52341 | martin.v.loewis | 2006-10-15 13:02:07 +0200 (Sun, 15 Oct 2006) | 2 lines Round to int, because some systems support sub-second time stamps in stat, but not in utime. Also be consistent with modifying only mtime, not atime. ........ r52342 | martin.v.loewis | 2006-10-15 13:57:40 +0200 (Sun, 15 Oct 2006) | 2 lines Set the eol-style for project files to "CRLF". ........ r52343 | martin.v.loewis | 2006-10-15 13:59:56 +0200 (Sun, 15 Oct 2006) | 3 lines Drop binary property on dsp files, set eol-style to CRLF instead. ........ r52344 | martin.v.loewis | 2006-10-15 14:01:43 +0200 (Sun, 15 Oct 2006) | 2 lines Remove binary property, set eol-style to CRLF instead. ........ r52346 | martin.v.loewis | 2006-10-15 16:30:38 +0200 (Sun, 15 Oct 2006) | 2 lines Mention the bdist_msi module. Will backport to 2.5. ........ r52354 | brett.cannon | 2006-10-16 05:09:52 +0200 (Mon, 16 Oct 2006) | 3 lines Fix turtle so that you can launch the demo2 function on its own instead of only when the module is launched as a script. ........ r52356 | martin.v.loewis | 2006-10-17 17:18:06 +0200 (Tue, 17 Oct 2006) | 2 lines Patch #1457736: Update VC6 to use current PCbuild settings. Will backport to 2.5. ........ r52360 | martin.v.loewis | 2006-10-17 20:09:55 +0200 (Tue, 17 Oct 2006) | 2 lines Remove obsolete file. Will backport. ........ r52363 | martin.v.loewis | 2006-10-17 20:59:23 +0200 (Tue, 17 Oct 2006) | 4 lines Forward-port r52358: - Bug #1578513: Cross compilation was broken by a change to configure. Repair so that it's back to how it was in 2.4.3. ........ r52365 | thomas.heller | 2006-10-17 21:30:48 +0200 (Tue, 17 Oct 2006) | 6 lines ctypes callback functions only support 'fundamental' result types. Check this and raise an error when something else is used - before this change ctypes would hang or crash when such a callback was called. This is a partial fix for #1574584. Will backport to release25-maint. ........ r52377 | tim.peters | 2006-10-18 07:06:06 +0200 (Wed, 18 Oct 2006) | 2 lines newIobject(): repaired incorrect cast to quiet MSVC warning. ........ r52378 | tim.peters | 2006-10-18 07:09:12 +0200 (Wed, 18 Oct 2006) | 2 lines Whitespace normalization. ........ r52379 | tim.peters | 2006-10-18 07:10:28 +0200 (Wed, 18 Oct 2006) | 2 lines Add missing svn:eol-style to text files. ........ r52387 | martin.v.loewis | 2006-10-19 12:58:46 +0200 (Thu, 19 Oct 2006) | 3 lines Add check for the PyArg_ParseTuple format, and declare it if it is supported. ........ r52388 | martin.v.loewis | 2006-10-19 13:00:37 +0200 (Thu, 19 Oct 2006) | 3 lines Fix various minor errors in passing arguments to PyArg_ParseTuple. ........ r52389 | martin.v.loewis | 2006-10-19 18:01:37 +0200 (Thu, 19 Oct 2006) | 2 lines Restore CFLAGS after checking for __attribute__ ........ r52390 | andrew.kuchling | 2006-10-19 23:55:55 +0200 (Thu, 19 Oct 2006) | 1 line [Bug #1576348] Fix typo in example ........ r52414 | walter.doerwald | 2006-10-22 10:59:41 +0200 (Sun, 22 Oct 2006) | 2 lines Port test___future__ to unittest. ........ r52415 | ronald.oussoren | 2006-10-22 12:45:18 +0200 (Sun, 22 Oct 2006) | 3 lines Patch #1580674: with this patch os.readlink uses the filesystem encoding to decode unicode objects and returns an unicode object when the argument is one. ........ r52416 | martin.v.loewis | 2006-10-22 12:46:18 +0200 (Sun, 22 Oct 2006) | 3 lines Patch #1580872: Remove duplicate declaration of PyCallable_Check. Will backport to 2.5. ........ r52418 | martin.v.loewis | 2006-10-22 12:55:15 +0200 (Sun, 22 Oct 2006) | 4 lines - Patch #1560695: Add .note.GNU-stack to ctypes' sysv.S so that ctypes isn't considered as requiring executable stacks. Will backport to 2.5. ........ r52420 | martin.v.loewis | 2006-10-22 15:45:13 +0200 (Sun, 22 Oct 2006) | 3 lines Remove passwd.adjunct.byname from list of maps for test_nis. Will backport to 2.5. ........ r52431 | georg.brandl | 2006-10-24 18:54:16 +0200 (Tue, 24 Oct 2006) | 2 lines Patch [ 1583506 ] tarfile.py: 100-char filenames are truncated ........ r52446 | andrew.kuchling | 2006-10-26 21:10:46 +0200 (Thu, 26 Oct 2006) | 1 line [Bug #1579796] Wrong syntax for PyDateTime_IMPORT in documentation. Reported by David Faure. ........ r52449 | andrew.kuchling | 2006-10-26 21:16:46 +0200 (Thu, 26 Oct 2006) | 1 line Typo fix ........ r52452 | martin.v.loewis | 2006-10-27 08:16:31 +0200 (Fri, 27 Oct 2006) | 3 lines Patch #1549049: Rewrite type conversion in structmember. Fixes #1545696 and #1566140. Will backport to 2.5. ........ r52454 | martin.v.loewis | 2006-10-27 08:42:27 +0200 (Fri, 27 Oct 2006) | 2 lines Check for values.h. Will backport. ........ r52456 | martin.v.loewis | 2006-10-27 09:06:52 +0200 (Fri, 27 Oct 2006) | 2 lines Get DBL_MAX from float.h not values.h. Will backport. ........ r52458 | martin.v.loewis | 2006-10-27 09:13:28 +0200 (Fri, 27 Oct 2006) | 2 lines Patch #1567274: Support SMTP over TLS. ........ r52459 | andrew.kuchling | 2006-10-27 13:33:29 +0200 (Fri, 27 Oct 2006) | 1 line Set svn:keywords property ........ r52460 | andrew.kuchling | 2006-10-27 13:36:41 +0200 (Fri, 27 Oct 2006) | 1 line Add item ........ r52461 | andrew.kuchling | 2006-10-27 13:37:01 +0200 (Fri, 27 Oct 2006) | 1 line Some wording changes and markup fixes ........ r52462 | andrew.kuchling | 2006-10-27 14:18:38 +0200 (Fri, 27 Oct 2006) | 1 line [Bug #1585690] Note that line_num was added in Python 2.5 ........ r52464 | andrew.kuchling | 2006-10-27 14:50:38 +0200 (Fri, 27 Oct 2006) | 1 line [Bug #1583946] Reword description of server and issuer ........ r52466 | andrew.kuchling | 2006-10-27 15:06:25 +0200 (Fri, 27 Oct 2006) | 1 line [Bug #1562583] Mention the set_reuse_addr() method ........ r52469 | andrew.kuchling | 2006-10-27 15:22:46 +0200 (Fri, 27 Oct 2006) | 4 lines [Bug #1542016] Report PCALL_POP value. This makes the return value of sys.callstats() match its docstring. Backport candidate. Though it's an API change, this is a pretty obscure portion of the API. ........ r52473 | andrew.kuchling | 2006-10-27 16:53:41 +0200 (Fri, 27 Oct 2006) | 1 line Point users to the subprocess module in the docs for os.system, os.spawn*, os.popen2, and the popen2 and commands modules ........ r52476 | andrew.kuchling | 2006-10-27 18:39:10 +0200 (Fri, 27 Oct 2006) | 1 line [Bug #1576241] Let functools.wraps work with built-in functions ........ r52478 | andrew.kuchling | 2006-10-27 18:55:34 +0200 (Fri, 27 Oct 2006) | 1 line [Bug #1575506] The _singlefileMailbox class was using the wrong file object in its flush() method, causing an error ........ r52480 | andrew.kuchling | 2006-10-27 19:06:16 +0200 (Fri, 27 Oct 2006) | 1 line Clarify docstring ........ r52481 | andrew.kuchling | 2006-10-27 19:11:23 +0200 (Fri, 27 Oct 2006) | 5 lines [Patch #1574068 by Scott Dial] urllib and urllib2 were using base64.encodestring() for encoding authentication data. encodestring() can include newlines for very long input, which produced broken HTTP headers. ........ r52483 | andrew.kuchling | 2006-10-27 20:13:46 +0200 (Fri, 27 Oct 2006) | 1 line Check db_setup_debug for a few print statements; change sqlite_setup_debug to False ........ r52484 | andrew.kuchling | 2006-10-27 20:15:02 +0200 (Fri, 27 Oct 2006) | 1 line [Patch #1503717] Tiny patch from Chris AtLee to stop a lengthy line from being printed ........ r52485 | thomas.heller | 2006-10-27 20:31:36 +0200 (Fri, 27 Oct 2006) | 5 lines WindowsError.str should display the windows error code, not the posix error code; with test. Fixes #1576174. Will backport to release25-maint. ........ r52487 | thomas.heller | 2006-10-27 21:05:53 +0200 (Fri, 27 Oct 2006) | 4 lines Modulefinder now handles absolute and relative imports, including tests. Will backport to release25-maint. ........ r52488 | georg.brandl | 2006-10-27 22:39:43 +0200 (Fri, 27 Oct 2006) | 2 lines Patch #1552024: add decorator support to unparse.py demo script. ........ r52492 | walter.doerwald | 2006-10-28 12:47:12 +0200 (Sat, 28 Oct 2006) | 2 lines Port test_bufio to unittest. ........ r52493 | georg.brandl | 2006-10-28 15:10:17 +0200 (Sat, 28 Oct 2006) | 6 lines Convert test_global, test_scope and test_grammar to unittest. I tried to enclose all tests which must be run at the toplevel (instead of inside a method) in exec statements. ........ r52494 | georg.brandl | 2006-10-28 15:11:41 +0200 (Sat, 28 Oct 2006) | 3 lines Update outstanding bugs test file. ........ r52495 | georg.brandl | 2006-10-28 15:51:49 +0200 (Sat, 28 Oct 2006) | 3 lines Convert test_math to unittest. ........ r52496 | georg.brandl | 2006-10-28 15:56:58 +0200 (Sat, 28 Oct 2006) | 3 lines Convert test_opcodes to unittest. ........ r52497 | georg.brandl | 2006-10-28 18:04:04 +0200 (Sat, 28 Oct 2006) | 2 lines Fix nth() itertool recipe. ........ r52500 | georg.brandl | 2006-10-28 22:25:09 +0200 (Sat, 28 Oct 2006) | 2 lines make test_grammar pass with python -O ........ r52501 | neal.norwitz | 2006-10-28 23:15:30 +0200 (Sat, 28 Oct 2006) | 6 lines Add some asserts. In sysmodule, I think these were to try to silence some warnings from Klokwork. They verify the assumptions of the format of svn version output. The assert in the thread module helped debug a problem on HP-UX. ........ r52502 | neal.norwitz | 2006-10-28 23:16:54 +0200 (Sat, 28 Oct 2006) | 5 lines Fix warnings with HP's C compiler. It doesn't recognize that infinite loops are, um, infinite. These conditions should not be able to happen. Will backport. ........ r52503 | neal.norwitz | 2006-10-28 23:17:51 +0200 (Sat, 28 Oct 2006) | 5 lines Fix crash in test on HP-UX. Apparently, it's not possible to delete a lock if it's held (even by the current thread). Will backport. ........ r52504 | neal.norwitz | 2006-10-28 23:19:07 +0200 (Sat, 28 Oct 2006) | 6 lines Fix bug #1565514, SystemError not raised on too many nested blocks. It seems like this should be a different error than SystemError, but I don't have any great ideas and SystemError was raised in 2.4 and earlier. Will backport. ........ r52505 | neal.norwitz | 2006-10-28 23:20:12 +0200 (Sat, 28 Oct 2006) | 4 lines Prevent crash if alloc of garbage fails. Found by Typo.pl. Will backport. ........ r52506 | neal.norwitz | 2006-10-28 23:21:00 +0200 (Sat, 28 Oct 2006) | 4 lines Don't inline Py_ADDRESS_IN_RANGE with gcc 4+ either. Will backport. ........ r52513 | neal.norwitz | 2006-10-28 23:56:49 +0200 (Sat, 28 Oct 2006) | 2 lines Fix test_modulefinder so it doesn't fail when run after test_distutils. ........ r52514 | neal.norwitz | 2006-10-29 00:12:26 +0200 (Sun, 29 Oct 2006) | 4 lines From SF 1557890, fix problem of using wrong type in example. Will backport. ........ r52517 | georg.brandl | 2006-10-29 09:39:22 +0100 (Sun, 29 Oct 2006) | 4 lines Fix codecs.EncodedFile which did not use file_encoding in 2.5.0, and fix all codecs file wrappers to work correctly with the "with" statement (bug #1586513). ........ r52519 | georg.brandl | 2006-10-29 09:47:08 +0100 (Sun, 29 Oct 2006) | 3 lines Clean up a leftover from old listcomp generation code. ........ r52520 | georg.brandl | 2006-10-29 09:53:06 +0100 (Sun, 29 Oct 2006) | 4 lines Bug #1586448: the compiler module now emits the same bytecode for list comprehensions as the builtin compiler, using the LIST_APPEND opcode. ........ r52521 | georg.brandl | 2006-10-29 10:01:01 +0100 (Sun, 29 Oct 2006) | 3 lines Remove trailing comma. ........ r52522 | georg.brandl | 2006-10-29 10:05:04 +0100 (Sun, 29 Oct 2006) | 3 lines Bug #1357915: allow all sequence types for shell arguments in subprocess. ........ r52524 | georg.brandl | 2006-10-29 10:16:12 +0100 (Sun, 29 Oct 2006) | 3 lines Patch #1583880: fix tarfile's problems with long names and posix/ GNU modes. ........ r52526 | georg.brandl | 2006-10-29 10:18:00 +0100 (Sun, 29 Oct 2006) | 3 lines Test assert if __debug__ is true. ........ r52527 | georg.brandl | 2006-10-29 10:32:16 +0100 (Sun, 29 Oct 2006) | 2 lines Fix the new EncodedFile test to work with big endian platforms. ........ r52529 | georg.brandl | 2006-10-29 15:39:09 +0100 (Sun, 29 Oct 2006) | 2 lines Bug #1586613: fix zlib and bz2 codecs' incremental en/decoders. ........ r52532 | georg.brandl | 2006-10-29 19:01:08 +0100 (Sun, 29 Oct 2006) | 2 lines Bug #1586773: extend hashlib docstring. ........ r52534 | neal.norwitz | 2006-10-29 19:30:10 +0100 (Sun, 29 Oct 2006) | 4 lines Update comments, remove commented out code. Move assembler structure next to assembler code to make it easier to move it to a separate file. ........ r52535 | georg.brandl | 2006-10-29 19:31:42 +0100 (Sun, 29 Oct 2006) | 3 lines Bug #1576657: when setting a KeyError for a tuple key, make sure that the tuple isn't used as the "exception arguments tuple". ........ r52537 | georg.brandl | 2006-10-29 20:13:40 +0100 (Sun, 29 Oct 2006) | 3 lines Convert test_mmap to unittest. ........ r52538 | georg.brandl | 2006-10-29 20:20:45 +0100 (Sun, 29 Oct 2006) | 3 lines Convert test_poll to unittest. ........ r52539 | georg.brandl | 2006-10-29 20:24:43 +0100 (Sun, 29 Oct 2006) | 3 lines Convert test_nis to unittest. ........ r52540 | georg.brandl | 2006-10-29 20:35:03 +0100 (Sun, 29 Oct 2006) | 3 lines Convert test_types to unittest. ........ r52541 | georg.brandl | 2006-10-29 20:51:16 +0100 (Sun, 29 Oct 2006) | 3 lines Convert test_cookie to unittest. ........ r52542 | georg.brandl | 2006-10-29 21:09:12 +0100 (Sun, 29 Oct 2006) | 3 lines Convert test_cgi to unittest. ........ r52543 | georg.brandl | 2006-10-29 21:24:01 +0100 (Sun, 29 Oct 2006) | 3 lines Completely convert test_httplib to unittest. ........ r52544 | georg.brandl | 2006-10-29 21:28:26 +0100 (Sun, 29 Oct 2006) | 2 lines Convert test_MimeWriter to unittest. ........ r52545 | georg.brandl | 2006-10-29 21:31:17 +0100 (Sun, 29 Oct 2006) | 3 lines Convert test_openpty to unittest. ........ r52546 | georg.brandl | 2006-10-29 21:35:12 +0100 (Sun, 29 Oct 2006) | 3 lines Remove leftover test output file. ........ r52547 | georg.brandl | 2006-10-29 22:54:18 +0100 (Sun, 29 Oct 2006) | 3 lines Move the check for openpty to the beginning. ........ r52548 | walter.doerwald | 2006-10-29 23:06:28 +0100 (Sun, 29 Oct 2006) | 2 lines Add tests for basic argument errors. ........ r52549 | walter.doerwald | 2006-10-30 00:02:27 +0100 (Mon, 30 Oct 2006) | 3 lines Add tests for incremental codecs with an errors argument. ........ r52550 | neal.norwitz | 2006-10-30 00:39:03 +0100 (Mon, 30 Oct 2006) | 1 line Fix refleak ........ r52552 | neal.norwitz | 2006-10-30 00:58:36 +0100 (Mon, 30 Oct 2006) | 1 line I'm assuming this is correct, it fixes the tests so they pass again ........ r52555 | vinay.sajip | 2006-10-31 18:32:37 +0100 (Tue, 31 Oct 2006) | 1 line Change to improve speed of _fixupChildren ........ r52556 | vinay.sajip | 2006-10-31 18:34:31 +0100 (Tue, 31 Oct 2006) | 1 line Added relativeCreated to Formatter doc (has been in the system for a long time - was unaccountably left out of the docs and not noticed until now). ........ r52588 | thomas.heller | 2006-11-02 20:48:24 +0100 (Thu, 02 Nov 2006) | 5 lines Replace the XXX marker in the 'Arrays and pointers' reference manual section with a link to the tutorial sections. Will backport to release25-maint. ........ r52592 | thomas.heller | 2006-11-02 21:22:29 +0100 (Thu, 02 Nov 2006) | 6 lines Fix a code example by adding a missing import. Fixes #1557890. Will backport to release25-maint. ........ r52598 | tim.peters | 2006-11-03 03:32:46 +0100 (Fri, 03 Nov 2006) | 2 lines Whitespace normalization. ........ r52619 | martin.v.loewis | 2006-11-04 19:14:06 +0100 (Sat, 04 Nov 2006) | 4 lines - Patch #1060577: Extract list of RPM files from spec file in bdist_rpm Will backport to 2.5. ........ r52621 | neal.norwitz | 2006-11-04 20:25:22 +0100 (Sat, 04 Nov 2006) | 4 lines Bug #1588287: fix invalid assertion for `1,2` in debug builds. Will backport ........ r52630 | andrew.kuchling | 2006-11-05 22:04:37 +0100 (Sun, 05 Nov 2006) | 1 line Update link ........ r52631 | skip.montanaro | 2006-11-06 15:34:52 +0100 (Mon, 06 Nov 2006) | 1 line note that user can control directory location even if default dir is used ........ r52644 | ronald.oussoren | 2006-11-07 16:53:38 +0100 (Tue, 07 Nov 2006) | 2 lines Fix a number of typos in strings and comments (sf#1589070) ........ r52647 | ronald.oussoren | 2006-11-07 17:00:34 +0100 (Tue, 07 Nov 2006) | 2 lines Whitespace changes to make the source more compliant with PEP8 (SF#1589070) ........ r52651 | thomas.heller | 2006-11-07 19:01:18 +0100 (Tue, 07 Nov 2006) | 3 lines Fix markup. Will backport to release25-maint. ........ r52653 | thomas.heller | 2006-11-07 19:20:47 +0100 (Tue, 07 Nov 2006) | 3 lines Fix grammatical error as well. Will backport to release25-maint. ........ r52657 | andrew.kuchling | 2006-11-07 21:39:16 +0100 (Tue, 07 Nov 2006) | 1 line Add missing word ........ r52662 | martin.v.loewis | 2006-11-08 07:46:37 +0100 (Wed, 08 Nov 2006) | 4 lines Correctly forward exception in instance_contains(). Fixes #1591996. Patch contributed by Neal Norwitz. Will backport. ........ r52664 | martin.v.loewis | 2006-11-08 07:48:36 +0100 (Wed, 08 Nov 2006) | 2 lines News entry for 52662. ........ r52665 | martin.v.loewis | 2006-11-08 08:35:55 +0100 (Wed, 08 Nov 2006) | 2 lines Patch #1351744: Add askyesnocancel helper for tkMessageBox. ........ r52666 | georg.brandl | 2006-11-08 08:45:59 +0100 (Wed, 08 Nov 2006) | 2 lines Patch #1592072: fix docs for return value of PyErr_CheckSignals. ........ r52668 | georg.brandl | 2006-11-08 11:04:29 +0100 (Wed, 08 Nov 2006) | 3 lines Bug #1592533: rename variable in heapq doc example, to avoid shadowing "sorted". ........ r52671 | andrew.kuchling | 2006-11-08 14:35:34 +0100 (Wed, 08 Nov 2006) | 1 line Add section on the functional module ........ r52672 | andrew.kuchling | 2006-11-08 15:14:30 +0100 (Wed, 08 Nov 2006) | 1 line Add section on operator module; make a few edits ........ r52673 | andrew.kuchling | 2006-11-08 15:24:03 +0100 (Wed, 08 Nov 2006) | 1 line Add table of contents; this required fixing a few headings. Some more smalle edits. ........ r52674 | andrew.kuchling | 2006-11-08 15:30:14 +0100 (Wed, 08 Nov 2006) | 1 line More edits ........ r52686 | martin.v.loewis | 2006-11-09 12:06:03 +0100 (Thu, 09 Nov 2006) | 3 lines Patch #838546: Make terminal become controlling in pty.fork(). Will backport to 2.5. ........ r52688 | martin.v.loewis | 2006-11-09 12:27:32 +0100 (Thu, 09 Nov 2006) | 2 lines Patch #1592250: Add elidge argument to Tkinter.Text.search. ........ r52690 | andrew.kuchling | 2006-11-09 14:27:07 +0100 (Thu, 09 Nov 2006) | 7 lines [Bug #1569790] mailbox.Maildir.get_folder() loses factory information Both the Maildir and MH classes had this bug; the patch fixes both classes and adds a test. Will backport to 25-maint. ........ r52692 | andrew.kuchling | 2006-11-09 14:51:14 +0100 (Thu, 09 Nov 2006) | 1 line [Patch #1514544 by David Watson] use fsync() to ensure data is really on disk ........ r52695 | walter.doerwald | 2006-11-09 17:23:26 +0100 (Thu, 09 Nov 2006) | 2 lines Replace C++ comment with C comment (fixes SF bug #1593525). ........ r52712 | andrew.kuchling | 2006-11-09 22:16:46 +0100 (Thu, 09 Nov 2006) | 11 lines [Patch #1514543] mailbox (Maildir): avoid losing messages on name clash Two changes: Where possible, use link()/remove() to move files into a directory; this makes it easier to avoid overwriting an existing file. Use _create_carefully() to create files in tmp/, which uses O_EXCL. Backport candidate. ........ r52716 | phillip.eby | 2006-11-10 01:33:36 +0100 (Fri, 10 Nov 2006) | 4 lines Fix SF#1566719: not creating site-packages (or other target directory) when installing .egg-info for a project that contains no modules or packages, while using --root (as in bdist_rpm). ........ r52719 | andrew.kuchling | 2006-11-10 14:14:01 +0100 (Fri, 10 Nov 2006) | 1 line Reword entry ........ r52725 | andrew.kuchling | 2006-11-10 15:39:01 +0100 (Fri, 10 Nov 2006) | 1 line [Feature request #1542920] Link to wsgi.org ........ r52731 | georg.brandl | 2006-11-11 19:29:11 +0100 (Sat, 11 Nov 2006) | 2 lines Bug #1594742: wrong word in stringobject doc. ........ r52733 | georg.brandl | 2006-11-11 19:32:47 +0100 (Sat, 11 Nov 2006) | 2 lines Bug #1594758: wording improvement for dict.update() docs. ........ r52736 | martin.v.loewis | 2006-11-12 11:32:47 +0100 (Sun, 12 Nov 2006) | 3 lines Patch #1065257: Support passing open files as body in HTTPConnection.request(). ........ r52737 | martin.v.loewis | 2006-11-12 11:41:39 +0100 (Sun, 12 Nov 2006) | 2 lines Patch #1355023: support whence argument for GzipFile.seek. ........ r52738 | martin.v.loewis | 2006-11-12 19:24:26 +0100 (Sun, 12 Nov 2006) | 2 lines Bug #1067760: Deprecate passing floats to file.seek. ........ r52739 | martin.v.loewis | 2006-11-12 19:48:13 +0100 (Sun, 12 Nov 2006) | 3 lines Patch #1359217: Ignore 2xx response before 150 response. Will backport to 2.5. ........ r52741 | martin.v.loewis | 2006-11-12 19:56:03 +0100 (Sun, 12 Nov 2006) | 4 lines Patch #1360200: Use unmangled_version RPM spec field to deal with file name mangling. Will backport to 2.5. ........ r52753 | walter.doerwald | 2006-11-15 17:23:46 +0100 (Wed, 15 Nov 2006) | 2 lines Fix typo. ........ r52754 | georg.brandl | 2006-11-15 18:42:03 +0100 (Wed, 15 Nov 2006) | 2 lines Bug #1594809: add a note to README regarding PYTHONPATH and make install. ........ r52762 | georg.brandl | 2006-11-16 16:05:14 +0100 (Thu, 16 Nov 2006) | 2 lines Bug #1597576: mention that the new base64 api has been introduced in py2.4. ........ r52764 | georg.brandl | 2006-11-16 17:50:59 +0100 (Thu, 16 Nov 2006) | 3 lines Bug #1597824: return the registered function from atexit.register() to facilitate usage as a decorator. ........ r52765 | georg.brandl | 2006-11-16 18:08:45 +0100 (Thu, 16 Nov 2006) | 4 lines Bug #1588217: don't parse "= " as a soft line break in binascii's a2b_qp() function, instead leave it in the string as quopri.decode() does. ........ r52776 | andrew.kuchling | 2006-11-17 14:30:25 +0100 (Fri, 17 Nov 2006) | 17 lines Remove file-locking in MH.pack() method. This change looks massive but it's mostly a re-indenting after removing some try...finally blocks. Also adds a test case that does a pack() while the mailbox is locked; this test would have turned up bugs in the original code on some platforms. In both nmh and GNU Mailutils' implementation of MH-format mailboxes, no locking is done of individual message files when renaming them. The original mailbox.py code did do locking, which meant that message files had to be opened. This code was buggy on certain platforms (found through reading the code); there were code paths that closed the file object and then called _unlock_file() on it. Will backport to 25-maint once I see how the buildbots react to this patch. ........ r52780 | martin.v.loewis | 2006-11-18 19:00:23 +0100 (Sat, 18 Nov 2006) | 5 lines Patch #1538878: Don't make tkSimpleDialog dialogs transient if the parent window is withdrawn. This mirrors what dialog.tcl does. Will backport to 2.5. ........ r52782 | martin.v.loewis | 2006-11-18 19:05:35 +0100 (Sat, 18 Nov 2006) | 4 lines Patch #1594554: Always close a tkSimpleDialog on ok(), even if an exception occurs. Will backport to 2.5. ........ r52784 | martin.v.loewis | 2006-11-18 19:42:11 +0100 (Sat, 18 Nov 2006) | 3 lines Patch #1472877: Fix Tix subwidget name resolution. Will backport to 2.5. ........ r52786 | andrew.kuchling | 2006-11-18 23:17:33 +0100 (Sat, 18 Nov 2006) | 1 line Expand checking in test_sha ........ r52787 | georg.brandl | 2006-11-19 09:48:30 +0100 (Sun, 19 Nov 2006) | 3 lines Patch [ 1586791 ] better error msgs for some TypeErrors ........ r52788 | martin.v.loewis | 2006-11-19 11:41:41 +0100 (Sun, 19 Nov 2006) | 4 lines Make cStringIO.truncate raise IOError for negative arguments (even for -1). Fixes the last bit of #1359365. ........ r52789 | andrew.kuchling | 2006-11-19 19:40:01 +0100 (Sun, 19 Nov 2006) | 1 line Add a test case of data w/ bytes > 127 ........ r52790 | martin.v.loewis | 2006-11-19 19:51:54 +0100 (Sun, 19 Nov 2006) | 3 lines Patch #1070046: Marshal new-style objects like InstanceType in xmlrpclib. ........ r52792 | neal.norwitz | 2006-11-19 22:26:53 +0100 (Sun, 19 Nov 2006) | 4 lines Speed up function calls into the math module by using METH_O. There should be no functional changes. However, the error msgs are slightly different. Also verified that the module dict is not NULL on init. ........ r52794 | george.yoshida | 2006-11-20 03:24:48 +0100 (Mon, 20 Nov 2006) | 2 lines markup fix ........ r52795 | georg.brandl | 2006-11-20 08:12:58 +0100 (Mon, 20 Nov 2006) | 3 lines Further markup fix. ........ r52800 | andrew.kuchling | 2006-11-20 14:39:37 +0100 (Mon, 20 Nov 2006) | 2 lines Jython compatibility fix: if uu.decode() opened its output file, be sure to close it. ........ r52811 | neal.norwitz | 2006-11-21 06:26:22 +0100 (Tue, 21 Nov 2006) | 9 lines Bug #1599782: Fix segfault on bsddb.db.DB().type(). The problem is that _DB_get_type() can't be called without the GIL because it calls a bunch of PyErr_* APIs when an error occurs. There were no other cases in this file that it was called without the GIL. Removing the BEGIN/END THREAD around _DB_get_type() made everything work. Will backport. ........ r52814 | neal.norwitz | 2006-11-21 06:51:51 +0100 (Tue, 21 Nov 2006) | 1 line Oops, convert tabs to spaces ........ r52815 | neal.norwitz | 2006-11-21 07:23:44 +0100 (Tue, 21 Nov 2006) | 1 line Fix SF #1599879, socket.gethostname should ref getfqdn directly. ........ r52817 | martin.v.loewis | 2006-11-21 19:20:25 +0100 (Tue, 21 Nov 2006) | 4 lines Conditionalize definition of _CRT_SECURE_NO_DEPRECATE and _CRT_NONSTDC_NO_DEPRECATE. Will backport. ........ r52821 | martin.v.loewis | 2006-11-22 09:50:02 +0100 (Wed, 22 Nov 2006) | 4 lines Patch #1362975: Rework CodeContext indentation algorithm to avoid hard-coding pixel widths. Also make the text's scrollbar a child of the text frame, not the top widget. ........ r52826 | walter.doerwald | 2006-11-23 06:03:56 +0100 (Thu, 23 Nov 2006) | 3 lines Change decode() so that it works with a buffer (i.e. unicode(..., 'utf-8-sig')) SF bug #1601501. ........ r52833 | georg.brandl | 2006-11-23 10:55:07 +0100 (Thu, 23 Nov 2006) | 2 lines Bug #1601630: little improvement to getopt docs ........ r52835 | michael.hudson | 2006-11-23 14:54:04 +0100 (Thu, 23 Nov 2006) | 3 lines a test for an error condition not covered by existing tests (noticed this when writing the equivalent code for pypy) ........ r52839 | raymond.hettinger | 2006-11-23 22:06:03 +0100 (Thu, 23 Nov 2006) | 1 line Fix and/add typo ........ r52840 | raymond.hettinger | 2006-11-23 22:35:19 +0100 (Thu, 23 Nov 2006) | 1 line ... and the number of the counting shall be three. ........ r52841 | thomas.heller | 2006-11-24 19:45:39 +0100 (Fri, 24 Nov 2006) | 1 line Fix bug #1598620: A ctypes structure cannot contain itself. ........ r52843 | martin.v.loewis | 2006-11-25 16:39:19 +0100 (Sat, 25 Nov 2006) | 3 lines Disable _XOPEN_SOURCE on NetBSD 1.x. Will backport to 2.5 ........ r52845 | georg.brandl | 2006-11-26 20:27:47 +0100 (Sun, 26 Nov 2006) | 2 lines Bug #1603321: make pstats.Stats accept Unicode file paths. ........ r52850 | georg.brandl | 2006-11-27 19:46:21 +0100 (Mon, 27 Nov 2006) | 2 lines Bug #1603789: grammatical error in Tkinter docs. ........ r52855 | thomas.heller | 2006-11-28 21:21:54 +0100 (Tue, 28 Nov 2006) | 7 lines Fix #1563807: _ctypes built on AIX fails with ld ffi error. The contents of ffi_darwin.c must be compiled unless __APPLE__ is defined and __ppc__ is not. Will backport. ........ r52862 | armin.rigo | 2006-11-29 22:59:22 +0100 (Wed, 29 Nov 2006) | 3 lines Forgot a case where the locals can now be a general mapping instead of just a dictionary. (backporting...) ........ r52872 | guido.van.rossum | 2006-11-30 20:23:13 +0100 (Thu, 30 Nov 2006) | 2 lines Update version. ........ r52890 | walter.doerwald | 2006-12-01 17:59:47 +0100 (Fri, 01 Dec 2006) | 3 lines Move xdrlib tests from the module into a separate test script, port the tests to unittest and add a few new tests. ........ r52900 | raymond.hettinger | 2006-12-02 03:00:39 +0100 (Sat, 02 Dec 2006) | 1 line Add name to credits (for untokenize). ........ r52905 | martin.v.loewis | 2006-12-03 10:54:46 +0100 (Sun, 03 Dec 2006) | 2 lines Move IDLE news into NEWS.txt. ........ r52906 | martin.v.loewis | 2006-12-03 12:23:45 +0100 (Sun, 03 Dec 2006) | 4 lines Patch #1544279: Improve thread-safety of the socket module by moving the sock_addr_t storage out of the socket object. Will backport to 2.5. ........ r52908 | martin.v.loewis | 2006-12-03 13:01:53 +0100 (Sun, 03 Dec 2006) | 3 lines Patch #1371075: Make ConfigParser accept optional dict type for ordering, sorting, etc. ........ r52910 | matthias.klose | 2006-12-03 18:16:41 +0100 (Sun, 03 Dec 2006) | 2 lines - Fix build failure on kfreebsd and on the hurd. ........ r52915 | george.yoshida | 2006-12-04 12:41:54 +0100 (Mon, 04 Dec 2006) | 2 lines fix a versionchanged tag ........ r52917 | george.yoshida | 2006-12-05 06:39:50 +0100 (Tue, 05 Dec 2006) | 3 lines Fix pickle doc typo Patch #1608758 ........ r52938 | georg.brandl | 2006-12-06 23:21:18 +0100 (Wed, 06 Dec 2006) | 2 lines Patch #1610437: fix a tarfile bug with long filename headers. ........ r52945 | brett.cannon | 2006-12-07 00:38:48 +0100 (Thu, 07 Dec 2006) | 3 lines Fix a bad assumption that all objects assigned to '__loader__' on a module will have a '_files' attribute. ........ r52951 | georg.brandl | 2006-12-07 10:30:06 +0100 (Thu, 07 Dec 2006) | 3 lines RFE #1592899: mention string.maketrans() in docs for str.translate, remove reference to the old regex module in the former's doc. ........ r52962 | raymond.hettinger | 2006-12-08 04:17:18 +0100 (Fri, 08 Dec 2006) | 1 line Eliminate two redundant calls to PyObject_Hash(). ........ r52963 | raymond.hettinger | 2006-12-08 05:24:33 +0100 (Fri, 08 Dec 2006) | 3 lines Port Armin's fix for a dict resize vulnerability (svn revision 46589, sf bug 1456209). ........ r52964 | raymond.hettinger | 2006-12-08 05:57:50 +0100 (Fri, 08 Dec 2006) | 4 lines Port Georg's dictobject.c fix keys that were tuples got unpacked on the way to setting a KeyError (svn revision 52535, sf bug 1576657). ........ r52966 | raymond.hettinger | 2006-12-08 18:35:25 +0100 (Fri, 08 Dec 2006) | 2 lines Add test for SF bug 1576657 ........ r52970 | georg.brandl | 2006-12-08 21:46:11 +0100 (Fri, 08 Dec 2006) | 3 lines #1577756: svnversion doesn't react to LANG=C, use LC_ALL=C to force English output. ........ r52972 | georg.brandl | 2006-12-09 10:08:29 +0100 (Sat, 09 Dec 2006) | 3 lines Patch #1608267: fix a race condition in os.makedirs() is the directory to be created is already there. ........ r52975 | matthias.klose | 2006-12-09 13:15:27 +0100 (Sat, 09 Dec 2006) | 2 lines - Fix the build of the library reference in info format. ........ r52994 | neal.norwitz | 2006-12-11 02:01:06 +0100 (Mon, 11 Dec 2006) | 1 line Fix a typo ........ r52996 | georg.brandl | 2006-12-11 08:56:33 +0100 (Mon, 11 Dec 2006) | 2 lines Move errno imports back to individual functions. ........ r52998 | vinay.sajip | 2006-12-11 15:07:16 +0100 (Mon, 11 Dec 2006) | 1 line Patch by Jeremy Katz (SF #1609407) ........ r53000 | vinay.sajip | 2006-12-11 15:26:23 +0100 (Mon, 11 Dec 2006) | 1 line Patch by "cuppatea" (SF #1503765) ........
6039 lines
162 KiB
C
6039 lines
162 KiB
C
/*----------------------------------------------------------------------
|
|
Copyright (c) 1999-2001, Digital Creations, Fredericksburg, VA, USA
|
|
and Andrew Kuchling. All rights reserved.
|
|
|
|
Redistribution and use in source and binary forms, with or without
|
|
modification, are permitted provided that the following conditions are
|
|
met:
|
|
|
|
o Redistributions of source code must retain the above copyright
|
|
notice, this list of conditions, and the disclaimer that follows.
|
|
|
|
o Redistributions in binary form must reproduce the above copyright
|
|
notice, this list of conditions, and the following disclaimer in
|
|
the documentation and/or other materials provided with the
|
|
distribution.
|
|
|
|
o Neither the name of Digital Creations nor the names of its
|
|
contributors may be used to endorse or promote products derived
|
|
from this software without specific prior written permission.
|
|
|
|
THIS SOFTWARE IS PROVIDED BY DIGITAL CREATIONS AND CONTRIBUTORS *AS
|
|
IS* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
|
|
TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
|
|
PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL DIGITAL
|
|
CREATIONS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
|
|
BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
|
|
OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
|
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
|
|
TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
|
|
USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
|
|
DAMAGE.
|
|
------------------------------------------------------------------------*/
|
|
|
|
|
|
/*
|
|
* Handwritten code to wrap version 3.x of the Berkeley DB library,
|
|
* written to replace a SWIG-generated file. It has since been updated
|
|
* to compile with BerkeleyDB versions 3.2 through 4.2.
|
|
*
|
|
* This module was started by Andrew Kuchling to remove the dependency
|
|
* on SWIG in a package by Gregory P. Smith <greg@electricrain.com> who
|
|
* based his work on a similar package by Robin Dunn <robin@alldunn.com>
|
|
* which wrapped Berkeley DB 2.7.x.
|
|
*
|
|
* Development of this module then returned full circle back to Robin Dunn
|
|
* who worked on behalf of Digital Creations to complete the wrapping of
|
|
* the DB 3.x API and to build a solid unit test suite. Robin has
|
|
* since gone onto other projects (wxPython).
|
|
*
|
|
* Gregory P. Smith <greg@electricrain.com> is once again the maintainer.
|
|
*
|
|
* Use the pybsddb-users@lists.sf.net mailing list for all questions.
|
|
* Things can change faster than the header of this file is updated. This
|
|
* file is shared with the PyBSDDB project at SourceForge:
|
|
*
|
|
* http://pybsddb.sf.net
|
|
*
|
|
* This file should remain backward compatible with Python 2.1, but see PEP
|
|
* 291 for the most current backward compatibility requirements:
|
|
*
|
|
* http://www.python.org/peps/pep-0291.html
|
|
*
|
|
* This module contains 6 types:
|
|
*
|
|
* DB (Database)
|
|
* DBCursor (Database Cursor)
|
|
* DBEnv (database environment)
|
|
* DBTxn (An explicit database transaction)
|
|
* DBLock (A lock handle)
|
|
* DBSequence (Sequence)
|
|
*
|
|
*/
|
|
|
|
/* --------------------------------------------------------------------- */
|
|
|
|
/*
|
|
* Portions of this module, associated unit tests and build scripts are the
|
|
* result of a contract with The Written Word (http://thewrittenword.com/)
|
|
* Many thanks go out to them for causing me to raise the bar on quality and
|
|
* functionality, resulting in a better bsddb3 package for all of us to use.
|
|
*
|
|
* --Robin
|
|
*/
|
|
|
|
/* --------------------------------------------------------------------- */
|
|
|
|
#include <stddef.h> /* for offsetof() */
|
|
#include <Python.h>
|
|
#include <db.h>
|
|
|
|
/* --------------------------------------------------------------------- */
|
|
/* Various macro definitions */
|
|
|
|
/* 40 = 4.0, 33 = 3.3; this will break if the second number is > 9 */
|
|
#define DBVER (DB_VERSION_MAJOR * 10 + DB_VERSION_MINOR)
|
|
#if DB_VERSION_MINOR > 9
|
|
#error "eek! DBVER can't handle minor versions > 9"
|
|
#endif
|
|
|
|
#define PY_BSDDB_VERSION "4.4.6"
|
|
static char *rcs_id = "$Id$";
|
|
|
|
|
|
#if (PY_VERSION_HEX < 0x02050000)
|
|
typedef int Py_ssize_t;
|
|
#endif
|
|
|
|
#ifdef WITH_THREAD
|
|
|
|
/* These are for when calling Python --> C */
|
|
#define MYDB_BEGIN_ALLOW_THREADS Py_BEGIN_ALLOW_THREADS;
|
|
#define MYDB_END_ALLOW_THREADS Py_END_ALLOW_THREADS;
|
|
|
|
/* For 2.3, use the PyGILState_ calls */
|
|
#if (PY_VERSION_HEX >= 0x02030000)
|
|
#define MYDB_USE_GILSTATE
|
|
#endif
|
|
|
|
/* and these are for calling C --> Python */
|
|
#if defined(MYDB_USE_GILSTATE)
|
|
#define MYDB_BEGIN_BLOCK_THREADS \
|
|
PyGILState_STATE __savestate = PyGILState_Ensure();
|
|
#define MYDB_END_BLOCK_THREADS \
|
|
PyGILState_Release(__savestate);
|
|
#else /* MYDB_USE_GILSTATE */
|
|
/* Pre GILState API - do it the long old way */
|
|
static PyInterpreterState* _db_interpreterState = NULL;
|
|
#define MYDB_BEGIN_BLOCK_THREADS { \
|
|
PyThreadState* prevState; \
|
|
PyThreadState* newState; \
|
|
PyEval_AcquireLock(); \
|
|
newState = PyThreadState_New(_db_interpreterState); \
|
|
prevState = PyThreadState_Swap(newState);
|
|
|
|
#define MYDB_END_BLOCK_THREADS \
|
|
newState = PyThreadState_Swap(prevState); \
|
|
PyThreadState_Clear(newState); \
|
|
PyEval_ReleaseLock(); \
|
|
PyThreadState_Delete(newState); \
|
|
}
|
|
#endif /* MYDB_USE_GILSTATE */
|
|
|
|
#else
|
|
/* Compiled without threads - avoid all this cruft */
|
|
#define MYDB_BEGIN_ALLOW_THREADS
|
|
#define MYDB_END_ALLOW_THREADS
|
|
#define MYDB_BEGIN_BLOCK_THREADS
|
|
#define MYDB_END_BLOCK_THREADS
|
|
|
|
#endif
|
|
|
|
/* Should DB_INCOMPLETE be turned into a warning or an exception? */
|
|
#define INCOMPLETE_IS_WARNING 1
|
|
|
|
/* --------------------------------------------------------------------- */
|
|
/* Exceptions */
|
|
|
|
static PyObject* DBError; /* Base class, all others derive from this */
|
|
static PyObject* DBCursorClosedError; /* raised when trying to use a closed cursor object */
|
|
static PyObject* DBKeyEmptyError; /* DB_KEYEMPTY: also derives from KeyError */
|
|
static PyObject* DBKeyExistError; /* DB_KEYEXIST */
|
|
static PyObject* DBLockDeadlockError; /* DB_LOCK_DEADLOCK */
|
|
static PyObject* DBLockNotGrantedError; /* DB_LOCK_NOTGRANTED */
|
|
static PyObject* DBNotFoundError; /* DB_NOTFOUND: also derives from KeyError */
|
|
static PyObject* DBOldVersionError; /* DB_OLD_VERSION */
|
|
static PyObject* DBRunRecoveryError; /* DB_RUNRECOVERY */
|
|
static PyObject* DBVerifyBadError; /* DB_VERIFY_BAD */
|
|
static PyObject* DBNoServerError; /* DB_NOSERVER */
|
|
static PyObject* DBNoServerHomeError; /* DB_NOSERVER_HOME */
|
|
static PyObject* DBNoServerIDError; /* DB_NOSERVER_ID */
|
|
#if (DBVER >= 33)
|
|
static PyObject* DBPageNotFoundError; /* DB_PAGE_NOTFOUND */
|
|
static PyObject* DBSecondaryBadError; /* DB_SECONDARY_BAD */
|
|
#endif
|
|
|
|
#if !INCOMPLETE_IS_WARNING
|
|
static PyObject* DBIncompleteError; /* DB_INCOMPLETE */
|
|
#endif
|
|
|
|
static PyObject* DBInvalidArgError; /* EINVAL */
|
|
static PyObject* DBAccessError; /* EACCES */
|
|
static PyObject* DBNoSpaceError; /* ENOSPC */
|
|
static PyObject* DBNoMemoryError; /* DB_BUFFER_SMALL (ENOMEM when < 4.3) */
|
|
static PyObject* DBAgainError; /* EAGAIN */
|
|
static PyObject* DBBusyError; /* EBUSY */
|
|
static PyObject* DBFileExistsError; /* EEXIST */
|
|
static PyObject* DBNoSuchFileError; /* ENOENT */
|
|
static PyObject* DBPermissionsError; /* EPERM */
|
|
|
|
#if (DBVER < 43)
|
|
#define DB_BUFFER_SMALL ENOMEM
|
|
#endif
|
|
|
|
|
|
/* --------------------------------------------------------------------- */
|
|
/* Structure definitions */
|
|
|
|
#if PYTHON_API_VERSION >= 1010 /* python >= 2.1 support weak references */
|
|
#define HAVE_WEAKREF
|
|
#else
|
|
#undef HAVE_WEAKREF
|
|
#endif
|
|
|
|
/* if Python >= 2.1 better support warnings */
|
|
#if PYTHON_API_VERSION >= 1010
|
|
#define HAVE_WARNINGS
|
|
#else
|
|
#undef HAVE_WARNINGS
|
|
#endif
|
|
|
|
#if PYTHON_API_VERSION <= 1007
|
|
/* 1.5 compatibility */
|
|
#define PyObject_New PyObject_NEW
|
|
#define PyObject_Del PyMem_DEL
|
|
#endif
|
|
|
|
struct behaviourFlags {
|
|
/* What is the default behaviour when DB->get or DBCursor->get returns a
|
|
DB_NOTFOUND || DB_KEYEMPTY error? Return None or raise an exception? */
|
|
unsigned int getReturnsNone : 1;
|
|
/* What is the default behaviour for DBCursor.set* methods when DBCursor->get
|
|
* returns a DB_NOTFOUND || DB_KEYEMPTY error? Return None or raise? */
|
|
unsigned int cursorSetReturnsNone : 1;
|
|
};
|
|
|
|
#define DEFAULT_GET_RETURNS_NONE 1
|
|
#define DEFAULT_CURSOR_SET_RETURNS_NONE 1 /* 0 in pybsddb < 4.2, python < 2.4 */
|
|
|
|
typedef struct {
|
|
PyObject_HEAD
|
|
DB_ENV* db_env;
|
|
u_int32_t flags; /* saved flags from open() */
|
|
int closed;
|
|
struct behaviourFlags moduleFlags;
|
|
#ifdef HAVE_WEAKREF
|
|
PyObject *in_weakreflist; /* List of weak references */
|
|
#endif
|
|
} DBEnvObject;
|
|
|
|
|
|
typedef struct {
|
|
PyObject_HEAD
|
|
DB* db;
|
|
DBEnvObject* myenvobj; /* PyObject containing the DB_ENV */
|
|
u_int32_t flags; /* saved flags from open() */
|
|
u_int32_t setflags; /* saved flags from set_flags() */
|
|
int haveStat;
|
|
struct behaviourFlags moduleFlags;
|
|
#if (DBVER >= 33)
|
|
PyObject* associateCallback;
|
|
PyObject* btCompareCallback;
|
|
int primaryDBType;
|
|
#endif
|
|
#ifdef HAVE_WEAKREF
|
|
PyObject *in_weakreflist; /* List of weak references */
|
|
#endif
|
|
} DBObject;
|
|
|
|
|
|
typedef struct {
|
|
PyObject_HEAD
|
|
DBC* dbc;
|
|
DBObject* mydb;
|
|
#ifdef HAVE_WEAKREF
|
|
PyObject *in_weakreflist; /* List of weak references */
|
|
#endif
|
|
} DBCursorObject;
|
|
|
|
|
|
typedef struct {
|
|
PyObject_HEAD
|
|
DB_TXN* txn;
|
|
PyObject *env;
|
|
#ifdef HAVE_WEAKREF
|
|
PyObject *in_weakreflist; /* List of weak references */
|
|
#endif
|
|
} DBTxnObject;
|
|
|
|
|
|
typedef struct {
|
|
PyObject_HEAD
|
|
DB_LOCK lock;
|
|
#ifdef HAVE_WEAKREF
|
|
PyObject *in_weakreflist; /* List of weak references */
|
|
#endif
|
|
} DBLockObject;
|
|
|
|
#if (DBVER >= 43)
|
|
typedef struct {
|
|
PyObject_HEAD
|
|
DB_SEQUENCE* sequence;
|
|
DBObject* mydb;
|
|
#ifdef HAVE_WEAKREF
|
|
PyObject *in_weakreflist; /* List of weak references */
|
|
#endif
|
|
} DBSequenceObject;
|
|
static PyTypeObject DBSequence_Type;
|
|
#endif
|
|
|
|
static PyTypeObject DB_Type, DBCursor_Type, DBEnv_Type, DBTxn_Type, DBLock_Type;
|
|
|
|
#define DBObject_Check(v) ((v)->ob_type == &DB_Type)
|
|
#define DBCursorObject_Check(v) ((v)->ob_type == &DBCursor_Type)
|
|
#define DBEnvObject_Check(v) ((v)->ob_type == &DBEnv_Type)
|
|
#define DBTxnObject_Check(v) ((v)->ob_type == &DBTxn_Type)
|
|
#define DBLockObject_Check(v) ((v)->ob_type == &DBLock_Type)
|
|
#if (DBVER >= 43)
|
|
#define DBSequenceObject_Check(v) ((v)->ob_type == &DBSequence_Type)
|
|
#endif
|
|
|
|
|
|
/* --------------------------------------------------------------------- */
|
|
/* Utility macros and functions */
|
|
|
|
#define RETURN_IF_ERR() \
|
|
if (makeDBError(err)) { \
|
|
return NULL; \
|
|
}
|
|
|
|
#define RETURN_NONE() Py_INCREF(Py_None); return Py_None;
|
|
|
|
#define _CHECK_OBJECT_NOT_CLOSED(nonNull, pyErrObj, name) \
|
|
if ((nonNull) == NULL) { \
|
|
PyObject *errTuple = NULL; \
|
|
errTuple = Py_BuildValue("(is)", 0, #name " object has been closed"); \
|
|
PyErr_SetObject((pyErrObj), errTuple); \
|
|
Py_DECREF(errTuple); \
|
|
return NULL; \
|
|
}
|
|
|
|
#define CHECK_DB_NOT_CLOSED(dbobj) \
|
|
_CHECK_OBJECT_NOT_CLOSED(dbobj->db, DBError, DB)
|
|
|
|
#define CHECK_ENV_NOT_CLOSED(env) \
|
|
_CHECK_OBJECT_NOT_CLOSED(env->db_env, DBError, DBEnv)
|
|
|
|
#define CHECK_CURSOR_NOT_CLOSED(curs) \
|
|
_CHECK_OBJECT_NOT_CLOSED(curs->dbc, DBCursorClosedError, DBCursor)
|
|
|
|
#if (DBVER >= 43)
|
|
#define CHECK_SEQUENCE_NOT_CLOSED(curs) \
|
|
_CHECK_OBJECT_NOT_CLOSED(curs->sequence, DBError, DBSequence)
|
|
#endif
|
|
|
|
#define CHECK_DBFLAG(mydb, flag) (((mydb)->flags & (flag)) || \
|
|
(((mydb)->myenvobj != NULL) && ((mydb)->myenvobj->flags & (flag))))
|
|
|
|
#define CLEAR_DBT(dbt) (memset(&(dbt), 0, sizeof(dbt)))
|
|
|
|
#define FREE_DBT(dbt) if ((dbt.flags & (DB_DBT_MALLOC|DB_DBT_REALLOC)) && \
|
|
dbt.data != NULL) { free(dbt.data); dbt.data = NULL; }
|
|
|
|
|
|
static int makeDBError(int err);
|
|
|
|
|
|
/* Return the access method type of the DBObject */
|
|
static int _DB_get_type(DBObject* self)
|
|
{
|
|
#if (DBVER >= 33)
|
|
DBTYPE type;
|
|
int err;
|
|
err = self->db->get_type(self->db, &type);
|
|
if (makeDBError(err)) {
|
|
return -1;
|
|
}
|
|
return type;
|
|
#else
|
|
return self->db->get_type(self->db);
|
|
#endif
|
|
}
|
|
|
|
|
|
/* Create a DBT structure (containing key and data values) from Python
|
|
strings. Returns 1 on success, 0 on an error. */
|
|
static int make_dbt(PyObject* obj, DBT* dbt)
|
|
{
|
|
CLEAR_DBT(*dbt);
|
|
if (obj == Py_None) {
|
|
/* no need to do anything, the structure has already been zeroed */
|
|
}
|
|
else if (!PyArg_Parse(obj, "s#", &dbt->data, &dbt->size)) {
|
|
PyErr_SetString(PyExc_TypeError,
|
|
"Data values must be of type string or None.");
|
|
return 0;
|
|
}
|
|
return 1;
|
|
}
|
|
|
|
|
|
/* Recno and Queue DBs can have integer keys. This function figures out
|
|
what's been given, verifies that it's allowed, and then makes the DBT.
|
|
|
|
Caller MUST call FREE_DBT(key) when done. */
|
|
static int
|
|
make_key_dbt(DBObject* self, PyObject* keyobj, DBT* key, int* pflags)
|
|
{
|
|
db_recno_t recno;
|
|
int type;
|
|
|
|
CLEAR_DBT(*key);
|
|
if (keyobj == Py_None) {
|
|
type = _DB_get_type(self);
|
|
if (type == -1)
|
|
return 0;
|
|
if (type == DB_RECNO || type == DB_QUEUE) {
|
|
PyErr_SetString(
|
|
PyExc_TypeError,
|
|
"None keys not allowed for Recno and Queue DB's");
|
|
return 0;
|
|
}
|
|
/* no need to do anything, the structure has already been zeroed */
|
|
}
|
|
|
|
else if (PyString_Check(keyobj)) {
|
|
/* verify access method type */
|
|
type = _DB_get_type(self);
|
|
if (type == -1)
|
|
return 0;
|
|
if (type == DB_RECNO || type == DB_QUEUE) {
|
|
PyErr_SetString(
|
|
PyExc_TypeError,
|
|
"String keys not allowed for Recno and Queue DB's");
|
|
return 0;
|
|
}
|
|
|
|
key->data = PyString_AS_STRING(keyobj);
|
|
key->size = PyString_GET_SIZE(keyobj);
|
|
}
|
|
|
|
else if (PyInt_Check(keyobj)) {
|
|
/* verify access method type */
|
|
type = _DB_get_type(self);
|
|
if (type == -1)
|
|
return 0;
|
|
if (type == DB_BTREE && pflags != NULL) {
|
|
/* if BTREE then an Integer key is allowed with the
|
|
* DB_SET_RECNO flag */
|
|
*pflags |= DB_SET_RECNO;
|
|
}
|
|
else if (type != DB_RECNO && type != DB_QUEUE) {
|
|
PyErr_SetString(
|
|
PyExc_TypeError,
|
|
"Integer keys only allowed for Recno and Queue DB's");
|
|
return 0;
|
|
}
|
|
|
|
/* Make a key out of the requested recno, use allocated space so DB
|
|
* will be able to realloc room for the real key if needed. */
|
|
recno = PyInt_AS_LONG(keyobj);
|
|
key->data = malloc(sizeof(db_recno_t));
|
|
if (key->data == NULL) {
|
|
PyErr_SetString(PyExc_MemoryError, "Key memory allocation failed");
|
|
return 0;
|
|
}
|
|
key->ulen = key->size = sizeof(db_recno_t);
|
|
memcpy(key->data, &recno, sizeof(db_recno_t));
|
|
key->flags = DB_DBT_REALLOC;
|
|
}
|
|
else {
|
|
PyErr_Format(PyExc_TypeError,
|
|
"String or Integer object expected for key, %s found",
|
|
keyobj->ob_type->tp_name);
|
|
return 0;
|
|
}
|
|
|
|
return 1;
|
|
}
|
|
|
|
|
|
/* Add partial record access to an existing DBT data struct.
|
|
If dlen and doff are set, then the DB_DBT_PARTIAL flag will be set
|
|
and the data storage/retrieval will be done using dlen and doff. */
|
|
static int add_partial_dbt(DBT* d, int dlen, int doff) {
|
|
/* if neither were set we do nothing (-1 is the default value) */
|
|
if ((dlen == -1) && (doff == -1)) {
|
|
return 1;
|
|
}
|
|
|
|
if ((dlen < 0) || (doff < 0)) {
|
|
PyErr_SetString(PyExc_TypeError, "dlen and doff must both be >= 0");
|
|
return 0;
|
|
}
|
|
|
|
d->flags = d->flags | DB_DBT_PARTIAL;
|
|
d->dlen = (unsigned int) dlen;
|
|
d->doff = (unsigned int) doff;
|
|
return 1;
|
|
}
|
|
|
|
/* a safe strcpy() without the zeroing behaviour and semantics of strncpy. */
|
|
/* TODO: make this use the native libc strlcpy() when available (BSD) */
|
|
unsigned int our_strlcpy(char* dest, const char* src, unsigned int n)
|
|
{
|
|
unsigned int srclen, copylen;
|
|
|
|
srclen = strlen(src);
|
|
if (n <= 0)
|
|
return srclen;
|
|
copylen = (srclen > n-1) ? n-1 : srclen;
|
|
/* populate dest[0] thru dest[copylen-1] */
|
|
memcpy(dest, src, copylen);
|
|
/* guarantee null termination */
|
|
dest[copylen] = 0;
|
|
|
|
return srclen;
|
|
}
|
|
|
|
/* Callback used to save away more information about errors from the DB
|
|
* library. */
|
|
static char _db_errmsg[1024];
|
|
#if (DBVER <= 42)
|
|
static void _db_errorCallback(const char* prefix, char* msg)
|
|
#else
|
|
static void _db_errorCallback(const DB_ENV *db_env,
|
|
const char* prefix, const char* msg)
|
|
#endif
|
|
{
|
|
our_strlcpy(_db_errmsg, msg, sizeof(_db_errmsg));
|
|
}
|
|
|
|
|
|
/* make a nice exception object to raise for errors. */
|
|
static int makeDBError(int err)
|
|
{
|
|
char errTxt[2048]; /* really big, just in case... */
|
|
PyObject *errObj = NULL;
|
|
PyObject *errTuple = NULL;
|
|
int exceptionRaised = 0;
|
|
unsigned int bytes_left;
|
|
|
|
switch (err) {
|
|
case 0: /* successful, no error */ break;
|
|
|
|
#if (DBVER < 41)
|
|
case DB_INCOMPLETE:
|
|
#if INCOMPLETE_IS_WARNING
|
|
bytes_left = our_strlcpy(errTxt, db_strerror(err), sizeof(errTxt));
|
|
/* Ensure that bytes_left never goes negative */
|
|
if (_db_errmsg[0] && bytes_left < (sizeof(errTxt) - 4)) {
|
|
bytes_left = sizeof(errTxt) - bytes_left - 4 - 1;
|
|
assert(bytes_left >= 0);
|
|
strcat(errTxt, " -- ");
|
|
strncat(errTxt, _db_errmsg, bytes_left);
|
|
}
|
|
_db_errmsg[0] = 0;
|
|
#ifdef HAVE_WARNINGS
|
|
exceptionRaised = PyErr_Warn(PyExc_RuntimeWarning, errTxt);
|
|
#else
|
|
fprintf(stderr, errTxt);
|
|
fprintf(stderr, "\n");
|
|
#endif
|
|
|
|
#else /* do an exception instead */
|
|
errObj = DBIncompleteError;
|
|
#endif
|
|
break;
|
|
#endif /* DBVER < 41 */
|
|
|
|
case DB_KEYEMPTY: errObj = DBKeyEmptyError; break;
|
|
case DB_KEYEXIST: errObj = DBKeyExistError; break;
|
|
case DB_LOCK_DEADLOCK: errObj = DBLockDeadlockError; break;
|
|
case DB_LOCK_NOTGRANTED: errObj = DBLockNotGrantedError; break;
|
|
case DB_NOTFOUND: errObj = DBNotFoundError; break;
|
|
case DB_OLD_VERSION: errObj = DBOldVersionError; break;
|
|
case DB_RUNRECOVERY: errObj = DBRunRecoveryError; break;
|
|
case DB_VERIFY_BAD: errObj = DBVerifyBadError; break;
|
|
case DB_NOSERVER: errObj = DBNoServerError; break;
|
|
case DB_NOSERVER_HOME: errObj = DBNoServerHomeError; break;
|
|
case DB_NOSERVER_ID: errObj = DBNoServerIDError; break;
|
|
#if (DBVER >= 33)
|
|
case DB_PAGE_NOTFOUND: errObj = DBPageNotFoundError; break;
|
|
case DB_SECONDARY_BAD: errObj = DBSecondaryBadError; break;
|
|
#endif
|
|
case DB_BUFFER_SMALL: errObj = DBNoMemoryError; break;
|
|
|
|
#if (DBVER >= 43)
|
|
/* ENOMEM and DB_BUFFER_SMALL were one and the same until 4.3 */
|
|
case ENOMEM: errObj = PyExc_MemoryError; break;
|
|
#endif
|
|
case EINVAL: errObj = DBInvalidArgError; break;
|
|
case EACCES: errObj = DBAccessError; break;
|
|
case ENOSPC: errObj = DBNoSpaceError; break;
|
|
case EAGAIN: errObj = DBAgainError; break;
|
|
case EBUSY : errObj = DBBusyError; break;
|
|
case EEXIST: errObj = DBFileExistsError; break;
|
|
case ENOENT: errObj = DBNoSuchFileError; break;
|
|
case EPERM : errObj = DBPermissionsError; break;
|
|
|
|
default: errObj = DBError; break;
|
|
}
|
|
|
|
if (errObj != NULL) {
|
|
bytes_left = our_strlcpy(errTxt, db_strerror(err), sizeof(errTxt));
|
|
/* Ensure that bytes_left never goes negative */
|
|
if (_db_errmsg[0] && bytes_left < (sizeof(errTxt) - 4)) {
|
|
bytes_left = sizeof(errTxt) - bytes_left - 4 - 1;
|
|
assert(bytes_left >= 0);
|
|
strcat(errTxt, " -- ");
|
|
strncat(errTxt, _db_errmsg, bytes_left);
|
|
}
|
|
_db_errmsg[0] = 0;
|
|
|
|
errTuple = Py_BuildValue("(is)", err, errTxt);
|
|
PyErr_SetObject(errObj, errTuple);
|
|
Py_DECREF(errTuple);
|
|
}
|
|
|
|
return ((errObj != NULL) || exceptionRaised);
|
|
}
|
|
|
|
|
|
|
|
/* set a type exception */
|
|
static void makeTypeError(char* expected, PyObject* found)
|
|
{
|
|
PyErr_Format(PyExc_TypeError, "Expected %s argument, %s found.",
|
|
expected, found->ob_type->tp_name);
|
|
}
|
|
|
|
|
|
/* verify that an obj is either None or a DBTxn, and set the txn pointer */
|
|
static int checkTxnObj(PyObject* txnobj, DB_TXN** txn)
|
|
{
|
|
if (txnobj == Py_None || txnobj == NULL) {
|
|
*txn = NULL;
|
|
return 1;
|
|
}
|
|
if (DBTxnObject_Check(txnobj)) {
|
|
*txn = ((DBTxnObject*)txnobj)->txn;
|
|
return 1;
|
|
}
|
|
else
|
|
makeTypeError("DBTxn", txnobj);
|
|
return 0;
|
|
}
|
|
|
|
|
|
/* Delete a key from a database
|
|
Returns 0 on success, -1 on an error. */
|
|
static int _DB_delete(DBObject* self, DB_TXN *txn, DBT *key, int flags)
|
|
{
|
|
int err;
|
|
|
|
MYDB_BEGIN_ALLOW_THREADS;
|
|
err = self->db->del(self->db, txn, key, 0);
|
|
MYDB_END_ALLOW_THREADS;
|
|
if (makeDBError(err)) {
|
|
return -1;
|
|
}
|
|
self->haveStat = 0;
|
|
return 0;
|
|
}
|
|
|
|
|
|
/* Store a key into a database
|
|
Returns 0 on success, -1 on an error. */
|
|
static int _DB_put(DBObject* self, DB_TXN *txn, DBT *key, DBT *data, int flags)
|
|
{
|
|
int err;
|
|
|
|
MYDB_BEGIN_ALLOW_THREADS;
|
|
err = self->db->put(self->db, txn, key, data, flags);
|
|
MYDB_END_ALLOW_THREADS;
|
|
if (makeDBError(err)) {
|
|
return -1;
|
|
}
|
|
self->haveStat = 0;
|
|
return 0;
|
|
}
|
|
|
|
/* Get a key/data pair from a cursor */
|
|
static PyObject* _DBCursor_get(DBCursorObject* self, int extra_flags,
|
|
PyObject *args, PyObject *kwargs, char *format)
|
|
{
|
|
int err;
|
|
PyObject* retval = NULL;
|
|
DBT key, data;
|
|
int dlen = -1;
|
|
int doff = -1;
|
|
int flags = 0;
|
|
static char* kwnames[] = { "flags", "dlen", "doff", NULL };
|
|
|
|
if (!PyArg_ParseTupleAndKeywords(args, kwargs, format, kwnames,
|
|
&flags, &dlen, &doff))
|
|
return NULL;
|
|
|
|
CHECK_CURSOR_NOT_CLOSED(self);
|
|
|
|
flags |= extra_flags;
|
|
CLEAR_DBT(key);
|
|
CLEAR_DBT(data);
|
|
if (CHECK_DBFLAG(self->mydb, DB_THREAD)) {
|
|
/* Tell BerkeleyDB to malloc the return value (thread safe) */
|
|
data.flags = DB_DBT_MALLOC;
|
|
key.flags = DB_DBT_MALLOC;
|
|
}
|
|
if (!add_partial_dbt(&data, dlen, doff))
|
|
return NULL;
|
|
|
|
MYDB_BEGIN_ALLOW_THREADS;
|
|
err = self->dbc->c_get(self->dbc, &key, &data, flags);
|
|
MYDB_END_ALLOW_THREADS;
|
|
|
|
if ((err == DB_NOTFOUND || err == DB_KEYEMPTY)
|
|
&& self->mydb->moduleFlags.getReturnsNone) {
|
|
Py_INCREF(Py_None);
|
|
retval = Py_None;
|
|
}
|
|
else if (makeDBError(err)) {
|
|
retval = NULL;
|
|
}
|
|
else { /* otherwise, success! */
|
|
|
|
/* if Recno or Queue, return the key as an Int */
|
|
switch (_DB_get_type(self->mydb)) {
|
|
case -1:
|
|
retval = NULL;
|
|
break;
|
|
|
|
case DB_RECNO:
|
|
case DB_QUEUE:
|
|
retval = Py_BuildValue("is#", *((db_recno_t*)key.data),
|
|
data.data, data.size);
|
|
break;
|
|
case DB_HASH:
|
|
case DB_BTREE:
|
|
default:
|
|
retval = Py_BuildValue("s#s#", key.data, key.size,
|
|
data.data, data.size);
|
|
break;
|
|
}
|
|
}
|
|
if (!err) {
|
|
FREE_DBT(key);
|
|
FREE_DBT(data);
|
|
}
|
|
return retval;
|
|
}
|
|
|
|
|
|
/* add an integer to a dictionary using the given name as a key */
|
|
static void _addIntToDict(PyObject* dict, char *name, int value)
|
|
{
|
|
PyObject* v = PyInt_FromLong((long) value);
|
|
if (!v || PyDict_SetItemString(dict, name, v))
|
|
PyErr_Clear();
|
|
|
|
Py_XDECREF(v);
|
|
}
|
|
#if (DBVER >= 43)
|
|
/* add an db_seq_t to a dictionary using the given name as a key */
|
|
static void _addDb_seq_tToDict(PyObject* dict, char *name, db_seq_t value)
|
|
{
|
|
PyObject* v = PyLong_FromLongLong(value);
|
|
if (!v || PyDict_SetItemString(dict, name, v))
|
|
PyErr_Clear();
|
|
|
|
Py_XDECREF(v);
|
|
}
|
|
#endif
|
|
|
|
|
|
|
|
/* --------------------------------------------------------------------- */
|
|
/* Allocators and deallocators */
|
|
|
|
static DBObject*
|
|
newDBObject(DBEnvObject* arg, int flags)
|
|
{
|
|
DBObject* self;
|
|
DB_ENV* db_env = NULL;
|
|
int err;
|
|
|
|
self = PyObject_New(DBObject, &DB_Type);
|
|
if (self == NULL)
|
|
return NULL;
|
|
|
|
self->haveStat = 0;
|
|
self->flags = 0;
|
|
self->setflags = 0;
|
|
self->myenvobj = NULL;
|
|
#if (DBVER >= 33)
|
|
self->associateCallback = NULL;
|
|
self->btCompareCallback = NULL;
|
|
self->primaryDBType = 0;
|
|
#endif
|
|
#ifdef HAVE_WEAKREF
|
|
self->in_weakreflist = NULL;
|
|
#endif
|
|
|
|
/* keep a reference to our python DBEnv object */
|
|
if (arg) {
|
|
Py_INCREF(arg);
|
|
self->myenvobj = arg;
|
|
db_env = arg->db_env;
|
|
}
|
|
|
|
if (self->myenvobj)
|
|
self->moduleFlags = self->myenvobj->moduleFlags;
|
|
else
|
|
self->moduleFlags.getReturnsNone = DEFAULT_GET_RETURNS_NONE;
|
|
self->moduleFlags.cursorSetReturnsNone = DEFAULT_CURSOR_SET_RETURNS_NONE;
|
|
|
|
MYDB_BEGIN_ALLOW_THREADS;
|
|
err = db_create(&self->db, db_env, flags);
|
|
if (self->db != NULL) {
|
|
self->db->set_errcall(self->db, _db_errorCallback);
|
|
#if (DBVER >= 33)
|
|
self->db->app_private = (void*)self;
|
|
#endif
|
|
}
|
|
MYDB_END_ALLOW_THREADS;
|
|
/* TODO add a weakref(self) to the self->myenvobj->open_child_weakrefs
|
|
* list so that a DBEnv can refuse to close without aborting any open
|
|
* DBTxns and closing any open DBs first. */
|
|
if (makeDBError(err)) {
|
|
if (self->myenvobj) {
|
|
Py_DECREF(self->myenvobj);
|
|
self->myenvobj = NULL;
|
|
}
|
|
PyObject_Del(self);
|
|
self = NULL;
|
|
}
|
|
return self;
|
|
}
|
|
|
|
|
|
static void
|
|
DB_dealloc(DBObject* self)
|
|
{
|
|
if (self->db != NULL) {
|
|
/* avoid closing a DB when its DBEnv has been closed out from under
|
|
* it */
|
|
if (!self->myenvobj ||
|
|
(self->myenvobj && self->myenvobj->db_env))
|
|
{
|
|
MYDB_BEGIN_ALLOW_THREADS;
|
|
self->db->close(self->db, 0);
|
|
MYDB_END_ALLOW_THREADS;
|
|
#ifdef HAVE_WARNINGS
|
|
} else {
|
|
PyErr_Warn(PyExc_RuntimeWarning,
|
|
"DB could not be closed in destructor: DBEnv already closed");
|
|
#endif
|
|
}
|
|
self->db = NULL;
|
|
}
|
|
#ifdef HAVE_WEAKREF
|
|
if (self->in_weakreflist != NULL) {
|
|
PyObject_ClearWeakRefs((PyObject *) self);
|
|
}
|
|
#endif
|
|
if (self->myenvobj) {
|
|
Py_DECREF(self->myenvobj);
|
|
self->myenvobj = NULL;
|
|
}
|
|
#if (DBVER >= 33)
|
|
if (self->associateCallback != NULL) {
|
|
Py_DECREF(self->associateCallback);
|
|
self->associateCallback = NULL;
|
|
}
|
|
if (self->btCompareCallback != NULL) {
|
|
Py_DECREF(self->btCompareCallback);
|
|
self->btCompareCallback = NULL;
|
|
}
|
|
#endif
|
|
PyObject_Del(self);
|
|
}
|
|
|
|
|
|
static DBCursorObject*
|
|
newDBCursorObject(DBC* dbc, DBObject* db)
|
|
{
|
|
DBCursorObject* self = PyObject_New(DBCursorObject, &DBCursor_Type);
|
|
if (self == NULL)
|
|
return NULL;
|
|
|
|
self->dbc = dbc;
|
|
self->mydb = db;
|
|
#ifdef HAVE_WEAKREF
|
|
self->in_weakreflist = NULL;
|
|
#endif
|
|
Py_INCREF(self->mydb);
|
|
return self;
|
|
}
|
|
|
|
|
|
static void
|
|
DBCursor_dealloc(DBCursorObject* self)
|
|
{
|
|
int err;
|
|
|
|
#ifdef HAVE_WEAKREF
|
|
if (self->in_weakreflist != NULL) {
|
|
PyObject_ClearWeakRefs((PyObject *) self);
|
|
}
|
|
#endif
|
|
|
|
if (self->dbc != NULL) {
|
|
MYDB_BEGIN_ALLOW_THREADS;
|
|
/* If the underlying database has been closed, we don't
|
|
need to do anything. If the environment has been closed
|
|
we need to leak, as BerkeleyDB will crash trying to access
|
|
the environment. There was an exception when the
|
|
user closed the environment even though there still was
|
|
a database open. */
|
|
if (self->mydb->db && self->mydb->myenvobj &&
|
|
!self->mydb->myenvobj->closed)
|
|
err = self->dbc->c_close(self->dbc);
|
|
self->dbc = NULL;
|
|
MYDB_END_ALLOW_THREADS;
|
|
}
|
|
Py_XDECREF( self->mydb );
|
|
PyObject_Del(self);
|
|
}
|
|
|
|
|
|
static DBEnvObject*
|
|
newDBEnvObject(int flags)
|
|
{
|
|
int err;
|
|
DBEnvObject* self = PyObject_New(DBEnvObject, &DBEnv_Type);
|
|
if (self == NULL)
|
|
return NULL;
|
|
|
|
self->closed = 1;
|
|
self->flags = flags;
|
|
self->moduleFlags.getReturnsNone = DEFAULT_GET_RETURNS_NONE;
|
|
self->moduleFlags.cursorSetReturnsNone = DEFAULT_CURSOR_SET_RETURNS_NONE;
|
|
#ifdef HAVE_WEAKREF
|
|
self->in_weakreflist = NULL;
|
|
#endif
|
|
|
|
MYDB_BEGIN_ALLOW_THREADS;
|
|
err = db_env_create(&self->db_env, flags);
|
|
MYDB_END_ALLOW_THREADS;
|
|
if (makeDBError(err)) {
|
|
PyObject_Del(self);
|
|
self = NULL;
|
|
}
|
|
else {
|
|
self->db_env->set_errcall(self->db_env, _db_errorCallback);
|
|
}
|
|
return self;
|
|
}
|
|
|
|
|
|
static void
|
|
DBEnv_dealloc(DBEnvObject* self)
|
|
{
|
|
#ifdef HAVE_WEAKREF
|
|
if (self->in_weakreflist != NULL) {
|
|
PyObject_ClearWeakRefs((PyObject *) self);
|
|
}
|
|
#endif
|
|
|
|
if (self->db_env && !self->closed) {
|
|
MYDB_BEGIN_ALLOW_THREADS;
|
|
self->db_env->close(self->db_env, 0);
|
|
MYDB_END_ALLOW_THREADS;
|
|
}
|
|
PyObject_Del(self);
|
|
}
|
|
|
|
|
|
static DBTxnObject*
|
|
newDBTxnObject(DBEnvObject* myenv, DB_TXN *parent, int flags)
|
|
{
|
|
int err;
|
|
DBTxnObject* self = PyObject_New(DBTxnObject, &DBTxn_Type);
|
|
if (self == NULL)
|
|
return NULL;
|
|
Py_INCREF(myenv);
|
|
self->env = (PyObject*)myenv;
|
|
#ifdef HAVE_WEAKREF
|
|
self->in_weakreflist = NULL;
|
|
#endif
|
|
|
|
MYDB_BEGIN_ALLOW_THREADS;
|
|
#if (DBVER >= 40)
|
|
err = myenv->db_env->txn_begin(myenv->db_env, parent, &(self->txn), flags);
|
|
#else
|
|
err = txn_begin(myenv->db_env, parent, &(self->txn), flags);
|
|
#endif
|
|
MYDB_END_ALLOW_THREADS;
|
|
if (makeDBError(err)) {
|
|
Py_DECREF(self->env);
|
|
PyObject_Del(self);
|
|
self = NULL;
|
|
}
|
|
return self;
|
|
}
|
|
|
|
|
|
static void
|
|
DBTxn_dealloc(DBTxnObject* self)
|
|
{
|
|
#ifdef HAVE_WEAKREF
|
|
if (self->in_weakreflist != NULL) {
|
|
PyObject_ClearWeakRefs((PyObject *) self);
|
|
}
|
|
#endif
|
|
|
|
#ifdef HAVE_WARNINGS
|
|
if (self->txn) {
|
|
/* it hasn't been finalized, abort it! */
|
|
MYDB_BEGIN_ALLOW_THREADS;
|
|
#if (DBVER >= 40)
|
|
self->txn->abort(self->txn);
|
|
#else
|
|
txn_abort(self->txn);
|
|
#endif
|
|
MYDB_END_ALLOW_THREADS;
|
|
PyErr_Warn(PyExc_RuntimeWarning,
|
|
"DBTxn aborted in destructor. No prior commit() or abort().");
|
|
}
|
|
#endif
|
|
|
|
Py_DECREF(self->env);
|
|
PyObject_Del(self);
|
|
}
|
|
|
|
|
|
static DBLockObject*
|
|
newDBLockObject(DBEnvObject* myenv, u_int32_t locker, DBT* obj,
|
|
db_lockmode_t lock_mode, int flags)
|
|
{
|
|
int err;
|
|
DBLockObject* self = PyObject_New(DBLockObject, &DBLock_Type);
|
|
if (self == NULL)
|
|
return NULL;
|
|
#ifdef HAVE_WEAKREF
|
|
self->in_weakreflist = NULL;
|
|
#endif
|
|
|
|
MYDB_BEGIN_ALLOW_THREADS;
|
|
#if (DBVER >= 40)
|
|
err = myenv->db_env->lock_get(myenv->db_env, locker, flags, obj, lock_mode,
|
|
&self->lock);
|
|
#else
|
|
err = lock_get(myenv->db_env, locker, flags, obj, lock_mode, &self->lock);
|
|
#endif
|
|
MYDB_END_ALLOW_THREADS;
|
|
if (makeDBError(err)) {
|
|
PyObject_Del(self);
|
|
self = NULL;
|
|
}
|
|
|
|
return self;
|
|
}
|
|
|
|
|
|
static void
|
|
DBLock_dealloc(DBLockObject* self)
|
|
{
|
|
#ifdef HAVE_WEAKREF
|
|
if (self->in_weakreflist != NULL) {
|
|
PyObject_ClearWeakRefs((PyObject *) self);
|
|
}
|
|
#endif
|
|
/* TODO: is this lock held? should we release it? */
|
|
|
|
PyObject_Del(self);
|
|
}
|
|
|
|
|
|
#if (DBVER >= 43)
|
|
static DBSequenceObject*
|
|
newDBSequenceObject(DBObject* mydb, int flags)
|
|
{
|
|
int err;
|
|
DBSequenceObject* self = PyObject_New(DBSequenceObject, &DBSequence_Type);
|
|
if (self == NULL)
|
|
return NULL;
|
|
Py_INCREF(mydb);
|
|
self->mydb = mydb;
|
|
#ifdef HAVE_WEAKREF
|
|
self->in_weakreflist = NULL;
|
|
#endif
|
|
|
|
|
|
MYDB_BEGIN_ALLOW_THREADS;
|
|
err = db_sequence_create(&self->sequence, self->mydb->db, flags);
|
|
MYDB_END_ALLOW_THREADS;
|
|
if (makeDBError(err)) {
|
|
Py_DECREF(self->mydb);
|
|
PyObject_Del(self);
|
|
self = NULL;
|
|
}
|
|
|
|
return self;
|
|
}
|
|
|
|
|
|
static void
|
|
DBSequence_dealloc(DBSequenceObject* self)
|
|
{
|
|
#ifdef HAVE_WEAKREF
|
|
if (self->in_weakreflist != NULL) {
|
|
PyObject_ClearWeakRefs((PyObject *) self);
|
|
}
|
|
#endif
|
|
|
|
Py_DECREF(self->mydb);
|
|
PyObject_Del(self);
|
|
}
|
|
#endif
|
|
|
|
/* --------------------------------------------------------------------- */
|
|
/* DB methods */
|
|
|
|
static PyObject*
|
|
DB_append(DBObject* self, PyObject* args)
|
|
{
|
|
PyObject* txnobj = NULL;
|
|
PyObject* dataobj;
|
|
db_recno_t recno;
|
|
DBT key, data;
|
|
DB_TXN *txn = NULL;
|
|
|
|
if (!PyArg_UnpackTuple(args, "append", 1, 2, &dataobj, &txnobj))
|
|
return NULL;
|
|
|
|
CHECK_DB_NOT_CLOSED(self);
|
|
|
|
/* make a dummy key out of a recno */
|
|
recno = 0;
|
|
CLEAR_DBT(key);
|
|
key.data = &recno;
|
|
key.size = sizeof(recno);
|
|
key.ulen = key.size;
|
|
key.flags = DB_DBT_USERMEM;
|
|
|
|
if (!make_dbt(dataobj, &data)) return NULL;
|
|
if (!checkTxnObj(txnobj, &txn)) return NULL;
|
|
|
|
if (-1 == _DB_put(self, txn, &key, &data, DB_APPEND))
|
|
return NULL;
|
|
|
|
return PyInt_FromLong(recno);
|
|
}
|
|
|
|
|
|
#if (DBVER >= 33)
|
|
|
|
static int
|
|
_db_associateCallback(DB* db, const DBT* priKey, const DBT* priData,
|
|
DBT* secKey)
|
|
{
|
|
int retval = DB_DONOTINDEX;
|
|
DBObject* secondaryDB = (DBObject*)db->app_private;
|
|
PyObject* callback = secondaryDB->associateCallback;
|
|
int type = secondaryDB->primaryDBType;
|
|
PyObject* args;
|
|
PyObject* result = NULL;
|
|
|
|
|
|
if (callback != NULL) {
|
|
MYDB_BEGIN_BLOCK_THREADS;
|
|
|
|
if (type == DB_RECNO || type == DB_QUEUE)
|
|
args = Py_BuildValue("(ls#)", *((db_recno_t*)priKey->data),
|
|
priData->data, priData->size);
|
|
else
|
|
args = Py_BuildValue("(s#s#)", priKey->data, priKey->size,
|
|
priData->data, priData->size);
|
|
if (args != NULL) {
|
|
result = PyEval_CallObject(callback, args);
|
|
}
|
|
if (args == NULL || result == NULL) {
|
|
PyErr_Print();
|
|
}
|
|
else if (result == Py_None) {
|
|
retval = DB_DONOTINDEX;
|
|
}
|
|
else if (PyInt_Check(result)) {
|
|
retval = PyInt_AsLong(result);
|
|
}
|
|
else if (PyString_Check(result)) {
|
|
char* data;
|
|
Py_ssize_t size;
|
|
|
|
CLEAR_DBT(*secKey);
|
|
#if PYTHON_API_VERSION <= 1007
|
|
/* 1.5 compatibility */
|
|
size = PyString_Size(result);
|
|
data = PyString_AsString(result);
|
|
#else
|
|
PyString_AsStringAndSize(result, &data, &size);
|
|
#endif
|
|
secKey->flags = DB_DBT_APPMALLOC; /* DB will free */
|
|
secKey->data = malloc(size); /* TODO, check this */
|
|
if (secKey->data) {
|
|
memcpy(secKey->data, data, size);
|
|
secKey->size = size;
|
|
retval = 0;
|
|
}
|
|
else {
|
|
PyErr_SetString(PyExc_MemoryError,
|
|
"malloc failed in _db_associateCallback");
|
|
PyErr_Print();
|
|
}
|
|
}
|
|
else {
|
|
PyErr_SetString(
|
|
PyExc_TypeError,
|
|
"DB associate callback should return DB_DONOTINDEX or string.");
|
|
PyErr_Print();
|
|
}
|
|
|
|
Py_XDECREF(args);
|
|
Py_XDECREF(result);
|
|
|
|
MYDB_END_BLOCK_THREADS;
|
|
}
|
|
return retval;
|
|
}
|
|
|
|
|
|
static PyObject*
|
|
DB_associate(DBObject* self, PyObject* args, PyObject* kwargs)
|
|
{
|
|
int err, flags=0;
|
|
DBObject* secondaryDB;
|
|
PyObject* callback;
|
|
#if (DBVER >= 41)
|
|
PyObject *txnobj = NULL;
|
|
DB_TXN *txn = NULL;
|
|
static char* kwnames[] = {"secondaryDB", "callback", "flags", "txn",
|
|
NULL};
|
|
#else
|
|
static char* kwnames[] = {"secondaryDB", "callback", "flags", NULL};
|
|
#endif
|
|
|
|
#if (DBVER >= 41)
|
|
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "OO|iO:associate", kwnames,
|
|
&secondaryDB, &callback, &flags,
|
|
&txnobj)) {
|
|
#else
|
|
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "OO|i:associate", kwnames,
|
|
&secondaryDB, &callback, &flags)) {
|
|
#endif
|
|
return NULL;
|
|
}
|
|
|
|
#if (DBVER >= 41)
|
|
if (!checkTxnObj(txnobj, &txn)) return NULL;
|
|
#endif
|
|
|
|
CHECK_DB_NOT_CLOSED(self);
|
|
if (!DBObject_Check(secondaryDB)) {
|
|
makeTypeError("DB", (PyObject*)secondaryDB);
|
|
return NULL;
|
|
}
|
|
CHECK_DB_NOT_CLOSED(secondaryDB);
|
|
if (callback == Py_None) {
|
|
callback = NULL;
|
|
}
|
|
else if (!PyCallable_Check(callback)) {
|
|
makeTypeError("Callable", callback);
|
|
return NULL;
|
|
}
|
|
|
|
/* Save a reference to the callback in the secondary DB. */
|
|
Py_XDECREF(secondaryDB->associateCallback);
|
|
Py_XINCREF(callback);
|
|
secondaryDB->associateCallback = callback;
|
|
secondaryDB->primaryDBType = _DB_get_type(self);
|
|
|
|
/* PyEval_InitThreads is called here due to a quirk in python 1.5
|
|
* - 2.2.1 (at least) according to Russell Williamson <merel@wt.net>:
|
|
* The global interepreter lock is not initialized until the first
|
|
* thread is created using thread.start_new_thread() or fork() is
|
|
* called. that would cause the ALLOW_THREADS here to segfault due
|
|
* to a null pointer reference if no threads or child processes
|
|
* have been created. This works around that and is a no-op if
|
|
* threads have already been initialized.
|
|
* (see pybsddb-users mailing list post on 2002-08-07)
|
|
*/
|
|
#ifdef WITH_THREAD
|
|
PyEval_InitThreads();
|
|
#endif
|
|
MYDB_BEGIN_ALLOW_THREADS;
|
|
#if (DBVER >= 41)
|
|
err = self->db->associate(self->db,
|
|
txn,
|
|
secondaryDB->db,
|
|
_db_associateCallback,
|
|
flags);
|
|
#else
|
|
err = self->db->associate(self->db,
|
|
secondaryDB->db,
|
|
_db_associateCallback,
|
|
flags);
|
|
#endif
|
|
MYDB_END_ALLOW_THREADS;
|
|
|
|
if (err) {
|
|
Py_XDECREF(secondaryDB->associateCallback);
|
|
secondaryDB->associateCallback = NULL;
|
|
secondaryDB->primaryDBType = 0;
|
|
}
|
|
|
|
RETURN_IF_ERR();
|
|
RETURN_NONE();
|
|
}
|
|
|
|
|
|
#endif
|
|
|
|
|
|
static PyObject*
|
|
DB_close(DBObject* self, PyObject* args)
|
|
{
|
|
int err, flags=0;
|
|
if (!PyArg_ParseTuple(args,"|i:close", &flags))
|
|
return NULL;
|
|
if (self->db != NULL) {
|
|
if (self->myenvobj)
|
|
CHECK_ENV_NOT_CLOSED(self->myenvobj);
|
|
err = self->db->close(self->db, flags);
|
|
self->db = NULL;
|
|
RETURN_IF_ERR();
|
|
}
|
|
RETURN_NONE();
|
|
}
|
|
|
|
|
|
#if (DBVER >= 32)
|
|
static PyObject*
|
|
_DB_consume(DBObject* self, PyObject* args, PyObject* kwargs, int consume_flag)
|
|
{
|
|
int err, flags=0, type;
|
|
PyObject* txnobj = NULL;
|
|
PyObject* retval = NULL;
|
|
DBT key, data;
|
|
DB_TXN *txn = NULL;
|
|
static char* kwnames[] = { "txn", "flags", NULL };
|
|
|
|
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|Oi:consume", kwnames,
|
|
&txnobj, &flags))
|
|
return NULL;
|
|
|
|
CHECK_DB_NOT_CLOSED(self);
|
|
type = _DB_get_type(self);
|
|
if (type == -1)
|
|
return NULL;
|
|
if (type != DB_QUEUE) {
|
|
PyErr_SetString(PyExc_TypeError,
|
|
"Consume methods only allowed for Queue DB's");
|
|
return NULL;
|
|
}
|
|
if (!checkTxnObj(txnobj, &txn))
|
|
return NULL;
|
|
|
|
CLEAR_DBT(key);
|
|
CLEAR_DBT(data);
|
|
if (CHECK_DBFLAG(self, DB_THREAD)) {
|
|
/* Tell BerkeleyDB to malloc the return value (thread safe) */
|
|
data.flags = DB_DBT_MALLOC;
|
|
key.flags = DB_DBT_MALLOC;
|
|
}
|
|
|
|
MYDB_BEGIN_ALLOW_THREADS;
|
|
err = self->db->get(self->db, txn, &key, &data, flags|consume_flag);
|
|
MYDB_END_ALLOW_THREADS;
|
|
|
|
if ((err == DB_NOTFOUND || err == DB_KEYEMPTY)
|
|
&& self->moduleFlags.getReturnsNone) {
|
|
err = 0;
|
|
Py_INCREF(Py_None);
|
|
retval = Py_None;
|
|
}
|
|
else if (!err) {
|
|
retval = Py_BuildValue("s#s#", key.data, key.size, data.data,
|
|
data.size);
|
|
FREE_DBT(key);
|
|
FREE_DBT(data);
|
|
}
|
|
|
|
RETURN_IF_ERR();
|
|
return retval;
|
|
}
|
|
|
|
static PyObject*
|
|
DB_consume(DBObject* self, PyObject* args, PyObject* kwargs, int consume_flag)
|
|
{
|
|
return _DB_consume(self, args, kwargs, DB_CONSUME);
|
|
}
|
|
|
|
static PyObject*
|
|
DB_consume_wait(DBObject* self, PyObject* args, PyObject* kwargs,
|
|
int consume_flag)
|
|
{
|
|
return _DB_consume(self, args, kwargs, DB_CONSUME_WAIT);
|
|
}
|
|
#endif
|
|
|
|
|
|
|
|
static PyObject*
|
|
DB_cursor(DBObject* self, PyObject* args, PyObject* kwargs)
|
|
{
|
|
int err, flags=0;
|
|
DBC* dbc;
|
|
PyObject* txnobj = NULL;
|
|
DB_TXN *txn = NULL;
|
|
static char* kwnames[] = { "txn", "flags", NULL };
|
|
|
|
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|Oi:cursor", kwnames,
|
|
&txnobj, &flags))
|
|
return NULL;
|
|
CHECK_DB_NOT_CLOSED(self);
|
|
if (!checkTxnObj(txnobj, &txn))
|
|
return NULL;
|
|
|
|
MYDB_BEGIN_ALLOW_THREADS;
|
|
err = self->db->cursor(self->db, txn, &dbc, flags);
|
|
MYDB_END_ALLOW_THREADS;
|
|
RETURN_IF_ERR();
|
|
return (PyObject*) newDBCursorObject(dbc, self);
|
|
}
|
|
|
|
|
|
static PyObject*
|
|
DB_delete(DBObject* self, PyObject* args, PyObject* kwargs)
|
|
{
|
|
PyObject* txnobj = NULL;
|
|
int flags = 0;
|
|
PyObject* keyobj;
|
|
DBT key;
|
|
DB_TXN *txn = NULL;
|
|
static char* kwnames[] = { "key", "txn", "flags", NULL };
|
|
|
|
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O|Oi:delete", kwnames,
|
|
&keyobj, &txnobj, &flags))
|
|
return NULL;
|
|
CHECK_DB_NOT_CLOSED(self);
|
|
if (!make_key_dbt(self, keyobj, &key, NULL))
|
|
return NULL;
|
|
if (!checkTxnObj(txnobj, &txn)) {
|
|
FREE_DBT(key);
|
|
return NULL;
|
|
}
|
|
|
|
if (-1 == _DB_delete(self, txn, &key, 0)) {
|
|
FREE_DBT(key);
|
|
return NULL;
|
|
}
|
|
|
|
FREE_DBT(key);
|
|
RETURN_NONE();
|
|
}
|
|
|
|
|
|
static PyObject*
|
|
DB_fd(DBObject* self, PyObject* args)
|
|
{
|
|
int err, the_fd;
|
|
|
|
if (!PyArg_ParseTuple(args,":fd"))
|
|
return NULL;
|
|
CHECK_DB_NOT_CLOSED(self);
|
|
|
|
MYDB_BEGIN_ALLOW_THREADS;
|
|
err = self->db->fd(self->db, &the_fd);
|
|
MYDB_END_ALLOW_THREADS;
|
|
RETURN_IF_ERR();
|
|
return PyInt_FromLong(the_fd);
|
|
}
|
|
|
|
|
|
static PyObject*
|
|
DB_get(DBObject* self, PyObject* args, PyObject* kwargs)
|
|
{
|
|
int err, flags=0;
|
|
PyObject* txnobj = NULL;
|
|
PyObject* keyobj;
|
|
PyObject* dfltobj = NULL;
|
|
PyObject* retval = NULL;
|
|
int dlen = -1;
|
|
int doff = -1;
|
|
DBT key, data;
|
|
DB_TXN *txn = NULL;
|
|
static char* kwnames[] = {"key", "default", "txn", "flags", "dlen",
|
|
"doff", NULL};
|
|
|
|
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O|OOiii:get", kwnames,
|
|
&keyobj, &dfltobj, &txnobj, &flags, &dlen,
|
|
&doff))
|
|
return NULL;
|
|
|
|
CHECK_DB_NOT_CLOSED(self);
|
|
if (!make_key_dbt(self, keyobj, &key, &flags))
|
|
return NULL;
|
|
if (!checkTxnObj(txnobj, &txn)) {
|
|
FREE_DBT(key);
|
|
return NULL;
|
|
}
|
|
|
|
CLEAR_DBT(data);
|
|
if (CHECK_DBFLAG(self, DB_THREAD)) {
|
|
/* Tell BerkeleyDB to malloc the return value (thread safe) */
|
|
data.flags = DB_DBT_MALLOC;
|
|
}
|
|
if (!add_partial_dbt(&data, dlen, doff)) {
|
|
FREE_DBT(key);
|
|
return NULL;
|
|
}
|
|
|
|
MYDB_BEGIN_ALLOW_THREADS;
|
|
err = self->db->get(self->db, txn, &key, &data, flags);
|
|
MYDB_END_ALLOW_THREADS;
|
|
|
|
if ((err == DB_NOTFOUND || err == DB_KEYEMPTY) && (dfltobj != NULL)) {
|
|
err = 0;
|
|
Py_INCREF(dfltobj);
|
|
retval = dfltobj;
|
|
}
|
|
else if ((err == DB_NOTFOUND || err == DB_KEYEMPTY)
|
|
&& self->moduleFlags.getReturnsNone) {
|
|
err = 0;
|
|
Py_INCREF(Py_None);
|
|
retval = Py_None;
|
|
}
|
|
else if (!err) {
|
|
if (flags & DB_SET_RECNO) /* return both key and data */
|
|
retval = Py_BuildValue("s#s#", key.data, key.size, data.data,
|
|
data.size);
|
|
else /* return just the data */
|
|
retval = PyString_FromStringAndSize((char*)data.data, data.size);
|
|
FREE_DBT(data);
|
|
}
|
|
FREE_DBT(key);
|
|
|
|
RETURN_IF_ERR();
|
|
return retval;
|
|
}
|
|
|
|
#if (DBVER >= 33)
|
|
static PyObject*
|
|
DB_pget(DBObject* self, PyObject* args, PyObject* kwargs)
|
|
{
|
|
int err, flags=0;
|
|
PyObject* txnobj = NULL;
|
|
PyObject* keyobj;
|
|
PyObject* dfltobj = NULL;
|
|
PyObject* retval = NULL;
|
|
int dlen = -1;
|
|
int doff = -1;
|
|
DBT key, pkey, data;
|
|
DB_TXN *txn = NULL;
|
|
static char* kwnames[] = {"key", "default", "txn", "flags", "dlen",
|
|
"doff", NULL};
|
|
|
|
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O|OOiii:pget", kwnames,
|
|
&keyobj, &dfltobj, &txnobj, &flags, &dlen,
|
|
&doff))
|
|
return NULL;
|
|
|
|
CHECK_DB_NOT_CLOSED(self);
|
|
if (!make_key_dbt(self, keyobj, &key, &flags))
|
|
return NULL;
|
|
if (!checkTxnObj(txnobj, &txn)) {
|
|
FREE_DBT(key);
|
|
return NULL;
|
|
}
|
|
|
|
CLEAR_DBT(data);
|
|
if (CHECK_DBFLAG(self, DB_THREAD)) {
|
|
/* Tell BerkeleyDB to malloc the return value (thread safe) */
|
|
data.flags = DB_DBT_MALLOC;
|
|
}
|
|
if (!add_partial_dbt(&data, dlen, doff)) {
|
|
FREE_DBT(key);
|
|
return NULL;
|
|
}
|
|
|
|
CLEAR_DBT(pkey);
|
|
pkey.flags = DB_DBT_MALLOC;
|
|
|
|
MYDB_BEGIN_ALLOW_THREADS;
|
|
err = self->db->pget(self->db, txn, &key, &pkey, &data, flags);
|
|
MYDB_END_ALLOW_THREADS;
|
|
|
|
if ((err == DB_NOTFOUND || err == DB_KEYEMPTY) && (dfltobj != NULL)) {
|
|
err = 0;
|
|
Py_INCREF(dfltobj);
|
|
retval = dfltobj;
|
|
}
|
|
else if ((err == DB_NOTFOUND || err == DB_KEYEMPTY)
|
|
&& self->moduleFlags.getReturnsNone) {
|
|
err = 0;
|
|
Py_INCREF(Py_None);
|
|
retval = Py_None;
|
|
}
|
|
else if (!err) {
|
|
PyObject *pkeyObj;
|
|
PyObject *dataObj;
|
|
dataObj = PyString_FromStringAndSize(data.data, data.size);
|
|
|
|
if (self->primaryDBType == DB_RECNO ||
|
|
self->primaryDBType == DB_QUEUE)
|
|
pkeyObj = PyInt_FromLong(*(int *)pkey.data);
|
|
else
|
|
pkeyObj = PyString_FromStringAndSize(pkey.data, pkey.size);
|
|
|
|
if (flags & DB_SET_RECNO) /* return key , pkey and data */
|
|
{
|
|
PyObject *keyObj;
|
|
int type = _DB_get_type(self);
|
|
if (type == DB_RECNO || type == DB_QUEUE)
|
|
keyObj = PyInt_FromLong(*(int *)key.data);
|
|
else
|
|
keyObj = PyString_FromStringAndSize(key.data, key.size);
|
|
#if (PY_VERSION_HEX >= 0x02040000)
|
|
retval = PyTuple_Pack(3, keyObj, pkeyObj, dataObj);
|
|
#else
|
|
retval = Py_BuildValue("OOO", keyObj, pkeyObj, dataObj);
|
|
#endif
|
|
Py_DECREF(keyObj);
|
|
}
|
|
else /* return just the pkey and data */
|
|
{
|
|
#if (PY_VERSION_HEX >= 0x02040000)
|
|
retval = PyTuple_Pack(2, pkeyObj, dataObj);
|
|
#else
|
|
retval = Py_BuildValue("OO", pkeyObj, dataObj);
|
|
#endif
|
|
}
|
|
Py_DECREF(dataObj);
|
|
Py_DECREF(pkeyObj);
|
|
FREE_DBT(pkey);
|
|
FREE_DBT(data);
|
|
}
|
|
FREE_DBT(key);
|
|
|
|
RETURN_IF_ERR();
|
|
return retval;
|
|
}
|
|
#endif
|
|
|
|
|
|
/* Return size of entry */
|
|
static PyObject*
|
|
DB_get_size(DBObject* self, PyObject* args, PyObject* kwargs)
|
|
{
|
|
int err, flags=0;
|
|
PyObject* txnobj = NULL;
|
|
PyObject* keyobj;
|
|
PyObject* retval = NULL;
|
|
DBT key, data;
|
|
DB_TXN *txn = NULL;
|
|
static char* kwnames[] = { "key", "txn", NULL };
|
|
|
|
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O|O:get_size", kwnames,
|
|
&keyobj, &txnobj))
|
|
return NULL;
|
|
CHECK_DB_NOT_CLOSED(self);
|
|
if (!make_key_dbt(self, keyobj, &key, &flags))
|
|
return NULL;
|
|
if (!checkTxnObj(txnobj, &txn)) {
|
|
FREE_DBT(key);
|
|
return NULL;
|
|
}
|
|
CLEAR_DBT(data);
|
|
|
|
/* We don't allocate any memory, forcing a DB_BUFFER_SMALL error and
|
|
thus getting the record size. */
|
|
data.flags = DB_DBT_USERMEM;
|
|
data.ulen = 0;
|
|
MYDB_BEGIN_ALLOW_THREADS;
|
|
err = self->db->get(self->db, txn, &key, &data, flags);
|
|
MYDB_END_ALLOW_THREADS;
|
|
if (err == DB_BUFFER_SMALL) {
|
|
retval = PyInt_FromLong((long)data.size);
|
|
err = 0;
|
|
}
|
|
|
|
FREE_DBT(key);
|
|
FREE_DBT(data);
|
|
RETURN_IF_ERR();
|
|
return retval;
|
|
}
|
|
|
|
|
|
static PyObject*
|
|
DB_get_both(DBObject* self, PyObject* args, PyObject* kwargs)
|
|
{
|
|
int err, flags=0;
|
|
PyObject* txnobj = NULL;
|
|
PyObject* keyobj;
|
|
PyObject* dataobj;
|
|
PyObject* retval = NULL;
|
|
DBT key, data;
|
|
DB_TXN *txn = NULL;
|
|
static char* kwnames[] = { "key", "data", "txn", "flags", NULL };
|
|
|
|
|
|
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "OO|Oi:get_both", kwnames,
|
|
&keyobj, &dataobj, &txnobj, &flags))
|
|
return NULL;
|
|
|
|
CHECK_DB_NOT_CLOSED(self);
|
|
if (!make_key_dbt(self, keyobj, &key, NULL))
|
|
return NULL;
|
|
if ( !make_dbt(dataobj, &data) ||
|
|
!checkTxnObj(txnobj, &txn) )
|
|
{
|
|
FREE_DBT(key);
|
|
return NULL;
|
|
}
|
|
|
|
flags |= DB_GET_BOTH;
|
|
|
|
if (CHECK_DBFLAG(self, DB_THREAD)) {
|
|
/* Tell BerkeleyDB to malloc the return value (thread safe) */
|
|
data.flags = DB_DBT_MALLOC;
|
|
/* TODO: Is this flag needed? We're passing a data object that should
|
|
match what's in the DB, so there should be no need to malloc.
|
|
We run the risk of freeing something twice! Check this. */
|
|
}
|
|
|
|
MYDB_BEGIN_ALLOW_THREADS;
|
|
err = self->db->get(self->db, txn, &key, &data, flags);
|
|
MYDB_END_ALLOW_THREADS;
|
|
|
|
if ((err == DB_NOTFOUND || err == DB_KEYEMPTY)
|
|
&& self->moduleFlags.getReturnsNone) {
|
|
err = 0;
|
|
Py_INCREF(Py_None);
|
|
retval = Py_None;
|
|
}
|
|
else if (!err) {
|
|
retval = PyString_FromStringAndSize((char*)data.data, data.size);
|
|
FREE_DBT(data); /* Only if retrieval was successful */
|
|
}
|
|
|
|
FREE_DBT(key);
|
|
RETURN_IF_ERR();
|
|
return retval;
|
|
}
|
|
|
|
|
|
static PyObject*
|
|
DB_get_byteswapped(DBObject* self, PyObject* args)
|
|
{
|
|
#if (DBVER >= 33)
|
|
int err = 0;
|
|
#endif
|
|
int retval = -1;
|
|
|
|
if (!PyArg_ParseTuple(args,":get_byteswapped"))
|
|
return NULL;
|
|
CHECK_DB_NOT_CLOSED(self);
|
|
|
|
#if (DBVER >= 33)
|
|
MYDB_BEGIN_ALLOW_THREADS;
|
|
err = self->db->get_byteswapped(self->db, &retval);
|
|
MYDB_END_ALLOW_THREADS;
|
|
RETURN_IF_ERR();
|
|
#else
|
|
MYDB_BEGIN_ALLOW_THREADS;
|
|
retval = self->db->get_byteswapped(self->db);
|
|
MYDB_END_ALLOW_THREADS;
|
|
#endif
|
|
return PyInt_FromLong(retval);
|
|
}
|
|
|
|
|
|
static PyObject*
|
|
DB_get_type(DBObject* self, PyObject* args)
|
|
{
|
|
int type;
|
|
|
|
if (!PyArg_ParseTuple(args,":get_type"))
|
|
return NULL;
|
|
CHECK_DB_NOT_CLOSED(self);
|
|
|
|
type = _DB_get_type(self);
|
|
if (type == -1)
|
|
return NULL;
|
|
return PyInt_FromLong(type);
|
|
}
|
|
|
|
|
|
static PyObject*
|
|
DB_join(DBObject* self, PyObject* args)
|
|
{
|
|
int err, flags=0;
|
|
int length, x;
|
|
PyObject* cursorsObj;
|
|
DBC** cursors;
|
|
DBC* dbc;
|
|
|
|
if (!PyArg_ParseTuple(args,"O|i:join", &cursorsObj, &flags))
|
|
return NULL;
|
|
|
|
CHECK_DB_NOT_CLOSED(self);
|
|
|
|
if (!PySequence_Check(cursorsObj)) {
|
|
PyErr_SetString(PyExc_TypeError,
|
|
"Sequence of DBCursor objects expected");
|
|
return NULL;
|
|
}
|
|
|
|
length = PyObject_Length(cursorsObj);
|
|
cursors = malloc((length+1) * sizeof(DBC*));
|
|
if (!cursors) {
|
|
PyErr_NoMemory();
|
|
return NULL;
|
|
}
|
|
|
|
cursors[length] = NULL;
|
|
for (x=0; x<length; x++) {
|
|
PyObject* item = PySequence_GetItem(cursorsObj, x);
|
|
if (item == NULL) {
|
|
free(cursors);
|
|
return NULL;
|
|
}
|
|
if (!DBCursorObject_Check(item)) {
|
|
PyErr_SetString(PyExc_TypeError,
|
|
"Sequence of DBCursor objects expected");
|
|
free(cursors);
|
|
return NULL;
|
|
}
|
|
cursors[x] = ((DBCursorObject*)item)->dbc;
|
|
Py_DECREF(item);
|
|
}
|
|
|
|
MYDB_BEGIN_ALLOW_THREADS;
|
|
err = self->db->join(self->db, cursors, &dbc, flags);
|
|
MYDB_END_ALLOW_THREADS;
|
|
free(cursors);
|
|
RETURN_IF_ERR();
|
|
|
|
/* FIXME: this is a buggy interface. The returned cursor
|
|
contains internal references to the passed in cursors
|
|
but does not hold python references to them or prevent
|
|
them from being closed prematurely. This can cause
|
|
python to crash when things are done in the wrong order. */
|
|
return (PyObject*) newDBCursorObject(dbc, self);
|
|
}
|
|
|
|
|
|
static PyObject*
|
|
DB_key_range(DBObject* self, PyObject* args, PyObject* kwargs)
|
|
{
|
|
int err, flags=0;
|
|
PyObject* txnobj = NULL;
|
|
PyObject* keyobj;
|
|
DBT key;
|
|
DB_TXN *txn = NULL;
|
|
DB_KEY_RANGE range;
|
|
static char* kwnames[] = { "key", "txn", "flags", NULL };
|
|
|
|
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O|Oi:key_range", kwnames,
|
|
&keyobj, &txnobj, &flags))
|
|
return NULL;
|
|
CHECK_DB_NOT_CLOSED(self);
|
|
if (!make_dbt(keyobj, &key))
|
|
/* BTree only, don't need to allow for an int key */
|
|
return NULL;
|
|
if (!checkTxnObj(txnobj, &txn))
|
|
return NULL;
|
|
|
|
MYDB_BEGIN_ALLOW_THREADS;
|
|
err = self->db->key_range(self->db, txn, &key, &range, flags);
|
|
MYDB_END_ALLOW_THREADS;
|
|
|
|
RETURN_IF_ERR();
|
|
return Py_BuildValue("ddd", range.less, range.equal, range.greater);
|
|
}
|
|
|
|
|
|
static PyObject*
|
|
DB_open(DBObject* self, PyObject* args, PyObject* kwargs)
|
|
{
|
|
int err, type = DB_UNKNOWN, flags=0, mode=0660;
|
|
char* filename = NULL;
|
|
char* dbname = NULL;
|
|
#if (DBVER >= 41)
|
|
PyObject *txnobj = NULL;
|
|
DB_TXN *txn = NULL;
|
|
/* with dbname */
|
|
static char* kwnames[] = {
|
|
"filename", "dbname", "dbtype", "flags", "mode", "txn", NULL};
|
|
/* without dbname */
|
|
static char* kwnames_basic[] = {
|
|
"filename", "dbtype", "flags", "mode", "txn", NULL};
|
|
#else
|
|
/* with dbname */
|
|
static char* kwnames[] = {
|
|
"filename", "dbname", "dbtype", "flags", "mode", NULL};
|
|
/* without dbname */
|
|
static char* kwnames_basic[] = {
|
|
"filename", "dbtype", "flags", "mode", NULL};
|
|
#endif
|
|
|
|
#if (DBVER >= 41)
|
|
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "z|ziiiO:open", kwnames,
|
|
&filename, &dbname, &type, &flags, &mode,
|
|
&txnobj))
|
|
#else
|
|
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "z|ziii:open", kwnames,
|
|
&filename, &dbname, &type, &flags,
|
|
&mode))
|
|
#endif
|
|
{
|
|
PyErr_Clear();
|
|
type = DB_UNKNOWN; flags = 0; mode = 0660;
|
|
filename = NULL; dbname = NULL;
|
|
#if (DBVER >= 41)
|
|
if (!PyArg_ParseTupleAndKeywords(args, kwargs,"z|iiiO:open",
|
|
kwnames_basic,
|
|
&filename, &type, &flags, &mode,
|
|
&txnobj))
|
|
return NULL;
|
|
#else
|
|
if (!PyArg_ParseTupleAndKeywords(args, kwargs,"z|iii:open",
|
|
kwnames_basic,
|
|
&filename, &type, &flags, &mode))
|
|
return NULL;
|
|
#endif
|
|
}
|
|
|
|
#if (DBVER >= 41)
|
|
if (!checkTxnObj(txnobj, &txn)) return NULL;
|
|
#endif
|
|
|
|
if (NULL == self->db) {
|
|
PyObject *t = Py_BuildValue("(is)", 0,
|
|
"Cannot call open() twice for DB object");
|
|
PyErr_SetObject(DBError, t);
|
|
Py_DECREF(t);
|
|
return NULL;
|
|
}
|
|
|
|
#if 0 && (DBVER >= 41)
|
|
if ((!txn) && (txnobj != Py_None) && self->myenvobj
|
|
&& (self->myenvobj->flags & DB_INIT_TXN))
|
|
{
|
|
/* If no 'txn' parameter was supplied (no DbTxn object and None was not
|
|
* explicitly passed) but we are in a transaction ready environment:
|
|
* add DB_AUTO_COMMIT to allow for older pybsddb apps using transactions
|
|
* to work on BerkeleyDB 4.1 without needing to modify their
|
|
* DBEnv or DB open calls.
|
|
* TODO make this behaviour of the library configurable.
|
|
*/
|
|
flags |= DB_AUTO_COMMIT;
|
|
}
|
|
#endif
|
|
|
|
MYDB_BEGIN_ALLOW_THREADS;
|
|
#if (DBVER >= 41)
|
|
err = self->db->open(self->db, txn, filename, dbname, type, flags, mode);
|
|
#else
|
|
err = self->db->open(self->db, filename, dbname, type, flags, mode);
|
|
#endif
|
|
MYDB_END_ALLOW_THREADS;
|
|
if (makeDBError(err)) {
|
|
self->db->close(self->db, 0);
|
|
self->db = NULL;
|
|
return NULL;
|
|
}
|
|
|
|
self->flags = flags;
|
|
RETURN_NONE();
|
|
}
|
|
|
|
|
|
static PyObject*
|
|
DB_put(DBObject* self, PyObject* args, PyObject* kwargs)
|
|
{
|
|
int flags=0;
|
|
PyObject* txnobj = NULL;
|
|
int dlen = -1;
|
|
int doff = -1;
|
|
PyObject* keyobj, *dataobj, *retval;
|
|
DBT key, data;
|
|
DB_TXN *txn = NULL;
|
|
static char* kwnames[] = { "key", "data", "txn", "flags", "dlen",
|
|
"doff", NULL };
|
|
|
|
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "OO|Oiii:put", kwnames,
|
|
&keyobj, &dataobj, &txnobj, &flags, &dlen, &doff))
|
|
return NULL;
|
|
|
|
CHECK_DB_NOT_CLOSED(self);
|
|
if (!make_key_dbt(self, keyobj, &key, NULL))
|
|
return NULL;
|
|
if ( !make_dbt(dataobj, &data) ||
|
|
!add_partial_dbt(&data, dlen, doff) ||
|
|
!checkTxnObj(txnobj, &txn) )
|
|
{
|
|
FREE_DBT(key);
|
|
return NULL;
|
|
}
|
|
|
|
if (-1 == _DB_put(self, txn, &key, &data, flags)) {
|
|
FREE_DBT(key);
|
|
return NULL;
|
|
}
|
|
|
|
if (flags & DB_APPEND)
|
|
retval = PyInt_FromLong(*((db_recno_t*)key.data));
|
|
else {
|
|
retval = Py_None;
|
|
Py_INCREF(retval);
|
|
}
|
|
FREE_DBT(key);
|
|
return retval;
|
|
}
|
|
|
|
|
|
|
|
static PyObject*
|
|
DB_remove(DBObject* self, PyObject* args, PyObject* kwargs)
|
|
{
|
|
char* filename;
|
|
char* database = NULL;
|
|
int err, flags=0;
|
|
static char* kwnames[] = { "filename", "dbname", "flags", NULL};
|
|
|
|
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s|zi:remove", kwnames,
|
|
&filename, &database, &flags))
|
|
return NULL;
|
|
CHECK_DB_NOT_CLOSED(self);
|
|
|
|
err = self->db->remove(self->db, filename, database, flags);
|
|
self->db = NULL;
|
|
RETURN_IF_ERR();
|
|
RETURN_NONE();
|
|
}
|
|
|
|
|
|
|
|
static PyObject*
|
|
DB_rename(DBObject* self, PyObject* args)
|
|
{
|
|
char* filename;
|
|
char* database;
|
|
char* newname;
|
|
int err, flags=0;
|
|
|
|
if (!PyArg_ParseTuple(args, "sss|i:rename", &filename, &database, &newname,
|
|
&flags))
|
|
return NULL;
|
|
CHECK_DB_NOT_CLOSED(self);
|
|
|
|
MYDB_BEGIN_ALLOW_THREADS;
|
|
err = self->db->rename(self->db, filename, database, newname, flags);
|
|
MYDB_END_ALLOW_THREADS;
|
|
RETURN_IF_ERR();
|
|
RETURN_NONE();
|
|
}
|
|
|
|
|
|
static PyObject*
|
|
DB_set_bt_minkey(DBObject* self, PyObject* args)
|
|
{
|
|
int err, minkey;
|
|
|
|
if (!PyArg_ParseTuple(args,"i:set_bt_minkey", &minkey ))
|
|
return NULL;
|
|
CHECK_DB_NOT_CLOSED(self);
|
|
|
|
MYDB_BEGIN_ALLOW_THREADS;
|
|
err = self->db->set_bt_minkey(self->db, minkey);
|
|
MYDB_END_ALLOW_THREADS;
|
|
RETURN_IF_ERR();
|
|
RETURN_NONE();
|
|
}
|
|
|
|
#if (DBVER >= 33)
|
|
static int
|
|
_default_cmp(const DBT *leftKey,
|
|
const DBT *rightKey)
|
|
{
|
|
int res;
|
|
int lsize = leftKey->size, rsize = rightKey->size;
|
|
|
|
res = memcmp(leftKey->data, rightKey->data,
|
|
lsize < rsize ? lsize : rsize);
|
|
|
|
if (res == 0) {
|
|
if (lsize < rsize) {
|
|
res = -1;
|
|
}
|
|
else if (lsize > rsize) {
|
|
res = 1;
|
|
}
|
|
}
|
|
return res;
|
|
}
|
|
|
|
static int
|
|
_db_compareCallback(DB* db,
|
|
const DBT *leftKey,
|
|
const DBT *rightKey)
|
|
{
|
|
int res = 0;
|
|
PyObject *args;
|
|
PyObject *result = NULL;
|
|
DBObject *self = (DBObject *)db->app_private;
|
|
|
|
if (self == NULL || self->btCompareCallback == NULL) {
|
|
MYDB_BEGIN_BLOCK_THREADS;
|
|
PyErr_SetString(PyExc_TypeError,
|
|
(self == 0
|
|
? "DB_bt_compare db is NULL."
|
|
: "DB_bt_compare callback is NULL."));
|
|
/* we're in a callback within the DB code, we can't raise */
|
|
PyErr_Print();
|
|
res = _default_cmp(leftKey, rightKey);
|
|
MYDB_END_BLOCK_THREADS;
|
|
} else {
|
|
MYDB_BEGIN_BLOCK_THREADS;
|
|
|
|
args = Py_BuildValue("s#s#", leftKey->data, leftKey->size,
|
|
rightKey->data, rightKey->size);
|
|
if (args != NULL) {
|
|
/* XXX(twouters) I highly doubt this INCREF is correct */
|
|
Py_INCREF(self);
|
|
result = PyEval_CallObject(self->btCompareCallback, args);
|
|
}
|
|
if (args == NULL || result == NULL) {
|
|
/* we're in a callback within the DB code, we can't raise */
|
|
PyErr_Print();
|
|
res = _default_cmp(leftKey, rightKey);
|
|
} else if (PyInt_Check(result)) {
|
|
res = PyInt_AsLong(result);
|
|
} else {
|
|
PyErr_SetString(PyExc_TypeError,
|
|
"DB_bt_compare callback MUST return an int.");
|
|
/* we're in a callback within the DB code, we can't raise */
|
|
PyErr_Print();
|
|
res = _default_cmp(leftKey, rightKey);
|
|
}
|
|
|
|
Py_XDECREF(args);
|
|
Py_XDECREF(result);
|
|
|
|
MYDB_END_BLOCK_THREADS;
|
|
}
|
|
return res;
|
|
}
|
|
|
|
static PyObject*
|
|
DB_set_bt_compare(DBObject* self, PyObject* args)
|
|
{
|
|
int err;
|
|
PyObject *comparator;
|
|
PyObject *tuple, *result;
|
|
|
|
if (!PyArg_ParseTuple(args, "O:set_bt_compare", &comparator))
|
|
return NULL;
|
|
|
|
CHECK_DB_NOT_CLOSED(self);
|
|
|
|
if (!PyCallable_Check(comparator)) {
|
|
makeTypeError("Callable", comparator);
|
|
return NULL;
|
|
}
|
|
|
|
/*
|
|
* Perform a test call of the comparator function with two empty
|
|
* string objects here. verify that it returns an int (0).
|
|
* err if not.
|
|
*/
|
|
tuple = Py_BuildValue("(ss)", "", "");
|
|
result = PyEval_CallObject(comparator, tuple);
|
|
Py_DECREF(tuple);
|
|
if (result == NULL)
|
|
return NULL;
|
|
if (!PyInt_Check(result)) {
|
|
PyErr_SetString(PyExc_TypeError,
|
|
"callback MUST return an int");
|
|
return NULL;
|
|
} else if (PyInt_AsLong(result) != 0) {
|
|
PyErr_SetString(PyExc_TypeError,
|
|
"callback failed to return 0 on two empty strings");
|
|
return NULL;
|
|
}
|
|
Py_DECREF(result);
|
|
|
|
/* We don't accept multiple set_bt_compare operations, in order to
|
|
* simplify the code. This would have no real use, as one cannot
|
|
* change the function once the db is opened anyway */
|
|
if (self->btCompareCallback != NULL) {
|
|
PyErr_SetString(PyExc_RuntimeError, "set_bt_compare() cannot be called more than once");
|
|
return NULL;
|
|
}
|
|
|
|
Py_INCREF(comparator);
|
|
self->btCompareCallback = comparator;
|
|
|
|
/* This is to workaround a problem with un-initialized threads (see
|
|
comment in DB_associate) */
|
|
#ifdef WITH_THREAD
|
|
PyEval_InitThreads();
|
|
#endif
|
|
|
|
err = self->db->set_bt_compare(self->db, _db_compareCallback);
|
|
|
|
if (err) {
|
|
/* restore the old state in case of error */
|
|
Py_DECREF(comparator);
|
|
self->btCompareCallback = NULL;
|
|
}
|
|
|
|
RETURN_IF_ERR();
|
|
RETURN_NONE();
|
|
}
|
|
#endif /* DBVER >= 33 */
|
|
|
|
|
|
static PyObject*
|
|
DB_set_cachesize(DBObject* self, PyObject* args)
|
|
{
|
|
int err;
|
|
int gbytes = 0, bytes = 0, ncache = 0;
|
|
|
|
if (!PyArg_ParseTuple(args,"ii|i:set_cachesize",
|
|
&gbytes,&bytes,&ncache))
|
|
return NULL;
|
|
CHECK_DB_NOT_CLOSED(self);
|
|
|
|
MYDB_BEGIN_ALLOW_THREADS;
|
|
err = self->db->set_cachesize(self->db, gbytes, bytes, ncache);
|
|
MYDB_END_ALLOW_THREADS;
|
|
RETURN_IF_ERR();
|
|
RETURN_NONE();
|
|
}
|
|
|
|
|
|
static PyObject*
|
|
DB_set_flags(DBObject* self, PyObject* args)
|
|
{
|
|
int err, flags;
|
|
|
|
if (!PyArg_ParseTuple(args,"i:set_flags", &flags))
|
|
return NULL;
|
|
CHECK_DB_NOT_CLOSED(self);
|
|
|
|
MYDB_BEGIN_ALLOW_THREADS;
|
|
err = self->db->set_flags(self->db, flags);
|
|
MYDB_END_ALLOW_THREADS;
|
|
RETURN_IF_ERR();
|
|
|
|
self->setflags |= flags;
|
|
RETURN_NONE();
|
|
}
|
|
|
|
|
|
static PyObject*
|
|
DB_set_h_ffactor(DBObject* self, PyObject* args)
|
|
{
|
|
int err, ffactor;
|
|
|
|
if (!PyArg_ParseTuple(args,"i:set_h_ffactor", &ffactor))
|
|
return NULL;
|
|
CHECK_DB_NOT_CLOSED(self);
|
|
|
|
MYDB_BEGIN_ALLOW_THREADS;
|
|
err = self->db->set_h_ffactor(self->db, ffactor);
|
|
MYDB_END_ALLOW_THREADS;
|
|
RETURN_IF_ERR();
|
|
RETURN_NONE();
|
|
}
|
|
|
|
|
|
static PyObject*
|
|
DB_set_h_nelem(DBObject* self, PyObject* args)
|
|
{
|
|
int err, nelem;
|
|
|
|
if (!PyArg_ParseTuple(args,"i:set_h_nelem", &nelem))
|
|
return NULL;
|
|
CHECK_DB_NOT_CLOSED(self);
|
|
|
|
MYDB_BEGIN_ALLOW_THREADS;
|
|
err = self->db->set_h_nelem(self->db, nelem);
|
|
MYDB_END_ALLOW_THREADS;
|
|
RETURN_IF_ERR();
|
|
RETURN_NONE();
|
|
}
|
|
|
|
|
|
static PyObject*
|
|
DB_set_lorder(DBObject* self, PyObject* args)
|
|
{
|
|
int err, lorder;
|
|
|
|
if (!PyArg_ParseTuple(args,"i:set_lorder", &lorder))
|
|
return NULL;
|
|
CHECK_DB_NOT_CLOSED(self);
|
|
|
|
MYDB_BEGIN_ALLOW_THREADS;
|
|
err = self->db->set_lorder(self->db, lorder);
|
|
MYDB_END_ALLOW_THREADS;
|
|
RETURN_IF_ERR();
|
|
RETURN_NONE();
|
|
}
|
|
|
|
|
|
static PyObject*
|
|
DB_set_pagesize(DBObject* self, PyObject* args)
|
|
{
|
|
int err, pagesize;
|
|
|
|
if (!PyArg_ParseTuple(args,"i:set_pagesize", &pagesize))
|
|
return NULL;
|
|
CHECK_DB_NOT_CLOSED(self);
|
|
|
|
MYDB_BEGIN_ALLOW_THREADS;
|
|
err = self->db->set_pagesize(self->db, pagesize);
|
|
MYDB_END_ALLOW_THREADS;
|
|
RETURN_IF_ERR();
|
|
RETURN_NONE();
|
|
}
|
|
|
|
|
|
static PyObject*
|
|
DB_set_re_delim(DBObject* self, PyObject* args)
|
|
{
|
|
int err;
|
|
char delim;
|
|
|
|
if (!PyArg_ParseTuple(args,"b:set_re_delim", &delim)) {
|
|
PyErr_Clear();
|
|
if (!PyArg_ParseTuple(args,"c:set_re_delim", &delim))
|
|
return NULL;
|
|
}
|
|
|
|
CHECK_DB_NOT_CLOSED(self);
|
|
|
|
MYDB_BEGIN_ALLOW_THREADS;
|
|
err = self->db->set_re_delim(self->db, delim);
|
|
MYDB_END_ALLOW_THREADS;
|
|
RETURN_IF_ERR();
|
|
RETURN_NONE();
|
|
}
|
|
|
|
static PyObject*
|
|
DB_set_re_len(DBObject* self, PyObject* args)
|
|
{
|
|
int err, len;
|
|
|
|
if (!PyArg_ParseTuple(args,"i:set_re_len", &len))
|
|
return NULL;
|
|
CHECK_DB_NOT_CLOSED(self);
|
|
|
|
MYDB_BEGIN_ALLOW_THREADS;
|
|
err = self->db->set_re_len(self->db, len);
|
|
MYDB_END_ALLOW_THREADS;
|
|
RETURN_IF_ERR();
|
|
RETURN_NONE();
|
|
}
|
|
|
|
|
|
static PyObject*
|
|
DB_set_re_pad(DBObject* self, PyObject* args)
|
|
{
|
|
int err;
|
|
char pad;
|
|
|
|
if (!PyArg_ParseTuple(args,"b:set_re_pad", &pad)) {
|
|
PyErr_Clear();
|
|
if (!PyArg_ParseTuple(args,"c:set_re_pad", &pad))
|
|
return NULL;
|
|
}
|
|
CHECK_DB_NOT_CLOSED(self);
|
|
|
|
MYDB_BEGIN_ALLOW_THREADS;
|
|
err = self->db->set_re_pad(self->db, pad);
|
|
MYDB_END_ALLOW_THREADS;
|
|
RETURN_IF_ERR();
|
|
RETURN_NONE();
|
|
}
|
|
|
|
|
|
static PyObject*
|
|
DB_set_re_source(DBObject* self, PyObject* args)
|
|
{
|
|
int err;
|
|
char *re_source;
|
|
|
|
if (!PyArg_ParseTuple(args,"s:set_re_source", &re_source))
|
|
return NULL;
|
|
CHECK_DB_NOT_CLOSED(self);
|
|
|
|
MYDB_BEGIN_ALLOW_THREADS;
|
|
err = self->db->set_re_source(self->db, re_source);
|
|
MYDB_END_ALLOW_THREADS;
|
|
RETURN_IF_ERR();
|
|
RETURN_NONE();
|
|
}
|
|
|
|
|
|
#if (DBVER >= 32)
|
|
static PyObject*
|
|
DB_set_q_extentsize(DBObject* self, PyObject* args)
|
|
{
|
|
int err;
|
|
int extentsize;
|
|
|
|
if (!PyArg_ParseTuple(args,"i:set_q_extentsize", &extentsize))
|
|
return NULL;
|
|
CHECK_DB_NOT_CLOSED(self);
|
|
|
|
MYDB_BEGIN_ALLOW_THREADS;
|
|
err = self->db->set_q_extentsize(self->db, extentsize);
|
|
MYDB_END_ALLOW_THREADS;
|
|
RETURN_IF_ERR();
|
|
RETURN_NONE();
|
|
}
|
|
#endif
|
|
|
|
static PyObject*
|
|
DB_stat(DBObject* self, PyObject* args, PyObject* kwargs)
|
|
{
|
|
int err, flags = 0, type;
|
|
void* sp;
|
|
PyObject* d;
|
|
#if (DBVER >= 43)
|
|
PyObject* txnobj = NULL;
|
|
DB_TXN *txn = NULL;
|
|
static char* kwnames[] = { "flags", "txn", NULL };
|
|
#else
|
|
static char* kwnames[] = { "flags", NULL };
|
|
#endif
|
|
|
|
#if (DBVER >= 43)
|
|
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|iO:stat", kwnames,
|
|
&flags, &txnobj))
|
|
return NULL;
|
|
if (!checkTxnObj(txnobj, &txn))
|
|
return NULL;
|
|
#else
|
|
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|i:stat", kwnames, &flags))
|
|
return NULL;
|
|
#endif
|
|
CHECK_DB_NOT_CLOSED(self);
|
|
|
|
MYDB_BEGIN_ALLOW_THREADS;
|
|
#if (DBVER >= 43)
|
|
err = self->db->stat(self->db, txn, &sp, flags);
|
|
#elif (DBVER >= 33)
|
|
err = self->db->stat(self->db, &sp, flags);
|
|
#else
|
|
err = self->db->stat(self->db, &sp, NULL, flags);
|
|
#endif
|
|
MYDB_END_ALLOW_THREADS;
|
|
RETURN_IF_ERR();
|
|
|
|
self->haveStat = 1;
|
|
|
|
/* Turn the stat structure into a dictionary */
|
|
type = _DB_get_type(self);
|
|
if ((type == -1) || ((d = PyDict_New()) == NULL)) {
|
|
free(sp);
|
|
return NULL;
|
|
}
|
|
|
|
#define MAKE_HASH_ENTRY(name) _addIntToDict(d, #name, ((DB_HASH_STAT*)sp)->hash_##name)
|
|
#define MAKE_BT_ENTRY(name) _addIntToDict(d, #name, ((DB_BTREE_STAT*)sp)->bt_##name)
|
|
#define MAKE_QUEUE_ENTRY(name) _addIntToDict(d, #name, ((DB_QUEUE_STAT*)sp)->qs_##name)
|
|
|
|
switch (type) {
|
|
case DB_HASH:
|
|
MAKE_HASH_ENTRY(magic);
|
|
MAKE_HASH_ENTRY(version);
|
|
MAKE_HASH_ENTRY(nkeys);
|
|
MAKE_HASH_ENTRY(ndata);
|
|
MAKE_HASH_ENTRY(pagesize);
|
|
#if (DBVER < 41)
|
|
MAKE_HASH_ENTRY(nelem);
|
|
#endif
|
|
MAKE_HASH_ENTRY(ffactor);
|
|
MAKE_HASH_ENTRY(buckets);
|
|
MAKE_HASH_ENTRY(free);
|
|
MAKE_HASH_ENTRY(bfree);
|
|
MAKE_HASH_ENTRY(bigpages);
|
|
MAKE_HASH_ENTRY(big_bfree);
|
|
MAKE_HASH_ENTRY(overflows);
|
|
MAKE_HASH_ENTRY(ovfl_free);
|
|
MAKE_HASH_ENTRY(dup);
|
|
MAKE_HASH_ENTRY(dup_free);
|
|
break;
|
|
|
|
case DB_BTREE:
|
|
case DB_RECNO:
|
|
MAKE_BT_ENTRY(magic);
|
|
MAKE_BT_ENTRY(version);
|
|
MAKE_BT_ENTRY(nkeys);
|
|
MAKE_BT_ENTRY(ndata);
|
|
MAKE_BT_ENTRY(pagesize);
|
|
MAKE_BT_ENTRY(minkey);
|
|
MAKE_BT_ENTRY(re_len);
|
|
MAKE_BT_ENTRY(re_pad);
|
|
MAKE_BT_ENTRY(levels);
|
|
MAKE_BT_ENTRY(int_pg);
|
|
MAKE_BT_ENTRY(leaf_pg);
|
|
MAKE_BT_ENTRY(dup_pg);
|
|
MAKE_BT_ENTRY(over_pg);
|
|
MAKE_BT_ENTRY(free);
|
|
MAKE_BT_ENTRY(int_pgfree);
|
|
MAKE_BT_ENTRY(leaf_pgfree);
|
|
MAKE_BT_ENTRY(dup_pgfree);
|
|
MAKE_BT_ENTRY(over_pgfree);
|
|
break;
|
|
|
|
case DB_QUEUE:
|
|
MAKE_QUEUE_ENTRY(magic);
|
|
MAKE_QUEUE_ENTRY(version);
|
|
MAKE_QUEUE_ENTRY(nkeys);
|
|
MAKE_QUEUE_ENTRY(ndata);
|
|
MAKE_QUEUE_ENTRY(pagesize);
|
|
MAKE_QUEUE_ENTRY(pages);
|
|
MAKE_QUEUE_ENTRY(re_len);
|
|
MAKE_QUEUE_ENTRY(re_pad);
|
|
MAKE_QUEUE_ENTRY(pgfree);
|
|
#if (DBVER == 31)
|
|
MAKE_QUEUE_ENTRY(start);
|
|
#endif
|
|
MAKE_QUEUE_ENTRY(first_recno);
|
|
MAKE_QUEUE_ENTRY(cur_recno);
|
|
break;
|
|
|
|
default:
|
|
PyErr_SetString(PyExc_TypeError, "Unknown DB type, unable to stat");
|
|
Py_DECREF(d);
|
|
d = NULL;
|
|
}
|
|
|
|
#undef MAKE_HASH_ENTRY
|
|
#undef MAKE_BT_ENTRY
|
|
#undef MAKE_QUEUE_ENTRY
|
|
|
|
free(sp);
|
|
return d;
|
|
}
|
|
|
|
static PyObject*
|
|
DB_sync(DBObject* self, PyObject* args)
|
|
{
|
|
int err;
|
|
int flags = 0;
|
|
|
|
if (!PyArg_ParseTuple(args,"|i:sync", &flags ))
|
|
return NULL;
|
|
CHECK_DB_NOT_CLOSED(self);
|
|
|
|
MYDB_BEGIN_ALLOW_THREADS;
|
|
err = self->db->sync(self->db, flags);
|
|
MYDB_END_ALLOW_THREADS;
|
|
RETURN_IF_ERR();
|
|
RETURN_NONE();
|
|
}
|
|
|
|
|
|
#if (DBVER >= 33)
|
|
static PyObject*
|
|
DB_truncate(DBObject* self, PyObject* args, PyObject* kwargs)
|
|
{
|
|
int err, flags=0;
|
|
u_int32_t count=0;
|
|
PyObject* txnobj = NULL;
|
|
DB_TXN *txn = NULL;
|
|
static char* kwnames[] = { "txn", "flags", NULL };
|
|
|
|
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|Oi:cursor", kwnames,
|
|
&txnobj, &flags))
|
|
return NULL;
|
|
CHECK_DB_NOT_CLOSED(self);
|
|
if (!checkTxnObj(txnobj, &txn))
|
|
return NULL;
|
|
|
|
MYDB_BEGIN_ALLOW_THREADS;
|
|
err = self->db->truncate(self->db, txn, &count, flags);
|
|
MYDB_END_ALLOW_THREADS;
|
|
RETURN_IF_ERR();
|
|
return PyInt_FromLong(count);
|
|
}
|
|
#endif
|
|
|
|
|
|
static PyObject*
|
|
DB_upgrade(DBObject* self, PyObject* args)
|
|
{
|
|
int err, flags=0;
|
|
char *filename;
|
|
|
|
if (!PyArg_ParseTuple(args,"s|i:upgrade", &filename, &flags))
|
|
return NULL;
|
|
CHECK_DB_NOT_CLOSED(self);
|
|
|
|
MYDB_BEGIN_ALLOW_THREADS;
|
|
err = self->db->upgrade(self->db, filename, flags);
|
|
MYDB_END_ALLOW_THREADS;
|
|
RETURN_IF_ERR();
|
|
RETURN_NONE();
|
|
}
|
|
|
|
|
|
static PyObject*
|
|
DB_verify(DBObject* self, PyObject* args, PyObject* kwargs)
|
|
{
|
|
int err, flags=0;
|
|
char* fileName;
|
|
char* dbName=NULL;
|
|
char* outFileName=NULL;
|
|
FILE* outFile=NULL;
|
|
static char* kwnames[] = { "filename", "dbname", "outfile", "flags",
|
|
NULL };
|
|
|
|
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s|zzi:verify", kwnames,
|
|
&fileName, &dbName, &outFileName, &flags))
|
|
return NULL;
|
|
|
|
CHECK_DB_NOT_CLOSED(self);
|
|
if (outFileName)
|
|
outFile = fopen(outFileName, "w");
|
|
/* XXX(nnorwitz): it should probably be an exception if outFile
|
|
can't be opened. */
|
|
|
|
MYDB_BEGIN_ALLOW_THREADS;
|
|
err = self->db->verify(self->db, fileName, dbName, outFile, flags);
|
|
MYDB_END_ALLOW_THREADS;
|
|
if (outFile)
|
|
fclose(outFile);
|
|
|
|
/* DB.verify acts as a DB handle destructor (like close); this was
|
|
* documented in BerkeleyDB 4.2 but had the undocumented effect
|
|
* of not being safe in prior versions while still requiring an explicit
|
|
* DB.close call afterwards. Lets call close for the user to emulate
|
|
* the safe 4.2 behaviour. */
|
|
#if (DBVER <= 41)
|
|
self->db->close(self->db, 0);
|
|
#endif
|
|
self->db = NULL;
|
|
|
|
RETURN_IF_ERR();
|
|
RETURN_NONE();
|
|
}
|
|
|
|
|
|
static PyObject*
|
|
DB_set_get_returns_none(DBObject* self, PyObject* args)
|
|
{
|
|
int flags=0;
|
|
int oldValue=0;
|
|
|
|
if (!PyArg_ParseTuple(args,"i:set_get_returns_none", &flags))
|
|
return NULL;
|
|
CHECK_DB_NOT_CLOSED(self);
|
|
|
|
if (self->moduleFlags.getReturnsNone)
|
|
++oldValue;
|
|
if (self->moduleFlags.cursorSetReturnsNone)
|
|
++oldValue;
|
|
self->moduleFlags.getReturnsNone = (flags >= 1);
|
|
self->moduleFlags.cursorSetReturnsNone = (flags >= 2);
|
|
return PyInt_FromLong(oldValue);
|
|
}
|
|
|
|
#if (DBVER >= 41)
|
|
static PyObject*
|
|
DB_set_encrypt(DBObject* self, PyObject* args, PyObject* kwargs)
|
|
{
|
|
int err;
|
|
u_int32_t flags=0;
|
|
char *passwd = NULL;
|
|
static char* kwnames[] = { "passwd", "flags", NULL };
|
|
|
|
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s|i:set_encrypt", kwnames,
|
|
&passwd, &flags)) {
|
|
return NULL;
|
|
}
|
|
|
|
MYDB_BEGIN_ALLOW_THREADS;
|
|
err = self->db->set_encrypt(self->db, passwd, flags);
|
|
MYDB_END_ALLOW_THREADS;
|
|
|
|
RETURN_IF_ERR();
|
|
RETURN_NONE();
|
|
}
|
|
#endif /* DBVER >= 41 */
|
|
|
|
|
|
/*-------------------------------------------------------------- */
|
|
/* Mapping and Dictionary-like access routines */
|
|
|
|
Py_ssize_t DB_length(PyObject* _self)
|
|
{
|
|
int err;
|
|
Py_ssize_t size = 0;
|
|
int flags = 0;
|
|
void* sp;
|
|
DBObject* self = (DBObject*)_self;
|
|
|
|
if (self->db == NULL) {
|
|
PyObject *t = Py_BuildValue("(is)", 0, "DB object has been closed");
|
|
PyErr_SetObject(DBError, t);
|
|
Py_DECREF(t);
|
|
return -1;
|
|
}
|
|
|
|
if (self->haveStat) { /* Has the stat function been called recently? If
|
|
so, we can use the cached value. */
|
|
flags = DB_FAST_STAT;
|
|
}
|
|
|
|
MYDB_BEGIN_ALLOW_THREADS;
|
|
redo_stat_for_length:
|
|
#if (DBVER >= 43)
|
|
err = self->db->stat(self->db, /*txnid*/ NULL, &sp, flags);
|
|
#elif (DBVER >= 33)
|
|
err = self->db->stat(self->db, &sp, flags);
|
|
#else
|
|
err = self->db->stat(self->db, &sp, NULL, flags);
|
|
#endif
|
|
|
|
/* All the stat structures have matching fields upto the ndata field,
|
|
so we can use any of them for the type cast */
|
|
size = ((DB_BTREE_STAT*)sp)->bt_ndata;
|
|
|
|
/* A size of 0 could mean that BerkeleyDB no longer had the stat values cached.
|
|
* redo a full stat to make sure.
|
|
* Fixes SF python bug 1493322, pybsddb bug 1184012
|
|
*/
|
|
if (size == 0 && (flags & DB_FAST_STAT)) {
|
|
flags = 0;
|
|
if (!err)
|
|
free(sp);
|
|
goto redo_stat_for_length;
|
|
}
|
|
|
|
MYDB_END_ALLOW_THREADS;
|
|
|
|
if (err)
|
|
return -1;
|
|
|
|
self->haveStat = 1;
|
|
|
|
free(sp);
|
|
return size;
|
|
}
|
|
|
|
|
|
PyObject* DB_subscript(DBObject* self, PyObject* keyobj)
|
|
{
|
|
int err;
|
|
PyObject* retval;
|
|
DBT key;
|
|
DBT data;
|
|
|
|
CHECK_DB_NOT_CLOSED(self);
|
|
if (!make_key_dbt(self, keyobj, &key, NULL))
|
|
return NULL;
|
|
|
|
CLEAR_DBT(data);
|
|
if (CHECK_DBFLAG(self, DB_THREAD)) {
|
|
/* Tell BerkeleyDB to malloc the return value (thread safe) */
|
|
data.flags = DB_DBT_MALLOC;
|
|
}
|
|
MYDB_BEGIN_ALLOW_THREADS;
|
|
err = self->db->get(self->db, NULL, &key, &data, 0);
|
|
MYDB_END_ALLOW_THREADS;
|
|
if (err == DB_NOTFOUND || err == DB_KEYEMPTY) {
|
|
PyErr_SetObject(PyExc_KeyError, keyobj);
|
|
retval = NULL;
|
|
}
|
|
else if (makeDBError(err)) {
|
|
retval = NULL;
|
|
}
|
|
else {
|
|
retval = PyString_FromStringAndSize((char*)data.data, data.size);
|
|
FREE_DBT(data);
|
|
}
|
|
|
|
FREE_DBT(key);
|
|
return retval;
|
|
}
|
|
|
|
|
|
static int
|
|
DB_ass_sub(DBObject* self, PyObject* keyobj, PyObject* dataobj)
|
|
{
|
|
DBT key, data;
|
|
int retval;
|
|
int flags = 0;
|
|
|
|
if (self->db == NULL) {
|
|
PyObject *t = Py_BuildValue("(is)", 0, "DB object has been closed");
|
|
PyErr_SetObject(DBError, t);
|
|
Py_DECREF(t);
|
|
return -1;
|
|
}
|
|
|
|
if (!make_key_dbt(self, keyobj, &key, NULL))
|
|
return -1;
|
|
|
|
if (dataobj != NULL) {
|
|
if (!make_dbt(dataobj, &data))
|
|
retval = -1;
|
|
else {
|
|
if (self->setflags & (DB_DUP|DB_DUPSORT))
|
|
/* dictionaries shouldn't have duplicate keys */
|
|
flags = DB_NOOVERWRITE;
|
|
retval = _DB_put(self, NULL, &key, &data, flags);
|
|
|
|
if ((retval == -1) && (self->setflags & (DB_DUP|DB_DUPSORT))) {
|
|
/* try deleting any old record that matches and then PUT it
|
|
* again... */
|
|
_DB_delete(self, NULL, &key, 0);
|
|
PyErr_Clear();
|
|
retval = _DB_put(self, NULL, &key, &data, flags);
|
|
}
|
|
}
|
|
}
|
|
else {
|
|
/* dataobj == NULL, so delete the key */
|
|
retval = _DB_delete(self, NULL, &key, 0);
|
|
}
|
|
FREE_DBT(key);
|
|
return retval;
|
|
}
|
|
|
|
|
|
static PyObject*
|
|
DB_has_key(DBObject* self, PyObject* args)
|
|
{
|
|
int err;
|
|
PyObject* keyobj;
|
|
DBT key, data;
|
|
PyObject* txnobj = NULL;
|
|
DB_TXN *txn = NULL;
|
|
|
|
if (!PyArg_ParseTuple(args,"O|O:has_key", &keyobj, &txnobj))
|
|
return NULL;
|
|
CHECK_DB_NOT_CLOSED(self);
|
|
if (!make_key_dbt(self, keyobj, &key, NULL))
|
|
return NULL;
|
|
if (!checkTxnObj(txnobj, &txn)) {
|
|
FREE_DBT(key);
|
|
return NULL;
|
|
}
|
|
|
|
/* This causes DB_BUFFER_SMALL to be returned when the db has the key because
|
|
it has a record but can't allocate a buffer for the data. This saves
|
|
having to deal with data we won't be using.
|
|
*/
|
|
CLEAR_DBT(data);
|
|
data.flags = DB_DBT_USERMEM;
|
|
|
|
MYDB_BEGIN_ALLOW_THREADS;
|
|
err = self->db->get(self->db, txn, &key, &data, 0);
|
|
MYDB_END_ALLOW_THREADS;
|
|
FREE_DBT(key);
|
|
|
|
if (err == DB_BUFFER_SMALL || err == 0) {
|
|
return PyInt_FromLong(1);
|
|
} else if (err == DB_NOTFOUND || err == DB_KEYEMPTY) {
|
|
return PyInt_FromLong(0);
|
|
}
|
|
|
|
makeDBError(err);
|
|
return NULL;
|
|
}
|
|
|
|
|
|
#define _KEYS_LIST 1
|
|
#define _VALUES_LIST 2
|
|
#define _ITEMS_LIST 3
|
|
|
|
static PyObject*
|
|
_DB_make_list(DBObject* self, DB_TXN* txn, int type)
|
|
{
|
|
int err, dbtype;
|
|
DBT key;
|
|
DBT data;
|
|
DBC *cursor;
|
|
PyObject* list;
|
|
PyObject* item = NULL;
|
|
|
|
CHECK_DB_NOT_CLOSED(self);
|
|
CLEAR_DBT(key);
|
|
CLEAR_DBT(data);
|
|
|
|
dbtype = _DB_get_type(self);
|
|
if (dbtype == -1)
|
|
return NULL;
|
|
|
|
list = PyList_New(0);
|
|
if (list == NULL)
|
|
return NULL;
|
|
|
|
/* get a cursor */
|
|
MYDB_BEGIN_ALLOW_THREADS;
|
|
err = self->db->cursor(self->db, txn, &cursor, 0);
|
|
MYDB_END_ALLOW_THREADS;
|
|
if (makeDBError(err)) {
|
|
Py_DECREF(list);
|
|
return NULL;
|
|
}
|
|
|
|
if (CHECK_DBFLAG(self, DB_THREAD)) {
|
|
key.flags = DB_DBT_REALLOC;
|
|
data.flags = DB_DBT_REALLOC;
|
|
}
|
|
|
|
while (1) { /* use the cursor to traverse the DB, collecting items */
|
|
MYDB_BEGIN_ALLOW_THREADS;
|
|
err = cursor->c_get(cursor, &key, &data, DB_NEXT);
|
|
MYDB_END_ALLOW_THREADS;
|
|
|
|
if (err) {
|
|
/* for any error, break out of the loop */
|
|
break;
|
|
}
|
|
|
|
switch (type) {
|
|
case _KEYS_LIST:
|
|
switch(dbtype) {
|
|
case DB_BTREE:
|
|
case DB_HASH:
|
|
default:
|
|
item = PyString_FromStringAndSize((char*)key.data, key.size);
|
|
break;
|
|
case DB_RECNO:
|
|
case DB_QUEUE:
|
|
item = PyInt_FromLong(*((db_recno_t*)key.data));
|
|
break;
|
|
}
|
|
break;
|
|
|
|
case _VALUES_LIST:
|
|
item = PyString_FromStringAndSize((char*)data.data, data.size);
|
|
break;
|
|
|
|
case _ITEMS_LIST:
|
|
switch(dbtype) {
|
|
case DB_BTREE:
|
|
case DB_HASH:
|
|
default:
|
|
item = Py_BuildValue("s#s#", key.data, key.size, data.data,
|
|
data.size);
|
|
break;
|
|
case DB_RECNO:
|
|
case DB_QUEUE:
|
|
item = Py_BuildValue("is#", *((db_recno_t*)key.data),
|
|
data.data, data.size);
|
|
break;
|
|
}
|
|
break;
|
|
default:
|
|
PyErr_Format(PyExc_ValueError, "Unknown key type 0x%x", type);
|
|
item = NULL;
|
|
break;
|
|
}
|
|
if (item == NULL) {
|
|
Py_DECREF(list);
|
|
list = NULL;
|
|
goto done;
|
|
}
|
|
PyList_Append(list, item);
|
|
Py_DECREF(item);
|
|
}
|
|
|
|
/* DB_NOTFOUND || DB_KEYEMPTY is okay, it means we got to the end */
|
|
if (err != DB_NOTFOUND && err != DB_KEYEMPTY && makeDBError(err)) {
|
|
Py_DECREF(list);
|
|
list = NULL;
|
|
}
|
|
|
|
done:
|
|
FREE_DBT(key);
|
|
FREE_DBT(data);
|
|
MYDB_BEGIN_ALLOW_THREADS;
|
|
cursor->c_close(cursor);
|
|
MYDB_END_ALLOW_THREADS;
|
|
return list;
|
|
}
|
|
|
|
|
|
static PyObject*
|
|
DB_keys(DBObject* self, PyObject* args)
|
|
{
|
|
PyObject* txnobj = NULL;
|
|
DB_TXN *txn = NULL;
|
|
|
|
if (!PyArg_UnpackTuple(args, "keys", 0, 1, &txnobj))
|
|
return NULL;
|
|
if (!checkTxnObj(txnobj, &txn))
|
|
return NULL;
|
|
return _DB_make_list(self, txn, _KEYS_LIST);
|
|
}
|
|
|
|
|
|
static PyObject*
|
|
DB_items(DBObject* self, PyObject* args)
|
|
{
|
|
PyObject* txnobj = NULL;
|
|
DB_TXN *txn = NULL;
|
|
|
|
if (!PyArg_UnpackTuple(args, "items", 0, 1, &txnobj))
|
|
return NULL;
|
|
if (!checkTxnObj(txnobj, &txn))
|
|
return NULL;
|
|
return _DB_make_list(self, txn, _ITEMS_LIST);
|
|
}
|
|
|
|
|
|
static PyObject*
|
|
DB_values(DBObject* self, PyObject* args)
|
|
{
|
|
PyObject* txnobj = NULL;
|
|
DB_TXN *txn = NULL;
|
|
|
|
if (!PyArg_UnpackTuple(args, "values", 0, 1, &txnobj))
|
|
return NULL;
|
|
if (!checkTxnObj(txnobj, &txn))
|
|
return NULL;
|
|
return _DB_make_list(self, txn, _VALUES_LIST);
|
|
}
|
|
|
|
/* --------------------------------------------------------------------- */
|
|
/* DBCursor methods */
|
|
|
|
|
|
static PyObject*
|
|
DBC_close(DBCursorObject* self, PyObject* args)
|
|
{
|
|
int err = 0;
|
|
|
|
if (!PyArg_ParseTuple(args, ":close"))
|
|
return NULL;
|
|
|
|
if (self->dbc != NULL) {
|
|
MYDB_BEGIN_ALLOW_THREADS;
|
|
err = self->dbc->c_close(self->dbc);
|
|
self->dbc = NULL;
|
|
MYDB_END_ALLOW_THREADS;
|
|
}
|
|
RETURN_IF_ERR();
|
|
RETURN_NONE();
|
|
}
|
|
|
|
|
|
static PyObject*
|
|
DBC_count(DBCursorObject* self, PyObject* args)
|
|
{
|
|
int err = 0;
|
|
db_recno_t count;
|
|
int flags = 0;
|
|
|
|
if (!PyArg_ParseTuple(args, "|i:count", &flags))
|
|
return NULL;
|
|
|
|
CHECK_CURSOR_NOT_CLOSED(self);
|
|
|
|
MYDB_BEGIN_ALLOW_THREADS;
|
|
err = self->dbc->c_count(self->dbc, &count, flags);
|
|
MYDB_END_ALLOW_THREADS;
|
|
RETURN_IF_ERR();
|
|
|
|
return PyInt_FromLong(count);
|
|
}
|
|
|
|
|
|
static PyObject*
|
|
DBC_current(DBCursorObject* self, PyObject* args, PyObject *kwargs)
|
|
{
|
|
return _DBCursor_get(self,DB_CURRENT,args,kwargs,"|iii:current");
|
|
}
|
|
|
|
|
|
static PyObject*
|
|
DBC_delete(DBCursorObject* self, PyObject* args)
|
|
{
|
|
int err, flags=0;
|
|
|
|
if (!PyArg_ParseTuple(args, "|i:delete", &flags))
|
|
return NULL;
|
|
|
|
CHECK_CURSOR_NOT_CLOSED(self);
|
|
|
|
MYDB_BEGIN_ALLOW_THREADS;
|
|
err = self->dbc->c_del(self->dbc, flags);
|
|
MYDB_END_ALLOW_THREADS;
|
|
RETURN_IF_ERR();
|
|
|
|
self->mydb->haveStat = 0;
|
|
RETURN_NONE();
|
|
}
|
|
|
|
|
|
static PyObject*
|
|
DBC_dup(DBCursorObject* self, PyObject* args)
|
|
{
|
|
int err, flags =0;
|
|
DBC* dbc = NULL;
|
|
|
|
if (!PyArg_ParseTuple(args, "|i:dup", &flags))
|
|
return NULL;
|
|
|
|
CHECK_CURSOR_NOT_CLOSED(self);
|
|
|
|
MYDB_BEGIN_ALLOW_THREADS;
|
|
err = self->dbc->c_dup(self->dbc, &dbc, flags);
|
|
MYDB_END_ALLOW_THREADS;
|
|
RETURN_IF_ERR();
|
|
|
|
return (PyObject*) newDBCursorObject(dbc, self->mydb);
|
|
}
|
|
|
|
static PyObject*
|
|
DBC_first(DBCursorObject* self, PyObject* args, PyObject* kwargs)
|
|
{
|
|
return _DBCursor_get(self,DB_FIRST,args,kwargs,"|iii:first");
|
|
}
|
|
|
|
|
|
static PyObject*
|
|
DBC_get(DBCursorObject* self, PyObject* args, PyObject *kwargs)
|
|
{
|
|
int err, flags=0;
|
|
PyObject* keyobj = NULL;
|
|
PyObject* dataobj = NULL;
|
|
PyObject* retval = NULL;
|
|
int dlen = -1;
|
|
int doff = -1;
|
|
DBT key, data;
|
|
static char* kwnames[] = { "key","data", "flags", "dlen", "doff",
|
|
NULL };
|
|
|
|
CLEAR_DBT(key);
|
|
CLEAR_DBT(data);
|
|
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "i|ii:get", &kwnames[2],
|
|
&flags, &dlen, &doff))
|
|
{
|
|
PyErr_Clear();
|
|
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "Oi|ii:get",
|
|
&kwnames[1],
|
|
&keyobj, &flags, &dlen, &doff))
|
|
{
|
|
PyErr_Clear();
|
|
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "OOi|ii:get",
|
|
kwnames, &keyobj, &dataobj,
|
|
&flags, &dlen, &doff))
|
|
{
|
|
return NULL;
|
|
}
|
|
}
|
|
}
|
|
|
|
CHECK_CURSOR_NOT_CLOSED(self);
|
|
|
|
if (keyobj && !make_key_dbt(self->mydb, keyobj, &key, NULL))
|
|
return NULL;
|
|
if ( (dataobj && !make_dbt(dataobj, &data)) ||
|
|
(!add_partial_dbt(&data, dlen, doff)) )
|
|
{
|
|
FREE_DBT(key);
|
|
return NULL;
|
|
}
|
|
|
|
if (CHECK_DBFLAG(self->mydb, DB_THREAD)) {
|
|
data.flags = DB_DBT_MALLOC;
|
|
if (!(key.flags & DB_DBT_REALLOC)) {
|
|
key.flags |= DB_DBT_MALLOC;
|
|
}
|
|
}
|
|
|
|
MYDB_BEGIN_ALLOW_THREADS;
|
|
err = self->dbc->c_get(self->dbc, &key, &data, flags);
|
|
MYDB_END_ALLOW_THREADS;
|
|
|
|
if ((err == DB_NOTFOUND || err == DB_KEYEMPTY)
|
|
&& self->mydb->moduleFlags.getReturnsNone) {
|
|
Py_INCREF(Py_None);
|
|
retval = Py_None;
|
|
}
|
|
else if (makeDBError(err)) {
|
|
retval = NULL;
|
|
}
|
|
else {
|
|
switch (_DB_get_type(self->mydb)) {
|
|
case -1:
|
|
retval = NULL;
|
|
break;
|
|
case DB_BTREE:
|
|
case DB_HASH:
|
|
default:
|
|
retval = Py_BuildValue("s#s#", key.data, key.size,
|
|
data.data, data.size);
|
|
break;
|
|
case DB_RECNO:
|
|
case DB_QUEUE:
|
|
retval = Py_BuildValue("is#", *((db_recno_t*)key.data),
|
|
data.data, data.size);
|
|
break;
|
|
}
|
|
FREE_DBT(data);
|
|
}
|
|
FREE_DBT(key);
|
|
return retval;
|
|
}
|
|
|
|
#if (DBVER >= 33)
|
|
static PyObject*
|
|
DBC_pget(DBCursorObject* self, PyObject* args, PyObject *kwargs)
|
|
{
|
|
int err, flags=0;
|
|
PyObject* keyobj = NULL;
|
|
PyObject* dataobj = NULL;
|
|
PyObject* retval = NULL;
|
|
int dlen = -1;
|
|
int doff = -1;
|
|
DBT key, pkey, data;
|
|
static char* kwnames_keyOnly[] = { "key", "flags", "dlen", "doff", NULL };
|
|
static char* kwnames[] = { "key", "data", "flags", "dlen", "doff", NULL };
|
|
|
|
CLEAR_DBT(key);
|
|
CLEAR_DBT(data);
|
|
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "i|ii:pget", &kwnames[2],
|
|
&flags, &dlen, &doff))
|
|
{
|
|
PyErr_Clear();
|
|
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "Oi|ii:pget",
|
|
kwnames_keyOnly,
|
|
&keyobj, &flags, &dlen, &doff))
|
|
{
|
|
PyErr_Clear();
|
|
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "OOi|ii:pget",
|
|
kwnames, &keyobj, &dataobj,
|
|
&flags, &dlen, &doff))
|
|
{
|
|
return NULL;
|
|
}
|
|
}
|
|
}
|
|
|
|
CHECK_CURSOR_NOT_CLOSED(self);
|
|
|
|
if (keyobj && !make_key_dbt(self->mydb, keyobj, &key, NULL))
|
|
return NULL;
|
|
if ( (dataobj && !make_dbt(dataobj, &data)) ||
|
|
(!add_partial_dbt(&data, dlen, doff)) ) {
|
|
FREE_DBT(key);
|
|
return NULL;
|
|
}
|
|
|
|
if (CHECK_DBFLAG(self->mydb, DB_THREAD)) {
|
|
data.flags = DB_DBT_MALLOC;
|
|
if (!(key.flags & DB_DBT_REALLOC)) {
|
|
key.flags |= DB_DBT_MALLOC;
|
|
}
|
|
}
|
|
|
|
CLEAR_DBT(pkey);
|
|
pkey.flags = DB_DBT_MALLOC;
|
|
|
|
MYDB_BEGIN_ALLOW_THREADS;
|
|
err = self->dbc->c_pget(self->dbc, &key, &pkey, &data, flags);
|
|
MYDB_END_ALLOW_THREADS;
|
|
|
|
if ((err == DB_NOTFOUND || err == DB_KEYEMPTY)
|
|
&& self->mydb->moduleFlags.getReturnsNone) {
|
|
Py_INCREF(Py_None);
|
|
retval = Py_None;
|
|
}
|
|
else if (makeDBError(err)) {
|
|
retval = NULL;
|
|
}
|
|
else {
|
|
PyObject *pkeyObj;
|
|
PyObject *dataObj;
|
|
dataObj = PyString_FromStringAndSize(data.data, data.size);
|
|
|
|
if (self->mydb->primaryDBType == DB_RECNO ||
|
|
self->mydb->primaryDBType == DB_QUEUE)
|
|
pkeyObj = PyInt_FromLong(*(int *)pkey.data);
|
|
else
|
|
pkeyObj = PyString_FromStringAndSize(pkey.data, pkey.size);
|
|
|
|
if (key.data && key.size) /* return key, pkey and data */
|
|
{
|
|
PyObject *keyObj;
|
|
int type = _DB_get_type(self->mydb);
|
|
if (type == DB_RECNO || type == DB_QUEUE)
|
|
keyObj = PyInt_FromLong(*(int *)key.data);
|
|
else
|
|
keyObj = PyString_FromStringAndSize(key.data, key.size);
|
|
#if (PY_VERSION_HEX >= 0x02040000)
|
|
retval = PyTuple_Pack(3, keyObj, pkeyObj, dataObj);
|
|
#else
|
|
retval = Py_BuildValue("OOO", keyObj, pkeyObj, dataObj);
|
|
#endif
|
|
Py_DECREF(keyObj);
|
|
FREE_DBT(key);
|
|
}
|
|
else /* return just the pkey and data */
|
|
{
|
|
#if (PY_VERSION_HEX >= 0x02040000)
|
|
retval = PyTuple_Pack(2, pkeyObj, dataObj);
|
|
#else
|
|
retval = Py_BuildValue("OO", pkeyObj, dataObj);
|
|
#endif
|
|
}
|
|
Py_DECREF(dataObj);
|
|
Py_DECREF(pkeyObj);
|
|
FREE_DBT(pkey);
|
|
FREE_DBT(data);
|
|
}
|
|
/* the only time REALLOC should be set is if we used an integer
|
|
* key that make_key_dbt malloc'd for us. always free these. */
|
|
if (key.flags & DB_DBT_REALLOC) {
|
|
FREE_DBT(key);
|
|
}
|
|
return retval;
|
|
}
|
|
#endif
|
|
|
|
|
|
static PyObject*
|
|
DBC_get_recno(DBCursorObject* self, PyObject* args)
|
|
{
|
|
int err;
|
|
db_recno_t recno;
|
|
DBT key;
|
|
DBT data;
|
|
|
|
if (!PyArg_ParseTuple(args, ":get_recno"))
|
|
return NULL;
|
|
|
|
CHECK_CURSOR_NOT_CLOSED(self);
|
|
|
|
CLEAR_DBT(key);
|
|
CLEAR_DBT(data);
|
|
if (CHECK_DBFLAG(self->mydb, DB_THREAD)) {
|
|
/* Tell BerkeleyDB to malloc the return value (thread safe) */
|
|
data.flags = DB_DBT_MALLOC;
|
|
key.flags = DB_DBT_MALLOC;
|
|
}
|
|
|
|
MYDB_BEGIN_ALLOW_THREADS;
|
|
err = self->dbc->c_get(self->dbc, &key, &data, DB_GET_RECNO);
|
|
MYDB_END_ALLOW_THREADS;
|
|
RETURN_IF_ERR();
|
|
|
|
recno = *((db_recno_t*)data.data);
|
|
FREE_DBT(key);
|
|
FREE_DBT(data);
|
|
return PyInt_FromLong(recno);
|
|
}
|
|
|
|
|
|
static PyObject*
|
|
DBC_last(DBCursorObject* self, PyObject* args, PyObject *kwargs)
|
|
{
|
|
return _DBCursor_get(self,DB_LAST,args,kwargs,"|iii:last");
|
|
}
|
|
|
|
|
|
static PyObject*
|
|
DBC_next(DBCursorObject* self, PyObject* args, PyObject *kwargs)
|
|
{
|
|
return _DBCursor_get(self,DB_NEXT,args,kwargs,"|iii:next");
|
|
}
|
|
|
|
|
|
static PyObject*
|
|
DBC_prev(DBCursorObject* self, PyObject* args, PyObject *kwargs)
|
|
{
|
|
return _DBCursor_get(self,DB_PREV,args,kwargs,"|iii:prev");
|
|
}
|
|
|
|
|
|
static PyObject*
|
|
DBC_put(DBCursorObject* self, PyObject* args, PyObject* kwargs)
|
|
{
|
|
int err, flags = 0;
|
|
PyObject* keyobj, *dataobj;
|
|
DBT key, data;
|
|
static char* kwnames[] = { "key", "data", "flags", "dlen", "doff",
|
|
NULL };
|
|
int dlen = -1;
|
|
int doff = -1;
|
|
|
|
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "OO|iii:put", kwnames,
|
|
&keyobj, &dataobj, &flags, &dlen, &doff))
|
|
return NULL;
|
|
|
|
CHECK_CURSOR_NOT_CLOSED(self);
|
|
|
|
if (!make_key_dbt(self->mydb, keyobj, &key, NULL))
|
|
return NULL;
|
|
if (!make_dbt(dataobj, &data) ||
|
|
!add_partial_dbt(&data, dlen, doff) )
|
|
{
|
|
FREE_DBT(key);
|
|
return NULL;
|
|
}
|
|
|
|
MYDB_BEGIN_ALLOW_THREADS;
|
|
err = self->dbc->c_put(self->dbc, &key, &data, flags);
|
|
MYDB_END_ALLOW_THREADS;
|
|
FREE_DBT(key);
|
|
RETURN_IF_ERR();
|
|
self->mydb->haveStat = 0;
|
|
RETURN_NONE();
|
|
}
|
|
|
|
|
|
static PyObject*
|
|
DBC_set(DBCursorObject* self, PyObject* args, PyObject *kwargs)
|
|
{
|
|
int err, flags = 0;
|
|
DBT key, data;
|
|
PyObject* retval, *keyobj;
|
|
static char* kwnames[] = { "key", "flags", "dlen", "doff", NULL };
|
|
int dlen = -1;
|
|
int doff = -1;
|
|
|
|
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O|iii:set", kwnames,
|
|
&keyobj, &flags, &dlen, &doff))
|
|
return NULL;
|
|
|
|
CHECK_CURSOR_NOT_CLOSED(self);
|
|
|
|
if (!make_key_dbt(self->mydb, keyobj, &key, NULL))
|
|
return NULL;
|
|
|
|
CLEAR_DBT(data);
|
|
if (CHECK_DBFLAG(self->mydb, DB_THREAD)) {
|
|
/* Tell BerkeleyDB to malloc the return value (thread safe) */
|
|
data.flags = DB_DBT_MALLOC;
|
|
}
|
|
if (!add_partial_dbt(&data, dlen, doff)) {
|
|
FREE_DBT(key);
|
|
return NULL;
|
|
}
|
|
|
|
MYDB_BEGIN_ALLOW_THREADS;
|
|
err = self->dbc->c_get(self->dbc, &key, &data, flags|DB_SET);
|
|
MYDB_END_ALLOW_THREADS;
|
|
if ((err == DB_NOTFOUND || err == DB_KEYEMPTY)
|
|
&& self->mydb->moduleFlags.cursorSetReturnsNone) {
|
|
Py_INCREF(Py_None);
|
|
retval = Py_None;
|
|
}
|
|
else if (makeDBError(err)) {
|
|
retval = NULL;
|
|
}
|
|
else {
|
|
switch (_DB_get_type(self->mydb)) {
|
|
case -1:
|
|
retval = NULL;
|
|
break;
|
|
case DB_BTREE:
|
|
case DB_HASH:
|
|
default:
|
|
retval = Py_BuildValue("s#s#", key.data, key.size,
|
|
data.data, data.size);
|
|
break;
|
|
case DB_RECNO:
|
|
case DB_QUEUE:
|
|
retval = Py_BuildValue("is#", *((db_recno_t*)key.data),
|
|
data.data, data.size);
|
|
break;
|
|
}
|
|
FREE_DBT(data);
|
|
FREE_DBT(key);
|
|
}
|
|
/* the only time REALLOC should be set is if we used an integer
|
|
* key that make_key_dbt malloc'd for us. always free these. */
|
|
if (key.flags & DB_DBT_REALLOC) {
|
|
FREE_DBT(key);
|
|
}
|
|
|
|
return retval;
|
|
}
|
|
|
|
|
|
static PyObject*
|
|
DBC_set_range(DBCursorObject* self, PyObject* args, PyObject* kwargs)
|
|
{
|
|
int err, flags = 0;
|
|
DBT key, data;
|
|
PyObject* retval, *keyobj;
|
|
static char* kwnames[] = { "key", "flags", "dlen", "doff", NULL };
|
|
int dlen = -1;
|
|
int doff = -1;
|
|
|
|
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O|iii:set_range", kwnames,
|
|
&keyobj, &flags, &dlen, &doff))
|
|
return NULL;
|
|
|
|
CHECK_CURSOR_NOT_CLOSED(self);
|
|
|
|
if (!make_key_dbt(self->mydb, keyobj, &key, NULL))
|
|
return NULL;
|
|
|
|
CLEAR_DBT(data);
|
|
if (!add_partial_dbt(&data, dlen, doff)) {
|
|
FREE_DBT(key);
|
|
return NULL;
|
|
}
|
|
if (CHECK_DBFLAG(self->mydb, DB_THREAD)) {
|
|
/* Tell BerkeleyDB to malloc the return value (thread safe) */
|
|
data.flags |= DB_DBT_MALLOC;
|
|
/* only BTREE databases will return anything in the key */
|
|
if (!(key.flags & DB_DBT_REALLOC) && _DB_get_type(self->mydb) == DB_BTREE) {
|
|
key.flags |= DB_DBT_MALLOC;
|
|
}
|
|
}
|
|
MYDB_BEGIN_ALLOW_THREADS;
|
|
err = self->dbc->c_get(self->dbc, &key, &data, flags|DB_SET_RANGE);
|
|
MYDB_END_ALLOW_THREADS;
|
|
if ((err == DB_NOTFOUND || err == DB_KEYEMPTY)
|
|
&& self->mydb->moduleFlags.cursorSetReturnsNone) {
|
|
Py_INCREF(Py_None);
|
|
retval = Py_None;
|
|
}
|
|
else if (makeDBError(err)) {
|
|
retval = NULL;
|
|
}
|
|
else {
|
|
switch (_DB_get_type(self->mydb)) {
|
|
case -1:
|
|
retval = NULL;
|
|
break;
|
|
case DB_BTREE:
|
|
case DB_HASH:
|
|
default:
|
|
retval = Py_BuildValue("s#s#", key.data, key.size,
|
|
data.data, data.size);
|
|
break;
|
|
case DB_RECNO:
|
|
case DB_QUEUE:
|
|
retval = Py_BuildValue("is#", *((db_recno_t*)key.data),
|
|
data.data, data.size);
|
|
break;
|
|
}
|
|
FREE_DBT(key);
|
|
FREE_DBT(data);
|
|
}
|
|
/* the only time REALLOC should be set is if we used an integer
|
|
* key that make_key_dbt malloc'd for us. always free these. */
|
|
if (key.flags & DB_DBT_REALLOC) {
|
|
FREE_DBT(key);
|
|
}
|
|
|
|
return retval;
|
|
}
|
|
|
|
static PyObject*
|
|
_DBC_get_set_both(DBCursorObject* self, PyObject* keyobj, PyObject* dataobj,
|
|
int flags, unsigned int returnsNone)
|
|
{
|
|
int err;
|
|
DBT key, data;
|
|
PyObject* retval;
|
|
|
|
/* the caller did this: CHECK_CURSOR_NOT_CLOSED(self); */
|
|
if (!make_key_dbt(self->mydb, keyobj, &key, NULL))
|
|
return NULL;
|
|
if (!make_dbt(dataobj, &data)) {
|
|
FREE_DBT(key);
|
|
return NULL;
|
|
}
|
|
|
|
MYDB_BEGIN_ALLOW_THREADS;
|
|
err = self->dbc->c_get(self->dbc, &key, &data, flags|DB_GET_BOTH);
|
|
MYDB_END_ALLOW_THREADS;
|
|
if ((err == DB_NOTFOUND || err == DB_KEYEMPTY) && returnsNone) {
|
|
Py_INCREF(Py_None);
|
|
retval = Py_None;
|
|
}
|
|
else if (makeDBError(err)) {
|
|
retval = NULL;
|
|
}
|
|
else {
|
|
switch (_DB_get_type(self->mydb)) {
|
|
case -1:
|
|
retval = NULL;
|
|
break;
|
|
case DB_BTREE:
|
|
case DB_HASH:
|
|
default:
|
|
retval = Py_BuildValue("s#s#", key.data, key.size,
|
|
data.data, data.size);
|
|
break;
|
|
case DB_RECNO:
|
|
case DB_QUEUE:
|
|
retval = Py_BuildValue("is#", *((db_recno_t*)key.data),
|
|
data.data, data.size);
|
|
break;
|
|
}
|
|
}
|
|
|
|
FREE_DBT(key);
|
|
return retval;
|
|
}
|
|
|
|
static PyObject*
|
|
DBC_get_both(DBCursorObject* self, PyObject* args)
|
|
{
|
|
int flags=0;
|
|
PyObject *keyobj, *dataobj;
|
|
|
|
if (!PyArg_ParseTuple(args, "OO|i:get_both", &keyobj, &dataobj, &flags))
|
|
return NULL;
|
|
|
|
/* if the cursor is closed, self->mydb may be invalid */
|
|
CHECK_CURSOR_NOT_CLOSED(self);
|
|
|
|
return _DBC_get_set_both(self, keyobj, dataobj, flags,
|
|
self->mydb->moduleFlags.getReturnsNone);
|
|
}
|
|
|
|
/* Return size of entry */
|
|
static PyObject*
|
|
DBC_get_current_size(DBCursorObject* self, PyObject* args)
|
|
{
|
|
int err, flags=DB_CURRENT;
|
|
PyObject* retval = NULL;
|
|
DBT key, data;
|
|
|
|
if (!PyArg_ParseTuple(args, ":get_current_size"))
|
|
return NULL;
|
|
CHECK_CURSOR_NOT_CLOSED(self);
|
|
CLEAR_DBT(key);
|
|
CLEAR_DBT(data);
|
|
|
|
/* We don't allocate any memory, forcing a DB_BUFFER_SMALL error and thus
|
|
getting the record size. */
|
|
data.flags = DB_DBT_USERMEM;
|
|
data.ulen = 0;
|
|
MYDB_BEGIN_ALLOW_THREADS;
|
|
err = self->dbc->c_get(self->dbc, &key, &data, flags);
|
|
MYDB_END_ALLOW_THREADS;
|
|
if (err == DB_BUFFER_SMALL || !err) {
|
|
/* DB_BUFFER_SMALL means positive size, !err means zero length value */
|
|
retval = PyInt_FromLong((long)data.size);
|
|
err = 0;
|
|
}
|
|
|
|
FREE_DBT(key);
|
|
FREE_DBT(data);
|
|
RETURN_IF_ERR();
|
|
return retval;
|
|
}
|
|
|
|
static PyObject*
|
|
DBC_set_both(DBCursorObject* self, PyObject* args)
|
|
{
|
|
int flags=0;
|
|
PyObject *keyobj, *dataobj;
|
|
|
|
if (!PyArg_ParseTuple(args, "OO|i:set_both", &keyobj, &dataobj, &flags))
|
|
return NULL;
|
|
|
|
/* if the cursor is closed, self->mydb may be invalid */
|
|
CHECK_CURSOR_NOT_CLOSED(self);
|
|
|
|
return _DBC_get_set_both(self, keyobj, dataobj, flags,
|
|
self->mydb->moduleFlags.cursorSetReturnsNone);
|
|
}
|
|
|
|
|
|
static PyObject*
|
|
DBC_set_recno(DBCursorObject* self, PyObject* args, PyObject *kwargs)
|
|
{
|
|
int err, irecno, flags=0;
|
|
db_recno_t recno;
|
|
DBT key, data;
|
|
PyObject* retval;
|
|
int dlen = -1;
|
|
int doff = -1;
|
|
static char* kwnames[] = { "recno","flags", "dlen", "doff", NULL };
|
|
|
|
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "i|iii:set_recno", kwnames,
|
|
&irecno, &flags, &dlen, &doff))
|
|
return NULL;
|
|
|
|
CHECK_CURSOR_NOT_CLOSED(self);
|
|
|
|
CLEAR_DBT(key);
|
|
recno = (db_recno_t) irecno;
|
|
/* use allocated space so DB will be able to realloc room for the real
|
|
* key */
|
|
key.data = malloc(sizeof(db_recno_t));
|
|
if (key.data == NULL) {
|
|
PyErr_SetString(PyExc_MemoryError, "Key memory allocation failed");
|
|
return NULL;
|
|
}
|
|
key.size = sizeof(db_recno_t);
|
|
key.ulen = key.size;
|
|
memcpy(key.data, &recno, sizeof(db_recno_t));
|
|
key.flags = DB_DBT_REALLOC;
|
|
|
|
CLEAR_DBT(data);
|
|
if (CHECK_DBFLAG(self->mydb, DB_THREAD)) {
|
|
/* Tell BerkeleyDB to malloc the return value (thread safe) */
|
|
data.flags = DB_DBT_MALLOC;
|
|
}
|
|
if (!add_partial_dbt(&data, dlen, doff)) {
|
|
FREE_DBT(key);
|
|
return NULL;
|
|
}
|
|
|
|
MYDB_BEGIN_ALLOW_THREADS;
|
|
err = self->dbc->c_get(self->dbc, &key, &data, flags|DB_SET_RECNO);
|
|
MYDB_END_ALLOW_THREADS;
|
|
if ((err == DB_NOTFOUND || err == DB_KEYEMPTY)
|
|
&& self->mydb->moduleFlags.cursorSetReturnsNone) {
|
|
Py_INCREF(Py_None);
|
|
retval = Py_None;
|
|
}
|
|
else if (makeDBError(err)) {
|
|
retval = NULL;
|
|
}
|
|
else { /* Can only be used for BTrees, so no need to return int key */
|
|
retval = Py_BuildValue("s#s#", key.data, key.size,
|
|
data.data, data.size);
|
|
FREE_DBT(data);
|
|
}
|
|
FREE_DBT(key);
|
|
|
|
return retval;
|
|
}
|
|
|
|
|
|
static PyObject*
|
|
DBC_consume(DBCursorObject* self, PyObject* args, PyObject *kwargs)
|
|
{
|
|
return _DBCursor_get(self,DB_CONSUME,args,kwargs,"|iii:consume");
|
|
}
|
|
|
|
|
|
static PyObject*
|
|
DBC_next_dup(DBCursorObject* self, PyObject* args, PyObject *kwargs)
|
|
{
|
|
return _DBCursor_get(self,DB_NEXT_DUP,args,kwargs,"|iii:next_dup");
|
|
}
|
|
|
|
|
|
static PyObject*
|
|
DBC_next_nodup(DBCursorObject* self, PyObject* args, PyObject *kwargs)
|
|
{
|
|
return _DBCursor_get(self,DB_NEXT_NODUP,args,kwargs,"|iii:next_nodup");
|
|
}
|
|
|
|
|
|
static PyObject*
|
|
DBC_prev_nodup(DBCursorObject* self, PyObject* args, PyObject *kwargs)
|
|
{
|
|
return _DBCursor_get(self,DB_PREV_NODUP,args,kwargs,"|iii:prev_nodup");
|
|
}
|
|
|
|
|
|
static PyObject*
|
|
DBC_join_item(DBCursorObject* self, PyObject* args)
|
|
{
|
|
int err, flags=0;
|
|
DBT key, data;
|
|
PyObject* retval;
|
|
|
|
if (!PyArg_ParseTuple(args, "|i:join_item", &flags))
|
|
return NULL;
|
|
|
|
CHECK_CURSOR_NOT_CLOSED(self);
|
|
|
|
CLEAR_DBT(key);
|
|
CLEAR_DBT(data);
|
|
if (CHECK_DBFLAG(self->mydb, DB_THREAD)) {
|
|
/* Tell BerkeleyDB to malloc the return value (thread safe) */
|
|
key.flags = DB_DBT_MALLOC;
|
|
}
|
|
|
|
MYDB_BEGIN_ALLOW_THREADS;
|
|
err = self->dbc->c_get(self->dbc, &key, &data, flags | DB_JOIN_ITEM);
|
|
MYDB_END_ALLOW_THREADS;
|
|
if ((err == DB_NOTFOUND || err == DB_KEYEMPTY)
|
|
&& self->mydb->moduleFlags.getReturnsNone) {
|
|
Py_INCREF(Py_None);
|
|
retval = Py_None;
|
|
}
|
|
else if (makeDBError(err)) {
|
|
retval = NULL;
|
|
}
|
|
else {
|
|
retval = Py_BuildValue("s#", key.data, key.size);
|
|
FREE_DBT(key);
|
|
}
|
|
|
|
return retval;
|
|
}
|
|
|
|
|
|
|
|
/* --------------------------------------------------------------------- */
|
|
/* DBEnv methods */
|
|
|
|
|
|
static PyObject*
|
|
DBEnv_close(DBEnvObject* self, PyObject* args)
|
|
{
|
|
int err, flags = 0;
|
|
|
|
if (!PyArg_ParseTuple(args, "|i:close", &flags))
|
|
return NULL;
|
|
if (!self->closed) { /* Don't close more than once */
|
|
MYDB_BEGIN_ALLOW_THREADS;
|
|
err = self->db_env->close(self->db_env, flags);
|
|
MYDB_END_ALLOW_THREADS;
|
|
/* after calling DBEnv->close, regardless of error, this DBEnv
|
|
* may not be accessed again (BerkeleyDB docs). */
|
|
self->closed = 1;
|
|
self->db_env = NULL;
|
|
RETURN_IF_ERR();
|
|
}
|
|
RETURN_NONE();
|
|
}
|
|
|
|
|
|
static PyObject*
|
|
DBEnv_open(DBEnvObject* self, PyObject* args)
|
|
{
|
|
int err, flags=0, mode=0660;
|
|
char *db_home;
|
|
|
|
if (!PyArg_ParseTuple(args, "z|ii:open", &db_home, &flags, &mode))
|
|
return NULL;
|
|
|
|
CHECK_ENV_NOT_CLOSED(self);
|
|
|
|
MYDB_BEGIN_ALLOW_THREADS;
|
|
err = self->db_env->open(self->db_env, db_home, flags, mode);
|
|
MYDB_END_ALLOW_THREADS;
|
|
RETURN_IF_ERR();
|
|
self->closed = 0;
|
|
self->flags = flags;
|
|
RETURN_NONE();
|
|
}
|
|
|
|
|
|
static PyObject*
|
|
DBEnv_remove(DBEnvObject* self, PyObject* args)
|
|
{
|
|
int err, flags=0;
|
|
char *db_home;
|
|
|
|
if (!PyArg_ParseTuple(args, "s|i:remove", &db_home, &flags))
|
|
return NULL;
|
|
CHECK_ENV_NOT_CLOSED(self);
|
|
MYDB_BEGIN_ALLOW_THREADS;
|
|
err = self->db_env->remove(self->db_env, db_home, flags);
|
|
MYDB_END_ALLOW_THREADS;
|
|
RETURN_IF_ERR();
|
|
RETURN_NONE();
|
|
}
|
|
|
|
#if (DBVER >= 41)
|
|
static PyObject*
|
|
DBEnv_dbremove(DBEnvObject* self, PyObject* args, PyObject* kwargs)
|
|
{
|
|
int err;
|
|
u_int32_t flags=0;
|
|
char *file = NULL;
|
|
char *database = NULL;
|
|
PyObject *txnobj = NULL;
|
|
DB_TXN *txn = NULL;
|
|
static char* kwnames[] = { "file", "database", "txn", "flags",
|
|
NULL };
|
|
|
|
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s|zOi:dbremove", kwnames,
|
|
&file, &database, &txnobj, &flags)) {
|
|
return NULL;
|
|
}
|
|
if (!checkTxnObj(txnobj, &txn)) {
|
|
return NULL;
|
|
}
|
|
CHECK_ENV_NOT_CLOSED(self);
|
|
MYDB_BEGIN_ALLOW_THREADS;
|
|
err = self->db_env->dbremove(self->db_env, txn, file, database, flags);
|
|
MYDB_END_ALLOW_THREADS;
|
|
RETURN_IF_ERR();
|
|
RETURN_NONE();
|
|
}
|
|
|
|
static PyObject*
|
|
DBEnv_dbrename(DBEnvObject* self, PyObject* args, PyObject* kwargs)
|
|
{
|
|
int err;
|
|
u_int32_t flags=0;
|
|
char *file = NULL;
|
|
char *database = NULL;
|
|
char *newname = NULL;
|
|
PyObject *txnobj = NULL;
|
|
DB_TXN *txn = NULL;
|
|
static char* kwnames[] = { "file", "database", "newname", "txn",
|
|
"flags", NULL };
|
|
|
|
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "szs|Oi:dbrename", kwnames,
|
|
&file, &database, &newname, &txnobj, &flags)) {
|
|
return NULL;
|
|
}
|
|
if (!checkTxnObj(txnobj, &txn)) {
|
|
return NULL;
|
|
}
|
|
CHECK_ENV_NOT_CLOSED(self);
|
|
MYDB_BEGIN_ALLOW_THREADS;
|
|
err = self->db_env->dbrename(self->db_env, txn, file, database, newname,
|
|
flags);
|
|
MYDB_END_ALLOW_THREADS;
|
|
RETURN_IF_ERR();
|
|
RETURN_NONE();
|
|
}
|
|
|
|
static PyObject*
|
|
DBEnv_set_encrypt(DBEnvObject* self, PyObject* args, PyObject* kwargs)
|
|
{
|
|
int err;
|
|
u_int32_t flags=0;
|
|
char *passwd = NULL;
|
|
static char* kwnames[] = { "passwd", "flags", NULL };
|
|
|
|
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s|i:set_encrypt", kwnames,
|
|
&passwd, &flags)) {
|
|
return NULL;
|
|
}
|
|
|
|
MYDB_BEGIN_ALLOW_THREADS;
|
|
err = self->db_env->set_encrypt(self->db_env, passwd, flags);
|
|
MYDB_END_ALLOW_THREADS;
|
|
|
|
RETURN_IF_ERR();
|
|
RETURN_NONE();
|
|
}
|
|
#endif /* DBVER >= 41 */
|
|
|
|
#if (DBVER >= 40)
|
|
static PyObject*
|
|
DBEnv_set_timeout(DBEnvObject* self, PyObject* args, PyObject* kwargs)
|
|
{
|
|
int err;
|
|
u_int32_t flags=0;
|
|
u_int32_t timeout = 0;
|
|
static char* kwnames[] = { "timeout", "flags", NULL };
|
|
|
|
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "ii:set_timeout", kwnames,
|
|
&timeout, &flags)) {
|
|
return NULL;
|
|
}
|
|
|
|
MYDB_BEGIN_ALLOW_THREADS;
|
|
err = self->db_env->set_timeout(self->db_env, (db_timeout_t)timeout, flags);
|
|
MYDB_END_ALLOW_THREADS;
|
|
|
|
RETURN_IF_ERR();
|
|
RETURN_NONE();
|
|
}
|
|
#endif /* DBVER >= 40 */
|
|
|
|
static PyObject*
|
|
DBEnv_set_shm_key(DBEnvObject* self, PyObject* args)
|
|
{
|
|
int err;
|
|
long shm_key = 0;
|
|
|
|
if (!PyArg_ParseTuple(args, "l:set_shm_key", &shm_key))
|
|
return NULL;
|
|
CHECK_ENV_NOT_CLOSED(self);
|
|
|
|
err = self->db_env->set_shm_key(self->db_env, shm_key);
|
|
RETURN_IF_ERR();
|
|
RETURN_NONE();
|
|
}
|
|
|
|
static PyObject*
|
|
DBEnv_set_cachesize(DBEnvObject* self, PyObject* args)
|
|
{
|
|
int err, gbytes=0, bytes=0, ncache=0;
|
|
|
|
if (!PyArg_ParseTuple(args, "ii|i:set_cachesize",
|
|
&gbytes, &bytes, &ncache))
|
|
return NULL;
|
|
CHECK_ENV_NOT_CLOSED(self);
|
|
|
|
MYDB_BEGIN_ALLOW_THREADS;
|
|
err = self->db_env->set_cachesize(self->db_env, gbytes, bytes, ncache);
|
|
MYDB_END_ALLOW_THREADS;
|
|
RETURN_IF_ERR();
|
|
RETURN_NONE();
|
|
}
|
|
|
|
|
|
#if (DBVER >= 32)
|
|
static PyObject*
|
|
DBEnv_set_flags(DBEnvObject* self, PyObject* args)
|
|
{
|
|
int err, flags=0, onoff=0;
|
|
|
|
if (!PyArg_ParseTuple(args, "ii:set_flags",
|
|
&flags, &onoff))
|
|
return NULL;
|
|
CHECK_ENV_NOT_CLOSED(self);
|
|
|
|
MYDB_BEGIN_ALLOW_THREADS;
|
|
err = self->db_env->set_flags(self->db_env, flags, onoff);
|
|
MYDB_END_ALLOW_THREADS;
|
|
RETURN_IF_ERR();
|
|
RETURN_NONE();
|
|
}
|
|
#endif
|
|
|
|
|
|
static PyObject*
|
|
DBEnv_set_data_dir(DBEnvObject* self, PyObject* args)
|
|
{
|
|
int err;
|
|
char *dir;
|
|
|
|
if (!PyArg_ParseTuple(args, "s:set_data_dir", &dir))
|
|
return NULL;
|
|
CHECK_ENV_NOT_CLOSED(self);
|
|
|
|
MYDB_BEGIN_ALLOW_THREADS;
|
|
err = self->db_env->set_data_dir(self->db_env, dir);
|
|
MYDB_END_ALLOW_THREADS;
|
|
RETURN_IF_ERR();
|
|
RETURN_NONE();
|
|
}
|
|
|
|
|
|
static PyObject*
|
|
DBEnv_set_lg_bsize(DBEnvObject* self, PyObject* args)
|
|
{
|
|
int err, lg_bsize;
|
|
|
|
if (!PyArg_ParseTuple(args, "i:set_lg_bsize", &lg_bsize))
|
|
return NULL;
|
|
CHECK_ENV_NOT_CLOSED(self);
|
|
|
|
MYDB_BEGIN_ALLOW_THREADS;
|
|
err = self->db_env->set_lg_bsize(self->db_env, lg_bsize);
|
|
MYDB_END_ALLOW_THREADS;
|
|
RETURN_IF_ERR();
|
|
RETURN_NONE();
|
|
}
|
|
|
|
|
|
static PyObject*
|
|
DBEnv_set_lg_dir(DBEnvObject* self, PyObject* args)
|
|
{
|
|
int err;
|
|
char *dir;
|
|
|
|
if (!PyArg_ParseTuple(args, "s:set_lg_dir", &dir))
|
|
return NULL;
|
|
CHECK_ENV_NOT_CLOSED(self);
|
|
|
|
MYDB_BEGIN_ALLOW_THREADS;
|
|
err = self->db_env->set_lg_dir(self->db_env, dir);
|
|
MYDB_END_ALLOW_THREADS;
|
|
RETURN_IF_ERR();
|
|
RETURN_NONE();
|
|
}
|
|
|
|
static PyObject*
|
|
DBEnv_set_lg_max(DBEnvObject* self, PyObject* args)
|
|
{
|
|
int err, lg_max;
|
|
|
|
if (!PyArg_ParseTuple(args, "i:set_lg_max", &lg_max))
|
|
return NULL;
|
|
CHECK_ENV_NOT_CLOSED(self);
|
|
|
|
MYDB_BEGIN_ALLOW_THREADS;
|
|
err = self->db_env->set_lg_max(self->db_env, lg_max);
|
|
MYDB_END_ALLOW_THREADS;
|
|
RETURN_IF_ERR();
|
|
RETURN_NONE();
|
|
}
|
|
|
|
|
|
#if (DBVER >= 33)
|
|
static PyObject*
|
|
DBEnv_set_lg_regionmax(DBEnvObject* self, PyObject* args)
|
|
{
|
|
int err, lg_max;
|
|
|
|
if (!PyArg_ParseTuple(args, "i:set_lg_regionmax", &lg_max))
|
|
return NULL;
|
|
CHECK_ENV_NOT_CLOSED(self);
|
|
|
|
MYDB_BEGIN_ALLOW_THREADS;
|
|
err = self->db_env->set_lg_regionmax(self->db_env, lg_max);
|
|
MYDB_END_ALLOW_THREADS;
|
|
RETURN_IF_ERR();
|
|
RETURN_NONE();
|
|
}
|
|
#endif
|
|
|
|
|
|
static PyObject*
|
|
DBEnv_set_lk_detect(DBEnvObject* self, PyObject* args)
|
|
{
|
|
int err, lk_detect;
|
|
|
|
if (!PyArg_ParseTuple(args, "i:set_lk_detect", &lk_detect))
|
|
return NULL;
|
|
CHECK_ENV_NOT_CLOSED(self);
|
|
|
|
MYDB_BEGIN_ALLOW_THREADS;
|
|
err = self->db_env->set_lk_detect(self->db_env, lk_detect);
|
|
MYDB_END_ALLOW_THREADS;
|
|
RETURN_IF_ERR();
|
|
RETURN_NONE();
|
|
}
|
|
|
|
|
|
static PyObject*
|
|
DBEnv_set_lk_max(DBEnvObject* self, PyObject* args)
|
|
{
|
|
int err, max;
|
|
|
|
if (!PyArg_ParseTuple(args, "i:set_lk_max", &max))
|
|
return NULL;
|
|
CHECK_ENV_NOT_CLOSED(self);
|
|
|
|
MYDB_BEGIN_ALLOW_THREADS;
|
|
err = self->db_env->set_lk_max(self->db_env, max);
|
|
MYDB_END_ALLOW_THREADS;
|
|
RETURN_IF_ERR();
|
|
RETURN_NONE();
|
|
}
|
|
|
|
|
|
#if (DBVER >= 32)
|
|
|
|
static PyObject*
|
|
DBEnv_set_lk_max_locks(DBEnvObject* self, PyObject* args)
|
|
{
|
|
int err, max;
|
|
|
|
if (!PyArg_ParseTuple(args, "i:set_lk_max_locks", &max))
|
|
return NULL;
|
|
CHECK_ENV_NOT_CLOSED(self);
|
|
|
|
MYDB_BEGIN_ALLOW_THREADS;
|
|
err = self->db_env->set_lk_max_locks(self->db_env, max);
|
|
MYDB_END_ALLOW_THREADS;
|
|
RETURN_IF_ERR();
|
|
RETURN_NONE();
|
|
}
|
|
|
|
|
|
static PyObject*
|
|
DBEnv_set_lk_max_lockers(DBEnvObject* self, PyObject* args)
|
|
{
|
|
int err, max;
|
|
|
|
if (!PyArg_ParseTuple(args, "i:set_lk_max_lockers", &max))
|
|
return NULL;
|
|
CHECK_ENV_NOT_CLOSED(self);
|
|
|
|
MYDB_BEGIN_ALLOW_THREADS;
|
|
err = self->db_env->set_lk_max_lockers(self->db_env, max);
|
|
MYDB_END_ALLOW_THREADS;
|
|
RETURN_IF_ERR();
|
|
RETURN_NONE();
|
|
}
|
|
|
|
|
|
static PyObject*
|
|
DBEnv_set_lk_max_objects(DBEnvObject* self, PyObject* args)
|
|
{
|
|
int err, max;
|
|
|
|
if (!PyArg_ParseTuple(args, "i:set_lk_max_objects", &max))
|
|
return NULL;
|
|
CHECK_ENV_NOT_CLOSED(self);
|
|
|
|
MYDB_BEGIN_ALLOW_THREADS;
|
|
err = self->db_env->set_lk_max_objects(self->db_env, max);
|
|
MYDB_END_ALLOW_THREADS;
|
|
RETURN_IF_ERR();
|
|
RETURN_NONE();
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
static PyObject*
|
|
DBEnv_set_mp_mmapsize(DBEnvObject* self, PyObject* args)
|
|
{
|
|
int err, mp_mmapsize;
|
|
|
|
if (!PyArg_ParseTuple(args, "i:set_mp_mmapsize", &mp_mmapsize))
|
|
return NULL;
|
|
CHECK_ENV_NOT_CLOSED(self);
|
|
|
|
MYDB_BEGIN_ALLOW_THREADS;
|
|
err = self->db_env->set_mp_mmapsize(self->db_env, mp_mmapsize);
|
|
MYDB_END_ALLOW_THREADS;
|
|
RETURN_IF_ERR();
|
|
RETURN_NONE();
|
|
}
|
|
|
|
|
|
static PyObject*
|
|
DBEnv_set_tmp_dir(DBEnvObject* self, PyObject* args)
|
|
{
|
|
int err;
|
|
char *dir;
|
|
|
|
if (!PyArg_ParseTuple(args, "s:set_tmp_dir", &dir))
|
|
return NULL;
|
|
CHECK_ENV_NOT_CLOSED(self);
|
|
|
|
MYDB_BEGIN_ALLOW_THREADS;
|
|
err = self->db_env->set_tmp_dir(self->db_env, dir);
|
|
MYDB_END_ALLOW_THREADS;
|
|
RETURN_IF_ERR();
|
|
RETURN_NONE();
|
|
}
|
|
|
|
|
|
static PyObject*
|
|
DBEnv_txn_begin(DBEnvObject* self, PyObject* args, PyObject* kwargs)
|
|
{
|
|
int flags = 0;
|
|
PyObject* txnobj = NULL;
|
|
DB_TXN *txn = NULL;
|
|
static char* kwnames[] = { "parent", "flags", NULL };
|
|
|
|
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|Oi:txn_begin", kwnames,
|
|
&txnobj, &flags))
|
|
return NULL;
|
|
|
|
if (!checkTxnObj(txnobj, &txn))
|
|
return NULL;
|
|
CHECK_ENV_NOT_CLOSED(self);
|
|
|
|
return (PyObject*)newDBTxnObject(self, txn, flags);
|
|
}
|
|
|
|
|
|
static PyObject*
|
|
DBEnv_txn_checkpoint(DBEnvObject* self, PyObject* args)
|
|
{
|
|
int err, kbyte=0, min=0, flags=0;
|
|
|
|
if (!PyArg_ParseTuple(args, "|iii:txn_checkpoint", &kbyte, &min, &flags))
|
|
return NULL;
|
|
CHECK_ENV_NOT_CLOSED(self);
|
|
|
|
MYDB_BEGIN_ALLOW_THREADS;
|
|
#if (DBVER >= 40)
|
|
err = self->db_env->txn_checkpoint(self->db_env, kbyte, min, flags);
|
|
#else
|
|
err = txn_checkpoint(self->db_env, kbyte, min, flags);
|
|
#endif
|
|
MYDB_END_ALLOW_THREADS;
|
|
RETURN_IF_ERR();
|
|
RETURN_NONE();
|
|
}
|
|
|
|
|
|
static PyObject*
|
|
DBEnv_set_tx_max(DBEnvObject* self, PyObject* args)
|
|
{
|
|
int err, max;
|
|
|
|
if (!PyArg_ParseTuple(args, "i:set_tx_max", &max))
|
|
return NULL;
|
|
CHECK_ENV_NOT_CLOSED(self);
|
|
|
|
err = self->db_env->set_tx_max(self->db_env, max);
|
|
RETURN_IF_ERR();
|
|
RETURN_NONE();
|
|
}
|
|
|
|
|
|
static PyObject*
|
|
DBEnv_set_tx_timestamp(DBEnvObject* self, PyObject* args)
|
|
{
|
|
int err;
|
|
long stamp;
|
|
time_t timestamp;
|
|
|
|
if (!PyArg_ParseTuple(args, "l:set_tx_timestamp", &stamp))
|
|
return NULL;
|
|
CHECK_ENV_NOT_CLOSED(self);
|
|
timestamp = (time_t)stamp;
|
|
err = self->db_env->set_tx_timestamp(self->db_env, ×tamp);
|
|
RETURN_IF_ERR();
|
|
RETURN_NONE();
|
|
}
|
|
|
|
|
|
static PyObject*
|
|
DBEnv_lock_detect(DBEnvObject* self, PyObject* args)
|
|
{
|
|
int err, atype, flags=0;
|
|
int aborted = 0;
|
|
|
|
if (!PyArg_ParseTuple(args, "i|i:lock_detect", &atype, &flags))
|
|
return NULL;
|
|
CHECK_ENV_NOT_CLOSED(self);
|
|
|
|
MYDB_BEGIN_ALLOW_THREADS;
|
|
#if (DBVER >= 40)
|
|
err = self->db_env->lock_detect(self->db_env, flags, atype, &aborted);
|
|
#else
|
|
err = lock_detect(self->db_env, flags, atype, &aborted);
|
|
#endif
|
|
MYDB_END_ALLOW_THREADS;
|
|
RETURN_IF_ERR();
|
|
return PyInt_FromLong(aborted);
|
|
}
|
|
|
|
|
|
static PyObject*
|
|
DBEnv_lock_get(DBEnvObject* self, PyObject* args)
|
|
{
|
|
int flags=0;
|
|
int locker, lock_mode;
|
|
DBT obj;
|
|
PyObject* objobj;
|
|
|
|
if (!PyArg_ParseTuple(args, "iOi|i:lock_get", &locker, &objobj, &lock_mode, &flags))
|
|
return NULL;
|
|
|
|
|
|
if (!make_dbt(objobj, &obj))
|
|
return NULL;
|
|
|
|
return (PyObject*)newDBLockObject(self, locker, &obj, lock_mode, flags);
|
|
}
|
|
|
|
|
|
static PyObject*
|
|
DBEnv_lock_id(DBEnvObject* self, PyObject* args)
|
|
{
|
|
int err;
|
|
u_int32_t theID;
|
|
|
|
if (!PyArg_ParseTuple(args, ":lock_id"))
|
|
return NULL;
|
|
|
|
CHECK_ENV_NOT_CLOSED(self);
|
|
MYDB_BEGIN_ALLOW_THREADS;
|
|
#if (DBVER >= 40)
|
|
err = self->db_env->lock_id(self->db_env, &theID);
|
|
#else
|
|
err = lock_id(self->db_env, &theID);
|
|
#endif
|
|
MYDB_END_ALLOW_THREADS;
|
|
RETURN_IF_ERR();
|
|
|
|
return PyInt_FromLong((long)theID);
|
|
}
|
|
|
|
|
|
static PyObject*
|
|
DBEnv_lock_put(DBEnvObject* self, PyObject* args)
|
|
{
|
|
int err;
|
|
DBLockObject* dblockobj;
|
|
|
|
if (!PyArg_ParseTuple(args, "O!:lock_put", &DBLock_Type, &dblockobj))
|
|
return NULL;
|
|
|
|
CHECK_ENV_NOT_CLOSED(self);
|
|
MYDB_BEGIN_ALLOW_THREADS;
|
|
#if (DBVER >= 40)
|
|
err = self->db_env->lock_put(self->db_env, &dblockobj->lock);
|
|
#else
|
|
err = lock_put(self->db_env, &dblockobj->lock);
|
|
#endif
|
|
MYDB_END_ALLOW_THREADS;
|
|
RETURN_IF_ERR();
|
|
RETURN_NONE();
|
|
}
|
|
|
|
#if (DBVER >= 44)
|
|
static PyObject*
|
|
DBEnv_lsn_reset(DBEnvObject* self, PyObject* args, PyObject* kwargs)
|
|
{
|
|
int err;
|
|
char *file;
|
|
u_int32_t flags = 0;
|
|
static char* kwnames[] = { "file", "flags", NULL};
|
|
|
|
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "z|i:lsn_reset", kwnames,
|
|
&file, &flags))
|
|
return NULL;
|
|
CHECK_ENV_NOT_CLOSED(self);
|
|
|
|
MYDB_BEGIN_ALLOW_THREADS;
|
|
err = self->db_env->lsn_reset(self->db_env, file, flags);
|
|
MYDB_END_ALLOW_THREADS;
|
|
RETURN_IF_ERR();
|
|
RETURN_NONE();
|
|
}
|
|
#endif /* DBVER >= 4.4 */
|
|
|
|
#if (DBVER >= 40)
|
|
static PyObject*
|
|
DBEnv_log_stat(DBEnvObject* self, PyObject* args)
|
|
{
|
|
int err;
|
|
DB_LOG_STAT* statp = NULL;
|
|
PyObject* d = NULL;
|
|
u_int32_t flags = 0;
|
|
|
|
if (!PyArg_ParseTuple(args, "|i:log_stat", &flags))
|
|
return NULL;
|
|
CHECK_ENV_NOT_CLOSED(self);
|
|
|
|
MYDB_BEGIN_ALLOW_THREADS;
|
|
err = self->db_env->log_stat(self->db_env, &statp, flags);
|
|
MYDB_END_ALLOW_THREADS;
|
|
RETURN_IF_ERR();
|
|
|
|
/* Turn the stat structure into a dictionary */
|
|
d = PyDict_New();
|
|
if (d == NULL) {
|
|
if (statp)
|
|
free(statp);
|
|
return NULL;
|
|
}
|
|
|
|
#define MAKE_ENTRY(name) _addIntToDict(d, #name, statp->st_##name)
|
|
|
|
MAKE_ENTRY(magic);
|
|
MAKE_ENTRY(version);
|
|
MAKE_ENTRY(mode);
|
|
MAKE_ENTRY(lg_bsize);
|
|
#if (DBVER >= 44)
|
|
MAKE_ENTRY(lg_size);
|
|
MAKE_ENTRY(record);
|
|
#endif
|
|
#if (DBVER <= 40)
|
|
MAKE_ENTRY(lg_max);
|
|
#endif
|
|
MAKE_ENTRY(w_mbytes);
|
|
MAKE_ENTRY(w_bytes);
|
|
MAKE_ENTRY(wc_mbytes);
|
|
MAKE_ENTRY(wc_bytes);
|
|
MAKE_ENTRY(wcount);
|
|
MAKE_ENTRY(wcount_fill);
|
|
#if (DBVER >= 44)
|
|
MAKE_ENTRY(rcount);
|
|
#endif
|
|
MAKE_ENTRY(scount);
|
|
MAKE_ENTRY(cur_file);
|
|
MAKE_ENTRY(cur_offset);
|
|
MAKE_ENTRY(disk_file);
|
|
MAKE_ENTRY(disk_offset);
|
|
MAKE_ENTRY(maxcommitperflush);
|
|
MAKE_ENTRY(mincommitperflush);
|
|
MAKE_ENTRY(regsize);
|
|
MAKE_ENTRY(region_wait);
|
|
MAKE_ENTRY(region_nowait);
|
|
|
|
#undef MAKE_ENTRY
|
|
free(statp);
|
|
return d;
|
|
} /* DBEnv_log_stat */
|
|
#endif /* DBVER >= 4.0 for log_stat method */
|
|
|
|
|
|
static PyObject*
|
|
DBEnv_lock_stat(DBEnvObject* self, PyObject* args)
|
|
{
|
|
int err;
|
|
DB_LOCK_STAT* sp;
|
|
PyObject* d = NULL;
|
|
u_int32_t flags = 0;
|
|
|
|
if (!PyArg_ParseTuple(args, "|i:lock_stat", &flags))
|
|
return NULL;
|
|
CHECK_ENV_NOT_CLOSED(self);
|
|
|
|
MYDB_BEGIN_ALLOW_THREADS;
|
|
#if (DBVER >= 40)
|
|
err = self->db_env->lock_stat(self->db_env, &sp, flags);
|
|
#else
|
|
#if (DBVER >= 33)
|
|
err = lock_stat(self->db_env, &sp);
|
|
#else
|
|
err = lock_stat(self->db_env, &sp, NULL);
|
|
#endif
|
|
#endif
|
|
MYDB_END_ALLOW_THREADS;
|
|
RETURN_IF_ERR();
|
|
|
|
/* Turn the stat structure into a dictionary */
|
|
d = PyDict_New();
|
|
if (d == NULL) {
|
|
free(sp);
|
|
return NULL;
|
|
}
|
|
|
|
#define MAKE_ENTRY(name) _addIntToDict(d, #name, sp->st_##name)
|
|
|
|
#if (DBVER < 41)
|
|
MAKE_ENTRY(lastid);
|
|
#endif
|
|
MAKE_ENTRY(nmodes);
|
|
#if (DBVER >= 32)
|
|
MAKE_ENTRY(maxlocks);
|
|
MAKE_ENTRY(maxlockers);
|
|
MAKE_ENTRY(maxobjects);
|
|
MAKE_ENTRY(nlocks);
|
|
MAKE_ENTRY(maxnlocks);
|
|
#endif
|
|
MAKE_ENTRY(nlockers);
|
|
MAKE_ENTRY(maxnlockers);
|
|
#if (DBVER >= 32)
|
|
MAKE_ENTRY(nobjects);
|
|
MAKE_ENTRY(maxnobjects);
|
|
#endif
|
|
MAKE_ENTRY(nrequests);
|
|
MAKE_ENTRY(nreleases);
|
|
#if (DBVER < 44)
|
|
MAKE_ENTRY(nnowaits); /* these were renamed in 4.4 */
|
|
MAKE_ENTRY(nconflicts);
|
|
#else
|
|
MAKE_ENTRY(lock_nowait);
|
|
MAKE_ENTRY(lock_wait);
|
|
#endif
|
|
MAKE_ENTRY(ndeadlocks);
|
|
MAKE_ENTRY(regsize);
|
|
MAKE_ENTRY(region_wait);
|
|
MAKE_ENTRY(region_nowait);
|
|
|
|
#undef MAKE_ENTRY
|
|
free(sp);
|
|
return d;
|
|
}
|
|
|
|
|
|
static PyObject*
|
|
DBEnv_log_archive(DBEnvObject* self, PyObject* args)
|
|
{
|
|
int flags=0;
|
|
int err;
|
|
char **log_list = NULL;
|
|
PyObject* list;
|
|
PyObject* item = NULL;
|
|
|
|
if (!PyArg_ParseTuple(args, "|i:log_archive", &flags))
|
|
return NULL;
|
|
|
|
CHECK_ENV_NOT_CLOSED(self);
|
|
MYDB_BEGIN_ALLOW_THREADS;
|
|
#if (DBVER >= 40)
|
|
err = self->db_env->log_archive(self->db_env, &log_list, flags);
|
|
#elif (DBVER == 33)
|
|
err = log_archive(self->db_env, &log_list, flags);
|
|
#else
|
|
err = log_archive(self->db_env, &log_list, flags, NULL);
|
|
#endif
|
|
MYDB_END_ALLOW_THREADS;
|
|
RETURN_IF_ERR();
|
|
|
|
list = PyList_New(0);
|
|
if (list == NULL) {
|
|
if (log_list)
|
|
free(log_list);
|
|
return NULL;
|
|
}
|
|
|
|
if (log_list) {
|
|
char **log_list_start;
|
|
for (log_list_start = log_list; *log_list != NULL; ++log_list) {
|
|
item = PyString_FromString (*log_list);
|
|
if (item == NULL) {
|
|
Py_DECREF(list);
|
|
list = NULL;
|
|
break;
|
|
}
|
|
PyList_Append(list, item);
|
|
Py_DECREF(item);
|
|
}
|
|
free(log_list_start);
|
|
}
|
|
return list;
|
|
}
|
|
|
|
|
|
static PyObject*
|
|
DBEnv_txn_stat(DBEnvObject* self, PyObject* args)
|
|
{
|
|
int err;
|
|
DB_TXN_STAT* sp;
|
|
PyObject* d = NULL;
|
|
u_int32_t flags=0;
|
|
|
|
if (!PyArg_ParseTuple(args, "|i:txn_stat", &flags))
|
|
return NULL;
|
|
CHECK_ENV_NOT_CLOSED(self);
|
|
|
|
MYDB_BEGIN_ALLOW_THREADS;
|
|
#if (DBVER >= 40)
|
|
err = self->db_env->txn_stat(self->db_env, &sp, flags);
|
|
#elif (DBVER == 33)
|
|
err = txn_stat(self->db_env, &sp);
|
|
#else
|
|
err = txn_stat(self->db_env, &sp, NULL);
|
|
#endif
|
|
MYDB_END_ALLOW_THREADS;
|
|
RETURN_IF_ERR();
|
|
|
|
/* Turn the stat structure into a dictionary */
|
|
d = PyDict_New();
|
|
if (d == NULL) {
|
|
free(sp);
|
|
return NULL;
|
|
}
|
|
|
|
#define MAKE_ENTRY(name) _addIntToDict(d, #name, sp->st_##name)
|
|
|
|
MAKE_ENTRY(time_ckp);
|
|
MAKE_ENTRY(last_txnid);
|
|
MAKE_ENTRY(maxtxns);
|
|
MAKE_ENTRY(nactive);
|
|
MAKE_ENTRY(maxnactive);
|
|
MAKE_ENTRY(nbegins);
|
|
MAKE_ENTRY(naborts);
|
|
MAKE_ENTRY(ncommits);
|
|
MAKE_ENTRY(regsize);
|
|
MAKE_ENTRY(region_wait);
|
|
MAKE_ENTRY(region_nowait);
|
|
|
|
#undef MAKE_ENTRY
|
|
free(sp);
|
|
return d;
|
|
}
|
|
|
|
|
|
static PyObject*
|
|
DBEnv_set_get_returns_none(DBEnvObject* self, PyObject* args)
|
|
{
|
|
int flags=0;
|
|
int oldValue=0;
|
|
|
|
if (!PyArg_ParseTuple(args,"i:set_get_returns_none", &flags))
|
|
return NULL;
|
|
CHECK_ENV_NOT_CLOSED(self);
|
|
|
|
if (self->moduleFlags.getReturnsNone)
|
|
++oldValue;
|
|
if (self->moduleFlags.cursorSetReturnsNone)
|
|
++oldValue;
|
|
self->moduleFlags.getReturnsNone = (flags >= 1);
|
|
self->moduleFlags.cursorSetReturnsNone = (flags >= 2);
|
|
return PyInt_FromLong(oldValue);
|
|
}
|
|
|
|
|
|
/* --------------------------------------------------------------------- */
|
|
/* DBTxn methods */
|
|
|
|
|
|
static PyObject*
|
|
DBTxn_commit(DBTxnObject* self, PyObject* args)
|
|
{
|
|
int flags=0, err;
|
|
DB_TXN *txn;
|
|
|
|
if (!PyArg_ParseTuple(args, "|i:commit", &flags))
|
|
return NULL;
|
|
|
|
if (!self->txn) {
|
|
PyObject *t = Py_BuildValue("(is)", 0, "DBTxn must not be used "
|
|
"after txn_commit or txn_abort");
|
|
PyErr_SetObject(DBError, t);
|
|
Py_DECREF(t);
|
|
return NULL;
|
|
}
|
|
txn = self->txn;
|
|
self->txn = NULL; /* this DB_TXN is no longer valid after this call */
|
|
MYDB_BEGIN_ALLOW_THREADS;
|
|
#if (DBVER >= 40)
|
|
err = txn->commit(txn, flags);
|
|
#else
|
|
err = txn_commit(txn, flags);
|
|
#endif
|
|
MYDB_END_ALLOW_THREADS;
|
|
RETURN_IF_ERR();
|
|
RETURN_NONE();
|
|
}
|
|
|
|
static PyObject*
|
|
DBTxn_prepare(DBTxnObject* self, PyObject* args)
|
|
{
|
|
#if (DBVER >= 33)
|
|
int err;
|
|
char* gid=NULL;
|
|
int gid_size=0;
|
|
|
|
if (!PyArg_ParseTuple(args, "s#:prepare", &gid, &gid_size))
|
|
return NULL;
|
|
|
|
if (gid_size != DB_XIDDATASIZE) {
|
|
PyErr_SetString(PyExc_TypeError,
|
|
"gid must be DB_XIDDATASIZE bytes long");
|
|
return NULL;
|
|
}
|
|
|
|
if (!self->txn) {
|
|
PyObject *t = Py_BuildValue("(is)", 0,"DBTxn must not be used "
|
|
"after txn_commit or txn_abort");
|
|
PyErr_SetObject(DBError, t);
|
|
Py_DECREF(t);
|
|
return NULL;
|
|
}
|
|
MYDB_BEGIN_ALLOW_THREADS;
|
|
#if (DBVER >= 40)
|
|
err = self->txn->prepare(self->txn, (u_int8_t*)gid);
|
|
#else
|
|
err = txn_prepare(self->txn, (u_int8_t*)gid);
|
|
#endif
|
|
MYDB_END_ALLOW_THREADS;
|
|
RETURN_IF_ERR();
|
|
RETURN_NONE();
|
|
#else
|
|
int err;
|
|
|
|
if (!PyArg_ParseTuple(args, ":prepare"))
|
|
return NULL;
|
|
|
|
if (!self->txn) {
|
|
PyObject *t = Py_BuildValue("(is)", 0, "DBTxn must not be used "
|
|
"after txn_commit or txn_abort");
|
|
PyErr_SetObject(DBError, t);
|
|
Py_DECREF(t);
|
|
return NULL;
|
|
}
|
|
MYDB_BEGIN_ALLOW_THREADS;
|
|
err = txn_prepare(self->txn);
|
|
MYDB_END_ALLOW_THREADS;
|
|
RETURN_IF_ERR();
|
|
RETURN_NONE();
|
|
#endif
|
|
}
|
|
|
|
|
|
static PyObject*
|
|
DBTxn_abort(DBTxnObject* self, PyObject* args)
|
|
{
|
|
int err;
|
|
DB_TXN *txn;
|
|
|
|
if (!PyArg_ParseTuple(args, ":abort"))
|
|
return NULL;
|
|
|
|
if (!self->txn) {
|
|
PyObject *t = Py_BuildValue("(is)", 0, "DBTxn must not be used "
|
|
"after txn_commit or txn_abort");
|
|
PyErr_SetObject(DBError, t);
|
|
Py_DECREF(t);
|
|
return NULL;
|
|
}
|
|
txn = self->txn;
|
|
self->txn = NULL; /* this DB_TXN is no longer valid after this call */
|
|
MYDB_BEGIN_ALLOW_THREADS;
|
|
#if (DBVER >= 40)
|
|
err = txn->abort(txn);
|
|
#else
|
|
err = txn_abort(txn);
|
|
#endif
|
|
MYDB_END_ALLOW_THREADS;
|
|
RETURN_IF_ERR();
|
|
RETURN_NONE();
|
|
}
|
|
|
|
|
|
static PyObject*
|
|
DBTxn_id(DBTxnObject* self, PyObject* args)
|
|
{
|
|
int id;
|
|
|
|
if (!PyArg_ParseTuple(args, ":id"))
|
|
return NULL;
|
|
|
|
if (!self->txn) {
|
|
PyObject *t = Py_BuildValue("(is)", 0, "DBTxn must not be used "
|
|
"after txn_commit or txn_abort");
|
|
PyErr_SetObject(DBError, t);
|
|
Py_DECREF(t);
|
|
return NULL;
|
|
}
|
|
MYDB_BEGIN_ALLOW_THREADS;
|
|
#if (DBVER >= 40)
|
|
id = self->txn->id(self->txn);
|
|
#else
|
|
id = txn_id(self->txn);
|
|
#endif
|
|
MYDB_END_ALLOW_THREADS;
|
|
return PyInt_FromLong(id);
|
|
}
|
|
|
|
#if (DBVER >= 43)
|
|
/* --------------------------------------------------------------------- */
|
|
/* DBSequence methods */
|
|
|
|
|
|
static PyObject*
|
|
DBSequence_close(DBSequenceObject* self, PyObject* args)
|
|
{
|
|
int err, flags=0;
|
|
if (!PyArg_ParseTuple(args,"|i:close", &flags))
|
|
return NULL;
|
|
CHECK_SEQUENCE_NOT_CLOSED(self)
|
|
|
|
MYDB_BEGIN_ALLOW_THREADS
|
|
err = self->sequence->close(self->sequence, flags);
|
|
self->sequence = NULL;
|
|
MYDB_END_ALLOW_THREADS
|
|
|
|
RETURN_IF_ERR();
|
|
|
|
RETURN_NONE();
|
|
}
|
|
|
|
static PyObject*
|
|
DBSequence_get(DBSequenceObject* self, PyObject* args, PyObject* kwargs)
|
|
{
|
|
int err, flags = 0;
|
|
int delta = 1;
|
|
db_seq_t value;
|
|
PyObject *txnobj = NULL;
|
|
DB_TXN *txn = NULL;
|
|
static char* kwnames[] = {"delta", "txn", "flags", NULL };
|
|
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|iOi:get", kwnames, &delta, &txnobj, &flags))
|
|
return NULL;
|
|
CHECK_SEQUENCE_NOT_CLOSED(self)
|
|
|
|
if (!checkTxnObj(txnobj, &txn))
|
|
return NULL;
|
|
|
|
MYDB_BEGIN_ALLOW_THREADS
|
|
err = self->sequence->get(self->sequence, txn, delta, &value, flags);
|
|
MYDB_END_ALLOW_THREADS
|
|
|
|
RETURN_IF_ERR();
|
|
return PyLong_FromLongLong(value);
|
|
|
|
}
|
|
|
|
static PyObject*
|
|
DBSequence_get_dbp(DBSequenceObject* self, PyObject* args)
|
|
{
|
|
if (!PyArg_ParseTuple(args,":get_dbp"))
|
|
return NULL;
|
|
CHECK_SEQUENCE_NOT_CLOSED(self)
|
|
Py_INCREF(self->mydb);
|
|
return (PyObject* )self->mydb;
|
|
}
|
|
|
|
static PyObject*
|
|
DBSequence_get_key(DBSequenceObject* self, PyObject* args)
|
|
{
|
|
int err;
|
|
DBT key;
|
|
CHECK_SEQUENCE_NOT_CLOSED(self)
|
|
MYDB_BEGIN_ALLOW_THREADS
|
|
err = self->sequence->get_key(self->sequence, &key);
|
|
MYDB_END_ALLOW_THREADS
|
|
|
|
RETURN_IF_ERR();
|
|
|
|
return PyString_FromStringAndSize(key.data, key.size);
|
|
}
|
|
|
|
static PyObject*
|
|
DBSequence_init_value(DBSequenceObject* self, PyObject* args)
|
|
{
|
|
int err;
|
|
db_seq_t value;
|
|
if (!PyArg_ParseTuple(args,"L:init_value", &value))
|
|
return NULL;
|
|
CHECK_SEQUENCE_NOT_CLOSED(self)
|
|
|
|
MYDB_BEGIN_ALLOW_THREADS
|
|
err = self->sequence->initial_value(self->sequence, value);
|
|
MYDB_END_ALLOW_THREADS
|
|
|
|
RETURN_IF_ERR();
|
|
|
|
RETURN_NONE();
|
|
}
|
|
|
|
static PyObject*
|
|
DBSequence_open(DBSequenceObject* self, PyObject* args, PyObject* kwargs)
|
|
{
|
|
int err, flags = 0;
|
|
PyObject* keyobj;
|
|
PyObject *txnobj = NULL;
|
|
DB_TXN *txn = NULL;
|
|
DBT key;
|
|
|
|
static char* kwnames[] = {"key", "txn", "flags", NULL };
|
|
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O|Oi:open", kwnames, &keyobj, &txnobj, &flags))
|
|
return NULL;
|
|
|
|
if (!checkTxnObj(txnobj, &txn))
|
|
return NULL;
|
|
|
|
if (!make_key_dbt(self->mydb, keyobj, &key, NULL))
|
|
return NULL;
|
|
|
|
MYDB_BEGIN_ALLOW_THREADS
|
|
err = self->sequence->open(self->sequence, txn, &key, flags);
|
|
MYDB_END_ALLOW_THREADS
|
|
|
|
CLEAR_DBT(key);
|
|
RETURN_IF_ERR();
|
|
|
|
RETURN_NONE();
|
|
}
|
|
|
|
static PyObject*
|
|
DBSequence_remove(DBSequenceObject* self, PyObject* args, PyObject* kwargs)
|
|
{
|
|
int err, flags = 0;
|
|
PyObject *txnobj = NULL;
|
|
DB_TXN *txn = NULL;
|
|
|
|
static char* kwnames[] = {"txn", "flags", NULL };
|
|
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|Oi:remove", kwnames, &txnobj, &flags))
|
|
return NULL;
|
|
|
|
if (!checkTxnObj(txnobj, &txn))
|
|
return NULL;
|
|
|
|
CHECK_SEQUENCE_NOT_CLOSED(self)
|
|
|
|
MYDB_BEGIN_ALLOW_THREADS
|
|
err = self->sequence->remove(self->sequence, txn, flags);
|
|
MYDB_END_ALLOW_THREADS
|
|
|
|
RETURN_IF_ERR();
|
|
RETURN_NONE();
|
|
}
|
|
|
|
static PyObject*
|
|
DBSequence_set_cachesize(DBSequenceObject* self, PyObject* args)
|
|
{
|
|
int err, size;
|
|
if (!PyArg_ParseTuple(args,"i:set_cachesize", &size))
|
|
return NULL;
|
|
CHECK_SEQUENCE_NOT_CLOSED(self)
|
|
|
|
MYDB_BEGIN_ALLOW_THREADS
|
|
err = self->sequence->set_cachesize(self->sequence, size);
|
|
MYDB_END_ALLOW_THREADS
|
|
|
|
RETURN_IF_ERR();
|
|
RETURN_NONE();
|
|
}
|
|
|
|
static PyObject*
|
|
DBSequence_get_cachesize(DBSequenceObject* self, PyObject* args)
|
|
{
|
|
int err, size;
|
|
if (!PyArg_ParseTuple(args,":get_cachesize"))
|
|
return NULL;
|
|
CHECK_SEQUENCE_NOT_CLOSED(self)
|
|
|
|
MYDB_BEGIN_ALLOW_THREADS
|
|
err = self->sequence->get_cachesize(self->sequence, &size);
|
|
MYDB_END_ALLOW_THREADS
|
|
|
|
RETURN_IF_ERR();
|
|
return PyInt_FromLong(size);
|
|
}
|
|
|
|
static PyObject*
|
|
DBSequence_set_flags(DBSequenceObject* self, PyObject* args)
|
|
{
|
|
int err, flags = 0;
|
|
if (!PyArg_ParseTuple(args,"i:set_flags", &flags))
|
|
return NULL;
|
|
CHECK_SEQUENCE_NOT_CLOSED(self)
|
|
|
|
MYDB_BEGIN_ALLOW_THREADS
|
|
err = self->sequence->set_flags(self->sequence, flags);
|
|
MYDB_END_ALLOW_THREADS
|
|
|
|
RETURN_IF_ERR();
|
|
RETURN_NONE();
|
|
|
|
}
|
|
|
|
static PyObject*
|
|
DBSequence_get_flags(DBSequenceObject* self, PyObject* args)
|
|
{
|
|
unsigned int flags;
|
|
int err;
|
|
if (!PyArg_ParseTuple(args,":get_flags"))
|
|
return NULL;
|
|
CHECK_SEQUENCE_NOT_CLOSED(self)
|
|
|
|
MYDB_BEGIN_ALLOW_THREADS
|
|
err = self->sequence->get_flags(self->sequence, &flags);
|
|
MYDB_END_ALLOW_THREADS
|
|
|
|
RETURN_IF_ERR();
|
|
return PyInt_FromLong((int)flags);
|
|
}
|
|
|
|
static PyObject*
|
|
DBSequence_set_range(DBSequenceObject* self, PyObject* args)
|
|
{
|
|
int err;
|
|
db_seq_t min, max;
|
|
if (!PyArg_ParseTuple(args,"(LL):set_range", &min, &max))
|
|
return NULL;
|
|
CHECK_SEQUENCE_NOT_CLOSED(self)
|
|
|
|
MYDB_BEGIN_ALLOW_THREADS
|
|
err = self->sequence->set_range(self->sequence, min, max);
|
|
MYDB_END_ALLOW_THREADS
|
|
|
|
RETURN_IF_ERR();
|
|
RETURN_NONE();
|
|
}
|
|
|
|
static PyObject*
|
|
DBSequence_get_range(DBSequenceObject* self, PyObject* args)
|
|
{
|
|
int err;
|
|
db_seq_t min, max;
|
|
if (!PyArg_ParseTuple(args,":get_range"))
|
|
return NULL;
|
|
CHECK_SEQUENCE_NOT_CLOSED(self)
|
|
|
|
MYDB_BEGIN_ALLOW_THREADS
|
|
err = self->sequence->get_range(self->sequence, &min, &max);
|
|
MYDB_END_ALLOW_THREADS
|
|
|
|
RETURN_IF_ERR();
|
|
return Py_BuildValue("(LL)", min, max);
|
|
}
|
|
|
|
static PyObject*
|
|
DBSequence_stat(DBSequenceObject* self, PyObject* args, PyObject* kwargs)
|
|
{
|
|
int err, flags = 0;
|
|
DB_SEQUENCE_STAT* sp = NULL;
|
|
PyObject* dict_stat;
|
|
static char* kwnames[] = {"flags", NULL };
|
|
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|i:stat", kwnames, &flags))
|
|
return NULL;
|
|
CHECK_SEQUENCE_NOT_CLOSED(self);
|
|
|
|
MYDB_BEGIN_ALLOW_THREADS;
|
|
err = self->sequence->stat(self->sequence, &sp, flags);
|
|
MYDB_END_ALLOW_THREADS;
|
|
RETURN_IF_ERR();
|
|
|
|
if ((dict_stat = PyDict_New()) == NULL) {
|
|
free(sp);
|
|
return NULL;
|
|
}
|
|
|
|
|
|
#define MAKE_INT_ENTRY(name) _addIntToDict(dict_stat, #name, sp->st_##name)
|
|
#define MAKE_LONG_LONG_ENTRY(name) _addDb_seq_tToDict(dict_stat, #name, sp->st_##name)
|
|
|
|
MAKE_INT_ENTRY(wait);
|
|
MAKE_INT_ENTRY(nowait);
|
|
MAKE_LONG_LONG_ENTRY(current);
|
|
MAKE_LONG_LONG_ENTRY(value);
|
|
MAKE_LONG_LONG_ENTRY(last_value);
|
|
MAKE_LONG_LONG_ENTRY(min);
|
|
MAKE_LONG_LONG_ENTRY(max);
|
|
MAKE_INT_ENTRY(cache_size);
|
|
MAKE_INT_ENTRY(flags);
|
|
|
|
#undef MAKE_INT_ENTRY
|
|
#undef MAKE_LONG_LONG_ENTRY
|
|
|
|
free(sp);
|
|
return dict_stat;
|
|
}
|
|
#endif
|
|
|
|
|
|
/* --------------------------------------------------------------------- */
|
|
/* Method definition tables and type objects */
|
|
|
|
static PyMethodDef DB_methods[] = {
|
|
{"append", (PyCFunction)DB_append, METH_VARARGS},
|
|
#if (DBVER >= 33)
|
|
{"associate", (PyCFunction)DB_associate, METH_VARARGS|METH_KEYWORDS},
|
|
#endif
|
|
{"close", (PyCFunction)DB_close, METH_VARARGS},
|
|
#if (DBVER >= 32)
|
|
{"consume", (PyCFunction)DB_consume, METH_VARARGS|METH_KEYWORDS},
|
|
{"consume_wait", (PyCFunction)DB_consume_wait, METH_VARARGS|METH_KEYWORDS},
|
|
#endif
|
|
{"cursor", (PyCFunction)DB_cursor, METH_VARARGS|METH_KEYWORDS},
|
|
{"delete", (PyCFunction)DB_delete, METH_VARARGS|METH_KEYWORDS},
|
|
{"fd", (PyCFunction)DB_fd, METH_VARARGS},
|
|
{"get", (PyCFunction)DB_get, METH_VARARGS|METH_KEYWORDS},
|
|
#if (DBVER >= 33)
|
|
{"pget", (PyCFunction)DB_pget, METH_VARARGS|METH_KEYWORDS},
|
|
#endif
|
|
{"get_both", (PyCFunction)DB_get_both, METH_VARARGS|METH_KEYWORDS},
|
|
{"get_byteswapped", (PyCFunction)DB_get_byteswapped,METH_VARARGS},
|
|
{"get_size", (PyCFunction)DB_get_size, METH_VARARGS|METH_KEYWORDS},
|
|
{"get_type", (PyCFunction)DB_get_type, METH_VARARGS},
|
|
{"join", (PyCFunction)DB_join, METH_VARARGS},
|
|
{"key_range", (PyCFunction)DB_key_range, METH_VARARGS|METH_KEYWORDS},
|
|
{"has_key", (PyCFunction)DB_has_key, METH_VARARGS},
|
|
{"items", (PyCFunction)DB_items, METH_VARARGS},
|
|
{"keys", (PyCFunction)DB_keys, METH_VARARGS},
|
|
{"open", (PyCFunction)DB_open, METH_VARARGS|METH_KEYWORDS},
|
|
{"put", (PyCFunction)DB_put, METH_VARARGS|METH_KEYWORDS},
|
|
{"remove", (PyCFunction)DB_remove, METH_VARARGS|METH_KEYWORDS},
|
|
{"rename", (PyCFunction)DB_rename, METH_VARARGS},
|
|
{"set_bt_minkey", (PyCFunction)DB_set_bt_minkey, METH_VARARGS},
|
|
#if (DBVER >= 33)
|
|
{"set_bt_compare", (PyCFunction)DB_set_bt_compare, METH_VARARGS},
|
|
#endif
|
|
{"set_cachesize", (PyCFunction)DB_set_cachesize, METH_VARARGS},
|
|
#if (DBVER >= 41)
|
|
{"set_encrypt", (PyCFunction)DB_set_encrypt, METH_VARARGS|METH_KEYWORDS},
|
|
#endif
|
|
{"set_flags", (PyCFunction)DB_set_flags, METH_VARARGS},
|
|
{"set_h_ffactor", (PyCFunction)DB_set_h_ffactor, METH_VARARGS},
|
|
{"set_h_nelem", (PyCFunction)DB_set_h_nelem, METH_VARARGS},
|
|
{"set_lorder", (PyCFunction)DB_set_lorder, METH_VARARGS},
|
|
{"set_pagesize", (PyCFunction)DB_set_pagesize, METH_VARARGS},
|
|
{"set_re_delim", (PyCFunction)DB_set_re_delim, METH_VARARGS},
|
|
{"set_re_len", (PyCFunction)DB_set_re_len, METH_VARARGS},
|
|
{"set_re_pad", (PyCFunction)DB_set_re_pad, METH_VARARGS},
|
|
{"set_re_source", (PyCFunction)DB_set_re_source, METH_VARARGS},
|
|
#if (DBVER >= 32)
|
|
{"set_q_extentsize",(PyCFunction)DB_set_q_extentsize,METH_VARARGS},
|
|
#endif
|
|
{"stat", (PyCFunction)DB_stat, METH_VARARGS|METH_KEYWORDS},
|
|
{"sync", (PyCFunction)DB_sync, METH_VARARGS},
|
|
#if (DBVER >= 33)
|
|
{"truncate", (PyCFunction)DB_truncate, METH_VARARGS|METH_KEYWORDS},
|
|
#endif
|
|
{"type", (PyCFunction)DB_get_type, METH_VARARGS},
|
|
{"upgrade", (PyCFunction)DB_upgrade, METH_VARARGS},
|
|
{"values", (PyCFunction)DB_values, METH_VARARGS},
|
|
{"verify", (PyCFunction)DB_verify, METH_VARARGS|METH_KEYWORDS},
|
|
{"set_get_returns_none",(PyCFunction)DB_set_get_returns_none, METH_VARARGS},
|
|
{NULL, NULL} /* sentinel */
|
|
};
|
|
|
|
|
|
static PyMappingMethods DB_mapping = {
|
|
DB_length, /*mp_length*/
|
|
(binaryfunc)DB_subscript, /*mp_subscript*/
|
|
(objobjargproc)DB_ass_sub, /*mp_ass_subscript*/
|
|
};
|
|
|
|
|
|
static PyMethodDef DBCursor_methods[] = {
|
|
{"close", (PyCFunction)DBC_close, METH_VARARGS},
|
|
{"count", (PyCFunction)DBC_count, METH_VARARGS},
|
|
{"current", (PyCFunction)DBC_current, METH_VARARGS|METH_KEYWORDS},
|
|
{"delete", (PyCFunction)DBC_delete, METH_VARARGS},
|
|
{"dup", (PyCFunction)DBC_dup, METH_VARARGS},
|
|
{"first", (PyCFunction)DBC_first, METH_VARARGS|METH_KEYWORDS},
|
|
{"get", (PyCFunction)DBC_get, METH_VARARGS|METH_KEYWORDS},
|
|
#if (DBVER >= 33)
|
|
{"pget", (PyCFunction)DBC_pget, METH_VARARGS|METH_KEYWORDS},
|
|
#endif
|
|
{"get_recno", (PyCFunction)DBC_get_recno, METH_VARARGS},
|
|
{"last", (PyCFunction)DBC_last, METH_VARARGS|METH_KEYWORDS},
|
|
{"next", (PyCFunction)DBC_next, METH_VARARGS|METH_KEYWORDS},
|
|
{"prev", (PyCFunction)DBC_prev, METH_VARARGS|METH_KEYWORDS},
|
|
{"put", (PyCFunction)DBC_put, METH_VARARGS|METH_KEYWORDS},
|
|
{"set", (PyCFunction)DBC_set, METH_VARARGS|METH_KEYWORDS},
|
|
{"set_range", (PyCFunction)DBC_set_range, METH_VARARGS|METH_KEYWORDS},
|
|
{"get_both", (PyCFunction)DBC_get_both, METH_VARARGS},
|
|
{"get_current_size",(PyCFunction)DBC_get_current_size, METH_VARARGS},
|
|
{"set_both", (PyCFunction)DBC_set_both, METH_VARARGS},
|
|
{"set_recno", (PyCFunction)DBC_set_recno, METH_VARARGS|METH_KEYWORDS},
|
|
{"consume", (PyCFunction)DBC_consume, METH_VARARGS|METH_KEYWORDS},
|
|
{"next_dup", (PyCFunction)DBC_next_dup, METH_VARARGS|METH_KEYWORDS},
|
|
{"next_nodup", (PyCFunction)DBC_next_nodup, METH_VARARGS|METH_KEYWORDS},
|
|
{"prev_nodup", (PyCFunction)DBC_prev_nodup, METH_VARARGS|METH_KEYWORDS},
|
|
{"join_item", (PyCFunction)DBC_join_item, METH_VARARGS},
|
|
{NULL, NULL} /* sentinel */
|
|
};
|
|
|
|
|
|
static PyMethodDef DBEnv_methods[] = {
|
|
{"close", (PyCFunction)DBEnv_close, METH_VARARGS},
|
|
{"open", (PyCFunction)DBEnv_open, METH_VARARGS},
|
|
{"remove", (PyCFunction)DBEnv_remove, METH_VARARGS},
|
|
#if (DBVER >= 41)
|
|
{"dbremove", (PyCFunction)DBEnv_dbremove, METH_VARARGS|METH_KEYWORDS},
|
|
{"dbrename", (PyCFunction)DBEnv_dbrename, METH_VARARGS|METH_KEYWORDS},
|
|
{"set_encrypt", (PyCFunction)DBEnv_set_encrypt, METH_VARARGS|METH_KEYWORDS},
|
|
#endif
|
|
#if (DBVER >= 40)
|
|
{"set_timeout", (PyCFunction)DBEnv_set_timeout, METH_VARARGS|METH_KEYWORDS},
|
|
#endif
|
|
{"set_shm_key", (PyCFunction)DBEnv_set_shm_key, METH_VARARGS},
|
|
{"set_cachesize", (PyCFunction)DBEnv_set_cachesize, METH_VARARGS},
|
|
{"set_data_dir", (PyCFunction)DBEnv_set_data_dir, METH_VARARGS},
|
|
#if (DBVER >= 32)
|
|
{"set_flags", (PyCFunction)DBEnv_set_flags, METH_VARARGS},
|
|
#endif
|
|
{"set_lg_bsize", (PyCFunction)DBEnv_set_lg_bsize, METH_VARARGS},
|
|
{"set_lg_dir", (PyCFunction)DBEnv_set_lg_dir, METH_VARARGS},
|
|
{"set_lg_max", (PyCFunction)DBEnv_set_lg_max, METH_VARARGS},
|
|
#if (DBVER >= 33)
|
|
{"set_lg_regionmax",(PyCFunction)DBEnv_set_lg_regionmax, METH_VARARGS},
|
|
#endif
|
|
{"set_lk_detect", (PyCFunction)DBEnv_set_lk_detect, METH_VARARGS},
|
|
{"set_lk_max", (PyCFunction)DBEnv_set_lk_max, METH_VARARGS},
|
|
#if (DBVER >= 32)
|
|
{"set_lk_max_locks", (PyCFunction)DBEnv_set_lk_max_locks, METH_VARARGS},
|
|
{"set_lk_max_lockers", (PyCFunction)DBEnv_set_lk_max_lockers, METH_VARARGS},
|
|
{"set_lk_max_objects", (PyCFunction)DBEnv_set_lk_max_objects, METH_VARARGS},
|
|
#endif
|
|
{"set_mp_mmapsize", (PyCFunction)DBEnv_set_mp_mmapsize, METH_VARARGS},
|
|
{"set_tmp_dir", (PyCFunction)DBEnv_set_tmp_dir, METH_VARARGS},
|
|
{"txn_begin", (PyCFunction)DBEnv_txn_begin, METH_VARARGS|METH_KEYWORDS},
|
|
{"txn_checkpoint", (PyCFunction)DBEnv_txn_checkpoint, METH_VARARGS},
|
|
{"txn_stat", (PyCFunction)DBEnv_txn_stat, METH_VARARGS},
|
|
{"set_tx_max", (PyCFunction)DBEnv_set_tx_max, METH_VARARGS},
|
|
{"set_tx_timestamp", (PyCFunction)DBEnv_set_tx_timestamp, METH_VARARGS},
|
|
{"lock_detect", (PyCFunction)DBEnv_lock_detect, METH_VARARGS},
|
|
{"lock_get", (PyCFunction)DBEnv_lock_get, METH_VARARGS},
|
|
{"lock_id", (PyCFunction)DBEnv_lock_id, METH_VARARGS},
|
|
{"lock_put", (PyCFunction)DBEnv_lock_put, METH_VARARGS},
|
|
{"lock_stat", (PyCFunction)DBEnv_lock_stat, METH_VARARGS},
|
|
{"log_archive", (PyCFunction)DBEnv_log_archive, METH_VARARGS},
|
|
#if (DBVER >= 40)
|
|
{"log_stat", (PyCFunction)DBEnv_log_stat, METH_VARARGS},
|
|
#endif
|
|
#if (DBVER >= 44)
|
|
{"lsn_reset", (PyCFunction)DBEnv_lsn_reset, METH_VARARGS|METH_KEYWORDS},
|
|
#endif
|
|
{"set_get_returns_none",(PyCFunction)DBEnv_set_get_returns_none, METH_VARARGS},
|
|
{NULL, NULL} /* sentinel */
|
|
};
|
|
|
|
|
|
static PyMethodDef DBTxn_methods[] = {
|
|
{"commit", (PyCFunction)DBTxn_commit, METH_VARARGS},
|
|
{"prepare", (PyCFunction)DBTxn_prepare, METH_VARARGS},
|
|
{"abort", (PyCFunction)DBTxn_abort, METH_VARARGS},
|
|
{"id", (PyCFunction)DBTxn_id, METH_VARARGS},
|
|
{NULL, NULL} /* sentinel */
|
|
};
|
|
|
|
|
|
#if (DBVER >= 43)
|
|
static PyMethodDef DBSequence_methods[] = {
|
|
{"close", (PyCFunction)DBSequence_close, METH_VARARGS},
|
|
{"get", (PyCFunction)DBSequence_get, METH_VARARGS|METH_KEYWORDS},
|
|
{"get_dbp", (PyCFunction)DBSequence_get_dbp, METH_VARARGS},
|
|
{"get_key", (PyCFunction)DBSequence_get_key, METH_VARARGS},
|
|
{"init_value", (PyCFunction)DBSequence_init_value, METH_VARARGS},
|
|
{"open", (PyCFunction)DBSequence_open, METH_VARARGS|METH_KEYWORDS},
|
|
{"remove", (PyCFunction)DBSequence_remove, METH_VARARGS|METH_KEYWORDS},
|
|
{"set_cachesize", (PyCFunction)DBSequence_set_cachesize, METH_VARARGS},
|
|
{"get_cachesize", (PyCFunction)DBSequence_get_cachesize, METH_VARARGS},
|
|
{"set_flags", (PyCFunction)DBSequence_set_flags, METH_VARARGS},
|
|
{"get_flags", (PyCFunction)DBSequence_get_flags, METH_VARARGS},
|
|
{"set_range", (PyCFunction)DBSequence_set_range, METH_VARARGS},
|
|
{"get_range", (PyCFunction)DBSequence_get_range, METH_VARARGS},
|
|
{"stat", (PyCFunction)DBSequence_stat, METH_VARARGS|METH_KEYWORDS},
|
|
{NULL, NULL} /* sentinel */
|
|
};
|
|
#endif
|
|
|
|
|
|
static PyObject*
|
|
DB_getattr(DBObject* self, char *name)
|
|
{
|
|
return Py_FindMethod(DB_methods, (PyObject* )self, name);
|
|
}
|
|
|
|
|
|
static PyObject*
|
|
DBEnv_getattr(DBEnvObject* self, char *name)
|
|
{
|
|
if (!strcmp(name, "db_home")) {
|
|
CHECK_ENV_NOT_CLOSED(self);
|
|
if (self->db_env->db_home == NULL) {
|
|
RETURN_NONE();
|
|
}
|
|
return PyString_FromString(self->db_env->db_home);
|
|
}
|
|
|
|
return Py_FindMethod(DBEnv_methods, (PyObject* )self, name);
|
|
}
|
|
|
|
|
|
static PyObject*
|
|
DBCursor_getattr(DBCursorObject* self, char *name)
|
|
{
|
|
return Py_FindMethod(DBCursor_methods, (PyObject* )self, name);
|
|
}
|
|
|
|
static PyObject*
|
|
DBTxn_getattr(DBTxnObject* self, char *name)
|
|
{
|
|
return Py_FindMethod(DBTxn_methods, (PyObject* )self, name);
|
|
}
|
|
|
|
static PyObject*
|
|
DBLock_getattr(DBLockObject* self, char *name)
|
|
{
|
|
return NULL;
|
|
}
|
|
|
|
#if (DBVER >= 43)
|
|
static PyObject*
|
|
DBSequence_getattr(DBSequenceObject* self, char *name)
|
|
{
|
|
return Py_FindMethod(DBSequence_methods, (PyObject* )self, name);
|
|
}
|
|
#endif
|
|
|
|
static PyTypeObject DB_Type = {
|
|
PyObject_HEAD_INIT(NULL)
|
|
0, /*ob_size*/
|
|
"DB", /*tp_name*/
|
|
sizeof(DBObject), /*tp_basicsize*/
|
|
0, /*tp_itemsize*/
|
|
/* methods */
|
|
(destructor)DB_dealloc, /*tp_dealloc*/
|
|
0, /*tp_print*/
|
|
(getattrfunc)DB_getattr, /*tp_getattr*/
|
|
0, /*tp_setattr*/
|
|
0, /*tp_compare*/
|
|
0, /*tp_repr*/
|
|
0, /*tp_as_number*/
|
|
0, /*tp_as_sequence*/
|
|
&DB_mapping,/*tp_as_mapping*/
|
|
0, /*tp_hash*/
|
|
#ifdef HAVE_WEAKREF
|
|
0, /* tp_call */
|
|
0, /* tp_str */
|
|
0, /* tp_getattro */
|
|
0, /* tp_setattro */
|
|
0, /* tp_as_buffer */
|
|
Py_TPFLAGS_DEFAULT, /* tp_flags */
|
|
0, /* tp_doc */
|
|
0, /* tp_traverse */
|
|
0, /* tp_clear */
|
|
0, /* tp_richcompare */
|
|
offsetof(DBObject, in_weakreflist), /* tp_weaklistoffset */
|
|
#endif
|
|
};
|
|
|
|
|
|
static PyTypeObject DBCursor_Type = {
|
|
PyObject_HEAD_INIT(NULL)
|
|
0, /*ob_size*/
|
|
"DBCursor", /*tp_name*/
|
|
sizeof(DBCursorObject), /*tp_basicsize*/
|
|
0, /*tp_itemsize*/
|
|
/* methods */
|
|
(destructor)DBCursor_dealloc,/*tp_dealloc*/
|
|
0, /*tp_print*/
|
|
(getattrfunc)DBCursor_getattr, /*tp_getattr*/
|
|
0, /*tp_setattr*/
|
|
0, /*tp_compare*/
|
|
0, /*tp_repr*/
|
|
0, /*tp_as_number*/
|
|
0, /*tp_as_sequence*/
|
|
0, /*tp_as_mapping*/
|
|
0, /*tp_hash*/
|
|
#ifdef HAVE_WEAKREF
|
|
0, /* tp_call */
|
|
0, /* tp_str */
|
|
0, /* tp_getattro */
|
|
0, /* tp_setattro */
|
|
0, /* tp_as_buffer */
|
|
Py_TPFLAGS_DEFAULT, /* tp_flags */
|
|
0, /* tp_doc */
|
|
0, /* tp_traverse */
|
|
0, /* tp_clear */
|
|
0, /* tp_richcompare */
|
|
offsetof(DBCursorObject, in_weakreflist), /* tp_weaklistoffset */
|
|
#endif
|
|
};
|
|
|
|
|
|
static PyTypeObject DBEnv_Type = {
|
|
PyObject_HEAD_INIT(NULL)
|
|
0, /*ob_size*/
|
|
"DBEnv", /*tp_name*/
|
|
sizeof(DBEnvObject), /*tp_basicsize*/
|
|
0, /*tp_itemsize*/
|
|
/* methods */
|
|
(destructor)DBEnv_dealloc, /*tp_dealloc*/
|
|
0, /*tp_print*/
|
|
(getattrfunc)DBEnv_getattr, /*tp_getattr*/
|
|
0, /*tp_setattr*/
|
|
0, /*tp_compare*/
|
|
0, /*tp_repr*/
|
|
0, /*tp_as_number*/
|
|
0, /*tp_as_sequence*/
|
|
0, /*tp_as_mapping*/
|
|
0, /*tp_hash*/
|
|
#ifdef HAVE_WEAKREF
|
|
0, /* tp_call */
|
|
0, /* tp_str */
|
|
0, /* tp_getattro */
|
|
0, /* tp_setattro */
|
|
0, /* tp_as_buffer */
|
|
Py_TPFLAGS_DEFAULT, /* tp_flags */
|
|
0, /* tp_doc */
|
|
0, /* tp_traverse */
|
|
0, /* tp_clear */
|
|
0, /* tp_richcompare */
|
|
offsetof(DBEnvObject, in_weakreflist), /* tp_weaklistoffset */
|
|
#endif
|
|
};
|
|
|
|
static PyTypeObject DBTxn_Type = {
|
|
PyObject_HEAD_INIT(NULL)
|
|
0, /*ob_size*/
|
|
"DBTxn", /*tp_name*/
|
|
sizeof(DBTxnObject), /*tp_basicsize*/
|
|
0, /*tp_itemsize*/
|
|
/* methods */
|
|
(destructor)DBTxn_dealloc, /*tp_dealloc*/
|
|
0, /*tp_print*/
|
|
(getattrfunc)DBTxn_getattr, /*tp_getattr*/
|
|
0, /*tp_setattr*/
|
|
0, /*tp_compare*/
|
|
0, /*tp_repr*/
|
|
0, /*tp_as_number*/
|
|
0, /*tp_as_sequence*/
|
|
0, /*tp_as_mapping*/
|
|
0, /*tp_hash*/
|
|
#ifdef HAVE_WEAKREF
|
|
0, /* tp_call */
|
|
0, /* tp_str */
|
|
0, /* tp_getattro */
|
|
0, /* tp_setattro */
|
|
0, /* tp_as_buffer */
|
|
Py_TPFLAGS_DEFAULT, /* tp_flags */
|
|
0, /* tp_doc */
|
|
0, /* tp_traverse */
|
|
0, /* tp_clear */
|
|
0, /* tp_richcompare */
|
|
offsetof(DBTxnObject, in_weakreflist), /* tp_weaklistoffset */
|
|
#endif
|
|
};
|
|
|
|
|
|
static PyTypeObject DBLock_Type = {
|
|
PyObject_HEAD_INIT(NULL)
|
|
0, /*ob_size*/
|
|
"DBLock", /*tp_name*/
|
|
sizeof(DBLockObject), /*tp_basicsize*/
|
|
0, /*tp_itemsize*/
|
|
/* methods */
|
|
(destructor)DBLock_dealloc, /*tp_dealloc*/
|
|
0, /*tp_print*/
|
|
(getattrfunc)DBLock_getattr, /*tp_getattr*/
|
|
0, /*tp_setattr*/
|
|
0, /*tp_compare*/
|
|
0, /*tp_repr*/
|
|
0, /*tp_as_number*/
|
|
0, /*tp_as_sequence*/
|
|
0, /*tp_as_mapping*/
|
|
0, /*tp_hash*/
|
|
#ifdef HAVE_WEAKREF
|
|
0, /* tp_call */
|
|
0, /* tp_str */
|
|
0, /* tp_getattro */
|
|
0, /* tp_setattro */
|
|
0, /* tp_as_buffer */
|
|
Py_TPFLAGS_DEFAULT, /* tp_flags */
|
|
0, /* tp_doc */
|
|
0, /* tp_traverse */
|
|
0, /* tp_clear */
|
|
0, /* tp_richcompare */
|
|
offsetof(DBLockObject, in_weakreflist), /* tp_weaklistoffset */
|
|
#endif
|
|
};
|
|
|
|
#if (DBVER >= 43)
|
|
static PyTypeObject DBSequence_Type = {
|
|
PyObject_HEAD_INIT(NULL)
|
|
0, /*ob_size*/
|
|
"DBSequence", /*tp_name*/
|
|
sizeof(DBSequenceObject), /*tp_basicsize*/
|
|
0, /*tp_itemsize*/
|
|
/* methods */
|
|
(destructor)DBSequence_dealloc, /*tp_dealloc*/
|
|
0, /*tp_print*/
|
|
(getattrfunc)DBSequence_getattr,/*tp_getattr*/
|
|
0, /*tp_setattr*/
|
|
0, /*tp_compare*/
|
|
0, /*tp_repr*/
|
|
0, /*tp_as_number*/
|
|
0, /*tp_as_sequence*/
|
|
0, /*tp_as_mapping*/
|
|
0, /*tp_hash*/
|
|
#ifdef HAVE_WEAKREF
|
|
0, /* tp_call */
|
|
0, /* tp_str */
|
|
0, /* tp_getattro */
|
|
0, /* tp_setattro */
|
|
0, /* tp_as_buffer */
|
|
Py_TPFLAGS_DEFAULT, /* tp_flags */
|
|
0, /* tp_doc */
|
|
0, /* tp_traverse */
|
|
0, /* tp_clear */
|
|
0, /* tp_richcompare */
|
|
offsetof(DBSequenceObject, in_weakreflist), /* tp_weaklistoffset */
|
|
#endif
|
|
};
|
|
#endif
|
|
|
|
/* --------------------------------------------------------------------- */
|
|
/* Module-level functions */
|
|
|
|
static PyObject*
|
|
DB_construct(PyObject* self, PyObject* args, PyObject* kwargs)
|
|
{
|
|
PyObject* dbenvobj = NULL;
|
|
int flags = 0;
|
|
static char* kwnames[] = { "dbEnv", "flags", NULL};
|
|
|
|
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|Oi:DB", kwnames,
|
|
&dbenvobj, &flags))
|
|
return NULL;
|
|
if (dbenvobj == Py_None)
|
|
dbenvobj = NULL;
|
|
else if (dbenvobj && !DBEnvObject_Check(dbenvobj)) {
|
|
makeTypeError("DBEnv", dbenvobj);
|
|
return NULL;
|
|
}
|
|
|
|
return (PyObject* )newDBObject((DBEnvObject*)dbenvobj, flags);
|
|
}
|
|
|
|
|
|
static PyObject*
|
|
DBEnv_construct(PyObject* self, PyObject* args)
|
|
{
|
|
int flags = 0;
|
|
if (!PyArg_ParseTuple(args, "|i:DbEnv", &flags)) return NULL;
|
|
return (PyObject* )newDBEnvObject(flags);
|
|
}
|
|
|
|
#if (DBVER >= 43)
|
|
static PyObject*
|
|
DBSequence_construct(PyObject* self, PyObject* args, PyObject* kwargs)
|
|
{
|
|
PyObject* dbobj;
|
|
int flags = 0;
|
|
static char* kwnames[] = { "db", "flags", NULL};
|
|
|
|
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O|i:DBSequence", kwnames, &dbobj, &flags))
|
|
return NULL;
|
|
if (!DBObject_Check(dbobj)) {
|
|
makeTypeError("DB", dbobj);
|
|
return NULL;
|
|
}
|
|
return (PyObject* )newDBSequenceObject((DBObject*)dbobj, flags);
|
|
}
|
|
#endif
|
|
|
|
static char bsddb_version_doc[] =
|
|
"Returns a tuple of major, minor, and patch release numbers of the\n\
|
|
underlying DB library.";
|
|
|
|
static PyObject*
|
|
bsddb_version(PyObject* self, PyObject* args)
|
|
{
|
|
int major, minor, patch;
|
|
|
|
if (!PyArg_ParseTuple(args, ":version"))
|
|
return NULL;
|
|
db_version(&major, &minor, &patch);
|
|
return Py_BuildValue("(iii)", major, minor, patch);
|
|
}
|
|
|
|
|
|
/* List of functions defined in the module */
|
|
|
|
static PyMethodDef bsddb_methods[] = {
|
|
{"DB", (PyCFunction)DB_construct, METH_VARARGS | METH_KEYWORDS },
|
|
{"DBEnv", (PyCFunction)DBEnv_construct, METH_VARARGS},
|
|
#if (DBVER >= 43)
|
|
{"DBSequence", (PyCFunction)DBSequence_construct, METH_VARARGS | METH_KEYWORDS },
|
|
#endif
|
|
{"version", (PyCFunction)bsddb_version, METH_VARARGS, bsddb_version_doc},
|
|
{NULL, NULL} /* sentinel */
|
|
};
|
|
|
|
|
|
/* --------------------------------------------------------------------- */
|
|
/* Module initialization */
|
|
|
|
|
|
/* Convenience routine to export an integer value.
|
|
* Errors are silently ignored, for better or for worse...
|
|
*/
|
|
#define ADD_INT(dict, NAME) _addIntToDict(dict, #NAME, NAME)
|
|
|
|
#define MODULE_NAME_MAX_LEN 11
|
|
static char _bsddbModuleName[MODULE_NAME_MAX_LEN+1] = "_bsddb";
|
|
|
|
DL_EXPORT(void) init_bsddb(void)
|
|
{
|
|
PyObject* m;
|
|
PyObject* d;
|
|
PyObject* pybsddb_version_s = PyString_FromString( PY_BSDDB_VERSION );
|
|
PyObject* db_version_s = PyString_FromString( DB_VERSION_STRING );
|
|
PyObject* cvsid_s = PyString_FromString( rcs_id );
|
|
|
|
/* Initialize the type of the new type objects here; doing it here
|
|
is required for portability to Windows without requiring C++. */
|
|
DB_Type.ob_type = &PyType_Type;
|
|
DBCursor_Type.ob_type = &PyType_Type;
|
|
DBEnv_Type.ob_type = &PyType_Type;
|
|
DBTxn_Type.ob_type = &PyType_Type;
|
|
DBLock_Type.ob_type = &PyType_Type;
|
|
#if (DBVER >= 43)
|
|
DBSequence_Type.ob_type = &PyType_Type;
|
|
#endif
|
|
|
|
|
|
#if defined(WITH_THREAD) && !defined(MYDB_USE_GILSTATE)
|
|
/* Save the current interpreter, so callbacks can do the right thing. */
|
|
_db_interpreterState = PyThreadState_GET()->interp;
|
|
#endif
|
|
|
|
/* Create the module and add the functions */
|
|
m = Py_InitModule(_bsddbModuleName, bsddb_methods);
|
|
if (m == NULL)
|
|
return;
|
|
|
|
/* Add some symbolic constants to the module */
|
|
d = PyModule_GetDict(m);
|
|
PyDict_SetItemString(d, "__version__", pybsddb_version_s);
|
|
PyDict_SetItemString(d, "cvsid", cvsid_s);
|
|
PyDict_SetItemString(d, "DB_VERSION_STRING", db_version_s);
|
|
Py_DECREF(pybsddb_version_s);
|
|
pybsddb_version_s = NULL;
|
|
Py_DECREF(cvsid_s);
|
|
cvsid_s = NULL;
|
|
Py_DECREF(db_version_s);
|
|
db_version_s = NULL;
|
|
|
|
ADD_INT(d, DB_VERSION_MAJOR);
|
|
ADD_INT(d, DB_VERSION_MINOR);
|
|
ADD_INT(d, DB_VERSION_PATCH);
|
|
|
|
ADD_INT(d, DB_MAX_PAGES);
|
|
ADD_INT(d, DB_MAX_RECORDS);
|
|
|
|
#if (DBVER >= 42)
|
|
ADD_INT(d, DB_RPCCLIENT);
|
|
#else
|
|
ADD_INT(d, DB_CLIENT);
|
|
/* allow apps to be written using DB_RPCCLIENT on older BerkeleyDB */
|
|
_addIntToDict(d, "DB_RPCCLIENT", DB_CLIENT);
|
|
#endif
|
|
ADD_INT(d, DB_XA_CREATE);
|
|
|
|
ADD_INT(d, DB_CREATE);
|
|
ADD_INT(d, DB_NOMMAP);
|
|
ADD_INT(d, DB_THREAD);
|
|
|
|
ADD_INT(d, DB_FORCE);
|
|
ADD_INT(d, DB_INIT_CDB);
|
|
ADD_INT(d, DB_INIT_LOCK);
|
|
ADD_INT(d, DB_INIT_LOG);
|
|
ADD_INT(d, DB_INIT_MPOOL);
|
|
ADD_INT(d, DB_INIT_TXN);
|
|
#if (DBVER >= 32)
|
|
ADD_INT(d, DB_JOINENV);
|
|
#endif
|
|
|
|
ADD_INT(d, DB_RECOVER);
|
|
ADD_INT(d, DB_RECOVER_FATAL);
|
|
ADD_INT(d, DB_TXN_NOSYNC);
|
|
ADD_INT(d, DB_USE_ENVIRON);
|
|
ADD_INT(d, DB_USE_ENVIRON_ROOT);
|
|
|
|
ADD_INT(d, DB_LOCKDOWN);
|
|
ADD_INT(d, DB_PRIVATE);
|
|
ADD_INT(d, DB_SYSTEM_MEM);
|
|
|
|
ADD_INT(d, DB_TXN_SYNC);
|
|
ADD_INT(d, DB_TXN_NOWAIT);
|
|
|
|
ADD_INT(d, DB_EXCL);
|
|
ADD_INT(d, DB_FCNTL_LOCKING);
|
|
ADD_INT(d, DB_ODDFILESIZE);
|
|
ADD_INT(d, DB_RDWRMASTER);
|
|
ADD_INT(d, DB_RDONLY);
|
|
ADD_INT(d, DB_TRUNCATE);
|
|
#if (DBVER >= 32)
|
|
ADD_INT(d, DB_EXTENT);
|
|
ADD_INT(d, DB_CDB_ALLDB);
|
|
ADD_INT(d, DB_VERIFY);
|
|
#endif
|
|
ADD_INT(d, DB_UPGRADE);
|
|
|
|
ADD_INT(d, DB_AGGRESSIVE);
|
|
ADD_INT(d, DB_NOORDERCHK);
|
|
ADD_INT(d, DB_ORDERCHKONLY);
|
|
ADD_INT(d, DB_PR_PAGE);
|
|
#if ! (DBVER >= 33)
|
|
ADD_INT(d, DB_VRFY_FLAGMASK);
|
|
ADD_INT(d, DB_PR_HEADERS);
|
|
#endif
|
|
ADD_INT(d, DB_PR_RECOVERYTEST);
|
|
ADD_INT(d, DB_SALVAGE);
|
|
|
|
ADD_INT(d, DB_LOCK_NORUN);
|
|
ADD_INT(d, DB_LOCK_DEFAULT);
|
|
ADD_INT(d, DB_LOCK_OLDEST);
|
|
ADD_INT(d, DB_LOCK_RANDOM);
|
|
ADD_INT(d, DB_LOCK_YOUNGEST);
|
|
#if (DBVER >= 33)
|
|
ADD_INT(d, DB_LOCK_MAXLOCKS);
|
|
ADD_INT(d, DB_LOCK_MINLOCKS);
|
|
ADD_INT(d, DB_LOCK_MINWRITE);
|
|
#endif
|
|
|
|
|
|
#if (DBVER >= 33)
|
|
/* docs say to use zero instead */
|
|
_addIntToDict(d, "DB_LOCK_CONFLICT", 0);
|
|
#else
|
|
ADD_INT(d, DB_LOCK_CONFLICT);
|
|
#endif
|
|
|
|
ADD_INT(d, DB_LOCK_DUMP);
|
|
ADD_INT(d, DB_LOCK_GET);
|
|
ADD_INT(d, DB_LOCK_INHERIT);
|
|
ADD_INT(d, DB_LOCK_PUT);
|
|
ADD_INT(d, DB_LOCK_PUT_ALL);
|
|
ADD_INT(d, DB_LOCK_PUT_OBJ);
|
|
|
|
ADD_INT(d, DB_LOCK_NG);
|
|
ADD_INT(d, DB_LOCK_READ);
|
|
ADD_INT(d, DB_LOCK_WRITE);
|
|
ADD_INT(d, DB_LOCK_NOWAIT);
|
|
#if (DBVER >= 32)
|
|
ADD_INT(d, DB_LOCK_WAIT);
|
|
#endif
|
|
ADD_INT(d, DB_LOCK_IWRITE);
|
|
ADD_INT(d, DB_LOCK_IREAD);
|
|
ADD_INT(d, DB_LOCK_IWR);
|
|
#if (DBVER >= 33)
|
|
#if (DBVER < 44)
|
|
ADD_INT(d, DB_LOCK_DIRTY);
|
|
#else
|
|
ADD_INT(d, DB_LOCK_READ_UNCOMMITTED); /* renamed in 4.4 */
|
|
#endif
|
|
ADD_INT(d, DB_LOCK_WWRITE);
|
|
#endif
|
|
|
|
ADD_INT(d, DB_LOCK_RECORD);
|
|
ADD_INT(d, DB_LOCK_UPGRADE);
|
|
#if (DBVER >= 32)
|
|
ADD_INT(d, DB_LOCK_SWITCH);
|
|
#endif
|
|
#if (DBVER >= 33)
|
|
ADD_INT(d, DB_LOCK_UPGRADE_WRITE);
|
|
#endif
|
|
|
|
ADD_INT(d, DB_LOCK_NOWAIT);
|
|
ADD_INT(d, DB_LOCK_RECORD);
|
|
ADD_INT(d, DB_LOCK_UPGRADE);
|
|
|
|
#if (DBVER >= 33)
|
|
ADD_INT(d, DB_LSTAT_ABORTED);
|
|
#if (DBVER < 43)
|
|
ADD_INT(d, DB_LSTAT_ERR);
|
|
#endif
|
|
ADD_INT(d, DB_LSTAT_FREE);
|
|
ADD_INT(d, DB_LSTAT_HELD);
|
|
#if (DBVER == 33)
|
|
ADD_INT(d, DB_LSTAT_NOGRANT);
|
|
#endif
|
|
ADD_INT(d, DB_LSTAT_PENDING);
|
|
ADD_INT(d, DB_LSTAT_WAITING);
|
|
#endif
|
|
|
|
ADD_INT(d, DB_ARCH_ABS);
|
|
ADD_INT(d, DB_ARCH_DATA);
|
|
ADD_INT(d, DB_ARCH_LOG);
|
|
#if (DBVER >= 42)
|
|
ADD_INT(d, DB_ARCH_REMOVE);
|
|
#endif
|
|
|
|
ADD_INT(d, DB_BTREE);
|
|
ADD_INT(d, DB_HASH);
|
|
ADD_INT(d, DB_RECNO);
|
|
ADD_INT(d, DB_QUEUE);
|
|
ADD_INT(d, DB_UNKNOWN);
|
|
|
|
ADD_INT(d, DB_DUP);
|
|
ADD_INT(d, DB_DUPSORT);
|
|
ADD_INT(d, DB_RECNUM);
|
|
ADD_INT(d, DB_RENUMBER);
|
|
ADD_INT(d, DB_REVSPLITOFF);
|
|
ADD_INT(d, DB_SNAPSHOT);
|
|
|
|
ADD_INT(d, DB_JOIN_NOSORT);
|
|
|
|
ADD_INT(d, DB_AFTER);
|
|
ADD_INT(d, DB_APPEND);
|
|
ADD_INT(d, DB_BEFORE);
|
|
ADD_INT(d, DB_CACHED_COUNTS);
|
|
#if (DBVER >= 41)
|
|
_addIntToDict(d, "DB_CHECKPOINT", 0);
|
|
#else
|
|
ADD_INT(d, DB_CHECKPOINT);
|
|
ADD_INT(d, DB_CURLSN);
|
|
#endif
|
|
#if ((DBVER >= 33) && (DBVER <= 41))
|
|
ADD_INT(d, DB_COMMIT);
|
|
#endif
|
|
ADD_INT(d, DB_CONSUME);
|
|
#if (DBVER >= 32)
|
|
ADD_INT(d, DB_CONSUME_WAIT);
|
|
#endif
|
|
ADD_INT(d, DB_CURRENT);
|
|
#if (DBVER >= 33)
|
|
ADD_INT(d, DB_FAST_STAT);
|
|
#endif
|
|
ADD_INT(d, DB_FIRST);
|
|
ADD_INT(d, DB_FLUSH);
|
|
ADD_INT(d, DB_GET_BOTH);
|
|
ADD_INT(d, DB_GET_RECNO);
|
|
ADD_INT(d, DB_JOIN_ITEM);
|
|
ADD_INT(d, DB_KEYFIRST);
|
|
ADD_INT(d, DB_KEYLAST);
|
|
ADD_INT(d, DB_LAST);
|
|
ADD_INT(d, DB_NEXT);
|
|
ADD_INT(d, DB_NEXT_DUP);
|
|
ADD_INT(d, DB_NEXT_NODUP);
|
|
ADD_INT(d, DB_NODUPDATA);
|
|
ADD_INT(d, DB_NOOVERWRITE);
|
|
ADD_INT(d, DB_NOSYNC);
|
|
ADD_INT(d, DB_POSITION);
|
|
ADD_INT(d, DB_PREV);
|
|
ADD_INT(d, DB_PREV_NODUP);
|
|
ADD_INT(d, DB_RECORDCOUNT);
|
|
ADD_INT(d, DB_SET);
|
|
ADD_INT(d, DB_SET_RANGE);
|
|
ADD_INT(d, DB_SET_RECNO);
|
|
ADD_INT(d, DB_WRITECURSOR);
|
|
|
|
ADD_INT(d, DB_OPFLAGS_MASK);
|
|
ADD_INT(d, DB_RMW);
|
|
#if (DBVER >= 33)
|
|
ADD_INT(d, DB_DIRTY_READ);
|
|
ADD_INT(d, DB_MULTIPLE);
|
|
ADD_INT(d, DB_MULTIPLE_KEY);
|
|
#endif
|
|
|
|
#if (DBVER >= 44)
|
|
ADD_INT(d, DB_READ_UNCOMMITTED); /* replaces DB_DIRTY_READ in 4.4 */
|
|
ADD_INT(d, DB_READ_COMMITTED);
|
|
#endif
|
|
|
|
#if (DBVER >= 33)
|
|
ADD_INT(d, DB_DONOTINDEX);
|
|
#endif
|
|
|
|
#if (DBVER >= 41)
|
|
_addIntToDict(d, "DB_INCOMPLETE", 0);
|
|
#else
|
|
ADD_INT(d, DB_INCOMPLETE);
|
|
#endif
|
|
ADD_INT(d, DB_KEYEMPTY);
|
|
ADD_INT(d, DB_KEYEXIST);
|
|
ADD_INT(d, DB_LOCK_DEADLOCK);
|
|
ADD_INT(d, DB_LOCK_NOTGRANTED);
|
|
ADD_INT(d, DB_NOSERVER);
|
|
ADD_INT(d, DB_NOSERVER_HOME);
|
|
ADD_INT(d, DB_NOSERVER_ID);
|
|
ADD_INT(d, DB_NOTFOUND);
|
|
ADD_INT(d, DB_OLD_VERSION);
|
|
ADD_INT(d, DB_RUNRECOVERY);
|
|
ADD_INT(d, DB_VERIFY_BAD);
|
|
#if (DBVER >= 33)
|
|
ADD_INT(d, DB_PAGE_NOTFOUND);
|
|
ADD_INT(d, DB_SECONDARY_BAD);
|
|
#endif
|
|
#if (DBVER >= 40)
|
|
ADD_INT(d, DB_STAT_CLEAR);
|
|
ADD_INT(d, DB_REGION_INIT);
|
|
ADD_INT(d, DB_NOLOCKING);
|
|
ADD_INT(d, DB_YIELDCPU);
|
|
ADD_INT(d, DB_PANIC_ENVIRONMENT);
|
|
ADD_INT(d, DB_NOPANIC);
|
|
#endif
|
|
|
|
#if (DBVER >= 42)
|
|
ADD_INT(d, DB_TIME_NOTGRANTED);
|
|
ADD_INT(d, DB_TXN_NOT_DURABLE);
|
|
ADD_INT(d, DB_TXN_WRITE_NOSYNC);
|
|
ADD_INT(d, DB_LOG_AUTOREMOVE);
|
|
ADD_INT(d, DB_DIRECT_LOG);
|
|
ADD_INT(d, DB_DIRECT_DB);
|
|
ADD_INT(d, DB_INIT_REP);
|
|
ADD_INT(d, DB_ENCRYPT);
|
|
ADD_INT(d, DB_CHKSUM);
|
|
#endif
|
|
|
|
#if (DBVER >= 43)
|
|
ADD_INT(d, DB_LOG_INMEMORY);
|
|
ADD_INT(d, DB_BUFFER_SMALL);
|
|
ADD_INT(d, DB_SEQ_DEC);
|
|
ADD_INT(d, DB_SEQ_INC);
|
|
ADD_INT(d, DB_SEQ_WRAP);
|
|
#endif
|
|
|
|
#if (DBVER >= 41)
|
|
ADD_INT(d, DB_ENCRYPT_AES);
|
|
ADD_INT(d, DB_AUTO_COMMIT);
|
|
#else
|
|
/* allow berkeleydb 4.1 aware apps to run on older versions */
|
|
_addIntToDict(d, "DB_AUTO_COMMIT", 0);
|
|
#endif
|
|
|
|
ADD_INT(d, EINVAL);
|
|
ADD_INT(d, EACCES);
|
|
ADD_INT(d, ENOSPC);
|
|
ADD_INT(d, ENOMEM);
|
|
ADD_INT(d, EAGAIN);
|
|
ADD_INT(d, EBUSY);
|
|
ADD_INT(d, EEXIST);
|
|
ADD_INT(d, ENOENT);
|
|
ADD_INT(d, EPERM);
|
|
|
|
#if (DBVER >= 40)
|
|
ADD_INT(d, DB_SET_LOCK_TIMEOUT);
|
|
ADD_INT(d, DB_SET_TXN_TIMEOUT);
|
|
#endif
|
|
|
|
/* The exception name must be correct for pickled exception *
|
|
* objects to unpickle properly. */
|
|
#ifdef PYBSDDB_STANDALONE /* different value needed for standalone pybsddb */
|
|
#define PYBSDDB_EXCEPTION_BASE "bsddb3.db."
|
|
#else
|
|
#define PYBSDDB_EXCEPTION_BASE "bsddb.db."
|
|
#endif
|
|
|
|
/* All the rest of the exceptions derive only from DBError */
|
|
#define MAKE_EX(name) name = PyErr_NewException(PYBSDDB_EXCEPTION_BASE #name, DBError, NULL); \
|
|
PyDict_SetItemString(d, #name, name)
|
|
|
|
/* The base exception class is DBError */
|
|
DBError = NULL; /* used in MAKE_EX so that it derives from nothing */
|
|
MAKE_EX(DBError);
|
|
|
|
/* Some magic to make DBNotFoundError and DBKeyEmptyError derive
|
|
* from both DBError and KeyError, since the API only supports
|
|
* using one base class. */
|
|
PyDict_SetItemString(d, "KeyError", PyExc_KeyError);
|
|
PyRun_String("class DBNotFoundError(DBError, KeyError): pass\n"
|
|
"class DBKeyEmptyError(DBError, KeyError): pass",
|
|
Py_file_input, d, d);
|
|
DBNotFoundError = PyDict_GetItemString(d, "DBNotFoundError");
|
|
DBKeyEmptyError = PyDict_GetItemString(d, "DBKeyEmptyError");
|
|
PyDict_DelItemString(d, "KeyError");
|
|
|
|
|
|
#if !INCOMPLETE_IS_WARNING
|
|
MAKE_EX(DBIncompleteError);
|
|
#endif
|
|
MAKE_EX(DBCursorClosedError);
|
|
MAKE_EX(DBKeyEmptyError);
|
|
MAKE_EX(DBKeyExistError);
|
|
MAKE_EX(DBLockDeadlockError);
|
|
MAKE_EX(DBLockNotGrantedError);
|
|
MAKE_EX(DBOldVersionError);
|
|
MAKE_EX(DBRunRecoveryError);
|
|
MAKE_EX(DBVerifyBadError);
|
|
MAKE_EX(DBNoServerError);
|
|
MAKE_EX(DBNoServerHomeError);
|
|
MAKE_EX(DBNoServerIDError);
|
|
#if (DBVER >= 33)
|
|
MAKE_EX(DBPageNotFoundError);
|
|
MAKE_EX(DBSecondaryBadError);
|
|
#endif
|
|
|
|
MAKE_EX(DBInvalidArgError);
|
|
MAKE_EX(DBAccessError);
|
|
MAKE_EX(DBNoSpaceError);
|
|
MAKE_EX(DBNoMemoryError);
|
|
MAKE_EX(DBAgainError);
|
|
MAKE_EX(DBBusyError);
|
|
MAKE_EX(DBFileExistsError);
|
|
MAKE_EX(DBNoSuchFileError);
|
|
MAKE_EX(DBPermissionsError);
|
|
|
|
#undef MAKE_EX
|
|
|
|
/* Check for errors */
|
|
if (PyErr_Occurred()) {
|
|
PyErr_Print();
|
|
Py_FatalError("can't initialize module _bsddb");
|
|
}
|
|
}
|
|
|
|
/* allow this module to be named _pybsddb so that it can be installed
|
|
* and imported on top of python >= 2.3 that includes its own older
|
|
* copy of the library named _bsddb without importing the old version. */
|
|
DL_EXPORT(void) init_pybsddb(void)
|
|
{
|
|
strncpy(_bsddbModuleName, "_pybsddb", MODULE_NAME_MAX_LEN);
|
|
init_bsddb();
|
|
}
|