Merge pull request #922 from openedx/bmtcril/clickhouse_24_8

feat: Upgrade ClickHouse to 24.8
openedx · Aug 26, 2024 · 393f588 · 393f588
2 parents 008fc74 + 1f64b89
commit 393f588
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 10 deletions.
diff --git a/tutoraspects/plugin.py b/tutoraspects/plugin.py
@@ -34,7 +34,7 @@
         ("RUN_RALPH", True),
         ("RUN_SUPERSET", True),
         ("DOCKER_IMAGE_ASPECTS", "edunext/aspects:{{ ASPECTS_VERSION }}"),
-        ("DOCKER_IMAGE_CLICKHOUSE", "clickhouse/clickhouse-server:24.3"),
+        ("DOCKER_IMAGE_CLICKHOUSE", "clickhouse/clickhouse-server:24.8"),
         ("DOCKER_IMAGE_RALPH", "fundocker/ralph:4.1.0"),
         ("DOCKER_IMAGE_SUPERSET", "edunext/aspects-superset:{{ ASPECTS_VERSION }}"),
         ("DOCKER_IMAGE_VECTOR", "timberio/vector:0.30.0-alpine"),

diff --git a/...s/templates/aspects/apps/aspects/migrations/alembic/versions/0023_extend_display_names.py b/...s/templates/aspects/apps/aspects/migrations/alembic/versions/0023_extend_display_names.py
@@ -17,32 +17,31 @@
 
 
 def drop_objects():
+    # We include these drop statements here because "CREATE OR REPLACE DICTIONARY"
+    # currently throws a file rename error and you can't drop a dictionary with a
+    # table referring to it.
     op.execute(
         f"""
-        DROP TABLE IF EXISTS {{ ASPECTS_EVENT_SINK_DATABASE }}.most_recent_course_blocks
+        DROP TABLE IF EXISTS {{ ASPECTS_EVENT_SINK_DATABASE }}.course_block_names
         {on_cluster}
         """
     )
-
     op.execute(
         f"""
-        DROP VIEW IF EXISTS {{ ASPECTS_EVENT_SINK_DATABASE }}.most_recent_course_blocks_mv
+        DROP DICTIONARY IF EXISTS {{ ASPECTS_EVENT_SINK_DATABASE }}.course_block_names_dict
         {on_cluster}
         """
     )
-
-    # We include these drop statements here because "CREATE OR REPLACE DICTIONARY"
-    # currently throws a file rename error and you can't drop a dictionary with a
-    # table referring to it.
     op.execute(
         f"""
-        DROP TABLE IF EXISTS {{ ASPECTS_EVENT_SINK_DATABASE }}.course_block_names
+        DROP TABLE IF EXISTS {{ ASPECTS_EVENT_SINK_DATABASE }}.most_recent_course_blocks
         {on_cluster}
         """
     )
+
     op.execute(
         f"""
-        DROP DICTIONARY IF EXISTS {{ ASPECTS_EVENT_SINK_DATABASE }}.course_block_names_dict
+        DROP VIEW IF EXISTS {{ ASPECTS_EVENT_SINK_DATABASE }}.most_recent_course_blocks_mv
         {on_cluster}
         """
     )

diff --git a/...aspects/apps/aspects/migrations/alembic/versions/0037_remove_most_recent_course_blocks.py b/...aspects/apps/aspects/migrations/alembic/versions/0037_remove_most_recent_course_blocks.py
@@ -30,6 +30,13 @@ def drop_objects():
         """
     )
 
+    op.execute(
+        f"""
+        DROP DICTIONARY IF EXISTS {{ ASPECTS_EVENT_SINK_DATABASE }}.course_block_names
+        {on_cluster}
+        """
+    )
+
     op.execute(
         f"""
         DROP TABLE IF EXISTS {{ ASPECTS_EVENT_SINK_DATABASE }}.most_recent_course_blocks