Changeset 3161

Timestamp:

12/15/07 16:50:52 (5 years ago)

Author:

tasuku

Message:

added iterkeys/itervalues/iteritems on pytc.BDB

Location:

lang/python/pytc/trunk

Files:

• pytc.c (modified) (4 diffs)
• tests/testBDB.py (modified) (1 diff)

lang/python/pytc/trunk/pytc.c

@@ -934 +934 @@
   0,                                           /* tp_richcompare */
   0,                                           /* tp_weaklistoffset */
-  PyTCHDB_GetIter_keys,                        /* tp_iter */
+  (getiterfunc)PyTCHDB_GetIter_keys,           /* tp_iter */
   (iternextfunc)PyTCHDB_iternext,              /* tp_iternext */
   PyTCHDB_methods,                             /* tp_methods */
@@ -1041 +1041 @@
 static PyObject *
 PyBDBCUR_iternext(PyBDBCUR *self) {
-  char *key;
-  int key_len;
-  PyObject *ret;
-
+  /* TODO: performance up */
+  GET_TCXSTR_KEY_VALUE(tcbdbcurrec,self->cur)
+  if (result) {
+    switch (self->itype) {
+      case iter_key:
+        ret = PyString_FromStringAndSize(tcxstrptr(key), tcxstrsize(key));
+        break;
+      case iter_value:
+        ret = PyString_FromStringAndSize(tcxstrptr(value), tcxstrsize(value));
+        break;
+      case iter_item:
+        ret = Py_BuildValue("(s#s#)", tcxstrptr(key), tcxstrsize(key),
+                                      tcxstrptr(value), tcxstrsize(value));
+        break;
+    }
+  }
   Py_BEGIN_ALLOW_THREADS
-  key = tcbdbcurkey(self->cur, &key_len);
+  result = tcbdbcurnext(self->cur);
   Py_END_ALLOW_THREADS
-
-  if (key) {
-    ret = PyString_FromStringAndSize(key, key_len);
-    free(key);
-    Py_BEGIN_ALLOW_THREADS
-    tcbdbcurnext(self->cur);
-    Py_END_ALLOW_THREADS
-    return ret;
-  }
-  return NULL;
+  CLEAR_TCXSTR_KEY_VALUE()
 }
 
@@ -1741 +1744 @@
    METH_NOARGS,
    ""},
+  {"iteritems", (PyCFunction)PyTCBDB_GetIter_items,
+   METH_NOARGS,
+   ""},
+  {"iterkeys", (PyCFunction)PyTCBDB_GetIter_keys,
+   METH_NOARGS,
+   ""},
+  {"itervalues", (PyCFunction)PyTCBDB_GetIter_values,
+   METH_NOARGS,
+   ""},
   /*
   {"", (PyCFunction)PyTCBDB_,
@@ -1798 +1810 @@
   0,                                           /* tp_richcompare */
   0,                                           /* tp_weaklistoffset */
-  PyTCBDB_GetIter_keys,                        /* tp_iter */
+  (getiterfunc)PyTCBDB_GetIter_keys,           /* tp_iter */
   0,                                           /* tp_iternext */
   PyTCBDB_methods,                             /* tp_methods */

lang/python/pytc/trunk/tests/testBDB.py

@@ -100 +100 @@
       ('moru', 'pui'), ('moruta', 'puipui')])
 
+    result = []
+    for key in db.iterkeys():
+      result.append(key)
+    self.assertEqual(sorted(result), ['hamu', 'kiki', 'kiki', 'moru', 'moruta'])
+
+    result = []
+    for value in db.itervalues():
+      result.append(value)
+    self.assertEqual(sorted(result),
+      ['ju', 'nya-nya-nya-', 'pui', 'puipui', 'unya-n'])
+
+    result = []
+    for (key, value) in db.iteritems():
+      result.append((key, value))
+    self.assertEqual(sorted(result),[
+      ('hamu', 'ju'), ('kiki', 'nya-nya-nya-'), ('kiki', 'unya-n'),
+      ('moru', 'pui'), ('moruta', 'puipui')])
+
     # this bug is reported by id:a2c
     self.assertRaises(TypeError, eval, 'db[:]', globals(), locals())