flipper-active_record 0.26.1 → 0.26.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5244fa15983cbfcba71bcf8d555d71d3e9142314d035dc7dad084ea413d0abfd
-  data.tar.gz: 810a08e5c66d66765f8a09e5b4554804792200b0fa8084fd38bb12a2db44cb08
+  metadata.gz: f2bf01c33aad4266b0237775c779d6b3b19d01d43adff566c82c1ddb26fb76f5
+  data.tar.gz: 34ba1e6bded36a3352031c82b9f32d34abbb5f8781eb28b15f7aa450cbd02cbd
 SHA512:
-  metadata.gz: 20d45ea8dc75cbab5be320ea9ca22487f7a15483088c2370d48bb0e1b01e1fbf6cb657f9cd3f17ffd02c4fbeef1e20a80d3f328eb5a29d03961ddbfc87bd1439
-  data.tar.gz: 5d3871e886483ee2c9cefa90ef1fb918b4fd795c46121251b62c4c7543868578ba519f6f9547a58a749c87f4840e09496ef9c403f1765b91851be8bfd44c5d6b
+  metadata.gz: 303520e21a9e3f71284d72bb817032df8849b5bee213e4a42924ab5e90af1f38e82734830fba40d11c0b6e91962b134838e80d181f4c7482f306f64651222bf6
+  data.tar.gz: f9b371acc123a5a7cc8e901d40db474a83f706d886496512b9f24c298d0a8e621c2e394b3b38f8bddc5b92966d7ab594f38c1b83912026eac967133dccd1eb2d

data/benchmark/active_record_adapter_ips.rb

@@ -0,0 +1,15 @@
+require 'bundler/setup'
+require_relative './active_record_setup'
+require 'flipper'
+require 'flipper/adapters/active_record'
+require 'benchmark/ips'
+
+flipper = Flipper.new(Flipper::Adapters::ActiveRecord.new)
+
+2000.times do |i|
+  flipper.enable_actor :foo, Flipper::Actor.new("User;#{i}")
+end
+
+Benchmark.ips do |x|
+  x.report("get_all") { flipper.preload_all }
+end

data/benchmark/active_record_ips.rb

@@ -0,0 +1,17 @@
+require 'bundler/setup'
+require_relative './active_record_setup'
+require 'flipper'
+require 'flipper/adapters/active_record'
+require 'benchmark/ips'
+
+flipper = Flipper.new(Flipper::Adapters::ActiveRecord.new)
+
+2000.times do |i|
+  flipper.enable_actor :foo, Flipper::Actor.new("User;#{i}")
+end
+
+Benchmark.ips do |x|
+  x.report("all") { Flipper::Adapters::ActiveRecord::Gate.where(feature_key: "foo".freeze).load }
+  x.report("pluck") { Flipper::Adapters::ActiveRecord::Gate.where(feature_key: "foo".freeze).pluck(:key, :value) }
+  x.compare!
+end

data/benchmark/active_record_setup.rb

@@ -0,0 +1,31 @@
+require 'bundler/setup'
+require 'active_record'
+
+ActiveRecord::Base.establish_connection({
+  adapter: 'sqlite3',
+  database: ':memory:',
+})
+
+ActiveRecord::Base.connection.execute <<-SQL
+  CREATE TABLE flipper_features (
+    id integer PRIMARY KEY,
+    key text NOT NULL UNIQUE,
+    created_at datetime NOT NULL,
+    updated_at datetime NOT NULL
+  )
+SQL
+
+ActiveRecord::Base.connection.execute <<-SQL
+  CREATE TABLE flipper_gates (
+    id integer PRIMARY KEY,
+    feature_key text NOT NULL,
+    key text NOT NULL,
+    value text DEFAULT NULL,
+    created_at datetime NOT NULL,
+    updated_at datetime NOT NULL
+  )
+SQL
+
+ActiveRecord::Base.connection.execute <<-SQL
+  CREATE UNIQUE INDEX index_gates_on_keys_and_value on flipper_gates (feature_key, key, value)
+SQL

data/lib/flipper/adapters/active_record.rb

@@ -95,17 +95,22 @@ module Flipper
       #
       # Returns a Hash of Flipper::Gate#key => value.
       def get(feature)
