miga-base 1.3.20.8 → 1.3.20.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 884fa2f8a10738f2de273cb19a10388f96c06bf60c0c1561a450c9a33baf92d8
-  data.tar.gz: 93b494c3000517ff796380c3de3606066d6a853c170bbbbc7cb55a9dc1ed6e5a
+  metadata.gz: 89f86ec82f63d08729e4f970919dba5762a2888c797cdf6a8a7f32805929508c
+  data.tar.gz: cb3e930ba1a4acb776bd7bcc7481470363109c2c01a67e1780f1d71dc29659c0
 SHA512:
-  metadata.gz: 366f03ddf1672c236d3378d9da097b363d608729f28eb30c1f4770702994b88959444f7a9ff058fda3999de1cd9df7d90320fd2314d42eac7dbbc1c5b2b9162f
-  data.tar.gz: 58189a89c46f22c757b62e5d427f6b0fe89d80c692fda3a566aadc743a9e1ca991cfbe5d667af9ee1c05aebe3c6cc28f13ba71300609ad7a19f661b3a5d26e93
+  metadata.gz: aa6434515aaca67b727e2a725cd2013e3096eb638cfc590e452c4e33c0e72f4c788b14cc0e8254cb91f14082330c038fa826ecab2cca01ccc2d4f96272ce0bac
+  data.tar.gz: f5aec44b327725934d7585e157a68a653c9567743c46120e90d5280638935194684829acaa0003ff14ed239ee07ead6a604e25d423743986f627cb379767614c

data/lib/miga/cli/action/doctor/distances.rb

@@ -141,18 +141,22 @@ module MiGA::Cli::Action::Doctor::Distances
     end
     MiGA::Parallel.distribute(lower_triangle, cli[:threads]) do |cell, k, thr|
       cli.advance('Writing:', k, lower_triangle.size, false) if thr == 0
+      done_f = File.join(tmp, "#{cell[0]}-#{cell[1]}.txt")
+      next if File.exist?(done_f)
+
       fixed_ds = merge_bidir_tmp_pair(tmp, cell[0], cell[1])
-      File.open(File.join(tmp, "#{cell[0]}-#{cell[1]}.txt"), 'w') do |fh|
-        fixed_ds.each { |ds| fh.puts ds }
-      end
+      File.open("#{done_f}.tmp", 'w') { |fh| fixed_ds.each { |ds| fh.puts ds } }
+      File.rename("#{done_f}.tmp", done_f)
     end
     cli.advance('Writing:', lower_triangle.size, lower_triangle.size, false)
     cli.say
     lower_triangle.map do |cell|
       Set.new.tap do |y|
-        File.open(File.join(tmp, "#{cell[0]}-#{cell[1]}.txt"), 'r') do |fh|
-          fh.each { |ln| y << ln.chomp }
-        end
+        file = File.join(tmp, "#{cell[0]}-#{cell[1]}.txt")
+        raise MiGA::Error.new(
+          "Expected file missing, probably due to a thread failure: #{file}"
+        ) unless File.exist?(file)
+        File.open(file, 'r') { |fh| fh.each { |ln| y << ln.chomp } }
       end
     end.inject(Set.new, :+)
   end

data/lib/miga/version.rb

@@ -12,7 +12,7 @@ module MiGA
   # - String indicating release status:
   #   - rc* release candidate, not released as gem
   #   - [0-9]+ stable release, released as gem
-  VERSION = [1.3, 20, 8].freeze
+  VERSION = [1.3, 20, 10].freeze
 
   ##
   # Nickname for the current major.minor version.

data/utils/cleanup-databases.rb

@@ -1,30 +1,18 @@
 #!/usr/bin/env ruby
 
-require 'thread'
 require 'miga'
 
 ARGV[1] or abort "Usage: #{$0} path/to/project threads"
 
 p = MiGA::Project.load(ARGV[0])
-dsn = p.dataset_names
-thr = ARGV[1].to_i
+thr = [ARGV[1].to_i, 1].max
 
-m = MiGA::MiGA.new
-m.say 'Cleaning Databases'
+p.say 'Cleaning Databases'
+ds = p.dataset_ref_active
 
-(0..thr - 1).each do |t|
-  fork do
-    dsn.each_with_index do |i, idx|
-      m.advance('Dataset:', idx + 1, dsn.size) if t == 0
-      next unless (idx % thr) == t
-
-      d = p.dataset(i)
-      next unless d.ref? && d.active?
-
-      d.cleanup_distances!
-    end
-  end
+MiGA::Parallel.distribute(ds, thr) do |d, k, t|
+  p.advance('Dataset:', k, ds.size) if t == 0
+  d.cleanup_distances!
 end
-Process.waitall
-m.advance('Dataset:', dsn.size, dsn.size)
-m.say
+p.advance('Dataset:', ds.size, ds.size)
+p.say

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: miga-base
 version: !ruby/object:Gem::Version
-  version: 1.3.20.8
+  version: 1.3.20.10
 platform: ruby
 authors:
 - Luis M. Rodriguez-R