upsert 2.0.4 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e403ffd510814ad862057a3059f8ce8e65d974d4
-  data.tar.gz: 142ba5495b4d63641f23b1e54ab2c855a9f858d9
+  metadata.gz: 8a8d49c15022e8faa065c2f060349210b28998b9
+  data.tar.gz: 3814d296ef548257347af887ca39a04b801ceb91
 SHA512:
-  metadata.gz: d4ad43d341e5fefbecac30c296f4dc6956e4e513a68e1aca95ea0026017ce882849b59144282cc9ac82f7eabea5bfc9297a134b7f3b6320b9ad717be180d977d
-  data.tar.gz: 3bec3b12605a00058fb654d718baa5cc6adef91ea8e1b6931e22248a3f45f1a3652db43183923346516675edf4ff0269d3a0122199ac941784851c996d6f0583
+  metadata.gz: e3a2553e8a0d143bb90592d1dc7f5a4ccd9224386fdce394dceef2ad2f46e186a853e61560ef1d6ea93f52b5bb7e948659c62398c60cc6c5d8c5887bdd9c6d0f
+  data.tar.gz: 864fcc5434d104ae1c4d5e8d68a8e8546217612be2d710b01a8ecfbd5e25435f2181a8c59afd7f6224b388762276f93256be6c7cec4ea5e18e994129ba1b396d

data/.travis.yml

@@ -3,9 +3,13 @@ global:
   - USERNAME=travis
     PASSWORD=
 rvm:
+  - 2.2.0
+  - 2.1.0
+  - 2.0.0
   - 1.9.3
   - 1.9.2
   - 1.8.7
+  - rbx-2
 env:
   - DB=postgresql
   - DB=mysql

data/CHANGELOG

@@ -1,3 +1,13 @@
+2.1.0 / 2015-03-13
+
+* Bug fixes
+
+  * Thread safety with Sidekiq! thanks @evadne and @thbar ! https://github.com/seamusabshere/upsert/pull/47
+
+* Known issues
+
+  * speed_spec fails against activerecord-import on mysql... need some advice on properly testing it
+
 2.0.4 / 2015-01-27
 
 * Bug fixes

data/README.md

@@ -1,7 +1,5 @@
 # Upsert
 