-        db_gates = with_connection(@gate_class) { @gate_class.where(feature_key: feature.key) }
-        result_for_feature(feature, db_gates)
+        gates = with_connection(@gate_class) { @gate_class.where(feature_key: feature.key).pluck(:key, :value) }
+        result_for_gates(feature, gates)
       end
 
       def get_multi(features)
         with_connection(@gate_class) do
-          db_gates = @gate_class.where(feature_key: features.map(&:key))
-          grouped_db_gates = db_gates.group_by(&:feature_key)
+          gates = @gate_class.where(feature_key: features.map(&:key)).pluck(:feature_key, :key, :value)
+          grouped_gates = gates.inject({}) do |hash, (feature_key, key, value)|
+            hash[feature_key] ||= []
+            hash[feature_key] << [key, value]
+            hash
+          end
+
           result = {}
           features.each do |feature|
-            result[feature.key] = result_for_feature(feature, grouped_db_gates[feature.key])
+            result[feature.key] = result_for_gates(feature, grouped_gates[feature.key])
           end
           result
         end
@@ -113,18 +118,26 @@ module Flipper
 
       def get_all
         with_connection(@feature_class) do
+          # query the gates from the db in a single query
           features = ::Arel::Table.new(@feature_class.table_name.to_sym)
           gates = ::Arel::Table.new(@gate_class.table_name.to_sym)
-          rows_query = features.join(gates, Arel::Nodes::OuterJoin)
+          rows_query = features.join(gates, ::Arel::Nodes::OuterJoin)
             .on(features[:key].eq(gates[:feature_key]))
             .project(features[:key].as('feature_key'), gates[:key], gates[:value])
-          rows = @feature_class.connection.select_all rows_query
-          db_gates = rows.map { |row| @gate_class.new(row) }
-          grouped_db_gates = db_gates.group_by(&:feature_key)
+          gates = @feature_class.connection.select_rows(rows_query)
+
+          # group the gates by feature key
+          grouped_gates = gates.inject({}) do |hash, (feature_key, key, value)|
+            hash[feature_key] ||= []
+            hash[feature_key] << [key, value]
+            hash
+          end
+
+          # build up the result hash
           result = Hash.new { |hash, key| hash[key] = default_config }
-          features = grouped_db_gates.keys.map { |key| Flipper::Feature.new(key, self) }
+          features = grouped_gates.keys.map { |key| Flipper::Feature.new(key, self) }
           features.each do |feature|
-            result[feature.key] = result_for_feature(feature, grouped_db_gates[feature.key])
+            result[feature.key] = result_for_gates(feature, grouped_gates[feature.key])
           end
           result
         end
@@ -219,22 +232,22 @@ module Flipper
         # already added so no need move on with life
       end
 
-      def result_for_feature(feature, db_gates)
-        db_gates ||= []
+      def result_for_gates(feature, gates)
         result = {}
+        gates ||= []
         feature.gates.each do |gate|
           result[gate.key] =
             case gate.data_type
             when :boolean
-              if detected_db_gate = db_gates.detect { |db_gate| db_gate.key == gate.key.to_s }
-                detected_db_gate.value
+              if row = gates.detect { |key, value| !key.nil? && key.to_sym == gate.key }
+                row.last
               end
             when :integer
-              if detected_db_gate = db_gates.detect { |db_gate| db_gate.key == gate.key.to_s }
-                detected_db_gate.value
+              if row = gates.detect { |key, value| !key.nil? && key.to_sym == gate.key }
+                row.last
               end
             when :set
-              db_gates.select { |db_gate| db_gate.key == gate.key.to_s }.map(&:value).to_set
+              gates.select { |key, value| !key.nil? && key.to_sym == gate.key }.map(&:last).to_set
             else
               unsupported_data_type gate.data_type
             end

data/lib/flipper/version.rb

@@ -1,3 +1,3 @@
 module Flipper
-  VERSION = '0.26.1'.freeze
+  VERSION = '0.26.2'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flipper-active_record
 version: !ruby/object:Gem::Version
-  version: 0.26.1
+  version: 0.26.2
 platform: ruby
 authors:
 - John Nunemaker
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.26.1
+        version: 0.26.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.26.1
+        version: 0.26.2
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -51,6 +51,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- benchmark/active_record_adapter_ips.rb
+- benchmark/active_record_ips.rb
+- benchmark/active_record_setup.rb
 - examples/active_record/ar_setup.rb
 - examples/active_record/basic.rb
 - examples/active_record/internals.rb