a lot of fixings and test cases

Author: hanke0

MANIFEST.in

@@ -1,4 +1,5 @@
 include *.h
 include *.c
 include LICENSE
-include README.rst
+include README.rst
+include ctool.pyi

Makefile

@@ -22,7 +22,7 @@ PYTHON_VERSION=$(shell which python | sed "s/\/bin\/python/\/include/" | xargs l
 
 .PHONE:
 compile:
-	gcc -DNDEBUG -g -fwrapv -O3 -Wall -Wextra -std=c99 -arch x86_64 \
+	gcc -DNDEBUG -g -fwrapv -O3 -Wall -Wextra -std=c99 \
 	-I$(PYTHON_HOME)/include \
 	-I$(PYTHON_HOME)/include/$(PYTHON_VERSION) \
 	-c ctoolsmodule.c -o build/ctools.o

ctools.h

@@ -15,7 +15,7 @@ PyDoc_STRVAR(jump_consistent_hash__doc__,
     :rtype: int\n");
 
 static PyObject*
-Ctools__jump_hash(PyObject* self, PyObject* args)
+Ctools__jump_hash(PyObject *Py_UNUSED(ignored), PyObject* args)
 {
     uint64_t key;
     int32_t num_buckets;
@@ -42,7 +42,7 @@ PyDoc_STRVAR(strhash__doc__,
     :rtype: int\n");
 
 static PyObject*
-Ctools__strhash(PyObject* self, PyObject* args)
+Ctools__strhash(PyObject *Py_UNUSED(ignored), PyObject* args)
 {
     const char* s;
     if (!PyArg_ParseTuple(args, "s", &s))
@@ -70,7 +70,7 @@ PyDoc_STRVAR(int8_to_datetime__doc__,
     :rtype: datetime.datetime\n");
 
 static PyObject*
-Ctools__int8_to_datetime(PyObject* self, PyObject* date_integer)
+Ctools__int8_to_datetime(PyObject *Py_UNUSED(ignored), PyObject* date_integer)
 {
     register long date = PyLong_AsLong(date_integer);
     if (date > 99990101 || date < 101) {

ctools.pyi

@@ -1,75 +1,79 @@
 from datetime import datetime
-from typing import Any, Mapping, Iterable, Tuple
+from typing import Any, Mapping, Iterable, Tuple, Callable, Optional
 
 def jump_consistent_hash(key: int, num_bucket: int) -> int: pass
 
 def strhash(s: str) -> int: ...
 
 def int8_to_datetime(date_integer: int) -> datetime: ...
 
+dict.setdefault()
 
 class LFUCache:
 
     def __init__(self, capacity: int) -> None: ...
 
-    def get(self, key, default=None) -> Any: ...
-
-    def pop(self, key, default=None) -> Any: ...
-
-    def setdefault(self, key, default=None) -> Any: ...
-
-    def update(self, map: Mapping, **kwargs) -> None: ...
-
-    def keys(self) -> Iterable: ...
-
-    def values(self) -> Iterable: ...
+    def get(self, key, default=None):
+        """ Return the value for key if key is in the cache, else default. """
+        pass
 
-    def items(self) -> Iterable[Tuple]: ...
+    def pop(self, key, default=None): # real signature unknown; restored from __doc__
+        """
+        Cache.pop(k[,default]) -> v, remove specified key and return the corresponding value.
+        If key is not found, default is returned
+        """
+        pass
 
-    def clear(self): ...
+    def setdefault(self, *args, **kwargs): # real signature unknown
+        """
+        Insert key with a value of default if key is not in the dictionary.
 
-    def __contains__(self, *args, **kwargs): # real signature unknown
-        """ True if the dictionary has the specified key, else False. """
+        Return the value for key if key is in the dictionary, else default.
+        """
         pass
 
-    def __delitem__(self, *args, **kwargs): # real signature unknown
-        """ Delete self[key]. """
+    def update(self, mp: Optional[Mapping] = None, **kwargs): # known special case of dict.update
+        """
+        Cache.update([mp, ]**kwargs) -> None.  Update Cache from dict/iterable mp and kwargs.
+        If mp is present then does:  for k in mp: Cache[k] = mp[k]
+        In either case, this is followed by: for k in kwargs:  Cache[k] = kwargs[k]
+        """
         pass
 
-    def __eq__(self, *args, **kwargs): # real signature unknown
-        """ Return self==value. """
+    def keys(self) -> Iterable:
+        """Return key list."""
         pass
 
-    def __getattribute__(self, *args, **kwargs): # real signature unknown
-        """ Return getattr(self, name). """
+    def values(self) -> Iterable:
+        """Return value list."""
         pass
 
-    def __getitem__(self, y): # real signature unknown; restored from __doc__
-        """ x.__getitem__(y) <==> x[y] """
+    def items(self) -> Iterable[Tuple]:
+        """Return (k, v) pairs list."""
         pass
 
-    def __ge__(self, *args, **kwargs): # real signature unknown
-        """ Return self>=value. """
+    def clear(self):
+        """ Cache.clear() -> None.  Remove all items from Cache. """
         pass
 
-    def __gt__(self, *args, **kwargs): # real signature unknown
-        """ Return self>value. """
+    def __contains__(self, key): # real signature unknown
+        """ True if the dictionary has the specified key, else False. """
         pass
 
-    def __iter__(self, *args, **kwargs): # real signature unknown
-        """ Implement iter(self). """
+    def __delitem__(self, key): # real signature unknown
+        """ Delete self[key]. """
         pass
 
-    def __len__(self, *args, **kwargs): # real signature unknown
-        """ Return len(self). """
+    def __setitem__(self, key, value): # real signature unknown
+        """ self[key] = value. """
         pass
 
-    def __le__(self, *args, **kwargs): # real signature unknown
-        """ Return self<=value. """
+    def __getitem__(self, key): # real signature unknown; restored from __doc__
+        """ Return self[key] """
         pass
 
-    def __lt__(self, *args, **kwargs): # real signature unknown
-        """ Return self<value. """
+    def __len__(self, *args, **kwargs): # real signature unknown
+        """ Return len(self). """
         pass
 
     def evict(self) -> None: ...
@@ -80,4 +84,10 @@ class LFUCache:
 
     def lfu(self) -> Any: ...
 
-    def lfu_of(self, key: Any) -> int: ...
+    def setnx(self, key, callback: Callable[[], Any]):
+        """
+        Insert key with a value of callback() if key is not in the dictionary.
+
+        Return the value for key if key is in the dictionary, else callback().
+        """
+        pass

ctoolsmodule.c

@@ -27,21 +27,19 @@ PyMODINIT_FUNC
 PyInit_ctools(void)
 {
     PyDateTime_IMPORT;
-
-    PyObject* m = PyModule_Create(&ctools_module);
-    if (m == NULL)
+    if (PyType_Ready(&LFUCacheType) < 0)
         return NULL;
 
-    LFUValueType.tp_new = PyType_GenericNew;
-    if (PyType_Ready(&LFUValueType) < 0)
+    if (PyType_Ready(&LFUWrapperType) < 0)
         return NULL;
 
-    LFUCacheType.tp_new = PyType_GenericNew;
-    if (PyType_Ready(&LFUCacheType) < 0)
+    PyObject* m = PyModule_Create(&ctools_module);
+    if (m == NULL)
         return NULL;
 
-    Py_INCREF(&LFUValueType);
+    Py_INCREF(&LFUWrapperType);
     Py_INCREF(&LFUCacheType);
     PyModule_AddObject(m, "LFUCache", (PyObject*)&LFUCacheType);
+    PyModule_AddObject(m, "LFUWrapper", (PyObject*)&LFUWrapperType);
     return m;
 }