masamune 0.13.3 → 0.13.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 656e76fbaa3b0179ab154a5ae5ae6513dea44639
-  data.tar.gz: d226613e31431e2a5ea7daebcf516e9c88d9a8f1
+  metadata.gz: 0b1cfbf2086afb91e515f3350cdefd9edc38b5c5
+  data.tar.gz: 7fd27c38a43dbfaa2b4a75db79207c9da2d412ca
 SHA512:
-  metadata.gz: ae8eac8dffdb378f44b2ce9494c59d283da2af2a160ecad01ef3d34f5108192009dbd6ca619332b443b433e6f1cda915572f39d698c31dab1a4a10cf35efbd86
-  data.tar.gz: f2574ff50498bfc54eb870b3773c7453241f54337d04c24c174844ac77a09b05c904b44d44fdb3fd6bcd90f88896174b87e09767ad34bb8d838401c89c940886
+  metadata.gz: 665f24b4261a0e9f05367d031de278cf3561e9993b004339feafb0022da22d43ed54be8682b9706e9ffb420ec0ec72bc9167bb54cf3b2e3f68065b05db91dcdb
+  data.tar.gz: 7ab3d42d09761b855abd75210d96c841709bba94bbe591c90844d3199328ffaa84f405708a9b7df198bd14a08c501e21f9fd0dff347f97f84478a63f7c47dc61

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

@@ -39,12 +39,6 @@ SELECT
   <%- end -%>
 FROM
   <%= source.name %>
-<%- target.join_conditions(source).each do |table, conditions| -%>
-JOIN
-  <%= table %>
-ON
-  <%= conditions.join(" AND\n  ") %>
-<%- end -%>
 GROUP BY
   <%- target.group_by(source).each do |value, last| -%>
   <%= value %><%= ',' unless last %>

data/lib/masamune/transform/rollup_fact.rb

@@ -52,7 +52,7 @@ module Masamune::Transform
 
       def insert_values(source)
         values = []
-        values << "(#{first_date_surrogate_key})"
+        values << calculated_date_key(source)
         shared_columns(source).values.map do |columns|
           column = columns.first
           next unless column.reference
@@ -63,7 +63,7 @@ module Masamune::Transform
         source.measures.each do |_ ,measure|
           values << measure.aggregate_value
         end
-        values << "(#{floor_time_key(source)})"
+        values << calculated_time_key(source)
         values
       end
       method_with_last_element :insert_values
@@ -78,7 +78,7 @@ module Masamune::Transform
 
       def group_by(source)
         group_by = []
-        group_by << date_column.reference.columns[rollup_key].qualified_name
+        group_by << calculated_date_key(source)
         shared_columns(source).values.map do |columns|
           column = columns.first
           next unless column.reference
@@ -86,64 +86,33 @@ module Masamune::Transform
           next if column.auto_reference
           group_by << column.qualified_name
         end
-        group_by << "(#{floor_time_key(source)})" if grain == :hourly
+        group_by << calculated_time_key(source)
         group_by
       end
       method_with_last_element :group_by
 
       private
 
-      def rollup_key
+      def calculated_date_key(source)
         case grain
-        when :hourly
-          :date_epoch
-        when :daily
-          :date_epoch
+        when :hourly, :daily
+          "#{source.date_column.qualified_name}"
         when :monthly
-          :month_epoch
+          "to_char(date_trunc('month',#{source.date_column.qualified_name}::text::date),'YYYYMMDD')::integer"
         end
       end
 
-      def date_key
-        :date_id
-      end
-
-      def first_date_surrogate_key
-        <<-EOS.gsub(/\s+/, ' ').strip
-          SELECT
-            #{date_column.reference.surrogate_key.name}
-          FROM
-            #{date_column.reference.name} d
-          WHERE
-            d.#{rollup_key} = #{date_column.reference.columns[rollup_key].qualified_name}
-          ORDER BY
-            d.#{date_key}
-          LIMIT 1
-        EOS
-      end
-
-      def floor_time_key(source)
+      def calculated_time_key(source)
         case grain
         when :hourly
-          "#{source.time_key.qualified_name} - (#{source.time_key.qualified_name} % #{1.hour.seconds})"
-        when :daily, :monthly
-          first_date_time_key
+          "(#{source.time_key.qualified_name} - (#{source.time_key.qualified_name} % #{1.hour.seconds}))"
+        when :daily
+          "extract(EPOCH from #{source.date_column.qualified_name}::text::date)"
+        when :monthly
+          "extract(EPOCH from date_trunc('month',#{source.date_column.qualified_name}::text::date))"
         end
       end
 
-      def first_date_time_key
-        <<-EOS.gsub(/\s+/, ' ').strip
-          SELECT
-            #{rollup_key}
-          FROM
-            #{date_column.reference.name} d
-          WHERE
-            d.#{rollup_key} = #{date_column.reference.columns[rollup_key].qualified_name}
-          ORDER BY
-            d.#{date_key}
-          LIMIT 1
-        EOS
-      end
     end
   end
 end

data/lib/masamune/version.rb

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

data/spec/masamune/transform/rollup_fact_spec.rb

