Remove v2 suffix from table names (#33)

Signed-off-by: Pavol Loffay <[email protected]>
jaegertracing · Jul 26, 2021 · eceb1d2 · eceb1d2
1 parent 6b89a50
commit eceb1d2
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/sqlscripts/0001-jaeger-index.sql b/sqlscripts/0001-jaeger-index.sql
@@ -1,4 +1,4 @@
-CREATE TABLE IF NOT EXISTS jaeger_index_v2 (
+CREATE TABLE IF NOT EXISTS jaeger_index (
                                  timestamp DateTime CODEC(Delta, ZSTD(1)),
                                  traceID String CODEC(ZSTD(1)),
                                  service LowCardinality(String) CODEC(ZSTD(1)),

diff --git a/sqlscripts/0002-jaeger-spans.sql b/sqlscripts/0002-jaeger-spans.sql
@@ -1,4 +1,4 @@
-CREATE TABLE IF NOT EXISTS jaeger_spans_v2 (
+CREATE TABLE IF NOT EXISTS jaeger_spans (
                                  timestamp DateTime CODEC(Delta, ZSTD(1)),
                                  traceID String CODEC(ZSTD(1)),
                                  model String CODEC(ZSTD(3))

diff --git a/sqlscripts/0003-jaeger-operations.sql b/sqlscripts/0003-jaeger-operations.sql
@@ -1,4 +1,4 @@
-CREATE MATERIALIZED VIEW IF NOT EXISTS jaeger_operations_v2
+CREATE MATERIALIZED VIEW IF NOT EXISTS jaeger_operations
 ENGINE SummingMergeTree
 PARTITION BY toYYYYMM(date) ORDER BY (date, service, operation)
 SETTINGS index_granularity=32
@@ -8,5 +8,5 @@ AS SELECT
   service,
   operation,
   count() as count
-   FROM jaeger_index_v2
+   FROM jaeger_index
    GROUP BY date, service, operation
diff --git a/sqlscripts/0004-jaeger-spans-archive.sql b/sqlscripts/0004-jaeger-spans-archive.sql
@@ -1,4 +1,4 @@
-CREATE TABLE IF NOT EXISTS jaeger_archive_spans_v2 (
+CREATE TABLE IF NOT EXISTS jaeger_archive_spans (
                                          timestamp DateTime CODEC(Delta, ZSTD(1)),
                                          traceID String CODEC(ZSTD(1)),
                                          model String CODEC(ZSTD(3))

diff --git a/storage/store.go b/storage/store.go
@@ -51,10 +51,10 @@ func NewStore(logger hclog.Logger, cfg Configuration, embeddedSQLScripts embed.F
 	}
 	return &Store{
 		db:            db,
-		writer:        clickhousespanstore.NewSpanWriter(logger, db, "jaeger_index_v2", "jaeger_spans_v2", clickhousespanstore.Encoding(cfg.Encoding), cfg.BatchFlushInterval, cfg.BatchWriteSize),
-		reader:        clickhousespanstore.NewTraceReader(db, "jaeger_operations_v2", "jaeger_index_v2", "jaeger_spans_v2"),
-		archiveWriter: clickhousespanstore.NewSpanWriter(logger, db, "", "jaeger_archive_spans_v2", clickhousespanstore.Encoding(cfg.Encoding), cfg.BatchFlushInterval, cfg.BatchWriteSize),
-		archiveReader: clickhousespanstore.NewTraceReader(db, "", "", "jaeger_archive_spans_v2"),
+		writer:        clickhousespanstore.NewSpanWriter(logger, db, "jaeger_index", "jaeger_spans", clickhousespanstore.Encoding(cfg.Encoding), cfg.BatchFlushInterval, cfg.BatchWriteSize),
+		reader:        clickhousespanstore.NewTraceReader(db, "jaeger_operations", "jaeger_index", "jaeger_spans"),
+		archiveWriter: clickhousespanstore.NewSpanWriter(logger, db, "", "jaeger_archive_spans", clickhousespanstore.Encoding(cfg.Encoding), cfg.BatchFlushInterval, cfg.BatchWriteSize),
+		archiveReader: clickhousespanstore.NewTraceReader(db, "", "", "jaeger_archive_spans"),
 	}, nil
 }