Stripped to just ZEO

3.11.txt

-Wish list for 3.11.
-
-These aren't promises, but things I'd like to do:
-
-- ZEO support for loading blobs via HTTP.
-
-- ZEO cache fix for loadBefore.
-
-- invalidation events.
-
-- Make DBs context manager, so in a simple script, one could do:
-
-  with ZEO.DB(someaddr) as connection:
-      do some things in a transaction. Commit and close at the end.
-
-- Persistent sets.
-
-- PxBTrees, persistent objects as keys in BTrees.
-
-  - Compare on persistent references.
-
-- Python BTrees and persistence.
-
-- JSONic read-only mode where you can read most objects for which you
-  don't have classes as long at they have the default getstate.
-  This might be as simple as using a variation of broken objects.
-
-- persistent.Object, which handles the common case of a simple object
-  that just has some data. (The moral equivalent of a JS object. :)
-
-- API to preload objects.
-
-  Say you know you're going to oterate over an array of objects, you
-  might signal that intend to use the object with something like::
-
-    for oject in objects:
-        object._p_will_use()
-
-  (I think there's an RFC for something like this.)
-
-  For most storages, _p_will_use won't have any effect, but for ZEO,
-  it could cause a load request to be sent to the server if the object
-  isn't already loaded or in the zeo cache. This way, you could have
-  lots of loads in flight at once, mitigating round-trip costs.
-
-- ZEO cache iterator, to facilitate analysis of cache contents.
-
-- Update file-storage iterator to expose file position as non-private
-  var for transactions and database records.
-
-  Expose trans size.
-
-- Update ZEO ClientStorage to block for soem short time rather than
-  error on short disconnection.
-
-- Remove silly ZEO connection backooff by default.
-
-- Rewrite ZEO connection logic using async IO rather than threads.
-

buildout.cfg

@@ -11,8 +11,7 @@ zc.recipe.testrunner = 1.3.0
 [test]
 recipe = zc.recipe.testrunner
 eggs =
-    persistent
-    ZODB3 [test]
+    ZEO [test]
 initialization =
   import os, tempfile
   try: os.mkdir('tmp')
@@ -23,6 +22,5 @@ defaults = ['--all']
 [scripts]
 recipe = zc.recipe.egg
 eggs =
-    persistent
-    ZODB3 [test]
+    ZEO [test]
 interpreter = py

setup.py

@@ -11,16 +11,8 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
-"""Zope Object Database: object database and persistence
 
-The Zope Object Database provides an object-oriented database for
-Python that provides a high-degree of transparency. Applications can
-take advantage of object database features with few, if any, changes
-to application logic.  ZODB includes features such as a plugable storage
-interface, rich transaction support, and undo.
-"""
-
-VERSION = "3.11dev"
+VERSION = "4.0.0dev"
 
 from ez_setup import use_setuptools
 use_setuptools()
@@ -30,23 +22,9 @@ from setuptools.extension import Extension
 import os
 import sys
 
-if sys.version_info < (2, 5):
-    print "This version of ZODB requires Python 2.5 or higher"
-    sys.exit(0)
-
-
-
 if sys.version_info < (2, 6):
-    transaction_version = 'transaction == 1.1.1'
-    manuel_version = 'manuel < 1.6dev'
-else:
-    transaction_version = 'transaction >= 1.1.0'
-    manuel_version = 'manuel'
-
-# The (non-obvious!) choices for the Trove Development Status line:
-# Development Status :: 5 - Production/Stable
-# Development Status :: 4 - Beta
-# Development Status :: 3 - Alpha
+    print "This version of ZEO requires Python 2.6 or higher"
+    sys.exit(0)
 
 classifiers = """\
 Intended Audience :: Developers
@@ -59,73 +37,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
-    dirname, basename = os.path.split(path)
-    return _modname(dirname, base, basename + '.' + name)
-
 def alltests():
     import logging
     import pkg_resources
@@ -142,7 +53,7 @@ def alltests():
 
     suite = unittest.TestSuite()
     base = pkg_resources.working_set.find(
-        pkg_resources.Requirement.parse('ZODB3')).location
+        pkg_resources.Requirement.parse('ZEO')).location
     for dirpath, dirnames, filenames in os.walk(base):
         if os.path.basename(dirpath) == 'tests':
             for filename in filenames:
@@ -152,49 +63,27 @@ def alltests():
                         _modname(dirpath, base, os.path.splitext(filename)[0]),
                         {}, {}, ['*'])
                     suite.addTest(mod.test_suite())
-        elif 'tests.py' in filenames:
-            continue
-            mod = __import__(_modname(dirpath, base, 'tests'), {}, {}, ['*'])
-            suite.addTest(mod.test_suite())
     return suite
 
-doclines = __doc__.split("\n")
-
-def read_file(*path):
-    base_dir = os.path.dirname(__file__)
-    file_path = (base_dir, ) + tuple(path)
-    return file(os.path.join(*file_path)).read()
-
-long_description = str(
-    ("\n".join(doclines[2:]) + "\n\n" +
-     ".. contents::\n\n" +
-     read_file("README.txt")  + "\n\n" +
-     read_file("src", "CHANGES.txt")
-    ).decode('latin-1').replace(u'L\xf6wis', '|Lowis|')
-    )+ '''\n\n.. |Lowis| unicode:: L \\xf6 wis\n'''
+tests_require = ['zope.testing', 'manuel']
 
-setup(name="ZODB3",
+setup(name="ZEO",
       version=VERSION,
-      setup_requires=['persistent'],
       maintainer="Zope Foundation and Contributors",
       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],
+      # description = doclines[0],
       classifiers = filter(None, classifiers.split("\n")),
-      long_description = long_description,
+      # long_description = long_description,
       test_suite="__main__.alltests", # to support "setup.py test"
-      tests_require = ['zope.testing', manuel_version],
-      extras_require = dict(test=['zope.testing', manuel_version]),
-      # XXX: We don't really want to install these headers;  we would
-      #      prefer just including them so that folks can build from an sdist.
-      headers = ['include/persistent/cPersistence.h',
-                 'include/persistent/ring.h'],
+      tests_require = tests_require,
+      extras_require = dict(test=tests_require),
       install_requires = [
-        transaction_version,
+          'ZODB',
+          'transaction',
           'persistent',
           'zc.lockfile',
           'ZConfig',
@@ -204,11 +93,6 @@ setup(name="ZODB3",
       zip_safe = False,
       entry_points = """
       [console_scripts]
-      fsdump = ZODB.FileStorage.fsdump:main
-      fsoids = ZODB.scripts.fsoids:main
-      fsrefs = ZODB.scripts.fsrefs:main
-      fstail = ZODB.scripts.fstail:Main
-      repozo = ZODB.scripts.repozo:main
       zeopack = ZEO.scripts.zeopack:main
       runzeo = ZEO.runzeo:main
       zeopasswd = ZEO.zeopasswd:main

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/floatvaluemacros.h

-
-#define VALUEMACROS_H "$Id$\n"
-
-#define VALUE_TYPE float
-#undef VALUE_TYPE_IS_PYOBJECT
-#define TEST_VALUE(K, T) (((K) < (T)) ? -1 : (((K) > (T)) ? 1: 0))
-#define VALUE_SAME(VALUE, TARGET) ( (VALUE) == (TARGET) )
-#define DECLARE_VALUE(NAME) VALUE_TYPE NAME
-#define VALUE_PARSE "f"
-#define DECREF_VALUE(k)
-#define INCREF_VALUE(k)
-#define COPY_VALUE(V, E) (V=(E))
-#define COPY_VALUE_TO_OBJECT(O, K) O=PyFloat_FromDouble(K)
-#define COPY_VALUE_FROM_ARG(TARGET, ARG, STATUS) \
-  if (PyFloat_Check(ARG)) TARGET = (float)PyFloat_AsDouble(ARG); \
-  else if (PyInt_Check(ARG)) TARGET = (float)PyInt_AsLong(ARG); \
-  else { \
-      PyErr_SetString(PyExc_TypeError, "expected float or int value"); \
-      (STATUS)=0; (TARGET)=0; }
-
-#define NORMALIZE_VALUE(V, MIN) ((MIN) > 0) ? ((V)/=(MIN)) : 0
-
-#define MERGE_DEFAULT 1.0f
-#define MERGE(O1, w1, O2, w2) ((O1)*(w1)+(O2)*(w2))
-#define MERGE_WEIGHT(O, w) ((O)*(w))

src/BTrees/tests/__init__.py

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

src/ZODB/scripts/__init__.py

-#