Switched to DateTime64(UTC) for timestamp

jaegertracing · Mar 8, 2023 · 7989482 · 7989482
1 parent 798c568
commit 7989482
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/guide-sharding-and-replication.md b/guide-sharding-and-replication.md
@@ -86,7 +86,7 @@ CREATE DATABASE IF NOT EXISTS jaeger ON CLUSTER '{cluster}' ENGINE=Atomic;
 USE jaeger;
 
 CREATE TABLE IF NOT EXISTS jaeger_spans_local ON CLUSTER '{cluster}' (
-    timestamp DateTime CODEC(Delta, ZSTD(1)),
+    timestamp DateTime64(3, 'UTC') CODEC(Delta, ZSTD(1)),
     traceID String CODEC(ZSTD(1)),
     model String CODEC(ZSTD(3))
 ) ENGINE ReplicatedMergeTree
@@ -95,7 +95,7 @@ ORDER BY traceID
 SETTINGS index_granularity=1024;
 
 CREATE TABLE IF NOT EXISTS jaeger_index_local ON CLUSTER '{cluster}' (
-    timestamp DateTime CODEC(Delta, ZSTD(1)),
+    timestamp DateTime64(3, 'UTC') CODEC(Delta, ZSTD(1)),
     traceID String CODEC(ZSTD(1)),
     service LowCardinality(String) CODEC(ZSTD(1)),
     operation LowCardinality(String) CODEC(ZSTD(1)),

diff --git a/sqlscripts/jaeger-index.tmpl.sql b/sqlscripts/jaeger-index.tmpl.sql
@@ -4,7 +4,7 @@ CREATE TABLE IF NOT EXISTS {{.SpansIndexTable}}
     {{if .Multitenant -}}
     tenant     LowCardinality(String) CODEC (ZSTD(1)),
     {{- end -}}
-    timestamp  DateTime CODEC (Delta, ZSTD(1)),
+    timestamp  DateTime64(3, 'UTC') CODEC (Delta, ZSTD(1)),
     traceID    String CODEC (ZSTD(1)),
     service    LowCardinality(String) CODEC (ZSTD(1)),
     operation  LowCardinality(String) CODEC (ZSTD(1)),

diff --git a/sqlscripts/jaeger-spans-archive.tmpl.sql b/sqlscripts/jaeger-spans-archive.tmpl.sql
@@ -4,7 +4,7 @@ CREATE TABLE IF NOT EXISTS {{.SpansArchiveTable}}
     {{if .Multitenant -}}
     tenant    LowCardinality(String) CODEC (ZSTD(1)),
     {{- end -}}
-    timestamp DateTime CODEC (Delta, ZSTD(1)),
+    timestamp DateTime64(3, 'UTC') CODEC (Delta, ZSTD(1)),
     traceID   String CODEC (ZSTD(1)),
     model     String CODEC (ZSTD(3))
 ) ENGINE {{if .Replication}}ReplicatedMergeTree{{else}}MergeTree(){{end}}

diff --git a/sqlscripts/jaeger-spans.tmpl.sql b/sqlscripts/jaeger-spans.tmpl.sql
@@ -4,7 +4,7 @@ CREATE TABLE IF NOT EXISTS {{.SpansTable}}
     {{if .Multitenant -}}
     tenant    LowCardinality(String) CODEC (ZSTD(1)),
     {{- end -}}
-    timestamp DateTime CODEC (Delta, ZSTD(1)),
+    timestamp DateTime64(3, 'UTC') CODEC (Delta, ZSTD(1)),
     traceID   String CODEC (ZSTD(1)),
     model     String CODEC (ZSTD(3))
 ) ENGINE {{if .Replication}}ReplicatedMergeTree{{else}}MergeTree(){{end}}

diff --git a/storage/store.go b/storage/store.go
@@ -220,7 +220,7 @@ func runInitScripts(logger hclog.Logger, db *sql.DB, cfg Configuration) error {
 		ttlDate       string
 	)
 	if cfg.TTLDays > 0 {
-		ttlTimestamp = fmt.Sprintf("TTL timestamp + INTERVAL %d DAY DELETE", cfg.TTLDays)
+		ttlTimestamp = fmt.Sprintf("TTL toDateTime(timestamp) + INTERVAL %d DAY DELETE", cfg.TTLDays)
 		ttlDate = fmt.Sprintf("TTL date + INTERVAL %d DAY DELETE", cfg.TTLDays)
 	}
 	if cfg.InitSQLScriptsDir != "" {