chtypes 2.0.0.dev0__py3-none-any.whl → 2.0.0.dev1__py3-none-any.whl

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:8ec0c6941f000aa07bfb9fbfef20205d3ee0a588833856bd12270ba42912bfb3) — DO NOT EDIT  # noqa: E501
+# GENERATED by scripts/abi-v1/gen.py --major 2 from spec/abi-v2/abi.json (CHS_ABI_FINGERPRINT sha256:d87e91be2bbe75b985c38224268c2f7dc5d8236dab0a4b4d61357c6dfdc1a232) — 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:8ec0c6941f000aa07bfb9fbfef20205d3ee0a588833856bd12270ba42912bfb3"
+CHS_ABI_FINGERPRINT = "sha256:d87e91be2bbe75b985c38224268c2f7dc5d8236dab0a4b4d61357c6dfdc1a232"
 
 # The description's stability: "unstable" while this generation is being
 # designed, so CHS_ABI_FINGERPRINT moves with every change, and "locked" after
@@ -61,6 +61,7 @@ _STATUS_OK = 0
 HANDLE_FREE: dict[str, str] = {
     "chs_buf": "chs_buf_free",
     "chs_error": "chs_error_free",
+    "chs_server": "chs_server_free",
     "chs_schema": "chs_schema_free",
     "chs_filter": "chs_filter_free",
     "chs_block": "chs_block_free",
@@ -102,6 +103,8 @@ ALL_SYMBOLS: tuple[str, ...] = (
     "chs_schema_create",
     "chs_schema_describe",
     "chs_schema_free",
+    "chs_server_create",
+    "chs_server_free",
     "chs_set_defaults",
     "chs_shutdown",
     "chs_type_validate",
@@ -174,6 +177,10 @@ class ErrorHandle(Handle):
     """A `chs_error` the library owns the free function for."""
 
 
+class ServerHandle(Handle):
+    """A `chs_server` the library owns the free function for."""
+
+
 class SchemaHandle(Handle):
     """A `chs_schema` the library owns the free function for."""
 
@@ -189,6 +196,7 @@ class BlockHandle(Handle):
 _HANDLE_CLASS: dict[str, type[Handle]] = {
     "chs_buf": BufHandle,
     "chs_error": ErrorHandle,
+    "chs_server": ServerHandle,
     "chs_schema": SchemaHandle,
     "chs_filter": FilterHandle,
     "chs_block": BlockHandle,
@@ -324,12 +332,24 @@ _add(
     _P("out", "out_handle", "chs_buf"),
     _P("err", "out_error", "chs_error", nullable=True),
 )
+_add(
+    "chs_server_create",
+    "status",
+    "chs_status",
+    _P("profile", "bytes_in", None),
+    _P("options", "bytes_in", None),
+    _P("out", "out_handle", "chs_server"),
+    _P("err", "out_error", "chs_error", nullable=True),
+)
+_add("chs_server_free", "void", None, _P("server", "handle", "chs_server", nullable=True))
 _add(
     "chs_schema_create",
     "status",
     "chs_status",
+    _P("server", "handle", "chs_server", nullable=True),
     _P("create_table", "bytes_in", None),
     _P("settings", "bytes_in", None),
+    _P("options", "bytes_in", None),
     _P("out", "out_handle", "chs_schema"),
     _P("err", "out_error", "chs_error", nullable=True),
 )
@@ -486,6 +506,18 @@ def resolve_abi_version(lib: ctypes.CDLL) -> Callable[..., object]:
     return fn
 
 
+def resolve_build_info(lib: ctypes.CDLL) -> Callable[..., object]:
+    """Loader step 4's dlsym: `chs_build_info` ALONE, so the fingerprint can be
+    compared before step 6's full sweep (rule r6 beats a missing symbol,
+    public issue #537). Absent is MissingSymbol, the step 4 refusal."""
+    try:
+        fn = lib.chs_build_info
+    except AttributeError:
+        raise MissingSymbol("chs_build_info") from None
+    _set_signature(fn, FUNCTIONS["chs_build_info"])
+    return fn
+
+
 class Api:
     """Every described symbol, resolved and signature-typed, step 6
     (plan section 3.2). Constructed ONLY by resolve_all(): the constructor
@@ -703,19 +735,42 @@ class Api:
         self._check(status, err)
         return _read_buf(self, out.value)
 
+    def server_create(
+        self,
+        profile: bytes | None,
+        options: bytes | None,
+    ) -> ServerHandle:
+        """The generated call wrapper for chs_server_create (thread class any).
+
+        Raises the class the status maps to on a non-OK status."""
+        out = ctypes.c_void_p()
+        err = ctypes.c_void_p()
+        status = self._raw["chs_server_create"](
+            *_bytes_in(profile),
+            *_bytes_in(options),
+            ctypes.byref(out),
+            ctypes.byref(err),
+        )
+        self._check(status, err)
+        return ServerHandle(out.value, self._raw["chs_server_free"])
+
     def schema_create(
         self,
+        server: ServerHandle | None,
         create_table: bytes | None,
         settings: bytes | None,
+        options: bytes | None,
     ) -> SchemaHandle:
-        """The generated call wrapper for chs_schema_create (thread class any).
+        """The generated call wrapper for chs_schema_create (thread class shared).
 
         Raises the class the status maps to on a non-OK status."""
         out = ctypes.c_void_p()
         err = ctypes.c_void_p()
         status = self._raw["chs_schema_create"](
+            None if server is None else server.value,
             *_bytes_in(create_table),
             *_bytes_in(settings),
+            *_bytes_in(options),
             ctypes.byref(out),
             ctypes.byref(err),
         )
@@ -925,17 +980,15 @@ _API_KEY = object()
 
 
 def resolve_all(lib: ctypes.CDLL) -> Api:
-    """Every described symbol, in sorted, deterministic order -- chs_abi_version
-    INCLUDED, even though _loader.py's step 3 (resolve_abi_version) already
-    resolved it before this runs: the test-only invoke_by_name() dispatcher
-    below needs every symbol reachable through ONE Api, handshake class
-    included, and re-resolving an already-present symbol is harmless (by the
-    time step 6 runs, step 3 has already proven it exists). The first symbol
-    ctypes cannot dlsym raises MissingSymbol(name); _loader.py's step 6 turns
-    that into "missing_symbol:<name>", matching every missing-<sym> stub
-    variant (tests/fixtures/abi-v2/cases.json), chs_build_info and
-    chs_clickhouse_version included -- loader step 4 needs chs_build_info
-    already resolved, which is exactly why this sweep must run before it."""
+    """Every described symbol, in sorted, deterministic order -- the handshake
+    symbols INCLUDED, even though _loader.py's steps 3 and 4 (resolve_abi_version,
+    resolve_build_info) already resolved theirs before this runs: the test-only
+    invoke_by_name() dispatcher below needs every symbol reachable through ONE
+    Api, and re-resolving an already-present symbol is harmless. The first
+    symbol ctypes cannot dlsym raises MissingSymbol(name); _loader.py's step 6
+    turns that into "missing_symbol:<name>", matching every missing-<sym> stub
+    variant. Step 6 runs AFTER step 4's fingerprint comparison, so a library
+    with another fingerprint is refused with rule r6's message first."""
     raw: dict = {}
     for name in ALL_SYMBOLS:
         try:

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:8ec0c6941f000aa07bfb9fbfef20205d3ee0a588833856bd12270ba42912bfb3) — DO NOT EDIT  # noqa: E501
+# GENERATED by scripts/abi-v1/gen.py --major 2 from spec/abi-v2/abi.json (CHS_ABI_FINGERPRINT sha256:d87e91be2bbe75b985c38224268c2f7dc5d8236dab0a4b4d61357c6dfdc1a232) — 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/_abi2/_loader.py

@@ -9,15 +9,20 @@ wired up; `predicate` is passed through exactly as that seam promises.
 Every `chs_*` spelling in this module is forbidden by
 scripts/abi-v1/check-no-hand-decls.py (it is not a generated file), so this
 calls ONLY python/src/chtypes/_abi2/_decls.py's non-`chs_`-prefixed surface:
-`resolve_abi_version()`, `resolve_all()`, and the `Api` object they return.
-
-Steps 1-6 run in the order plan section 3.2 gives (with step 6's full
-resolve-all sweep run right after step 3, BEFORE step 4's
-`chs_build_info()` call -- step 4 needs that symbol already resolved, and
-`tests/fixtures/abi-v2/cases.json`'s `missing-chs_build_info` and
-`missing-chs_clickhouse_version` stub variants both expect the step 6
-`missing_symbol:<name>` reason, not a step 4 one, which is only possible if
-the full symbol sweep happens before chs_build_info is ever called). Step 7
+`resolve_abi_version()`, `resolve_build_info()`, `resolve_all()`, and the `Api` object they return.
+
+Steps 1-7 run in the documented order, the order Go, TypeScript and Rust
+run: glibc (1), dlopen (2), `chs_abi_version` alone (3), `chs_build_info`
+alone, parsed strictly and its fingerprint compared (4: rule r6's exact
+message wins here), the signed-statement cross-check (5), and only then the
+resolve-every-declared-symbol sweep (6). A library with another fingerprint
+that also lacks a symbol this SDK declares (every fingerprint move that adds
+an export meets one) is therefore refused with r6's message, never as
+`missing_symbol:<name>` (public issue #537; the stub variant
+`fingerprint-other-missing-symbol`). A symbol missing from step 4's own
+`chs_build_info` is still `missing_symbol:chs_build_info`, and
+`tests/fixtures/abi-v2/cases.json`'s other `missing-<sym>` variants still
+expect `missing_symbol:<name>` from step 6. Step 7
 calls the image's once-per-image zone setup (empty zone = UTC unless the
 caller supplies one) and then its default settings.
 """
@@ -198,15 +203,15 @@ def _open(
     if version != _decls.CHS_ABI_VERSION:
         _refuse("abi_version", path, want=_decls.CHS_ABI_VERSION, got=version)
 
+    # Step 4: chs_build_info ALONE, parsed strictly, then the fingerprint
+    # compared. Rule r6 is decided here, before the step 6 sweep can name a
+    # missing symbol instead (#537).
     try:
-        api = _decls.resolve_all(lib)
+        build_info_fn = _decls.resolve_build_info(lib)
     except _decls.MissingSymbol as e:
         _refuse(f"missing_symbol:{e.name}", path, want=e.name, got=None)
-        # _refuse always raises; the following line only satisfies a type
-        # checker that cannot see that. (Never reached.)
-        raise
-
-    raw = api.build_info()
+        raise  # never reached: _refuse always raises
+    raw = build_info_fn()
     if raw is None:
         _refuse("build_info_malformed", path, got="chs_build_info() returned NULL")
     info = _parse_build_info(raw, path)
@@ -214,9 +219,17 @@ def _open(
     if info["abi_fingerprint"] != _decls.CHS_ABI_FINGERPRINT:
         _refuse_fingerprint(path, info.get("abi_fingerprint"))
 
+    # Step 5: the signed predicate against build_info.
     if not skip_step5:
         _cross_check(info, predicate, path)
 
+    # Step 6: resolve every declared symbol.
+    try:
+        api = _decls.resolve_all(lib)
+    except _decls.MissingSymbol as e:
+        _refuse(f"missing_symbol:{e.name}", path, want=e.name, got=None)
+        raise  # never reached: _refuse always raises
+
     # Step 7: the once-per-image setup (docs/reference/bindings-v1.md section
     # 6): the image zone (empty = UTC), then the default settings when there
     # are any. After every handshake check and before any other call. A

chtypes/_abi2/_vocab.py

@@ -1,4 +1,4 @@
-# GENERATED by scripts/abi-v1/gen.py --major 2 from spec/abi-v2/abi.json (CHS_ABI_FINGERPRINT sha256:8ec0c6941f000aa07bfb9fbfef20205d3ee0a588833856bd12270ba42912bfb3) — DO NOT EDIT  # noqa: E501
+# GENERATED by scripts/abi-v1/gen.py --major 2 from spec/abi-v2/abi.json (CHS_ABI_FINGERPRINT sha256:d87e91be2bbe75b985c38224268c2f7dc5d8236dab0a4b4d61357c6dfdc1a232) — 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`, `Reason`, `Source`, `DiscoverQueryParam`) with the facts the

chtypes/library.py

@@ -399,5 +399,7 @@ class Library:
         a compiled type always takes the image zone, never the profile's."""
         statement = to_bytes(create_table, "create_table")
         settings_bytes = settings_json(settings, session_timezone)
-        handle = self._api.schema_create(statement, settings_bytes)
+        # No server (NULL) and no options (none, which is `{}`): the schema is on
+        # the image's own server, exactly as before the server profile existed.
+        handle = self._api.schema_create(None, statement, settings_bytes, None)
         return Schema(self, handle)

{chtypes-2.0.0.dev0.dist-info → chtypes-2.0.0.dev1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: chtypes
-Version: 2.0.0.dev0
+Version: 2.0.0.dev1
 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.dev0.dist-info → chtypes-2.0.0.dev1.dist-info}/RECORD

@@ -6,16 +6,16 @@ chtypes/_guard.py,sha256=zTtwprCS0XvGWY7GDozo-IP6GwjMAWl-o-AjShdCSVI,1985
 chtypes/_input.py,sha256=GonZVBB7gOPXEoDBDjEExiZXMIW7gbTIFAopvcxqnTs,4039
 chtypes/_setup.py,sha256=n84T0hFmXu_fdnXQIFhk3dMVL0_-yhfdRZsqCXTLzzg,6114
 chtypes/errors.py,sha256=9qv94rxbe7hm7lSVFG33Qri82FwDtCY-EnJiwnMfkp8,9501
-chtypes/library.py,sha256=gG4MN2zwfiLOFn0k-nZsZ2vAaBQBNe97DBbUbTtus7k,15426
+chtypes/library.py,sha256=U_XWbvJLxeXJmSDJV5OpwiRAKhlwTk_pFTlHxKFtab8,15600
 chtypes/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 chtypes/registry.py,sha256=Wra-DzLYrWPHsyPlsTPOmPvuc1as5jPEfA7gxVYHPs4,12444
 chtypes/results.py,sha256=JXHgnd06jXGbNGfHToBO0tRxUPy1Q3urOsH4EXax3-0,8062
 chtypes/_abi2/__init__.py,sha256=d3i7_iUDMFT1jg49vRQz1SMH6oseYZHUR0oPt6aSTiY,1042
-chtypes/_abi2/_decls.py,sha256=qlbkMEzXwjp7mZta5-NXVHU2DTEDqTd1Qzwc4rP0RKA,36677
-chtypes/_abi2/_errmap.py,sha256=sgx97MNwOP3zgnonkcH8OKFOHiClaecL2AMOc3BKBqc,2886
+chtypes/_abi2/_decls.py,sha256=c2xuqG0rFgSthOO1FHEGzPhr4ldKQzoOdRxyXaEslq8,38454
+chtypes/_abi2/_errmap.py,sha256=L6WmPSXqqEoNchX1jrfWsbogthm5crwF-8tQBly330E,2886
 chtypes/_abi2/_errors.py,sha256=wRE9M0oYtJz_9izQqpEBh5571M_1QzGWBoJ3pJTykWw,761
-chtypes/_abi2/_loader.py,sha256=RuhC9COv3lWA67SHYd7UAPdg7FsjIVkXgWNg2_Lr0HM,11717
-chtypes/_abi2/_vocab.py,sha256=X_3ebytcvCklP2iJfHMaLTrvwQVz3FmJP1dxp6CWTCM,14663
+chtypes/_abi2/_loader.py,sha256=VMWrbWMp9Uq3K-7a219lfqAmSmBlD2hcB6WDJgG8XG0,12514
+chtypes/_abi2/_vocab.py,sha256=6UyJwWDnp_R59YMDF7ZWuLchVU7Sq8asmQChH21QEDw,14663
 chtypes/_ocifetch/__init__.py,sha256=enfPOKkqP4kqAKqckBGWXN1OQsiYo9ngDP-wzG0zn2I,1484
 chtypes/_ocifetch/_channel.py,sha256=aumM_S8X7_H2GXhaDZwoSTcg-m9_k4QSu5XTqSWZ6EQ,11836
 chtypes/_ocifetch/_constants.py,sha256=UdOGIShDXaDP13NGbuftKZRE4u7VK8JfZmoeChw4GMU,5467
@@ -30,8 +30,8 @@ chtypes/_ocifetch/_lock.py,sha256=14_uex9qXdOht-5FSrSvFvd99-gB7DmI3bDuxXs4YU8,55
 chtypes/_ocifetch/_oci.py,sha256=lmrlykbyQev55uFDn8UBwXyMLthd3-pQq3xIyfXCUXY,12704
 chtypes/_ocifetch/_referrers.py,sha256=J2b4gN6vryz_IzYHxrd2Tp-tQO9Cz766rZtKgCVcKqA,6008
 chtypes/_ocifetch/_unpack.py,sha256=Cn4-up63KL63L8pnkS5zwJ6VbbHPSigpCnmOdcHJ4RI,5609
-chtypes-2.0.0.dev0.dist-info/METADATA,sha256=RlGXGLQU7lKwz8_nNkEyQQOx8gbef-84qlB_kNdwVgM,10213
-chtypes-2.0.0.dev0.dist-info/WHEEL,sha256=W3fkpkm7-wf9vBI5Z-7s0eWkeM-spu78I8Neb98DeEg,87
-chtypes-2.0.0.dev0.dist-info/entry_points.txt,sha256=TdNcluWBR0VOt5mVFROsp-NiVPAdR3EHo0UsHlMC0r0,50
-chtypes-2.0.0.dev0.dist-info/licenses/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
-chtypes-2.0.0.dev0.dist-info/RECORD,,
+chtypes-2.0.0.dev1.dist-info/METADATA,sha256=tGh0moOPb4CzqmGW2bt922V8NSKPje4Idmms1Lp5Nn4,10213
+chtypes-2.0.0.dev1.dist-info/WHEEL,sha256=W3fkpkm7-wf9vBI5Z-7s0eWkeM-spu78I8Neb98DeEg,87
+chtypes-2.0.0.dev1.dist-info/entry_points.txt,sha256=TdNcluWBR0VOt5mVFROsp-NiVPAdR3EHo0UsHlMC0r0,50
+chtypes-2.0.0.dev1.dist-info/licenses/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
+chtypes-2.0.0.dev1.dist-info/RECORD,,