intermix-client 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87731151937f4cd67118f193d514e5f91dff0f1d4e2c10b6420fa65a35534393
-  data.tar.gz: 2057a99edf427f0266194a57f5b53cc2207173830eddbe5aff9914056bb43e4b
+  metadata.gz: 842129af572462687c6aa5949d2883a31735dac45888d742176eddbc21af7428
+  data.tar.gz: c29f00a632cf79db2a73577b2e88cfa326eff090370da85af0e95b71c137acee
 SHA512:
-  metadata.gz: db718e660550a3f38b5dee9ffd990a5255112f78e1bc5c03850e12738c8946b59177c5d2d03e1b751880e2d3a8ba1fd1148244355a1823f6c2b2cd98367325a0
-  data.tar.gz: f1fe04612f3adf8d9f6351f3dee6fce280a70586b4976936c8e282fa19cbdacb9b05b6cddc920bedbb5efb9b097659ccdc52e788d998135ce190af6a20702596
+  metadata.gz: b950e9dbd1551ad923eb6cdf6c21dcbd9b5e4b6b8728fde25e7daa46f302566ef9f17332cb76de7597f0665b1a8f952ddb92beece88f63c247ee7ac51dbbb809
+  data.tar.gz: 666f952f29cf6ffccb5806cad45bc8fb53ae1f673eaaf615bdd587d6295e06d9ee193ace3dc3747476d9b1d569e67825c03f6fbb0fd67d7c9e9fc099eb3ea5b5

data/.gitignore

@@ -5,3 +5,4 @@ Gemfile.lock
 /coverage
 .DS_Store
 .idea
+*.iml

data/Changelog.md