@@ -104,7 +104,7 @@ describe Masamune::Transform::RollupFact do
         INSERT INTO
           visits_hourly_fact_y2014m08_stage (date_dimension_id, tenant_dimension_id, user_dimension_id, user_agent_type_id, feature_type_id, total, time_key)
         SELECT
-          (SELECT id FROM date_dimension d WHERE d.date_epoch = date_dimension.date_epoch ORDER BY d.date_id LIMIT 1),
+          visits_transaction_fact_y2014m08.date_dimension_id,
           visits_transaction_fact_y2014m08.tenant_dimension_id,
           visits_transaction_fact_y2014m08.user_dimension_id,
           visits_transaction_fact_y2014m08.user_agent_type_id,
@@ -113,12 +113,8 @@ describe Masamune::Transform::RollupFact do
           (visits_transaction_fact_y2014m08.time_key - (visits_transaction_fact_y2014m08.time_key % 3600))
         FROM
           visits_transaction_fact_y2014m08
-        JOIN
-          date_dimension
-        ON
-          date_dimension.id = visits_transaction_fact_y2014m08.date_dimension_id
         GROUP BY
-          date_dimension.date_epoch,
+          visits_transaction_fact_y2014m08.date_dimension_id,
           visits_transaction_fact_y2014m08.tenant_dimension_id,
           visits_transaction_fact_y2014m08.user_dimension_id,
           visits_transaction_fact_y2014m08.user_agent_type_id,
@@ -207,25 +203,22 @@ describe Masamune::Transform::RollupFact do
         INSERT INTO
           visits_daily_fact_y2014m08_stage (date_dimension_id, tenant_dimension_id, user_dimension_id, user_agent_type_id, feature_type_id, total, time_key)
         SELECT
-          (SELECT id FROM date_dimension d WHERE d.date_epoch = date_dimension.date_epoch ORDER BY d.date_id LIMIT 1),
+          visits_hourly_fact_y2014m08.date_dimension_id,
           visits_hourly_fact_y2014m08.tenant_dimension_id,
           visits_hourly_fact_y2014m08.user_dimension_id,
           visits_hourly_fact_y2014m08.user_agent_type_id,
           visits_hourly_fact_y2014m08.feature_type_id,
           SUM(visits_hourly_fact_y2014m08.total),
-          (SELECT date_epoch FROM date_dimension d WHERE d.date_epoch = date_dimension.date_epoch ORDER BY d.date_id LIMIT 1)
+          extract(EPOCH from visits_hourly_fact_y2014m08.date_dimension_id::text::date)
         FROM
           visits_hourly_fact_y2014m08
-        JOIN
-          date_dimension
-        ON
-          date_dimension.id = visits_hourly_fact_y2014m08.date_dimension_id
         GROUP BY
-          date_dimension.date_epoch,
+          visits_hourly_fact_y2014m08.date_dimension_id,
           visits_hourly_fact_y2014m08.tenant_dimension_id,
           visits_hourly_fact_y2014m08.user_dimension_id,
           visits_hourly_fact_y2014m08.user_agent_type_id,
-          visits_hourly_fact_y2014m08.feature_type_id
+          visits_hourly_fact_y2014m08.feature_type_id,
+          extract(EPOCH from visits_hourly_fact_y2014m08.date_dimension_id::text::date)
         ;
 
         COMMIT;
@@ -309,25 +302,22 @@ describe Masamune::Transform::RollupFact do
         INSERT INTO
           visits_monthly_fact_y2014m08_stage (date_dimension_id, tenant_dimension_id, user_dimension_id, user_agent_type_id, feature_type_id, total, time_key)
         SELECT
-          (SELECT id FROM date_dimension d WHERE d.month_epoch = date_dimension.month_epoch ORDER BY d.date_id LIMIT 1),
+          to_char(date_trunc('month',visits_daily_fact_y2014m08.date_dimension_id::text::date),'YYYYMMDD')::integer,
           visits_daily_fact_y2014m08.tenant_dimension_id,
           visits_daily_fact_y2014m08.user_dimension_id,
           visits_daily_fact_y2014m08.user_agent_type_id,
           visits_daily_fact_y2014m08.feature_type_id,
           SUM(visits_daily_fact_y2014m08.total),
-          (SELECT month_epoch FROM date_dimension d WHERE d.month_epoch = date_dimension.month_epoch ORDER BY d.date_id LIMIT 1)
+          extract(EPOCH from date_trunc('month',visits_daily_fact_y2014m08.date_dimension_id::text::date))
         FROM
           visits_daily_fact_y2014m08
-        JOIN
-          date_dimension
-        ON
-          date_dimension.id = visits_daily_fact_y2014m08.date_dimension_id
         GROUP BY
-          date_dimension.month_epoch,
+          to_char(date_trunc('month',visits_daily_fact_y2014m08.date_dimension_id::text::date),'YYYYMMDD')::integer,
           visits_daily_fact_y2014m08.tenant_dimension_id,
           visits_daily_fact_y2014m08.user_dimension_id,
           visits_daily_fact_y2014m08.user_agent_type_id,
-          visits_daily_fact_y2014m08.feature_type_id
+          visits_daily_fact_y2014m08.feature_type_id,
+          extract(EPOCH from date_trunc('month',visits_daily_fact_y2014m08.date_dimension_id::text::date))
         ;
 
         COMMIT;

metadata

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