From ac4e32aba3646a0abdb10fea896d2e1b1a48194c Mon Sep 17 00:00:00 2001 From: Taha Yassine Kraiem Date: Thu, 12 May 2022 16:24:58 +0200 Subject: [PATCH] feat(DB): changed partition expression --- ee/scripts/helm/db/init_dbs/clickhouse/create/clicks.sql | 2 +- ee/scripts/helm/db/init_dbs/clickhouse/create/customs.sql | 2 +- ee/scripts/helm/db/init_dbs/clickhouse/create/errors.sql | 2 +- ee/scripts/helm/db/init_dbs/clickhouse/create/inputs.sql | 2 +- ee/scripts/helm/db/init_dbs/clickhouse/create/longtasks.sql | 2 +- ee/scripts/helm/db/init_dbs/clickhouse/create/pages.sql | 2 +- ee/scripts/helm/db/init_dbs/clickhouse/create/performance.sql | 2 +- ee/scripts/helm/db/init_dbs/clickhouse/create/resources.sql | 2 +- ee/scripts/helm/db/init_dbs/clickhouse/create/sessions.sql | 2 +- .../helm/db/init_dbs/clickhouse/create/sessions_metadata.sql | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/ee/scripts/helm/db/init_dbs/clickhouse/create/clicks.sql b/ee/scripts/helm/db/init_dbs/clickhouse/create/clicks.sql index 7781d2328..b9322a403 100644 --- a/ee/scripts/helm/db/init_dbs/clickhouse/create/clicks.sql +++ b/ee/scripts/helm/db/init_dbs/clickhouse/create/clicks.sql @@ -16,6 +16,6 @@ CREATE TABLE IF NOT EXISTS clicks label String, hesitation_time Nullable(UInt32) ) ENGINE = MergeTree - PARTITION BY toDate(datetime) + PARTITION BY toStartOfWeek(datetime) ORDER BY (project_id, datetime) TTL datetime + INTERVAL 1 MONTH; diff --git a/ee/scripts/helm/db/init_dbs/clickhouse/create/customs.sql b/ee/scripts/helm/db/init_dbs/clickhouse/create/customs.sql index eed67c990..fb4b2c881 100644 --- a/ee/scripts/helm/db/init_dbs/clickhouse/create/customs.sql +++ b/ee/scripts/helm/db/init_dbs/clickhouse/create/customs.sql @@ -17,6 +17,6 @@ CREATE TABLE IF NOT EXISTS customs payload Nullable(String), level Enum8('info'=0, 'error'=1) DEFAULT 'info' ) ENGINE = MergeTree - PARTITION BY toDate(datetime) + PARTITION BY toStartOfWeek(datetime) ORDER BY (project_id, datetime) TTL datetime + INTERVAL 1 MONTH; \ No newline at end of file diff --git a/ee/scripts/helm/db/init_dbs/clickhouse/create/errors.sql b/ee/scripts/helm/db/init_dbs/clickhouse/create/errors.sql index 4560f6500..98052071a 100644 --- a/ee/scripts/helm/db/init_dbs/clickhouse/create/errors.sql +++ b/ee/scripts/helm/db/init_dbs/clickhouse/create/errors.sql @@ -18,6 +18,6 @@ CREATE TABLE IF NOT EXISTS errors message String, error_id String ) ENGINE = MergeTree - PARTITION BY toDate(datetime) + PARTITION BY toStartOfWeek(datetime) ORDER BY (project_id, datetime) TTL datetime + INTERVAL 1 MONTH; diff --git a/ee/scripts/helm/db/init_dbs/clickhouse/create/inputs.sql b/ee/scripts/helm/db/init_dbs/clickhouse/create/inputs.sql index 523d2d468..83b475d0f 100644 --- a/ee/scripts/helm/db/init_dbs/clickhouse/create/inputs.sql +++ b/ee/scripts/helm/db/init_dbs/clickhouse/create/inputs.sql @@ -15,6 +15,6 @@ CREATE TABLE IF NOT EXISTS inputs datetime DateTime, label String ) ENGINE = MergeTree - PARTITION BY toDate(datetime) + PARTITION BY toStartOfWeek(datetime) ORDER BY (project_id, datetime) TTL datetime + INTERVAL 1 MONTH; diff --git a/ee/scripts/helm/db/init_dbs/clickhouse/create/longtasks.sql b/ee/scripts/helm/db/init_dbs/clickhouse/create/longtasks.sql index 9770fb380..90a90a104 100644 --- a/ee/scripts/helm/db/init_dbs/clickhouse/create/longtasks.sql +++ b/ee/scripts/helm/db/init_dbs/clickhouse/create/longtasks.sql @@ -20,7 +20,7 @@ CREATE TABLE IF NOT EXISTS longtasks container_name String, container_src String ) ENGINE = MergeTree - PARTITION BY toDate(datetime) + PARTITION BY toStartOfWeek(datetime) ORDER BY (project_id, datetime) TTL datetime + INTERVAL 1 MONTH; diff --git a/ee/scripts/helm/db/init_dbs/clickhouse/create/pages.sql b/ee/scripts/helm/db/init_dbs/clickhouse/create/pages.sql index 71d9503cf..3902abd33 100644 --- a/ee/scripts/helm/db/init_dbs/clickhouse/create/pages.sql +++ b/ee/scripts/helm/db/init_dbs/clickhouse/create/pages.sql @@ -35,6 +35,6 @@ CREATE TABLE IF NOT EXISTS pages dom_content_loaded_event_time Nullable(UInt16) MATERIALIZED if (greaterOrEquals(dom_content_loaded_event_end, dom_content_loaded_event_start), minus(dom_content_loaded_event_end, dom_content_loaded_event_start), Null), load_event_time Nullable(UInt16) MATERIALIZED if (greaterOrEquals(load_event_end, load_event_start), minus(load_event_end, load_event_start), Null) ) ENGINE = MergeTree -PARTITION BY toDate(datetime) +PARTITION BY toStartOfWeek(datetime) ORDER BY (project_id, datetime) TTL datetime + INTERVAL 1 MONTH; diff --git a/ee/scripts/helm/db/init_dbs/clickhouse/create/performance.sql b/ee/scripts/helm/db/init_dbs/clickhouse/create/performance.sql index fa64967f4..650895662 100644 --- a/ee/scripts/helm/db/init_dbs/clickhouse/create/performance.sql +++ b/ee/scripts/helm/db/init_dbs/clickhouse/create/performance.sql @@ -26,6 +26,6 @@ CREATE TABLE IF NOT EXISTS performance avg_used_js_heap_size UInt64, max_used_js_heap_size UInt64 ) ENGINE = MergeTree - PARTITION BY toDate(datetime) + PARTITION BY toStartOfWeek(datetime) ORDER BY (project_id, datetime) TTL datetime + INTERVAL 1 MONTH; diff --git a/ee/scripts/helm/db/init_dbs/clickhouse/create/resources.sql b/ee/scripts/helm/db/init_dbs/clickhouse/create/resources.sql index cc2c7cd6d..bfd4f0ea1 100644 --- a/ee/scripts/helm/db/init_dbs/clickhouse/create/resources.sql +++ b/ee/scripts/helm/db/init_dbs/clickhouse/create/resources.sql @@ -27,6 +27,6 @@ CREATE TABLE IF NOT EXISTS resources method Nullable(Enum8('GET' = 0, 'HEAD' = 1, 'POST' = 2, 'PUT' = 3, 'DELETE' = 4, 'CONNECT' = 5, 'OPTIONS' = 6, 'TRACE' = 7, 'PATCH' = 8)), status Nullable(UInt16) ) ENGINE = MergeTree - PARTITION BY toDate(datetime) + PARTITION BY toStartOfWeek(datetime) ORDER BY (project_id, datetime) TTL datetime + INTERVAL 1 MONTH; diff --git a/ee/scripts/helm/db/init_dbs/clickhouse/create/sessions.sql b/ee/scripts/helm/db/init_dbs/clickhouse/create/sessions.sql index 712cbd6d4..59df20242 100644 --- a/ee/scripts/helm/db/init_dbs/clickhouse/create/sessions.sql +++ b/ee/scripts/helm/db/init_dbs/clickhouse/create/sessions.sql @@ -20,6 +20,6 @@ CREATE TABLE IF NOT EXISTS sessions utm_medium Nullable(String), utm_campaign Nullable(String) ) ENGINE = ReplacingMergeTree(duration) - PARTITION BY toDate(datetime) + PARTITION BY toStartOfWeek(datetime) ORDER BY (project_id, datetime, session_id) TTL datetime + INTERVAL 1 MONTH; diff --git a/ee/scripts/helm/db/init_dbs/clickhouse/create/sessions_metadata.sql b/ee/scripts/helm/db/init_dbs/clickhouse/create/sessions_metadata.sql index f6b77930e..2884b4515 100644 --- a/ee/scripts/helm/db/init_dbs/clickhouse/create/sessions_metadata.sql +++ b/ee/scripts/helm/db/init_dbs/clickhouse/create/sessions_metadata.sql @@ -26,6 +26,6 @@ CREATE TABLE IF NOT EXISTS sessions_metadata metadata_9 Nullable(String), metadata_10 Nullable(String) ) ENGINE = MergeTree - PARTITION BY toDate(datetime) + PARTITION BY toStartOfWeek(datetime) ORDER BY (project_id, datetime) TTL datetime + INTERVAL 1 MONTH; \ No newline at end of file