masamune 0.13.1 → 0.13.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 49fdc180c59d4179763efd965d946c93fb864dcf
-  data.tar.gz: 0765d61a7a7247c7bb5eb0d70d17c7edb5e5fcf5
+  metadata.gz: 8fa6da8799159be2bb3472751c15650fee02f59f
+  data.tar.gz: ea974ce24ad0a23c35b74c9d1c7088c7bbce01c3
 SHA512:
-  metadata.gz: 7a121d38a8d42a7e0c255ba17e523e1520da7016e0a87d553adcd32c67f6af21eb2ffc81cbcda1123e286fd93cdde8b31177affa30e17314497248d820fea989
-  data.tar.gz: 93ab83f1f5804d0b3bf25970a665d63f3e7099c43ec6c817e8a04ee30ad3dde348aa4a2515a1a8518e76aeb0150eed04a77cf1a568710f806dbe4582f1502259
+  metadata.gz: 2e7b57261f2885aab5bfdbd3d4fa6cfceddeda92dc5d6919d9526107e04da9f99774ca1186a32f11391ef8e4f287ea5c300c0f8f8c3d226f5be1d446ebcbb50f
+  data.tar.gz: 1fd79cfc1578985db4d2d64cfc84197f8071497cd351c875aa5b50930263e14a119f095307bea842ea50508ad79bce17acd967dbfba53d60a217c8fc188c1e28

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

@@ -61,6 +61,6 @@ WHERE
 ;
 <%- end -%>
 
-ANALYZE <%= target.name %>;
+VACUUM FULL ANALYZE <%= target.name %>;
 
 COMMIT;

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

@@ -113,7 +113,7 @@ WHERE NOT EXISTS (SELECT 1 FROM <%= target.name %> WHERE <%= row.insert_constrai
 <%- end -%>
 
 <%- if helper.perform_analyze? -%>
-ANALYZE <%= target.name %>;
+VACUUM FULL ANALYZE <%= target.name %>;
 <%- end -%>
 
 <%- if helper.define_functions? -%>

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

@@ -39,7 +39,7 @@ WHERE
 <%- end -%>
 ;
 
-ANALYZE <%= target.stage_table.name %>;
+VACUUM FULL ANALYZE <%= target.stage_table.name %>;
 
 <%= target.bulk_upsert(target.stage_table, target) %>
 <%- end -%>

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

@@ -49,7 +49,7 @@ ALTER TABLE <%= source.name %> RENAME TO <%= target.name %>;
 
 <%= render 'define_index.psql.erb', target: target, skip_check_exist: true %>
 
-ANALYZE <%= target.name %>;
+VACUUM FULL ANALYZE <%= target.name %>;
 
 COMMIT;
 

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

@@ -38,4 +38,4 @@ ON
 <%- end -%>
 ;
 
-ANALYZE <%= target.stage_table.name %>;
+VACUUM FULL ANALYZE <%= target.stage_table.name %>;

data/lib/masamune/transform/stage_fact.rb

@@ -73,6 +73,7 @@ module Masamune::Transform
             next if column.degenerate?
             dependencies[reference_name] ||= []
             cross_references = cross_references(column)
+
             coalesce_values = []
 
             if cross_references.any?
@@ -80,8 +81,13 @@ module Masamune::Transform
               coalesce_values << cross_references.map { |reference, column| column.qualified_name(reference.label) }
             end
 
-            if column.reference && !column.reference.default.nil?
-              coalesce_values << column.reference.default(column.adjacent) if column.adjacent.natural_key
+            column.reference.auto_surrogate_keys.each do |auto_surrogate_key|
+              next unless auto_surrogate_key.default
+              conditions[reference_name] << "#{auto_surrogate_key.qualified_name(reference.label)} = #{auto_surrogate_key.default}"
+            end if column.reference
+
+            if column.reference && !column.reference.default.nil? && column.adjacent.natural_key
+              coalesce_values << column.reference.default(column.adjacent)
             elsif column.adjacent && !column.adjacent.default.nil?
               coalesce_values << column.adjacent.sql_value(column.adjacent.default)
             end
@@ -90,11 +96,14 @@ module Masamune::Transform
               "#{column.foreign_key_name} = COALESCE(#{column.qualified_name}, #{coalesce_values.join(', ')})" :
               "#{column.foreign_key_name} = #{column.qualified_name}")
           end
