xamplr 1.9.1 → 1.9.2

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :major: 1
 :minor: 9
-:patch: 1
+:patch: 2
 :build: 

data/lib/xamplr/from-xml.rb

@@ -43,7 +43,9 @@ module Xampl
     end
 
     def FromXML.registered(name)
+      #puts "registered by ns tag: #{ @@by_ns_tag.keys.sort.inspect }"
       klass = @@by_ns_tag[name]
+      #puts "registered by tag: #{ @@by_tag.keys.sort.inspect }"
       klass = @@by_tag[name] unless klass
       klass = [] unless klass
       return klass
@@ -137,6 +139,7 @@ module Xampl
         klasses = FromXML.registered(klass_name)
         if (0 == klasses.size) then
           # The class has not been registered (either it was never generated, or it was never loaded)
+          puts "#{ __FILE__ }:#{ __LINE__ } [#{__method__}] Don't know about class name: #{ klass_name }"
 #          puts "#{ __FILE__ }:#{ __LINE__ } [#{__method__}] @@by_ns_tag: #{ @@by_ns_tag.inspect }"
 #          puts "#{ __FILE__ }:#{ __LINE__ } [#{__method__}] @@by_tag: #{ @@by_tag.inspect }"
           xml_text = XMLText.new

data/lib/xamplr/persist-to-xml.rb

@@ -5,13 +5,14 @@ module Xampl
   class PersistXML < Visitor
     attr_accessor :ns_to_prefix, :start_body, :body, :out, :mentions
 
-    def initialize(out="", mentions=nil)
+    def initialize(out="", mentions=nil, substitutions={})
       super()
 
       @out = out
       @was_attr = false
 
       @mentions = mentions
+      @pid_substitutions = substitutions
 
       @ns_to_prefix = {}
       @start_body = nil
@@ -103,11 +104,19 @@ module Xampl
 
     def attribute(xampl)
       @attr_list = []
+      pattr = xampl.indexed_by.to_s
+
       if (nil != xampl.attributes) then
         xampl.attributes.each do |attr_spec|
           prefix = (2 < attr_spec.length) ? register_ns(attr_spec[2]) : ""
-          value = xampl.instance_variable_get(attr_spec[0])
-#          @attr_list << (" " << prefix << attr_spec[1] << "='" << attr_esc(value) << "'") unless nil == value
+          value = nil
+          if pattr == attr_spec[1] then
+            value = @pid_substitutions[xampl]
+#            puts "#{ File.basename __FILE__ }:#{ __LINE__ } [#{__method__}] xampl: #{ xampl }, substitute: #{ value }" if value
+            value = xampl.instance_variable_get(attr_spec[0]) unless value
+          else
+            value = xampl.instance_variable_get(attr_spec[0])
+          end
           @attr_list << (" " << prefix << attr_spec[1] << '="' << attr_esc(value) << '"') unless nil == value
         end
       end
@@ -120,8 +129,9 @@ module Xampl
         xampl.attributes.each do |attr_spec|
           if pattr == attr_spec[1] then
             prefix = (2 < attr_spec.length) ? register_ns(attr_spec[2]) : ""
-            value = xampl.instance_variable_get(attr_spec[0])
-#            @attr_list << (" " << prefix << attr_spec[1] << "='" << attr_esc(value) << "'") unless nil == value
+            value = @pid_substitutions[xampl]
+#            puts "#{ File.basename __FILE__ }:#{ __LINE__ } [#{__method__}] xampl: #{ xampl }, substitute: #{ value }" if value
+            value = xampl.instance_variable_get(attr_spec[0]) unless value
             @attr_list << (" " << prefix << attr_spec[1] << '="' << attr_esc(value) << '"') unless nil == value
             break
           end
@@ -242,6 +252,11 @@ module Xampl
     def to_xml(out="", skip=[])
       PersistXML.new(out).start(self).done
     end
+
+    def substituting_to_xml(opts={})
+      substitutions = opts[:substitutions] || {}
+      PersistXML.new("", [], substitutions).start(self).done
+    end
   end
 
 end

data/lib/xamplr/persister.rb

@@ -1,5 +1,7 @@
 require "xamplr/persistence"
 
+require 'set'
+
 module Xampl
   class Persister
     attr_accessor :name,
@@ -10,7 +12,8 @@ module Xampl
                   :total_sync_count, :total_rollback_count,
                   :cache_hits, :total_cache_hits,
                   :last_write_count,
-                  :rolled_back
+                  :rolled_back,
+                  :expunged
     attr_reader :syncing, :format
 
     def initialize(name=nil, format=nil)
@@ -18,6 +21,7 @@ module Xampl
       @format = format
       @automatic = false
       @changed = {}