@@ -0,0 +1,8 @@
+## 0.0.3
+* [Intermix::Vacuum - fix thresholds to actually respect percent values](https://github.com/tophatter/intermix-api-ruby/pull/9)
+
+## 0.0.2
+* [Downgrade httparty from 0.17.0 to 0.14.0](https://github.com/tophatter/intermix-api-ruby/pull/6)
+
+## 0.0.1
+* [Basic client implementation for generating the vacuum script](https://github.com/tophatter/intermix-api-ruby/pull/4)

data/README.md

@@ -54,7 +54,7 @@ After checking out the repo, run `bundle install` to install dependencies. Then,
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/tophatter/intermix-client.
+Bug reports and pull requests are welcome on GitHub at https://github.com/tophatter/intermix-api-ruby.git.
 
 ## License
 

data/intermix-client.gemspec

@@ -1,9 +1,9 @@
 # To publish the next version:
 # gem build intermix-client.gemspec
-# gem push intermix-client-0.0.1.gem
+# gem push intermix-client-{VERSION}.gem
 Gem::Specification.new do |spec|
   spec.name          = 'intermix-client'
-  spec.version       = '0.0.2'
+  spec.version       = '0.0.3'
   spec.authors       = ['Joe Manley']
   spec.email         = ['joemanley201@gmail.com']
 

data/lib/intermix/vacuum.rb

@@ -1,8 +1,8 @@
 module Intermix
   class Vacuum
-    DEFAULT_STATS_OFF_THRESHOLD = 0.10
-    DEFAULT_UNSORTED_THRESHOLD  = 0.10
-    DEFAULT_VACUUM_THRESHOLD    = 0.95
+    DEFAULT_STATS_OFF_THRESHOLD_PCT = 10
+    DEFAULT_UNSORTED_THRESHOLD_PCT  = 10
+    DEFAULT_VACUUM_THRESHOLD_PCT    = 95
 
     REDSHIFT_USERNAME = ''
     REDSHIFT_HOST     = ''
@@ -12,13 +12,14 @@ module Intermix
 
     attr_reader :client,
                 :full, :delete_only, :sort, :analyze,
-                :stats_off_threshold, :unsorted_threshold,
+                :stats_off_threshold_pct, :unsorted_threshold_pct,
+                :vacuum_threshold_pct,
                 :admin_user, :host, :port
 
     def initialize(client:,
                    delete_only: false, full: false, sort: false,
-                   stats_off_threshold: DEFAULT_STATS_OFF_THRESHOLD, unsorted_threshold: DEFAULT_UNSORTED_THRESHOLD,
-                   vacuum_threshold: DEFAULT_VACUUM_THRESHOLD,
+                   stats_off_threshold_pct: DEFAULT_STATS_OFF_THRESHOLD_PCT, unsorted_threshold_pct: DEFAULT_UNSORTED_THRESHOLD_PCT,
+                   vacuum_threshold_pct: DEFAULT_VACUUM_THRESHOLD_PCT,
                    admin_user: REDSHIFT_USERNAME, host: REDSHIFT_HOST, port: REDSHIFT_PORT)
       raise ArgumentError, 'client cannot be nil.' unless client.present?
       raise ArgumentError, 'invalid vacuum mode.' if full && [delete_only, sort].any?
@@ -30,9 +31,9 @@ module Intermix
       @sort        = sort
       @analyze     = true if full || delete_only
 
-      @stats_off_threshold  = stats_off_threshold
-      @unsorted_threshold   = unsorted_threshold
-      @vacuum_threshold_pct = [vacuum_threshold * 100, 100].min
+      @stats_off_threshold_pct = stats_off_threshold_pct
+      @unsorted_threshold_pct  = unsorted_threshold_pct
+      @vacuum_threshold_pct    = [vacuum_threshold_pct, 100].min
 
       @admin_user = admin_user
       @host       = host
@@ -47,9 +48,9 @@ module Intermix
           false
         elsif table.size_pct_unsorted.nil?
           false
-        elsif table.stats_pct_off <= @stats_off_threshold
+        elsif table.stats_pct_off <= @stats_off_threshold_pct
           false
-        elsif table.size_pct_unsorted <= @unsorted_threshold
+        elsif table.size_pct_unsorted <= @unsorted_threshold_pct
           false
         else
           true
@@ -111,7 +112,7 @@ module Intermix
         table.sort_key == 'INTERLEAVED' ? 'REINDEX' : 'SORT ONLY'
       end
 
-      "VACUUM #{command} #{table.full_name} to #{@vacuum_threshold_pct.to_i} percent;\n"
+      "VACUUM #{command} #{table.full_name} to #{@vacuum_threshold_pct} percent;\n"
     end
 
     def analyze_command(table:)

data/spec/support/shared_contexts/stubbed_client.rb

@@ -14,8 +14,8 @@ RSpec.shared_context 'stubbed_client' do
       schema_name: 'public',
       table_id: 1,
       table_name: 'events',
-      stats_pct_off: 0.12,
-      size_pct_unsorted: 0.13,
+      stats_pct_off: 12,
+      size_pct_unsorted: 13,
       row_count: 123_456,
       sort_key: 'id'
     }

data/spec/table_spec.rb

@@ -21,8 +21,8 @@ RSpec.describe Intermix::Table do
         expect(subject.schema_name).to eq('public')
         expect(subject.table_id).to eq(1)
         expect(subject.table_name).to eq('events')
-        expect(subject.stats_pct_off).to eq(0.12)
-        expect(subject.size_pct_unsorted).to eq(0.13)
+        expect(subject.stats_pct_off).to eq(12)
+        expect(subject.size_pct_unsorted).to eq(13)
         expect(subject.row_count).to eq(123_456)
         expect(subject.sort_key).to eq('id')
       end

data/spec/vacuum_spec.rb

@@ -59,8 +59,9 @@ RSpec.describe Intermix::Vacuum do
           expect(subject.sort).to be_falsey
           expect(subject.analyze).to be_truthy
 
-          expect(subject.stats_off_threshold).to eq(0.10)
-          expect(subject.stats_off_threshold).to eq(0.10)
+          expect(subject.stats_off_threshold_pct).to eq(10)
+          expect(subject.unsorted_threshold_pct).to eq(10)
+          expect(subject.vacuum_threshold_pct).to eq(95)
 
           expect(subject.admin_user).to eq('')
           expect(subject.host).to eq('')
@@ -71,19 +72,19 @@ RSpec.describe Intermix::Vacuum do
   end
 
   describe '#generate_script', :stubbed_client do
-    let(:stats_off_threshold) { 0.21 }
-    let(:unsorted_threshold) { 0.22 }
+    let(:stats_off_threshold_pct) { 21 }
+    let(:unsorted_threshold_pct) { 22 }
     let(:threshold_met) do
       [
-        stubbed_table.merge(table_name: 'table1', stats_pct_off: 0.45, size_pct_unsorted: 0.41), # included
-        stubbed_table.merge(table_name: 'table2', stats_pct_off: 0.56, size_pct_unsorted: 0.78)  # included
+        stubbed_table.merge(table_name: 'table1', stats_pct_off: 45, size_pct_unsorted: 41), # included
+        stubbed_table.merge(table_name: 'table2', stats_pct_off: 56, size_pct_unsorted: 78)  # included
       ]
     end
     let(:threshold_unmet) do
       [
-        stubbed_table.merge(table_name: 'table3', stats_pct_off: 0.45, size_pct_unsorted: nil),  # excluded
-        stubbed_table.merge(table_name: 'table4', stats_pct_off: 0.45, size_pct_unsorted: 0.20), # excluded
-        stubbed_table.merge(table_name: 'table5', stats_pct_off: 0.20, size_pct_unsorted: 0.41)  # excluded
+        stubbed_table.merge(table_name: 'table3', stats_pct_off: 45, size_pct_unsorted: nil), # excluded
+        stubbed_table.merge(table_name: 'table4', stats_pct_off: 45, size_pct_unsorted: 20),  # excluded
+        stubbed_table.merge(table_name: 'table5', stats_pct_off: 20, size_pct_unsorted: 41)   # excluded
       ]
     end
     let(:excluded_schema) do
@@ -99,8 +100,8 @@ RSpec.describe Intermix::Vacuum do
     subject do
       vacuum = Intermix::Vacuum.new(client: stubbed_client,
                                     delete_only: delete_only, full: full, sort: sort,
-                                    stats_off_threshold: stats_off_threshold, unsorted_threshold: unsorted_threshold,
-                                    vacuum_threshold: 0.99)
+                                    stats_off_threshold_pct: stats_off_threshold_pct, unsorted_threshold_pct: unsorted_threshold_pct,
+                                    vacuum_threshold_pct: 99)
       vacuum.generate_script
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: intermix-client
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Joe Manley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-08 00:00:00.000000000 Z
+date: 2019-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -50,6 +50,7 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - ".travis.yml"
+- Changelog.md
 - Gemfile
 - LICENSE.txt
 - README.md