RubyGems - typed_dag - Versions diffs - 1.0.1 → 2.0.0 - Mend

typed_dag 1.0.1 → 2.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (25) hide show

checksums.yaml +4 -4
data/README.md +20 -5
data/lib/typed_dag/configuration.rb +4 -0
data/lib/typed_dag/edge/closure_maintenance.rb +16 -2
data/lib/typed_dag/sql.rb +1 -0
data/lib/typed_dag/sql/add_closure.rb +36 -5
data/lib/typed_dag/sql/delete_zero_count.rb +22 -0
data/lib/typed_dag/sql/get_circular.rb +4 -2
data/lib/typed_dag/sql/helper.rb +15 -1
data/lib/typed_dag/sql/insert_closure_of_depth.rb +44 -5
data/lib/typed_dag/sql/insert_reflexive.rb +3 -2
data/lib/typed_dag/sql/relation_access.rb +1 -0
data/lib/typed_dag/sql/select_closure.rb +20 -9
data/lib/typed_dag/sql/truncate_closure.rb +23 -128
data/lib/typed_dag/version.rb +1 -1
data/spec/support/helpers.rb +10 -1
data/spec/test_app/config/database.yml +1 -3
data/spec/test_app/db/migrate/20170831093433_create_nodes_and_endges.rb +3 -4
data/spec/test_app/db/schema.rb +7 -6
data/spec/test_app/log/test.log +0 -0
data/spec/typed_dag/edge_spec.rb +33 -33
data/spec/typed_dag/node_spec.rb +43 -50
data/spec/typed_dag/sql/add_closure_spec.rb +103 -37
data/spec/typed_dag/sql/truncate_closure_spec.rb +93 -121
metadata +3 -2

data/spec/typed_dag/sql/truncate_closure_spec.rb CHANGED Viewed

@@ -1,135 +1,107 @@
 require 'spec_helper'
 RSpec.describe TypedDag::Sql::TruncateClosure do
+  include TypedDag::Specs::Helpers
   describe '.sql' do
     let(:relation) { Relation.new ancestor_id: 4, descendant_id: 6, invalidate: 1 }
