mirror of
https://github.com/GreptimeTeam/greptimedb.git
synced 2026-10-25 13:22:30 +00:00
docs: record beta2 rollback guard dependency
Signed-off-by: discord9 <discord9@163.com>
This commit is contained in:
discord9
@@ -4,10 +4,10 @@
|
||||
|
||||
- Release base: `2f5e97850e55d86c0ed9eff1719994c88b4450a0`
|
||||
- Aggregate branch: `work/release-v1.2-beta2-complete`
|
||||
- Aggregate head: `81fd630955f16b9c45811539aa8434b47d5a875b`
|
||||
- Aggregate commits: 47 (the prior 43-commit aggregate ancestry, two JSON2 layout commits, the #8902 carrier, and the final non-PR version identity commit)
|
||||
- CI: Historical [GitHub Actions run 32341712112](https://github.com/GreptimeTeam/greptimedb/actions/runs/32341712112), whose actual head SHA was `b5c38fbfc15053f42d4c1d843204bbdd52cb4a00`, completed with conclusion `failure` on the superseded-base aggregate. Failed jobs: Clippy, Check Unused Dependencies, and Check (ubuntu-latest). SQLness, Compatibility Test, binary builds, Rustfmt, license, and fuzz jobs passed; `test` was skipped downstream because Clippy and Check Unused Dependencies failed, while `coverage` was skipped independently because this was a `workflow_dispatch` run and coverage runs only for `merge_group`, not because of failed prerequisites. No CI run or result is recorded for the final range `2f5e97850e55d86c0ed9eff1719994c88b4450a0..81fd630955f16b9c45811539aa8434b47d5a875b`.
|
||||
- `release/v1.2` was not updated by this work.
|
||||
- Aggregate head: `6f150e01cd4221d4c62c5f7082f6d318b3110e00`
|
||||
- Aggregate commits: 48 (the prior 47-commit aggregate history plus the #8751 dependency-closure carrier)
|
||||
- CI evidence: Historical [GitHub Actions run 32341712112](https://github.com/GreptimeTeam/greptimedb/actions/runs/32341712112), whose actual head SHA was `b5c38fbfc15053f42d4c1d843204bbdd52cb4a00`, failed on the superseded-base aggregate: Clippy, Check Unused Dependencies, and Check (ubuntu-latest) failed; SQLness, Compatibility Test, binary builds, Rustfmt, license, and fuzz passed; `test` was skipped downstream because Clippy and Check Unused Dependencies failed, while `coverage` was skipped independently because this was a `workflow_dispatch` run and coverage runs only for `merge_group`. The later [Release run 32462587383](https://github.com/GreptimeTeam/greptimedb/actions/runs/32462587383) was triggered at the pre-#8751 head `81fd630955f16b9c45811539aa8434b47d5a875b`: its Windows job `96713326607` failed in the composite Windows-artifact step, while the overall run was subsequently cancelled and dependent jobs were cancelled. This Windows result is evidence of that run's job outcome, not a diagnosis of #8751 and not final CI for the refreshed head. No final CI result is claimed for `2f5e97850e55d86c0ed9eff1719994c88b4450a0..6f150e01cd4221d4c62c5f7082f6d318b3110e00`.
|
||||
- `release/v1.2` was fast-forwarded to the aggregate head `6f150e01cd4221d4c62c5f7082f6d318b3110e00`; the range remains linear with zero merge commits.
|
||||
|
||||
## How to read the artifacts
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
|
||||
## Scope
|
||||
|
||||
The review scope has 36 public Issue-requested PR relationships: the original 31 plus #8825, #8921, #8895, #8901, and #8902. The current Issue body contains the original 31 requests, while the public comments add #8825, #8921, #8895, and #8901; [comment 5366438434](https://github.com/GreptimeTeam/greptimedb/issues/8892#issuecomment-5366438434), posted by `discord9` at `2026-08-21T07:12:57Z`, publicly requests #8902. Official PR #8921 is now in the release base `2f5e97850e55d86c0ed9eff1719994c88b4450a0`, so it is base-present and is not represented as an aggregate carrier. #8672 and #8699 remain base-present as well. The other public Issue-requested PRs are represented by backport mappings; #8825 remains carried by `d18430b874f9c8054747dbf688585cd7d2988e3e`, and #8902 is carried by the final pre-version carrier `40e02ff6b62ad3445f7035e437bd9e322c8af31b`, followed by the non-PR version identity commit `81fd630955f16b9c45811539aa8434b47d5a875b`. The dependency closure adds exactly two provenance relationships: full #8734 and a release-compatible slice of #8392, for 38 total provenance relationships. The patch-ID verdict contains 14 exact stable patch-ID relationships—#8777, #8832, #8787, #8849, #8859, #8889, #8833, #8600, #8808, #8709, #8522, #8739, #8772, and #8901—and 20 adapted relationships.
|
||||
The review scope has 36 public Issue-requested PR relationships: the original 31 plus #8825, #8921, #8895, #8901, and #8902. The current Issue body contains the original 31 requests, while the public comments add #8825, #8921, #8895, and #8901; [comment 5366438434](https://github.com/GreptimeTeam/greptimedb/issues/8892#issuecomment-5366438434), posted by `discord9` at `2026-08-21T07:12:57Z`, publicly requests #8902. Official PR #8921 is now in the release base `2f5e97850e55d86c0ed9eff1719994c88b4450a0`, so it is base-present and is not represented as an aggregate carrier. #8672 and #8699 remain base-present as well. The other public Issue-requested PRs are represented by backport mappings; #8825 remains carried by `d18430b874f9c8054747dbf688585cd7d2988e3e`, and #8902 is carried by the final pre-version carrier `40e02ff6b62ad3445f7035e437bd9e322c8af31b`, followed by the non-PR version identity commit `81fd630955f16b9c45811539aa8434b47d5a875b`. The dependency closure adds exactly three provenance relationships: full #8734, a release-compatible slice of #8392, and #8751 (upstream merge b70daafc77c87806afd00521c368545a60e5f574), for 39 total provenance relationships. The patch-ID verdict contains 14 exact stable patch-ID relationships—#8777, #8832, #8787, #8849, #8859, #8889, #8833, #8600, #8808, #8709, #8522, #8739, #8772, and #8901—and 21 adapted relationships, including the production-only partial #8751 carrier.
|
||||
|
||||
## Mapping classes
|
||||
|
||||
@@ -36,14 +36,28 @@ The review scope has 36 public Issue-requested PR relationships: the original 31
|
||||
- **dependency**: not listed in the original 31 but required by the selected event chain; #8734.
|
||||
- **release-extra**: compatibility, lock, regression-test, formatting, generated-result, or non-PR release-version correction that is not represented as an upstream PR. The final version identity commit is classified here.
|
||||
|
||||
## Dependency closure: upstream #8751 required by #8734
|
||||
|
||||
Upstream PR [#8751](https://github.com/GreptimeTeam/greptimedb/pull/8751), merge `b70daafc77c87806afd00521c368545a60e5f574`, is recorded as a dependency-closure relationship required by upstream [#8734](https://github.com/GreptimeTeam/greptimedb/pull/8734). The aggregate carrier is `6f150e01cd4221d4c62c5f7082f6d318b3110e00`, and the release-base parent remains `2f5e97850e55d86c0ed9eff1719994c88b4450a0`.
|
||||
|
||||
The upstream PR has two hunks: a production cleanup in `src/common/meta/src/ddl/drop_table.rs` and a rollback regression-test hunk in `src/common/meta/src/ddl/tests/drop_table.rs`. The regression test was already present through the existing #8734 backport sequence, so the refreshed aggregate carrier contains only the production hunk. This is a production-only partial upstream carrier; its stable patch ID is therefore not equal to the full upstream patch, and `patch-id-verdict.tsv` classifies #8751 as **adapted**, not exact. The raw comparison is [`range-diffs/pr-8751.txt`](range-diffs/pr-8751.txt).
|
||||
|
||||
### Verification evidence
|
||||
|
||||
- Before #8751: local Main verification recorded a 4/4 failure.
|
||||
- After #8751: Main recorded a 20/20 no-retry pass, log SHA `fa9ae951fa78dce66c7b0aedc81cd172c9fc898445712162c616c99aeb7000d8`.
|
||||
- After #8751: common-meta recorded a 546/546 no-retry pass, log SHA `84b54cdff1767a2c0e0683e59a955472eacabc769871c5d893940f07d932a79a`.
|
||||
|
||||
These are local before/after verification records; they do not overstate the cancelled Release run as final CI.
|
||||
|
||||
## Accepted breaking-format exception
|
||||
|
||||
PR #8824 is accepted by explicit release-owner direction in this backport session. Public artifacts do not identify a named approver or date; Issue comment [5352919911](https://github.com/GreptimeTeam/greptimedb/issues/8892#issuecomment-5352919911) is the public record of the accepted exception, not evidence of independent third-party approval. It changes native-histogram persisted Struct children in place (`UInt32/UInt64` fields to `Int32/Int64`, including `count_u64`/`zero_count_u64` becoming `count_i64`/`zero_count_i64`) without a migration, downgrade, or mixed-version compatibility layer. This is an accepted release risk based on the feature being believed unused, not a compatibility guarantee.
|
||||
|
||||
## Final rebased range and appended #8902
|
||||
## Final rebased range, appended #8902, and dependency closure #8751
|
||||
|
||||
The final review range is `2f5e97850e55d86c0ed9eff1719994c88b4450a0..81fd630955f16b9c45811539aa8434b47d5a875b`, a linear 47-commit range. The superseded beta2 base `8eeff8b4417e6fb675a66cecbdba40060322785c` and endpoint `b7fdcb89568dc707c323f8c0a3b9413ec4e889ab` are historical provenance only; all active aggregate carrier fields in the TSV indexes are remapped to the rebased commits. Official #8921 is the release-base commit `2f5e97850e55d86c0ed9eff1719994c88b4450a0`, not a duplicate aggregate carrier.
|
||||
The final review range is `2f5e97850e55d86c0ed9eff1719994c88b4450a0..6f150e01cd4221d4c62c5f7082f6d318b3110e00`, a linear 48-commit range. The superseded beta2 base `8eeff8b4417e6fb675a66cecbdba40060322785c` and endpoint `b7fdcb89568dc707c323f8c0a3b9413ec4e889ab` are historical provenance only; all active aggregate carrier fields in the TSV indexes are remapped to the rebased commits. Official #8921 is the release-base commit `2f5e97850e55d86c0ed9eff1719994c88b4450a0`, not a duplicate aggregate carrier.
|
||||
|
||||
The three selected PRs #8672, #8699, and #8921 are base-present; the other selected PRs have aggregate provenance. Thus the machine-readable indexes contain exactly 36 public Issue-requested PR rows plus exactly the two closure rows (#8734 and #8392): 38 unique provenance relationships.
|
||||
The three selected PRs #8672, #8699, and #8921 are base-present; the other selected PRs have aggregate provenance. Thus the machine-readable indexes contain exactly 36 public Issue-requested PR rows plus exactly the three closure rows (#8734, #8392, and #8751): 39 unique provenance relationships.
|
||||
|
||||
PR #8902 is carried by pre-version commit `40e02ff6b62ad3445f7035e437bd9e322c8af31b`; the final version identity is recorded by non-PR release-extra commit `81fd630955f16b9c45811539aa8434b47d5a875b`; its readable decision is [Dictionary group-by fast path](decisions/dictionary-groupby-fast-path.md), and its raw patch comparison is [#8902](range-diffs/pr-8902.txt).
|
||||
PR #8902 is carried by pre-version commit `40e02ff6b62ad3445f7035e437bd9e322c8af31b`; the final version identity is recorded by non-PR release-extra commit `6f150e01cd4221d4c62c5f7082f6d318b3110e00`; its readable decision is [Dictionary group-by fast path](decisions/dictionary-groupby-fast-path.md), and its raw patch comparison is [#8902](range-diffs/pr-8902.txt).
|
||||
|
||||
@@ -45,3 +45,4 @@ fed5c80d7e94bd2c8ab1f7ddac8ab205d993156d d7f1233f775d54380318d6ad9ff62504a7cbcff
|
||||
5a642091cd2b6185fbe6a08d6f76d8295955152f b96ea86a621e7283e77e4e37dd4e3ec8dfc44f73 a1011136c44b4f6f2520683739fbd845257c0a0e feat: add JSON2 physical layout primitives
|
||||
40e02ff6b62ad3445f7035e437bd9e322c8af31b d99b0df374eec0329ac3f430e40b80a1e6c6963c; 1a91c76c615afec71239b84af7787a0505bef914 (absorbed) 8c3fca20ce058fd569d436c38bc96e41fc1adbca fix(query): restore columnar group-by for dictionary-encoded tags
|
||||
81fd630955f16b9c45811539aa8434b47d5a875b 9469fd7d7cb138515cd72d18861dd00b9dc2b74b chore: bump version to 1.2.0-beta.2
|
||||
6f150e01cd4221d4c62c5f7082f6d318b3110e00 b70daafc77c87806afd00521c368545a60e5f574 1ef6788196f8233a3d2ab7183216271210049f9a fix(meta): release region guards after drop rollback (#8751)
|
||||
|
||||
|
@@ -45,3 +45,4 @@ fed5c80d7e94bd2c8ab1f7ddac8ab205d993156d feat: add JSON2 storage layout settings
|
||||
5a642091cd2b6185fbe6a08d6f76d8295955152f feat: add JSON2 physical layout primitives
|
||||
40e02ff6b62ad3445f7035e437bd9e322c8af31b fix(query): restore columnar group-by for dictionary-encoded tags
|
||||
81fd630955f16b9c45811539aa8434b47d5a875b chore: bump version to 1.2.0-beta.2
|
||||
6f150e01cd4221d4c62c5f7082f6d318b3110e00 fix(meta): release region guards after drop rollback (#8751)
|
||||
|
||||
|
@@ -3857,7 +3857,7 @@ index 1725b1255..783fb7796 100644
|
||||
|
||||
Some(Box::new(event))
|
||||
diff --git a/src/common/meta/src/ddl/drop_table.rs b/src/common/meta/src/ddl/drop_table.rs
|
||||
index d03f8166b..5db98a5e0 100644
|
||||
index d03f8166b..b73bd95e1 100644
|
||||
--- a/src/common/meta/src/ddl/drop_table.rs
|
||||
+++ b/src/common/meta/src/ddl/drop_table.rs
|
||||
@@ -420,14 +420,14 @@ impl Procedure for DropTableProcedure {
|
||||
@@ -3879,6 +3879,18 @@ index d03f8166b..5db98a5e0 100644
|
||||
};
|
||||
|
||||
Some(Box::new(event))
|
||||
@@ -456,7 +456,10 @@ impl Procedure for DropTableProcedure {
|
||||
&self.data.region_wal_options,
|
||||
)
|
||||
.await
|
||||
- .map_err(ProcedureError::external)
|
||||
+ .map_err(ProcedureError::external)?;
|
||||
+
|
||||
+ self.dropping_regions.clear();
|
||||
+ Ok(())
|
||||
}
|
||||
}
|
||||
|
||||
diff --git a/src/common/meta/src/ddl/drop_view.rs b/src/common/meta/src/ddl/drop_view.rs
|
||||
index 3804df686..32d843fbd 100644
|
||||
--- a/src/common/meta/src/ddl/drop_view.rs
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
**Start here.** This is the canonical, priority-ordered index of behavior that was
|
||||
reconstructed, sliced, folded, or adapted for v1.2.0-beta.2. The aggregate head
|
||||
is [`81fd630955f`](https://github.com/GreptimeTeam/greptimedb/commit/81fd630955f16b9c45811539aa8434b47d5a875b);
|
||||
is [`6f150e01cd4`](https://github.com/GreptimeTeam/greptimedb/commit/6f150e01cd4221d4c62c5f7082f6d318b3110e00);
|
||||
links to the shipping commits below are immutable commit links.
|
||||
|
||||
A range-diff is an audit of the *difference between two patches*, not the full
|
||||
@@ -11,7 +11,9 @@ not edited.
|
||||
|
||||
## Canonical CI status
|
||||
|
||||
The recorded historical [GitHub Actions run 32341712112](https://github.com/GreptimeTeam/greptimedb/actions/runs/32341712112), whose actual head SHA was `b5c38fbfc15053f42d4c1d843204bbdd52cb4a00`, completed with conclusion **failure** on the superseded-base aggregate. Failed jobs were **Clippy**, **Check Unused Dependencies**, and **Check (ubuntu-latest)**. **SQLness**, **Compatibility Test**, binary builds, **Rustfmt**, license, and fuzz jobs passed. **`test` was skipped downstream because Clippy and Check Unused Dependencies failed, while `coverage` was skipped independently because this was a `workflow_dispatch` run and coverage runs only for `merge_group`, not because of failed prerequisites.** No CI run or result is recorded for the final range `2f5e97850e55d86c0ed9eff1719994c88b4450a0..81fd630955f16b9c45811539aa8434b47d5a875b`; this is recorded CI evidence only, and local verification claims remain limited to the existing top-level README and `manual-deltas.md`.
|
||||
The recorded historical [GitHub Actions run 32341712112](https://github.com/GreptimeTeam/greptimedb/actions/runs/32341712112), whose actual head SHA was `b5c38fbfc15053f42d4c1d843204bbdd52cb4a00`, failed on the superseded-base aggregate: Clippy, Check Unused Dependencies, and Check (ubuntu-latest) failed; SQLness, Compatibility Test, binary builds, Rustfmt, license, and fuzz passed; `test` was skipped downstream because Clippy and Check Unused Dependencies failed, while `coverage` was skipped independently because this was a `workflow_dispatch` run and coverage runs only for `merge_group`. The later [Release run 32462587383](https://github.com/GreptimeTeam/greptimedb/actions/runs/32462587383) ran at pre-#8751 head `81fd630955f16b9c45811539aa8434b47d5a875b`; Windows job `96713326607` failed in the composite Windows-artifact step, and the overall run was subsequently cancelled with dependent jobs cancelled. This is Windows job evidence, not a root-cause attribution to #8751 and not final CI for the refreshed head.
|
||||
|
||||
Recorded local before/after verification is: before #8751, Main 4/4 failed; after #8751, Main 20/20 passed with no retry (log SHA `fa9ae951fa78dce66c7b0aedc81cd172c9fc898445712162c616c99aeb7000d8`), and common-meta 546/546 passed with no retry (log SHA `84b54cdff1767a2c0e0683e59a955472eacabc769871c5d893940f07d932a79a`). No final CI result is claimed for the refreshed range `2f5e97850e55d86c0ed9eff1719994c88b4450a0..6f150e01cd4221d4c62c5f7082f6d318b3110e00`; these are recorded local verification results only.
|
||||
|
||||
## 1. BLOCKING / compatibility decisions
|
||||
|
||||
@@ -29,6 +31,12 @@ The recorded historical [GitHub Actions run 32341712112](https://github.com/Grep
|
||||
| **Adapted and folded; compatibility validation retained** | [#8579](https://github.com/GreptimeTeam/greptimedb/commit/bbc91ea637516c4657a8cdb9f40289f126b9ef61) + [#8818](https://github.com/GreptimeTeam/greptimedb/commit/cd6efa0abf6ec99737ad8bce36376c4946023edc) | [reconstructed carrier](https://github.com/GreptimeTeam/greptimedb/commit/9d8894b7f8b3e3391e4347f1a7a9ce3d1c5182fa) | #8818 metadata rules are folded into #8579; unrelated #8615 lifecycle APIs are not imported. | [Remote schema validation](remote-schema-validation.md) |
|
||||
| **Adapted; shared Channel plus legacy event-context compatibility** | [#8734](https://github.com/GreptimeTeam/greptimedb/commit/1f1c9270a806658d2c3d9700c8cd1445d687f89f), [#8834](https://github.com/GreptimeTeam/greptimedb/commit/72f6cf09bf7f7d78c84514163554ad2a29fc7f05), [#8835](https://github.com/GreptimeTeam/greptimedb/commit/943eee852f292bfffd7240867dc27248216c353f), [#8852](https://github.com/GreptimeTeam/greptimedb/commit/154f90b3652bf9b1b3e7eccc5f277f856a2f3079), [#8825](https://github.com/GreptimeTeam/greptimedb/commit/60c7bbcaf30a0e65ad7fa2b2b8ad0c1199a662b1) | [#8734](https://github.com/GreptimeTeam/greptimedb/commit/e9ad585975022b206275afb2735ac480869bcd33), [#8834](https://github.com/GreptimeTeam/greptimedb/commit/5d059c84bd2f7ecb724d5a84501196d57f27481a), [#8835](https://github.com/GreptimeTeam/greptimedb/commit/22174d32dadf9ea58073b15c72828db9927969c6), [#8852](https://github.com/GreptimeTeam/greptimedb/commit/2927fa339ec677fb632a8940bcd0d43eea78881a), [#8825 carrier](https://github.com/GreptimeTeam/greptimedb/commit/d18430b874f9c8054747dbf688585cd7d2988e3e), [rolling fallback](https://github.com/GreptimeTeam/greptimedb/commit/46edabe916a10c2cafe816b8fe01f0d5da8fffc8), [single conversion](https://github.com/GreptimeTeam/greptimedb/commit/e61a6df6b2b110badd5755f68010b6439d69ac84) | #8825 replaces `common_session::channel_protocol` with shared `common_base::protocol::Channel` while preserving old-frontend fallback and exactly-once protobuf → PersistentEventContext → ProcedureEventInput conversion; schemas are unchanged. | [Event context compatibility](event-context-compatibility.md) |
|
||||
|
||||
## Dependency closure: #8751 required by #8734
|
||||
|
||||
Upstream [#8751](https://github.com/GreptimeTeam/greptimedb/pull/8751), merge `b70daafc77c87806afd00521c368545a60e5f574`, is required by the selected upstream #8734 event-context sequence and is recorded in the provenance indexes as a closure relationship. Its aggregate carrier is `6f150e01cd4221d4c62c5f7082f6d318b3110e00`.
|
||||
|
||||
The upstream patch contains both a production cleanup and a rollback regression test. The test hunk was already present through the existing backport sequence, so the carrier intentionally contains only the production hunk. Because this is a partial production-only carrier, the stable patch ID differs from the full upstream patch; the verdict is **adapted**, not exact. See [`range-diffs/pr-8751.txt`](../range-diffs/pr-8751.txt).
|
||||
|
||||
## 3. Reconstructed/folded semantics
|
||||
|
||||
| Status | Original PR(s) | Aggregate carrier(s) | Relative to original PR | Concern |
|
||||
@@ -56,7 +64,7 @@ Exact entries with nearby context can be reviewed from [dependency and baseline
|
||||
|
||||
## Final provenance scope
|
||||
|
||||
The final review records 36 public Issue-requested PR relationships: the original 31 plus #8825, #8921, #8895, #8901, and #8902. Three selected PRs—#8672, #8699, and #8921—are base-present. The dependency closure adds exactly two relationships: full #8734 and the release-compatible slice of #8392. The indexes therefore contain 38 unique PR provenance relationships total; the non-PR version identity commit is recorded separately in the aggregate provenance ledger. The patch-ID verdict contains 14 exact stable patch-ID relationships and 20 adapted relationships; its exact list includes #8901. The #8895 and #8901 mappings and complete upstream ranges are covered in [JSON2 merge/layout coverage](json2-mergescan.md) and [`manual-deltas.md`](../manual-deltas.md).
|
||||
The final review records 36 public Issue-requested PR relationships: the original 31 plus #8825, #8921, #8895, #8901, and #8902. Three selected PRs—#8672, #8699, and #8921—are base-present. The dependency closure adds exactly three relationships: full #8734, the release-compatible slice of #8392, and #8751 (upstream merge `b70daafc77c87806afd00521c368545a60e5f574`). The indexes therefore contain 39 unique PR provenance relationships total; the non-PR version identity commit is recorded separately in the aggregate provenance ledger. The patch-ID verdict contains 14 exact stable patch-ID relationships and 21 adapted relationships; its exact list includes #8901. The #8895 and #8901 mappings and complete upstream ranges are covered in [JSON2 merge/layout coverage](json2-mergescan.md) and [`manual-deltas.md`](../manual-deltas.md).
|
||||
|
||||
## Recorded verification context
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@ Immutable upstream patches: [#8734](https://github.com/GreptimeTeam/greptimedb/c
|
||||
|
||||
## Resulting backport patch — what ships
|
||||
|
||||
Carriers are [#8734](https://github.com/GreptimeTeam/greptimedb/commit/e9ad585975022b206275afb2735ac480869bcd33), [#8834](https://github.com/GreptimeTeam/greptimedb/commit/5d059c84bd2f7ecb724d5a84501196d57f27481a), [#8835](https://github.com/GreptimeTeam/greptimedb/commit/22174d32dadf9ea58073b15c72828db9927969c6), and [#8852](https://github.com/GreptimeTeam/greptimedb/commit/2927fa339ec677fb632a8940bcd0d43eea78881a). The #8825 carrier is [d18430b874f9c8054747dbf688585cd7d2988e3e](https://github.com/GreptimeTeam/greptimedb/commit/d18430b874f9c8054747dbf688585cd7d2988e3e), the final aggregate head is `81fd630955f16b9c45811539aa8434b47d5a875b` (with `40e02ff6b62ad3445f7035e437bd9e322c8af31b` as the pre-version carrier). Rolling extras [legacy fallback](https://github.com/GreptimeTeam/greptimedb/commit/46edabe916a10c2cafe816b8fe01f0d5da8fffc8) and [single conversion](https://github.com/GreptimeTeam/greptimedb/commit/e61a6df6b2b110badd5755f68010b6439d69ac84) complete compatibility. The narrow test adaptations [9bf878f5](https://github.com/GreptimeTeam/greptimedb/commit/9bf878f562518d30a412138ad4244d7d8e7867e6) and [6595b5d7b](https://github.com/GreptimeTeam/greptimedb/commit/6595b5d7bf1f59587bf89676d420db7371cdc459) are retained and not reverted.
|
||||
Carriers are [#8734](https://github.com/GreptimeTeam/greptimedb/commit/e9ad585975022b206275afb2735ac480869bcd33), [#8834](https://github.com/GreptimeTeam/greptimedb/commit/5d059c84bd2f7ecb724d5a84501196d57f27481a), [#8835](https://github.com/GreptimeTeam/greptimedb/commit/22174d32dadf9ea58073b15c72828db9927969c6), and [#8852](https://github.com/GreptimeTeam/greptimedb/commit/2927fa339ec677fb632a8940bcd0d43eea78881a). The #8825 carrier is [d18430b874f9c8054747dbf688585cd7d2988e3e](https://github.com/GreptimeTeam/greptimedb/commit/d18430b874f9c8054747dbf688585cd7d2988e3e), the final aggregate head is `6f150e01cd4221d4c62c5f7082f6d318b3110e00` (with `40e02ff6b62ad3445f7035e437bd9e322c8af31b` as the pre-version carrier). Rolling extras [legacy fallback](https://github.com/GreptimeTeam/greptimedb/commit/46edabe916a10c2cafe816b8fe01f0d5da8fffc8) and [single conversion](https://github.com/GreptimeTeam/greptimedb/commit/e61a6df6b2b110badd5755f68010b6439d69ac84) complete compatibility. The narrow test adaptations [9bf878f5](https://github.com/GreptimeTeam/greptimedb/commit/9bf878f562518d30a412138ad4244d7d8e7867e6) and [6595b5d7b](https://github.com/GreptimeTeam/greptimedb/commit/6595b5d7bf1f59587bf89676d420db7371cdc459) are retained and not reverted.
|
||||
|
||||
## PR #8825 mapping and exact conflict resolution
|
||||
|
||||
|
||||
@@ -47,4 +47,4 @@ The explicit Issue-requested JSON2 layout PRs are also represented in the machin
|
||||
- **#8895**: upstream merge `d7f1233f775d54380318d6ad9ff62504a7cbcff1`, head `6b8645bf584a04b45828c7e8d0fb19418db70d2e`, complete upstream range `0a6a22033e3ebb4d6c7243874d840558a9eb7216^..6b8645bf584a04b45828c7e8d0fb19418db70d2e`, aggregate carrier `fed5c80d7e94bd2c8ab1f7ddac8ab205d993156d`. The carrier folds the two upstream commits, retains JSON2 DDL/layout settings, and omits the upstream-only >=v1.3.0 compatibility case; it is `adapted`.
|
||||
- **#8901**: upstream merge `b96ea86a621e7283e77e4e37dd4e3ec8dfc44f73`, head `b450abd46e473a07cb1b42a9c7c62d0b0d551e17`, complete upstream range `6e637fbe58f36643fea40f38d5ff352fe00254f9^..b450abd46e473a07cb1b42a9c7c62d0b0d551e17`, aggregate carrier `5a642091cd2b6185fbe6a08d6f76d8295955152f`. The carrier folds the three upstream commits and is `exact` by stable patch ID.
|
||||
|
||||
These are part of the 36 public Issue-requested PR relationships: the original 31 plus #8825, #8921, #8895, #8901, and #8902. Together with base-present #8672/#8699/#8921 and the two closure relationships (#8734 full, #8392 release-compatible slice), the review contains 38 provenance relationships.
|
||||
These are part of the 36 public Issue-requested PR relationships: the original 31 plus #8825, #8921, #8895, #8901, and #8902. Together with base-present #8672/#8699/#8921 and the three closure relationships (#8734 full, #8392 release-compatible slice, and #8751), the review contains 39 provenance relationships.
|
||||
|
||||
@@ -76,14 +76,14 @@ The canonical reviewer index is [`decisions/README.md`](decisions/README.md). Th
|
||||
### Other Query adaptations
|
||||
- #8659 differs because it is replayed on release protocol/server APIs.
|
||||
- #8898 is the dashboard version update only, adapted to the release file state.
|
||||
- The 14 exact stable patch-ID relationships are #8777, #8832, #8787, #8849, #8859, #8889, #8833, #8600, #8808, #8709, #8522, #8739, #8772, and #8901. The remaining 20 verdicts are adapted.
|
||||
- The 14 exact stable patch-ID relationships are #8777, #8832, #8787, #8849, #8859, #8889, #8833, #8600, #8808, #8709, #8522, #8739, #8772, and #8901. The remaining 21 verdicts are adapted, including the production-only partial #8751 carrier.
|
||||
|
||||
## Platform / Event
|
||||
|
||||
### #8825 — adapted
|
||||
- Upstream PR head: `bf947141753a9ea554aa1ca31637fdd3ad1429f3`; merge: `60c7bbcaf30a0e65ad7fa2b2b8ad0c1199a662b1`.
|
||||
- Requested by WenyXu in [Issue #8892 comment 5353700059](https://github.com/GreptimeTeam/greptimedb/issues/8892#issuecomment-5353700059).
|
||||
- Aggregate carrier: `d18430b874f9c8054747dbf688585cd7d2988e3e`; final aggregate head: `81fd630955f16b9c45811539aa8434b47d5a875b` (the pre-version carrier remains `40e02ff6b62ad3445f7035e437bd9e322c8af31b`).
|
||||
- Aggregate carrier: `d18430b874f9c8054747dbf688585cd7d2988e3e`; final aggregate head: `6f150e01cd4221d4c62c5f7082f6d318b3110e00` (the pre-version carrier remains `40e02ff6b62ad3445f7035e437bd9e322c8af31b`).
|
||||
- Adds shared `common_base::protocol::Channel`, re-exports it as `session::context::Channel`, and retains stable wire values/names and `Unknown` behavior. Session dialect mapping remains through the `dialect_for_channel` helper; common-meta derives protocol names from shared `Channel`.
|
||||
- Semantic conflict resolution is explicit: shared mapping replaces `common_session::channel_protocol`, but the aggregate preserves the old-frontend fallback for omitted protobuf `event_context` and exactly-once protobuf → `PersistentEventContext` → `ProcedureEventInput` conversion. Actor/event JSON and protobuf schemas are unchanged.
|
||||
- Narrow test adaptations `9bf878f5` and `6595b5d7b` are retained and not reverted.
|
||||
@@ -153,4 +153,16 @@ The canonical reviewer index is [`decisions/README.md`](decisions/README.md). Th
|
||||
|
||||
## Final provenance scope
|
||||
|
||||
The final review records 36 public Issue-requested PR relationships: the original 31 plus #8825, #8921, #8895, #8901, and #8902. Of those, #8672, #8699, and #8921 are base-present. The dependency closure contributes exactly two additional relationships—full #8734 and the release-compatible slice of #8392—for 38 unique provenance relationships total.
|
||||
The final review records 36 public Issue-requested PR relationships: the original 31 plus #8825, #8921, #8895, #8901, and #8902. Of those, #8672, #8699, and #8921 are base-present. The dependency closure contributes exactly three additional relationships—full #8734, the release-compatible slice of #8392, and #8751—for 39 unique provenance relationships total.
|
||||
|
||||
|
||||
### #8751 — adapted, dependency closure required by #8734
|
||||
- Upstream merge: `b70daafc77c87806afd00521c368545a60e5f574`; aggregate carrier: `6f150e01cd4221d4c62c5f7082f6d318b3110e00`.
|
||||
- #8751 is required by the selected upstream #8734 event-context chain and adds one provenance closure relationship.
|
||||
- The upstream patch has a production cleanup hunk and a rollback regression-test hunk. The regression test was already present through the existing backport sequence, so the aggregate carrier intentionally contains only the production hunk.
|
||||
- This production-only partial carrier is classified `adapted`, not `exact`: stable patch IDs differ (`4d065c99ef5f69e5a801dc261eb19a432748d760` upstream versus `1ef6788196f8233a3d2ab7183216271210049f9a` carrier).
|
||||
- Raw evidence: [`range-diffs/pr-8751.txt`](range-diffs/pr-8751.txt).
|
||||
|
||||
### Release and local verification evidence
|
||||
- Release run [32462587383](https://github.com/GreptimeTeam/greptimedb/actions/runs/32462587383) used the pre-#8751 head `81fd630955f16b9c45811539aa8434b47d5a875b`. Windows job `96713326607` failed in the composite Windows-artifact step; the overall run was later cancelled, so this is not final CI for the refreshed head and is not attributed to #8751 without further evidence.
|
||||
- Recorded local before/after results: Main before #8751 4/4 failed; Main after #8751 20/20 passed without retry, log SHA `fa9ae951fa78dce66c7b0aedc81cd172c9fc898445712162c616c99aeb7000d8`; common-meta after #8751 546/546 passed without retry, log SHA `84b54cdff1767a2c0e0683e59a955472eacabc769871c5d893940f07d932a79a`.
|
||||
|
||||
@@ -32,3 +32,4 @@
|
||||
8902 d99b0df374eec0329ac3f430e40b80a1e6c6963c 40e02ff6b62ad3445f7035e437bd9e322c8af31b adapted bdc71e83b0147f1d94f1db4cbe80d0dbf8a6aa58 8c3fca20ce058fd569d436c38bc96e41fc1adbca
|
||||
8895 d7f1233f775d54380318d6ad9ff62504a7cbcff1 fed5c80d7e94bd2c8ab1f7ddac8ab205d993156d adapted e26d83fb1aab2ee25d7e9d74ba1c42a163507c0d ba5de162f5dd269aa0081d8d97492c578fc37d05
|
||||
8901 b96ea86a621e7283e77e4e37dd4e3ec8dfc44f73 5a642091cd2b6185fbe6a08d6f76d8295955152f exact a1011136c44b4f6f2520683739fbd845257c0a0e a1011136c44b4f6f2520683739fbd845257c0a0e
|
||||
8751 b70daafc77c87806afd00521c368545a60e5f574 6f150e01cd4221d4c62c5f7082f6d318b3110e00 adapted 4d065c99ef5f69e5a801dc261eb19a432748d760 1ef6788196f8233a3d2ab7183216271210049f9a
|
||||
|
||||
|
@@ -0,0 +1,49 @@
|
||||
PR #8751
|
||||
Upstream PR merge commit: b70daafc77c87806afd00521c368545a60e5f574
|
||||
Aggregate carrier: 6f150e01cd4221d4c62c5f7082f6d318b3110e00
|
||||
Upstream range: b70daafc77c87806afd00521c368545a60e5f574^..b70daafc77c87806afd00521c368545a60e5f574
|
||||
Aggregate range: 6f150e01cd4221d4c62c5f7082f6d318b3110e00^..6f150e01cd4221d4c62c5f7082f6d318b3110e00
|
||||
Dependency closure: required by upstream #8734's event-context sequence.
|
||||
Adaptation notes: upstream #8751 includes a production cleanup hunk and a rollback regression-test hunk. The aggregate carrier contains only the production cleanup because the regression-test hunk was already present through the existing backport sequence (in carrier e9ad585975022b206275afb2735ac480869bcd33). This is a production-only partial carrier, so stable patch-ID equality is not expected and the verdict is adapted rather than exact.
|
||||
Command: git range-diff --creation-factor=100 b70daafc77c87806afd00521c368545a60e5f574^..b70daafc77c87806afd00521c368545a60e5f574 6f150e01cd4221d4c62c5f7082f6d318b3110e00^..6f150e01cd4221d4c62c5f7082f6d318b3110e00
|
||||
|
||||
1: b70daafc7 ! 1: 6f150e01c fix(meta): release region guards after drop rollback (#8751)
|
||||
@@
|
||||
## Metadata ##
|
||||
-Author: Weny Xu <wenymedia@gmail.com>
|
||||
+Author: discord9 <discord9@163.com>
|
||||
|
||||
## Commit message ##
|
||||
fix(meta): release region guards after drop rollback (#8751)
|
||||
|
||||
- Signed-off-by: WenyXu <wenymedia@gmail.com>
|
||||
+ (cherry picked from commit b70daafc77c87806afd00521c368545a60e5f574)
|
||||
+ Signed-off-by: discord9 <discord9@163.com>
|
||||
|
||||
## src/common/meta/src/ddl/drop_table.rs ##
|
||||
@@ src/common/meta/src/ddl/drop_table.rs: impl Procedure for DropTableProcedure {
|
||||
@@ src/common/meta/src/ddl/drop_table.rs: impl Procedure for DropTableProcedure {
|
||||
}
|
||||
}
|
||||
|
||||
-
|
||||
- ## src/common/meta/src/ddl/tests/drop_table.rs ##
|
||||
-@@ src/common/meta/src/ddl/tests/drop_table.rs: async fn test_on_rollback() {
|
||||
- procedure.on_delete_metadata().await.unwrap();
|
||||
- assert!(procedure.rollback_supported());
|
||||
- procedure.rollback(&ctx).await.unwrap();
|
||||
-+ assert!(procedure.dropping_regions.is_empty());
|
||||
-+ assert_eq!(ddl_context.memory_region_keeper.len(), 0);
|
||||
-+
|
||||
-+ // The physical table can be dropped again after the metadata rollback.
|
||||
-+ let retry_task = new_drop_table_task("phy_table", physical_table_id, false);
|
||||
-+ let mut retry = DropTableProcedure::new(retry_task, ddl_context.clone());
|
||||
-+ retry.on_prepare().await.unwrap();
|
||||
-+ retry.on_delete_metadata().await.unwrap();
|
||||
-+ retry.rollback(&ctx).await.unwrap();
|
||||
-+ assert!(retry.dropping_regions.is_empty());
|
||||
-+ assert_eq!(ddl_context.memory_region_keeper.len(), 0);
|
||||
-+
|
||||
- // Rollback again
|
||||
- assert!(procedure.rollback_supported());
|
||||
- procedure.rollback(&ctx).await.unwrap();
|
||||
@@ -13,7 +13,7 @@
|
||||
- Aggregate carrier: `d18430b874f9c8054747dbf688585cd7d2988e3e`
|
||||
- Aggregate carrier parent: `6595b5d7bf1f59587bf89676d420db7371cdc459`
|
||||
- Aggregate carrier link: [d18430b874f9c8054747dbf688585cd7d2988e3e](https://github.com/GreptimeTeam/greptimedb/commit/d18430b874f9c8054747dbf688585cd7d2988e3e)
|
||||
- Aggregate final head: `81fd630955f16b9c45811539aa8434b47d5a875b` (pre-version carrier: `40e02ff6b62ad3445f7035e437bd9e322c8af31b`)
|
||||
- Aggregate final head: `6f150e01cd4221d4c62c5f7082f6d318b3110e00` (pre-version carrier: `40e02ff6b62ad3445f7035e437bd9e322c8af31b`)
|
||||
- Narrow release test adaptations retained before the carrier: `9bf878f562518d30a412138ad4244d7d8e7867e6`, `6595b5d7bf1f59587bf89676d420db7371cdc459`.
|
||||
|
||||
## Why no range-diff is recorded
|
||||
|
||||
@@ -36,3 +36,4 @@
|
||||
8921 2f5e97850e55d86c0ed9eff1719994c88b4450a0 BASE-PRESENT (official release base) https://github.com/GreptimeTeam/greptimedb/pull/8921 fix: clear pooled Prometheus Remote Write decoder state
|
||||
8895 d7f1233f775d54380318d6ad9ff62504a7cbcff1 MERGED https://github.com/GreptimeTeam/greptimedb/pull/8895 refactor(json2): support JSON2 storage layout settings in DDL
|
||||
8901 b96ea86a621e7283e77e4e37dd4e3ec8dfc44f73 MERGED https://github.com/GreptimeTeam/greptimedb/pull/8901 refactor(json2): add JSON2 v2 physical layout primitives
|
||||
8751 b70daafc77c87806afd00521c368545a60e5f574 MERGED https://github.com/GreptimeTeam/greptimedb/pull/8751 fix(meta): release region guards after drop rollback
|
||||
|
||||
|
Reference in New Issue
Block a user