merged branches/tseaver-btrees_as_egg, splitting btrees into separate project

CHANGES.txt

@@ -8,8 +8,8 @@
 New Features
 ------------
 
-- The ``persistent`` package is now released as a separate distribution,
-  on which ZODB now depends.
+- The ``persistent`` and ``BTrees`` packages are now released as separate
+  distributions, on which ZODB now depends.
 
 - ZODB no longer depends on zope.event.  It now uses ZODB.event, which
   uses zope.event if it is installed.  You can override

buildout.cfg

@@ -12,6 +12,7 @@ zc.recipe.testrunner = 1.3.0
 recipe = zc.recipe.testrunner
 eggs =
     persistent
+    BTrees
     ZODB [test]
 initialization =
   import os, tempfile
@@ -24,5 +25,6 @@ defaults = ['--all']
 recipe = zc.recipe.egg
 eggs =
     persistent
+    BTrees
     ZODB3 [test]
 interpreter = py

setup.py

@@ -50,67 +50,6 @@ Operating System :: Unix
 Framework :: ZODB
 """
 
-# Include directories for C extensions
-# Sniff the location of the headers in 'persistent'.
-
-class ModuleHeaderDir(object):
-
-    def __init__(self, require_spec, where='..'):
-        # By default, assume top-level pkg has the same name as the dist.
-        # Also assume that headers are located in the package dir, and
-        # are meant to be included as follows:
-        #    #include "module/header_name.h"
-        self._require_spec = require_spec
-        self._where = where
-
-    def __str__(self):
-        from pkg_resources import require
-        from pkg_resources import resource_filename
-        require(self._require_spec)
-        return os.path.abspath(
-                    resource_filename(self._require_spec, self._where))
-
-include = [ModuleHeaderDir('persistent'), 'src']
-
-# Set up dependencies for the BTrees package
-base_btrees_depends = [
-    "src/BTrees/BTreeItemsTemplate.c",
-    "src/BTrees/BTreeModuleTemplate.c",
-    "src/BTrees/BTreeTemplate.c",
-    "src/BTrees/BucketTemplate.c",
-    "src/BTrees/MergeTemplate.c",
-    "src/BTrees/SetOpTemplate.c",
-    "src/BTrees/SetTemplate.c",
-    "src/BTrees/TreeSetTemplate.c",
-    "src/BTrees/sorters.c",
-    ]
-
-_flavors = {"O": "object", "I": "int", "F": "float", 'L': 'int'}
-
-KEY_H = "src/BTrees/%skeymacros.h"
-VALUE_H = "src/BTrees/%svaluemacros.h"
-
-
-def BTreeExtension(flavor):
-    key = flavor[0]
-    value = flavor[1]
-    name = "BTrees._%sBTree" % flavor
-    sources = ["src/BTrees/_%sBTree.c" % flavor]
-    kwargs = {"include_dirs": include}
-    if flavor != "fs":
-        kwargs["depends"] = (base_btrees_depends + [KEY_H % _flavors[key],
-                                                    VALUE_H % _flavors[value]])
-    else:
-        kwargs["depends"] = base_btrees_depends
-    if key != "O":
-        kwargs["define_macros"] = [('EXCLUDE_INTSET_SUPPORT', None)]
-    return Extension(name, sources, **kwargs)
-
-exts = [BTreeExtension(flavor)
-        for flavor in ("OO", "IO", "OI", "II", "IF",
-                       "fs", "LO", "OL", "LL", "LF",
-                       )]
-
 def _modname(path, base, name=''):
     if path == base:
         return name
@@ -170,7 +109,6 @@ setup(name="ZODB",
       maintainer_email="zodb-dev@zope.org",
       packages = find_packages('src'),
       package_dir = {'': 'src'},
-      ext_modules = exts,
       license = "ZPL 2.1",
       platforms = ["any"],
       description = doclines[0],
@@ -186,6 +124,7 @@ setup(name="ZODB",
       install_requires = [
         'transaction',
         'persistent',
+        'BTrees',
         'zc.lockfile',
         'ZConfig',
         'zdaemon',

src/BTrees/IFBTree.py

-##############################################################################
-#
-# Copyright (c) 2001, 2002 Zope Foundation and Contributors.
-# All Rights Reserved.
-#
-# This software is subject to the provisions of the Zope Public License,
-# Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
-# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-# FOR A PARTICULAR PURPOSE
-#
-##############################################################################
-
-import zope.interface
-import BTrees.Interfaces
-
-# hack to overcome dynamic-linking headache.
-from _IFBTree import *
-
-zope.interface.moduleProvides(BTrees.Interfaces.IIntegerFloatBTreeModule)

src/BTrees/IIBTree.py

-##############################################################################
-#
-# Copyright (c) 2001, 2002 Zope Foundation and Contributors.
-# All Rights Reserved.
-#
-# This software is subject to the provisions of the Zope Public License,
-# Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
-# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-# FOR A PARTICULAR PURPOSE
-#
-##############################################################################
-
-import zope.interface
-import BTrees.Interfaces
-
-# hack to overcome dynamic-linking headache.
-from _IIBTree import *
-
-zope.interface.moduleProvides(BTrees.Interfaces.IIntegerIntegerBTreeModule)

src/BTrees/IOBTree.py

-##############################################################################
-#
-# Copyright (c) 2001, 2002 Zope Foundation and Contributors.
-# All Rights Reserved.
-#
-# This software is subject to the provisions of the Zope Public License,
-# Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
-# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-# FOR A PARTICULAR PURPOSE
-#
-##############################################################################
-
-import zope.interface
-import BTrees.Interfaces
-
-# hack to overcome dynamic-linking headache.
-from _IOBTree import *
-
-zope.interface.moduleProvides(BTrees.Interfaces.IIntegerObjectBTreeModule)

src/BTrees/LFBTree.py

-##############################################################################
-#
-# Copyright (c) 2001, 2002 Zope Foundation and Contributors.
-# All Rights Reserved.
-#
-# This software is subject to the provisions of the Zope Public License,
-# Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
-# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-# FOR A PARTICULAR PURPOSE
-#
-##############################################################################
-
-import zope.interface
-import BTrees.Interfaces
-
-# hack to overcome dynamic-linking headache.
-from _LFBTree import *
-
-zope.interface.moduleProvides(BTrees.Interfaces.IIntegerFloatBTreeModule)

src/BTrees/LLBTree.py

-##############################################################################
-#
-# Copyright (c) 2001, 2002 Zope Foundation and Contributors.
-# All Rights Reserved.
-#
-# This software is subject to the provisions of the Zope Public License,
-# Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
-# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-# FOR A PARTICULAR PURPOSE
-#
-##############################################################################
-
-import zope.interface
-import BTrees.Interfaces
-
-# hack to overcome dynamic-linking headache.
-from _LLBTree import *
-
-zope.interface.moduleProvides(BTrees.Interfaces.IIntegerIntegerBTreeModule)

src/BTrees/LOBTree.py

-##############################################################################
-#
-# Copyright (c) 2001, 2002 Zope Foundation and Contributors.
-# All Rights Reserved.
-#
-# This software is subject to the provisions of the Zope Public License,
-# Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
-# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-# FOR A PARTICULAR PURPOSE
-#
-##############################################################################
-
-import zope.interface
-import BTrees.Interfaces
-
-# hack to overcome dynamic-linking headache.
-from _LOBTree import *
-
-zope.interface.moduleProvides(BTrees.Interfaces.IIntegerObjectBTreeModule)

src/BTrees/Length.py

-##############################################################################
-#
-# Copyright (c) 2001, 2002 Zope Foundation and Contributors.
-# All Rights Reserved.
-#
-# This software is subject to the provisions of the Zope Public License,
-# Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
-# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-# FOR A PARTICULAR PURPOSE
-#
-##############################################################################
-
-import persistent
-
-class Length(persistent.Persistent):
-    """BTree lengths are often too expensive to compute.
-
-    Objects that use BTrees need to keep track of lengths themselves.
-    This class provides an object for doing this.
-
-    As a bonus, the object support application-level conflict
-    resolution.
-
-    It is tempting to to assign length objects to __len__ attributes
-    to provide instance-specific __len__ methods.  However, this no
-    longer works as expected, because new-style classes cache
-    class-defined slot methods (like __len__) in C type slots.  Thus,
-    instance-defined slot fillers are ignored.
-
-    """
-    value = 0
-
-    def __init__(self, v=0):
-        self.value = v
-
-    def __getstate__(self):
-        return self.value
-
-    def __setstate__(self, v):
-        self.value = v
-
-    def set(self, v):
-        self.value = v
-
-    def _p_resolveConflict(self, old, s1, s2):
-        return s1 + s2 - old
-
-    def change(self, delta):
-        self.value += delta
-
-    def __call__(self, *args):
-        return self.value

src/BTrees/OIBTree.py

-##############################################################################
-#
-# Copyright (c) 2001, 2002 Zope Foundation and Contributors.
-# All Rights Reserved.
-#
-# This software is subject to the provisions of the Zope Public License,
-# Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
-# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-# FOR A PARTICULAR PURPOSE
-#
-##############################################################################
-
-import zope.interface
-import BTrees.Interfaces
-
-# hack to overcome dynamic-linking headache.
-from _OIBTree import *
-
-zope.interface.moduleProvides(BTrees.Interfaces.IObjectIntegerBTreeModule)

src/BTrees/OLBTree.py

-##############################################################################
-#
-# Copyright (c) 2001, 2002 Zope Foundation and Contributors.
-# All Rights Reserved.
-#
-# This software is subject to the provisions of the Zope Public License,
-# Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
-# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-# FOR A PARTICULAR PURPOSE
-#
-##############################################################################
-
-import zope.interface
-import BTrees.Interfaces
-
-# hack to overcome dynamic-linking headache.
-from _OLBTree import *
-
-zope.interface.moduleProvides(BTrees.Interfaces.IObjectIntegerBTreeModule)

src/BTrees/OOBTree.py

-##############################################################################
-#
-# Copyright (c) 2001, 2002 Zope Foundation and Contributors.
-# All Rights Reserved.
-#
-# This software is subject to the provisions of the Zope Public License,
-# Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
-# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-# FOR A PARTICULAR PURPOSE
-#
-##############################################################################
-
-import zope.interface
-import BTrees.Interfaces
-
-# hack to overcome dynamic-linking headache.
-from _OOBTree import *
-
-zope.interface.moduleProvides(BTrees.Interfaces.IObjectObjectBTreeModule)

src/BTrees/_IFBTree.c

-/*############################################################################
-#
-# Copyright (c) 2004 Zope Foundation and Contributors.
-# All Rights Reserved.
-#
-# This software is subject to the provisions of the Zope Public License,
-# Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
-# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-# FOR A PARTICULAR PURPOSE.
-#
-############################################################################*/
-
-#define MASTER_ID "$Id$\n"
-
-/* IFBTree - int key, float value BTree
-
-   Implements a collection using int type keys
-   and float type values
-*/
-
-/* Setup template macros */
-
-#define PERSISTENT
-
-#define MOD_NAME_PREFIX "IF"
-#define INITMODULE init_IFBTree
-#define DEFAULT_MAX_BUCKET_SIZE 120
-#define DEFAULT_MAX_BTREE_SIZE 500
-
-#include "intkeymacros.h"
-#include "floatvaluemacros.h"
-#include "BTreeModuleTemplate.c"

src/BTrees/_IIBTree.c

-/*############################################################################
-#
-# Copyright (c) 2004 Zope Foundation and Contributors.
-# All Rights Reserved.
-#
-# This software is subject to the provisions of the Zope Public License,
-# Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
-# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-# FOR A PARTICULAR PURPOSE.
-#
-############################################################################*/
-
-#define MASTER_ID "$Id$\n"
-
-/* IIBTree - int key, int value BTree
-
-   Implements a collection using int type keys
-   and int type values
-*/
-
-/* Setup template macros */
-
-#define PERSISTENT
-
-#define MOD_NAME_PREFIX "II"
-#define INITMODULE init_IIBTree
-#define DEFAULT_MAX_BUCKET_SIZE 120
-#define DEFAULT_MAX_BTREE_SIZE 500
-
-#include "intkeymacros.h"
-#include "intvaluemacros.h"
-#include "BTreeModuleTemplate.c"

src/BTrees/_IOBTree.c

-/*############################################################################
-#
-# Copyright (c) 2004 Zope Foundation and Contributors.
-# All Rights Reserved.
-#
-# This software is subject to the provisions of the Zope Public License,
-# Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
-# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-# FOR A PARTICULAR PURPOSE.
-#
-############################################################################*/
-
-#define MASTER_ID "$Id$\n"
-
-/* IOBTree - int key, object value BTree
-
-   Implements a collection using int type keys
-   and object type values
-*/
-
-#define PERSISTENT
-
-#define MOD_NAME_PREFIX "IO"
-#define DEFAULT_MAX_BUCKET_SIZE 60
-#define DEFAULT_MAX_BTREE_SIZE 500
-#define INITMODULE init_IOBTree
-                                
-#include "intkeymacros.h"
-#include "objectvaluemacros.h"
-#include "BTreeModuleTemplate.c"

src/BTrees/_LFBTree.c

-/*############################################################################
-#
-# Copyright (c) 2004 Zope Foundation and Contributors.
-# All Rights Reserved.
-#
-# This software is subject to the provisions of the Zope Public License,
-# Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
-# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-# FOR A PARTICULAR PURPOSE.
-#
-############################################################################*/
-
-#define MASTER_ID "$Id: _IFBTree.c 67074 2006-04-17 19:13:39Z fdrake $\n"
-
-/* IFBTree - int key, float value BTree
-
-   Implements a collection using int type keys
-   and float type values
-*/
-
-/* Setup template macros */
-
-#define PERSISTENT
-
-#define MOD_NAME_PREFIX "LF"
-#define INITMODULE init_LFBTree
-#define DEFAULT_MAX_BUCKET_SIZE 120
-#define DEFAULT_MAX_BTREE_SIZE 500
-
-#define ZODB_64BIT_INTS
-
-#include "intkeymacros.h"
-#include "floatvaluemacros.h"
-#include "BTreeModuleTemplate.c"

src/BTrees/_LLBTree.c

-/*############################################################################
-#
-# Copyright (c) 2004 Zope Foundation and Contributors.
-# All Rights Reserved.
-#
-# This software is subject to the provisions of the Zope Public License,
-# Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
-# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-# FOR A PARTICULAR PURPOSE.
-#
-############################################################################*/
-
-#define MASTER_ID "$Id: _IIBTree.c 25186 2004-06-02 15:07:33Z jim $\n"
-
-/* IIBTree - int key, int value BTree
-
-   Implements a collection using int type keys
-   and int type values
-*/
-
-/* Setup template macros */
-
-#define PERSISTENT
-
-#define MOD_NAME_PREFIX "LL"
-#define INITMODULE init_LLBTree
-#define DEFAULT_MAX_BUCKET_SIZE 120
-#define DEFAULT_MAX_BTREE_SIZE 500
-
-#define ZODB_64BIT_INTS
-
-#include "intkeymacros.h"
-#include "intvaluemacros.h"
-#include "BTreeModuleTemplate.c"

src/BTrees/_LOBTree.c

-/*############################################################################
-#
-# Copyright (c) 2004 Zope Foundation and Contributors.
-# All Rights Reserved.
-#
-# This software is subject to the provisions of the Zope Public License,
-# Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
-# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-# FOR A PARTICULAR PURPOSE.
-#
-############################################################################*/
-
-#define MASTER_ID "$Id: _IOBTree.c 25186 2004-06-02 15:07:33Z jim $\n"
-
-/* IOBTree - int key, object value BTree
-
-   Implements a collection using int type keys
-   and object type values
-*/
-
-#define PERSISTENT
-
-#define MOD_NAME_PREFIX "LO"
-#define DEFAULT_MAX_BUCKET_SIZE 60
-#define DEFAULT_MAX_BTREE_SIZE 500
-#define INITMODULE init_LOBTree
-
-#define ZODB_64BIT_INTS
-
-#include "intkeymacros.h"
-#include "objectvaluemacros.h"
-#include "BTreeModuleTemplate.c"

src/BTrees/objectvaluemacros.h

-
-#define VALUEMACROS_H "$Id$\n"
-
-#define VALUE_TYPE PyObject *
-#define VALUE_TYPE_IS_PYOBJECT
-#define TEST_VALUE(VALUE, TARGET) PyObject_Compare((VALUE),(TARGET))
-#define DECLARE_VALUE(NAME) VALUE_TYPE NAME
-#define INCREF_VALUE(k) Py_INCREF(k)
-#define DECREF_VALUE(k) Py_DECREF(k)
-#define COPY_VALUE(k,e) k=(e)
-#define COPY_VALUE_TO_OBJECT(O, K) O=(K); Py_INCREF(O)
-#define COPY_VALUE_FROM_ARG(TARGET, ARG, S) TARGET=(ARG)
-#define NORMALIZE_VALUE(V, MIN) Py_INCREF(V)

src/BTrees/tests/__init__.py

-# If tests is a package, debugging is a bit easier.