+      @expunged = Set.new
       @cache_hits = 0
       @total_cache_hits = 0
       @read_count = 0
@@ -167,6 +171,10 @@ module Xampl
       end
     end
 
+    def expunge(xampl)
+      false
+    end
+
     def lookup(klass, pid)
       #raise XamplException.new(:live_across_rollback) if @rolled_back
       #puts "#{File.basename(__FILE__)} #{__LINE__} LOOKUP:: klass: #{klass} pid: #{pid}"
@@ -264,6 +272,9 @@ module Xampl
 
         @changed = {}
 
+        puts "SOME NOT EXPUNGED: #{ @expunged.inspect }" unless 0 == @expunged.size
+        @expunged = Set.new
+
         @total_read_count = @total_read_count + @read_count
         @total_write_count = @total_write_count + @write_count
         @total_cache_hits = @total_cache_hits + @cache_hits

data/lib/xamplr/persisters/caching.rb

@@ -134,7 +134,7 @@ module Xampl
     end
 
     def read(klass, pid, target=nil)
-      #      puts "#{File.basename(__FILE__)} #{__LINE__} READ:: klass: #{klass} pid: #{pid} target: [[#{target}]], PM: #{ self }"
+#      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

data/lib/xamplr/persisters/tokyo-cabinet.rb

@@ -98,7 +98,11 @@ module Xampl
       end
 
       note_errors("TC[[#{ @filename }]]:: open [#{ @filename }] error: %s\n") do
-        @tc_db.open(@filename, TDB::OWRITER | TDB::OCREAT | TDB::OLCKNB | TDB::OTSYNC ) #TDB::OTSYNC slows it down by almost 50 times
+        if Xampl.raw_persister_options[:otsync] then
+          @tc_db.open(@filename, TDB::OWRITER | TDB::OCREAT | TDB::OLCKNB | TDB::OTSYNC ) #TDB::OTSYNC slows it down by almost 50 times
+        else
+          @tc_db.open(@filename, TDB::OWRITER | TDB::OCREAT | TDB::OLCKNB)
+        end
       end
 
       # Don't care if there are errors (in fact, if the index exists a failure is the expected thing)
@@ -109,9 +113,11 @@ module Xampl
       $numeric_indexes.each do | index_name |
         @tc_db.setindex(index_name, TDB::ITDECIMAL | TDB::ITKEEP)
       end
+
+      optimise
     end
 
-    def optimise(opts)
+    def optimise(opts={})
       return unless @tc_db
 
       if opts[:indexes_only] then
@@ -359,6 +365,9 @@ module Xampl
 
     def do_sync_write
       begin
+#@start = Time.now
+#@last = Time.now
+#puts "#{ __FILE__ }:#{ __LINE__ } [#{__method__}] time: #{ Time.now - @start }/#{ Time.now - @last }"; @last = Time.now
 #        puts "#{ __FILE__ }:#{ __LINE__ } [#{__method__}] **************************"
 #        callers = caller(0)
 #        puts "   0 #{ callers[0] }"
@@ -371,9 +380,11 @@ module Xampl
         note_errors("TC[[#{ @filename }]]:: tranbegin error: %s\n") do
           @tc_db.tranbegin
         end
+#puts "#{ __FILE__ }:#{ __LINE__ } [#{__method__}] time: #{ Time.now - @start }/#{ Time.now - @last }"; @last = Time.now
 
         @changed.each do |xampl, ignore|
           write(xampl)
+#puts "#{ __FILE__ }:#{ __LINE__ } [#{__method__}] time: #{ Time.now - @start }/#{ Time.now - @last }"; @last = Time.now
         end
       rescue => e
         msg = "no TC.abort attempted"
@@ -388,9 +399,11 @@ module Xampl
         raise RuntimeError, "TokyoCabinetPersister Error:: #{ msg }/#{ e }", e.backtrace
       else
 #        puts "#{ __FILE__ }:#{ __LINE__ } [#{__method__}] COMMIT"
+#puts "#{ __FILE__ }:#{ __LINE__ } [#{__method__}] time: #{ Time.now - @start }/#{ Time.now - @last }"; @last = Time.now
         note_errors("TC[[#{ @filename }]]:: trancommit error: %s\n") do
           @tc_db.trancommit
         end
+#puts "#{ __FILE__ }:#{ __LINE__ } [#{__method__}] time: #{ Time.now - @start }/#{ Time.now - @last }"; @last = Time.now
       ensure
 #      puts "               num records: #{ @tc_db.rnum() }"
         #      puts "#{ __FILE__ }:#{ __LINE__ } keys..."
@@ -401,6 +414,7 @@ module Xampl
         #      end
 
 #        close
+#puts "#{ __FILE__ }:#{ __LINE__ } [#{__method__}] time: #{ Time.now - @start }/#{ Time.now - @last }"; @last = Time.now
       end
     end
 
