tartarus-rb 0.6.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d964cd9b85733405512f08d58cea33e9f12f5b6d3fa05d8fb2d1c979463ffead
-  data.tar.gz: 955301decdf77128432413afb6dd40612bb5c279e2cb65129f740cf1c81c1373
+  metadata.gz: 1fbf0d84c0c5a7221c340303d65c7649d883dae985003803b571b2a41b28081b
+  data.tar.gz: 0a63951eac2535c59a63968ee260ec2980b0c904cbde4bba0d83beb1c04d46a5
 SHA512:
-  metadata.gz: d455a12a6503b078c1b49e3902d840a017bfa50f99c6eee2ff17367d3398eb62b376503f84b260a90663e9c3f465ac59ba4509a1b3f9767835548853a24f3469
-  data.tar.gz: 2b4502ce62eb6bd831413d237e9b69535fbbe113c09e25e35f0ee680c902599bd0c52a210c0eb365ccde044c6a200da32c4b12798a6137e996a228f1192d8b10
+  metadata.gz: 2f7ffe596efe58ddc1c83f2d680516b54795a0ebd240ef2231dbed873bcf71ff36c52b0c06636de1de703f6a26320122ff1747bbdb98bbf2602e4547e083656e
+  data.tar.gz: 037ec5b6c6220b18e67641eead3d177df8413b1f711148a9098957e5718b4ee18754812550062d9c5f8cfdcfa8d0f16ce8a63cb0996fd2882567bb5b67bd3356

data/Changelog.md

@@ -2,6 +2,14 @@
 
 ## Master
 
+## 0.8.0
+
+- Remove explicit ordering from both `Tartarus::ArchivableCollectionRepository#items_older_than` and `Tartarus::ArchivableCollectionRepository#items_older_than_for_tenant`
+
+## 0.7.0
+
+- Remove explicit ordering from `Tartarus::ArchivableCollectionRepository#items_older_than`, it increased the cost of queries significantly on large tables
+
 ## 0.6.0
 
 - Optimize query from `Tartarus::ArchivableCollectionRepository#items_older_than` by adding explicit ordering

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    tartarus-rb (0.6.0)
+    tartarus-rb (0.8.0)
       sidekiq (>= 5)
       sidekiq-cron (~> 1)
 
@@ -32,7 +32,7 @@ GEM
       minitest (>= 5.1)
       tzinfo (~> 2.0)
       zeitwerk (~> 2.3)
-    addressable (2.7.0)
+    addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
     aws-eventstream (1.1.0)
     aws-partitions (1.424.0)
@@ -55,39 +55,41 @@ GEM
     diff-lcs (1.4.4)
     dotenv (2.7.6)
     erubi (1.10.0)
-    et-orbi (1.2.4)
+    et-orbi (1.2.7)
       tzinfo
-    fugit (1.4.5)
-      et-orbi (~> 1.1, >= 1.1.8)
+    fugit (1.8.1)
+      et-orbi (~> 1, >= 1.2.7)
       raabro (~> 1.4)
+    globalid (1.1.0)
+      activesupport (>= 5.0)
     hashdiff (1.0.0)
     i18n (1.8.5)
       concurrent-ruby (~> 1.0)
-    jmespath (1.4.0)
-    loofah (2.9.0)
+    jmespath (1.6.1)
+    loofah (2.18.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     method_source (1.0.0)
-    mini_portile2 (2.5.0)
-    minitest (5.14.2)
-    nokogiri (1.11.1)
-      mini_portile2 (~> 2.5.0)
+    mini_portile2 (2.8.4)
+    minitest (5.20.0)
+    nokogiri (1.15.4)
+      mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    pg (1.2.3)
+    pg (1.5.4)
     postgres-copy (1.5.0)
       activerecord (>= 5.1)
       pg (>= 0.17)
       responders
-    public_suffix (4.0.4)
+    public_suffix (4.0.7)
     raabro (1.4.0)
-    racc (1.5.2)
-    rack (2.2.3)
+    racc (1.7.1)
+    rack (2.2.3.1)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.3.0)
+    rails-html-sanitizer (1.4.3)
       loofah (~> 2.3)
     railties (6.1.0.rc1)
       actionpack (= 6.1.0.rc1)
@@ -121,9 +123,10 @@ GEM
       connection_pool (>= 2.2.2)
       rack (~> 2.0)
       redis (>= 4.2.0)
-    sidekiq-cron (1.2.0)
-      fugit (~> 1.1)
-      sidekiq (>= 4.2.1)
+    sidekiq-cron (1.10.1)
+      fugit (~> 1.8)
+      globalid (>= 1.0.1)
+      sidekiq (>= 6)
     thor (1.1.0)
     timecop (0.9.2)
     tzinfo (2.0.2)

data/README.md

@@ -27,59 +27,62 @@ Here are some examples how to use it
 Put it in the initializer, e.g. in `config/initializers/sidekiq.rb` right after loading schedule for `sidekiq-cron`:
 
 ``` rb
-schedule_file = "config/schedule.yml"
-
-if File.exist?(schedule_file) && Sidekiq.server?
-  Sidekiq::Cron::Job.load_from_hash YAML.load_file(schedule_file)
-
-  tartarus = Tartarus.new
-
-  tartarus.register do |item|
-    item.model = ModelThatYouWantToArchive
-    item.cron = "5 4 * * *"
-    item.queue = "default"
-    item.tenants_range = -> { Account.active }
-    item.tenant_value_source = :uuid
-    item.tenant_id_field = :account_uuid
-    item.archive_items_older_than = -> { 30.days.ago }
-    item.timestamp_field = :created_at
-    item.archive_with = :destroy_all
-  end
-
-  tartarus.register do |item|
-    item.model = OtherModelThatYouWantToArchive
-    item.cron = "5 5 * * *"
-    item.queue = "default"
-    item.tenants_range = -> { ["Account", "User"] }
-    item.tenant_id_field = :model_type
-    item.archive_items_older_than = -> { 30.days.ago }
-    item.timestamp_field = :created_at
-  end
-
-  glacier_configuration = Tartarus::RemoteStorage::Glacier::Configuration.build(
-    aws_key: ENV.fetch("AWS_KEY"),
-    aws_secret: ENV.fetch("AWS_SECRET"),
-    aws_region: ENV.fetch("AWS_REGION"),
-    vault_name: ENV.fetch("GLACIER_VAULT_NAME"),
-    root_path: Rails.root.to_s,
-    archive_registry_factory: ArchiveRegistry,
-  )
-  # don't forget about installing `aws-sdk-glacier` gem
-
-  tartarus.register do |item|
-    item.model = YetAnotherModel
-    item.cron = "5 6 * * *"
-    item.queue = "default"
-    item.timestamp_field = :created_at
-    item.archive_items_older_than = -> { 1.week.ago }
-    item.remote_storage = Tartarus::RemoteStorage::Glacier.new(glacier_configuration)
+Sidekiq.configure_server do |config|
+  config.on(:startup) do
+    schedule_file = "config/schedule.yml"
+
+    if File.exist?(schedule_file) && Sidekiq.server?
+      Sidekiq::Cron::Job.load_from_hash YAML.load_file(schedule_file)
+
+      tartarus = Tartarus.new
+
+      tartarus.register do |item|
+        item.model = ModelThatYouWantToArchive
+        item.cron = "5 4 * * *"
+        item.queue = "default"
+        item.tenants_range = -> { Account.active }
+        item.tenant_value_source = :uuid
+        item.tenant_id_field = :account_uuid
+        item.archive_items_older_than = -> { 30.days.ago }
+        item.timestamp_field = :created_at
+        item.archive_with = :destroy_all
+      end
+
+      tartarus.register do |item|
+        item.model = OtherModelThatYouWantToArchive
+        item.cron = "5 5 * * *"
+        item.queue = "default"
+        item.tenants_range = -> { ["Account", "User"] }
+        item.tenant_id_field = :model_type
+        item.archive_items_older_than = -> { 30.days.ago }
+        item.timestamp_field = :created_at
+      end
+
+      glacier_configuration = Tartarus::RemoteStorage::Glacier::Configuration.build(
+        aws_key: ENV.fetch("AWS_KEY"),
+        aws_secret: ENV.fetch("AWS_SECRET"),
+        aws_region: ENV.fetch("AWS_REGION"),
+        vault_name: ENV.fetch("GLACIER_VAULT_NAME"),
+        root_path: Rails.root.to_s,
+        archive_registry_factory: ArchiveRegistry,
+      )
+      # don't forget about installing `aws-sdk-glacier` gem
+
+      tartarus.register do |item|
+        item.model = YetAnotherModel
+        item.cron = "5 6 * * *"
+        item.queue = "default"
+        item.timestamp_field = :created_at
+        item.archive_items_older_than = -> { 1.week.ago }
+        item.remote_storage = Tartarus::RemoteStorage::Glacier.new(glacier_configuration)
+      end
+
+      tartarus.schedule #  this method must be called to create jobs for sidekiq-cron!
+    end
   end
-
-  tartarus.schedule #  this method must be called to create jobs for sidekiq-cron!
 end
 ```
 
-
 You can use the following config params:
 - `model` - a name of the ActiveReord model you want to archive, required
 - `name` - name of your strategy, optional. It fallbacks `model.to_s`. It's important to set in in cases when you have several strategies for the same model:

data/lib/tartarus/archivable_collection_repository.rb

@@ -13,14 +13,13 @@ class Tartarus
       ensure_column_exists(collection, model_name, tenant_id_field)
 
       collection.where("#{timestamp_field} < ?", timestamp).where(tenant_id_field => tenant_id)
-                .order(tenant_id_field, timestamp_field)
     end
 
     def items_older_than(model_name, timestamp_field, timestamp)
       collection = collection_for(model_name)
       ensure_column_exists(collection, model_name, timestamp_field)
 
-      collection.where("#{timestamp_field} < ?", timestamp).order(timestamp_field)
+      collection.where("#{timestamp_field} < ?", timestamp)
     end
 
     private

data/lib/tartarus/rb/version.rb

@@ -1,5 +1,5 @@
 class Tartarus
   module Rb
-    VERSION = "0.6.0"
+    VERSION = "0.8.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tartarus-rb
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Karol Galanciak
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-02-25 00:00:00.000000000 Z
+date: 2023-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -264,7 +264,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: A gem for archving (deleting) old records you no longer need. Send them straight