From 20bdb14d4bcc063bb5f879a48187f2ba4d6d1603 Mon Sep 17 00:00:00 2001
From: Gary Sassano <10464497+garysassano@users.noreply.github.com>
Date: Fri, 25 Jul 2025 00:49:39 +0200
Subject: [PATCH 1/2] fix ddl queries

---
 src/bin/clickhouse-ddl/ddl_metrics.rs |  2 +-
 src/bin/clickhouse-ddl/ddl_traces.rs  | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/bin/clickhouse-ddl/ddl_metrics.rs b/src/bin/clickhouse-ddl/ddl_metrics.rs
index 108281e5..b1d66ceb 100644
--- a/src/bin/clickhouse-ddl/ddl_metrics.rs
+++ b/src/bin/clickhouse-ddl/ddl_metrics.rs
@@ -51,7 +51,7 @@ pub(crate) fn get_metrics_ddl(
                     ("MAP_INDICES", map_indices),
                     (
                         "TTL_EXPR",
-                        build_ttl_string(ttl, "toDateTime(TimeUnix)").as_str(),
+                        build_ttl_string(ttl, "TimeUnix").as_str(),
                     ),
                     ("JSON_SETTING", json_setting),
                 ]),
diff --git a/src/bin/clickhouse-ddl/ddl_traces.rs b/src/bin/clickhouse-ddl/ddl_traces.rs
index 62362ff4..ff8c9117 100644
--- a/src/bin/clickhouse-ddl/ddl_traces.rs
+++ b/src/bin/clickhouse-ddl/ddl_traces.rs
@@ -35,7 +35,7 @@ pub(crate) fn get_traces_ddl(
             ("MAP_INDICES", map_indices),
             (
                 "TTL_EXPR",
-                build_ttl_string(ttl, "toDateTime(Timestamp)").as_str(),
+                build_ttl_string(ttl, "Timestamp").as_str(),
             ),
             ("JSON_SETTING", json_setting),
         ]),
@@ -52,7 +52,7 @@ pub(crate) fn get_traces_ddl(
             ("ENGINE", engine),
             (
                 "TTL_EXPR",
-                build_ttl_string(ttl, "toDateTime(Start)").as_str(),
+                build_ttl_string(ttl, "Start").as_str(),
             ),
         ]),
     );
@@ -114,7 +114,7 @@ CREATE TABLE IF NOT EXISTS %%TABLE%% %%CLUSTER%% (
 	INDEX idx_duration Duration TYPE minmax GRANULARITY 1
 ) ENGINE = %%ENGINE%%
 PARTITION BY toDate(Timestamp)
-ORDER BY (ServiceName, SpanName, toDateTime(Timestamp))
+ORDER BY (ServiceName, SpanName, Timestamp)
 %%TTL_EXPR%%
 SETTINGS index_granularity = 8192, ttl_only_drop_parts = 1 %%JSON_SETTING%%
 ;
@@ -130,8 +130,8 @@ const TRACES_TABLE_MAP_INDICES_SQL: &str = r#"
 const TRACES_TABLE_ID_TS_SQL: &str = r#"
 CREATE TABLE IF NOT EXISTS %%TABLE%% %%CLUSTER%% (
      TraceId String CODEC(ZSTD(1)),
-     Start DateTime CODEC(Delta, ZSTD(1)),
-     End DateTime CODEC(Delta, ZSTD(1)),
+     Start DateTime64(9) CODEC(Delta, ZSTD(1)),
+     End DateTime64(9) CODEC(Delta, ZSTD(1)),
      INDEX idx_trace_id TraceId TYPE bloom_filter(0.01) GRANULARITY 1
 ) ENGINE = %%ENGINE%%
 PARTITION BY toDate(Start)

From 0b656e551068baa847b7b7c3fbd4edccef86fb32 Mon Sep 17 00:00:00 2001
From: Gary Sassano <10464497+garysassano@users.noreply.github.com>
Date: Fri, 25 Jul 2025 01:21:24 +0200
Subject: [PATCH 2/2] include column types in create mv

---
 src/bin/clickhouse-ddl/ddl_traces.rs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/bin/clickhouse-ddl/ddl_traces.rs b/src/bin/clickhouse-ddl/ddl_traces.rs
index ff8c9117..d4da7b0f 100644
--- a/src/bin/clickhouse-ddl/ddl_traces.rs
+++ b/src/bin/clickhouse-ddl/ddl_traces.rs
@@ -143,6 +143,11 @@ SETTINGS index_granularity = 8192, ttl_only_drop_parts = 1;
 const TRACES_TABLE_ID_TS_MV_SQL: &str = r#"
 CREATE MATERIALIZED VIEW IF NOT EXISTS %%TABLE%% %%CLUSTER%%
 TO %%TABLE_ID_TS%%
+(
+	TraceId String,
+	Start DateTime64(9),
+	End DateTime64(9)
+)
 AS SELECT
 	TraceId,
 	min(Timestamp) as Start,