hutch-xamplr 1.0.4 → 1.0.5

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:minor: 0
-:patch: 4
+:patch: 5
 :major: 1
+:minor: 0

data/examples/random-people/batch-load-users.rb

@@ -5,8 +5,8 @@ require 'RandomPeople'
 require 'people'
 
 Xampl.set_default_persister_kind(:tokyo_cabinet)
-#Xampl.set_default_persister_format(:xml_format)
-Xampl.set_default_persister_format(:ruby_format)
+Xampl.set_default_persister_format(:xml_format)
+#Xampl.set_default_persister_format(:ruby_format)
 
 module RandomPeople
 

data/examples/random-people/optimise.rb

@@ -4,8 +4,8 @@ require 'RandomPeople'
 require 'people'
 
 Xampl.set_default_persister_kind(:tokyo_cabinet)
-#Xampl.set_default_persister_format(:xml_format)
-Xampl.set_default_persister_format(:ruby_format)
+Xampl.set_default_persister_format(:xml_format)
+#Xampl.set_default_persister_format(:ruby_format)
 
 module RandomPeople
 

data/examples/random-people/query.rb

@@ -4,8 +4,8 @@ require 'RandomPeople'
 require 'people'
 
 Xampl.set_default_persister_kind(:tokyo_cabinet)
-#Xampl.set_default_persister_format(:xml_format)
-Xampl.set_default_persister_format(:ruby_format)
+Xampl.set_default_persister_format(:xml_format)
+#Xampl.set_default_persister_format(:ruby_format)
 
 module RandomPeople
 

data/examples/random-people/query2.rb

@@ -4,8 +4,8 @@ require 'RandomPeople'
 require 'people'
 
 Xampl.set_default_persister_kind(:tokyo_cabinet)
-#Xampl.set_default_persister_format(:xml_format)
-Xampl.set_default_persister_format(:ruby_format)
+Xampl.set_default_persister_format(:xml_format)
+#Xampl.set_default_persister_format(:ruby_format)
 
 module RandomPeople
 

data/examples/random-people-shared-addresses/find-people-by-address.rb

@@ -92,10 +92,7 @@ module RandomPeople
         people = Xampl.find_mentions_of(address)
 
         people_inspected += people.size
-
-        people.each do | person |
-          all_people << person if person.address.first == address
-        end
+        all_people.merge(people)
       end
     end
 

data/lib/xamplr/README-POSSIBLE-PROBLEMS

@@ -0,0 +1,5 @@
+
+I modified from-xml around 180-190 in a couple of places, marked with TODO comments
+
+Why this cropped up now I DO NOT KNOW and this makes me nervous.
+

data/lib/xamplr/from-xml.rb

@@ -137,9 +137,9 @@ module Xampl
         end
 
         unless @is_realising then
-          @attributeValue.size.times{ | i |
+          @attributeValue.size.times do |i|
             FromXML.tokenise_string @attributeValue[i]
-          }
+          end
         end
 
         if target then
@@ -150,7 +150,7 @@ module Xampl
           element.note_attributes_initialised(@is_realising)
         else
           if klasses[0].persisted? then
-            @attributeName.each_index{ | i |
+            @attributeName.each_index do |i|
               if @attributeName[i] == klasses[0].persisted?.to_s then
                 existing_element = Xampl.find_known(klasses[0], @attributeValue[i])
                 if existing_element then
@@ -178,10 +178,16 @@ module Xampl
                   #                   existing_element.reset_contents
                   #                   element = existing_element
                   #                   existing_element = nil
+#                  puts "#{File.basename(__FILE__)} #{__LINE__} EXISTING ELEMENT: #{ existing_element }"
+#                  puts "#{File.basename(__FILE__)} #{__LINE__} WOW, must handle the existing element correctly"
+                  element = existing_element #TODO -- IS THIS RIGHT????????????????????????
                 end
                 unless element then
                   element = klasses[0].new
                   requires_caching = @recovering
+#                  puts "#{File.basename(__FILE__)} #{__LINE__} WOW, what about recovering????"
+                  #TODO -- IS THIS RIGHT????????????????????????
+                  requires_caching = true #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
                   unless @recovering then
                     element.force_load if parent
                   end
@@ -190,7 +196,7 @@ module Xampl
 
                 break
               end
-            }
+            end
           end
 
           unless element then

data/lib/xamplr/indexed-array.rb

@@ -79,35 +79,37 @@ class IndexedArray
   end
 
   def each
-    @store.each{ | obj | yield(obj) }
+    @store.each do  |obj |
+      yield(obj)
+    end
   end
 
   def each_index
-    @store.each_index{ | i | yield(i) }
+    @store.each_index { | i | yield(i) }
   end
 
   def each_key_value
-    @map.each{ | k, v | yield(k, @store[v]) }
+    @map.each { | k, v | yield(k, @store[v]) }
   end
 
   def sort
-    @store.sort{ | a, b | yield(a, b) }
+    @store.sort { | a, b | yield(a, b) }
   end
 
   def sort!
     arr = []
-    @map.each{ | index, pos |
+    @map.each do |index, pos|
       arr << [index, @store[pos]]
-    }
-    arr.sort!{ | a, b |
+    end
+    arr.sort! do |a, b|
       yield(a[1], b[1])
-    }
+    end
     @map = {}
     @store = []
-    arr.each { | pair |
+    arr.each do |pair|
       @map[pair[0]] = @store.size
       @store << pair[1]
-    }
+    end
   end
 end
 

data/lib/xamplr/persistence.rb

@@ -63,7 +63,7 @@ module Xampl
     @@persister = @@known_persisters[name]
 
     if @@persister then
-#      @@persister.open # this won't work
+      #      @@persister.open # this won't work
       # TODO -- if we know the persister, why are we being so anal about kind and format???
 
       kind = @@persister.kind || kind
@@ -691,8 +691,7 @@ module Xampl
 
     def lookup(klass, pid)
       #raise XamplException.new(:live_across_rollback) if @rolled_back
-
-      # puts "LOOKUP:: klass: #{klass} pid: #{pid}"
+#puts "#{File.basename(__FILE__)} #{__LINE__} LOOKUP:: klass: #{klass} pid: #{pid}"
 
       begin
         busy(true)
@@ -701,6 +700,8 @@ module Xampl
         busy(false)
       end
 
+#puts "#{File.basename(__FILE__)} #{__LINE__}       ---> #{ xampl }"
+
       return xampl
     end
 
@@ -713,7 +714,7 @@ module Xampl
     end
 
     def lazy_load(target, klass, pid)
-      # puts "LAZY_LOAD:: klass: #{klass} pid: #{pid} target: #{target}"
+#      puts "#{File.basename(__FILE__)} #{__LINE__} LAZY_LOAD:: klass: #{klass} pid: #{pid} target: #{target}"
 
       xampl = read(klass, pid, target)
 

data/lib/xamplr/persister/caches.rb

@@ -37,7 +37,7 @@ module Xampl
       actual_victim = nil
       min = 1 + @now
       @size = 0
-      @cache.each{ | key, pair |
+      @cache.each do |key, pair|
         possibility = pair[0]
         if (not possibility.load_needed) and pair[1] < min then
           @size += 1
@@ -45,7 +45,7 @@ module Xampl
           actual_victim = possibility
           min = pair[1]
         end
-      }
+      end
 #puts
       #puts
       #puts "REMOVE FROM CACHE(XamplCache): victim: #{victim}, actual: #{actual_victim}"
@@ -84,11 +84,11 @@ module Xampl
     end
 
     def print(out = "")
-      out << "Cache with capacity: #{@capacity}, current size: #{@size}\n"
-      @cache.each{ | key, pair |
+      out << "Cache (standard) with capacity: #{@capacity}, current size: #{@size}\n"
+      @cache.each do |key, pair|
         out << sprintf("  key: '%s', value: '%s', accessed: %s\n",
                        key, pair[0], pair[1])
-      }
+      end
       out
     end
 
@@ -122,7 +122,7 @@ module Xampl
       actual_victim = nil
       min = 1 + @accesses
       live = 0
-      @cache.each{ | key, pair |
+      @cache.each do |key, pair|
         pair[1] -= 1
         possibility = pair[0]
         if (not possibility.load_needed) and pair[1] < min then
@@ -131,7 +131,7 @@ module Xampl
           actual_victim = possibility
           min = pair[1]
         end
-      }
+      end
 #puts
       #puts
       #puts "REMOVE FROM CACHE(XamplCacheLFU): victim: #{victim}, actual: #{actual_victim} -- live: #{live}, size: #{@size}"
@@ -172,11 +172,11 @@ module Xampl
     end
 
     def print(out = "")
-      out << "Cache with capacity: #{@capacity}, current size: #{@size}\n"
-      @cache.each{ | key, pair |
+      out << "Cache (LFU) with capacity: #{@capacity}, current size: #{@size}\n"
+      @cache.each do |key, pair|
         out << sprintf("  key: '%s', value: '%s', count: %s\n",
                        key, pair[0], pair[1])
-      }
+      end
       out
     end
 

data/lib/xamplr/persister/caching.rb

@@ -25,45 +25,45 @@ module Xampl
 
     def sync_done
       if @new_cache then
-        @new_cache.each{ | name1, map1 |
+        @new_cache.each do |name1, map1|
           if map1 then
             cache_map1 = @cache[name1]
             @cache[name1] = cache_map1 = {} unless cache_map1
-            map1.each{ | name2, map2 |
+            map1.each do |name2, map2|
               if map2 then
                 cache_map2 = cache_map1[name2]
                 #cache_map1[name2] = cache_map2 = {} unless cache_map2
                 cache_map1[name2] = cache_map2 = fresh_cache unless cache_map2
 
                 #cache_map2.merge!(map2)
-                map2.each{ | pid, xampl |
+                map2.each do |pid, xampl|
                   cache_map2[pid] = xampl
-                }
+                end
               end
-            }
+            end
           end
-        }
+        end
       end
       @new_cache = {}
     end
 
     def rollback_cleanup
-      @new_cache.each{ | name, map |
+      @new_cache.each do |name, map|
         if map then
-          map.each{ | name2, map2 |
+          map.each do |name2, map2|
             if map2 then
-              map2.each{ | pid, xampl |
+              map2.each do |pid, xampl|
                 @changed.delete(xampl)
-              }
+              end
             end
-          }
+          end
         end
-      }
-      @changed.each{ | xampl, ignore|
-        xampl.force_load
-      }
-      @new_cache = {}
-      super
+        @changed.each do |xampl, ignore|
+          xampl.force_load
+        end
+        @new_cache = {}
+        super
+      end
     end
 
     def cache(xampl)
@@ -91,6 +91,11 @@ module Xampl
       xampl = Xampl.lookup_in_map(@cache, klass, pid)
       if xampl then
         if target and target != xampl then
+
+          puts "#{File.basename(__FILE__)} #{__LINE__} CACHE CONFLICT:: klass: #{ klass }, pid: #{ pid }, target: #{ target }, cached: #{ xampl }"
+          dump(@cache)
+          caller(0).each { | trace | puts "  #{trace}"}
+
           target.invalidate
           raise XamplException.new(:cache_conflict)
         end
@@ -117,8 +122,19 @@ module Xampl
       return nil, target
     end
 
+    def dump(cache)
+      puts "DUMP CACHE"
+      cache.each do | k, v |
+        puts "--- [[#{k}]]"
+        v.each do | kk, vv |
+          puts "--- --- [[#{kk}]]"
+          puts vv.print
+        end
+      end
+    end
+
     def read(klass, pid, target=nil)
-      #puts "ABSTRACT_READ[#{__LINE__}]:: klass: #{klass} pid: #{pid} target: #{target}"
+      #      puts "#{File.basename(__FILE__)} #{__LINE__} READ:: klass: #{klass} pid: #{pid} target: [[#{target}]], PM: #{ self }"
 
       xampl, target = read_from_cache(klass, pid, target)
       return xampl if xampl and !target
@@ -139,6 +155,9 @@ module Xampl
         raise e
       end
 
+      #      puts "#{File.basename(__FILE__)} #{__LINE__} STORE IN CACHE:: xampl: #{xampl }, persister: #{ self }"
+      #      dump(@cache)
+
       Xampl.store_in_cache(@cache, xampl, self) { xampl }
       xampl.introduce_persister(self)
 
@@ -146,8 +165,6 @@ module Xampl
       xampl.changes_accepted
       @changed.delete(xampl)
 
-      #puts "                READ [#{xampl}]"
-      #puts "                READ [#{xampl}]" if ('1145881653_1' == pid)
       return xampl
     end
   end

data/lib/xamplr/xampl-object.rb

@@ -216,7 +216,8 @@ module Xampl
     end
 
     def XamplObject.realise_from_xml_string(xml_string, target=nil, tokenise=true)
-      return FromXML.new.realise_string(xml_string, tokenise, target)
+      xampl = FromXML.new.realise_string(xml_string, tokenise, target)
+      return xampl
     end
 
     def XamplObject.from_xml_string(xml_string, tokenise=true)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: hutch-xamplr
 version: !ruby/object:Gem::Version 
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors: 
 - Bob Hutchison
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-21 00:00:00 -07:00
+date: 2009-04-27 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -71,6 +71,7 @@ files:
 - lib/xampl.rb
 - lib/xamplr-generator.rb
 - lib/xamplr.rb
+- lib/xamplr/README-POSSIBLE-PROBLEMS
 - lib/xamplr/TODO
 - lib/xamplr/from-xml.rb
 - lib/xamplr/gen-elements.xml