Skip to content

[bot] Fast-forward for 26.9.0 - #1007

Merged
github-actions[bot] merged 9 commits into
release26.9from
26.9_ff_bot_26.9.0
Sep 16, 2026
Merged

github-actions[bot] merged 9 commits into
release26.9from
26.9_ff_bot_26.9.0

Conversation

@github-actions

Copy link
Copy Markdown

Generated automatically.
Approve all matching PRs simultaneously.
Approval will trigger automatic merge.
View all PRs: https://internal.labkey.com/Scrumtime/Backlog/harvest-gitOpenPullRequests.view?branch=26.9_ff_bot_26.9.0

labkey-martyp and others added 9 commits August 25, 2026 21:05
## Rationale

Removes this module's last references to MergeSync, which is being
retired. The labwork request form they belonged to is not registered, so
none of this code was reachable at runtime.

## Changes

- Removes the Merge integration from the labwork request form, along
with its instructions panel.
- Drops the prompt that offered to open Merge after a request was
submitted.
…985)

## Rationale

Make it possible to tell from the ETL job log which event data rows
ended up holding no attribute values. The _SND Event Data step clears
attribute values as a side effect of its merge and only the _SND
Attribute Data step restores them; because the two steps decide
independently which rows to process, a mismatch leaves event data
silently stripped. Newly inserted rows carry the same exposure, arriving
with no attribute values and depending on that same second step to
supply them. Until now nothing in the log identified the rows either
step handled, so the problem could only be found by querying the
database after the fact.

## Changes

- Both ETL steps log the EventDataIds they handled, so the two logs can
be diffed against each other.
- The event data step logs on every path that touches exp.Object: merge,
insert, and delete.
- The merge also logs which rows are about to have their attribute
values cleared.
- The attribute data step logs the rows it received, the rows it wrote,
and the difference between them.
- The attribute data step reports when its source rows arrive ungrouped,
which is one way the values fail to be restored.
- Failures that abort the attribute data step now name the row that
failed and note that the batch was left with its attribute values
cleared.
- Both steps also log the source rowversion span of each batch, so the
rows a step actually handled can be placed against the incremental
window the ETL logs for the run.
- The attribute data step pairs each EventDataId it left unwritten with
its rowversion; one falling inside the window points at the source view
dropping the row rather than at a window mismatch.
- Id lists are sorted and chunked for diffing, and omitted above 2000
ids so the full batches of an initial load don't flood the log.
- Everything logs at debug, which the ETL job logger runs at by default;
the diagnostics that cost queries or memory are skipped when debug is
off.
- No change to what the merge writes.
)

This PR has code changes related to ASI Observation datasets.
@github-actions
github-actions Bot merged commit f568bea into release26.9 Sep 16, 2026
17 checks passed
@github-actions
github-actions Bot deleted the 26.9_ff_bot_26.9.0 branch September 16, 2026 18:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants