sliding_partition 0.3.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 60a930fe3a691eb3e9ddd4dd74d6719a264232d5
-  data.tar.gz: 576af132477c22d38afc7948df0d170a0c95a36a
+  metadata.gz: 2bf2b1b4f2a76d444d0238530ae8eb2be574c566
+  data.tar.gz: 97ae79b822ca5e4212d53e18e90976d78029e1aa
 SHA512:
-  metadata.gz: 7f98cde8a0c07ba0e749e6449f11cd460a752e9ff0ea77f5fdfe39f8446ad601eadabf3408388111b0cc3db153a968cad9224071cac5e2766df6575c9dfb3f53
-  data.tar.gz: 03e0310746fcdcd74807f6fbaad099d9f8f66c50dfafde2d92f1f5fa84a499cb218b749556bea666f395b4fff65e91c7233e59ffdda17bd521c2af8777c49ddb
+  metadata.gz: 6c076eee13cd511d8f74788e7462cf05ef7835ad92d943d0252d7ddb4b2d09f1cf8d3e63e118f958fa76461ed4e883873a2e56416d8e64b18fe52186e1bcf224
+  data.tar.gz: 250ce476eed36ef530ef28ed3af7d0084ef3c2c95acfce42d7a87647caf8b623fb98ee2c7a238d668abf78fd936ea4687a1846340388b06372167559d77eb0c1

data/lib/sliding_partition.rb

@@ -23,6 +23,10 @@ module SlidingPartition
     parititions.values.each { |p| p.migrate! }
   end
 
+  def self.final_copy!
+    parititions.values.each { |p| p.final_copy! }
+  end
+
   def self.parititions
     @@parititions ||= {}
   end

data/lib/sliding_partition/definition.rb

@@ -23,14 +23,18 @@ module SlidingPartition
       PartitionDDLChanger.new(self, at).rotate!
     end
 
-    def migrate!(at: Time.now)
-      PartitionDDLChanger.new(self, at).migrate!
+    def migrate!(at: Time.now, quiet: false)
+      PartitionDDLChanger.new(self, at, quiet: quiet).migrate!
     end
 
     def partitions(at: Time.now)
       TableCollection.new(definition: self, at_time: at)
     end
 
+    def final_copy!(at: Time.now, quiet: false)
+      PartitionDDLChanger.new(self, at, quiet: quiet).migrate!
+    end
+
     def inherited_table_name
       @inherited_table_name ||= model.table_name
     end

data/lib/sliding_partition/identity.rb

@@ -12,7 +12,7 @@ module SlidingPartition
     end
 
     def self.version
-      "0.3.0"
+      "0.5.0"
     end
 
     def self.version_label

data/lib/sliding_partition/partition_ddl_changer.rb

@@ -1,23 +1,27 @@
+require "sliding_partition/util"
 
 module SlidingPartition
   class PartitionDDLChanger
     extend Forwardable
 
+    include SlidingPartition::Util
+
     attr_reader :definition, :time, :partitions
 
     delegate %i[ inherited_table_name time_column suffix
                  partition_interval retention_interval ] => :definition
 
-    def initialize(definition, time)
+    def initialize(definition, time, quiet: false)
       @definition, @time = definition, time
       @partitions = @definition.partitions(at: time)
+      @quiet = quiet
     end
 
     def setup!
       connection.transaction do
-        create_tables!
-        update_trigger_function!
-        create_trigger!
+        say_with_time("Creating tables") { create_tables! }
+        say_with_time("Updating trigger function") { update_trigger_function! }
+        say_with_time("Creating trigger") { create_trigger! }
       end
     end
 
@@ -31,14 +35,21 @@ module SlidingPartition
 
     def migrate!
       connection.transaction do
-        clone_new_table!
-        update_trigger_function!
-        swap_tables!
-        setup!
-        migrate_data!(from: retired_table, to: parent_table)
+        say_with_time("Cloning table") { clone_new_table! }
+        say_with_time("Creating #{partitions.tables.size} partition tables") { create_tables! }
+        say_with_time("Migrating data") { migrate_data!(from: parent_table, to: new_table) }
+        say_with_time("Swapping retired & new tables") { swap_tables! }
       end
     end
 
+    def final_copy!
+      connection.execute(<<-SQL)
+        INSERT INTO #{parent_table} (
+          SELECT * FROM #{retired_table} WHERE id NOT IN (SELECT id FROM #{parent_table})
+        )
+      SQL
+    end
+
     def create_tables!
       partitions.each do |partition|
         create_partition_table(partition) unless partition_table_exists?(partition)
@@ -64,19 +75,14 @@ module SlidingPartition
         ALTER TABLE #{parent_table} RENAME TO #{retired_table};
         ALTER TABLE #{new_table} RENAME TO #{parent_table};
       SQL
+      update_trigger_function!
       create_trigger!
     end
 
     def migrate_data!(from:, to:)
-      partitions.each do |partition|
-        connection.execute <<-SQL
-        INSERT INTO #{to} (
-          SELECT * FROM #{from}
-          WHERE #{time_column} >= TIMESTAMP '#{partition.timestamp_floor.to_s(:db)}'
-            AND #{time_column} <  TIMESTAMP '#{partition.timestamp_ceiling.to_s(:db)}'
-        );
-        SQL
-      end
+      connection.execute <<-SQL
+        INSERT INTO #{to} ( SELECT * FROM #{from} )
+      SQL
     end
 
     protected

data/lib/sliding_partition/table_collection.rb

@@ -16,10 +16,10 @@ module SlidingPartition
     end
 
     def tables
-      first_ts = time - retention_interval
-      last_ts = time + partition_interval
-      (first_ts.to_i...last_ts.to_i).step(partition_interval).map do |partition_time|
-        PartitionTable.new(for_time: Time.at(partition_time), definition: definition)
+      @tables ||= begin
+        (first_timestamp.to_i...last_timestamp.to_i).step(partition_interval).map do |partition_time|
+          PartitionTable.new(for_time: Time.at(partition_time), definition: definition)
+        end
       end
     end
 
@@ -27,9 +27,24 @@ module SlidingPartition
       tables.each(&block)
     end
 
+    def first_timestamp
+      @first_timestamp ||= if retention_interval == :forever
+                             earliest_record_timestamp
+                           else
+                             time - retention_interval
+                           end
+    end
+
+    def last_timestamp
+      time + partition_interval
+    end
+
     def first_partition_timestamp
       tables.first.timestamp_floor
     end
 
+    def earliest_record_timestamp
+      definition.model.order("#{time_column} ASC").limit(1).first[time_column]
+    end
   end
 end

data/lib/sliding_partition/util.rb

@@ -0,0 +1,18 @@
+
+module SlidingPartition
+  module Util
+
+    def say_with_time(message)
+      say(message)
+      result = nil
+      time = Benchmark.measure { yield }
+      say "%.4fs" % time.real, :subitem
+      result
+    end
+
+    def say(message, subitem=false)
+      puts "#{subitem ? "   ->" : "--"} #{message}" unless @quiet
+    end
+
+  end
+end

data/lib/tasks/sliding_partition_tasks.rake

@@ -12,4 +12,9 @@ namespace :partition do
   task :migrate => :environment do
     SlidingPartition.migrate!
   end
+
+  desc "Copy missing data"
+  task :final_copy => :environment do
+    SlidingPartition.final_copy!
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sliding_partition
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Paul Sadauskas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-23 00:00:00.000000000 Z
+date: 2017-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -259,6 +259,7 @@ files:
 - lib/sliding_partition/partition_table.rb
 - lib/sliding_partition/railtie.rb
 - lib/sliding_partition/table_collection.rb
+- lib/sliding_partition/util.rb
 - lib/tasks/sliding_partition_tasks.rake
 homepage: https://github.com/paul/sliding_partition
 licenses: