masamune 0.13.8 → 0.14.0

data/spec/masamune/transform/relabel_dimension_spec.rb

@@ -24,6 +24,8 @@ require 'spec_helper'
 
 describe Masamune::Transform::RelabelDimension do
   before do
+    allow_any_instance_of(Masamune::Schema::Table).to receive(:lock_id).and_return(42)
+
     catalog.schema :postgres do
       dimension 'user_account_state', type: :mini do
         column 'name', type: :string, unique: true
@@ -46,8 +48,9 @@ describe Masamune::Transform::RelabelDimension do
 
     it 'should eq render relabel_dimension 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 SET version = NULL;
 
@@ -96,6 +99,8 @@ describe Masamune::Transform::RelabelDimension do
         ;
 
         COMMIT;
+
+        SELECT pg_advisory_unlock(42);
       EOS
     end
   end

data/spec/masamune/transform/snapshot_dimension_spec.rb

@@ -61,14 +61,9 @@ describe Masamune::Transform::SnapshotDimension do
             consolidated.tenant_id,
             consolidated.user_id,
             consolidated.preferences,
-            consolidated.parent_id,
-            consolidated.record_id,
             consolidated.start_at
           FROM (
-            SELECT DISTINCT ON (tenant_id, user_id, start_at)
-              FIRST_VALUE(id) OVER w AS parent_id,
-              FIRST_VALUE(start_at) OVER w AS parent_start_at,
-              id AS record_id,
+            SELECT DISTINCT ON (tenant_id, user_id, start_at, id)
               coalesce_merge(user_account_state_type_id) OVER w AS user_account_state_type_id,
               tenant_id AS tenant_id,
               user_id AS user_id,
@@ -77,7 +72,7 @@ describe Masamune::Transform::SnapshotDimension do
             FROM
               windows
             WINDOW w AS (PARTITION BY tenant_id, user_id, window_id ORDER BY start_at DESC)
-            ORDER BY tenant_id, user_id, start_at DESC, window_id
+            ORDER BY tenant_id, user_id, start_at DESC, id DESC, window_id
           ) consolidated
           WHERE
             consolidated.user_account_state_type_id IS NOT NULL AND
@@ -85,14 +80,12 @@ describe Masamune::Transform::SnapshotDimension do
             consolidated.user_id IS NOT NULL
         )
         INSERT INTO
-          user_dimension_stage (user_account_state_type_id, tenant_id, user_id, preferences, parent_id, record_id, start_at)
+          user_dimension_stage (user_account_state_type_id, tenant_id, user_id, preferences, start_at)
         SELECT
           user_account_state_type_id,
           tenant_id,
           user_id,
           preferences,
-          parent_id,
-          record_id,
           start_at
         FROM
           snapshot

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: masamune
 version: !ruby/object:Gem::Version
-  version: 0.13.8
+  version: 0.14.0
 platform: ruby
 authors:
 - Michael Andrews
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-20 00:00:00.000000000 Z
+date: 2015-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -265,39 +265,55 @@ files:
 - lib/masamune/thor_loader.rb
 - lib/masamune/topological_hash.rb
 - lib/masamune/transform.rb
-- lib/masamune/transform/bulk_upsert.psql.erb
 - lib/masamune/transform/bulk_upsert.rb
+- lib/masamune/transform/common.rb
+- lib/masamune/transform/common/denormalize_table.rb
 - lib/masamune/transform/consolidate_dimension.rb
-- lib/masamune/transform/deduplicate_dimension.psql.erb
 - lib/masamune/transform/deduplicate_dimension.rb
-- lib/masamune/transform/define_foreign_key.psql.erb
-- lib/masamune/transform/define_index.psql.erb
-- lib/masamune/transform/define_inheritance.psql.erb
-- lib/masamune/transform/define_schema.hql.erb
-- lib/masamune/transform/define_schema.psql.erb
 - lib/masamune/transform/define_schema.rb
-- lib/masamune/transform/define_table.hql.erb
-- lib/masamune/transform/define_table.psql.erb
 - lib/masamune/transform/define_table.rb
-- lib/masamune/transform/define_unique.psql.erb
-- lib/masamune/transform/denormalize_table.hql.erb
-- lib/masamune/transform/denormalize_table.psql.erb
 - lib/masamune/transform/denormalize_table.rb
-- lib/masamune/transform/insert_reference_values.psql.erb
+- lib/masamune/transform/hive.rb
+- lib/masamune/transform/hive/define_schema.hql.erb
+- lib/masamune/transform/hive/define_table.hql.erb
+- lib/masamune/transform/hive/define_table.rb
+- lib/masamune/transform/hive/denormalize_table.hql.erb
+- lib/masamune/transform/hive/denormalize_table.rb
 - lib/masamune/transform/insert_reference_values.rb
 - lib/masamune/transform/load_dimension.rb
 - lib/masamune/transform/load_fact.rb
 - lib/masamune/transform/operator.rb
-- lib/masamune/transform/relabel_dimension.psql.erb
+- lib/masamune/transform/postgres.rb
+- lib/masamune/transform/postgres/bulk_upsert.psql.erb
+- lib/masamune/transform/postgres/bulk_upsert.rb
+- lib/masamune/transform/postgres/deduplicate_dimension.psql.erb
+- lib/masamune/transform/postgres/deduplicate_dimension.rb
+- lib/masamune/transform/postgres/define_foreign_key.psql.erb
+- lib/masamune/transform/postgres/define_index.psql.erb
+- lib/masamune/transform/postgres/define_inheritance.psql.erb
+- lib/masamune/transform/postgres/define_schema.psql.erb
+- lib/masamune/transform/postgres/define_table.psql.erb
+- lib/masamune/transform/postgres/define_table.rb
+- lib/masamune/transform/postgres/define_unique.psql.erb
+- lib/masamune/transform/postgres/denormalize_table.psql.erb
+- lib/masamune/transform/postgres/denormalize_table.rb
+- lib/masamune/transform/postgres/insert_reference_values.psql.erb
+- lib/masamune/transform/postgres/insert_reference_values.rb
+- lib/masamune/transform/postgres/relabel_dimension.psql.erb
+- lib/masamune/transform/postgres/relabel_dimension.rb
+- lib/masamune/transform/postgres/replace_table.psql.erb
+- lib/masamune/transform/postgres/rollup_fact.psql.erb
+- lib/masamune/transform/postgres/rollup_fact.rb
+- lib/masamune/transform/postgres/snapshot_dimension.psql.erb
+- lib/masamune/transform/postgres/snapshot_dimension.rb
+- lib/masamune/transform/postgres/stage_dimension.psql.erb
+- lib/masamune/transform/postgres/stage_dimension.rb
+- lib/masamune/transform/postgres/stage_fact.psql.erb
+- lib/masamune/transform/postgres/stage_fact.rb
 - lib/masamune/transform/relabel_dimension.rb
-- lib/masamune/transform/replace_table.psql.erb
-- lib/masamune/transform/rollup_fact.psql.erb
 - lib/masamune/transform/rollup_fact.rb
-- lib/masamune/transform/snapshot_dimension.psql.erb
 - lib/masamune/transform/snapshot_dimension.rb
-- lib/masamune/transform/stage_dimension.psql.erb
 - lib/masamune/transform/stage_dimension.rb
-- lib/masamune/transform/stage_fact.psql.erb
 - lib/masamune/transform/stage_fact.rb
 - lib/masamune/version.rb
 - spec/fixtures/aggregate.sql.erb