Skip to content

Antalya 26.6: Hybrid tables - #2144

Open
zvonand wants to merge 6 commits into
antalya-26.6from
feature/antalya-26.6/auto-grp-pr-1694
Open

Antalya 26.6: Hybrid tables#2144
zvonand wants to merge 6 commits into
antalya-26.6from
feature/antalya-26.6/auto-grp-pr-1694

Conversation

@zvonand

@zvonand zvonand commented Aug 3, 2026

Copy link
Copy Markdown
Member

Changelog category (leave one):

  • New Feature

Changelog entry (a user-readable short description of the changes that goes to CHANGELOG.md):

Add support for Hybrid tables, which combine local MergeTree storage with data in object storage behind a configurable watermark. Watermarks can be moved with ALTER TABLE MODIFY SETTING and inspected via the new system.hybrid_watermarks table, and queries now skip segments that cannot match the combination of the WHERE clause and the segment predicate.

DONE
Add support for Hybrid tables, which combine local MergeTree storage with data in object storage behind a configurable watermark. Watermarks can be moved with ALTER TABLE MODIFY SETTING and inspected via the new system.hybrid_watermarks table, and queries now skip segments that cannot match the combination of the WHERE clause and the segment predicate.

DONE (#1694 by @zvonand, #1723 by @mkmkme, #1788 by @mkmkme, #1789 by @mkmkme).

CI/CD Options

Exclude tests:

  • Fast test
  • Integration Tests
  • Stateless tests
  • Stateful tests
  • Performance tests
  • All with ASAN
  • All with TSAN
  • All with MSAN
  • All with UBSAN
  • All with Coverage
  • All with Aarch64
  • All Regression
  • Disable CI Cache

Regression jobs to run:

  • Fast suites (mostly <1h)
  • Aggregate Functions (2h)
  • Alter (1.5h)
  • Benchmark (30m)
  • ClickHouse Keeper (1h)
  • Iceberg (2h)
  • LDAP (1h)
  • Parquet (1.5h)
  • RBAC (1.5h)
  • SSL Server (1h)
  • S3 (2h)
  • S3 Export (2h)
  • Swarms (30m)
  • Tiered Storage (2h)

Combined port of 4 PR(s) (group auto-grp-pr-1694). Cherry-picked from #1694, #1723, #1788, #1789.

zvonand added 6 commits August 3, 2026 10:54
…next commit)

---
Original cherry-pick message follows:

Merge pull request #1694 from Altinity/feature/antalya-26.3/pr-1442

Antalya 26.3 forward-port: Hybrid tables
# Conflicts:
#	src/Core/Settings.cpp
#	src/Interpreters/ClusterProxy/executeQuery.cpp
#	src/Planner/Utils.cpp
#	src/Storages/StorageDistributed.cpp
…move-watermark

Antalya-26.3 Frontport of #1659 - Add ALTER TABLE MODIFY SETTING support for Hybrid watermarks

Source-PR: #1723 (#1723)
…next commit)

---
Original cherry-pick message follows:

Merge pull request #1788 from Altinity/mkmkme/antalya-26.3/hybrid-segment-pruning

Antalya 26.3 Hybrid: added support for segment pruning
# Conflicts:
#	src/Storages/StorageDistributed.cpp
Kept the PR's `StorageDistributed::getStorageSnapshot()` override, which
freezes the Hybrid watermark snapshot in `HybridSnapshotData`.

Adapted: re-added the `getStorageSnapshot()` declaration in
StorageDistributed.h, removed by antalya-26.6 commit 5d159b3
("rewrite getStorageSnapshot to getInMemoryMetadataPtr"), so the
source PR's override body compiles.

Source-PR: #1788 (#1788)
…tem-table

hybrid: added system.hybrid_watermarks to inspect the Hybrid table watermarks
Source-PR: #1789 (#1789)
@zvonand zvonand added releasy Created/managed by RelEasy antalya-26.6 ai-resolved Port conflict auto-resolved by Claude labels Aug 3, 2026
@github-actions

github-actions Bot commented Aug 3, 2026

Copy link
Copy Markdown

Workflow [PR], commit [78baf98]

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ai-resolved Port conflict auto-resolved by Claude antalya-26.6 releasy Created/managed by RelEasy

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant