litestream 0.7.2-x86_64-linux → 0.9.0-x86_64-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3fc80c60f00f49af0aa809eb1105a801c456e4ce7a1c025fb52b006316a86fc5
-  data.tar.gz: 15745f36c2e10d154e109763de84098285eeb4d2c5b4c8464b171eb597510817
+  metadata.gz: 7ce26bfd1f1653d96303a109f652aa041f24eeb11b8df7a64ad1172f1630adf0
+  data.tar.gz: 3570aa252e1a755c6dc78bc5e720fda47fc7ea340d0a81ab816a766056757f18
 SHA512:
-  metadata.gz: bf8212c25a33f8c0b6d0724384409991fa94822be7b4054c62bc790d4cbf4755e347e4f253b01865d02e9016c4290cbdcf608299f0f62b927b232e3ffeb17a3d
-  data.tar.gz: 55f6ec8f7c9f1c5071533fd47a207011a0a2d18bc8361de85e1249acef07b7e19b1d0c6bea86b2c1a86a1768fcfffec82458ef7d24602fcaf83774793385a7a2
+  metadata.gz: 8d0ddf78cfc460f6652b8664b0f31246b745451b01f675695fb28cba646874bca31e39c62af51363ddc99e45dd023fdd0e2cec0efbd9a888009e0318f3ba5dd1
+  data.tar.gz: 57520e534e247b47b3898269b3c36dc754869694c9ad2cb896292ee6bb66b6c5fcb56691d64030ef6d7831b991b3b264e1775304cff355ca14c7d754e13ad12e

data/lib/litestream/commands.rb

@@ -102,16 +102,29 @@ module Litestream
         }.merge(argv)
         restore(database, async: false, **args)
 
-        restored_tables_count = `sqlite3 #{backup} "select count(*) from sqlite_schema where type='table';"`.chomp.to_i
-        restored_size = File.size(backup)
-        original_tables_count = `sqlite3 #{database} "select count(*) from sqlite_schema where type='table';"`.chomp.to_i
-        original_size = File.size(database)
+        restored_schema = `sqlite3 #{backup} "select name, type from sqlite_schema;"`.chomp.split("\n")
+        restored_data = restored_schema.map { _1.split("|") }.group_by(&:last)
+        restored_rows_count = restored_data["table"]&.sum { |tbl, _| `sqlite3 #{backup} "select count(*) from #{tbl};"`.chomp.to_i }
+
+        original_schema = `sqlite3 #{database} "select name, type from sqlite_schema;"`.chomp.split("\n")
+        original_data = original_schema.map { _1.split("|") }.group_by(&:last)
+        original_rows_count = original_data["table"]&.sum { |tbl, _| `sqlite3 #{database} "select count(*) from #{tbl};"`.chomp.to_i }
 
         Dir.glob(backup + "*").each { |file| File.delete(file) }
 
         {
-          "size" => {"original" => original_size, "restored" => restored_size},
-          "tables" => {"original" => original_tables_count, "restored" => restored_tables_count}
+          "original" => {
+            "path" => database,
+            "tables" => original_data["table"]&.size,
+            "indexes" => original_data["index"]&.size,
+            "rows" => original_rows_count
+          },
+          "restored" => {
+            "path" => backup,
+            "tables" => restored_data["table"]&.size,
+            "indexes" => restored_data["index"]&.size,
+            "rows" => restored_rows_count
+          }
         }
       end
 

data/lib/litestream/version.rb

@@ -1,3 +1,3 @@
 module Litestream
-  VERSION = "0.7.2"
+  VERSION = "0.9.0"
 end

data/lib/tasks/litestream_tasks.rake

@@ -93,18 +93,53 @@ namespace :litestream do
     options.symbolize_keys!
 
     result = Litestream::Commands.verify(database, async: true, **options)
-
-    puts <<~TXT if result
-
-      size
-        original          #{result["size"]["original"]}
-        restored          #{result["size"]["restored"]}
-        delta             #{result["size"]["original"] - result["size"]["restored"]}
-
-      tables
-        original          #{result["tables"]["original"]}
-        restored          #{result["tables"]["restored"]}
-        delta             #{result["tables"]["original"] - result["tables"]["restored"]}
-    TXT
+    original_tables = result["original"]["tables"]
+    restored_tables = result["restored"]["tables"]
+    original_indexes = result["original"]["indexes"]
+    restored_indexes = result["restored"]["indexes"]
+    original_rows = result["original"]["rows"]
+    restored_rows = result["restored"]["rows"]
+
+    same_number_of_tables = original_tables == restored_tables
+    same_number_of_indexes = original_indexes == restored_indexes
+    same_number_of_rows = original_rows == restored_rows
+
+    if same_number_of_tables && same_number_of_indexes && same_number_of_rows
+      puts "Backup for `#{database}` verified as consistent!\n" + [
+        "  tables   #{original_tables}",
+        "  indexes  #{original_indexes}",
+        "  rows     #{original_rows}"
+      ].compact.join("\n")
+    else
+      abort "Verification failed for #{database}:\n" + [
+        (unless same_number_of_tables
+           if original_tables > restored_tables
+             diff = original_tables - restored_tables
+             "  Backup is missing #{diff} table#{"s" if diff > 1}"
+           else
+             diff = restored_tables - original_tables
+             "  Backup has extra #{diff} table#{"s" if diff > 1}"
+           end
+         end),
+        (unless same_number_of_indexes
+           if original_indexes > restored_indexes
+             diff = original_indexes - restored_indexes
+             "  Backup is missing #{diff} index#{"es" if diff > 1}"
+           else
+             diff = restored_indexes - original_indexes
+             "  Backup has extra #{diff} index#{"es" if diff > 1}"
+           end
+         end),
+        (unless same_number_of_rows
+           if original_rows > restored_rows
+             diff = original_rows - restored_rows
+             "  Backup is missing #{diff} row#{"s" if diff > 1}"
+           else
+             diff = restored_rows - original_rows
+             "  Backup has extra #{diff} row#{"s" if diff > 1}"
+           end
+         end)
+      ].compact.join("\n")
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: litestream
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.9.0
 platform: x86_64-linux
 authors:
 - Stephen Margheim
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-05-02 00:00:00.000000000 Z
+date: 2024-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logfmt