Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

don't drop local tables when there is no distributed table #363

Merged
merged 3 commits into from
Feb 13, 2025
Merged

don't drop local tables when there is no distributed table #363

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
58f7fa9
don't drop local tables when there is no distributed table
canbekley Oct 1, 2024
d446760
Merge remote-tracking branch 'origin/main' into fix/drop-local-table-…
canbekley Nov 4, 2024
d40abf4
add changelog
canbekley Nov 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@
### Improvement
* Added support for [range_hashed](https://clickhouse.com/docs/en/sql-reference/dictionaries#range_hashed) and [complex_key_range_hashed](https://clickhouse.com/docs/en/sql-reference/dictionaries#complex_key_range_hashed) layouts to the dictionary materialization. ([#361](https://github.com/ClickHouse/dbt-clickhouse/pull/361))

### Bug Fixes
* Existing local tables are no longer dropped/recreated in case of missing distributed tables in `distributed_incremental` materialization mode. ([#363](https://github.com/ClickHouse/dbt-clickhouse/pull/363))

### Release [1.8.4], 2024-09-17
### Improvement
* The S3 help macro now support a `role_arn` parameter as an alternative way to provide authentication for S3 based models. Thanks to
Expand Down
11 changes: 8 additions & 3 deletions dbt/include/clickhouse/macros/materializations/incremental/distributed_incremental.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
{% do exceptions.raise_compiler_error('To use distributed materializations cluster setting in dbt profile must be set') %}
{% endif %}

{% set existing_relation_local = existing_relation.incorporate(path={"identifier": this.identifier + local_suffix, "schema": local_db_prefix + this.schema}) if existing_relation is not none else none %}
{% set existing_relation_local = load_cached_relation(this.incorporate(path={"identifier": this.identifier + local_suffix, "schema": local_db_prefix + this.schema})) %}
{% set target_relation_local = target_relation.incorporate(path={"identifier": this.identifier + local_suffix, "schema": local_db_prefix + this.schema}) if target_relation is not none else none %}

{%- set unique_key = config.get('unique_key') -%}
Expand Down Expand Up @@ -55,8 +55,8 @@
{{ create_view_as(view_relation, sql) }}
{% endcall %}

{% if existing_relation is none %}
-- No existing table, simply create a new one
{% if existing_relation_local is none %}
-- No existing local table, recreate local and distributed tables
{{ create_distributed_local_table(target_relation, target_relation_local, view_relation, sql) }}

{% elif full_refresh_mode %}
Expand All @@ -74,6 +74,11 @@
{% endcall %}

{% else %}
{% if existing_relation is none %}
{% do run_query(create_distributed_table(target_relation, target_relation_local)) %}
{% set existing_relation = target_relation %}
{% endif %}

{% set incremental_strategy = adapter.calculate_incremental_strategy(config.get('incremental_strategy')) %}
{% set incremental_predicates = config.get('predicates', none) or config.get('incremental_predicates', none) %}
{%- if on_schema_change != 'ignore' %}
Expand Down