@@ -435,14 +449,42 @@ module Xampl
       results
     end
 
+    def remove_all_mention(root, xampl)
+      xampl.remove_from(root)
+      root.children.each do | child |
+        remove_all_mention(child, xampl)
+      end
+    end
+
+    def expunge(xampl)
+      #NOTE -- this *must* be in a transaction
+      #NOTE -- the expunge operation is in two steps and is completed in write
+
+      mentions = Xampl.find_mentions_of(xampl)
+      mentions.each do | has_a_xampl |
+#        xampl.remove_from(has_a_xampl)
+        remove_all_mention(has_a_xampl, xampl)
+      end
+      xampl.changed
+      self.expunged << xampl
+
+      false
+    end
+
     def write(xampl)
       raise XamplException.new(:no_index_so_no_persist) unless xampl.get_the_index
 
+      expunging = self.expunged.include?(xampl)
+      self.expunged.delete(xampl) if expunging
+#      if expunging
+#        puts "#{File.basename(__FILE__)}:#{__LINE__} [#{ __method__ }] EXPUNGING #{ xampl }/#{ expunging }"
+#      end
+
       place_dir = xampl.class.name.split("::")
       place = File.join( place_dir, xampl.get_the_index)
       place_dir = File.join( @files_dir, place_dir )
       mentions = Set.new
-      data = represent(xampl, mentions)
+      xampl_in_xml = represent(xampl, mentions)
 
       #get rid of any supplimentary indexes associated with this xampl object
       # TODO -- This can be slow
@@ -458,83 +500,95 @@ module Xampl
         query.searchout
       end
 
