Skip to content

Allow compiling without xray/xray_interface.h header when XRay is disabled#91452

Merged
pamarcos merged 2 commits intomasterfrom
fix-xray-conditionals
Dec 4, 2025
Merged

Allow compiling without xray/xray_interface.h header when XRay is disabled#91452
pamarcos merged 2 commits intomasterfrom
fix-xray-conditionals

Conversation

@thevar1able
Copy link
Copy Markdown
Member

@thevar1able thevar1able commented Dec 3, 2025

Changelog category (leave one):

  • Build/Testing/Packaging Improvement

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

Allow compiling without xray/xray_interface.h header when XRay is disabled.

@thevar1able thevar1able requested a review from pamarcos December 3, 2025 22:41
@clickhouse-gh
Copy link
Copy Markdown
Contributor

clickhouse-gh bot commented Dec 3, 2025 •
edited
Loading

Workflow [PR], commit [c48c620]

Summary: ❌

job_name test_name status info comment
Stateless tests (amd_msan, parallel) failure
03096_order_by_system_tables FAIL cidb
Integration tests (arm_binary, distributed plan, 2/4) failure
test_peak_memory_usage/test.py::test_clickhouse_client_max_peak_memory_usage_distributed FAIL cidb, issue
AST fuzzer (amd_debug) failure
Logical error: 'Unexpected return type from isNotDistinctFrom. Expected UInt8. Got Nothing. Action: (STID: 2508-11b5) FAIL cidb
BuzzHouse (amd_debug) failure
Logical error: 'Invalid number of rows in Chunk Array(size = 32, UInt64(size = 32), Tuple(size = 140, String(size = 140))) Array(size = 7, UInt64(size = 7), String(size = 36)) column Array(String) at position 1: expected 32, got 7' (STID: 2508-11b5) FAIL cidb
BuzzHouse (amd_tsan) failure
Logical error: 'Invalid number of columns in chunk pushed to OutputPort. Expected 3, found 1 (STID: 2508-11b5) FAIL cidb
Stateless tests (arm_asan, targeted) error
Stateless tests (amd_binary, ParallelReplicas, s3 storage, parallel) error

@clickhouse-gh clickhouse-gh bot added the pr-build Pull request with build/testing/packaging improvement label Dec 3, 2025
@pamarcos pamarcos self-assigned this Dec 4, 2025
@pamarcos
Copy link
Copy Markdown
Member

pamarcos commented Dec 4, 2025

@thevar1able Sorry I missed those. I think you may have run into a similar issue to what Azat had here, because the header files should be available no matter what.

Anyway, let me push a commit on top of yours to simplify headers in case XRay is disabled 👍

@Algunenano Algunenano mentioned this pull request Dec 4, 2025
Open
@pamarcos pamarcos added this pull request to the merge queue Dec 4, 2025
Merged via the queue into master with commit ac7430a Dec 4, 2025
122 of 130 checks passed
@pamarcos pamarcos deleted the fix-xray-conditionals branch December 4, 2025 13:48
@robot-ch-test-poll1 robot-ch-test-poll1 added the pr-synced-to-cloud The PR is synced to the cloud repo label Dec 4, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@pamarcos pamarcos pamarcos approved these changes

Assignees

@pamarcos pamarcos

Labels

pr-build Pull request with build/testing/packaging improvement pr-synced-to-cloud The PR is synced to the cloud repo

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@thevar1able @pamarcos @robot-ch-test-poll1