pgslice 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 63369b304364c5cbc5b6b96e9303d3f46293d0b3
-  data.tar.gz: 15e76add4582111650e46daad02bbe755b3e45e1
+  metadata.gz: 02a6779afe17f04bc97713d360ac5bbdcdbd68e0
+  data.tar.gz: e3aac8b61fed50af76c9bc7b4835b6f218a474d1
 SHA512:
-  metadata.gz: 64d23629b73f8adf89ce6adc03c2cc951b9b67e7edc8e03eb596546e43b40f1415ea494ccdcab4efb460686ff967941ddf4ba66491525d3b4612490b017b4a0f
-  data.tar.gz: 864e600e79f944667c11a151a23341366085b39d1cf81b10f1ef03408c9d6101690ad3697d36369f0151353baa90d7f7d0429b0507c6d738c33396ffb3cefa47
+  metadata.gz: dde7c9b7330f0edf78297d4a3a61e1d8d253c893f14fbe808083e3d55253fa4e4ffc3351f12ee34053c5fe4c999066b2eb7cdd8f801f594013ea7a477f1985db
+  data.tar.gz: 6a578d1b2663fe77eedb21dfbf121284ed4a6ed026f4cfc4c4c60b911d6513168b4072bf30ab3fb3cb519227903e57c9bb11aa34400e1e9abb870e527d8a62d7

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.1.5
+
+- Removed `activesupport` dependency for speed
+- Fixed `fill` for months
+
 ## 0.1.4
 
 - Added sequence ownership

data/README.md

@@ -205,6 +205,7 @@ gem specific_install ankane/pgslice
 
 - Command to sync index changes with partitions
 - Disable indexing for faster `fill`
+- ETA for `fill`
 
 ## Contributing
 

data/lib/pgslice.rb

@@ -1,7 +1,6 @@
 require "pgslice/version"
 require "slop"
 require "pg"
-require "active_support/all"
 
 module PgSlice
   class Error < StandardError; end
@@ -117,21 +116,22 @@ CREATE TRIGGER #{trigger_name}
       # ensure table has trigger
       abort "No trigger on table: #{table}\nDid you mean to use --intermediate?" unless has_trigger?(trigger_name, table)
 
-      period, field, name_format, inc, today = settings_from_table(original_table, table)
+      index_defs = execute("select pg_get_indexdef(indexrelid) from pg_index where indrelid = $1::regclass AND indisprimary = 'f'", [original_table]).map { |r| r["pg_get_indexdef"] }
+      primary_key = self.primary_key(table)
 
-      days = range.map { |n| today + (n * inc) }
       queries = []
 
-      index_defs = execute("select pg_get_indexdef(indexrelid) from pg_index where indrelid = $1::regclass AND indisprimary = 'f'", [original_table]).map { |r| r["pg_get_indexdef"] }
-      primary_key = self.primary_key(table)
+      period, field = settings_from_table(original_table, table)
+      today = round_date(Date.today, period)
+      range.each do |n|
+        day = advance_date(today, period, n)
 
-      days.each do |day|
-        partition_name = "#{original_table}_#{day.strftime(name_format)}"
+        partition_name = "#{original_table}_#{day.strftime(name_format(period))}"
         next if table_exists?(partition_name)
 
         queries << <<-SQL
 CREATE TABLE #{partition_name}
-    (CHECK (#{field} >= #{sql_date(day)} AND #{field} < #{sql_date(day + inc)}))
+    (CHECK (#{field} >= #{sql_date(day)} AND #{field} < #{sql_date(advance_date(day, period, 1))}))
     INHERITS (#{table});
         SQL
 
@@ -161,11 +161,12 @@ CREATE TABLE #{partition_name}
       abort "Table not found: #{source_table}" unless table_exists?(source_table)
       abort "Table not found: #{dest_table}" unless table_exists?(dest_table)
 
-      period, field, name_format, inc, today = settings_from_table(table, dest_table)
+      period, field = settings_from_table(table, dest_table)
+      name_format = self.name_format(period)
 
       existing_tables = self.existing_tables(like: "#{table}_%").select { |t| /#{Regexp.escape("#{table}_")}(\d{4,6})/.match(t) }.sort
-      starting_time = DateTime.strptime(existing_tables.first.last(8), name_format)
-      ending_time = DateTime.strptime(existing_tables.last.last(8), name_format) + inc
+      starting_time = DateTime.strptime(existing_tables.first.split("_").last, name_format)
+      ending_time = advance_date(DateTime.strptime(existing_tables.last.split("_").last, name_format), period, 1)
 
       primary_key = self.primary_key(table)
       max_source_id = max_id(source_table, primary_key)
@@ -412,6 +413,35 @@ INSERT INTO #{dest_table} (#{fields})
       "'#{time.strftime("%Y-%m-%d")}'::date"
     end
 
+    def name_format(period)
+      case period.to_sym
+      when :day
+        "%Y%m%d"
+      else
+        "%Y%m"
+      end
+    end
+
+    def round_date(date, period)
+      date = date.to_date
+      case period.to_sym
+      when :day
+        date
+      else
+        Date.new(date.year, date.month)
+      end
+    end
+
+    def advance_date(date, period, count = 1)
+      date = date.to_date
+      case period.to_sym
+      when :day
+        date.next_day(count)
+      else
+        date.next_month(count)
+      end
+    end
+
     def settings_from_table(original_table, table)
       trigger_name = self.trigger_name(original_table)
       function_def = execute("select pg_get_functiondef(oid) from pg_proc where proname = $1", [trigger_name])[0]["pg_get_functiondef"]
@@ -419,20 +449,7 @@ INSERT INTO #{dest_table} (#{fields})
       abort "Could not read settings" unless sql_format
       period = sql_format[0]
       field = /to_char\(NEW\.(\w+),/.match(function_def)[1]
-
-      today = Time.now
-      case period
-      when :day
-        name_format = "%Y%m%d"
-        inc = 1.day
-        today = today.beginning_of_day
-      else
-        name_format = "%Y%m"
-        inc = 1.month
-        today = today.beginning_of_month
-      end
-
-      [period, field, name_format, inc, today]
+      [period, field]
     end
   end
 end

data/lib/pgslice/version.rb

@@ -1,3 +1,3 @@
 module PgSlice
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

data/pgslice.gemspec

@@ -19,7 +19,6 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "slop", ">= 4.2.0"
   spec.add_dependency "pg"
-  spec.add_dependency "activesupport"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pgslice
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-25 00:00:00.000000000 Z
+date: 2016-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slop
@@ -38,20 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement