small fixes 2026-08-17 (2): s2_neon_o9 toc flip, CHANGELOG entry for PR #447

CHANGELOG.md

@@ -15,6 +15,27 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - sort/hash grouping refactor (#30) ([#33](https://github.com/englacial/zagg/pull/33)) by @espg
 - Rectilinear grid: chunk-driven auto-padding + run enablement ([#32](https://github.com/englacial/zagg/pull/32)) by @espg
 
+## [0.46.0] - 2026-08-17
+
+- unindexed shard-map builds cover at `parent_order` and intersect before decoding records (#445) ([#447](https://github.com/englacial/zagg/pull/447)) by @espg
+  - An unpinned unindexed HEALPix mortie `swath` build now covers at the output
+    grid's `parent_order` instead of its chunk order, so `metadata["mortie_order"]`
+    in newly built manifests records the shard order (e.g. 9, not 13). Assignment
+    is measurably identical at the production order pairs (the
+    `bench/neon_order_sweep.py` invariant, verified at 555,867 granules); at
+    coarse grids the new default is a documented conservative superset, never a
+    subset. The order an explicit `mortie_order=` pin resolves to is unchanged
+    (it is still honored literally and still validated against `parent_order`).
+  - Unindexed builds cover from the catalog's WKB column and intersect before
+    materializing granule records. At clone scale (555,867 granules) the
+    unpinned default — the case the bullet above changes — goes 1,075 s -> 39 s
+    (~27x), no longer covering every footprint at the chunk order to answer a
+    shard-order question; a build that already pinned `mortie_order=9` goes
+    86.6 s -> 39.3 s (~2.2x).
+  - Disclosed: an explicit `mortie_order=` pin always covers live, indexed or not,
+    so a MultiPolygon footprint assigns as a union-of-parts superset; single-part
+    CMR granules are unaffected.
+
 ## [0.3.0] - 2026-06-11
 
 - Add bring-your-own-role path for IAM-constrained deploys; creds handling for external s3 bucket writes ([#27](https://github.com/englacial/zagg/pull/27)) by @espg

tests/data/benchmark/configs/s2_neon_o9.yaml

@@ -6,12 +6,15 @@
 # the shipped src/zagg/configs/sentinel2_l2a.yaml except ``parent_order: 9`` --
 # the o9 dispatch shard matching the point-pipeline legs (~12.8 km shards, 4
 # over the SERC box, 4^10 order-19 cells each; the same override espg's
-# operational S2 SERC run pins).
+# operational S2 SERC run pins) -- and the harness-local ``pyramid: false``
+# opt-out below. Both are packaging: the semantic hash (D19) of this config
+# equals the shipped one, so the leg measures the shipped product.
 #
 # Layout notes: ``store_layout: hive`` -- the production default for HEALPix
 # raster since issues #247/#253 (issue #237 promoted, ratified by @espg on
-# issue #272; the flat interop profile is deprecated). ``sharded`` does not
-# apply to the (time, cells) slab writes (raster is never sharded, issue #247).
+# issue #272; the flat interop profile is deprecated), restated here, not a
+# divergence. ``sharded`` does not apply to the (time, cells) slab writes
+# (raster is never sharded, issue #247).
 data_source:
   reader: raster
   bands:
@@ -30,6 +33,10 @@ output:
   # ratified issue #272). One leaf zarr object per array per dispatch shard.
   store_layout: hive
   pyramid: false                 # overview sweep opted out pending Phase E fleet sizing (issue #201)
+  # Time axis as mortie toc words (spec §8, issue #443) -- output-defining, so
+  # it tracks the shipped config (issue #451): a store born on toc is a
+  # different product from a legacy-axis one.
+  time_encoding: toc
   grid:
     type: healpix
     indexing_scheme: nested

tests/test_raster_benchmark.py

@@ -43,6 +43,44 @@ def test_raster_targets_manifest_consistent():
     assert get_store_layout(cfg) == "hive"
 
 
+def test_s2_neon_o9_tracks_the_shipped_sentinel2_config():
+    # The leg's config claims to be the shipped src/zagg/configs/sentinel2_l2a.yaml
+    # with the o9 dispatch shard (issue #451); hold it to that mechanically so a
+    # knob added to one and not the other (as time_encoding was, issue #443)
+    # cannot drift silently. Divergence budget: parent_order and the harness's
+    # pyramid opt-out -- both packaging, so the semantic hash (D19) matches.
+    from zagg.config import get_store_layout, load_config
+    from zagg.semantics import semantic_hash
+
+    manifest, base = rrb.load_targets(str(BENCH / "targets_raster_neon.json"))
+    bench = load_config(str(base / manifest["targets"]["raster_s2_neon_2025"]["config"]))
+    shipped = load_config(str(REPO / "src" / "zagg" / "configs" / "sentinel2_l2a.yaml"))
+
+    assert bench.data_source == shipped.data_source
+    assert bench.aggregation == shipped.aggregation
+    assert semantic_hash(bench) == semantic_hash(shipped)
+
+    def normalized(cfg):
+        # store is a run-local output path (the harness overrides it); grid
+        # indexing_scheme is descriptive-only (config.py rejects any other value).
+        out = {k: v for k, v in cfg.output.items() if k not in ("store", "grid", "pyramid")}
+        out["store_layout"] = get_store_layout(cfg)
+        out["grid"] = {k: v for k, v in cfg.output["grid"].items() if k != "indexing_scheme"}
+        return out
+
+    b, s = normalized(bench), normalized(shipped)
+    assert b["grid"].pop("parent_order") == 9
+    assert s["grid"].pop("parent_order") == 11
+    assert b == s
+    # pyramid is dropped from the dict comparison above, so pin both sides of it
+    # explicitly: the shipped config growing an overview declaration (the issue
+    # #382 grammar) would otherwise turn the family on for the product while the
+    # leg keeps measuring it off, at an unchanged semantic hash -- output.pyramid
+    # is not in semantic_core, so the D19 assertion cannot see it either.
+    assert bench.output["pyramid"] is False
+    assert "pyramid" not in shipped.output
+
+
 def test_pinned_s2_catalog_carries_raster_entries():
     # The pinned catalog is the fixed granule set (offline, no STAC): 2025
     # Earth Search c1 items over the SERC box, with the raster entry fields