mirror of
https://github.com/python/cpython.git
synced 2025-10-30 05:01:30 +00:00
svn+ssh://pythondev@svn.python.org/python/branches/p3yk
................
r55837 | guido.van.rossum | 2007-06-08 16:04:42 -0700 (Fri, 08 Jun 2007) | 2 lines
PEP 3119 -- the abc module.
................
r55838 | guido.van.rossum | 2007-06-08 17:38:55 -0700 (Fri, 08 Jun 2007) | 2 lines
Implement part of PEP 3119 -- One Trick Ponies.
................
r55847 | guido.van.rossum | 2007-06-09 08:28:06 -0700 (Sat, 09 Jun 2007) | 2 lines
Different way to do one trick ponies, allowing registration (per PEP strawman).
................
r55849 | guido.van.rossum | 2007-06-09 18:06:38 -0700 (Sat, 09 Jun 2007) | 3 lines
Make sure that the magic looking for __hash__ (etc.) doesn't apply to
real subclasses of Hashable.
................
r55852 | guido.van.rossum | 2007-06-10 08:29:51 -0700 (Sun, 10 Jun 2007) | 2 lines
Add some more examples, e.g. generators and dict views.
................
r55853 | guido.van.rossum | 2007-06-10 08:31:59 -0700 (Sun, 10 Jun 2007) | 2 lines
keys() and items() *are* containers -- just values() isn't.
................
r55864 | georg.brandl | 2007-06-10 15:29:40 -0700 (Sun, 10 Jun 2007) | 2 lines
PEP 3127: new octal literals, binary literals.
................
r55865 | georg.brandl | 2007-06-10 15:31:37 -0700 (Sun, 10 Jun 2007) | 2 lines
Some octal literal fixes in Tools.
................
r55866 | georg.brandl | 2007-06-10 15:37:43 -0700 (Sun, 10 Jun 2007) | 2 lines
Tokenizer changes for PEP 3127.
................
r55867 | georg.brandl | 2007-06-10 15:37:55 -0700 (Sun, 10 Jun 2007) | 2 lines
Some docs for PEP 3127.
................
r55868 | georg.brandl | 2007-06-10 15:44:39 -0700 (Sun, 10 Jun 2007) | 2 lines
Missed a place in intobject.c. Is that used anymore anyway?
................
r55871 | neal.norwitz | 2007-06-10 18:31:49 -0700 (Sun, 10 Jun 2007) | 182 lines
Merged revisions 55729-55868 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r55731 | neal.norwitz | 2007-06-01 00:29:12 -0700 (Fri, 01 Jun 2007) | 7 lines
SF 1668596/1720897: distutils now copies data files
even if package_dir is empty.
This needs to be backported. I'm too tired tonight. It would be great
if someone backports this if the buildbots are ok with it. Otherwise,
I will try to get to it tomorrow.
........
r55732 | georg.brandl | 2007-06-01 04:33:33 -0700 (Fri, 01 Jun 2007) | 2 lines
Bug #1722484: remove docstrings again when running with -OO.
........
r55735 | georg.brandl | 2007-06-01 12:20:27 -0700 (Fri, 01 Jun 2007) | 2 lines
Fix wrong issue number.
........
r55739 | brett.cannon | 2007-06-01 20:02:29 -0700 (Fri, 01 Jun 2007) | 3 lines
Have configure raise an error when building on AtheOS. Code specific to AtheOS
will be removed in Python 2.7.
........
r55746 | neal.norwitz | 2007-06-02 11:33:53 -0700 (Sat, 02 Jun 2007) | 1 line
Update expected birthday of 2.6
........
r55751 | neal.norwitz | 2007-06-03 13:32:50 -0700 (Sun, 03 Jun 2007) | 10 lines
Backout the original 'fix' to 1721309 which had no effect.
Different versions of Berkeley DB handle this differently.
The comments and bug report should have the details. Memory is allocated
in 4.4 (and presumably earlier), but not in 4.5. Thus
4.5 has the free error, but not earlier versions.
Mostly update comments, plus make the free conditional.
This fix was already applied to the 2.5 branch.
........
r55752 | brett.cannon | 2007-06-03 16:13:41 -0700 (Sun, 03 Jun 2007) | 6 lines
Make _strptime.TimeRE().pattern() use ``\s+`` for matching whitespace instead
of ``\s*``. This prevents patterns from "stealing" bits from other patterns in
order to make a match work.
Closes bug #1730389. Will be backported.
........
r55766 | hyeshik.chang | 2007-06-05 11:16:52 -0700 (Tue, 05 Jun 2007) | 4 lines
Fix build on FreeBSD. Bluetooth HCI API in FreeBSD is quite different
from Linux's. Just fix the build for now but the code doesn't
support the complete capability of HCI on FreeBSD yet.
........
r55770 | hyeshik.chang | 2007-06-05 11:58:51 -0700 (Tue, 05 Jun 2007) | 4 lines
Bug #1728403: Fix a bug that CJKCodecs StreamReader hangs when it
reads a file that ends with incomplete sequence and sizehint argument
for .read() is specified.
........
r55775 | hyeshik.chang | 2007-06-05 12:28:15 -0700 (Tue, 05 Jun 2007) | 2 lines
Fix for Windows: close a temporary file before trying to delete it.
........
r55783 | guido.van.rossum | 2007-06-05 14:24:47 -0700 (Tue, 05 Jun 2007) | 2 lines
Patch by Tim Delany (missing DECREF). SF #1731330.
........
r55785 | collin.winter | 2007-06-05 17:17:35 -0700 (Tue, 05 Jun 2007) | 3 lines
Patch #1731049: make threading.py use a proper "raise" when checking internal state, rather than assert statements (which get stripped out by -O).
........
r55786 | facundo.batista | 2007-06-06 08:13:37 -0700 (Wed, 06 Jun 2007) | 4 lines
FTP.ntransfercmd method now uses create_connection when passive,
using the timeout received in connection time.
........
r55792 | facundo.batista | 2007-06-06 10:15:23 -0700 (Wed, 06 Jun 2007) | 7 lines
Added an optional timeout parameter to function urllib2.urlopen,
with tests in test_urllib2net.py (must have network resource
enabled to execute them). Also modified test_urllib2.py because
testing mock classes must take it into acount. Docs are also
updated.
........
r55793 | thomas.heller | 2007-06-06 13:19:19 -0700 (Wed, 06 Jun 2007) | 1 line
Build _ctypes and _ctypes_test in the ReleaseAMD64 configuration.
........
r55802 | georg.brandl | 2007-06-07 06:23:24 -0700 (Thu, 07 Jun 2007) | 3 lines
Disallow function calls like foo(None=1).
Backport from py3k rev. 55708 by Guido.
........
r55804 | georg.brandl | 2007-06-07 06:30:24 -0700 (Thu, 07 Jun 2007) | 2 lines
Make reindent.py executable.
........
r55805 | georg.brandl | 2007-06-07 06:34:10 -0700 (Thu, 07 Jun 2007) | 2 lines
Patch #1667860: Fix UnboundLocalError in urllib2.
........
r55821 | kristjan.jonsson | 2007-06-07 16:53:49 -0700 (Thu, 07 Jun 2007) | 1 line
Fixing changes to getbuildinfo.c that broke linux builds
........
r55828 | thomas.heller | 2007-06-08 09:10:27 -0700 (Fri, 08 Jun 2007) | 1 line
Make this test work with older Python releases where struct has no 't' format character.
........
r55829 | martin.v.loewis | 2007-06-08 10:29:20 -0700 (Fri, 08 Jun 2007) | 3 lines
Bug #1733488: Fix compilation of bufferobject.c on AIX.
Will backport to 2.5.
........
r55831 | thomas.heller | 2007-06-08 11:20:09 -0700 (Fri, 08 Jun 2007) | 2 lines
[ 1715718 ] x64 clean compile patch for _ctypes, by Kristj?n Valur
with small modifications.
........
r55832 | thomas.heller | 2007-06-08 12:01:06 -0700 (Fri, 08 Jun 2007) | 1 line
Fix gcc warnings intruduced by passing Py_ssize_t to PyErr_Format calls.
........
r55833 | thomas.heller | 2007-06-08 12:08:31 -0700 (Fri, 08 Jun 2007) | 2 lines
Fix wrong documentation, and correct the punktuation.
Closes [1700455].
........
r55834 | thomas.heller | 2007-06-08 12:14:23 -0700 (Fri, 08 Jun 2007) | 1 line
Fix warnings by using proper function prototype.
........
r55839 | neal.norwitz | 2007-06-08 20:36:34 -0700 (Fri, 08 Jun 2007) | 7 lines
Prevent expandtabs() on string and unicode objects from causing a segfault when
a large width is passed on 32-bit platforms. Found by Google.
It would be good for people to review this especially carefully and verify
I don't have an off by one error and there is no other way to cause overflow.
........
r55841 | neal.norwitz | 2007-06-08 21:48:22 -0700 (Fri, 08 Jun 2007) | 1 line
Use macro version of GET_SIZE to avoid Coverity warning (#150) about a possible error.
........
r55842 | martin.v.loewis | 2007-06-09 00:42:52 -0700 (Sat, 09 Jun 2007) | 3 lines
Patch #1733960: Allow T_LONGLONG to accept ints.
Will backport to 2.5.
........
r55843 | martin.v.loewis | 2007-06-09 00:58:05 -0700 (Sat, 09 Jun 2007) | 2 lines
Fix Windows build.
........
r55845 | martin.v.loewis | 2007-06-09 03:10:26 -0700 (Sat, 09 Jun 2007) | 2 lines
Provide LLONG_MAX for S390.
........
r55854 | thomas.heller | 2007-06-10 08:59:17 -0700 (Sun, 10 Jun 2007) | 4 lines
First version of build scripts for Windows/AMD64 (no external
components are built yet, and 'kill_python' is disabled).
........
r55855 | thomas.heller | 2007-06-10 10:55:51 -0700 (Sun, 10 Jun 2007) | 3 lines
For now, disable the _bsddb, _sqlite3, _ssl, _testcapi, _tkinter
modules in the ReleaseAMD64 configuration because they do not compile.
........
r55856 | thomas.heller | 2007-06-10 11:27:54 -0700 (Sun, 10 Jun 2007) | 1 line
Need to set the environment variables, otherwise devenv.com is not found.
........
r55860 | thomas.heller | 2007-06-10 14:01:17 -0700 (Sun, 10 Jun 2007) | 1 line
Revert commit 55855.
........
................
r55880 | neal.norwitz | 2007-06-10 22:07:36 -0700 (Sun, 10 Jun 2007) | 5 lines
Fix the refleak counter on test_collections. The ABC metaclass creates
a registry which must be cleared on each run. Otherwise, there *seem*
to be refleaks when there really aren't any. (The class is held within
the registry even though it's no longer needed.)
................
r55884 | neal.norwitz | 2007-06-10 22:46:33 -0700 (Sun, 10 Jun 2007) | 1 line
These tests have been removed, so they are no longer needed here
................
r55886 | georg.brandl | 2007-06-11 00:26:37 -0700 (Mon, 11 Jun 2007) | 3 lines
Optimize access to True and False in the compiler (if True)
and the peepholer (LOAD_NAME True).
................
r55905 | georg.brandl | 2007-06-11 10:02:26 -0700 (Mon, 11 Jun 2007) | 5 lines
Remove __oct__ and __hex__ and use __index__ for converting
non-ints before formatting in a base.
Add a bin() builtin.
................
r55906 | georg.brandl | 2007-06-11 10:04:44 -0700 (Mon, 11 Jun 2007) | 2 lines
int(x, 0) does not "guess".
................
r55907 | georg.brandl | 2007-06-11 10:05:47 -0700 (Mon, 11 Jun 2007) | 2 lines
Add a comment to explain that nb_oct and nb_hex are nonfunctional.
................
r55908 | guido.van.rossum | 2007-06-11 10:49:18 -0700 (Mon, 11 Jun 2007) | 2 lines
Get rid of unused imports and comment.
................
r55910 | guido.van.rossum | 2007-06-11 13:05:17 -0700 (Mon, 11 Jun 2007) | 2 lines
_Abstract.__new__ now requires either no arguments or __init__ overridden.
................
r55911 | guido.van.rossum | 2007-06-11 13:07:49 -0700 (Mon, 11 Jun 2007) | 7 lines
Move the collections ABCs to a separate file, _abcoll.py, in order to avoid
needing to import _collections.so during the bootstrap (this will become
apparent in the next submit of os.py).
Add (plain and mutable) ABCs for Set, Mapping, Sequence.
................
r55912 | guido.van.rossum | 2007-06-11 13:09:31 -0700 (Mon, 11 Jun 2007) | 2 lines
Rewrite the _Environ class to use the new collections ABCs.
................
r55913 | guido.van.rossum | 2007-06-11 13:59:45 -0700 (Mon, 11 Jun 2007) | 72 lines
Merged revisions 55869-55912 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r55869 | neal.norwitz | 2007-06-10 17:42:11 -0700 (Sun, 10 Jun 2007) | 1 line
Add Atul Varma for patch # 1667860
........
r55870 | neal.norwitz | 2007-06-10 18:22:03 -0700 (Sun, 10 Jun 2007) | 1 line
Ignore valgrind problems on Ubuntu from ld
........
r55872 | neal.norwitz | 2007-06-10 18:48:46 -0700 (Sun, 10 Jun 2007) | 2 lines
Ignore config.status.lineno which seems new (new autoconf?)
........
r55873 | neal.norwitz | 2007-06-10 19:14:39 -0700 (Sun, 10 Jun 2007) | 1 line
Prevent these tests from running on Win64 since they don\'t apply there either
........
r55874 | neal.norwitz | 2007-06-10 19:16:10 -0700 (Sun, 10 Jun 2007) | 5 lines
Fix a bug when there was a newline in the string expandtabs was called on.
This also catches another condition that can overflow.
Will backport.
........
r55879 | neal.norwitz | 2007-06-10 21:52:37 -0700 (Sun, 10 Jun 2007) | 1 line
Prevent hang if the port cannot be opened.
........
r55881 | neal.norwitz | 2007-06-10 22:28:45 -0700 (Sun, 10 Jun 2007) | 4 lines
Add all of the distuils modules that don't seem to have explicit tests. :-(
Move an import in mworkscompiler so that this module can be imported on
any platform. Hopefully this works on all platforms.
........
r55882 | neal.norwitz | 2007-06-10 22:35:10 -0700 (Sun, 10 Jun 2007) | 4 lines
SF #1734732, lower case the module names per PEP 8.
Will backport.
........
r55885 | neal.norwitz | 2007-06-10 23:16:48 -0700 (Sun, 10 Jun 2007) | 4 lines
Not sure why this only fails sometimes on Unix machines. Better
to disable it and only import msvccompiler on Windows since that's
the only place it can work anyways.
........
r55887 | neal.norwitz | 2007-06-11 00:29:43 -0700 (Mon, 11 Jun 2007) | 4 lines
Bug #1734723: Fix repr.Repr() so it doesn't ignore the maxtuple attribute.
Will backport
........
r55889 | neal.norwitz | 2007-06-11 00:36:24 -0700 (Mon, 11 Jun 2007) | 1 line
Reflow long line
........
r55896 | thomas.heller | 2007-06-11 08:58:33 -0700 (Mon, 11 Jun 2007) | 3 lines
Use "O&" in calls to PyArg_Parse when we need a 'void*' instead of "k"
or "K" codes.
........
r55901 | facundo.batista | 2007-06-11 09:27:08 -0700 (Mon, 11 Jun 2007) | 5 lines
Added versionchanged flag to all the methods which received
a new optional timeout parameter, and a versionadded flag to
the socket.create_connection function.
........
................
r55914 | guido.van.rossum | 2007-06-11 14:19:50 -0700 (Mon, 11 Jun 2007) | 3 lines
New super() implementation, for PEP 3135 (though the PEP is not yet updated
to this design, and small tweaks may still be made later).
................
r55923 | guido.van.rossum | 2007-06-11 21:15:24 -0700 (Mon, 11 Jun 2007) | 4 lines
I'm guessing this module broke when Neal ripped out the types module --
it used 'list' both as a local variable and as the built-in list type.
Renamed the local variable since that was easier.
................
r55924 | guido.van.rossum | 2007-06-11 21:20:05 -0700 (Mon, 11 Jun 2007) | 5 lines
Change all occurrences of super(<thisclass>, <firstarg>) to super().
Seems to have worked, all the tests still pass.
Exception: test_descr and test_descrtut, which have tons of these
and are there to test the various usages.
................
r55939 | collin.winter | 2007-06-12 13:57:33 -0700 (Tue, 12 Jun 2007) | 1 line
Patch #1735485: remove StandardError from the exception hierarchy.
................
r55954 | neal.norwitz | 2007-06-12 21:56:32 -0700 (Tue, 12 Jun 2007) | 51 lines
Merged revisions 55913-55950 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r55926 | marc-andre.lemburg | 2007-06-12 02:09:58 -0700 (Tue, 12 Jun 2007) | 3 lines
Apply patch #1734945 to support TurboLinux as distribution.
........
r55927 | marc-andre.lemburg | 2007-06-12 02:26:49 -0700 (Tue, 12 Jun 2007) | 3 lines
Add patch #1726668: Windows Vista support.
........
r55929 | thomas.heller | 2007-06-12 08:36:22 -0700 (Tue, 12 Jun 2007) | 1 line
Checkout, but do not yet try to build, exernal sources.
........
r55930 | thomas.heller | 2007-06-12 09:08:27 -0700 (Tue, 12 Jun 2007) | 6 lines
Add bufferoverflowU.lib to the libraries needed by _ssl (is this the
right thing to do?).
Set the /XP64 /RETAIL build enviroment in the makefile when building
ReleaseAMD64.
........
r55931 | thomas.heller | 2007-06-12 09:23:19 -0700 (Tue, 12 Jun 2007) | 5 lines
Revert this change, since it breaks the win32 build:
Add bufferoverflowU.lib to the libraries needed by _ssl (is this the
right thing to do?).
........
r55934 | thomas.heller | 2007-06-12 10:28:31 -0700 (Tue, 12 Jun 2007) | 3 lines
Specify the bufferoverflowU.lib to the makefile on the command line
(for ReleaseAMD64 builds).
........
r55937 | thomas.heller | 2007-06-12 12:02:59 -0700 (Tue, 12 Jun 2007) | 3 lines
Add bufferoverflowU.lib to PCBuild\_bsddb.vcproj.
Build sqlite3.dll and bsddb.
........
r55938 | thomas.heller | 2007-06-12 12:56:12 -0700 (Tue, 12 Jun 2007) | 2 lines
Don't rebuild Berkeley DB if not needed (this was committed by accident).
........
r55948 | martin.v.loewis | 2007-06-12 20:42:19 -0700 (Tue, 12 Jun 2007) | 3 lines
Provide PY_LLONG_MAX on all systems having long long.
Will backport to 2.5.
........
................
r55959 | guido.van.rossum | 2007-06-13 09:22:41 -0700 (Wed, 13 Jun 2007) | 2 lines
Fix a compilation warning.
................
705 lines
25 KiB
Python
705 lines
25 KiB
Python
#-----------------------------------------------------------------------
|
|
#
|
|
# Copyright (C) 2000, 2001 by Autonomous Zone Industries
|
|
# Copyright (C) 2002 Gregory P. Smith
|
|
#
|
|
# License: This is free software. You may use this software for any
|
|
# purpose including modification/redistribution, so long as
|
|
# this header remains intact and that you do not claim any
|
|
# rights of ownership or authorship of this software. This
|
|
# software has been tested, but no warranty is expressed or
|
|
# implied.
|
|
#
|
|
# -- Gregory P. Smith <greg@electricrain.com>
|
|
|
|
# This provides a simple database table interface built on top of
|
|
# the Python BerkeleyDB 3 interface.
|
|
#
|
|
_cvsid = '$Id$'
|
|
|
|
import re
|
|
import sys
|
|
import copy
|
|
import xdrlib
|
|
import random
|
|
import cPickle as pickle
|
|
|
|
try:
|
|
# For Pythons w/distutils pybsddb
|
|
from bsddb3.db import *
|
|
except ImportError:
|
|
# For Python 2.3
|
|
from bsddb.db import *
|
|
|
|
# XXX(nnorwitz): is this correct? DBIncompleteError is conditional in _bsddb.c
|
|
try:
|
|
DBIncompleteError
|
|
except NameError:
|
|
class DBIncompleteError(Exception):
|
|
pass
|
|
|
|
class TableDBError(Exception):
|
|
pass
|
|
class TableAlreadyExists(TableDBError):
|
|
pass
|
|
|
|
|
|
class Cond:
|
|
"""This condition matches everything"""
|
|
def __call__(self, s):
|
|
return 1
|
|
|
|
class ExactCond(Cond):
|
|
"""Acts as an exact match condition function"""
|
|
def __init__(self, strtomatch):
|
|
self.strtomatch = strtomatch
|
|
def __call__(self, s):
|
|
return s == self.strtomatch
|
|
|
|
class PrefixCond(Cond):
|
|
"""Acts as a condition function for matching a string prefix"""
|
|
def __init__(self, prefix):
|
|
self.prefix = prefix
|
|
def __call__(self, s):
|
|
return s[:len(self.prefix)] == self.prefix
|
|
|
|
class PostfixCond(Cond):
|
|
"""Acts as a condition function for matching a string postfix"""
|
|
def __init__(self, postfix):
|
|
self.postfix = postfix
|
|
def __call__(self, s):
|
|
return s[-len(self.postfix):] == self.postfix
|
|
|
|
class LikeCond(Cond):
|
|
"""
|
|
Acts as a function that will match using an SQL 'LIKE' style
|
|
string. Case insensitive and % signs are wild cards.
|
|
This isn't perfect but it should work for the simple common cases.
|
|
"""
|
|
def __init__(self, likestr, re_flags=re.IGNORECASE):
|
|
# escape python re characters
|
|
chars_to_escape = '.*+()[]?'
|
|
for char in chars_to_escape :
|
|
likestr = likestr.replace(char, '\\'+char)
|
|
# convert %s to wildcards
|
|
self.likestr = likestr.replace('%', '.*')
|
|
self.re = re.compile('^'+self.likestr+'$', re_flags)
|
|
def __call__(self, s):
|
|
return self.re.match(s)
|
|
|
|
#
|
|
# keys used to store database metadata
|
|
#
|
|
_table_names_key = '__TABLE_NAMES__' # list of the tables in this db
|
|
_columns = '._COLUMNS__' # table_name+this key contains a list of columns
|
|
|
|
def _columns_key(table):
|
|
return table + _columns
|
|
|
|
#
|
|
# these keys are found within table sub databases
|
|
#
|
|
_data = '._DATA_.' # this+column+this+rowid key contains table data
|
|
_rowid = '._ROWID_.' # this+rowid+this key contains a unique entry for each
|
|
# row in the table. (no data is stored)
|
|
_rowid_str_len = 8 # length in bytes of the unique rowid strings
|
|
|
|
def _data_key(table, col, rowid):
|
|
return table + _data + col + _data + rowid
|
|
|
|
def _search_col_data_key(table, col):
|
|
return table + _data + col + _data
|
|
|
|
def _search_all_data_key(table):
|
|
return table + _data
|
|
|
|
def _rowid_key(table, rowid):
|
|
return table + _rowid + rowid + _rowid
|
|
|
|
def _search_rowid_key(table):
|
|
return table + _rowid
|
|
|
|
def contains_metastrings(s) :
|
|
"""Verify that the given string does not contain any
|
|
metadata strings that might interfere with dbtables database operation.
|
|
"""
|
|
if (s.find(_table_names_key) >= 0 or
|
|
s.find(_columns) >= 0 or
|
|
s.find(_data) >= 0 or
|
|
s.find(_rowid) >= 0):
|
|
# Then
|
|
return 1
|
|
else:
|
|
return 0
|
|
|
|
|
|
class bsdTableDB :
|
|
def __init__(self, filename, dbhome, create=0, truncate=0, mode=0o600,
|
|
recover=0, dbflags=0):
|
|
"""bsdTableDB(filename, dbhome, create=0, truncate=0, mode=0o600)
|
|
|
|
Open database name in the dbhome BerkeleyDB directory.
|
|
Use keyword arguments when calling this constructor.
|
|
"""
|
|
self.db = None
|
|
myflags = DB_THREAD
|
|
if create:
|
|
myflags |= DB_CREATE
|
|
flagsforenv = (DB_INIT_MPOOL | DB_INIT_LOCK | DB_INIT_LOG |
|
|
DB_INIT_TXN | dbflags)
|
|
# DB_AUTO_COMMIT isn't a valid flag for env.open()
|
|
try:
|
|
dbflags |= DB_AUTO_COMMIT
|
|
except AttributeError:
|
|
pass
|
|
if recover:
|
|
flagsforenv = flagsforenv | DB_RECOVER
|
|
self.env = DBEnv()
|
|
# enable auto deadlock avoidance
|
|
self.env.set_lk_detect(DB_LOCK_DEFAULT)
|
|
self.env.open(dbhome, myflags | flagsforenv)
|
|
if truncate:
|
|
myflags |= DB_TRUNCATE
|
|
self.db = DB(self.env)
|
|
# this code relies on DBCursor.set* methods to raise exceptions
|
|
# rather than returning None
|
|
self.db.set_get_returns_none(1)
|
|
# allow duplicate entries [warning: be careful w/ metadata]
|
|
self.db.set_flags(DB_DUP)
|
|
self.db.open(filename, DB_BTREE, dbflags | myflags, mode)
|
|
self.dbfilename = filename
|
|
# Initialize the table names list if this is a new database
|
|
txn = self.env.txn_begin()
|
|
try:
|
|
if not self.db.has_key(_table_names_key, txn):
|
|
self.db.put(_table_names_key, pickle.dumps([], 1), txn=txn)
|
|
# Yes, bare except
|
|
except:
|
|
txn.abort()
|
|
raise
|
|
else:
|
|
txn.commit()
|
|
# TODO verify more of the database's metadata?
|
|
self.__tablecolumns = {}
|
|
|
|
def __del__(self):
|
|
self.close()
|
|
|
|
def close(self):
|
|
if self.db is not None:
|
|
self.db.close()
|
|
self.db = None
|
|
if self.env is not None:
|
|
self.env.close()
|
|
self.env = None
|
|
|
|
def checkpoint(self, mins=0):
|
|
try:
|
|
self.env.txn_checkpoint(mins)
|
|
except DBIncompleteError:
|
|
pass
|
|
|
|
def sync(self):
|
|
try:
|
|
self.db.sync()
|
|
except DBIncompleteError:
|
|
pass
|
|
|
|
def _db_print(self) :
|
|
"""Print the database to stdout for debugging"""
|
|
print("******** Printing raw database for debugging ********")
|
|
cur = self.db.cursor()
|
|
try:
|
|
key, data = cur.first()
|
|
while 1:
|
|
print(repr({key: data}))
|
|
next = cur.next()
|
|
if next:
|
|
key, data = next
|
|
else:
|
|
cur.close()
|
|
return
|
|
except DBNotFoundError:
|
|
cur.close()
|
|
|
|
|
|
def CreateTable(self, table, columns):
|
|
"""CreateTable(table, columns) - Create a new table in the database.
|
|
|
|
raises TableDBError if it already exists or for other DB errors.
|
|
"""
|
|
assert isinstance(columns, list)
|
|
txn = None
|
|
try:
|
|
# checking sanity of the table and column names here on
|
|
# table creation will prevent problems elsewhere.
|
|
if contains_metastrings(table):
|
|
raise ValueError(
|
|
"bad table name: contains reserved metastrings")
|
|
for column in columns :
|
|
if contains_metastrings(column):
|
|
raise ValueError(
|
|
"bad column name: contains reserved metastrings")
|
|
|
|
columnlist_key = _columns_key(table)
|
|
if self.db.has_key(columnlist_key):
|
|
raise TableAlreadyExists, "table already exists"
|
|
|
|
txn = self.env.txn_begin()
|
|
# store the table's column info
|
|
self.db.put(columnlist_key, pickle.dumps(columns, 1), txn=txn)
|
|
|
|
# add the table name to the tablelist
|
|
tablelist = pickle.loads(self.db.get(_table_names_key, txn=txn,
|
|
flags=DB_RMW))
|
|
tablelist.append(table)
|
|
# delete 1st, in case we opened with DB_DUP
|
|
self.db.delete(_table_names_key, txn)
|
|
self.db.put(_table_names_key, pickle.dumps(tablelist, 1), txn=txn)
|
|
|
|
txn.commit()
|
|
txn = None
|
|
except DBError as dberror:
|
|
if txn:
|
|
txn.abort()
|
|
raise TableDBError, dberror.args[1]
|
|
|
|
|
|
def ListTableColumns(self, table):
|
|
"""Return a list of columns in the given table.
|
|
[] if the table doesn't exist.
|
|
"""
|
|
assert isinstance(table, str)
|
|
if contains_metastrings(table):
|
|
raise ValueError, "bad table name: contains reserved metastrings"
|
|
|
|
columnlist_key = _columns_key(table)
|
|
if not self.db.has_key(columnlist_key):
|
|
return []
|
|
pickledcolumnlist = self.db.get(columnlist_key)
|
|
if pickledcolumnlist:
|
|
return pickle.loads(pickledcolumnlist)
|
|
else:
|
|
return []
|
|
|
|
def ListTables(self):
|
|
"""Return a list of tables in this database."""
|
|
pickledtablelist = self.db.get(_table_names_key)
|
|
if pickledtablelist:
|
|
return pickle.loads(pickledtablelist)
|
|
else:
|
|
return []
|
|
|
|
def CreateOrExtendTable(self, table, columns):
|
|
"""CreateOrExtendTable(table, columns)
|
|
|
|
Create a new table in the database.
|
|
|
|
If a table of this name already exists, extend it to have any
|
|
additional columns present in the given list as well as
|
|
all of its current columns.
|
|
"""
|
|
assert isinstance(columns, list)
|
|
try:
|
|
self.CreateTable(table, columns)
|
|
except TableAlreadyExists:
|
|
# the table already existed, add any new columns
|
|
txn = None
|
|
try:
|
|
columnlist_key = _columns_key(table)
|
|
txn = self.env.txn_begin()
|
|
|
|
# load the current column list
|
|
oldcolumnlist = pickle.loads(
|
|
self.db.get(columnlist_key, txn=txn, flags=DB_RMW))
|
|
# create a hash table for fast lookups of column names in the
|
|
# loop below
|
|
oldcolumnhash = {}
|
|
for c in oldcolumnlist:
|
|
oldcolumnhash[c] = c
|
|
|
|
# create a new column list containing both the old and new
|
|
# column names
|
|
newcolumnlist = copy.copy(oldcolumnlist)
|
|
for c in columns:
|
|
if c not in oldcolumnhash:
|
|
newcolumnlist.append(c)
|
|
|
|
# store the table's new extended column list
|
|
if newcolumnlist != oldcolumnlist :
|
|
# delete the old one first since we opened with DB_DUP
|
|
self.db.delete(columnlist_key, txn)
|
|
self.db.put(columnlist_key,
|
|
pickle.dumps(newcolumnlist, 1),
|
|
txn=txn)
|
|
|
|
txn.commit()
|
|
txn = None
|
|
|
|
self.__load_column_info(table)
|
|
except DBError as dberror:
|
|
if txn:
|
|
txn.abort()
|
|
raise TableDBError, dberror.args[1]
|
|
|
|
|
|
def __load_column_info(self, table) :
|
|
"""initialize the self.__tablecolumns dict"""
|
|
# check the column names
|
|
try:
|
|
tcolpickles = self.db.get(_columns_key(table))
|
|
except DBNotFoundError:
|
|
raise TableDBError, "unknown table: %r" % (table,)
|
|
if not tcolpickles:
|
|
raise TableDBError, "unknown table: %r" % (table,)
|
|
self.__tablecolumns[table] = pickle.loads(tcolpickles)
|
|
|
|
def __new_rowid(self, table, txn) :
|
|
"""Create a new unique row identifier"""
|
|
unique = 0
|
|
while not unique:
|
|
# Generate a random 64-bit row ID string
|
|
# (note: this code has <64 bits of randomness
|
|
# but it's plenty for our database id needs!)
|
|
p = xdrlib.Packer()
|
|
p.pack_int(int(random.random()*2147483647))
|
|
p.pack_int(int(random.random()*2147483647))
|
|
newid = p.get_buffer()
|
|
|
|
# Guarantee uniqueness by adding this key to the database
|
|
try:
|
|
self.db.put(_rowid_key(table, newid), None, txn=txn,
|
|
flags=DB_NOOVERWRITE)
|
|
except DBKeyExistError:
|
|
pass
|
|
else:
|
|
unique = 1
|
|
|
|
return newid
|
|
|
|
|
|
def Insert(self, table, rowdict) :
|
|
"""Insert(table, datadict) - Insert a new row into the table
|
|
using the keys+values from rowdict as the column values.
|
|
"""
|
|
txn = None
|
|
try:
|
|
if not self.db.has_key(_columns_key(table)):
|
|
raise TableDBError, "unknown table"
|
|
|
|
# check the validity of each column name
|
|
if table not in self.__tablecolumns:
|
|
self.__load_column_info(table)
|
|
for column in rowdict.keys() :
|
|
if not self.__tablecolumns[table].count(column):
|
|
raise TableDBError, "unknown column: %r" % (column,)
|
|
|
|
# get a unique row identifier for this row
|
|
txn = self.env.txn_begin()
|
|
rowid = self.__new_rowid(table, txn=txn)
|
|
|
|
# insert the row values into the table database
|
|
for column, dataitem in rowdict.items():
|
|
# store the value
|
|
self.db.put(_data_key(table, column, rowid), dataitem, txn=txn)
|
|
|
|
txn.commit()
|
|
txn = None
|
|
|
|
except DBError as dberror:
|
|
# WIBNI we could just abort the txn and re-raise the exception?
|
|
# But no, because TableDBError is not related to DBError via
|
|
# inheritance, so it would be backwards incompatible. Do the next
|
|
# best thing.
|
|
info = sys.exc_info()
|
|
if txn:
|
|
txn.abort()
|
|
self.db.delete(_rowid_key(table, rowid))
|
|
raise TableDBError, dberror.args[1], info[2]
|
|
|
|
|
|
def Modify(self, table, conditions={}, mappings={}):
|
|
"""Modify(table, conditions={}, mappings={}) - Modify items in rows matching 'conditions' using mapping functions in 'mappings'
|
|
|
|
* table - the table name
|
|
* conditions - a dictionary keyed on column names containing
|
|
a condition callable expecting the data string as an
|
|
argument and returning a boolean.
|
|
* mappings - a dictionary keyed on column names containing a
|
|
condition callable expecting the data string as an argument and
|
|
returning the new string for that column.
|
|
"""
|
|
try:
|
|
matching_rowids = self.__Select(table, [], conditions)
|
|
|
|
# modify only requested columns
|
|
columns = mappings.keys()
|
|
for rowid in matching_rowids.keys():
|
|
txn = None
|
|
try:
|
|
for column in columns:
|
|
txn = self.env.txn_begin()
|
|
# modify the requested column
|
|
try:
|
|
dataitem = self.db.get(
|
|
_data_key(table, column, rowid),
|
|
txn)
|
|
self.db.delete(
|
|
_data_key(table, column, rowid),
|
|
txn)
|
|
except DBNotFoundError:
|
|
# XXXXXXX row key somehow didn't exist, assume no
|
|
# error
|
|
dataitem = None
|
|
dataitem = mappings[column](dataitem)
|
|
if dataitem != None:
|
|
self.db.put(
|
|
_data_key(table, column, rowid),
|
|
dataitem, txn=txn)
|
|
txn.commit()
|
|
txn = None
|
|
|
|
# catch all exceptions here since we call unknown callables
|
|
except:
|
|
if txn:
|
|
txn.abort()
|
|
raise
|
|
|
|
except DBError as dberror:
|
|
raise TableDBError, dberror.args[1]
|
|
|
|
def Delete(self, table, conditions={}):
|
|
"""Delete(table, conditions) - Delete items matching the given
|
|
conditions from the table.
|
|
|
|
* conditions - a dictionary keyed on column names containing
|
|
condition functions expecting the data string as an
|
|
argument and returning a boolean.
|
|
"""
|
|
try:
|
|
matching_rowids = self.__Select(table, [], conditions)
|
|
|
|
# delete row data from all columns
|
|
columns = self.__tablecolumns[table]
|
|
for rowid in matching_rowids.keys():
|
|
txn = None
|
|
try:
|
|
txn = self.env.txn_begin()
|
|
for column in columns:
|
|
# delete the data key
|
|
try:
|
|
self.db.delete(_data_key(table, column, rowid),
|
|
txn)
|
|
except DBNotFoundError:
|
|
# XXXXXXX column may not exist, assume no error
|
|
pass
|
|
|
|
try:
|
|
self.db.delete(_rowid_key(table, rowid), txn)
|
|
except DBNotFoundError:
|
|
# XXXXXXX row key somehow didn't exist, assume no error
|
|
pass
|
|
txn.commit()
|
|
txn = None
|
|
except DBError as dberror:
|
|
if txn:
|
|
txn.abort()
|
|
raise
|
|
except DBError as dberror:
|
|
raise TableDBError, dberror.args[1]
|
|
|
|
|
|
def Select(self, table, columns, conditions={}):
|
|
"""Select(table, columns, conditions) - retrieve specific row data
|
|
Returns a list of row column->value mapping dictionaries.
|
|
|
|
* columns - a list of which column data to return. If
|
|
columns is None, all columns will be returned.
|
|
* conditions - a dictionary keyed on column names
|
|
containing callable conditions expecting the data string as an
|
|
argument and returning a boolean.
|
|
"""
|
|
try:
|
|
if table not in self.__tablecolumns:
|
|
self.__load_column_info(table)
|
|
if columns is None:
|
|
columns = self.__tablecolumns[table]
|
|
matching_rowids = self.__Select(table, columns, conditions)
|
|
except DBError as dberror:
|
|
raise TableDBError, dberror.args[1]
|
|
# return the matches as a list of dictionaries
|
|
return matching_rowids.values()
|
|
|
|
|
|
def __Select(self, table, columns, conditions):
|
|
"""__Select() - Used to implement Select and Delete (above)
|
|
Returns a dictionary keyed on rowids containing dicts
|
|
holding the row data for columns listed in the columns param
|
|
that match the given conditions.
|
|
* conditions is a dictionary keyed on column names
|
|
containing callable conditions expecting the data string as an
|
|
argument and returning a boolean.
|
|
"""
|
|
# check the validity of each column name
|
|
if table not in self.__tablecolumns:
|
|
self.__load_column_info(table)
|
|
if columns is None:
|
|
columns = self.tablecolumns[table]
|
|
for column in (columns + list(conditions.keys())):
|
|
if not self.__tablecolumns[table].count(column):
|
|
raise TableDBError, "unknown column: %r" % (column,)
|
|
|
|
# keyed on rows that match so far, containings dicts keyed on
|
|
# column names containing the data for that row and column.
|
|
matching_rowids = {}
|
|
# keys are rowids that do not match
|
|
rejected_rowids = {}
|
|
|
|
# attempt to sort the conditions in such a way as to minimize full
|
|
# column lookups
|
|
def cmp_conditions(atuple, btuple):
|
|
a = atuple[1]
|
|
b = btuple[1]
|
|
if type(a) is type(b):
|
|
if isinstance(a, PrefixCond) and isinstance(b, PrefixCond):
|
|
# longest prefix first
|
|
return cmp(len(b.prefix), len(a.prefix))
|
|
if isinstance(a, LikeCond) and isinstance(b, LikeCond):
|
|
# longest likestr first
|
|
return cmp(len(b.likestr), len(a.likestr))
|
|
return 0
|
|
if isinstance(a, ExactCond):
|
|
return -1
|
|
if isinstance(b, ExactCond):
|
|
return 1
|
|
if isinstance(a, PrefixCond):
|
|
return -1
|
|
if isinstance(b, PrefixCond):
|
|
return 1
|
|
# leave all unknown condition callables alone as equals
|
|
return 0
|
|
|
|
conditionlist = list(conditions.items())
|
|
conditionlist.sort(cmp_conditions)
|
|
|
|
# Apply conditions to column data to find what we want
|
|
cur = self.db.cursor()
|
|
column_num = -1
|
|
for column, condition in conditionlist:
|
|
column_num = column_num + 1
|
|
searchkey = _search_col_data_key(table, column)
|
|
# speedup: don't linear search columns within loop
|
|
if column in columns:
|
|
savethiscolumndata = 1 # save the data for return
|
|
else:
|
|
savethiscolumndata = 0 # data only used for selection
|
|
|
|
try:
|
|
key, data = cur.set_range(searchkey)
|
|
while key[:len(searchkey)] == searchkey:
|
|
# extract the rowid from the key
|
|
rowid = key[-_rowid_str_len:]
|
|
|
|
if rowid not in rejected_rowids:
|
|
# if no condition was specified or the condition
|
|
# succeeds, add row to our match list.
|
|
if not condition or condition(data):
|
|
if rowid not in matching_rowids:
|
|
matching_rowids[rowid] = {}
|
|
if savethiscolumndata:
|
|
matching_rowids[rowid][column] = data
|
|
else:
|
|
if rowid in matching_rowids:
|
|
del matching_rowids[rowid]
|
|
rejected_rowids[rowid] = rowid
|
|
|
|
key, data = cur.next()
|
|
|
|
except DBError as dberror:
|
|
if dberror.args[0] != DB_NOTFOUND:
|
|
raise
|
|
continue
|
|
|
|
cur.close()
|
|
|
|
# we're done selecting rows, garbage collect the reject list
|
|
del rejected_rowids
|
|
|
|
# extract any remaining desired column data from the
|
|
# database for the matching rows.
|
|
if len(columns) > 0:
|
|
for rowid, rowdata in matching_rowids.items():
|
|
for column in columns:
|
|
if column in rowdata:
|
|
continue
|
|
try:
|
|
rowdata[column] = self.db.get(
|
|
_data_key(table, column, rowid))
|
|
except DBError as dberror:
|
|
if dberror.args[0] != DB_NOTFOUND:
|
|
raise
|
|
rowdata[column] = None
|
|
|
|
# return the matches
|
|
return matching_rowids
|
|
|
|
|
|
def Drop(self, table):
|
|
"""Remove an entire table from the database"""
|
|
txn = None
|
|
try:
|
|
txn = self.env.txn_begin()
|
|
|
|
# delete the column list
|
|
self.db.delete(_columns_key(table), txn)
|
|
|
|
cur = self.db.cursor(txn)
|
|
|
|
# delete all keys containing this tables column and row info
|
|
table_key = _search_all_data_key(table)
|
|
while 1:
|
|
try:
|
|
key, data = cur.set_range(table_key)
|
|
except DBNotFoundError:
|
|
break
|
|
# only delete items in this table
|
|
if key[:len(table_key)] != table_key:
|
|
break
|
|
cur.delete()
|
|
|
|
# delete all rowids used by this table
|
|
table_key = _search_rowid_key(table)
|
|
while 1:
|
|
try:
|
|
key, data = cur.set_range(table_key)
|
|
except DBNotFoundError:
|
|
break
|
|
# only delete items in this table
|
|
if key[:len(table_key)] != table_key:
|
|
break
|
|
cur.delete()
|
|
|
|
cur.close()
|
|
|
|
# delete the tablename from the table name list
|
|
tablelist = pickle.loads(
|
|
self.db.get(_table_names_key, txn=txn, flags=DB_RMW))
|
|
try:
|
|
tablelist.remove(table)
|
|
except ValueError:
|
|
# hmm, it wasn't there, oh well, that's what we want.
|
|
pass
|
|
# delete 1st, incase we opened with DB_DUP
|
|
self.db.delete(_table_names_key, txn)
|
|
self.db.put(_table_names_key, pickle.dumps(tablelist, 1), txn=txn)
|
|
|
|
txn.commit()
|
|
txn = None
|
|
|
|
if table in self.__tablecolumns:
|
|
del self.__tablecolumns[table]
|
|
|
|
except DBError as dberror:
|
|
if txn:
|
|
txn.abort()
|
|
raise TableDBError, dberror.args[1]
|