rhubarb 0.2.2 → 0.2.3

data/CHANGES

@@ -1,4 +1,13 @@
-version 0.2.2
+version 0.2.3
+
+*  Rhubarb now uses prepared statements almost exclusively.  This
+   should result in an appreciable speedup (I observed around 10% on
+   the test suite; a large rhubarb-based application I have previously
+   spent over 12% of runtime preparing one-off statemtents).
+
+*  Fixed a crashing bug introduced in 0.2.2.
+
+version 0.2.2 (8859efbbbca5e80d64e3bd8e6e5ba2ffd8a3e83d)
 
 *  explicit support for :blob-typed columns (blob values will be
    appropriately stored in create statements and attribute assignments).

data/TODO

@@ -4,7 +4,6 @@
 * Bring code coverage up to 100%
 * Documentation
 * Standalone examples (i.e. not just "please see the test suite")
-* Resolve issues related to using prepared statements
 * Find rows by value of blob-valued field
 * Automatic zlib compression of blobs (:zblob type)
 * Automatic yaml serialization of arbitrary Ruby objects (:rubyobj type)

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.3

data/lib/rhubarb/classmixins.rb

@@ -53,13 +53,18 @@ module Rhubarb
       valid_cols = self.colnames.intersection arg_hash.keys
       select_criteria = valid_cols.map {|col| "#{col.to_s} = #{col.inspect}"}.join(" AND ")
       arg_hash.each {|k,v| arg_hash[k] = v.row_id if v.respond_to? :row_id}
-
-      self.db.execute("select * from #{table_name} where #{select_criteria} order by row_id", arg_hash).map {|tup| self.new(tup) }
+      find_by_text = "select * from #{table_name} where #{select_criteria} order by row_id"
+      find_by_stmt = (db.stmts[find_by_text] ||= db.prepare(find_by_text))
+      find_by_stmt.execute!(arg_hash).map {|tup| self.new(tup) }
     end
 
     # Does what it says on the tin.  Since this will allocate an object for each row, it isn't recomended for huge tables.
     def find_all
-      self.db.execute("SELECT * from #{table_name}").map {|tup| self.new(tup)}
+      results = []
+      find_all_text = "SELECT * from #{table_name}"
+      find_all_stmt = (db.stmts[find_all_text] ||= db.prepare(find_all_text))
+      find_all_stmt.execute! {|tup| results << self.new(tup)}
+      results
     end
 
     def delete_all
@@ -78,8 +83,10 @@ module Rhubarb
         define_method name.to_s do |*args|
           # handle reference parameters
           args = args.map {|arg| Util::rhubarb_fk_identity(arg)}
-
-          res = self.db.execute(query.gsub("__TABLE__", "#{self.table_name}"), args)
+          cq_text = query.gsub("__TABLE__", "#{self.table_name}")
+          cq_stmt = (db.stmts[cq_text] ||= db.prepare(cq_text))
+          
+          res = cq_stmt.execute!(args)
           res.map {|row| self.new(row) }        
         end
       end
@@ -212,8 +219,9 @@ module Rhubarb
         new_row[column] = colkinds[column] == :blob ? Util::blobify(value) : Util::rhubarb_fk_identity(value)
       end
 
-      stmt = "insert into #{table_name} (#{colspec}) values (#{valspec})"
-      db.execute(stmt, new_row)
+      create_text = "insert into #{table_name} (#{colspec}) values (#{valspec})"
+      create_stmt = (self.db.stmts[create_text] ||= db.prepare(create_text))
+      create_stmt.execute!(new_row)
       res = find(db.last_insert_row_id)
       
       res
@@ -272,11 +280,11 @@ module Rhubarb
       self.db.get_first_value("select count(row_id) from #{table_name}").to_i
     end
 
-    def find_tuple(id)
-      self.db.get_first_row("select * from #{table_name} where row_id = ?", id)
+    def find_tuple(tid)
+      self.db.get_first_row("select * from #{table_name} where row_id = ?", tid)
     end
     
     include FindFreshest
     
   end
-end
+end

data/lib/rhubarb/persistence.rb

@@ -24,6 +24,13 @@ module Rhubarb
       def setup_db(db)
         db.results_as_hash = true
         db.type_translation = true
+        db.busy_timeout(150)
+        class << db
+          def stmts
+            @rhubarb_stmts ||= {}
+            @rhubarb_stmts
+          end
+        end
       end
     end
     
@@ -34,9 +41,11 @@ module Rhubarb
     end
   
     def self.close(which=:default)
-      if dbs[which]
-        dbs[which].close
+      current_db = dbs[which]
+      if current_db
         dbs.delete(which)
+        current_db.stmts.values.each {|pstmt| pstmt.close }
+        current_db.close
       end
     end
   

data/lib/rhubarb/persisting.rb

@@ -37,7 +37,7 @@ module Rhubarb
     
     def hash
       freshen
-      @row_id ^ self.table_name.hash
+      @row_id ^ self.class.table_name.hash
     end
     
     def ==(other)
@@ -62,7 +62,9 @@ module Rhubarb
     # Deletes the row corresponding to this object from the database; 
     # invalidates =self= and any other objects backed by this row
     def delete
-      self.db.execute("delete from #{self.class.table_name} where row_id = ?", @row_id)
+      delete_text = "delete from #{self.class.table_name} where row_id = ?"
+      delete_stmt = (self.db.stmts[delete_text] ||= self.db.prepare(delete_text))
+      delete_stmt.execute!(@row_id)
       mark_dirty
       @tuple = nil
       @row_id = nil
@@ -110,7 +112,10 @@ module Rhubarb
     # Helper method to update the row in the database when one of our fields changes
     def update(attr_name, value)
       mark_dirty
-      self.db.execute("update #{self.class.table_name} set #{attr_name} = ?, updated = ? where row_id = ?", value, Util::timestamp, @row_id)
+
+      update_text = "update #{self.class.table_name} set #{attr_name} = ?, updated = ? where row_id = ?"
+      update_stmt = (self.db.stmts[update_text] ||= self.db.prepare(update_text))
+      update_stmt.execute!(value, Util::timestamp, @row_id)
     end
 
     # Resolve any fields that reference other tables, replacing row ids with referred objects
@@ -129,4 +134,4 @@ module Rhubarb
     end
 
   end
-end
+end

data/lib/rhubarb/rhubarb.rb

@@ -11,7 +11,6 @@
 # 
 #     http://www.apache.org/licenses/LICENSE-2.0
 
-require 'rubygems'
 require 'set'
 require 'sqlite3'
 require 'rhubarb/util'

data/ruby-rhubarb.spec.in

@@ -1,5 +1,5 @@
 %{!?ruby_sitelib: %global ruby_sitelib %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"] ')}
-%define rel 0.1
+%define rel 1.0
 
 Summary: Simple versioned object-graph persistence layer
 Name: ruby-rhubarb
@@ -48,6 +48,12 @@ rm -rf %{buildroot}
 %{ruby_sitelib}/rhubarb/persistence.rb
 
 %changelog
+* Thu Feb 25 2010 willb <willb@redhat> - 0.2.3-1.0
+* updated to version 0.2.3 from source
+
+* Thu Feb 25 2010 willb <willb@redhat> - 0.2.2-2.0
+* removed rubygems include 
+
 * Fri Feb  5 2010  <rrat@redhat> - 0.2.0-0.3
 - Explicitly list files
 - Added ruby(abi) and dependency

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rhubarb
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors: 
 - William Benton
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-22 00:00:00 -06:00
+date: 2010-02-26 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency