[bot] Merge 26.7 to 26.9 (Conflicts) - #8004
Merged
Merged
Conversation
## Rationale Analysis shows that our current 1 hour retention for materialized tables is way too short for sample type scenarios. Additionally, without doing an analyze the DB may not be making good query plan choices. ## Changes - Update retention from 1->12 hours as an incremental testing step - `ANALYZE` materialized table as part of its creation ## Tasks - [ ] Claude Code Review - [ ] Manual Testing - Test Automation - N/A
…7996) ## Rationale Datadog tracks queries executed for an HTTP request. We don't have the proper wiring to make the async query and aggregates connect to their HTTP request. ## Changes - Switch how the spans are tracked - Improve naming for the spans - Intentionally keep materializing queries separate from the event that invoked them - Track errors and cancellations separately ## Tasks - [x] Claude Code Review - Manual Testing - N/A - Test Automation - N/A
…e number of samples (#7992)
cnathe
force-pushed
the
26.9_fb_bot_merge_26.7
branch
from
September 1, 2026 14:31
5b8944a to
d7f3ed2
Compare
cnathe
approved these changes
Sep 1, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Automatic merge failed! Please merge
26.7into26.9_fb_bot_merge_26.7and resolve conflicts manually.Resolve all conflicts (using IntelliJ or
git mergetool)Approve all matching PRs simultaneously.
Approval will trigger automatic merge.
Verify all PRs before approving: https://internal.labkey.com/Scrumtime/Backlog/harvest-gitOpenPullRequests.view?branch=26.9_fb_bot_merge_26.7