From 463f0814024169f9aab1e9348b8b93adfacdc536 Mon Sep 17 00:00:00 2001 From: alesapin Date: Wed, 12 Nov 2025 16:13:17 +0000 Subject: [PATCH 1/6] Merge pull request #89914 from ClickHouse/show_catalogs_in_show_databses Show datalake catalogs in SHOW DATABASES query --- src/Interpreters/InterpreterShowTablesQuery.cpp | 4 ++-- tests/integration/test_database_glue/test.py | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Interpreters/InterpreterShowTablesQuery.cpp b/src/Interpreters/InterpreterShowTablesQuery.cpp index d8e01ecd722a..634fa9515f03 100644 --- a/src/Interpreters/InterpreterShowTablesQuery.cpp +++ b/src/Interpreters/InterpreterShowTablesQuery.cpp @@ -232,10 +232,10 @@ BlockIO InterpreterShowTablesQuery::execute() } auto rewritten_query = getRewrittenQuery(); String database = getContext()->resolveDatabase(query.getFrom()); - if (DatabaseCatalog::instance().isDatalakeCatalog(database)) + if (query.databases || DatabaseCatalog::instance().isDatalakeCatalog(database)) { auto context_copy = Context::createCopy(getContext()); - /// HACK To always show them in explicit "SHOW TABLES" queries + /// HACK To always show them in explicit "SHOW TABLES" and "SHOW DATABASES" queries context_copy->setSetting("show_data_lake_catalogs_in_system_tables", true); return executeQuery(rewritten_query, context_copy, QueryFlags{ .internal = true }).second; } diff --git a/tests/integration/test_database_glue/test.py b/tests/integration/test_database_glue/test.py index 7ba239484640..c53d1fe145ea 100644 --- a/tests/integration/test_database_glue/test.py +++ b/tests/integration/test_database_glue/test.py @@ -617,6 +617,8 @@ def test_system_tables(started_cluster): node.query(f"SELECT count() FROM {CATALOG_NAME}.`{namespace}.{table_name}`") ) + assert CATALOG_NAME in node.query("SHOW DATABASES") + assert table_name in node.query(f"SHOW TABLES FROM {CATALOG_NAME}") # system.tables assert int(node.query(f"SELECT count() FROM system.tables WHERE database = '{CATALOG_NAME}' and table ilike '%{root_namespace}%' SETTINGS show_data_lake_catalogs_in_system_tables = true").strip()) == 4 assert int(node.query(f"SELECT count() FROM system.tables WHERE database = '{CATALOG_NAME}' and table ilike '%{root_namespace}%'").strip()) == 0 From 9c7aaffc72dbecd6919bd34264c37dcbd1a4b901 Mon Sep 17 00:00:00 2001 From: Andrey Zvonov Date: Tue, 30 Dec 2025 02:12:50 +0100 Subject: [PATCH 2/6] poke CI From 04b2bb8d84e1192d97dfdbb44a78d87c6ce2985b Mon Sep 17 00:00:00 2001 From: CarlosFelipeOR Date: Fri, 26 Dec 2025 03:25:24 -0300 Subject: [PATCH 3/6] Add new S3 export suites --- .github/workflows/regression.yml | 70 ++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) diff --git a/.github/workflows/regression.yml b/.github/workflows/regression.yml index 5275e2550003..e9ade5e6312a 100644 --- a/.github/workflows/regression.yml +++ b/.github/workflows/regression.yml @@ -1005,6 +1005,76 @@ jobs: name: ${{ env.SUITE }}-${{ matrix.STORAGE }}-${{ matrix.PART }}-${{ inputs.arch }}-artifacts path: ${{ env.artifact_paths}} + S3Export: + if: | + fromJson(inputs.workflow_config).custom_data.ci_regression_jobs[0] == null || + contains(fromJson(inputs.workflow_config).custom_data.ci_regression_jobs, 's3') + strategy: + fail-fast: false + matrix: + PART: [part, partition] + needs: [runner_labels_setup] + runs-on: ${{ fromJson(needs.runner_labels_setup.outputs.runner_labels) }} + timeout-minutes: ${{ inputs.timeout_minutes }} + steps: + - name: Checkout regression repo + uses: actions/checkout@v4 + with: + repository: Altinity/clickhouse-regression + ref: ${{ inputs.commit }} + - name: Set envs + run: | + cat >> "$GITHUB_ENV" << 'EOF' + REPORTS_PATH=${{ runner.temp }}/reports_dir + SUITE=s3 + PART=${{ matrix.PART }} + EOF + - name: Setup + run: .github/setup.sh + - name: Get deb url + env: + S3_BASE_URL: https://altinity-build-artifacts.s3.amazonaws.com/ + PR_NUMBER: ${{ github.event.pull_request.number || 0 }} + run: | + mkdir -p $REPORTS_PATH + cat > $REPORTS_PATH/workflow_config.json << 'EOF' + ${{ inputs.workflow_config }} + EOF + + python3 .github/get-deb-url.py --github-env $GITHUB_ENV --workflow-config $REPORTS_PATH/workflow_config.json --s3-base-url $S3_BASE_URL --pr-number $PR_NUMBER --branch-name ${{ github.ref_name }} --commit-hash ${{ inputs.build_sha }} --binary + + - name: Run ${{ env.SUITE }} suite + id: run_suite + run: EXITCODE=0; + python3 + -u ${{ env.SUITE }}/regression.py + --clickhouse-binary-path ${{ env.clickhouse_path }} + --storage minio + --attr project="$GITHUB_REPOSITORY" project.id="$GITHUB_REPOSITORY_ID" package="${{ env.clickhouse_path }}" version="${{ env.version }}" user.name="$GITHUB_ACTOR" repository="https://github.com/Altinity/clickhouse-regression" commit.hash="$(git rev-parse HEAD)" job.name="$GITHUB_JOB (${{ matrix.PART }})" job.retry=$GITHUB_RUN_ATTEMPT job.url="$GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID" arch="$(uname -i)" + --only ":/try*" "minio/export tests/export ${{ matrix.PART }}/*" + ${{ env.args }} || EXITCODE=$?; + .github/add_link_to_logs.sh; + exit $EXITCODE + - name: Set Commit Status + if: always() + run: python3 .github/set_builds_status.py + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + JOB_OUTCOME: ${{ steps.run_suite.outcome }} + SUITE_NAME: "Regression ${{ inputs.arch }} S3 Export ${{ matrix.PART }}" + - name: Create and upload logs + if: always() + run: .github/create_and_upload_logs.sh 1 + - name: Upload logs to regression results database + if: always() + timeout-minutes: 20 + run: .github/upload_results_to_database.sh 1 + - uses: actions/upload-artifact@v4 + if: always() + with: + name: ${{ env.SUITE }}-export-${{ matrix.PART }}-${{ inputs.arch }}-artifacts + path: ${{ env.artifact_paths}} + TieredStorage: if: | fromJson(inputs.workflow_config).custom_data.ci_regression_jobs[0] == null || From 06a368c961c0c95a203808ba55be657f820065e7 Mon Sep 17 00:00:00 2001 From: CarlosFelipeOR Date: Mon, 5 Jan 2026 11:06:44 -0300 Subject: [PATCH 4/6] Update commit hash --- .github/workflows/master.yml | 4 ++-- .github/workflows/pull_request.yml | 4 ++-- ci/praktika/yaml_additional_templates.py | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 3413847303e0..93d25c56e96d 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -4178,7 +4178,7 @@ jobs: secrets: inherit with: runner_type: altinity-on-demand, altinity-regression-tester - commit: c07440a1ad14ffc5fc49ce90dff2f40c2e5f364d + commit: 86e64e4071409726472b5b8b596608aade3259d7 arch: release build_sha: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }} timeout_minutes: 300 @@ -4190,7 +4190,7 @@ jobs: secrets: inherit with: runner_type: altinity-on-demand, altinity-regression-tester-aarch64 - commit: c07440a1ad14ffc5fc49ce90dff2f40c2e5f364d + commit: 86e64e4071409726472b5b8b596608aade3259d7 arch: aarch64 build_sha: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }} timeout_minutes: 300 diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 2add6cd67783..066a7ce55d15 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -4134,7 +4134,7 @@ jobs: secrets: inherit with: runner_type: altinity-on-demand, altinity-regression-tester - commit: c07440a1ad14ffc5fc49ce90dff2f40c2e5f364d + commit: 86e64e4071409726472b5b8b596608aade3259d7 arch: release build_sha: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }} timeout_minutes: 300 @@ -4146,7 +4146,7 @@ jobs: secrets: inherit with: runner_type: altinity-on-demand, altinity-regression-tester-aarch64 - commit: c07440a1ad14ffc5fc49ce90dff2f40c2e5f364d + commit: 86e64e4071409726472b5b8b596608aade3259d7 arch: aarch64 build_sha: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }} timeout_minutes: 300 diff --git a/ci/praktika/yaml_additional_templates.py b/ci/praktika/yaml_additional_templates.py index 5aac6f1ca8ed..bccab062e4ca 100644 --- a/ci/praktika/yaml_additional_templates.py +++ b/ci/praktika/yaml_additional_templates.py @@ -35,7 +35,7 @@ class AltinityWorkflowTemplates: echo "Workflow Run Report: [View Report]($REPORT_LINK)" >> $GITHUB_STEP_SUMMARY """ # Additional jobs - REGRESSION_HASH = "c07440a1ad14ffc5fc49ce90dff2f40c2e5f364d" + REGRESSION_HASH = "86e64e4071409726472b5b8b596608aade3259d7" ALTINITY_JOBS = { "GrypeScan": r""" GrypeScanServer: From d30c4dc97cc49ccb6b4b98695daa2e174a821aa2 Mon Sep 17 00:00:00 2001 From: CarlosFelipeOR Date: Mon, 5 Jan 2026 17:16:02 -0300 Subject: [PATCH 5/6] Update commit hash --- .github/workflows/master.yml | 4 ++-- .github/workflows/pull_request.yml | 4 ++-- ci/praktika/yaml_additional_templates.py | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 93d25c56e96d..793c6e214204 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -4178,7 +4178,7 @@ jobs: secrets: inherit with: runner_type: altinity-on-demand, altinity-regression-tester - commit: 86e64e4071409726472b5b8b596608aade3259d7 + commit: 0f9bcf585589bd3cb0622ee1c81b1975a11fc357 arch: release build_sha: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }} timeout_minutes: 300 @@ -4190,7 +4190,7 @@ jobs: secrets: inherit with: runner_type: altinity-on-demand, altinity-regression-tester-aarch64 - commit: 86e64e4071409726472b5b8b596608aade3259d7 + commit: 0f9bcf585589bd3cb0622ee1c81b1975a11fc357 arch: aarch64 build_sha: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }} timeout_minutes: 300 diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 066a7ce55d15..33dd56539728 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -4134,7 +4134,7 @@ jobs: secrets: inherit with: runner_type: altinity-on-demand, altinity-regression-tester - commit: 86e64e4071409726472b5b8b596608aade3259d7 + commit: 0f9bcf585589bd3cb0622ee1c81b1975a11fc357 arch: release build_sha: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }} timeout_minutes: 300 @@ -4146,7 +4146,7 @@ jobs: secrets: inherit with: runner_type: altinity-on-demand, altinity-regression-tester-aarch64 - commit: 86e64e4071409726472b5b8b596608aade3259d7 + commit: 0f9bcf585589bd3cb0622ee1c81b1975a11fc357 arch: aarch64 build_sha: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }} timeout_minutes: 300 diff --git a/ci/praktika/yaml_additional_templates.py b/ci/praktika/yaml_additional_templates.py index bccab062e4ca..aa694dc7253e 100644 --- a/ci/praktika/yaml_additional_templates.py +++ b/ci/praktika/yaml_additional_templates.py @@ -35,7 +35,7 @@ class AltinityWorkflowTemplates: echo "Workflow Run Report: [View Report]($REPORT_LINK)" >> $GITHUB_STEP_SUMMARY """ # Additional jobs - REGRESSION_HASH = "86e64e4071409726472b5b8b596608aade3259d7" + REGRESSION_HASH = "0f9bcf585589bd3cb0622ee1c81b1975a11fc357" ALTINITY_JOBS = { "GrypeScan": r""" GrypeScanServer: From 6bd16f808a0746ed1cee0b49bc7422510cab1027 Mon Sep 17 00:00:00 2001 From: CarlosFelipeOR Date: Tue, 6 Jan 2026 02:03:53 -0300 Subject: [PATCH 6/6] Update commit hash --- .github/workflows/master.yml | 4 ++-- .github/workflows/pull_request.yml | 4 ++-- ci/praktika/yaml_additional_templates.py | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 793c6e214204..635294994033 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -4178,7 +4178,7 @@ jobs: secrets: inherit with: runner_type: altinity-on-demand, altinity-regression-tester - commit: 0f9bcf585589bd3cb0622ee1c81b1975a11fc357 + commit: f4c832bb4047e55544ebbf85a02c6364605117c9 arch: release build_sha: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }} timeout_minutes: 300 @@ -4190,7 +4190,7 @@ jobs: secrets: inherit with: runner_type: altinity-on-demand, altinity-regression-tester-aarch64 - commit: 0f9bcf585589bd3cb0622ee1c81b1975a11fc357 + commit: f4c832bb4047e55544ebbf85a02c6364605117c9 arch: aarch64 build_sha: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }} timeout_minutes: 300 diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 33dd56539728..ebf9cc3cb4c1 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -4134,7 +4134,7 @@ jobs: secrets: inherit with: runner_type: altinity-on-demand, altinity-regression-tester - commit: 0f9bcf585589bd3cb0622ee1c81b1975a11fc357 + commit: f4c832bb4047e55544ebbf85a02c6364605117c9 arch: release build_sha: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }} timeout_minutes: 300 @@ -4146,7 +4146,7 @@ jobs: secrets: inherit with: runner_type: altinity-on-demand, altinity-regression-tester-aarch64 - commit: 0f9bcf585589bd3cb0622ee1c81b1975a11fc357 + commit: f4c832bb4047e55544ebbf85a02c6364605117c9 arch: aarch64 build_sha: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }} timeout_minutes: 300 diff --git a/ci/praktika/yaml_additional_templates.py b/ci/praktika/yaml_additional_templates.py index aa694dc7253e..e16845de3301 100644 --- a/ci/praktika/yaml_additional_templates.py +++ b/ci/praktika/yaml_additional_templates.py @@ -35,7 +35,7 @@ class AltinityWorkflowTemplates: echo "Workflow Run Report: [View Report]($REPORT_LINK)" >> $GITHUB_STEP_SUMMARY """ # Additional jobs - REGRESSION_HASH = "0f9bcf585589bd3cb0622ee1c81b1975a11fc357" + REGRESSION_HASH = "f4c832bb4047e55544ebbf85a02c6364605117c9" ALTINITY_JOBS = { "GrypeScan": r""" GrypeScanServer: