chtypes 2.0.0.dev5__py3-none-any.whl → 2.0.0.dev6__py3-none-any.whl

chtypes/_ocifetch/_channel.py

@@ -79,6 +79,7 @@ __all__ = [
     "visible",
     "use_dev_channel_for_tests",
     "use_fetch_v1_for_tests",
+    "use_prod_v2_for_tests",
 ]
 
 # The dev channel's registry and key (spec/abi-v2/docs.md, rule r6).
@@ -165,6 +166,25 @@ FETCH_V1_CHANNEL: Final = Channel(
     pinnable=True,
 )
 
+# The production generation-2 channel a 2.0.0 SDK speaks after the lock: the v1
+# contract with v2 values, from the generated constants (docs/guides/fetch-v1.md,
+# "Generation 2 after the lock"). It trusts the release key, honors every
+# override and pin, and has no alias step. NOT the default: only
+# use_prod_v2_for_tests selects it, until the lock change makes it active()'s
+# fallback.
+PROD_V2_CHANNEL: Final = Channel(
+    name=C.PROD_V2_NAME,
+    abi=C.PROD_V2_ABI_GENERATION,
+    record_schema=C.PROD_V2_RECORD_SCHEMA,
+    root_leaf=C.PROD_V2_CACHE_DIR,
+    subroot=C.PROD_V2_CACHE_DIR,
+    system_dirs=C.PROD_V2_SYSTEM_DIRS,
+    bases=C.PROD_V2_BASES,
+    keys=C.RELEASE_KEYS,
+    overridable=True,
+    pinnable=True,
+)
+
 _lock = threading.Lock()
 _current: Channel | None = None
 
@@ -224,6 +244,14 @@ def use_fetch_v1_for_tests() -> Callable[[], None]:
     return _use(FETCH_V1_CHANNEL)
 
 
+def use_prod_v2_for_tests() -> Callable[[], None]:
+    """Make this TEST run speak the production generation-2 channel
+    (`PROD_V2_CHANNEL`): the v1 contract with abi 2, schema-2 records and the
+    `v2` subroot. Returns the restore function; raises outside a test run."""
+    _test_only("use_prod_v2_for_tests")
+    return _use(PROD_V2_CHANNEL)
+
+
 def allow_overrides_for_tests() -> Callable[[], None]:
     """Make this TEST run's dev channel honor the base, trust and unsigned
     overrides, so a test can reach a fixture registry signed with the test key;

chtypes/_ocifetch/_constants.py

@@ -1,6 +1,6 @@
 # Code generated by scripts/fetch-v1/gen-constants.py from
 # spec/fetch-v1/constants.json. DO NOT EDIT.
-# Source sha256: 4554956faeb154fc324a6120b7b35976222c6bc8ecbce7fd0147502e3073611d
+# Source sha256: 82afa8d6cba96c10b5945c6f7c1c8360a504cc8ac6231e74017cc6c20b908df6
 """The v1 fetch constants, generated: see docs/guides/fetch-v1.md."""
 
 from __future__ import annotations
@@ -101,6 +101,12 @@ RETIRED_MESSAGE_MAX_CODE_POINTS: Final[int] = 256
 
 CACHE_ROOT_TEMPLATE: Final[str] = "${XDG_CACHE_HOME:-$HOME/.cache}/chtypes/v1"
 SYSTEM_CACHE_DIRS: Final[tuple[str, ...]] = ("/usr/local/share/chtypes/v1", "/opt/chtypes/v1")
+PROD_V2_NAME: Final[str] = "v2"
+PROD_V2_ABI_GENERATION: Final[int] = 2
+PROD_V2_RECORD_SCHEMA: Final[int] = 2
+PROD_V2_CACHE_DIR: Final[str] = "v2"
+PROD_V2_BASES: Final[tuple[str, ...]] = ("https://registry.wavehouse.dev/chtypes/v2",)
+PROD_V2_SYSTEM_DIRS: Final[tuple[str, ...]] = ("/usr/local/share/chtypes/v2", "/opt/chtypes/v2")
 CACHE_UNPACKED_DIR: Final[str] = "unpacked/sha256"
 CACHE_VERIFIED_RECORD: Final[str] = "verified.json"
 CACHE_ANNOTATION_PREFIX: Final[str] = "dev.wavehouse.chtypes."

chtypes/registry.py

@@ -15,13 +15,19 @@ The sequence of `for_version(request)`:
 Construction opens nothing. The binding orders and matches no versions itself:
 which installed build a floating request means, and the spelling rules, are the
 fetch layer's.
+
+Opens of different requests never wait for each other's fetch (public issue
+#491): the registry's lock guards its memo and the attempts in progress, and is
+never held across steps 2 to 5. Concurrent opens of one request share one
+attempt, and so one fetch, and each gets that attempt's `Library` or its error;
+a failed attempt is never remembered, so the next open starts a new one.
 """
 
 from __future__ import annotations
 
 import os
 import threading
