occams-record 1.0.0.rc4 → 1.0.0.rc5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c40b0d44fb2db1881bda281bc83b8bf475c0fea2ea6fd86ea90258d865bfffa
-  data.tar.gz: 793a87b8f7d859cd42a4e629616e59487aeed0ff3c63dcc89910ad6ab6766ccc
+  metadata.gz: a370b14fabfecd12e219d2bdf5c0719e95c71518e283a5aa5601e9de69c5b3d4
+  data.tar.gz: dbfab334da683c11342efeece655780c59272f2ac51c1ddf6c5382fea926571a
 SHA512:
-  metadata.gz: 42fe66a1f8dcea058db1f694dcf201292068f18623625d7aa289f162887b16653a9811a7c27d784e3ca9f7e128fc4ea16727d928acf7aa14ce5122881c742f65
-  data.tar.gz: ff4f8ed12de31bb6762c70ba12264781c7d51341f1a20480affd121494f3c75da9f0aae683e587540e2d69ec452ea97cd29f6d71ddbb8e9cbdb0748842dc262e
+  metadata.gz: 35e38ad43a0cbe41adfcbffa72badd4cf3b6f1f716a74fe1e752e419fb4697903156445360f5b159d951983faa716c71ad157edce704dbfa7155f8d51921b44d
+  data.tar.gz: bf2e41947e4366243b3a45ce9a4f4a8bf3fd2dea1f7314f85a61cc3268be3c514fb08e6a5a6fcf6c0a83de35e7a0905ffea3d2d9f64c4511433ec56fc3088174

data/README.md

@@ -2,7 +2,7 @@
 
 > Do not multiply entities beyond necessity. -- Occam's Razor
 
-**Breaking change in 1.0.0 RC1** See HISTORY.md.
+**Breaking change in 1.0.0 RC1** See [HISTORY.md](https://github.com/jhollinger/occams-record/blob/master/HISTORY.md#100rc1-2018-12-01).
 
 Occam's Record is a high-efficiency, advanced query library for ActiveRecord apps. It is **not** an ORM or an ActiveRecord replacement. Use it to solve pain points in your existing ActiveRecord app. Occams Record gives you two things:
 
@@ -228,6 +228,14 @@ The following ActiveRecord features are not supported, and likely never will be.
 
 ---
 
+# Benchmarking
+
+`bundle exec rake bench` will run a suite of performance benchmarks comparing Occams Record with Active Record. These are primarily used during development to prevent performance regressions. An in-memory Sqlite database is used.
+
+If you run your own benchmarks, keep in mind exactly what you're measuring. For example if you're benchmarking a report written in AR vs OR, there are many constants in that measurement: the time spent in the database, the time spent transfering the database results back to your Ruby process, any calculations you're doing on your results, and the time spent building your html/json/csv/etc. So if OR is 3x fastr than AR, the total runtime of said report *won't* improve by 3x.
+
+On the other hand, Active Record makes it *very* easy to forget to eager load associations (the N+1 query problem). Occams Record fixes that. So if your report was missing some associations you could see easily see performance improvements well over 3x.
+
 # Testing
 
 To run the tests, simply run:

data/lib/occams-record/eager_loaders/belongs_to.rb

@@ -11,6 +11,8 @@ module OccamsRecord
       # @yield
       #
       def query(rows)
+        return if rows.empty?
+
         ids = rows.map { |row|
           begin
             row.send @ref.foreign_key
@@ -18,7 +20,9 @@ module OccamsRecord
             raise MissingColumnError.new(row, e.name)
           end
         }.compact.uniq
-        yield base_scope.where(@ref.association_primary_key => ids) if ids.any?
+
+        q = base_scope.where(@ref.association_primary_key => ids)
+        yield q if ids.any?
       end
 
       #

data/lib/occams-record/eager_loaders/has_one.rb

@@ -12,6 +12,7 @@ module OccamsRecord
       #
       def query(rows)
         return if rows.empty?
+
         ids = rows.map { |row|
           begin
             row.send @ref.active_record_primary_key
@@ -19,9 +20,10 @@ module OccamsRecord
             raise MissingColumnError.new(row, e.name)
           end
         }.compact.uniq
+
         q = base_scope.where(@ref.foreign_key => ids)
         q.where!(@ref.type => rows[0].class&.model_name) if @ref.options[:as]
-        yield ids.any? ? q : nil
+        yield q if ids.any?
       end
 
       #

data/lib/occams-record/merge.rb

@@ -29,27 +29,53 @@ module OccamsRecord
     # for the associated rows.
     #
     def single!(assoc_rows, mapping)
-      target_attrs = mapping.keys.map
+      target_attrs = mapping.keys
       assoc_attrs = mapping.values
 
-      assoc_rows_by_ids = assoc_rows.reduce({}) { |a, assoc_row|
-        begin
-          ids = assoc_attrs.map { |attr| assoc_row.send attr }
-        rescue NoMethodError => e
-          raise MissingColumnError.new(assoc_row, e.name)
+      # Optimized for merges where there's a single mapping key pair (which is the vast majority)
+      if mapping.size == 1
+        target_attr, assoc_attr = target_attrs[0], assoc_attrs[0]
+        assoc_rows_by_ids = assoc_rows.reduce({}) { |a, assoc_row|
+          #begin
+            id = assoc_row.send assoc_attr
+          #rescue NoMethodError => e
+          #  raise MissingColumnError.new(assoc_row, e.name)
+          #end
+          a[id] ||= assoc_row
+          a
+        }
+
+        target_rows.each do |row|
+          begin
+            attr = row.send target_attr
+          rescue NoMethodError => e
+            raise MissingColumnError.new(row, e.name)
+          end
+          row.send @assign, attr ? assoc_rows_by_ids[attr] : nil
         end
-        a[ids] ||= assoc_row
-        a
-      }
 
-      target_rows.each do |row|
-        begin
-          attrs = target_attrs.map { |attr| row.send attr }
-        rescue NoMethodError => e
-          raise MissingColumnError.new(row, e.name)
+      # Slower but works with any number of mapping key pairs
+      else
+        assoc_rows_by_ids = assoc_rows.reduce({}) { |a, assoc_row|
+          begin
+            ids = assoc_attrs.map { |attr| assoc_row.send attr }
+          rescue NoMethodError => e
+            raise MissingColumnError.new(assoc_row, e.name)
+          end
+          a[ids] ||= assoc_row
+          a
+        }
+
+        target_rows.each do |row|
+          begin
+            attrs = target_attrs.map { |attr| row.send attr }
+          rescue NoMethodError => e
+            raise MissingColumnError.new(row, e.name)
+          end
+          row.send @assign, attrs.any? ? assoc_rows_by_ids[attrs] : nil
         end
-        row.send @assign, attrs.any? ? assoc_rows_by_ids[attrs] : nil
       end
+
       nil
     end
 
@@ -65,22 +91,46 @@ module OccamsRecord
       target_attrs = mapping.keys
       assoc_attrs = mapping.values
 
-      begin
-        assoc_rows_by_attrs = assoc_rows.group_by { |r|
-          assoc_attrs.map { |attr| r.send attr }
-        }
-      rescue NoMethodError => e
-        raise MissingColumnError.new(assoc_rows[0], e.name)
-      end
+      # Optimized for merges where there's a single mapping key pair (which is the vast majority)
+      if mapping.size == 1
+        target_attr, assoc_attr = target_attrs[0], assoc_attrs[0]
+        begin
+          assoc_rows_by_attr = assoc_rows.group_by { |r|
+            r.send assoc_attr
+          }
+        rescue NoMethodError => e
+          raise MissingColumnError.new(assoc_rows[0], e.name)
+        end
 
-      target_rows.each do |row|
+        target_rows.each do |row|
+          begin
+            pkey = row.send target_attr
+          rescue NoMethodError => e
+            raise MissingColumnError.new(row, e.name)
+          end
+          row.send @assign, assoc_rows_by_attr[pkey] || []
+        end
+
+      # Slower but works with any number of mapping key pairs
+      else
         begin
-          pkeys = target_attrs.map { |attr| row.send attr }
+          assoc_rows_by_attrs = assoc_rows.group_by { |r|
+            assoc_attrs.map { |attr| r.send attr }
+          }
         rescue NoMethodError => e
-          raise MissingColumnError.new(row, e.name)
+          raise MissingColumnError.new(assoc_rows[0], e.name)
+        end
+
+        target_rows.each do |row|
+          begin
+            pkeys = target_attrs.map { |attr| row.send attr }
+          rescue NoMethodError => e
+            raise MissingColumnError.new(row, e.name)
+          end
+          row.send @assign, assoc_rows_by_attrs[pkeys] || []
         end
-        row.send @assign, assoc_rows_by_attrs[pkeys] || []
       end
+
       nil
     end
   end

data/lib/occams-record/version.rb

@@ -3,5 +3,5 @@
 #
 module OccamsRecord
   # Library version
-  VERSION = '1.0.0.rc4'.freeze
+  VERSION = '1.0.0.rc5'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: occams-record
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc4
+  version: 1.0.0.rc5
 platform: ruby
 authors:
 - Jordan Hollinger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-07 00:00:00.000000000 Z
+date: 2018-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord