optic-rails 0.0.6 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ffe914a1df59184ac225cc960634735a71a437b770ae7ab9c22b4eca2fb6f46
-  data.tar.gz: 24912fa3c973cd9d879a480a5f7797c3250b4cfa88e64b112aa9bcff54471efc
+  metadata.gz: b2cff9fec79805dad7c1257d4510b13a4e253959942930cf60044195f47323c9
+  data.tar.gz: 5d83085f13bba93a899125f0047965d4176056c7260f6772d69af895b9868d89
 SHA512:
-  metadata.gz: 9e96164ddef86ce2cf6f2351f221eb1a0dcf8d03bcfdec9aa70d90b1b160ca6f18135376bf249bcecb9a433a17400596de7e0a47e8ac1afe40b4f29021c7a4df
-  data.tar.gz: 9750272605b12a86c50fa356f2f7e09cf72e3889bb2cf6cea91ed34bb6ab0834409bea1611316271de6987de0441d09491fb03a7dda6d0399b0d9a484899fefc
+  metadata.gz: ee4a8807e8e46da376e3acf326078ef46b07ea94bb4536f7c9bf8875075d31bf80764cef33d453c7a00ac876cbe82dffb1bbce1ebaf366eaa113d0de514ddb81
+  data.tar.gz: d0cc8c92cd20111aa7c24719e22b87e9852006a53102cde5bbd0b256c8c746b75cf541947c8189321a06be902f257bd71b7c1d768c30a76ece5622709951389c

data/lib/optic/rails.rb

@@ -103,57 +103,68 @@ module Optic
       }
     end
 
-    def self.execute_sql_query(sql)
+    # Try to be defensive with our DB connection:
+    # 1) Check a connection out from the thread pool instead of using an implicit one
+    # 2) Make the connection read-only
+    # 3) Time out any queries that take more than 100ms
+    def self.with_connection
       ActiveRecord::Base.connection_pool.with_connection do |connection|
-        connection.execute(sql)
+        connection.transaction do
+          connection.execute "SET TRANSACTION READ ONLY"
+          connection.execute "SET LOCAL statement_timeout = 100"
+          yield connection
+        end
       end
     end
 
     def self.get_metrics(pivot_name)
-      pivot = pivot_name.constantize
-
-      result = {
-        entity_totals: [],
-        pivot_name: pivot.name,
-        # TODO filter columns, spread over multiple queries
-        pivot_values: execute_sql_query(pivot.unscoped.select("*").to_sql).to_a,
-        pivoted_totals: []
-        # TODO also return computed "spanning" tree of objects from the pivot's POV (using the dijkstra paths from below)
-      }
-
-      graph = entity_graph
-
-      # Spit out counts for each entity by the customer pivot
-
-      edge_weights = lambda { |_| 1 }
-
-      graph.vertices.each do |vertex|
-        count_query = vertex.unscoped.select("COUNT(*)").to_sql
-        result[:entity_totals] << { name: vertex.name, total: execute_sql_query(count_query).first["count"] }
+      with_connection do |connection|
+        pivot = pivot_name.constantize
+        pivot_values = connection.execute(pivot.unscoped.select("*").to_sql).to_a
+
+        result = {
+          entity_totals: [],
+          pivot_name: pivot.name,
+          # TODO filter columns, spread over multiple queries
+          pivot_values: pivot_values,
+          pivoted_totals: []
+          # TODO also return computed "spanning" tree of objects from the pivot's POV (using the dijkstra paths from below)
+        }
+
+        graph = entity_graph
+
+        # Spit out counts for each entity by the customer pivot
+
+        edge_weights = lambda { |_| 1 }
+
+        graph.vertices.each do |vertex|
+          count_query = vertex.unscoped.select("COUNT(*)").to_sql
+          result[:entity_totals] << { name: vertex.name, total: connection.execute(count_query).first["count"] }
+
+          next if vertex == pivot # Skip pivoted metrics if this is the pivot
+
+          # TODO weight edges to give preference to non-optional belongs_to (and other attributes?)
+          path = graph.dijkstra_shortest_path(edge_weights, vertex, pivot)
+          if path
+            # Generate a SQL query to count the number of vertex instances grouped by pivot id, with appropriate joins from the path
+            belongs_to_names = path.each_cons(2).map do |join_from, join_to|
+              # TODO we shouldn't have to look up the edge again - use a graph model that allows us to annotate the edges with the reflections
+              reflections = join_from.reflect_on_all_associations(:belongs_to).find_all { |reflection| !reflection.options[:polymorphic] && reflection.klass == join_to }
+              raise "Multiple belongs_to unsupported" unless reflections.size == 1 # TODO
+              reflections.first.name
+            end
 
-        next if vertex == pivot # Skip pivoted metrics if this is the pivot
+            joins = belongs_to_names.reverse.inject { |acc, elt| { elt => acc } }
+            query = vertex.unscoped.joins(joins).group(qualified_primary_key(pivot)).select(qualified_primary_key(pivot), "COUNT(#{qualified_primary_key(vertex)})").to_sql
 
-        # TODO weight edges to give preference to non-optional belongs_to (and other attributes?)
-        path = graph.dijkstra_shortest_path(edge_weights, vertex, pivot)
-        if path
-          # Generate a SQL query to count the number of vertex instances grouped by pivot id, with appropriate joins from the path
-          belongs_to_names = path.each_cons(2).map do |join_from, join_to|
-            # TODO we shouldn't have to look up the edge again - use a graph model that allows us to annotate the edges with the reflections
-            reflections = join_from.reflect_on_all_associations(:belongs_to).find_all { |reflection| !reflection.options[:polymorphic] && reflection.klass == join_to }
-            raise "Multiple belongs_to unsupported" unless reflections.size == 1 # TODO
-            reflections.first.name
+            result[:pivoted_totals] << { entity_name: vertex.name, totals: Hash[connection.execute(query).map { |record| [record["id"], record["count"]] }] }
+          else
+            p "WARNING: No path from #{vertex.name} to #{pivot.name}"
           end
-
-          joins = belongs_to_names.reverse.inject { |acc, elt| { elt => acc } }
-          query = vertex.unscoped.joins(joins).group(qualified_primary_key(pivot)).select(qualified_primary_key(pivot), "COUNT(#{qualified_primary_key(vertex)})").to_sql
-
-          result[:pivoted_totals] << { entity_name: vertex.name, totals: Hash[execute_sql_query(query).map { |record| [record["id"], record["count"]] }] }
-        else
-          p "WARNING: No path from #{vertex.name} to #{pivot.name}"
         end
-      end
 
-      result
+        result
+      end
     end
 
   end

data/lib/optic/rails/version.rb

@@ -1,5 +1,5 @@
 module Optic
   module Rails
-    VERSION = '0.0.6'
+    VERSION = '0.1.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: optic-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.1.0
 platform: ruby
 authors:
 - Anton Vaynshtok
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-21 00:00:00.000000000 Z
+date: 2018-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: action_cable_client