-from collections.abc import Sequence
+from collections.abc import Callable, Sequence
 from dataclasses import dataclass
 from pathlib import Path
 
@@ -168,6 +174,19 @@ def _wrap(exc: FetchError) -> errors.ArtifactError:
     return wrapped
 
 
+class _Flight:
+    """One attempt to open one request: the installed lookup, the fetch when
+    there is one, and the load. Every open of that request made while it is in
+    progress waits on it and gets its answer."""
+
+    __slots__ = ("done", "error", "library")
+
+    def __init__(self) -> None:
+        self.done = threading.Event()
+        self.library: Library | None = None
+        self.error: BaseException | None = None
+
+
 class Registry:
     """Opens versions. Safe across threads. `autofetch` defaults to
     `CHTYPES_AUTOFETCH`, and is off when that is unset.
@@ -175,6 +194,9 @@ class Registry:
     Construction opens nothing: only `for_version` and `preload` open an
     artifact. `preload` opens each listed request through the loader at
     construction, in list order, and never fetches, even with autofetch on.
+
+    An open never waits for another request's fetch, and concurrent opens of
+    one request share one fetch (public issue #491).
     """
 
     def __init__(
@@ -189,8 +211,14 @@ class Registry:
             env = os.environ.get(_fetch_constants.ENV_AUTOFETCH_NAME, "")
             autofetch = env.strip().lower() in _TRUTHY
         self._autofetch = autofetch
-        self._lock = threading.RLock()
+        # Guards the memo and the attempts in progress, never a lookup, a fetch
+        # or a load.
+        self._lock = threading.Lock()
         self._memo: dict[str, Library] = {}
+        self._flights: dict[str, _Flight] = {}
+        # A test hook, None outside tests: called each time an open starts
+        # waiting on an attempt, its own or another open's.
+        self._on_wait: Callable[[str], None] | None = None
         if isinstance(preload, str):
             raise TypeError("preload must be a sequence of requests, not a single string")
         for request in preload:
@@ -221,30 +249,63 @@ class Registry:
             return tuple(seen)
 
     def _open(self, request: str, *, allow_fetch: bool) -> Library:
+        with self._lock:
+            hit = self._memo.get(request)
+        if hit is not None:
+            return hit
+        # A refused version spelling is the caller's own misuse, refused before
+        # anything is attempted, and unlocks nothing.
+        try:
+            fetch_request = Request(request)
+        except ValueError as exc:
+            raise errors.misuse(str(exc)) from None
+        # So is a pinning request on the dev channel (rule r6).
+        _refuse_pinning(self._fetch._to_options())
         with self._lock:
             hit = self._memo.get(request)
             if hit is not None:
                 return hit
-            # A refused version spelling is the caller's own misuse, refused
-            # before anything is attempted, and unlocks nothing. An open that
-            # attempted a load and failed unlocks the setup record while no
-            # image has completed load step 7, whatever failed: the resolve,
-            # the fetch, the signature or any load step (bindings-v1.md
-            # section 6, rule 4).
-            try:
-                fetch_request = Request(request)
-            except ValueError as exc:
-                raise errors.misuse(str(exc)) from None
-            # So is a pinning request on the dev channel (rule r6).
-            _refuse_pinning(self._fetch._to_options())
-            began = _setup.generation()
-            try:
-                library = self._resolve_and_open(request, fetch_request, allow_fetch)
-            except Exception:
-                _setup.open_failed(began)
-                raise
-            self._memo[request] = library
-            return library
+            flight = self._flights.get(request)
+            lead = flight is None
+            if flight is None:
+                flight = self._flights[request] = _Flight()
+        on_wait = self._on_wait
+        if on_wait is not None:
+            on_wait(request)
+        if lead:
+            self._attempt(flight, request, fetch_request, allow_fetch)
+        else:
+            flight.done.wait()
+        if flight.error is not None:
+            raise flight.error
+        assert flight.library is not None
+        return flight.library
+
+    def _attempt(
+        self, flight: _Flight, request: str, fetch_request: Request, allow_fetch: bool
+    ) -> None:
+        """Run an attempt on the leading open's thread, with no lock held, then
+        release every open waiting on it. An attempt that tried a load and
+        failed unlocks the setup record while no image has completed load step
+        7, whatever failed: the resolve, the fetch, the signature or any load
+        step (bindings-v1.md section 6, rule 4). It is never remembered."""
+        began = _setup.generation()
+        library: Library | None = None
+        error: BaseException | None = None
+        try:
+            library = self._resolve_and_open(request, fetch_request, allow_fetch)
+        except Exception as exc:
+            _setup.open_failed(began)
+            error = exc
+        except BaseException as exc:
+            error = exc
+        with self._lock:
+            del self._flights[request]
+            if error is None:
+                assert library is not None
+                self._memo[request] = library
+            flight.library, flight.error = library, error
+        flight.done.set()
 
     def _resolve_and_open(self, request: str, fetch_request: Request, allow_fetch: bool) -> Library:
         try:

{chtypes-2.0.0.dev5.dist-info → chtypes-2.0.0.dev6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: chtypes
-Version: 2.0.0.dev5
+Version: 2.0.0.dev6
 Summary: Python binding for the chtypes artifacts: ClickHouse's own type system, per version, behind the frozen chs_* C ABI
 Project-URL: Homepage, https://github.com/wave-rf/chtypes
 Project-URL: Repository, https://github.com/wave-rf/chtypes

{chtypes-2.0.0.dev5.dist-info → chtypes-2.0.0.dev6.dist-info}/RECORD

@@ -8,7 +8,7 @@ chtypes/_setup.py,sha256=n84T0hFmXu_fdnXQIFhk3dMVL0_-yhfdRZsqCXTLzzg,6114
 chtypes/errors.py,sha256=7gDi9Ij8yptrr9E0LZyA2XkeaFFVyZoQMVQjQj6mn0s,9936
 chtypes/library.py,sha256=G6DJFiRuv8--JARxfiSNEqeFLkafaMs_n9nG-IwoC74,17878
 chtypes/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-chtypes/registry.py,sha256=Q3LR7wBs7Ggy_5xG_-0bZrTRgvRWJO5OJbD92ecUlt4,13786
+chtypes/registry.py,sha256=ApkHjOx4jBxeKJCZ7aTsPDJCWFnSd6rDRLfXam4ddQg,16275
 chtypes/results.py,sha256=gue7f4pqnpvXlSteYqhmqU1ZuAYCD7p4AgTiuYWpgYY,12591
 chtypes/_abi2/__init__.py,sha256=d3i7_iUDMFT1jg49vRQz1SMH6oseYZHUR0oPt6aSTiY,1042
 chtypes/_abi2/_decls.py,sha256=tGj_gOkMsw9fv8lWBXHUMn6dfYqpkta_nq1BhT6p4Dk,38454
@@ -17,8 +17,8 @@ chtypes/_abi2/_errors.py,sha256=wRE9M0oYtJz_9izQqpEBh5571M_1QzGWBoJ3pJTykWw,761
 chtypes/_abi2/_loader.py,sha256=VMWrbWMp9Uq3K-7a219lfqAmSmBlD2hcB6WDJgG8XG0,12514
 chtypes/_abi2/_vocab.py,sha256=6Ly15gQ1Vf3SP8hDSWCg1jnwVEURCBWSj9LZgv23xfA,17442
 chtypes/_ocifetch/__init__.py,sha256=enfPOKkqP4kqAKqckBGWXN1OQsiYo9ngDP-wzG0zn2I,1484
-chtypes/_ocifetch/_channel.py,sha256=8GqSNwuWaO3f4550N_DEsswqJu-0mWFAXbCB3ccFF9M,19108
-chtypes/_ocifetch/_constants.py,sha256=IZtAK3oxnCELZysvrzRozJkntxKSQllGjxod5No-Kco,5644
+chtypes/_ocifetch/_channel.py,sha256=YEt6qlhr-AMFhSHefFvS5GQJ30-Qh4PAbGN6xnHZwxU,20217
+chtypes/_ocifetch/_constants.py,sha256=Lt7hrSxFr5L2y87wsw33bbCekEwdq8wKn8N3i_r79o8,5974
 chtypes/_ocifetch/_dsse.py,sha256=0RaFJaG1jhXr1uPfuHxm7yAn6viNzYhfCRUf-sW5SvQ,9333
 chtypes/_ocifetch/_ensure.py,sha256=rI_xj0dccct7wMz0DwHoJTAB-yGVYFkLZ2Z0qRXuR30,63612
 chtypes/_ocifetch/_errors.py,sha256=TTYpwhvZ7MyD9Ssg5js8_YB8Fl30rYBPlENyAetqEbQ,7129
@@ -31,8 +31,8 @@ chtypes/_ocifetch/_oci.py,sha256=UdA8QGTh1O27DBYRf5UxsevjgI52IecQlEf9IO6Y0A4,139
 chtypes/_ocifetch/_referrers.py,sha256=J2b4gN6vryz_IzYHxrd2Tp-tQO9Cz766rZtKgCVcKqA,6008
 chtypes/_ocifetch/_retired.py,sha256=MQ6nbWLJw50IZYY1VfM6AiCZ4BySK0GVkGVOtAXaq3Y,3060
 chtypes/_ocifetch/_unpack.py,sha256=Cn4-up63KL63L8pnkS5zwJ6VbbHPSigpCnmOdcHJ4RI,5609
-chtypes-2.0.0.dev5.dist-info/METADATA,sha256=42l-skEiDCQQ3VA7jXzokD7woNnMpYzZm-qVMw2vivc,11280
-chtypes-2.0.0.dev5.dist-info/WHEEL,sha256=W3fkpkm7-wf9vBI5Z-7s0eWkeM-spu78I8Neb98DeEg,87
-chtypes-2.0.0.dev5.dist-info/entry_points.txt,sha256=TdNcluWBR0VOt5mVFROsp-NiVPAdR3EHo0UsHlMC0r0,50
-chtypes-2.0.0.dev5.dist-info/licenses/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
-chtypes-2.0.0.dev5.dist-info/RECORD,,
+chtypes-2.0.0.dev6.dist-info/METADATA,sha256=T0boAAXpcSjeW7OqcCM0WihNHOX7ZRGU4ePoQnAlL-I,11280
+chtypes-2.0.0.dev6.dist-info/WHEEL,sha256=W3fkpkm7-wf9vBI5Z-7s0eWkeM-spu78I8Neb98DeEg,87
+chtypes-2.0.0.dev6.dist-info/entry_points.txt,sha256=TdNcluWBR0VOt5mVFROsp-NiVPAdR3EHo0UsHlMC0r0,50
+chtypes-2.0.0.dev6.dist-info/licenses/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
+chtypes-2.0.0.dev6.dist-info/RECORD,,