Repository navigation
fix(schema): drop a property together with the constraints that name only it - #1062
Conversation
…only it A property-level @index, @unique or @key is also stored as a type-level constraint naming the property by stable id. Dropping the property made the planner see that constraint disappear and refuse the whole change, because the constraint comparison did not know which properties the plan drops. An indexed property could therefore never be removed. The property planner now returns the stable ids of the properties it drops, and the constraint comparison no longer refuses a removed constraint when every field it names is one of them. A @key, a constraint that also names a field that stays (a remaining property or @src/@dst), and a constraint removed from a property that stays are still refused. Apply needs no change: the drop's Operation::Project already removes the index on the dropped column, and the evolved table declares full-text analyzers from the desired catalog. ConstraintIR::fields replaces two copies of the same match in schema_ir.rs and serves the new rule. Fixes ModernRelay#1014
Why
That refusal is wider than the safety rule. An index is derived state. A constraint that names only dropped properties has no value left to check. Lance already removes an index whose field leaves the schema. This is the defect in #1014. Removing a constraint from a property that stays is a different contract, and it stays refused. That follow-up is #1064. WhatA non-key constraint now ends with the properties it names, when this plan drops every one of those properties. The match uses stable property ids. The plan still refuses these changes:
Apply is unchanged. The drop is still one metadata-only How
The accepted catalog is replaced by the catalog built from the desired schema. Apply still rejects an unsupported plan before effects. The physical index leaves in that same Project. In Lance 11.0.0, Full-text declarations for the evolved table come from the desired catalog. The dropped column is not in that list, so the commit does not add a new analyzer segment for it.
ImpactA user can drop an indexed property, or a property that carries A composite constraint can be removed only when every member is dropped in that plan. Dropping one member of Blocking findingsNone. Optional findingsNone. Tradeoffs and liabilityThe violated rule was invariant 7, together with the documented supported change "drop a property". The planner treated a dependent constraint as an independent schema change. The class is every non-key constraint whose fields are all properties this plan drops. One predicate covers that class. It does not special-case The fix sits in the planner, which owns the migration contract. Apply already implemented the column drop. A second drop-index step would add a crash window for work Lance already does inside Project. This removes a real liability. An indexed property no longer has to stay forever as a deprecated copy. The plan line is still Five more changes of this shape do not need five more helpers. The rule is already keyed on stable ids and on No new publication door, no new table effect, and no second record of the index. Names stay separate from stable ids. A missing index on a dropped column cannot change query results, because the column is gone. Open work stays aligned. #1066 refuses full-text calls on a property with no full-text index. It does not change this planner rule. A dropped property is absent, so those calls cannot name it. #963 plans schema apply on live branches and still uses these metadata-only commits. This PR adds no commit kind for that RFC to absorb. Lance's data-evolution guide says ValidationHead reviewed: GQT cannot express this contract. Parent plus the new tests only, with the production planner unchanged: Result: 1 failed, 485 filtered out. The scalar Result: 1 failed, 31 filtered out. Apply returned Exact head: Result: 1 passed, 485 filtered out. Result: 1 passed, 31 filtered out. The test drops a full-text Code inspection of Lance 11.0.0 CI on this head, run RecommendationApprove. |
ModernRelay#1036) * fix(cleanup): finish a table whose interrupted sweep removed its index directory The collector deletes a swept version's files before its manifest, so a pass that stops in between leaves the manifest for the next pass. On a local store that next pass failed for the table: `delete_paths` called `remove_dir_all` again on the `_indices/<uuid>` directory the stopped pass had removed, and Lance's local provider reports an absent directory as `NotFound`. The table kept the error and deleted nothing on every later run. Object stores list the prefix empty and succeed, so S3, Azure and the DST memory store converged already. An absent index directory is now already deleted, as an absent file already was. The files-before-manifest order is unchanged, and the deletion set still holds only paths no retained root marks. The failpoints test stops a pass at `cleanup.sweep_pre_manifest_delete` after it removed an index directory only the pruned pin names, then proves the next pass removes that manifest, reports no error, and leaves every retained root's paths in place. * docs(cleanup): state the sweep order before the retry outcome Reword the maintenance guide's sentence on an interrupted cleanup so the deletion order and the next run's outcome read as two steps, and point the release note at the guide's Cleanup section. * test(cleanup): interrupt the sweep between manifests and before dead-staging manifests Cover the directory-touching windows of the collector's sweep on a local store, where Lance reports removing an absent directory as NotFound: - a pass stopped between two manifests of the published sweep, with an index directory among the files it already deleted; - a pass stopped after the dead stagings' files and before their manifests, through the new seam cleanup.sweep_pre_dead_manifest_delete. Each retry reports no error, removes the remaining manifests and keeps every retained root's paths. * test(cleanup): run the sweep crash windows on S3 and Azure The three collector-retry fixtures in failpoints.rs become helpers over a graph uri. The file tests keep their names and call them on a temporary directory; one RustFS/S3 test and one Azure/Azurite test run all three, each on a fresh graph root, and both CI jobs require them by name. The first fixture now also stops a pass at cleanup.sweep_pre_file_delete, the one sweep window no failpoint test reached: the pass deletes nothing and the next pass plans the same sweep. Its retry asserts what the other two already did, no error on any table and nothing left to remove. Index-directory presence goes through the storage adapter's exists rather than std::fs, so the same assertion holds on an object store. The RFC's crash-window gate is satisfied and leaves blocked_on; the evidence bullet names the owners per backend. * test(dst): reach the dead-staging sweep window Register cleanup.sweep_pre_dead_manifest_delete in the crash-window catalog (appended, 53 windows) and give it a milestone recipe: insert, index build, insert, cleanup. The reach census's setup crash stops the index build before its manifest commit, stranding a detached staging; the second insert moves main's head past the head the staging recorded, so the recipe's cleanup judges it dead and crosses the window. A window inside cleanup's per-table pass does not fail the op: cleanup records the table's error and returns Ok. The harness treated that as a plain success, so no retry was judged and the report kept no trace of the window. crash_op now returns CleanupDeferred when the op's deferrals name the scheduled window; the universe records deferred:<window>@op<i> and runs the obligation pass a crashed cleanup gets (a clean rerun that defers nothing, the collector oracle, the world read). This covers cleanup.table_gc and the three earlier sweep windows as well. The pin dst_dead_staging_sweep_window_is_reached_and_retried probes the window and stops the recipe's cleanup at it; the sensitivity proof gains a deferred-cleanup case. Both go red with the routing reverted. * test(dst): schedule setup crashes in the hunt and the fleet cleanup.sweep_pre_dead_manifest_delete needs an earlier crash's aftermath: an index build stopped before its manifest commit. Only the reach census added that crash, by spending the universe's one crash_on_match slot on it, so the hunt and the fleet scheduled the window on a cleanup with no dead staging and it never fired there. Scenario::setup_crash is a second slot, matched before crash_on_match and always a real crash, even under probe_only; crash_on_match starts matching after it. harness::setup_crash_for replaces the test-only census_setup and keeps only its live entry; window_needs_wide and window_needs_schema_ops include the setup's needs. The reach census, the hunt and the fleet's window arm take the setup from it, and the hunt counts a hit from the window's own verdict instead of crashes > 0, which a setup crash alone would satisfy. The pin now stops the cleanup through the fleet arm's scenario instead of a pinned op index. * feat(release): publish daily pinnable edge builds and stamp and attest every release (ModernRelay#1031) * feat(release): publish daily, pinnable and attested edge builds Edge releases now build once a day from the newest audited commit on main and publish each build as its own prerelease, edge-<commit date>-<short commit>, which never changes once published; the rolling edge release copies it and only moves forward. Both release workflows share one archive build that stamps the commit and channel into the binaries, runs each archive on its platform and verifies the exact set, and both attest build provenance. Each edge release states its storage format and HTTP contract next to the latest stable release's, then the notes recorded since that release. * fix(release): attest only the commit a release run is for The provenance predicate takes its source commit from the run's OIDC sha claim, not from the checkout. An edge run now builds only its own commit, waiting up to 90 minutes for that commit's audit instead of walking back to an older one, and both publishers refuse to attest a build of any other commit; a stable backfill from v0.14.0 is dispatched at its tag. * fix(release): keep edge runs from overlapping A newer edge run could move the rolling tag after an older run published but before its installer checks ran, failing a release that succeeded. Whole runs now share one concurrency group. * feat(release): stamp and attest the container image The image's bookworm-built binaries now carry the same commit and stable channel stamp as the release archives, checked inside the image before it is pushed, and the pushed GHCR digest carries a build provenance attestation under the same rule: only for the run's own commit, and from v0.14.0 a backfill is dispatched at its tag. * fix(release): address review of the edge release rework - Refuse an edge build while the package version is not above the latest stable release: X.Y.Z-edge+<commit> sorts before X.Y.Z, so the ordering claim held only after main advanced its version. - Require the commit's CI Gate as well as its vocabulary audit, waiting up to 180 minutes, since the build becomes a pinnable, attested release; a run cancelled because main moved on now ends the edge run with a notice. - Keep the newest edge build of every storage format beyond the retained 30, read from a marker line in the release text, so the build that can export an abandoned development format survives. - Report one build identity from omnigraph-api-types: the CLI, /healthz and the MCP server info share the stamped version and its compile-time checks. - Compose the edge release text from the real release-note preview in CI, and hold the two copies of the v0.14.0 attestation cutoff to one value. * feat(load): plan CSV overwrites and reuse validation reads (ModernRelay#1026) * fix(cli): accept --as on commit publish and drop (ModernRelay#1029) * fix(cli): accept --as on commit publish and drop The plane guard classified every `commit` subcommand as a read and refused `--as`, so `commit publish` and `commit drop` against a direct graph could only attribute `operator.actor`, although both dispatch through the write resolver and the engine's `_as` entry points. The guard now matches the `commit` subcommands exhaustively: publish and drop take `--as` on a direct target, while list, show and changes still refuse it. A served publish or drop still refuses `--as` before any request. Guard errors name the subcommand (`commit list`, ...). The published commit keeps the actor of the write that created it; the branching guide now says so. * test(cli): pin created_at and fold the served refusal into its owner The publish regression now also checks that the published commit keeps the proposal's `created_at`, the second half of the branching guide's claim. The served `--as` refusal for `commit publish` and `commit drop` moves into `as_on_a_served_write_is_rejected` as two more argument rows instead of a parallel fixture. Rewrap the edited guide paragraph. * docs(changelog): say a published commit keeps its timestamp too The branching guide and the regression test state both the actor and the timestamp; the release note now says the same. * fix(cli)!: send a server token only to the server it is keyed to (ModernRelay#1030) * refactor(cli): centralize invocation and command boundaries (ModernRelay#1047) * refactor(cli): capture operator config during client setup * refactor(cli): reuse config for aliases and served clusters * refactor(cli): isolate invocation parsing * refactor(cli): make scope resolution pure * refactor(cli): separate application completion from process exit * refactor(cli): extract query family and typed preparation * refactor(cli): capture presentation and preserve delivery outcomes * test(cli): qualify captured presentation across execution * refactor(cli): isolate graph history execution and output * fix(cli): track dedicated commit write outcomes * docs(cli): describe history delivery and outcome boundaries * refactor(cli): isolate transfer execution and delivery * refactor(cli): isolate schema lifecycle and lint execution * refactor(cli): isolate maintenance execution and delivery * refactor(cli): isolate cluster control execution and delivery * refactor(cli): complete invocation config and I/O boundaries * fix(cli): preserve failures and recovery across output errors * docs(cli): consolidate server credential guidance * feat(commits): page a branch's commit list (ModernRelay#1013) * feat(commits): page a branch's commit list GET /commits returned a branch's whole lineage, and building it read all of __history. It now takes `limit` (1 to 1,000) and an opaque `page_token`; a paged answer names `head_commit_id`, the head its first page resolved, and a `next_page_token` while older commits remain. Later pages answer for that head's first-parent chain even after the branch moves, and the token carries a digest of the branch, never its name. Without either parameter the answer is unchanged. A page walks first parents by falling generation from the head or the token's next commit: the head and buffer cost nothing, and an older commit is read by id with the rest of its __history extent, so a page costs the extents its own commits occupy and never the history below them. `omnigraph commit list --limit/--page-token` and the MCP `commits_list` tool page the same way. * test(commits): register the paged commit list as a read-only surface The public and coordinator API registries in forbidden_apis classify every async entry point; Omnigraph::list_commits_page and GraphCoordinator::first_parent_page read and publish nothing. * test(commits): track the reworded commit list description in the vocabulary inventory The listCommits description still names the graph-manifest version in its ordering sentence; its prose digest changed with the paging text. * test(commits): pin commit-list page storage calls in the DST cost golden The newest and the oldest page of main's commit list on a reopened handle, after 12 and 36 publishes under a 2048-byte history release. Both rows match at the two depths: a page reads the extents of its own commits, not the history above or below them. * fix(commits): prove a commit-list continuation for a branch-scoped caller A commit-list page token is checksummed, not signed, so the commit a continuation starts at is the caller's claim. A caller allowed to read main only could re-sign a main token to list a secret branch's commits, which GET /commits?branch=secret and GET /commits/{id} both refuse it. Under a policy, a continuation by a caller without the graph-wide read gate (the gate of GET /commits/{commit_id}) now goes through list_commits_page_on_branch: the token's commit must be the first commit below its generation on the branch's first-parent chain from the head, or the page is refused with 400. That proof walks the chain, so such a continuation costs what the whole listing costs; a caller with graph-wide read keeps the page cost. The list_commits_page doc says what the token does not prove. Pages through both doors concatenate to the listing on an upgraded root, whose converted commits carry pre-upgrade ids. * fix(commits): check a scoped commit-list continuation cheaply, through a read check list_commits_page_on_branch becomes list_commits_page_readable, which takes the same ReadCheck as diff_page_readable. A continuation's commit is on the branch's history when the branch's __manifest holds it (its head or buffer), when a branch the caller may read published it, or else when a walk down the branch's first-parent chain finds it. So a branch-scoped caller paging its own branch no longer walks the history on every page; only a commit neither cheap rule covers costs the walk. The page is read once and the check uses its first commit. An unknown commit is refused exactly as an unreadable one is. A missing commit met inside the walk is an integrity error, not a 404. The server shares one read decision between the diff and commit-list doors. The API documents that a continuation's head_commit_id is the one its token carries, and openapi.json describes the scoped caller's cost. * feat(release): publish an edge container image from each edge build (ModernRelay#1060) * feat(release): publish an edge container image from each edge build The daily edge run now also publishes a container image of the same build. It packages the published build release's Linux x86_64 archive, checked against its checksum and its attestation for this workflow and commit, on Debian trixie, since the Ubuntu-built archives need glibc 2.39 or newer. The root Dockerfile takes its base as BASE_IMAGE, bookworm by default, so the stable image is unchanged. The image is tagged edge-<commit date>-<short commit> on GHCR and Docker Hub, checked inside the image for its commit and channel, attested on both registries, and tagged edge only when the rolling edge release moved. It never moves latest, and a rerun reuses the image first pushed for the build. * fix(release): match the image's server features and follow edge as it is now - Build every release archive with the server's aws feature, as the stable image already is, so the edge image packaged from the Linux archive accepts OMNIGRAPH_SERVER_BEARER_TOKENS_AWS_SECRET like the image it replaces. Lance's S3 support already builds the AWS SDK base; the feature adds one crate. The gate checker requires both release builds to enable it. - Move the edge image tags, and check the edge installer channel, only while the rolling edge release still names this build, so a rerun of an older run's failed job cannot move them behind a newer build. * fix(release): skip an edge build whose workflows no longer match main (ModernRelay#1061) GitHub refuses the workflow token a new tag on a commit whose workflow files differ from main's current ones ("refusing to allow a GitHub App to create or update workflow"), and the token can never hold the workflows permission. An edge build of 02026b5 failed this way after a workflow change merged during its build. The edge run now checks that the build's workflow files still match main's before building and again before tagging, and otherwise publishes nothing, with a notice; the image and installer jobs run only for a published build. * fix(release): build the Linux x86_64 archive on a pinned Ubuntu 24.04 runner (ModernRelay#1063) `ubuntu-latest` moves to Ubuntu 26.04 between 2026-10-19 and 2026-11-19 (actions/runner-images#14748), and a run may land on either image during the rollout. A Linux archive needs the glibc it was linked against, so the x86_64 archive would start requiring Ubuntu 26.04's glibc, breaking Ubuntu 24.04 and Debian 13 users and the trixie edge image. Pin it to ubuntu-24.04, as the arm64 archive already is (ubuntu-24.04-arm), document the archives' glibc 2.39 floor, and have the gate checker refuse ubuntu-latest for archive builds. * fix(release): pull image bases from Docker Hub when logged in (ModernRelay#1065) The first edge image build failed twice pulling debian:trixie-slim from ECR Public: "429 Too Many Requests: Data limit exceeded". GitHub-hosted runners pull it anonymously from shared addresses, whose data limit is often spent, and the stable image pulls its bookworm base the same way. Both image workflows now log in to Docker Hub when the DOCKERHUB_* secrets exist and build on the Docker Official Image; the stable workflow's rust:1-bookworm builder pull is then logged in too. Without the secrets, the base still comes from ECR Public. * fix(schema): drop a property together with the constraints that name only it (ModernRelay#1062) A property-level @index, @unique or @key is also stored as a type-level constraint naming the property by stable id. Dropping the property made the planner see that constraint disappear and refuse the whole change, because the constraint comparison did not know which properties the plan drops. An indexed property could therefore never be removed. The property planner now returns the stable ids of the properties it drops, and the constraint comparison no longer refuses a removed constraint when every field it names is one of them. A @key, a constraint that also names a field that stays (a remaining property or @src/@dst), and a constraint removed from a property that stays are still refused. Apply needs no change: the drop's Operation::Project already removes the index on the dropped column, and the evolved table declares full-text analyzers from the desired catalog. ConstraintIR::fields replaces two copies of the same match in schema_ir.rs and serves the new rule. Fixes ModernRelay#1014 * feat(query)!: refuse full-text calls without a full-text index (ModernRelay#1066) * query: refuse full-text calls without a full-text index (T27, FullTextIndexRequired) A full-text call (`search`, `fuzzy`, `match_text`, `bm25`) reads its property's full-text index, whose analyzer folds case and stems; without one Lance scans with a bare, case-sensitive tokenizer, so the same call answered differently on an indexed and an unindexed property. - T27 at type checking: a full-text call on a String node property with no one-column full-text `@index`/`@key` is refused, from the schema alone. `PropType::index_kind` moves to the compiler and index maintenance uses it, so the type checker and the index builder cannot drift. An enum's fix points at `=`; a non-String field keeps its operand error. - FullTextIndexRequired at planning (HTTP 409, `full_text_index_required` in the error body): the planner reads the coverage of every property a full-text call names, filters included, and refuses `absent`. An untrained segment, which every write now declares, is `partial` and answers; a table with no fragment, or a type the snapshot does not hold, counts as covered. Acceptance refuses a plan that records no coverage, or `absent`, for a call, and replay re-derives every recorded coverage from the pinned dataset. Regressions: cases/v2/issue_747_full_text_calls_need_a_full_text_index.gqt and search.rs::a_full_text_index_with_no_segment_refuses_the_call_issue_747, both red with their check removed. * docs: rescope RFC 0047 step 3 and document the full-text index requirement RFC 0047 records step 3 as refusing only an index with no segment, now that every write declares a declared column's analyzer, with a decision-log entry, and its rollout table records steps 2 and 2a as merged. The search guide, troubleshooting page and execution guide describe T27 and the 409; the release notes call T27 breaking and tell operators to validate stored queries before upgrading. * feat(query): the ranked binding roots its component (ModernRelay#1069) * feat(query): the ranked binding roots its component A nearest(), bm25() or rrf() order on a binding a traversal reaches was refused at planning unless that binding was declared first, and a ranked binding no declaration introduced could not be ranked at all. Lowering now roots the top-level component holding the bindings the leading order key ranks at that binding; a ranked binding only a traversal introduces gets a NodeScan of its checked type, and every other binding of the component is reached by a forward or reverse expand. An rrf() whose arms rank two bindings one traversal connects is the type error T59. The planner codes P001 and P005 are withdrawn; the planner keeps both checks as internal errors. * docs(search): rank a traversal-reached binding * test(cleanup): qualify scoped retries and keep setup pending until a crash --------- Co-authored-by: Azim Afroozeh <13484327+azimafroozeh@users.noreply.github.com> Co-authored-by: Andrew Altshuler <andrew@modernrelay.com> Co-authored-by: aaltshuler <andrew@collectivelab.io>
What & why
schema planrefused to drop any property that carries@index,@unique,@rangeor@check, so an indexed property could never be removed. The planner keeps a property-level constraint both on the property and as a type-level constraint that names the property by stable id. When the property is dropped, the type-level comparison saw the constraint disappear and refused, because it did not know which properties the plan drops.Now a constraint ends with the properties it names: when the plan drops every field a constraint names, removing that constraint is part of the drop. The rule is keyed on stable property ids, not names, and covers every constraint kind.
Still refused:
@keychange, since entity ids derive from the key (theis_keycommitted-lookup skip invalidate.rsdepends on this);@unique(a, b)with onlyadropped) or@src/@dst;@index(see notes).Apply needs no change. The drop's metadata-only
Operation::Projectalready removes the index on the dropped column (Lance'sretain_relevant_indices, pinned bylance_surface_guards::metadata_only_schema_evolution_keeps_blob_files_ids_and_index_coverage). The evolved table declares its full-text analyzers from the desired catalog, which no longer names the column.Changes:
schema_plan.rs:plan_propertiesreturns the dropped property ids;plan_constraintstakes them and skips a removed constraint thatends_with_dropped_properties. The rule is documented onSchemaMigrationStep::DropProperty.schema_ir.rs: newConstraintIR::fields()replaces two copies of the same match and serves the new rule.validate.rskey comment, and afixedchangelog note.Backing issue / RFC
(a fix under
crates/,tools/, or the root manifests carries anissue_N_*.gqtcase or anissue_Ntest in the diff, or asks a maintainer for theno-reprolabel;Fix Regression Gatechecks,docs/dev/ci.md)deny.tomledit / comment / one-line CI) — no issue/RFC requiredChecklist
Invariants: one publication is unchanged (no new table effect); stable identity drives the rule (invariant 6); a dropped column's index is derived state that leaves with its column (invariant 7);
@keystays fixed for the life of a type.Local verification
macOS arm64, on
mainat 764fb42. GQT cannot express a schema change, so the regressions are a planner test and an engine test.cargo test -p omnigraph-compiler --locked --lib— 486 passed. The newplan_drops_a_property_with_the_constraints_that_name_only_it_issue_1014(12 rows: scalar, full-text and vector@index,@unique,@rangewith@check, a composite with every member dropped and an edge property are supported; a partial composite, an edge constraint naming@src, a@keydrop, a bare@indexremoval and a drop beside a bare removal are refused, each for the removed constraint) failed before the fix with the reported refusal.RUST_MIN_STACK=16777216 cargo test -p omnigraph-engine --locked --test schema_apply— 32 passed. The extended owner, renamedapply_schema_column_changes_keep_data_files_ids_and_index_coverage_issue_1014, now drops a full-text-indexed and a scalar-indexed column. It asserts that each pinned table loses exactly that index, that every other index keeps its coverage, and thatensure_indicesdoes not rebuild it. Against the unfixed planner it failed at the apply withremoving constraints from 'Document' is not supported in schema migration v1(BeforeEffect).cargo clippy -p omnigraph-compiler -p omnigraph-engine --all-targets --locked -- -D warnings -W clippy::dbg_macro— cleancargo fmt --all --check— cleancargo test -p omnigraph-skill --locked— passedpython3 scripts/check-docs.py,python3 scripts/release_notes.py preview --working-tree,bash scripts/check-agents-md.sh,typoson the changed files — cleanNotes for reviewers
drop property 'Doc.score'; it does not list the constraints that leave with it. Listing them (an explicit step, or a field onDropProperty) would change the wire format and the CLI renderer for information the drop already implies, so it is left out. It can be added later without a behavior change.@indexremoval from a property that stays stays refused. For a scalar or vector index it changes only cost, but apply would then need a new table effect (Lancedrop_index, staged detached and pinned) or would leave an undeclared physical index. For a free-text String, the full-text segment holds the analyzer, so removing it changessearch/match_text/fuzzy/bm25results until the analyzer is part of the schema (rfc: analyzed lexical search on the shared expression model #792). That decision is proposed in schema: remove a constraint from a property that stays #1064, kind by kind: metadata-only removals, BTREE and vector index removal as a detached effect, and full-text kept refused until rfc: analyzed lexical search on the shared expression model #792.execution: unknownon a refused direct apply (raised in the issue): the engine already marks the refusalBeforeEffect, but the CLI's direct-mode outcome does not read it. That is CLI: qualify retry-safe exits for direct write preparation conflicts #466's scope, not this PR's.