fix(restore_test): regenerate golden files for enterprise

scylladb · May 9, 2024 · 397eac0 · 397eac0
1 parent fa1a8f4
commit 397eac0
Show file tree

Hide file tree

Showing 9 changed files with 124 additions and 92 deletions.
diff --git a/pkg/service/restore/testdata/get_target/continue_false.target.json b/pkg/service/restore/testdata/get_target/continue_false.target.json
@@ -15,7 +15,7 @@
     "!ks1.mv1",
     "!ks2.si1_index"
   ],
-  "snapshot_tag": "sm_20231109110956UTC",
+  "snapshot_tag": "sm_20240509162107UTC",
   "batch_size": 2,
   "restore_tables": true,
   "continue": false

diff --git a/pkg/service/restore/testdata/get_target/continue_false.units.json b/pkg/service/restore/testdata/get_target/continue_false.units.json
@@ -1,73 +1,73 @@
 [
   {
     "keyspace": "ks1",
-    "size": 15078072,
+    "size": 12942864,
     "tables": [
       {
-        "table": "table2",
-        "tombstone_gc": "timeout",
-        "size": 7539036
+        "table": "table1",
+        "tombstone_gc": "repair",
+        "size": 6471438
       },
       {
-        "table": "table1",
-        "tombstone_gc": "timeout",
-        "size": 7539036
+        "table": "table2",
+        "tombstone_gc": "repair",
+        "size": 6471426
       }
     ]
   },
   {
-    "keyspace": "ks2",
-    "size": 15078060,
+    "keyspace": "system_distributed",
+    "size": 305454,
     "tables": [
       {
-        "table": "table1",
+        "table": "view_build_status",
         "tombstone_gc": "timeout",
-        "size": 7539030
+        "size": 305454
       },
       {
-        "table": "table2",
+        "table": "dicts",
+        "tombstone_gc": "timeout",
+        "size": 0
+      },
+      {
+        "table": "service_levels",
+        "tombstone_gc": "timeout",
+        "size": 0
+      }
+    ]
+  },
+  {
+    "keyspace": "system_replicated_keys",
+    "size": 0,
+    "tables": [
+      {
+        "table": "encrypted_keys",
         "tombstone_gc": "timeout",
-        "size": 7539030
+        "size": 0
       }
     ]
   },
   {
     "keyspace": "system_auth",
-    "size": 104226,
+    "size": 0,
     "tables": [
       {
-        "table": "role_permissions",
+        "table": "role_attributes",
         "tombstone_gc": "timeout",
-        "size": 70848
+        "size": 0
       },
       {
         "table": "roles",
         "tombstone_gc": "timeout",
-        "size": 33378
-      },
-      {
-        "table": "role_members",
-        "tombstone_gc": "timeout",
         "size": 0
       },
       {
-        "table": "role_attributes",
+        "table": "role_permissions",
         "tombstone_gc": "timeout",
         "size": 0
-      }
-    ]
-  },
-  {
-    "keyspace": "system_distributed",
-    "size": 187103,
-    "tables": [
-      {
-        "table": "view_build_status",
-        "tombstone_gc": "timeout",
-        "size": 187103
       },
       {
-        "table": "service_levels",
+        "table": "role_members",
         "tombstone_gc": "timeout",
         "size": 0
       }
@@ -78,30 +78,46 @@
     "size": 0,
     "tables": [
       {
-        "table": "sessions_time_idx",
+        "table": "events",
         "tombstone_gc": "timeout",
         "size": 0
       },
       {
-        "table": "sessions",
+        "table": "node_slow_log",
         "tombstone_gc": "timeout",
         "size": 0
       },
       {
-        "table": "node_slow_log_time_idx",
+        "table": "sessions_time_idx",
         "tombstone_gc": "timeout",
         "size": 0
       },
       {
-        "table": "node_slow_log",
+        "table": "node_slow_log_time_idx",
         "tombstone_gc": "timeout",
         "size": 0
       },
       {
-        "table": "events",
+        "table": "sessions",
         "tombstone_gc": "timeout",
         "size": 0
       }
     ]
+  },
+  {
+    "keyspace": "ks2",
+    "size": 12942852,
+    "tables": [
+      {
+        "table": "table2",
+        "tombstone_gc": "repair",
+        "size": 6471420
+      },
+      {
+        "table": "table1",
+        "tombstone_gc": "repair",
+        "size": 6471432
+      }
+    ]
   }
 ]
diff --git a/pkg/service/restore/testdata/get_target/continue_false.views.json b/pkg/service/restore/testdata/get_target/continue_false.views.json
@@ -11,6 +11,6 @@
     "view": "mv1",
     "type": "MaterializedView",
     "base_table": "table1",
-    "create_stmt": "CREATE MATERIALIZED VIEW IF NOT EXISTS ks1.mv1 AS\n    SELECT *\n    FROM ks1.table1\n    WHERE data IS NOT null\n    PRIMARY KEY (id, data)\n    WITH CLUSTERING ORDER BY (data ASC)\n    AND bloom_filter_fp_chance = 0.01\n    AND caching = {'keys':'ALL','rows_per_partition':'ALL'}\n    AND comment = ''\n    AND compaction = {'class':'SizeTieredCompactionStrategy'}\n    AND compression = {'sstable_compression':'org.apache.cassandra.io.compress.LZ4Compressor'}\n    AND crc_check_chance = 1\n    AND dclocal_read_repair_chance = 0\n    AND default_time_to_live = 0\n    AND gc_grace_seconds = 864000\n    AND max_index_interval = 2048\n    AND memtable_flush_period_in_ms = 0\n    AND min_index_interval = 128\n    AND read_repair_chance = 0\n    AND speculative_retry = '99.0PERCENTILE'"
+    "create_stmt": "CREATE MATERIALIZED VIEW IF NOT EXISTS ks1.mv1 AS\n    SELECT *\n    FROM ks1.table1\n    WHERE data IS NOT null\n    PRIMARY KEY (id, data)\n    WITH CLUSTERING ORDER BY (data ASC)\n    AND bloom_filter_fp_chance = 0.01\n    AND caching = {'keys':'ALL','rows_per_partition':'ALL'}\n    AND comment = ''\n    AND compaction = {'class':'IncrementalCompactionStrategy'}\n    AND compression = {'sstable_compression':'org.apache.cassandra.io.compress.LZ4Compressor'}\n    AND crc_check_chance = 1\n    AND dclocal_read_repair_chance = 0\n    AND default_time_to_live = 0\n    AND gc_grace_seconds = 864000\n    AND max_index_interval = 2048\n    AND memtable_flush_period_in_ms = 0\n    AND min_index_interval = 128\n    AND read_repair_chance = 0\n    AND speculative_retry = '99.0PERCENTILE'"
   }
 ]
diff --git a/pkg/service/restore/testdata/get_target/default_values.target.json b/pkg/service/restore/testdata/get_target/default_values.target.json
@@ -15,7 +15,7 @@
     "!ks1.mv1",
     "!ks2.si1_index"
   ],
-  "snapshot_tag": "sm_20231109110956UTC",
+  "snapshot_tag": "sm_20240509162107UTC",
   "batch_size": 2,
   "restore_tables": true,
   "continue": true

diff --git a/pkg/service/restore/testdata/get_target/default_values.units.json b/pkg/service/restore/testdata/get_target/default_values.units.json
@@ -1,104 +1,120 @@
 [
   {
-    "keyspace": "system_distributed",
-    "size": 187103,
+    "keyspace": "ks2",
+    "size": 12942852,
     "tables": [
       {
-        "table": "view_build_status",
-        "tombstone_gc": "timeout",
-        "size": 187103
+        "table": "table2",
+        "tombstone_gc": "repair",
+        "size": 6471420
       },
       {
-        "table": "service_levels",
-        "tombstone_gc": "timeout",
-        "size": 0
+        "table": "table1",
+        "tombstone_gc": "repair",
+        "size": 6471432
       }
     ]
   },
   {
-    "keyspace": "system_traces",
-    "size": 0,
+    "keyspace": "ks1",
+    "size": 12942864,
     "tables": [
       {
-        "table": "sessions_time_idx",
-        "tombstone_gc": "timeout",
-        "size": 0
+        "table": "table1",
+        "tombstone_gc": "repair",
+        "size": 6471438
       },
       {
-        "table": "sessions",
-        "tombstone_gc": "timeout",
-        "size": 0
-      },
+        "table": "table2",
+        "tombstone_gc": "repair",
+        "size": 6471426
+      }
+    ]
+  },
+  {
+    "keyspace": "system_distributed",
+    "size": 305454,
+    "tables": [
       {
-        "table": "node_slow_log_time_idx",
+        "table": "view_build_status",
         "tombstone_gc": "timeout",
-        "size": 0
+        "size": 305454
       },
       {
-        "table": "node_slow_log",
+        "table": "dicts",
         "tombstone_gc": "timeout",
         "size": 0
       },
       {
-        "table": "events",
+        "table": "service_levels",
         "tombstone_gc": "timeout",
         "size": 0
       }
     ]
   },
   {
-    "keyspace": "ks1",
-    "size": 15078072,
+    "keyspace": "system_replicated_keys",
+    "size": 0,
     "tables": [
       {
-        "table": "table2",
-        "tombstone_gc": "timeout",
-        "size": 7539036
-      },
-      {
-        "table": "table1",
+        "table": "encrypted_keys",
         "tombstone_gc": "timeout",
-        "size": 7539036
+        "size": 0
       }
     ]
   },
   {
-    "keyspace": "ks2",
-    "size": 15078060,
+    "keyspace": "system_auth",
+    "size": 0,
     "tables": [
       {
-        "table": "table1",
+        "table": "role_attributes",
         "tombstone_gc": "timeout",
-        "size": 7539030
+        "size": 0
       },
       {
-        "table": "table2",
+        "table": "roles",
+        "tombstone_gc": "timeout",
+        "size": 0
+      },
+      {
+        "table": "role_permissions",
+        "tombstone_gc": "timeout",
+        "size": 0
+      },
+      {
+        "table": "role_members",
         "tombstone_gc": "timeout",
-        "size": 7539030
+        "size": 0
       }
     ]
   },
   {
-    "keyspace": "system_auth",
-    "size": 104226,
+    "keyspace": "system_traces",
+    "size": 0,
     "tables": [
       {
-        "table": "role_permissions",
+        "table": "events",
         "tombstone_gc": "timeout",
-        "size": 70848
+        "size": 0
       },
       {
-        "table": "roles",
+        "table": "node_slow_log",
         "tombstone_gc": "timeout",
-        "size": 33378
+        "size": 0
       },
       {
-        "table": "role_members",
+        "table": "sessions_time_idx",
         "tombstone_gc": "timeout",
         "size": 0
       },
       {
-        "table": "role_attributes",
+        "table": "node_slow_log_time_idx",
+        "tombstone_gc": "timeout",
+        "size": 0
+      },
+      {
+        "table": "sessions",
         "tombstone_gc": "timeout",
         "size": 0
       }

diff --git a/pkg/service/restore/testdata/get_target/default_values.views.json b/pkg/service/restore/testdata/get_target/default_values.views.json
@@ -11,6 +11,6 @@
     "view": "mv1",
     "type": "MaterializedView",
     "base_table": "table1",
-    "create_stmt": "CREATE MATERIALIZED VIEW IF NOT EXISTS ks1.mv1 AS\n    SELECT *\n    FROM ks1.table1\n    WHERE data IS NOT null\n    PRIMARY KEY (id, data)\n    WITH CLUSTERING ORDER BY (data ASC)\n    AND bloom_filter_fp_chance = 0.01\n    AND caching = {'keys':'ALL','rows_per_partition':'ALL'}\n    AND comment = ''\n    AND compaction = {'class':'SizeTieredCompactionStrategy'}\n    AND compression = {'sstable_compression':'org.apache.cassandra.io.compress.LZ4Compressor'}\n    AND crc_check_chance = 1\n    AND dclocal_read_repair_chance = 0\n    AND default_time_to_live = 0\n    AND gc_grace_seconds = 864000\n    AND max_index_interval = 2048\n    AND memtable_flush_period_in_ms = 0\n    AND min_index_interval = 128\n    AND read_repair_chance = 0\n    AND speculative_retry = '99.0PERCENTILE'"
+    "create_stmt": "CREATE MATERIALIZED VIEW IF NOT EXISTS ks1.mv1 AS\n    SELECT *\n    FROM ks1.table1\n    WHERE data IS NOT null\n    PRIMARY KEY (id, data)\n    WITH CLUSTERING ORDER BY (data ASC)\n    AND bloom_filter_fp_chance = 0.01\n    AND caching = {'keys':'ALL','rows_per_partition':'ALL'}\n    AND comment = ''\n    AND compaction = {'class':'IncrementalCompactionStrategy'}\n    AND compression = {'sstable_compression':'org.apache.cassandra.io.compress.LZ4Compressor'}\n    AND crc_check_chance = 1\n    AND dclocal_read_repair_chance = 0\n    AND default_time_to_live = 0\n    AND gc_grace_seconds = 864000\n    AND max_index_interval = 2048\n    AND memtable_flush_period_in_ms = 0\n    AND min_index_interval = 128\n    AND read_repair_chance = 0\n    AND speculative_retry = '99.0PERCENTILE'"
   }
 ]
