roma-storage 0.4.1 → 0.4.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: e683364828401598f900c197ee7a9d4de6d911e6870fc836722ea5f2863c2986
4
- data.tar.gz: a80f61deb26e63d8ef0a54343e82641472e55881349a56deaddf010f62291998
3
+ metadata.gz: 15a70bb2fa5351726fb3133ac8246ae3ad1a5d1d6c1335baa5915bc282098dee
4
+ data.tar.gz: c7a66b80c0cae8fdd02f94c13401263218d3ffba317d3890b9ed9ae362818ea7
5
5
  SHA512:
6
- metadata.gz: 85fc39c8979a0990d1279b8599d5784f163adf2a3197eca743821e6bda0cd91a24f8941645b3ff575687a7e8d6989f2db42bf1ae23eb0e8ee09367ae249f9956
7
- data.tar.gz: aa712f58b74d9cdc01c3cec7ff11562b00bcf3889f381c50c3816ad9580887c1b1b6d752d900b413a20c5a7b8a2aa76d690aba1626120f09e267a0d777a3deda
6
+ metadata.gz: 3a88eca9a802e3590e3ed832b583718ad76d7fd07c7ca1bcf4607bf2f64b966034a61bef21dbc5c48b2303b03fb39204b3d4982d2727f4dfc942cd0316e79537
7
+ data.tar.gz: 5004273907b0378c04bfec03da67496e11956b61ca209282dc82502c0990ed96cb504e25f5d392ecd59536bdf1b09827e10bc85c7f4b1399be43706e864440ca
@@ -434,7 +434,7 @@ module Roma
434
434
  @divnum.times do |i|
435
435
  next if @dbs[i] != :normal
436
436
  hdb = @hdb[i]
437
- hdb.each do |k, v|
437
+ each_record(hdb) do |k, v|
438
438
  return unless @do_clean_up # 1st check
439
439
  vn, last, clk, expt = unpack_header(v)
440
440
  vn_stat = vnhash[vn]
@@ -463,6 +463,11 @@ module Roma
463
463
  end
464
464
  end
465
465
 
466
+ # Yields each key and value of the database +hdb+, for each_clean_up.
467
+ def each_record(hdb, &block)
468
+ hdb.each(&block)
469
+ end
470
+
466
471
  def stop_clean_up(&block)
467
472
  @do_clean_up = false
468
473
  if block
@@ -23,26 +23,14 @@ module Roma
23
23
  end
24
24
 
25
25
  if RUBY_VERSION >= '1.9.2'
26
- def each_clean_up(t, vnhash)
27
- @do_clean_up = true
28
- nt = Time.now.to_i
29
- @hdb.each{ |hdb|
30
- keys = hdb.keys
31
- keys.each{ |k|
32
- v = hdb[k]
33
- return unless @do_clean_up
34
- vn, last, _clk, expt = unpack_header(v)
35
- vn_stat = vnhash[vn]
36
- if vn_stat == :primary && ( (expt != 0 && nt > expt) || (expt == 0 && t > last) )
37
- yield k, vn
38
- hdb.out(k) if hdb.get(k) == v
39
- elsif vn_stat == nil && t > last
40
- yield k, vn
41
- hdb.out(k) if hdb.get(k) == v
42
- end
43
- sleep @each_clean_up_sleep
44
- }
45
- }
26
+ # Yields the keys that the database has when it starts: a Hash can't
27
+ # take a new key while it is iterated, and the requests set keys
28
+ # while each_clean_up sleeps. A key deleted meanwhile is skipped.
29
+ def each_record(hdb)
30
+ hdb.keys.each do |k|
31
+ v = hdb[k]
32
+ yield k, v if v
33
+ end
46
34
  end
47
35
 
48
36
  def each_unpacked_db(target_vn, db)
@@ -1,5 +1,5 @@
1
1
  module Roma
2
2
  module Storage
3
- VERSION = "0.4.1"
3
+ VERSION = "0.4.2"
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: roma-storage
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.4.1
4
+ version: 0.4.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Tatsuya Sato