Skip to content

Antalya 26.5: Antalya 26.1 forward-port: Hybrid tables#1961

Open
zvonand wants to merge 4 commits into
antalya-26.5from
feature/antalya-26.5/pr-1789
Open

Antalya 26.5: Antalya 26.1 forward-port: Hybrid tables#1961
zvonand wants to merge 4 commits into
antalya-26.5from
feature/antalya-26.5/pr-1789

Conversation

@zvonand

@zvonand zvonand commented Jun 25, 2026

Copy link
Copy Markdown
Member

Auto-ported prerequisites: RelEasy detected that the requested port depended on PR(s) not yet on the target branch and auto-ported them first (2 PR(s) added). Reviewers: please confirm the prereq scope is appropriate.

Changelog category (leave one):

  • New Feature

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

#1071
#1156
#1272 (#1442 by @filimonov, #1723 by @mkmkme) (#1956 by @zvonand, #1939 by @zvonand, #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 3 PR(s) (group pr-1789). Cherry-picked from #1956, #1939, #1789.

zvonand added 4 commits June 25, 2026 02:33
…next commit)

---
Original cherry-pick message follows:

Merge 0b3d34b into e9c8a02

# Conflicts:
#	docs/en/engines/table-engines/special/hybrid.md
#	src/Functions/identity.cpp
#	src/Storages/StorageDistributed.cpp
#	src/Storages/StorageDistributed.h
In hybrid.md: kept HEAD's hybridParam() documentation sections (dynamic
watermarks feature already on antalya-26.5).

In identity.cpp: took theirs — `FunctionDocumentation::Category::Internal`
for `AliasMarker`, matching the "not intended for direct use" description
and the pattern used by the other internal functions in the same file.

In StorageDistributed.h: kept HEAD's `WatermarkParams` typedef,
`HYBRID_WATERMARK_PREFIX`, `getHybridWatermarkParams`, `loadHybridWatermarkParams`,
and `hybrid_watermark_params` member (hybridParam watermark feature).

In StorageDistributed.cpp:
- `#include <Parsers/ASTSetQuery.h>`: kept HEAD (needed by hybridParam).
- `withVirtuals()` → `withVirtuals(VirtualsKind::All, VirtualsMaterializationPlace::All)`:
  took theirs — `withVirtuals` now requires both args (antalya-26.5 API change).
- `getInMemoryMetadataPtr()` → `getInMemoryMetadataPtr(local_context, false)`:
  took theirs — signature now takes `(ContextPtr, bool)`.
- `substitute_watermarks` lambda and all `substitute_watermarks(...)` call sites:
  kept HEAD (hybridParam watermark substitution at query time).
- Error handling: took theirs — `ALL_CONNECTION_TRIES_FAILED` with descriptive
  message for the skip_unavailable_shards path.
- `setHybridLayout`: took theirs — `addEphemeral` now takes 4 args including
  `VirtualsMaterializationPlace`; setVirtuals via `StorageInMemoryMetadata`.
- `collect_hybrid_params` / watermark validation / `validate_predicate` (with
  substitution): kept HEAD (full hybridParam collection and validation).
- `prefer_alias_to_column_name`: took theirs —
  `setPreferAliasToColumnName(preferAliasToColumnName())` per current
  `ASTWithAlias` API.
- `registerStorageHybrid` factory block: kept HEAD's `supports_settings = true`
  and `has_builtin_setting_fn` (hybridParam SETTINGS support).
…tem-table

hybrid: added system.hybrid_watermarks to inspect the Hybrid table watermarks
@zvonand zvonand added releasy Created/managed by RelEasy antalya-26.5 ai-resolved Port conflict auto-resolved by Claude auto-prereq-added Combined PR includes auto-added prerequisite PR(s) labels Jun 25, 2026
@github-actions

Copy link
Copy Markdown

Workflow [PR], commit [3cb5ad3]

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.5 auto-prereq-added Combined PR includes auto-added prerequisite PR(s) releasy Created/managed by RelEasy

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant