Skip to content

Skip conflict-log message assembly when the level is suppressed#492

Merged
mason-sharp merged 1 commit into
v5_STABLEfrom
feat/check-before-conflict-log
Jun 8, 2026
Merged

Skip conflict-log message assembly when the level is suppressed#492
mason-sharp merged 1 commit into
v5_STABLEfrom
feat/check-before-conflict-log

Conversation

@mason-sharp

Copy link
Copy Markdown
Member

spock_report_conflict() stringified both the local and remote tuples (tuple_to_stringinfo deforms every attribute and calls type-output functions) and did catalog lookups unconditionally, once per conflicting row -- even when the ereport() would be discarded by the active log thresholds.

Guard the message assembly with message_level_is_interesting() so a high-conflict apply stream stops paying to format log lines nobody will see. The resolutions-table write above is gated separately and is unaffected.

spock_report_conflict() stringified both the local and remote tuples
(tuple_to_stringinfo deforms every attribute and calls type-output functions)
and did catalog lookups unconditionally, once per conflicting row -- even when
the ereport() would be discarded by the active log thresholds.

Guard the message assembly with message_level_is_interesting() so a
high-conflict apply stream stops paying to format log lines nobody will see.
The resolutions-table write above is gated separately and is unaffected.
@mason-sharp mason-sharp requested a review from ibrarahmad June 8, 2026 16:00
@coderabbitai

coderabbitai Bot commented Jun 8, 2026

Copy link
Copy Markdown

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro

Run ID: a78d4852-97e3-43c7-a838-a8563c50dced

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch feat/check-before-conflict-log

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

@codacy-production

Copy link
Copy Markdown

Up to standards ✅

🟢 Issues 0 issues

Results:
0 new issues

View in Codacy

🟢 Metrics 0 duplication

Metric Results
Duplication 0

View in Codacy

NEW Get contextual insights on your PRs based on Codacy's metrics, along with PR and Jira context, without leaving GitHub. Enable AI reviewer
TIP This summary will be updated as you push new changes.

@mason-sharp mason-sharp merged commit 35d7990 into v5_STABLE Jun 8, 2026
6 checks passed
@mason-sharp mason-sharp deleted the feat/check-before-conflict-log branch June 8, 2026 16:35
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.

2 participants