chtypes 2.0.0.dev4__tar.gz → 2.0.0.dev6__tar.gz

{chtypes-2.0.0.dev4 → chtypes-2.0.0.dev6}/CHANGELOG.md

@@ -8,16 +8,52 @@ The four bindings in this repository are released together and give one answer,
 
 ### Added
 
+- Every settings layer's filter-declined settings, in one list (ABI v2; moves the dev fingerprint; #588): `SchemaDescription.filter_declined_settings`, a tuple of `DeclinedSetting`, decoded from `schema_description`'s new required top-level `filter_declined_settings`, over every layer known at schema compile (`setup`'s defaults as the compile captured them, the server profile, and the schema's own settings). `DeclinedSetting` gains `layer`, the highest layer that sets the name, from the new `DeclinedLayer` vocabulary (`DEFAULTS`, `SERVER`, `SCHEMA`, and its unknown(n)). One entry per name, ordered by layer and then by name bytes, as the library writes it; the binding sorts nothing.
+- `Schema.describe` raises the library's `CHS_REJECTED` with ch_code 306 (TOO_DEEP_RECURSION), a `SchemaError`, for a deep input the server's stack check refuses (ABI v2: `chs_schema_describe` now lists `CHS_REJECTED`).
 - The server's filter-declined settings (ABI v2; moves the dev fingerprint): `SchemaServer.filter_declined_settings`, a tuple of `DeclinedSetting` (`name`, `tier`), decoded from `schema_description`'s new required `server.filter_declined_settings`, with the new `DeclinedTier` vocabulary (`PREDICATE`, `PREDICATE_UNFLIPPED`, `RESULT_CONTENT`, and its unknown(n)). `compile_filter` on a schema whose server lists any is the library's `CHS_DECLINED`, an `UnsupportedError` carrying its message; a filter's own settings other than `session_timezone` are no longer declined at compile, and a declined one is named at evaluation instead.
 - The v2 spec states that a filter verdict counts only when the evaluation's outcome is `ok`: over a body a server would not accept, every verdict is `d`.
 - The v2 spec publishes the WHERE-affecting settings lists (`spec/abi-v2/where-settings/`) with the consumer rule.
 - The v2 spec publishes the filter decline-reasons catalog (`spec/abi-v2/declines/`).
+- The v2 spec's decline catalog has 49 entries, and it publishes the settings values a server refuses outright (`spec/abi-v2/where-settings/documented-pathological.tsv`).
+- The v2 spec's decline catalog follows the producer's batch 11: its `server-profile-setting` entry now covers every settings layer the schema compiles under (the id is unchanged), the evaluation-time setting entries name only the filter's own settings, and its `stack-depth` entry lists `chs_schema_describe`.
 - A `410 Gone` is a retired repository, and permanent (#571). Any request the fetch layer makes (a tag, an alias, a digest, a blob, `tags/list`, the referrers API or its fallback tag, after a redirect too) that answers `410` is now the new code `CHTYPES_SOURCE_RETIRED` (exit status 10), never retried and never sent to the next base, nor from the dev channel's alias to its tag. It was `CHTYPES_SOURCE_UNREACHABLE` (exit 3) with the registry's message dropped, and Go, Python and Rust moved on to the next base, so a mirror's 404 could hide the retirement. The error names the URL that answered and carries the registry's own message, with control and bidirectional-formatting characters removed and cut to 256 code points: Go `CodeSourceRetired` (`errors.Is(err, ErrSourceRetired)`), Python and TypeScript `SourceRetiredError`, Rust `Error::SourceRetired`. The rule is `docs/guides/fetch-v1.md` section 2, "A retired repository", and the `retired-410-*` and `list-tags-retired-410` conformance cases and one shared message table (`tests/fixtures/retired-message/cases.json`) hold all four bindings to it.
 - A 2.0.0-dev SDK prefers the newest build of its own fingerprint (#511). A version request resolves `<tag>--fp-<fingerprint>` first, the alias the staging dev registry serves beside every dev tag, with the binding's own generated ABI fingerprint, and the tag itself only when every base answers the alias 404; any other failure of the alias request is that failure, with no fallback, and an alias whose index lacks the platform is `CHTYPES_ARTIFACT_UNPUBLISHED`. The dev channel's cache lookups (the installed-build lookup a registry open makes first, the offline answer, and the monotonic rule of a fetch) now see only records whose signed `abi_fingerprint` is the SDK's own, so a newer build of another fingerprint, installed by another dev SDK in the shared cache, is never returned or kept over this one's own, and is never removed or rewritten. So a dev build of a newer fingerprint no longer strands an older dev SDK until its consumers upgrade. Trust is unchanged (the signed predicate and the load checks decide), a listing never shows an alias, nothing records one, `list` and `where` are unchanged, and there is no option: both steps are the dev channel's alone, and the v1 contract and every production channel never take them. The rule is `docs/guides/fetch-v1.md` section 3, and the `dev-alias-*`, `resolve-installed-dev-alias-*` and `list-tags-dev-alias` conformance cases hold all four bindings to it.
 
+### Changed
+
+- `compile_filter` is the library's `CHS_DECLINED`, `UnsupportedError`, on a schema whose `filter_declined_settings` is not empty from any layer, and its message names each setting and its layer (ABI v2, #588). A declined setting from the defaults or the schema's own settings now fails the compile, where it was named at evaluation before; a filter's own settings and an evaluation's are still named at evaluation.
+- **Enforcement gate lifted** for `26.3` on `linux-amd64`.
+- **Enforcement gate lifted** for `26.7` on `linux-amd64`.
+- **Enforcement gate lifted** for `26.8` on `linux-amd64`.
+- **Enforcement gate lifted** for `26.9` on `linux-amd64`.
+- **Enforcement gate lifted** for `26.3` on `linux-arm64`.
+- **Enforcement gate lifted** for `26.7` on `linux-arm64`.
+- **Enforcement gate lifted** for `26.8` on `linux-arm64`.
+- **Enforcement gate lifted** for `26.9` on `linux-arm64`.
+- **Enforcement gate lifted** for `26.7` on `darwin-arm64`.
+- **Enforcement gate lifted** for `26.8` on `darwin-arm64`.
+- **Enforcement gate lifted** for `26.9` on `darwin-arm64`.
+- **Enforcement gate restored** for `26.3` on `linux-amd64`.
+- **Enforcement gate restored** for `26.3` on `linux-arm64`.
+- **Enforcement gate restored** for `26.7` on `linux-amd64`.
+- **Enforcement gate restored** for `26.7` on `linux-arm64`.
+- **Enforcement gate restored** for `26.8` on `linux-amd64`.
+- **Enforcement gate restored** for `26.8` on `linux-arm64`.
+- **Enforcement gate restored** for `26.9` on `linux-amd64`.
+- **Enforcement gate restored** for `26.9` on `linux-arm64`.
+- **Enforcement gate restored** for `26.7` on `darwin-arm64`.
+- **Enforcement gate restored** for `26.8` on `darwin-arm64`.
+- **Enforcement gate restored** for `26.9` on `darwin-arm64`.
+
+### Removed
+
+- `SchemaServer.filter_declined_settings` (a breaking change inside v2 dev, #588): the server member no longer carries the list. Read `SchemaDescription.filter_declined_settings`, whose `server`-layer entries are the profile's.
+
 ### Fixed
 
+- A 2.0.0-dev SDK whose own-fingerprint alias has expired, with a cached build of that fingerprint for the request, now says so in the `CHTYPES_ARTIFACT_UNPUBLISHED` message of `fetch` (#581): `; a cached build for this fingerprint (build <id>) is still usable by open; upgrade the SDK to get newer builds` is appended. The code, the exit status (4) and the cache are unchanged, and all four bindings give the same message (`fp-ahead-cached-own-fp`).
 - A 2.0.0-dev SDK whose fingerprint no published build carries yet now fails closed with a precise message (#578). When every base answers its own alias 404 and the tag names a build signed for another fingerprint, `fetch` is `CHTYPES_ARTIFACT_UNPUBLISHED` (exit status 4): `no published build for this SDK's fingerprint <own fp>; newest published on this channel is <fp> (build <id>)`. It used to install that build, or report it already installed, and the lookup at open then answered `CHTYPES_ARTIFACT_MISSING` with advice to run `fetch`: a loop with no pointer to the cause. Nothing is downloaded or installed and the cache is unchanged. An alias that answers, a tag at the SDK's own fingerprint and the v1 contract are unchanged. All four bindings run the same fetch conformance cases, `fp-ahead-*`, and the rule is `docs/guides/fetch-v1.md` section 3.
+- Opening a line no longer waits for another line's fetch: the registry never holds its lock across network I/O, and concurrent opens of one request share one fetch (#491).
 
 ## [1.1.0] — 2026-10-06
 

{chtypes-2.0.0.dev4 → chtypes-2.0.0.dev6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: chtypes
-Version: 2.0.0.dev4
+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.dev4 → chtypes-2.0.0.dev6}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "chtypes"
-version = "2.0.0.dev4"
+version = "2.0.0.dev6"
 description = "Python binding for the chtypes artifacts: ClickHouse's own type system, per version, behind the frozen chs_* C ABI"
 readme = "README.md"
 license = "Apache-2.0"

{chtypes-2.0.0.dev4 → chtypes-2.0.0.dev6}/src/chtypes/__init__.py

@@ -48,6 +48,7 @@ from importlib.metadata import version as _package_version
 
 from ._abi2._vocab import (
     EXPORT_NONE,
+    DeclinedLayer,
     DeclinedTier,
     DefaultKind,
     DiscoverQueryParam,
@@ -156,6 +157,7 @@ __all__ = [
     "ChtypesError",
     "Column",
     "Computed",
+    "DeclinedLayer",
     "DeclinedSetting",
     "DeclinedTier",
     "DefaultKind",

{chtypes-2.0.0.dev4 → chtypes-2.0.0.dev6}/src/chtypes/_abi2/_decls.py

@@ -1,4 +1,4 @@
-# GENERATED by scripts/abi-v1/gen.py --major 2 from spec/abi-v2/abi.json (CHS_ABI_FINGERPRINT sha256:28c7445ce6b5c6d0ae33177fd60eb7b3b5654a966c842b8d812aea622824dc72) — DO NOT EDIT  # noqa: E501
+# GENERATED by scripts/abi-v1/gen.py --major 2 from spec/abi-v2/abi.json (CHS_ABI_FINGERPRINT sha256:d60a681ea0e249ab9e2c83b50640ad9cef040261ddf61805106c93e2c68774e4) — DO NOT EDIT  # noqa: E501
 """The Python binding's generated ABI v2 layer: ctypes signatures, the handle
 classes, the two-phase resolve functions and invoke_by_name(), the test-only
 dispatcher the conformance suite drives from tests/fixtures/abi-v2/cases.json.
@@ -19,7 +19,7 @@ from dataclasses import dataclass, field
 from . import _errmap
 
 CHS_ABI_VERSION = 2
-CHS_ABI_FINGERPRINT = "sha256:28c7445ce6b5c6d0ae33177fd60eb7b3b5654a966c842b8d812aea622824dc72"
+CHS_ABI_FINGERPRINT = "sha256:d60a681ea0e249ab9e2c83b50640ad9cef040261ddf61805106c93e2c68774e4"
 
 # The description's stability: "unstable" while this generation is being
 # designed, so CHS_ABI_FINGERPRINT moves with every change, and "locked" after

{chtypes-2.0.0.dev4 → chtypes-2.0.0.dev6}/src/chtypes/_abi2/_errmap.py

@@ -1,4 +1,4 @@
-# GENERATED by scripts/abi-v1/gen.py --major 2 from spec/abi-v2/abi.json (CHS_ABI_FINGERPRINT sha256:28c7445ce6b5c6d0ae33177fd60eb7b3b5654a966c842b8d812aea622824dc72) — DO NOT EDIT  # noqa: E501
+# GENERATED by scripts/abi-v1/gen.py --major 2 from spec/abi-v2/abi.json (CHS_ABI_FINGERPRINT sha256:d60a681ea0e249ab9e2c83b50640ad9cef040261ddf61805106c93e2c68774e4) — DO NOT EDIT  # noqa: E501
 """spec/abi-v2/sdk.json's error-mapping tables, as references to the
 public classes (python/src/chtypes/errors.py, re-exported by
 python/src/chtypes/_abi2/_errors.py). Only the MAPPING is generated: the

{chtypes-2.0.0.dev4 → chtypes-2.0.0.dev6}/src/chtypes/_abi2/_vocab.py

@@ -1,8 +1,8 @@
-# GENERATED by scripts/abi-v1/gen.py --major 2 from spec/abi-v2/abi.json (CHS_ABI_FINGERPRINT sha256:28c7445ce6b5c6d0ae33177fd60eb7b3b5654a966c842b8d812aea622824dc72) — DO NOT EDIT  # noqa: E501
+# GENERATED by scripts/abi-v1/gen.py --major 2 from spec/abi-v2/abi.json (CHS_ABI_FINGERPRINT sha256:d60a681ea0e249ab9e2c83b50640ad9cef040261ddf61805106c93e2c68774e4) — DO NOT EDIT  # noqa: E501
 """The Python binding's generated vocabularies, from spec/abi-v2/abi.json: the C
 enums (`Format`, `Status`), the document vocabularies (`Outcome`, `FilterOutcome`,
-`Verdict`, `DefaultKind`, `MergeReason`, `DeclinedTier`, `Reason`, `Source`,
-`DiscoverQueryParam`) with the facts the description attaches to each value
+`Verdict`, `DefaultKind`, `MergeReason`, `DeclinedTier`, `DeclinedLayer`, `Reason`,
+`Source`, `DiscoverQueryParam`) with the facts the description attaches to each value
 (`Format.ch_name`, `Reason` lossy, `Source` is_stored, `Verdict.answered`), and the
 `DocFlags` groups. No other file in this package keeps a copy of any of it.
 
@@ -250,7 +250,7 @@ class MergeReason(StrEnum):
 
 
 class DeclinedTier(StrEnum):
-    """The WHERE-settings tier of a setting a server profile sets and this build's
+    """The WHERE-settings tier of a setting a settings layer sets and this build's
     filters do not honor in a WHERE, as a `DeclinedSetting` reports it."""
 
     PREDICATE = "predicate"
@@ -274,6 +274,31 @@ class DeclinedTier(StrEnum):
         return cls(text)
 
 
+class DeclinedLayer(StrEnum):
+    """The settings layer a `DeclinedSetting` comes from, the highest one that sets
+    the name: `defaults`, `server` or `schema`, lowest first."""
+
+    DEFAULTS = "defaults"
+    SERVER = "server"
+    SCHEMA = "schema"
+
+    @classmethod
+    def _missing_(cls, value: object) -> DeclinedLayer | None:
+        return _unknown_str(cls, value)
+
+    @property
+    def known(self) -> bool:
+        """Whether the description lists this value: False for exactly the unknown(n)
+        member an unlisted value reads as (rule r3)."""
+        return type(self)._value2member_map_.get(self._value_) is self
+
+    @classmethod
+    def of(cls, text: str) -> DeclinedLayer:
+        """Map a document's spelling. One the description does not list is kept as
+        this vocabulary's unknown(n) member, carrying it (rule r3)."""
+        return cls(text)
+
+
 class DiscoverQueryParam(StrEnum):
     """A query parameter of the SQL `discover_query` returns, which the caller binds
     when it runs the query."""
@@ -441,6 +466,7 @@ DESCRIBED_VOCABULARIES: Final[dict[str, type]] = {
     "discover_query_param": DiscoverQueryParam,
     "default_kind": DefaultKind,
     "declined_tier": DeclinedTier,
+    "declined_layer": DeclinedLayer,
 }
 
 

{chtypes-2.0.0.dev4 → chtypes-2.0.0.dev6}/src/chtypes/_decode.py

@@ -29,6 +29,7 @@ from collections.abc import Callable, Mapping
 from typing import Any
 
 from ._abi2._vocab import (
+    DeclinedLayer,
     DeclinedTier,
     DefaultKind,
     FilterOutcome,
@@ -504,10 +505,11 @@ def _string_map(obj: Mapping[str, Any], key: str, where: str) -> dict[str, str]
 
 
 def _declined_setting(obj: dict[str, Any], where: str) -> DeclinedSetting:
-    # An unlisted tier is its unknown(n): kept, never a failure (rule r3).
+    # An unlisted tier or layer is its unknown(n): kept, never a failure (rule r3).
     return DeclinedSetting(
         name=_name(obj, "name", where),
         tier=DeclinedTier.of(_text(obj, "tier", where)),
+        layer=DeclinedLayer.of(_text(obj, "layer", where)),
     )
 
 
@@ -516,9 +518,6 @@ def _server(obj: dict[str, Any], where: str) -> SchemaServer:
         timezone=_text(obj, "timezone", where),
         settings=_string_map(obj, "settings", where) or {},
         macros=_string_map(obj, "macros", where),
-        filter_declined_settings=_objects(
-            obj, "filter_declined_settings", where, _declined_setting
-        ),
     )
 
 
@@ -546,6 +545,10 @@ def decode_schema_description(raw: bytes) -> SchemaDescription:
             if replicated is None
             else _replicated(_obj(replicated, where, "replicated"), f"{where}.replicated")
         ),
+        # Over every layer known at schema compile, with or without a server.
+        filter_declined_settings=_objects(
+            obj, "filter_declined_settings", where, _declined_setting
+        ),
     )
 
 

{chtypes-2.0.0.dev4 → chtypes-2.0.0.dev6}/src/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;
@@ -277,7 +305,11 @@ def visible(predicate: object, channel: Channel | None = None) -> bool:
 
 
 def ahead_of_registry(
-    alias_absent: bool, predicate: object, channel: Channel | None = None
+    alias_absent: bool,
+    predicate: object,
+    channel: Channel | None = None,
+    *,
+    cached_own_build: Callable[[], str | None] | None = None,
 ) -> None:
     """The dev channel's answer for an SDK whose fingerprint no published build
     carries yet (docs/guides/fetch-v1.md §3; public issue #578): when every base
@@ -287,11 +319,33 @@ def ahead_of_registry(
     build answers gets, naming both fingerprints. Nothing is installed and an
     install of that build is never reported, because the lookup this SDK opens
     through would refuse it. Returns in every other case: the alias answered,
-    the tag's build is this SDK's own, or the contract has no own fingerprint."""
+    the tag's build is this SDK's own, or the contract has no own fingerprint.
+
+    The expired alias with a usable cache (public issue #581): `cached_own_build`
+    looks up, through the filter open uses, the cache's verified record of this
+    SDK's OWN fingerprint for the request, and returns its build id ("" for a
+    record that names none) or None for no record. When there is one the
+    message grows by `_cached_own_suffix`; the code does not change."""
     channel = channel or active()
     if not alias_absent or visible(predicate, channel):
         return
-    raise ArtifactUnpublishedError(f"chtypes: {_ahead_message(channel.own_fingerprint, predicate)}")
+    message = _ahead_message(channel.own_fingerprint, predicate)
+    if cached_own_build is not None:
+        build = cached_own_build()
+        if build is not None:
+            message += _cached_own_suffix(build)
+    raise ArtifactUnpublishedError(f"chtypes: {message}")
+
+
+def _cached_own_suffix(build: str) -> str:
+    """The clause appended when the cache holds an own-fingerprint build: "; a
+    cached build for this fingerprint (build <id>) is still usable by open;
+    upgrade the SDK to get newer builds", the parenthesis dropped when the
+    record names no build."""
+    suffix = "; a cached build for this fingerprint"
+    if build:
+        suffix += f" (build {build})"
+    return suffix + " is still usable by open; upgrade the SDK to get newer builds"
 
 
 def _ahead_message(own: str, predicate: object) -> str:

{chtypes-2.0.0.dev4 → chtypes-2.0.0.dev6}/src/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-2.0.0.dev4 → chtypes-2.0.0.dev6}/src/chtypes/_ocifetch/_ensure.py

@@ -716,7 +716,11 @@ def _ensure_floating(
         # An install of another fingerprint's build, reached through the tag
         # because the registry has none at this SDK's own, is never reported
         # installed (public issue #578): refused before the cache is touched.
-        _channel.ahead_of_registry(alias_absent, existing_record.predicate)
+        _channel.ahead_of_registry(
+            alias_absent,
+            existing_record.predicate,
+            cached_own_build=lambda: _cached_own_build(roots, platform_key, request.spelling),
+        )
         # A NEWER build within the request, installed beside it, is still the
         # answer ("monotonic-warning", docs/guides/fetch-v1.md §9).
         newer = _newer_installed(
@@ -812,7 +816,11 @@ def _ensure_floating(
         # own fingerprint answered 404 on every base, and the tag's build is
         # signed for another. Refused from the signed statement, before the
         # layer is requested, so nothing is downloaded or installed.
-        _channel.ahead_of_registry(alias_absent, predicate)
+        _channel.ahead_of_registry(
+            alias_absent,
+            predicate,
+            cached_own_build=lambda: _cached_own_build(roots, platform_key, request.spelling),
+        )
     newer = _newer_installed(roots, platform_key, predicate, request.spelling)
     if newer is not None:
         newer_dir, newer_record, warning = newer
@@ -1235,6 +1243,25 @@ def with_notes(message: str, notes: Sequence[str]) -> str:
     return f"{message}. {' '.join(notes)}"
 
 
+def _cached_own_build(
+    roots: Sequence[Path], platform_key: str, request_spelling: str
+) -> str | None:
+    """The build id of the newest cached record of this SDK's OWN fingerprint
+    that answers the request (`resolve_installed`'s filter), "" when it names
+    none, or None when the cache holds no such record (public issue #581)."""
+    candidates = [
+        record
+        for _dir, record in list_verified_records(roots)
+        if record.platform == platform_key
+        and version_within_request(record.version, request_spelling)
+        and _channel.visible(record.predicate)
+    ]
+    if not candidates:
+        return None
+    best = max(candidates, key=lambda r: (spelling_components(r.version), r.build))
+    return best.build or ""
+
+
 def resolve_installed(request: Request, platform: str, options: Options) -> Resolved | None:
     """Cache-only: never touches the network (docs/guides/fetch-v1.md "The seam").
 

{chtypes-2.0.0.dev4 → chtypes-2.0.0.dev6}/src/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.dev4 → chtypes-2.0.0.dev6}/src/chtypes/results.py

@@ -14,7 +14,15 @@ from __future__ import annotations
 from collections.abc import Mapping
 from dataclasses import dataclass
 
-from ._abi2._vocab import DeclinedTier, DefaultKind, FilterOutcome, MergeReason, Outcome, Verdict
+from ._abi2._vocab import (
+    DeclinedLayer,
+    DeclinedTier,
+    DefaultKind,
+    FilterOutcome,
+    MergeReason,
+    Outcome,
+    Verdict,
+)
 
 __all__ = [
     "AtMergeEntry",
@@ -252,14 +260,17 @@ class Column:
 
 @dataclass(frozen=True, slots=True)
 class DeclinedSetting:
-    """One setting a server's profile sets that this build's filters do not honor
-    in a WHERE: an entry of the server's `filter_declined_settings` (ABI v2).
-    `name` is bytes (from `name` or `name_b64`). `tier` is the tier this build
-    line's WHERE-settings list gives it, a `DeclinedTier`; one the description
-    does not list is its unknown(n) member (rule r3)."""
+    """One setting the schema compiles under that this build's filters do not
+    honor in a WHERE: an entry of the schema description's
+    `filter_declined_settings` (ABI v2). `name` is bytes (from `name` or
+    `name_b64`). `tier` is the tier this build line's WHERE-settings list gives
+    it, a `DeclinedTier`, and `layer` the settings layer it comes from, the
+    highest one that sets the name, a `DeclinedLayer`; a value the description
+    does not list is its vocabulary's unknown(n) member (rule r3)."""
 
     name: bytes
     tier: DeclinedTier
+    layer: DeclinedLayer
 
 
 @dataclass(frozen=True, slots=True)
@@ -269,17 +280,11 @@ class SchemaServer:
     data-derived. `timezone` is the zone the schema's types bind: the profile's,
     or else the image zone. `settings` is the profile's settings (`{}` when it
     gave none). `macros` is None exactly when the profile carried no macros
-    (unknown), and a mapping, even an empty one, when it did (the complete set).
-    `filter_declined_settings` is the settings the profile sets that this
-    build's filters do not honor in a WHERE, in the profile's own order, empty
-    when it lists none: a schema on a server that lists any is one
-    `compile_filter` declines (`UnsupportedError`), and a consumer that streams
-    rows refuses such a tenant (spec/abi-v2/where-settings/README.md)."""
+    (unknown), and a mapping, even an empty one, when it did (the complete set)."""
 
     timezone: str
     settings: Mapping[str, str]
     macros: Mapping[str, str] | None
-    filter_declined_settings: tuple[DeclinedSetting, ...] = ()
 
 
 @dataclass(frozen=True, slots=True)
@@ -293,13 +298,22 @@ class SchemaReplicated:
 
 @dataclass(frozen=True, slots=True)
 class SchemaDescription:
-    """A schema's columns, in declared order, and the server it was compiled on.
-    `server` is None exactly when it was compiled without one; `replicated` is
-    None when the document carries none."""
+    """A schema's columns, in declared order, the server it was compiled on, and
+    the settings its filters decline. `server` is None exactly when it was
+    compiled without one; `replicated` is None when the document carries none.
+    `filter_declined_settings` is the settings the schema compiles under that
+    this build's filters do not honor in a WHERE, over every layer known at
+    schema compile (the defaults `setup` set, the server profile and the
+    schema's own settings), empty when it lists none: one entry per name, at
+    the highest layer that sets it, ordered by layer and then by name bytes, as
+    the library wrote it. A schema that lists any is one `compile_filter`
+    declines (`UnsupportedError`), and a consumer that streams rows refuses
+    such a tenant (spec/abi-v2/where-settings/README.md)."""
 
     columns: tuple[Column, ...]
     server: SchemaServer | None = None
     replicated: SchemaReplicated | None = None
+    filter_declined_settings: tuple[DeclinedSetting, ...] = ()
 
 
 @dataclass(frozen=True, slots=True)