-    def harmonize_string(string)
-      string.squish.gsub('( ', '(').gsub(' )', ')')
-    end
-    if ActiveRecord::Base.connection.adapter_name == 'Mysql2'
-      it 'produces the correct sql for mysql' do
-        expected_sql = <<-SQL
-          DELETE
-            deletion_table
-          FROM
-            relations deletion_table
-          INNER JOIN
-            (SELECT id
-            FROM (
-              SELECT COUNT(*) count, ancestor_id, descendant_id, hierarchy, invalidate
-              FROM (
-                SELECT
-                  r1.ancestor_id,
-                  r2.descendant_id,
-                  CASE
-                    WHEN r1.descendant_id = r2.ancestor_id AND (r1.hierarchy > 0 OR r2.hierarchy > 0)
-                    THEN r1.hierarchy + r2.hierarchy
-                    WHEN r1.descendant_id != r2.ancestor_id
-                    THEN r1.hierarchy + r2.hierarchy + 0
-                    ELSE 0
-                    END AS hierarchy ,
-                  CASE
-                    WHEN r1.descendant_id = r2.ancestor_id AND (r1.invalidate > 0 OR r2.invalidate > 0)
-                    THEN r1.invalidate + r2.invalidate
-                    WHEN r1.descendant_id != r2.ancestor_id
-                    THEN r1.invalidate + r2.invalidate + 1
-                    ELSE 0
-                    END AS invalidate
-                FROM
-                  relations r1
-                JOIN
-                  relations r2
-                ON
-                  (r1.descendant_id = 4 AND r2.ancestor_id = 6 AND NOT (r1.ancestor_id = 4 AND r2.descendant_id = 6))
-                ) aggregation
-                GROUP BY ancestor_id, descendant_id, hierarchy, invalidate) criteria
+    it 'produces the correct sql' do
+      expected_sql = if mysql_db?
+        <<-SQL
+          UPDATE
+            relations
+          JOIN
+            (SELECT
+              ancestor_id,
+              descendant_id,
+              hierarchy,
+              invalidate,
+              SUM(count) AS count
+            FROM
+              (SELECT
+                r1.ancestor_id,
+                r2.descendant_id,
+                CASE
+                  WHEN r1.descendant_id = r2.ancestor_id AND (r1.hierarchy > 0 OR r2.hierarchy > 0)
+                  THEN r1.hierarchy + r2.hierarchy
+                  WHEN r1.descendant_id != r2.ancestor_id
+                  THEN r1.hierarchy + r2.hierarchy + 0
+                  ELSE 0
+                  END AS hierarchy,
+                CASE
+                  WHEN r1.descendant_id = r2.ancestor_id AND (r1.invalidate > 0 OR r2.invalidate > 0)
+                  THEN r1.invalidate + r2.invalidate
+                  WHEN r1.descendant_id != r2.ancestor_id
+                  THEN r1.invalidate + r2.invalidate + 1
+                  ELSE 0
+                  END AS invalidate,
+                r1.count * r2.count AS count
+              FROM
+                relations r1
               JOIN
-                (SELECT
-                  id,
-                  ancestor_id,
-                  descendant_id,
-                  hierarchy,
-                  invalidate,
-                  greatest(@cur_count := IF(@cur_ancestor_id = ancestor_id AND @cur_descendant_id = descendant_id AND @cur_hierarchy = hierarchy AND @cur_invalidate = invalidate,
-                                         @cur_count + 1, 1),
-                           least(0, @cur_ancestor_id := ancestor_id, @cur_descendant_id := descendant_id, @cur_hierarchy := hierarchy, @cur_invalidate := invalidate)) AS row_number
-                FROM relations
-                CROSS JOIN (SELECT @cur_count := NULL, @cur_ancestor_id := NULL, @cur_descendant_id := NULL, @cur_hierarchy := NULL, @cur_invalidate := NULL) params_initialization
-                WHERE
-                  ancestor_id IN (SELECT ancestor_id FROM relations WHERE descendant_id = 4) OR ancestor_id = 4
-                AND
-                    descendant_id IN (SELECT descendant_id FROM relations WHERE ancestor_id = 4)
-                ORDER BY ancestor_id, descendant_id, hierarchy, invalidate) ranked
-              ON ranked.ancestor_id = criteria.ancestor_id
-              AND ranked.descendant_id = criteria.descendant_id
-              AND ranked.hierarchy = criteria.hierarchy
-              AND ranked.invalidate = criteria.invalidate
-              AND count >= row_number) selection_table
-            ON
-              deletion_table.id = selection_table.id
+                relations r2
+              ON
+                (r1.descendant_id = 4 AND r2.ancestor_id = 6 AND NOT (r1.ancestor_id = 4 AND r2.descendant_id = 6))) unique_rows
+            GROUP BY
+              ancestor_id,
+              descendant_id,
+              hierarchy,
+              invalidate) removed_relations
+          ON relations.ancestor_id = removed_relations.ancestor_id
+            AND relations.descendant_id = removed_relations.descendant_id
+            AND relations.hierarchy = removed_relations.hierarchy
+            AND relations.invalidate = removed_relations.invalidate
+          SET
+            relations.count = relations.count - removed_relations.count
         SQL
-        expect(harmonize_string(described_class.sql(relation)))
-          .to eql harmonize_string(expected_sql)
-      end
-    else
-      it 'produces the correct sql for postgresql' do
+      else
         expected_sql = <<-SQL
-          DELETE
+          UPDATE
+            relations
+          SET
+            count = relations.count - removed_relations.count
           FROM
-            relations deletion_table
-          USING
-            (SELECT id
-            FROM (
-              SELECT COUNT(*) count, ancestor_id, descendant_id, hierarchy, invalidate
-              FROM (
-                SELECT
-                  r1.ancestor_id,
-                  r2.descendant_id,
-                  CASE
-                    WHEN r1.descendant_id = r2.ancestor_id AND (r1.hierarchy > 0 OR r2.hierarchy > 0)
-                    THEN r1.hierarchy + r2.hierarchy
-                    WHEN r1.descendant_id != r2.ancestor_id
-                    THEN r1.hierarchy + r2.hierarchy + 0
-                    ELSE 0
-                    END AS hierarchy ,
-                  CASE
-                    WHEN r1.descendant_id = r2.ancestor_id AND (r1.invalidate > 0 OR r2.invalidate > 0)
-                    THEN r1.invalidate + r2.invalidate
-                    WHEN r1.descendant_id != r2.ancestor_id
-                    THEN r1.invalidate + r2.invalidate + 1
-                    ELSE 0
-                    END AS invalidate
-                FROM
-                  relations r1
-                JOIN
-                  relations r2
-                ON
-                  (r1.descendant_id = 4 AND r2.ancestor_id = 6 AND NOT (r1.ancestor_id = 4 AND r2.descendant_id = 6))
-                ) aggregation
-                GROUP BY ancestor_id, descendant_id, hierarchy, invalidate) criteria
+            (SELECT
+              ancestor_id,
+              descendant_id,
+              hierarchy,
+              invalidate,
+              SUM(count) AS count
+            FROM
+              (SELECT
+                r1.ancestor_id,
+                r2.descendant_id,
+                CASE
+                  WHEN r1.descendant_id = r2.ancestor_id AND (r1.hierarchy > 0 OR r2.hierarchy > 0)
+                  THEN r1.hierarchy + r2.hierarchy
+                  WHEN r1.descendant_id != r2.ancestor_id
+                  THEN r1.hierarchy + r2.hierarchy + 0
+                  ELSE 0
+                  END AS hierarchy,
+                CASE
+                  WHEN r1.descendant_id = r2.ancestor_id AND (r1.invalidate > 0 OR r2.invalidate > 0)
+                  THEN r1.invalidate + r2.invalidate
+                  WHEN r1.descendant_id != r2.ancestor_id
+                  THEN r1.invalidate + r2.invalidate + 1
+                  ELSE 0
+                  END AS invalidate,
+                r1.count * r2.count AS count
+              FROM
+                relations r1
               JOIN
-                (SELECT *, ROW_NUMBER() OVER(
-                  PARTITION BY ancestor_id, descendant_id, hierarchy, invalidate
-                  )
-                FROM
-                  relations
-                WHERE
-                  ancestor_id IN (SELECT ancestor_id FROM relations WHERE descendant_id = 4) OR ancestor_id = 4
-                AND
-                  descendant_id IN (SELECT descendant_id FROM relations WHERE ancestor_id = 4)) ranked
-              ON ranked.ancestor_id = criteria.ancestor_id
-              AND ranked.descendant_id = criteria.descendant_id
-              AND ranked.hierarchy = criteria.hierarchy
-              AND ranked.invalidate = criteria.invalidate
-              AND count >= row_number) selection_table
-            WHERE
-              deletion_table.id = selection_table.id
+                relations r2
+              ON
+                (r1.descendant_id = 4 AND r2.ancestor_id = 6 AND NOT (r1.ancestor_id = 4 AND r2.descendant_id = 6))) unique_rows
+            GROUP BY
+              ancestor_id,
+              descendant_id,
+              hierarchy,
+              invalidate) removed_relations
+          WHERE relations.ancestor_id = removed_relations.ancestor_id
+            AND relations.descendant_id = removed_relations.descendant_id
+            AND relations.hierarchy = removed_relations.hierarchy
+            AND relations.invalidate = removed_relations.invalidate
         SQL
         expect(harmonize_string(described_class.sql(relation)))

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: typed_dag
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 2.0.0
 platform: ruby
 authors:
 - OpenProject GmbH
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-12-04 00:00:00.000000000 Z
+date: 2018-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -96,6 +96,7 @@ files:
 - lib/typed_dag/rebuild_dag.rb
 - lib/typed_dag/sql.rb
 - lib/typed_dag/sql/add_closure.rb
+- lib/typed_dag/sql/delete_zero_count.rb
 - lib/typed_dag/sql/get_circular.rb
 - lib/typed_dag/sql/helper.rb
 - lib/typed_dag/sql/insert_closure_of_depth.rb