From 1015ca80f4149c7095c048433eff2b40a6baabb5 Mon Sep 17 00:00:00 2001 From: Taha Yassine Kraiem Date: Mon, 29 Aug 2022 19:06:23 +0100 Subject: [PATCH] feat(DB): CH added openreplay_version function feat(scripts): support clickhouse multiquery script --- ee/scripts/helm/db/init_dbs/clickhouse/1.8.0/a_pre.sql | 2 ++ ee/scripts/helm/db/init_dbs/clickhouse/1.8.0/x_post.sql | 2 ++ ee/scripts/helm/db/init_dbs/clickhouse/create/a_pre.sql | 2 ++ ee/scripts/helm/db/init_dbs/clickhouse/create/x_post.sql | 2 ++ scripts/helmcharts/openreplay/files/clickhouse.sh | 4 ++-- 5 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 ee/scripts/helm/db/init_dbs/clickhouse/1.8.0/a_pre.sql create mode 100644 ee/scripts/helm/db/init_dbs/clickhouse/1.8.0/x_post.sql create mode 100644 ee/scripts/helm/db/init_dbs/clickhouse/create/a_pre.sql create mode 100644 ee/scripts/helm/db/init_dbs/clickhouse/create/x_post.sql diff --git a/ee/scripts/helm/db/init_dbs/clickhouse/1.8.0/a_pre.sql b/ee/scripts/helm/db/init_dbs/clickhouse/1.8.0/a_pre.sql new file mode 100644 index 000000000..6868d2faf --- /dev/null +++ b/ee/scripts/helm/db/init_dbs/clickhouse/1.8.0/a_pre.sql @@ -0,0 +1,2 @@ +DROP FUNCTION IF EXISTS openreplay_version; +CREATE FUNCTION openreplay_version AS() -> 'v1.8.0-ee.pre'; \ No newline at end of file diff --git a/ee/scripts/helm/db/init_dbs/clickhouse/1.8.0/x_post.sql b/ee/scripts/helm/db/init_dbs/clickhouse/1.8.0/x_post.sql new file mode 100644 index 000000000..57b19e34c --- /dev/null +++ b/ee/scripts/helm/db/init_dbs/clickhouse/1.8.0/x_post.sql @@ -0,0 +1,2 @@ +DROP FUNCTION IF EXISTS openreplay_version; +CREATE FUNCTION openreplay_version AS() -> 'v1.8.0-ee'; \ No newline at end of file diff --git a/ee/scripts/helm/db/init_dbs/clickhouse/create/a_pre.sql b/ee/scripts/helm/db/init_dbs/clickhouse/create/a_pre.sql new file mode 100644 index 000000000..6868d2faf --- /dev/null +++ b/ee/scripts/helm/db/init_dbs/clickhouse/create/a_pre.sql @@ -0,0 +1,2 @@ +DROP FUNCTION IF EXISTS openreplay_version; +CREATE FUNCTION openreplay_version AS() -> 'v1.8.0-ee.pre'; \ No newline at end of file diff --git a/ee/scripts/helm/db/init_dbs/clickhouse/create/x_post.sql b/ee/scripts/helm/db/init_dbs/clickhouse/create/x_post.sql new file mode 100644 index 000000000..57b19e34c --- /dev/null +++ b/ee/scripts/helm/db/init_dbs/clickhouse/create/x_post.sql @@ -0,0 +1,2 @@ +DROP FUNCTION IF EXISTS openreplay_version; +CREATE FUNCTION openreplay_version AS() -> 'v1.8.0-ee'; \ No newline at end of file diff --git a/scripts/helmcharts/openreplay/files/clickhouse.sh b/scripts/helmcharts/openreplay/files/clickhouse.sh index 3cf48cc93..3e29cf2df 100644 --- a/scripts/helmcharts/openreplay/files/clickhouse.sh +++ b/scripts/helmcharts/openreplay/files/clickhouse.sh @@ -11,7 +11,7 @@ function migrate() { echo "Migrating clickhouse version $version" # For now, we can ignore the clickhouse db inject errors. # TODO: Better error handling in script - clickhouse-client -h clickhouse-openreplay-clickhouse.db.svc.cluster.local --port 9000 < ${clickhousedir}/${version}/${version}.sql || true + clickhouse-client -h clickhouse-openreplay-clickhouse.db.svc.cluster.local --port 9000 --multiquery < ${clickhousedir}/${version}/${version}.sql || true done } @@ -19,7 +19,7 @@ function init() { echo "Initializing clickhouse" for file in `ls ${clickhousedir}/create/*.sql`; do echo "Injecting $file" - clickhouse-client -h clickhouse-openreplay-clickhouse.db.svc.cluster.local --port 9000 < $file || true + clickhouse-client -h clickhouse-openreplay-clickhouse.db.svc.cluster.local --port 9000 --multiquery < $file || true done }