-**note** There is a known problem with mysql2 and sidekiq - we're working on it in https://github.com/seamusabshere/upsert/tree/real_thread_safe and various issues
-
 [![Build Status](https://travis-ci.org/seamusabshere/upsert.svg?branch=master)](https://travis-ci.org/seamusabshere/upsert)
 
 Make it easy to upsert on traditional RDBMS like MySQL, PostgreSQL, and SQLite3—hey look NoSQL!. Transparently creates (and re-uses) stored procedures/functions when necessary.
@@ -157,7 +155,7 @@ From the tests (updated 11/7/12):
     Upsert was 82% faster than find + new/set/save
     Upsert was 85% faster than find_or_create + update_attributes
     Upsert was 90% faster than create + rescue/find/update
-    Upsert was 46% faster than faking upserts with activerecord-import
+    Upsert was 46% faster than faking upserts with activerecord-import (note: in question as of 3/13/15, need some expert advice)
 
 #### SQL MERGE trick
 

data/lib/upsert.rb

@@ -194,6 +194,7 @@ class Upsert
     end
     @connection = Connection.const_get(adapter).new self, metal
     @merge_function_class = MergeFunction.const_get adapter
+    @merge_function_cache = {}
     @assume_function_exists = options.fetch :assume_function_exists, false
   end
 
@@ -213,7 +214,8 @@ class Upsert
   #   upsert.row({:name => 'Jerry'}, :breed => 'beagle')
   #   upsert.row({:name => 'Pierre'}, :breed => 'tabby')
   def row(selector, setter = {}, options = nil)
-    merge_function_class.execute self, Row.new(selector, setter, options)
+    row_object = Row.new(selector, setter, options)
+    merge_function(row_object).execute(row_object)
     nil
   end
 
@@ -221,6 +223,11 @@ class Upsert
   def clear_database_functions
     merge_function_class.clear connection
   end
+  
+  def merge_function(row)
+    cache_key = [row.selector.keys, row.setter.keys]
+    @merge_function_cache[cache_key] ||= merge_function_class.new(self, row.selector.keys, row.setter.keys, assume_function_exists?)
+  end
 
   # @private
   def quoted_table_name

data/lib/upsert/merge_function.rb

@@ -8,11 +8,6 @@ class Upsert
     NAME_PREFIX = "upsert#{Upsert::VERSION.gsub('.', '_')}"
 
     class << self
-      def execute(controller, row)
-        merge_function = lookup controller, row
-        merge_function.execute row
-      end
-
       def unique_name(table_name, selector_keys, setter_keys)
         parts = [
           NAME_PREFIX,
@@ -30,14 +25,6 @@ class Upsert
           parts
         end
       end
-
-      def lookup(controller, row)
-        @lookup ||= {}
-        selector_keys = row.selector.keys
-        setter_keys = row.setter.keys
-        key = [controller.table_name, selector_keys, setter_keys]
-        @lookup[key] ||= new(controller, selector_keys, setter_keys, controller.assume_function_exists?)
-      end
     end
 
     attr_reader :controller
@@ -53,7 +40,7 @@ class Upsert
     end
 
     def name
-      @name ||= MergeFunction.unique_name table_name, selector_keys, setter_keys
+      @name ||= self.class.unique_name table_name, selector_keys, setter_keys
     end
 
     def connection

data/lib/upsert/version.rb

@@ -1,3 +1,3 @@
 class Upsert
-  VERSION = '2.0.4'
+  VERSION = '2.1.0'
 end

data/spec/database_functions_spec.rb

@@ -2,27 +2,43 @@ require 'spec_helper'
 require 'stringio'
 describe Upsert do
   describe 'database functions' do
-
-    it "re-uses merge functions across connections" do
+    it "does not re-use merge functions across connections" do
       begin
         io = StringIO.new
         old_logger = Upsert.logger
         Upsert.logger = Logger.new io, Logger::INFO
 
-        # clear
+        # clear, create (#1)
         Upsert.clear_database_functions($conn_factory.new_connection)
-        
-        # create
         Upsert.new($conn_factory.new_connection, :pets).row :name => 'hello'
 
-        # clear
+        # clear, create (#2)
         Upsert.clear_database_functions($conn_factory.new_connection)
-
-        # create (#2)
         Upsert.new($conn_factory.new_connection, :pets).row :name => 'hello'
+        
+        io.rewind
+        hits = io.read.split("\n").grep(/Creating or replacing/)
+        hits.length.should == 2
+      ensure
+        Upsert.logger = old_logger
+      end
+    end
+    
+    it "does not re-use merge functions even when on the same connection" do
+      begin
+        io = StringIO.new
+        old_logger = Upsert.logger
+        Upsert.logger = Logger.new io, Logger::INFO
+        
+        connection = $conn_factory.new_connection
 
-        # no create!
-        Upsert.new($conn_factory.new_connection, :pets).row :name => 'hello'
+        # clear, create (#1)
+        Upsert.clear_database_functions(connection)
+        Upsert.new(connection, :pets).row :name => 'hello'
+
+        # clear, create (#2)
+        Upsert.clear_database_functions(connection)
+        Upsert.new(connection, :pets).row :name => 'hello'
         
         io.rewind
         hits = io.read.split("\n").grep(/Creating or replacing/)
@@ -31,6 +47,29 @@ describe Upsert do
         Upsert.logger = old_logger
       end
     end
+    
+    it "re-uses merge functions within batch" do
+      begin
+        io = StringIO.new
+        old_logger = Upsert.logger
+        Upsert.logger = Logger.new io, Logger::INFO
+
+        # clear
+        Upsert.clear_database_functions($conn_factory.new_connection)
+        
+        # create
+        Upsert.batch($conn_factory.new_connection, :pets) do |upsert|
+          upsert.row :name => 'hello'
+          upsert.row :name => 'world'
+        end
+        
+        io.rewind
+        hits = io.read.split("\n").grep(/Creating or replacing/)
+        hits.length.should == 1
+      ensure
+        Upsert.logger = old_logger
+      end
+    end
 
     it "assumes function exists if told to" do
       begin

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: upsert
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.1.0
 platform: ruby
 authors:
 - Seamus Abshere
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-27 00:00:00.000000000 Z
+date: 2015-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-core