stampeded 0.3.2-x86_64-linux-gnu → 0.4.0-x86_64-linux-gnu

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 16f83d97375e018e18b228d93955b19b68fca9909e74fadf34da386433b15726
-  data.tar.gz: e49704df83f97c6462f71dc6e53c44dcd855cbf7d7d1f22776cf936cc865a027
+  metadata.gz: cad7f788cd761495c62f13f696e9a8b6a278fe20cddaf2973deed5fc58e1fb1f
+  data.tar.gz: 28788406522070a1ed14f54d8b855e26c7c3c0501c4b69bf6c4466d66f575807
 SHA512:
-  metadata.gz: ccb8dbff76079e2baad792e8c1e58d954aa95da83c5992b5f52541128d2b08c0f974ba744a03ad9d9b4fd662702b4a46733ae0ef9ecd3419d33c76065b700f36
-  data.tar.gz: e7b3edcff3113d69a5f877c53f94c5f024f6d0106761eab4780a8a508596fa46124d73b96c51fe5695eea692fe0b5d55bf57b2238a116d4e90db40f0325e1dae
+  metadata.gz: 47083a221b84efec03e9693cd4cc543307c9c59f35aad9772a8d43b8de48c99fb31b0a770e5ee178ba693c2505b1afba9f0a30a08018528fb51a2d0f46ee9d1e
+  data.tar.gz: bb24cac65641ca47c82780535a3325bfab125306a7d14a9ed0536d0bcabbbe77c93c76aa97335fea0820a67a8be71ffc35bd971776d57034fcdd7035432e4ede

data/lib/stampeded/schema.rb

@@ -39,7 +39,8 @@ module Stampeded
         c.exec(<<~SQL)
           DROP TABLE IF EXISTS stampeded_cron_occurrences, stampeded_schedules,
                                stampeded_queue_policies, stampeded_queue_counts,
-                               stampeded_jobs, stampeded_workers CASCADE;
+                               stampeded_jobs, stampeded_workers,
+                               stampeded_schema CASCADE;
           DO $$
           DECLARE r record;
           BEGIN

data/lib/stampeded/tasks/stampeded.rake

@@ -22,10 +22,11 @@ namespace :stampeded do
     worker.run
   end
 
-  desc "Run the daemon (scheduler, reaper, pruner, dashboard). Not the worker."
+  desc "Run the daemon (scheduler, reaper, pruner, dashboard). Not the worker. Upgrades the schema first."
   task daemon: :environment do
     require "stampeded/daemon"
-    args = ["--no-worker", *ENV["STAMPEDED_ARGS"].to_s.split]
+    # --migrate is safe on every start: it upgrades an older schema in place.
+    args = ["--no-worker", "--migrate", *ENV["STAMPEDED_ARGS"].to_s.split]
     Stampeded::Daemon.exec!(*args, env: { "STAMPEDED_DATABASE_URL" => Stampeded.database_url_for_daemon })
   end
 end

data/lib/stampeded/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Stampeded
-  VERSION = "0.3.2" # x-release-please-version
+  VERSION = "0.4.0" # x-release-please-version
 end

data/schema/schema.sql

@@ -65,15 +65,20 @@ CREATE TABLE stampeded_jobs (
     dedup_period    text        CHECK (dedup_period IN
                                   ('minute','hour','day','week','month')),
 
+    -- Scope, period and bucket: buckets of two periods start together (an
+    -- hour and its day at midnight UTC), so the period keeps them apart.
+    -- Joined as bytea with a raw zero byte: no `text` value can ever decode
+    -- to one (chr(0) itself is refused), so a crafted dedup_scope can never
+    -- forge the separator and so never forge another row's key.
     dedup_key       bytea       GENERATED ALWAYS AS (
-        sha256((
-            dedup_scope || coalesce(
-                ':' || extract(
+        sha256(
+            dedup_scope::bytea || '\x00'::bytea || coalesce(
+                dedup_period::bytea || '\x00'::bytea || extract(
                     epoch FROM (date_trunc(dedup_period, inserted_at, 'UTC') - to_timestamp(0))
-                )::bigint::text,
-                ''
+                )::bigint::text::bytea,
+                ''::bytea
             )
-        )::bytea)
+        )
     ) STORED,
 
     failure_kind    text,
@@ -1047,3 +1052,13 @@ CREATE TABLE stampeded_queue_policies (
     created_at     timestamptz NOT NULL DEFAULT now(),
     updated_at     timestamptz NOT NULL DEFAULT now()
 );
+
+-- Which schema this database holds, one row: `stampeded::schema::migrate`
+-- upgrades from it and refuses one newer than itself. Raised by each upgrade.
+CREATE TABLE stampeded_schema (
+    version     integer     NOT NULL CHECK (version > 0),
+    changed_at  timestamptz NOT NULL DEFAULT now()
+);
+CREATE UNIQUE INDEX stampeded_schema_one_row ON stampeded_schema ((true));
+-- Must match schema::VERSION.
+INSERT INTO stampeded_schema (version) VALUES (3);

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stampeded
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: x86_64-linux-gnu
 authors:
 - Abdelkader Boudih