[Zodb-checkins] CVS: Zope/lib/python/BTrees - BTreeTemplate.c:1.67

[Tim Peters]

Update of /cvs-repository/Zope/lib/python/BTrees
In directory cvs.zope.org:/tmp/cvs-serv25549

Modified Files:
	BTreeTemplate.c 
Log Message:
_BTree_get():  For a little speed boost in a frequent operation, removed
the recursion (iteration is quite natural here -- it was tail-recursive).


=== Zope/lib/python/BTrees/BTreeTemplate.c 1.66 => 1.67 ===
 _BTree_get(BTree *self, PyObject *keyarg, int has_key)
 {
-  KEY_TYPE key;
-  int min;              /* index of child to search */
-  PyObject *r = NULL;   /* result object */
-  int copied = 1;
+    KEY_TYPE key;
+    PyObject *result = NULL;    /* guilty until proved innocent */
+    int copied = 1;
 
-  COPY_KEY_FROM_ARG(key, keyarg, copied);
-  UNLESS (copied) return NULL;
+    COPY_KEY_FROM_ARG(key, keyarg, copied);
+    UNLESS (copied) return NULL;
 
-  PER_USE_OR_RETURN(self, NULL);
-
-  BTREE_SEARCH(min, self, key, goto Error);
-  if (self->len)
-    {
-      if (SameType_Check(self, self->data[min].child))
-        r = _BTree_get(BTREE(self->data[min].child), keyarg,
-                        has_key ? has_key + 1: 0);
-      else
-        r = _bucket_get(BUCKET(self->data[min].child), keyarg,
-                        has_key ? has_key + 1: 0);
+    PER_USE_OR_RETURN(self, NULL);
+    if (self->len == 0) {
+        /* empty BTree */
+        if (has_key)
+            result = PyInt_FromLong(0);
+        else
+            PyErr_SetObject(PyExc_KeyError, keyarg);
     }
-  else
-    {  /* No data */
-      if (has_key)
-        r = PyInt_FromLong(0);
-      else
-        PyErr_SetObject(PyExc_KeyError, keyarg);
+    else {
+        for (;;) {
+            int i;
+            Sized *child;
+
+            BTREE_SEARCH(i, self, key, goto Done);
+            child = self->data[i].child;
+            has_key += has_key != 0;    /* bump depth counter, maybe */
+            if (SameType_Check(self, child)) {
+                PER_UNUSE(self);
+                self = BTREE(child);
+                PER_USE_OR_RETURN(self, NULL);
+            }
+            else {
+                result = _bucket_get(BUCKET(child), keyarg, has_key);
+                break;
+            }
+        }
     }
 
-Error:
-  PER_ALLOW_DEACTIVATION(self);
-  PER_ACCESSED(self);
-  return r;
+Done:
+    PER_UNUSE(self);
+    return result;
 }
 
 static PyObject *