Tune cache (#73)

* +--------------------+-----------+-----------+-----------+---------+
  | Case               | A ns/call | B ns/call | Delta ns  | Speedup |
  +--------------------+-----------+-----------+-----------+---------+
  | ext_compile_cached | 264.1     | 172.9     | -91.2     | 1.53x   |
  | ext_match_module   | 454.0     | 351.3     | -102.7    | 1.29x   |
  +--------------------+-----------+-----------+-----------+---------+

* 0.2.12 version update

Author: Qubitium

pcre/cache.py

@@ -48,13 +48,6 @@ def __init__(self) -> None:
 _THREAD_LOCAL = _ThreadCacheState()
 _GLOBAL_STATE = _GlobalCacheState()
 _CACHE_STRATEGY = _CacheStrategy.THREAD_LOCAL
-_CACHE_STRATEGY_LOCKED = False
-
-
-def _lock_cache_strategy() -> None:
-    global _CACHE_STRATEGY_LOCKED
-    if not _CACHE_STRATEGY_LOCKED:
-        _CACHE_STRATEGY_LOCKED = True
 
 
 def _normalize_strategy(value: str) -> _CacheStrategy:
@@ -178,8 +171,6 @@ def cached_compile(
 ) -> T:
     """Compile *pattern* with *flags*, caching wrapper results when hashable."""
 
-    _lock_cache_strategy()
-
     if _CACHE_STRATEGY is _CacheStrategy.THREAD_LOCAL:
         return _cached_compile_thread_local(pattern, flags, wrapper, jit=jit)
     return _cached_compile_global(pattern, flags, wrapper, jit=jit)

pcre/pcre.py

@@ -473,6 +473,31 @@ def parallel_map(
 
 
 def compile(pattern: Any, flags: FlagInput = 0) -> Pattern:
+    # Fast path for the dominant shape: compile(pattern) with default flags.
+    if flags == 0:
+        if isinstance(pattern, Pattern):
+            return pattern
+
+        if isinstance(pattern, _CPattern):
+            wrapper = Pattern(pattern)
+            if get_thread_default():
+                wrapper.enable_auto_threads()
+            else:
+                wrapper.disable_threads()
+            return wrapper
+
+        adjusted_pattern = _apply_regex_compat(pattern, bool(_DEFAULT_COMPAT_REGEX))
+        if isinstance(adjusted_pattern, str):
+            native_flags = _pcre2.PCRE2_UTF | _pcre2.PCRE2_UCP
+        else:
+            native_flags = 0
+        compiled = cached_compile(adjusted_pattern, native_flags, Pattern, jit=_DEFAULT_JIT)
+        if get_thread_default():
+            compiled.enable_auto_threads()
+        else:
+            compiled.disable_threads()
+        return compiled
+
     resolved_flags = _normalise_flags(flags)
     threads_requested = bool(resolved_flags & THREADS)
     no_threads_requested = bool(resolved_flags & NO_THREADS)

pcre_ext/pattern_cache.c

@@ -211,27 +211,6 @@ pattern_cache_teardown(void)
     atomic_store_explicit(&pattern_cache_global_mode, 0, memory_order_release);
 }
 
-static void
-pattern_cache_touch(PatternCacheState *state, PyObject *cache_key)
-{
-    if (state->order == NULL) {
-        return;
-    }
-    Py_ssize_t idx = PySequence_Index(state->order, cache_key);
-    if (idx >= 0) {
-        if (PySequence_DelItem(state->order, idx) < 0) {
-            PyErr_Clear();
-            return;
-        }
-    } else if (PyErr_Occurred()) {
-        PyErr_Clear();
-        return;
-    }
-    if (PyList_Append(state->order, cache_key) < 0) {
-        PyErr_Clear();
-    }
-}
-
 int
 pattern_cache_lookup(PyObject *cache_key, PatternObject **out_pattern)
 {
@@ -256,7 +235,6 @@ pattern_cache_lookup(PyObject *cache_key, PatternObject **out_pattern)
     if (cached != NULL) {
         Py_INCREF(cached);
         *out_pattern = (PatternObject *)cached;
-        pattern_cache_touch(state, cache_key);
     } else if (PyErr_Occurred()) {
         pattern_cache_release_state(lock_held);
         return -1;

pcre_ext/pcre2.c

@@ -1806,11 +1806,6 @@ Pattern_compile_cached(PyObject *pattern_obj, uint32_t flags, int jit, int jit_e
         return NULL;
     }
 
-    if (PyObject_Hash(cache_key) == -1) {
-        PyErr_Clear();
-        use_cache = 0;
-    }
-
     if (use_cache) {
         PatternObject *cached = NULL;
         if (pattern_cache_lookup(cache_key, &cached) == 0) {

pyproject.toml

@@ -9,7 +9,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "PyPcre"
-version = "0.2.11"
+version = "0.2.12"
 description = "Modern, GIL-friendly, Fast Python bindings for PCRE2 with auto caching and JIT of compiled patterns."
 readme = "README.md"
 requires-python = ">=3.9"

tests/__init__.py

@@ -0,0 +1 @@
+"""Project test package marker to avoid third-party `tests` package shadowing."""