Skip to content

Commit 27758a0

Browse files
SlachSlach
committed
25.9+ LIVE VIEW was removed, fix TestSkipTablesAndSkipTableEngines
Signed-off-by: Slach <[email protected]>
1 parent d15c7f9 commit 27758a0

File tree

1 file changed

+14
-11
lines changed

1 file changed

+14
-11
lines changed

‎test/integration/integration_test.go‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2133,7 +2133,7 @@ func TestSkipTablesAndSkipTableEngines(t *testing.T) {
21332133
env.queryWithNoError(r, "CREATE TABLE IF NOT EXISTS test_skip_tables.test_merge_tree (id UInt64, s String) ENGINE=MergeTree() ORDER BY id")
21342134
env.queryWithNoError(r, "CREATE TABLE IF NOT EXISTS test_skip_tables.test_memory (id UInt64) ENGINE=Memory")
21352135
env.queryWithNoError(r, "CREATE MATERIALIZED VIEW IF NOT EXISTS test_skip_tables.test_mv (id UInt64) ENGINE=MergeTree() ORDER BY id AS SELECT id FROM test_skip_tables.test_merge_tree")
2136-
if compareVersion(os.Getenv("CLICKHOUSE_VERSION"), "21.3") >= 0 {
2136+
if compareVersion(os.Getenv("CLICKHOUSE_VERSION"), "21.3") >= 0 && compareVersion(os.Getenv("CLICKHOUSE_VERSION"), "25.11") < 0 {
21372137
query := "CREATE LIVE VIEW IF NOT EXISTS test_skip_tables.test_live_view AS SELECT count() FROM test_skip_tables.test_merge_tree"
21382138
allowExperimentalAnalyzer, err := env.ch.TurnAnalyzerOffIfNecessary(version, query, "")
21392139
r.NoError(err)
@@ -2153,7 +2153,7 @@ func TestSkipTablesAndSkipTableEngines(t *testing.T) {
21532153
env.DockerExecNoError(r, "clickhouse-backup", "ls", "-la", "/var/lib/clickhouse/backup/skip_table_pattern/metadata/test_skip_tables/test_memory.json")
21542154
env.DockerExecNoError(r, "clickhouse-backup", "ls", "-la", "/var/lib/clickhouse/backup/skip_table_pattern/metadata/test_skip_tables/test_mv.json")
21552155
env.DockerExecNoError(r, "clickhouse-backup", "bash", "-ce", "ls -la /var/lib/clickhouse/backup/skip_table_pattern/metadata/test_skip_tables/*inner*.json")
2156-
if compareVersion(os.Getenv("CLICKHOUSE_VERSION"), "21.3") >= 0 {
2156+
if compareVersion(os.Getenv("CLICKHOUSE_VERSION"), "21.3") >= 0 && compareVersion(os.Getenv("CLICKHOUSE_VERSION"), "25.11") < 0 {
21572157
env.DockerExecNoError(r, "clickhouse-backup", "ls", "-la", "/var/lib/clickhouse/backup/skip_table_pattern/metadata/test_skip_tables/test_live_view.json")
21582158
}
21592159
if compareVersion(os.Getenv("CLICKHOUSE_VERSION"), "21.12") >= 0 {
@@ -2165,7 +2165,7 @@ func TestSkipTablesAndSkipTableEngines(t *testing.T) {
21652165
r.Error(env.DockerExec("clickhouse-backup", "ls", "-la", "/var/lib/clickhouse/backup/skip_engines/metadata/test_skip_tables/test_memory.json"))
21662166
r.Error(env.DockerExec("clickhouse-backup", "ls", "-la", "/var/lib/clickhouse/backup/skip_engines/metadata/test_skip_tables/test_mv.json"))
21672167
env.DockerExecNoError(r, "clickhouse-backup", "bash", "-ce", "ls -la /var/lib/clickhouse/backup/skip_engines/metadata/test_skip_tables/*inner*.json")
2168-
if compareVersion(os.Getenv("CLICKHOUSE_VERSION"), "21.3") >= 0 {
2168+
if compareVersion(os.Getenv("CLICKHOUSE_VERSION"), "21.3") >= 0 && compareVersion(os.Getenv("CLICKHOUSE_VERSION"), "25.11") < 0 {
21692169
r.Error(env.DockerExec("clickhouse-backup", "ls", "-la", "/var/lib/clickhouse/backup/skip_engines/metadata/test_skip_tables/test_live_view.json"))
21702170
}
21712171
if compareVersion(os.Getenv("CLICKHOUSE_VERSION"), "21.12") >= 0 {
@@ -2183,7 +2183,7 @@ func TestSkipTablesAndSkipTableEngines(t *testing.T) {
21832183
r.Error(env.DockerExec("minio", "ls", "-la", "/minio/data/clickhouse/backup/cluster/0/test_skip_full_backup/metadata/test_skip_tables/test_memory.json"))
21842184
env.DockerExecNoError(r, "minio", "ls", "-la", "/minio/data/clickhouse/backup/cluster/0/test_skip_full_backup/metadata/test_skip_tables/test_mv.json")
21852185
env.DockerExecNoError(r, "minio", "bash", "-ce", "ls -la /minio/data/clickhouse/backup/cluster/0/test_skip_full_backup/metadata/test_skip_tables/*inner*.json")
2186-
if compareVersion(os.Getenv("CLICKHOUSE_VERSION"), "21.3") >= 0 {
2186+
if compareVersion(os.Getenv("CLICKHOUSE_VERSION"), "21.3") >= 0 && compareVersion(os.Getenv("CLICKHOUSE_VERSION"), "25.11") < 0 {
21872187
env.DockerExecNoError(r, "minio", "ls", "-la", "/minio/data/clickhouse/backup/cluster/0/test_skip_full_backup/metadata/test_skip_tables/test_live_view.json")
21882188
}
21892189
if compareVersion(os.Getenv("CLICKHOUSE_VERSION"), "21.12") >= 0 {
@@ -2196,7 +2196,7 @@ func TestSkipTablesAndSkipTableEngines(t *testing.T) {
21962196
r.Error(env.DockerExec("minio", "ls", "-la", "/minio/data/clickhouse/backup/cluster/0/test_skip_full_backup/metadata/test_skip_tables/test_memory.json"))
21972197
r.Error(env.DockerExec("minio", "ls", "-la", "/minio/data/clickhouse/backup/cluster/0/test_skip_full_backup/metadata/test_skip_tables/test_mv.json"))
21982198
env.DockerExecNoError(r, "minio", "bash", "-ce", "ls -la /minio/data/clickhouse/backup/cluster/0/test_skip_full_backup/metadata/test_skip_tables/*inner*.json")
2199-
if compareVersion(os.Getenv("CLICKHOUSE_VERSION"), "21.3") >= 0 {
2199+
if compareVersion(os.Getenv("CLICKHOUSE_VERSION"), "21.3") >= 0 && compareVersion(os.Getenv("CLICKHOUSE_VERSION"), "25.11") < 0 {
22002200
r.Error(env.DockerExec("minio", "ls", "-la", "/minio/data/clickhouse/backup/cluster/0/test_skip_full_backup/metadata/test_skip_tables/test_live_view.json"))
22012201
}
22022202
if compareVersion(os.Getenv("CLICKHOUSE_VERSION"), "21.12") >= 0 {
@@ -2209,7 +2209,7 @@ func TestSkipTablesAndSkipTableEngines(t *testing.T) {
22092209
env.DockerExecNoError(r, "minio", "ls", "-la", "/minio/data/clickhouse/backup/cluster/0/test_skip_full_backup/metadata/test_skip_tables/test_memory.json")
22102210
env.DockerExecNoError(r, "minio", "ls", "-la", "/minio/data/clickhouse/backup/cluster/0/test_skip_full_backup/metadata/test_skip_tables/test_mv.json")
22112211
env.DockerExecNoError(r, "minio", "bash", "-ce", "ls -la /minio/data/clickhouse/backup/cluster/0/test_skip_full_backup/metadata/test_skip_tables/*inner*.json")
2212-
if compareVersion(os.Getenv("CLICKHOUSE_VERSION"), "21.3") >= 0 {
2212+
if compareVersion(os.Getenv("CLICKHOUSE_VERSION"), "21.3") >= 0 && compareVersion(os.Getenv("CLICKHOUSE_VERSION"), "25.11") < 0 {
22132213
env.DockerExecNoError(r, "minio", "ls", "-la", "/minio/data/clickhouse/backup/cluster/0/test_skip_full_backup/metadata/test_skip_tables/test_live_view.json")
22142214
}
22152215
if compareVersion(os.Getenv("CLICKHOUSE_VERSION"), "21.12") >= 0 {
@@ -2226,7 +2226,7 @@ func TestSkipTablesAndSkipTableEngines(t *testing.T) {
22262226
env.DockerExecNoError(r, "clickhouse-backup", "ls", "-la", "/var/lib/clickhouse/backup/test_skip_full_backup/metadata/test_skip_tables/test_memory.json")
22272227
env.DockerExecNoError(r, "clickhouse-backup", "ls", "-la", "/var/lib/clickhouse/backup/test_skip_full_backup/metadata/test_skip_tables/test_mv.json")
22282228
env.DockerExecNoError(r, "clickhouse-backup", "bash", "-ce", "ls -la /var/lib/clickhouse/backup/test_skip_full_backup/metadata/test_skip_tables/*inner*.json")
2229-
if compareVersion(os.Getenv("CLICKHOUSE_VERSION"), "21.3") >= 0 {
2229+
if compareVersion(os.Getenv("CLICKHOUSE_VERSION"), "21.3") >= 0 && compareVersion(os.Getenv("CLICKHOUSE_VERSION"), "25.11") < 0 {
22302230
env.DockerExecNoError(r, "clickhouse-backup", "ls", "-la", "/var/lib/clickhouse/backup/test_skip_full_backup/metadata/test_skip_tables/test_live_view.json")
22312231
}
22322232
if compareVersion(os.Getenv("CLICKHOUSE_VERSION"), "21.12") >= 0 {
@@ -2239,7 +2239,7 @@ func TestSkipTablesAndSkipTableEngines(t *testing.T) {
22392239
r.Error(env.DockerExec("clickhouse-backup", "ls", "-la", "/var/lib/clickhouse/backup/test_skip_full_backup/metadata/test_skip_tables/test_memory.json"))
22402240
r.Error(env.DockerExec("clickhouse-backup", "ls", "-la", "/var/lib/clickhouse/backup/test_skip_full_backup/metadata/test_skip_tables/test_mv.json"))
22412241
env.DockerExecNoError(r, "clickhouse-backup", "bash", "-ce", "ls -la /var/lib/clickhouse/backup/test_skip_full_backup/metadata/test_skip_tables/*inner*.json")
2242-
if compareVersion(os.Getenv("CLICKHOUSE_VERSION"), "21.3") >= 0 {
2242+
if compareVersion(os.Getenv("CLICKHOUSE_VERSION"), "21.3") >= 0 && compareVersion(os.Getenv("CLICKHOUSE_VERSION"), "25.11") < 0 {
22432243
r.Error(env.DockerExec("clickhouse-backup", "ls", "-la", "/var/lib/clickhouse/backup/test_skip_full_backup/metadata/test_skip_tables/test_live_view.json"))
22442244
}
22452245
if compareVersion(os.Getenv("CLICKHOUSE_VERSION"), "21.12") >= 0 {
@@ -2252,7 +2252,7 @@ func TestSkipTablesAndSkipTableEngines(t *testing.T) {
22522252
env.DockerExecNoError(r, "clickhouse-backup", "ls", "-la", "/var/lib/clickhouse/backup/test_skip_full_backup/metadata/test_skip_tables/test_memory.json")
22532253
env.DockerExecNoError(r, "clickhouse-backup", "ls", "-la", "/var/lib/clickhouse/backup/test_skip_full_backup/metadata/test_skip_tables/test_mv.json")
22542254
env.DockerExecNoError(r, "clickhouse-backup", "bash", "-ce", "ls -la /var/lib/clickhouse/backup/test_skip_full_backup/metadata/test_skip_tables/*inner*.json")
2255-
if compareVersion(os.Getenv("CLICKHOUSE_VERSION"), "21.3") >= 0 {
2255+
if compareVersion(os.Getenv("CLICKHOUSE_VERSION"), "21.3") >= 0 && compareVersion(os.Getenv("CLICKHOUSE_VERSION"), "25.11") < 0 {
22562256
env.DockerExecNoError(r, "clickhouse-backup", "ls", "-la", "/var/lib/clickhouse/backup/test_skip_full_backup/metadata/test_skip_tables/test_live_view.json")
22572257
}
22582258
if compareVersion(os.Getenv("CLICKHOUSE_VERSION"), "21.12") >= 0 {
@@ -2276,9 +2276,11 @@ func TestSkipTablesAndSkipTableEngines(t *testing.T) {
22762276
expectedTables = 6
22772277
}
22782278
//*.inner.target.* for WINDOW VIEW created only after 22.6
2279-
if compareVersion(os.Getenv("CLICKHOUSE_VERSION"), "22.6") >= 0 {
2279+
//LIVE VIEW removed in 25.11+
2280+
if compareVersion(os.Getenv("CLICKHOUSE_VERSION"), "22.6") >= 0 && compareVersion(os.Getenv("CLICKHOUSE_VERSION"), "25.11") < 0 {
22802281
expectedTables = 7
22812282
}
2283+
22822284
found := false
22832285
for _, item := range result {
22842286
if item.Name == "test_memory" {
@@ -2323,7 +2325,8 @@ func TestSkipTablesAndSkipTableEngines(t *testing.T) {
23232325
expectedTables = 7
23242326
}
23252327
//*.inner.target.* for WINDOW VIEW created only after 22.6
2326-
if compareVersion(os.Getenv("CLICKHOUSE_VERSION"), "22.6") >= 0 {
2328+
//LIVE VIEW removed in 25.11+
2329+
if compareVersion(os.Getenv("CLICKHOUSE_VERSION"), "22.6") >= 0 && compareVersion(os.Getenv("CLICKHOUSE_VERSION"), "25.11") < 0 {
23272330
expectedTables = 8
23282331
}
23292332
r.Equal(expectedTables, len(result), "unexpected tables after full restore in test_skip_tables %#v", result)

0 commit comments

Comments
 (0)