+
           if reference.type == :two || reference.type == :four
             join_key_a = "TO_TIMESTAMP(#{source.time_key.qualified_name}) BETWEEN #{reference.start_key.qualified_name(reference.label)} AND COALESCE(#{reference.end_key.qualified_name(reference.label)}, 'INFINITY')"
             join_key_b = "TO_TIMESTAMP(#{source.time_key.qualified_name}) < #{reference.start_key.qualified_name(reference.label)} AND #{reference.version_key.qualified_name(reference.label)} = 1"
             conditions[reference_name] << "((#{join_key_a}) OR (#{join_key_b}))"
           end
+
+          conditions[reference_name].uniq!
         end
         conditions.slice(*dependencies.tsort)
       end

data/lib/masamune/version.rb

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

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

@@ -127,7 +127,7 @@ describe Masamune::Transform::BulkUpsert do
           user_dimension.start_at IS NULL
         ;
 
-        ANALYZE user_dimension;
+        VACUUM FULL ANALYZE user_dimension;
 
         COMMIT;
       EOS
@@ -193,7 +193,7 @@ describe Masamune::Transform::BulkUpsert do
           user_dimension_ledger.start_at IS NULL
         ;
 
-        ANALYZE user_dimension_ledger;
+        VACUUM FULL ANALYZE user_dimension_ledger;
 
         COMMIT;
       EOS

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

@@ -198,7 +198,7 @@ describe Masamune::Transform::DefineTable do
         CREATE INDEX visits_file_fact_stage_0fe2101_index ON visits_file_fact_stage (user_agent_type_version, time_key);
         CREATE INDEX visits_file_fact_stage_b0abfed_index ON visits_file_fact_stage (user_dimension_user_id, time_key);
 
-        ANALYZE visits_file_fact_stage;
+        VACUUM FULL ANALYZE visits_file_fact_stage;
       EOS
     end
 

data/spec/masamune/transform/define_table.table_spec.rb

@@ -474,7 +474,7 @@ describe Masamune::Transform::DefineTable do
         SELECT 'active'
         WHERE NOT EXISTS (SELECT 1 FROM user_table WHERE name = 'active');
 
-        ANALYZE user_table;
+        VACUUM FULL ANALYZE user_table;
       EOS
     end
   end
@@ -574,7 +574,7 @@ describe Masamune::Transform::DefineTable do
         SELECT default_tenant_id(), -2
         WHERE NOT EXISTS (SELECT 1 FROM user_table WHERE tenant_id = default_tenant_id() AND user_id = -2);
 
-        ANALYZE user_table;
+        VACUUM FULL ANALYZE user_table;
 
         CREATE OR REPLACE FUNCTION default_user_table_user_id()
         RETURNS INTEGER IMMUTABLE AS $$
@@ -902,7 +902,7 @@ describe Masamune::Transform::DefineTable do
         ALTER TABLE user_table ADD CONSTRAINT user_table_3854361_key UNIQUE(tenant_id);
         END IF; END $$;
 
-        ANALYZE user_table;
+        VACUUM FULL ANALYZE user_table;
       EOS
     end
   end
@@ -937,7 +937,7 @@ describe Masamune::Transform::DefineTable do
         CREATE INDEX user_table_e8701ad_index ON user_table (user_id);
         END IF; END $$;
 
-        ANALYZE user_table;
+        VACUUM FULL ANALYZE user_table;
       EOS
     end
   end
@@ -975,7 +975,7 @@ describe Masamune::Transform::DefineTable do
         ALTER TABLE user_table ADD CONSTRAINT user_table_bd2027e_fkey FOREIGN KEY (user_account_state_table_id) REFERENCES user_account_state_table(id);
         END IF; END $$;
 
-        ANALYZE user_table;
+        VACUUM FULL ANALYZE user_table;
       EOS
     end
   end

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

@@ -74,7 +74,7 @@ describe Masamune::Transform::InsertReferenceValues do
           department_type_department_id IS NOT NULL
         ;
 
-        ANALYZE department_type_stage;
+        VACUUM FULL ANALYZE department_type_stage;
 
         BEGIN;
         LOCK TABLE department_type IN EXCLUSIVE MODE;
@@ -96,7 +96,7 @@ describe Masamune::Transform::InsertReferenceValues do
           department_type.department_id IS NULL
         ;
 
-        ANALYZE department_type;
+        VACUUM FULL ANALYZE department_type;
 
         COMMIT;
       EOS

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

@@ -91,7 +91,7 @@ describe Masamune::Transform::InsertReferenceValues do
           user_agent_type_name IS NOT NULL
         ;
 
-        ANALYZE user_agent_type_stage;
+        VACUUM FULL ANALYZE user_agent_type_stage;
 
         BEGIN;
         LOCK TABLE user_agent_type IN EXCLUSIVE MODE;
@@ -113,7 +113,7 @@ describe Masamune::Transform::InsertReferenceValues do
           user_agent_type.version IS NULL
         ;
 
-        ANALYZE user_agent_type;
+        VACUUM FULL ANALYZE user_agent_type;
 
         COMMIT;
 
@@ -129,7 +129,7 @@ describe Masamune::Transform::InsertReferenceValues do
           feature_type_name IS NOT NULL
         ;
 
-        ANALYZE feature_type_stage;
+        VACUUM FULL ANALYZE feature_type_stage;
 
         BEGIN;
         LOCK TABLE feature_type IN EXCLUSIVE MODE;
@@ -148,7 +148,7 @@ describe Masamune::Transform::InsertReferenceValues do
           feature_type.name IS NULL
         ;
 
-        ANALYZE feature_type;
+        VACUUM FULL ANALYZE feature_type;
 
         COMMIT;
       EOS

data/spec/masamune/transform/rollup_fact_spec.rb

@@ -172,7 +172,7 @@ describe Masamune::Transform::RollupFact do
         CREATE INDEX visits_hourly_fact_y2014m08_d8b1c3e_index ON visits_hourly_fact_y2014m08 (user_agent_type_id);
         CREATE INDEX visits_hourly_fact_y2014m08_39f0fdd_index ON visits_hourly_fact_y2014m08 (user_dimension_id);
 
-        ANALYZE visits_hourly_fact_y2014m08;
+        VACUUM FULL ANALYZE visits_hourly_fact_y2014m08;
 
         COMMIT;
 
@@ -274,7 +274,7 @@ describe Masamune::Transform::RollupFact do
         CREATE INDEX visits_daily_fact_y2014m08_d8b1c3e_index ON visits_daily_fact_y2014m08 (user_agent_type_id);
         CREATE INDEX visits_daily_fact_y2014m08_39f0fdd_index ON visits_daily_fact_y2014m08 (user_dimension_id);
 
-        ANALYZE visits_daily_fact_y2014m08;
+        VACUUM FULL ANALYZE visits_daily_fact_y2014m08;
 
         COMMIT;
 
@@ -376,7 +376,7 @@ describe Masamune::Transform::RollupFact do
         CREATE INDEX visits_monthly_fact_y2014m08_d8b1c3e_index ON visits_monthly_fact_y2014m08 (user_agent_type_id);
         CREATE INDEX visits_monthly_fact_y2014m08_39f0fdd_index ON visits_monthly_fact_y2014m08 (user_dimension_id);
 
-        ANALYZE visits_monthly_fact_y2014m08;
+        VACUUM FULL ANALYZE visits_monthly_fact_y2014m08;
 
         COMMIT;
 

data/spec/masamune/transform/stage_dimension_spec.rb

@@ -110,7 +110,7 @@ describe Masamune::Transform::StageDimension do
           hr_user_account_state_type.name = user_file_dimension_ledger_stage.hr_user_account_state_type_name
         ;
 
-        ANALYZE user_dimension_ledger_stage;
+        VACUUM FULL ANALYZE user_dimension_ledger_stage;
       EOS
     end
   end

data/spec/masamune/transform/stage_fact_spec.rb

@@ -145,28 +145,33 @@ describe Masamune::Transform::StageFact do
         JOIN
           user_dimension
         ON
+          user_dimension.cluster_type_id = default_cluster_type_id() AND
           user_dimension.user_id = visits_hourly_file_fact_stage.user_dimension_user_id AND
           ((TO_TIMESTAMP(visits_hourly_file_fact_stage.time_key) BETWEEN user_dimension.start_at AND COALESCE(user_dimension.end_at, 'INFINITY')) OR (TO_TIMESTAMP(visits_hourly_file_fact_stage.time_key) < user_dimension.start_at AND user_dimension.version = 1))
         JOIN
           group_dimension AS from_group_dimension
         ON
+          from_group_dimension.cluster_type_id = default_cluster_type_id() AND
           from_group_dimension.group_id = COALESCE(visits_hourly_file_fact_stage.from_group_dimension_group_id, missing_group_dimension_group_id()) AND
           from_group_dimension.group_mode = COALESCE(visits_hourly_file_fact_stage.from_group_dimension_group_mode, missing_group_dimension_group_mode()) AND
           ((TO_TIMESTAMP(visits_hourly_file_fact_stage.time_key) BETWEEN from_group_dimension.start_at AND COALESCE(from_group_dimension.end_at, 'INFINITY')) OR (TO_TIMESTAMP(visits_hourly_file_fact_stage.time_key) < from_group_dimension.start_at AND from_group_dimension.version = 1))
         JOIN
           group_dimension
         ON
+          group_dimension.cluster_type_id = default_cluster_type_id() AND
           group_dimension.group_id = COALESCE(visits_hourly_file_fact_stage.group_dimension_group_id, missing_group_dimension_group_id()) AND
           group_dimension.group_mode = COALESCE(visits_hourly_file_fact_stage.group_dimension_group_mode, missing_group_dimension_group_mode()) AND
           ((TO_TIMESTAMP(visits_hourly_file_fact_stage.time_key) BETWEEN group_dimension.start_at AND COALESCE(group_dimension.end_at, 'INFINITY')) OR (TO_TIMESTAMP(visits_hourly_file_fact_stage.time_key) < group_dimension.start_at AND group_dimension.version = 1))
         JOIN
           tenant_dimension
         ON
+          tenant_dimension.cluster_type_id = default_cluster_type_id() AND
           tenant_dimension.tenant_id = COALESCE(visits_hourly_file_fact_stage.tenant_dimension_tenant_id, user_dimension.tenant_id, from_group_dimension.tenant_id, group_dimension.tenant_id) AND
           ((TO_TIMESTAMP(visits_hourly_file_fact_stage.time_key) BETWEEN tenant_dimension.start_at AND COALESCE(tenant_dimension.end_at, 'INFINITY')) OR (TO_TIMESTAMP(visits_hourly_file_fact_stage.time_key) < tenant_dimension.start_at AND tenant_dimension.version = 1))
         JOIN
           user_agent_type
         ON
+          user_agent_type.cluster_type_id = default_cluster_type_id() AND
           user_agent_type.name = visits_hourly_file_fact_stage.user_agent_type_name AND
           user_agent_type.version = COALESCE(visits_hourly_file_fact_stage.user_agent_type_version, 'Unknown') AND
           user_agent_type.mobile = COALESCE(visits_hourly_file_fact_stage.user_agent_type_mobile, FALSE)
@@ -232,7 +237,7 @@ describe Masamune::Transform::StageFact do
         CREATE INDEX visits_hourly_fact_y2014m08_d8b1c3e_index ON visits_hourly_fact_y2014m08 (user_agent_type_id);
         CREATE INDEX visits_hourly_fact_y2014m08_39f0fdd_index ON visits_hourly_fact_y2014m08 (user_dimension_id);
 
-        ANALYZE visits_hourly_fact_y2014m08;
+        VACUUM FULL ANALYZE visits_hourly_fact_y2014m08;
 
         COMMIT;
 

metadata

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