diff --git a/pkg/service/restore/testdata/get_target/tables.target.json b/pkg/service/restore/testdata/get_target/tables.target.json
@@ -16,7 +16,7 @@
     "!ks1.mv1",
     "!ks2.si1_index"
   ],
-  "snapshot_tag": "sm_20231109110956UTC",
+  "snapshot_tag": "sm_20240509162107UTC",
   "batch_size": 99,
   "parallel": 98,
   "restore_tables": true,

diff --git a/pkg/service/restore/testdata/get_target/tables.units.json b/pkg/service/restore/testdata/get_target/tables.units.json
@@ -1,12 +1,12 @@
 [
   {
     "keyspace": "ks1",
-    "size": 7539036,
+    "size": 6471438,
     "tables": [
       {
         "table": "table1",
-        "tombstone_gc": "timeout",
-        "size": 7539036
+        "tombstone_gc": "repair",
+        "size": 6471438
       }
     ]
   }

diff --git a/pkg/service/restore/testdata/get_target/tables.views.json b/pkg/service/restore/testdata/get_target/tables.views.json
@@ -4,6 +4,6 @@
     "view": "mv1",
     "type": "MaterializedView",
     "base_table": "table1",
-    "create_stmt": "CREATE MATERIALIZED VIEW IF NOT EXISTS ks1.mv1 AS\n    SELECT *\n    FROM ks1.table1\n    WHERE data IS NOT null\n    PRIMARY KEY (id, data)\n    WITH CLUSTERING ORDER BY (data ASC)\n    AND bloom_filter_fp_chance = 0.01\n    AND caching = {'keys':'ALL','rows_per_partition':'ALL'}\n    AND comment = ''\n    AND compaction = {'class':'SizeTieredCompactionStrategy'}\n    AND compression = {'sstable_compression':'org.apache.cassandra.io.compress.LZ4Compressor'}\n    AND crc_check_chance = 1\n    AND dclocal_read_repair_chance = 0\n    AND default_time_to_live = 0\n    AND gc_grace_seconds = 864000\n    AND max_index_interval = 2048\n    AND memtable_flush_period_in_ms = 0\n    AND min_index_interval = 128\n    AND read_repair_chance = 0\n    AND speculative_retry = '99.0PERCENTILE'"
+    "create_stmt": "CREATE MATERIALIZED VIEW IF NOT EXISTS ks1.mv1 AS\n    SELECT *\n    FROM ks1.table1\n    WHERE data IS NOT null\n    PRIMARY KEY (id, data)\n    WITH CLUSTERING ORDER BY (data ASC)\n    AND bloom_filter_fp_chance = 0.01\n    AND caching = {'keys':'ALL','rows_per_partition':'ALL'}\n    AND comment = ''\n    AND compaction = {'class':'IncrementalCompactionStrategy'}\n    AND compression = {'sstable_compression':'org.apache.cassandra.io.compress.LZ4Compressor'}\n    AND crc_check_chance = 1\n    AND dclocal_read_repair_chance = 0\n    AND default_time_to_live = 0\n    AND gc_grace_seconds = 864000\n    AND max_index_interval = 2048\n    AND memtable_flush_period_in_ms = 0\n    AND min_index_interval = 128\n    AND read_repair_chance = 0\n    AND speculative_retry = '99.0PERCENTILE'"
   }
 ]