Conflicts resolved:
- Aggregate function combinators and `IAggregateFunction`: kept both the PR's
`getEstimatedMergeWork` / `getStateBytesPerDistinctInput` and master's `isLargeMergePair`.
- `UniqExactSet`: both sides made the same fix of tracking only own tasks; took master's version.
- `AggregateFunctionUniq`: took master's `parallelizeMergePrepare` for the variadic function.
- `aggregationBucketTopK`: kept master's threshold top-K merge enablement and its widened lone
`count` (also `count(x)`), plus the PR's `uniqExact` / `uniqExactIf` ranks.
- `AggregatingTransform`: kept the PR's restructuring and passed master's `threshold_top_k_verdict`.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Move the `SettingsSecrets.h` masking bodies into the .cpp so including the header does not pull
URL masking into every translation unit, and stub `renderSecretSettingValue` in the WASM build,
which formats with secrets shown.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
The `CH Inc sync` build failed in `utils/check-large-objects.sh`: with ThinLTO the object of
`src/Interpreters/AdaptiveAggregation/Merge.cpp` is 62 MB, over the 50 MB limit (46 MB in a
non-LTO build). It instantiates the merge kernels for every aggregation method, as `Aggregator.cpp`
does, which is excluded for the same reason. The pattern names the path, so the `MergeTree`
translation units stay checked.
https://github.com/ClickHouse/clickhouse-private/actions/runs/39318608382/job/118289663759
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
- Add illumos executable-path and inode lookup to the self-extracting
launcher.
- Enable stripped and self-extracting binaries and use the standard
`clickhouse-bundle` target in illumos CI.
- Publish stripped `clickhouse` and unstripped `clickhouse-full` binaries
through the existing branch download hook.
Conflicts with the `PCO` codec (a second Rust crate) were resolved by keeping both:
`ENABLE_PCO`/`ENABLE_VORTEX`, `USE_PCO`/`USE_VORTEX`, both workspace members.
`contrib/rust_vendor` now points to a48591e11, the merge of the vortex and pco vendor
snapshots (it descends from both pinned commits). `Cargo.lock` is the PR's lock updated
offline with `cargo update --workspace --offline`, which only added the `pco` path crates.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Alexey Milovidov