-      # TODO -- This can be slow
-      mentions.each do | mention |
-        mention_place = File.join(mention.class.name.split("::"), mention.get_the_index)
-        #TODO -- will repeadedly changing a persisted xampl object fragment the TC db?
-
-        pk = @tc_db.genuid
-        mention_hash = {
-                'xampl-from' => place,
-                'mentioned_class' => xampl.class.name,
+      if expunging then
+        file_place = "#{ @files_dir }/#{ place }"
+        File.delete(file_place) if File.exists?(file_place)
+        note_errors("TC[[#{ place }]]:: write error: %s\n") do
+          @tc_db.out(place)
+        end
+
+        uncache(xampl)
+      else
+        if Xampl.raw_persister_options[:mentions] then
+          # TODO -- This can be slow
+          mentions.each do | mention |
+            mention_place = File.join(mention.class.name.split("::"), mention.get_the_index)
+            #TODO -- will repeadedly changing a persisted xampl object fragment the TC db?
+
+            pk = @tc_db.genuid
+            mention_hash = {
+                    'xampl-from' => place,
+                    'mentioned_class' => xampl.class.name,
+                    'pid' => xampl.get_the_index,
+                    'xampl-to' => mention_place
+            }
+
+            note_errors("TC[[#{ @filename }]]:: write error: %s\n") do
+              @tc_db.put(pk, mention_hash)
+            end
+          end
+        end
+
+        xampl_hash = {
+                'class' => xampl.class.name,
                 'pid' => xampl.get_the_index,
-                'xampl-to' => mention_place
+                'time-stamp' => @time_stamp,
+                'xampl' => xampl_in_xml
         }
 
-        note_errors("TC[[#{ @filename }]]:: write error: %s\n") do
-          @tc_db.put(pk, mention_hash)
+        primary_description, secondary_descriptions = xampl.describe_yourself
+        if primary_description then
+          xampl_hash = primary_description.merge(xampl_hash)
         end
-      end
 
-      xampl_hash = {
-              'class' => xampl.class.name,
-              'pid' => xampl.get_the_index,
-              'time-stamp' => @time_stamp,
-              'xampl' => data
-      }
-
-#      puts "#{ __FILE__ }:#{ __LINE__ } [#{__method__}] #{ xampl.class.name } ... describe"
-      primary_description, secondary_descriptions = xampl.describe_yourself
-      if primary_description then
-        xampl_hash = primary_description.merge(xampl_hash)
-      end
-
-      note_errors("TC[[#{ @filename }]]:: write error: %s\n") do
-        if Xampl.raw_persister_options[:write_through] then
-          FileUtils.mkdir_p(place_dir) unless File.exist?(place_dir)
-          file_place = "#{ @files_dir }/#{ place }"
-          File.open(file_place, "w")do |out|
-            out.write xampl_hash['xampl']
-            if :sync == Xampl.raw_persister_options[:write_through] then
-              out.fsync
-              if $is_darwin then
-                out.fcntl(51, 0) # Attempt an F_FULLFSYNC fcntl to commit data to disk (darwin *ONLY*)
+        note_errors("TC[[#{ @filename }]]:: write error: %s\n") do
+          if Xampl.raw_persister_options[:write_through] then
+            FileUtils.mkdir_p(place_dir) unless File.exist?(place_dir)
+            file_place = "#{ @files_dir }/#{ place }"
+            File.open(file_place, "w") do |out|
+              out.write xampl_hash['xampl']
+              if :sync == Xampl.raw_persister_options[:write_through] then
+                out.fsync
+                if $is_darwin then
+                  out.fcntl(51, 0) # Attempt an F_FULLFSYNC fcntl to commit data to disk (darwin *ONLY*)
+                end
               end
             end
-          end
 
+          end
+          @tc_db.put(place, xampl_hash)
         end
-        @tc_db.put(place, xampl_hash)
-      end
 
-      #TODO -- smarter regarding when to delete (e.g. mentions)
-      if xampl.should_schedule_delete? and xampl.scheduled_for_deletion_at then
-        secondary_descriptions = [] unless secondary_descriptions
-        secondary_descriptions << { 'scheduled-delete-at' => xampl.scheduled_for_deletion_at }
-      elsif xampl.scheduled_for_deletion_at then
-        #TODO -- puts "#{ __FILE__ }:#{ __LINE__ } HOW TO DO THIS without violating xampl's change rules????? "
-        #xampl.scheduled_for_deletion_at = nil
-      end
+        #TODO -- smarter regarding when to delete (e.g. mentions)
+        if xampl.should_schedule_delete? and xampl.scheduled_for_deletion_at then
+          secondary_descriptions = [] unless secondary_descriptions
+          secondary_descriptions << { 'scheduled-delete-at' => xampl.scheduled_for_deletion_at }
+        elsif xampl.scheduled_for_deletion_at then
+          #TODO -- puts "#{ __FILE__ }:#{ __LINE__ } HOW TO DO THIS without violating xampl's change rules????? "
+          #xampl.scheduled_for_deletion_at = nil
+        end
 
-      if secondary_descriptions then
-        xampl_hash = {
-                'class' => xampl.class.name,
-                'pid' => xampl.get_the_index,
-                'xampl-place' => place
-        }
+        if secondary_descriptions then
+          xampl_hash = {
+                  'class' => xampl.class.name,
+                  'pid' => xampl.get_the_index,
+                  'xampl-place' => place
+          }
 
-        secondary_descriptions.each do | secondary_description |
-          description = secondary_description.merge(xampl_hash)
+          secondary_descriptions.each do | secondary_description |
+            description = secondary_description.merge(xampl_hash)
 
-          note_errors("TC[[#{ @filename }]]:: write error: %s\n") do
-            pk = @tc_db.genuid
-            @tc_db.put(pk, description)
+            note_errors("TC[[#{ @filename }]]:: write error: %s\n") do
+              pk = @tc_db.genuid
+              @tc_db.put(pk, description)
+            end
           end
         end
+
+        @write_count = @write_count + 1
+        xampl.changes_accepted
       end
 
-      @write_count = @write_count + 1
-      xampl.changes_accepted
       return true
     end
 

data/lib/xamplr/visitors.rb

@@ -1,4 +1,4 @@
-
+#encoding: utf-8
 module Xampl
 
   class CountingVisitor < Visitor

data/lib/xamplr/xampl-object.rb

@@ -188,7 +188,12 @@ module Xampl
 
     def persist(out="", mentions=nil, rules=nil)
       persist_xml_new = PersistXML.new(out, mentions)
-      return persist_xml_new.start(self).done
+
+#      start = Time.now
+      r = persist_xml_new.start(self).done
+#      done = Time.now
+#      puts "#{ File.basename __FILE__ }:#{ __LINE__ } [#{__method__}] SIZE: #{ r.size }, Time: #{ done - start } #{ self }"
+      return r
     end
 
     ################################################################################################

data/lib/xamplr/xampl-persisted-object.rb

@@ -5,6 +5,7 @@ module Xampl
 
     attr_reader :persister
     attr_accessor :load_needed
+    attr_accessor :must_be_mentioned
 
     def persist_required
       return true

data/xamplr.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{xamplr}
-  s.version = "1.9.1"
+  s.version = "1.9.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bob Hutchison"]
-  s.date = %q{2010-01-12}
+  s.date = %q{2010-01-20}
   s.description = %q{xamplr is the ruby version of xampl.}
   s.email = %q{hutch@recursive.ca}
   s.extra_rdoc_files = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: xamplr
 version: !ruby/object:Gem::Version 
-  version: 1.9.1
+  version: 1.9.2
 platform: ruby
 authors: 
 - Bob Hutchison
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-12 00:00:00 -05:00
+date: 2010-01-20 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency