masamune 0.13.7 → 0.13.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 503b5c0caf8dbb92977b77240d970f3ba25657a4
-  data.tar.gz: a8179a229d83ec4ad7f4ae7ba074740acd50c564
+  metadata.gz: f4d4d75d505e70be3e5c119ccb677ad9e9846a85
+  data.tar.gz: 2518fa319f34c708c94b363473b9e0ab4cf73b75
 SHA512:
-  metadata.gz: 39316442a3e2cbf2d89c146b673b6504c0ac84cf21091584d483b2aed2652125133c8face5845891dae71628069150e7c0d922c27770fea78016685231ea9457
-  data.tar.gz: 858f6a70370c44ce6b110c2ffe1e2a81ed7044977740d2148808a8c4dc2c06b40b1bd27d4a8bf36a49a5d380036b87a54cbb1e37ca5b978767f2aed6830e33a2
+  metadata.gz: 43e4b96852c3cacaadf6a82169eefd892d962329f151ced5923369281340cf0a2b49e1edadc0de59cb1080f89b2c91ebfa61378e6bcae602ccd7af361ccb793a
+  data.tar.gz: e5aabba71b0721d37537f59d0744ebb02a66e73dcc060a98704bf8247b9ec229c3db8a3a338a4603c2b57e780a97cec663da5ecb653a67ff09fc6acd577ecf13

data/lib/masamune/transform/bulk_upsert.psql.erb

@@ -20,8 +20,9 @@
 --  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 --  THE SOFTWARE.
 
+SELECT pg_advisory_lock(<%= target.lock_id %>);
+
 BEGIN;
-LOCK TABLE <%= target.name %> IN EXCLUSIVE MODE;
 
 <%- if target.update_columns.any? -%>
 UPDATE
@@ -64,3 +65,5 @@ WHERE
 COMMIT;
 
 VACUUM FULL ANALYZE <%= target.name %>;
+
+SELECT pg_advisory_unlock(<%= target.lock_id %>);

data/lib/masamune/version.rb

@@ -21,5 +21,5 @@
 #  THE SOFTWARE.
 
 module Masamune
-  VERSION = '0.13.7'
+  VERSION = '0.13.8'
 end

data/spec/masamune/transform/bulk_upsert.dimension_spec.rb

@@ -24,6 +24,8 @@ require 'spec_helper'
 
 describe Masamune::Transform::BulkUpsert do
   before do
+    allow_any_instance_of(Masamune::Schema::Table).to receive(:lock_id).and_return(42)
+
     catalog.schema :postgres do
       dimension 'cluster', type: :mini do
         column 'id', type: :integer, surrogate_key: true, auto: true
@@ -78,8 +80,9 @@ describe Masamune::Transform::BulkUpsert do
 
     it 'should render bulk_upsert template' do
       is_expected.to eq <<-EOS.strip_heredoc
+        SELECT pg_advisory_lock(42);
+
         BEGIN;
-        LOCK TABLE user_dimension IN EXCLUSIVE MODE;
 
         UPDATE
           user_dimension
@@ -130,6 +133,8 @@ describe Masamune::Transform::BulkUpsert do
         COMMIT;
 
         VACUUM FULL ANALYZE user_dimension;
+
+        SELECT pg_advisory_unlock(42);
       EOS
     end
   end
@@ -139,8 +144,9 @@ describe Masamune::Transform::BulkUpsert do
 
     it 'should render bulk_upsert template' do
       is_expected.to eq <<-EOS.strip_heredoc
+        SELECT pg_advisory_lock(42);
+
         BEGIN;
-        LOCK TABLE user_dimension_ledger IN EXCLUSIVE MODE;
 
         UPDATE
           user_dimension_ledger
@@ -196,6 +202,8 @@ describe Masamune::Transform::BulkUpsert do
         COMMIT;
 
         VACUUM FULL ANALYZE user_dimension_ledger;
+
+        SELECT pg_advisory_unlock(42);
       EOS
     end
   end

data/spec/masamune/transform/insert_reference_values.dimension_spec.rb

@@ -24,6 +24,8 @@ require 'spec_helper'
 
 describe Masamune::Transform::InsertReferenceValues do
   before do
+    allow_any_instance_of(Masamune::Schema::Table).to receive(:lock_id).and_return(42)
+
     catalog.schema :postgres do
       dimension 'department', type: :mini do
         column 'tenant_id', type: :integer, unique: true, natural_key: true
@@ -76,8 +78,9 @@ describe Masamune::Transform::InsertReferenceValues do
 
         ANALYZE department_type_stage;
 
+        SELECT pg_advisory_lock(42);
+
         BEGIN;
-        LOCK TABLE department_type IN EXCLUSIVE MODE;
 
         INSERT INTO
           department_type (tenant_id, department_id)
@@ -99,6 +102,8 @@ describe Masamune::Transform::InsertReferenceValues do
         COMMIT;
 
         VACUUM FULL ANALYZE department_type;
+
+        SELECT pg_advisory_unlock(42);
       EOS
     end
   end

data/spec/masamune/transform/insert_reference_values.fact_spec.rb

@@ -24,6 +24,8 @@ require 'spec_helper'
 
 describe Masamune::Transform::InsertReferenceValues do
   before do
+    allow_any_instance_of(Masamune::Schema::Table).to receive(:lock_id).and_return(42)
+
     catalog.schema :postgres do
       dimension 'date', type: :one do
         column 'date_id', type: :integer, unique: true, index: true, natural_key: true
@@ -93,8 +95,9 @@ describe Masamune::Transform::InsertReferenceValues do
 
         ANALYZE user_agent_type_stage;
 
+        SELECT pg_advisory_lock(42);
+
         BEGIN;
-        LOCK TABLE user_agent_type IN EXCLUSIVE MODE;
 
         INSERT INTO
           user_agent_type (name, version)
@@ -117,6 +120,8 @@ describe Masamune::Transform::InsertReferenceValues do
 
         VACUUM FULL ANALYZE user_agent_type;
 
+        SELECT pg_advisory_unlock(42);
+
         CREATE TEMPORARY TABLE IF NOT EXISTS feature_type_stage (LIKE feature_type INCLUDING ALL);
 
         INSERT INTO
@@ -131,8 +136,9 @@ describe Masamune::Transform::InsertReferenceValues do
 
         ANALYZE feature_type_stage;
 
+        SELECT pg_advisory_lock(42);
+
         BEGIN;
-        LOCK TABLE feature_type IN EXCLUSIVE MODE;
 
         INSERT INTO
           feature_type (name)
@@ -151,6 +157,8 @@ describe Masamune::Transform::InsertReferenceValues do
         COMMIT;
 
         VACUUM FULL ANALYZE feature_type;
+
+        SELECT pg_advisory_unlock(42);
       EOS
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: masamune
 version: !ruby/object:Gem::Version
-  version: 0.13.7
+  version: 0.13.8
 platform: ruby
 authors:
 - Michael Andrews
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-13 00:00:00.000000000 Z
+date: 2015-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor