que 1.3.0 → 2.0.0.beta1

data/Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:2.7.5-slim-buster@sha256:4cbbe2fba099026b243200aa8663f56476950cc64ccd91d7aaccddca31e445b5 AS base
+FROM ruby:3.1.1-slim-buster@sha256:2ada3e4fe7b1703c9333ad4eb9fc12c1d4d60bce0f981281b2151057e928d9ad AS base
 
 # Install libpq-dev in our base layer, as it's needed in all environments
 RUN apt-get update \

data/README.md

@@ -1,6 +1,6 @@
 # Que ![tests](https://github.com/que-rb/que/workflows/tests/badge.svg)
 
-**This README and the rest of the docs on the master branch all refer to Que 1.0. If you're using version 0.x, please refer to the docs on [the 0.x branch](https://github.com/que-rb/que/tree/0.x).**
+**This README and the rest of the docs on the master branch all refer to Que 2.x. For older versions, please refer to the docs on the respective branches: [1.x](https://github.com/que-rb/que/tree/1.x), or [0.x](https://github.com/que-rb/que/tree/0.x).**
 
 *TL;DR: Que is a high-performance job queue that improves the reliability of your application by protecting your jobs with the same [ACID guarantees](https://en.wikipedia.org/wiki/ACID) as the rest of your data.*
 
@@ -23,9 +23,9 @@ Que's secondary goal is performance. The worker process is multithreaded, so tha
 
 Compatibility:
 
-- MRI Ruby 2.2+
+- MRI Ruby 2.7+
 - PostgreSQL 9.5+
-- Rails 4.1+ (optional)
+- Rails 6.0+ (optional)
 
 **Please note** - Que's job table undergoes a lot of churn when it is under high load, and like any heavily-written table, is susceptible to bloat and slowness if Postgres isn't able to clean it up. The most common cause of this is long-running transactions, so it's recommended to try to keep all transactions against the database housing Que's job table as short as possible. This is good advice to remember for any high-activity database, but bears emphasizing when using tables that undergo a lot of writes.
 
@@ -54,12 +54,12 @@ gem install que
 First, create the queue schema in a migration. For example:
 
 ```ruby
-class CreateQueSchema < ActiveRecord::Migration[5.0]
+class CreateQueSchema < ActiveRecord::Migration[6.0]
   def up
     # Whenever you use Que in a migration, always specify the version you're
     # migrating to. If you're unsure what the current version is, check the
     # changelog.
-    Que.migrate!(version: 5)
+    Que.migrate!(version: 6)
   end
 
   def down
@@ -117,10 +117,10 @@ end
 You can also add options to run the job after a specific time, or with a specific priority:
 
 ```ruby
-ChargeCreditCard.enqueue card.id, user_id: current_user.id, run_at: 1.day.from_now, priority: 5
+ChargeCreditCard.enqueue(card.id, user_id: current_user.id, job_options: { run_at: 1.day.from_now, priority: 5 })
 ```
 ## Running the Que Worker
-In order to process jobs, you must start a separate worker process outside of your main server. 
+In order to process jobs, you must start a separate worker process outside of your main server.
 
 ```bash
 bundle exec que
@@ -142,7 +142,7 @@ You may need to pass que a file path to require so that it can load your app. Qu
 
 If you're using ActiveRecord to dump your database's schema, please [set your schema_format to :sql](http://guides.rubyonrails.org/migrations.html#types-of-schema-dumps) so that Que's table structure is managed correctly. This is a good idea regardless, as the `:ruby` schema format doesn't support many of PostgreSQL's advanced features.
 
-Pre-1.0, the default queue name needed to be configured in order for Que to work out of the box with Rails. In 1.0 the default queue name is now 'default', as Rails expects, but when Rails enqueues some types of jobs it may try to use another queue name that isn't worked by default. You can either:
+Pre-1.0, the default queue name needed to be configured in order for Que to work out of the box with Rails. As of 1.0 the default queue name is now 'default', as Rails expects, but when Rails enqueues some types of jobs it may try to use another queue name that isn't worked by default. You can either:
 
 - [Configure Rails](https://guides.rubyonrails.org/configuring.html) to send all internal job types to the 'default' queue by adding the following to `config/application.rb`:
 

data/bin/command_line_interface.rb

@@ -138,10 +138,9 @@ module Que
             opts.on(
               '--minimum-buffer-size [SIZE]',
               Integer,
-              "Set minimum number of jobs to be locked and held in this " \
-                "process awaiting a worker (default: 2)",
+              "Unused (deprecated)",
             ) do |s|
-              options[:minimum_buffer_size] = s
+              warn "The --minimum-buffer-size SIZE option has been deprecated and will be removed in v2.0 (it's actually been unused since v1.0.0.beta4)"
             end
 
             opts.on(
@@ -221,7 +220,7 @@ OUTPUT
 
         locker =
           begin
-            Que::Locker.new(options)
+            Que::Locker.new(**options)
           rescue => e
             output.puts(e.message)
             return 1
@@ -236,7 +235,7 @@ OUTPUT
           <<~STARTUP
             Que #{Que::VERSION} started worker process with:
               Worker threads: #{locker.workers.length} (priorities: #{locker.workers.map { |w| w.priority || 'any' }.join(', ')})
-              Buffer size: #{locker.job_buffer.minimum_size}-#{locker.job_buffer.maximum_size}
+              Buffer size: #{locker.job_buffer.maximum_size}
               Queues:
             #{locker.queues.map { |queue, interval| "    - #{queue} (poll interval: #{interval}s)" }.join("\n")}
             Que waiting for jobs...

data/docker-compose.yml

@@ -10,13 +10,14 @@ services:
       - db
     volumes:
       - .:/work
-      - ruby-2.7.5-gem-cache:/usr/local/bundle
+      - ruby-3.1.1-gem-cache:/usr/local/bundle
       - ~/.docker-rc.d/:/.docker-rc.d/:ro
     working_dir: /work
     entrypoint: /work/scripts/docker-entrypoint
     command: bash
     environment:
       DATABASE_URL: postgres://que:que@db/que-test
+      USE_RAILS: ~
 
   db:
     image: "postgres:${POSTGRES_VERSION-13}"
@@ -43,4 +44,4 @@ services:
 
 volumes:
   db-data: ~
-  ruby-2.7.5-gem-cache: ~
+  ruby-3.1.1-gem-cache: ~

data/docs/README.md

@@ -4,7 +4,7 @@ Docs Index
 - [Command Line Interface](#command-line-interface)
   * [worker-priorities and worker-count](#worker-priorities-and-worker-count)
   * [poll-interval](#poll-interval)
-  * [minimum-buffer-size and maximum-buffer-size](#minimum-buffer-size-and-maximum-buffer-size)
+  * [maximum-buffer-size](#maximum-buffer-size)
   * [connection-url](#connection-url)
   * [wait-period](#wait-period)
   * [log-internals](#log-internals)
@@ -62,7 +62,6 @@ usage: que [options] [file/to/require] ...
         --connection-url [URL]       Set a custom database url to connect to for locking purposes.
         --log-internals              Log verbosely about Que's internal state. Only recommended for debugging issues
         --maximum-buffer-size [SIZE] Set maximum number of jobs to be locked and held in this process awaiting a worker (default: 8)
-        --minimum-buffer-size [SIZE] Set minimum number of jobs to be locked and held in this process awaiting a worker (default: 2)
         --wait-period [PERIOD]       Set maximum interval between checks of the in-memory job queue, in milliseconds (default: 50)
 ```
 
@@ -82,9 +81,9 @@ If you pass both worker-count and worker-priorities, the count will trim or pad
 
 This option sets the number of seconds the process will wait between polls of the job queue. Jobs that are ready to be worked immediately will be broadcast via the LISTEN/NOTIFY system, so polling is unnecessary for them - polling is only necessary for jobs that are scheduled in the future or which are being delayed due to errors. The default is 5 seconds.
 
-### minimum-buffer-size and maximum-buffer-size
+### maximum-buffer-size
 
-These options set the size of the internal buffer that Que uses to hold jobs until they're ready for workers. The default minimum is 2 and the maximum is 8, meaning that the process won't buffer more than 8 jobs that aren't yet ready to be worked, and will only resort to polling if the buffer dips below 2. If you don't want jobs to be buffered at all, you can set both of these values to zero.
+This option sets the size of the internal buffer that Que uses to hold jobs until they're ready for workers. The default maximum is 8, meaning that the process won't buffer more than 8 jobs that aren't yet ready to be worked. If you don't want jobs to be buffered at all, you can set this value to zero.
 
 ### connection-url
 
@@ -129,8 +128,8 @@ There are other docs to read if you're using [Sequel](#using-sequel) or [plain P
 After you've connected Que to the database, you can manage the jobs table. You'll want to migrate to a specific version in a migration file, to ensure that they work the same way even when you upgrade Que in the future:
 
 ```ruby
-# Update the schema to version #5.
-Que.migrate!(version: 5)
+# Update the schema to version #6.
+Que.migrate!(version: 6)
 
 # Remove Que's jobs table entirely.
 Que.migrate!(version: 0)
@@ -442,7 +441,7 @@ que -q default -q credit_cards
 Then you can set jobs to be enqueued in that queue specifically:
 
 ```ruby
-ProcessCreditCard.enqueue current_user.id, queue: 'credit_cards'
+ProcessCreditCard.enqueue(current_user.id, job_options: { queue: 'credit_cards' })
 
 # Or:
 
@@ -456,7 +455,7 @@ end
 In some cases, the ProcessCreditCard class may not be defined in the application that is enqueueing the job. In that case, you can specify the job class as a string:
 
 ```ruby
-Que.enqueue current_user.id, job_class: 'ProcessCreditCard', queue: 'credit_cards'
+Que.enqueue(current_user.id, job_options: { job_class: 'ProcessCreditCard', queue: 'credit_cards' })
 ```
 
 ## Shutting Down Safely
@@ -550,7 +549,7 @@ require 'que'
 Sequel.migration do
   up do
     Que.connection = self
-    Que.migrate!(version: 5)
+    Que.migrate!(version: 6)
   end
   down do
     Que.connection = self
@@ -586,7 +585,7 @@ Sequel automatically wraps model persistance actions (create, update, destroy) i
 
 ## Using Que With ActiveJob
 
-You can include `Que::ActiveJob::JobExtensions` into your `ApplicationJob` subclass to get support for all of Que's 
+You can include `Que::ActiveJob::JobExtensions` into your `ApplicationJob` subclass to get support for all of Que's
 [helper methods](#job-helper-methods). These methods will become no-ops if you use a queue adapter that isn't Que, so if you like to use a different adapter in development they shouldn't interfere.
 
 Additionally, including `Que::ActiveJob::JobExtensions` lets you define a run() method that supports keyword arguments.

data/lib/que/active_job/extensions.rb

@@ -12,8 +12,10 @@ module Que
       end
 
       def perform(*args)
+        args, kwargs = Que.split_out_ruby2_keywords(args)
+
         Que.internal_log(:active_job_perform, self) do
-          {args: args}
+          {args: args, kwargs: kwargs}
         end
 
         _run(
@@ -21,7 +23,12 @@ module Que
             que_filter_args(
               args.map { |a| a.is_a?(Hash) ? a.deep_symbolize_keys : a }
             )
-          )
+          ),
+          kwargs: Que.recursively_freeze(
+            que_filter_args(
+              kwargs.deep_symbolize_keys,
+            )
+          ),
         )
       end
 
@@ -53,37 +60,46 @@ module Que
     # A module that we mix into ActiveJob's wrapper for Que::Job, to maintain
     # backwards-compatibility with internal changes we make.
     module WrapperExtensions
-      # The Rails adapter (built against a pre-1.0 version of this gem)
-      # assumes that it can access a job's id via job.attrs["job_id"]. So,
-      # oblige it.
-      def attrs
-        {"job_id" => que_attrs[:id]}
+      module ClassMethods
+        # We've dropped support for job options supplied as top-level keywords, but ActiveJob's QueAdapter still uses them. So we have to move them into the job_options hash ourselves.
+        def enqueue(args, priority:, queue:, run_at: nil)
+          super(args, job_options: { priority: priority, queue: queue, run_at: run_at })
+        end
       end
 
-      def run(args)
-        # Our ActiveJob extensions expect to be able to operate on the actual
-        # job object, but there's no way to access it through ActiveJob. So,
-        # scope it to the current thread. It's a bit messy, but it's the best
-        # option under the circumstances (doesn't require hacking ActiveJob in
-        # any more extensive way).
+      module InstanceMethods
+        # The Rails adapter (built against a pre-1.0 version of this gem)
+        # assumes that it can access a job's id via job.attrs["job_id"]. So,
+        # oblige it.
+        def attrs
+          {"job_id" => que_attrs[:id]}
+        end
+
+        def run(args)
+          # Our ActiveJob extensions expect to be able to operate on the actual
+          # job object, but there's no way to access it through ActiveJob. So,
+          # scope it to the current thread. It's a bit messy, but it's the best
+          # option under the circumstances (doesn't require hacking ActiveJob in
+          # any more extensive way).
 
-        # There's no reason this logic should ever nest, because it wouldn't
-        # make sense to run a worker inside of a job, but even so, assert that
-        # nothing absurd is going on.
-        Que.assert NilClass, Thread.current[:que_current_job]
+          # There's no reason this logic should ever nest, because it wouldn't
+          # make sense to run a worker inside of a job, but even so, assert that
+          # nothing absurd is going on.
+          Que.assert NilClass, Thread.current[:que_current_job]
 
-        begin
-          Thread.current[:que_current_job] = self
+          begin
+            Thread.current[:que_current_job] = self
 
-          # We symbolize the args hash but ActiveJob doesn't like that :/
-          super(args.deep_stringify_keys)
-        ensure
-          # Also assert that the current job state was only removed now, but
-          # unset the job first so that an assertion failure doesn't mess up
-          # the state any more than it already has.
-          current = Thread.current[:que_current_job]
-          Thread.current[:que_current_job] = nil
-          Que.assert(self, current)
+            # We symbolize the args hash but ActiveJob doesn't like that :/
+            super(args.deep_stringify_keys)
+          ensure
+            # Also assert that the current job state was only removed now, but
+            # unset the job first so that an assertion failure doesn't mess up
+            # the state any more than it already has.
+            current = Thread.current[:que_current_job]
+            Thread.current[:que_current_job] = nil
+            Que.assert(self, current)
+          end
         end
       end
     end
@@ -92,6 +108,7 @@ end
 
 class ActiveJob::QueueAdapters::QueAdapter
   class JobWrapper < Que::Job
-    prepend Que::ActiveJob::WrapperExtensions
+    extend Que::ActiveJob::WrapperExtensions::ClassMethods
+    prepend Que::ActiveJob::WrapperExtensions::InstanceMethods
   end
 end

data/lib/que/active_record/model.rb

@@ -39,8 +39,8 @@ module Que
           where("que_jobs.data @> ?", JSON.dump(tags: [tag]))
         end
 
-        def by_args(*args)
-          where("que_jobs.args @> ?", JSON.dump(args))
+        def by_args(*args, **kwargs)
+          where("que_jobs.args @> ? AND que_jobs.kwargs @> ?", JSON.dump(args), JSON.dump(kwargs))
         end
       end
     end

data/lib/que/job.rb

@@ -12,7 +12,7 @@ module Que
     SQL[:insert_job] =
       %{
         INSERT INTO public.que_jobs
-        (queue, priority, run_at, job_class, args, data, job_schema_version)
+        (queue, priority, run_at, job_class, args, kwargs, data, job_schema_version)
         VALUES
         (
           coalesce($1, 'default')::text,
@@ -21,6 +21,7 @@ module Que
           $4::text,
           coalesce($5, '[]')::jsonb,
           coalesce($6, '{}')::jsonb,
+          coalesce($7, '{}')::jsonb,
           #{Que.job_schema_version}
         )
         RETURNING *
@@ -56,13 +57,10 @@ module Que
         :priority,
         :run_at
 
-      def enqueue(
-        *args,
-        job_options: {},
-        **arg_opts
-      )
-        arg_opts, job_options = _extract_job_options(arg_opts, job_options.dup)
-        args << arg_opts if arg_opts.any?
+      def enqueue(*args)
+        args, kwargs = Que.split_out_ruby2_keywords(args)
+
+        job_options = kwargs.delete(:job_options) || {}
 
         if job_options[:tags]
           if job_options[:tags].length > MAXIMUM_TAGS_COUNT
@@ -81,6 +79,7 @@ module Que
           priority: job_options[:priority] || resolve_que_setting(:priority),
           run_at:   job_options[:run_at]   || resolve_que_setting(:run_at),
           args:     Que.serialize_json(args),
+          kwargs:   Que.serialize_json(kwargs),
           data:     job_options[:tags] ? Que.serialize_json(tags: job_options[:tags]) : "{}",
           job_class: \
             job_options[:job_class] || name ||
@@ -89,27 +88,31 @@ module Que
 
         if attrs[:run_at].nil? && resolve_que_setting(:run_synchronously)
           attrs[:args] = Que.deserialize_json(attrs[:args])
+          attrs[:kwargs] = Que.deserialize_json(attrs[:kwargs])
           attrs[:data] = Que.deserialize_json(attrs[:data])
           _run_attrs(attrs)
         else
           values =
             Que.execute(
               :insert_job,
-              attrs.values_at(:queue, :priority, :run_at, :job_class, :args, :data),
+              attrs.values_at(:queue, :priority, :run_at, :job_class, :args, :kwargs, :data),
             ).first
-
           new(values)
         end
       end
+      ruby2_keywords(:enqueue) if respond_to?(:ruby2_keywords, true)
 
       def run(*args)
         # Make sure things behave the same as they would have with a round-trip
         # to the DB.
+        args, kwargs = Que.split_out_ruby2_keywords(args)
         args = Que.deserialize_json(Que.serialize_json(args))
+        kwargs = Que.deserialize_json(Que.serialize_json(kwargs))
 
         # Should not fail if there's no DB connection.
-        _run_attrs(args: args)
+        _run_attrs(args: args, kwargs: kwargs)
       end
+      ruby2_keywords(:run) if respond_to?(:ruby2_keywords, true)
 
       def resolve_que_setting(setting, *args)
         value = send(setting) if respond_to?(setting)
@@ -136,27 +139,6 @@ module Que
           end
         end
       end
-
-      def _extract_job_options(arg_opts, job_options)
-        deprecated_job_option_names = []
-
-        %i[queue priority run_at job_class tags].each do |option_name|
-          next unless arg_opts.key?(option_name) && job_options[option_name].nil?
-
-          job_options[option_name] = arg_opts.delete(option_name)
-          deprecated_job_option_names << option_name
-        end
-
-        _log_job_options_deprecation(deprecated_job_option_names)
-
-        [arg_opts, job_options]
-      end
-
-      def _log_job_options_deprecation(deprecated_job_option_names)
-        return unless deprecated_job_option_names.any?
-
-        warn "Passing job options like (#{deprecated_job_option_names.join(', ')}) to `JobClass.enqueue` as top level keyword args has been deprecated and will be removed in version 2.0. Please wrap job options in an explicit `job_options` keyword arg instead."
-      end
     end
 
     # Set up some defaults.

data/lib/que/job_buffer.rb

@@ -6,7 +6,7 @@
 
 module Que
   class JobBuffer
-    attr_reader :maximum_size, :minimum_size, :priority_queues
+    attr_reader :maximum_size, :priority_queues
 
     # Since we use a mutex, which is not reentrant, we have to be a little
     # careful to not call a method that locks the mutex when we've already
@@ -17,20 +17,11 @@ module Que
 
     def initialize(
       maximum_size:,
-      minimum_size:,
       priorities:
     )
       @maximum_size = Que.assert(Integer, maximum_size)
       Que.assert(maximum_size >= 0) { "maximum_size for a JobBuffer must be at least zero!" }
 
-      @minimum_size = Que.assert(Integer, minimum_size)
-      Que.assert(minimum_size >= 0) { "minimum_size for a JobBuffer must be at least zero!" }
-
-      Que.assert(minimum_size <= maximum_size) do
-        "minimum buffer size (#{minimum_size}) is " \
-          "greater than the maximum buffer size (#{maximum_size})!"
-      end
-
       @stop  = false
       @array = []
       @mutex = Mutex.new

data/lib/que/job_methods.rb

@@ -39,12 +39,16 @@ module Que
     # Run the job with error handling and cleanup logic. Optionally support
     # overriding the args, because it's necessary when jobs are invoked from
     # ActiveJob.
-    def _run(args: nil, reraise_errors: false)
+    def _run(args: nil, kwargs: nil, reraise_errors: false)
       if args.nil? && que_target
         args = que_target.que_attrs.fetch(:args)
       end
 
-      run(*args)
+      if kwargs.nil? && que_target
+        kwargs = que_target.que_attrs.fetch(:kwargs)
+      end
+
+      run(*args, **kwargs)
       default_resolve_action if que_target && !que_target.que_resolved
     rescue => error
       raise error unless que_target

data/lib/que/locker.rb

@@ -45,7 +45,6 @@ module Que
 
     DEFAULT_POLL_INTERVAL       = 5.0
     DEFAULT_WAIT_PERIOD         = 50
-    DEFAULT_MINIMUM_BUFFER_SIZE = 2
     DEFAULT_MAXIMUM_BUFFER_SIZE = 8
     DEFAULT_WORKER_PRIORITIES   = [10, 30, 50, nil, nil, nil].freeze
 
@@ -57,7 +56,6 @@ module Que
       poll_interval:       DEFAULT_POLL_INTERVAL,
       wait_period:         DEFAULT_WAIT_PERIOD,
       maximum_buffer_size: DEFAULT_MAXIMUM_BUFFER_SIZE,
-      minimum_buffer_size: DEFAULT_MINIMUM_BUFFER_SIZE,
       worker_priorities:   DEFAULT_WORKER_PRIORITIES,
       on_worker_start:     nil
     )
@@ -77,7 +75,6 @@ module Que
       # ResultQueue to receive messages from workers.
       @job_buffer = JobBuffer.new(
         maximum_size: maximum_buffer_size,
-        minimum_size: minimum_buffer_size,
         priorities:   worker_priorities.uniq,
       )
 
@@ -93,7 +90,6 @@ module Que
           poll_interval:       poll_interval,
           wait_period:         wait_period,
           maximum_buffer_size: maximum_buffer_size,
-          minimum_buffer_size: minimum_buffer_size,
           worker_priorities:   worker_priorities,
         }
       end

data/lib/que/migrations/6/down.sql

@@ -0,0 +1,8 @@
+DROP INDEX que_jobs_kwargs_gin_idx;
+ALTER TABLE que_jobs DROP COLUMN kwargs;
+
+ALTER INDEX que_poll_idx RENAME TO que_poll_idx_with_job_schema_version;
+CREATE INDEX que_poll_idx ON que_jobs (queue, priority, run_at, id) WHERE (finished_at IS NULL AND expired_at IS NULL);
+
+ALTER TABLE que_jobs ALTER COLUMN job_schema_version SET DEFAULT 1;
+ALTER TABLE que_jobs ALTER COLUMN job_schema_version DROP NOT NULL;

data/lib/que/migrations/6/up.sql

@@ -0,0 +1,8 @@
+ALTER TABLE que_jobs ADD COLUMN kwargs JSONB NOT NULL DEFAULT '{}';
+CREATE INDEX que_jobs_kwargs_gin_idx ON que_jobs USING gin (kwargs jsonb_path_ops);
+
+DROP INDEX que_poll_idx;
+ALTER INDEX que_poll_idx_with_job_schema_version RENAME TO que_poll_idx;
+
+ALTER TABLE que_jobs ALTER COLUMN job_schema_version DROP DEFAULT;
+ALTER TABLE que_jobs ALTER COLUMN job_schema_version SET NOT NULL;

data/lib/que/migrations.rb

@@ -4,7 +4,7 @@ module Que
   module Migrations
     # In order to ship a schema change, add the relevant up and down sql files
     # to the migrations directory, and bump the version here.
-    CURRENT_VERSION = 5
+    CURRENT_VERSION = 6
 
     class << self
       def migrate!(version:)

data/lib/que/poller.rb

@@ -146,8 +146,6 @@ module Que
 
       return unless should_poll?
 
-      expected_count = priorities.inject(0){|s,(_,c)| s + c}
-
       jobs =
         connection.execute_prepared(
           :poll_jobs,
@@ -159,7 +157,7 @@ module Que
         )
 
       @last_polled_at      = Time.now
-      @last_poll_satisfied = expected_count == jobs.count
+      @last_poll_satisfied = poll_satisfied?(priorities, jobs)
 
       Que.internal_log :poller_polled, self do
         {
@@ -265,5 +263,12 @@ module Que
         SQL
       end
     end
+
+    private
+
+    def poll_satisfied?(priorities, jobs)
+      lowest_priority = priorities.keys.max
+      jobs.count >= priorities[lowest_priority]
+    end
   end
 end

data/lib/que/sequel/model.rb

@@ -40,8 +40,11 @@ module Que
           where(QUALIFIED_TABLE[:data].pg_jsonb.contains(JSON.dump(tags: [tag])))
         end
 
-        def by_args(*args)
-          where(QUALIFIED_TABLE[:args].pg_jsonb.contains(JSON.dump(args)))
+        def by_args(*args, **kwargs)
+          where(
+            QUALIFIED_TABLE[:args].pg_jsonb.contains(JSON.dump(args)) &
+            QUALIFIED_TABLE[:kwargs].pg_jsonb.contains(JSON.dump(kwargs))
+          ) 
         end
       end
     end

data/lib/que/utils/ruby2_keywords.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+# Temporary module allowing ruby2 keyword args to be extracted from an *args splat
+# Allows us to ensure consistent behaviour when running on ruby 2 vs ruby 3
+# We can remove this if/when we drop support for ruby 2
+
+require 'json'
+
+module Que
+  module Utils
+    module Ruby2Keywords
+      def split_out_ruby2_keywords(args)
+        return [args, {}] unless args.last&.is_a?(Hash) && Hash.ruby2_keywords_hash?(args.last)
+
+        [args[0..-2], args.last]
+      end
+    end
+  end
+end

data/lib/que/version.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
 module Que
-  VERSION = '1.3.0'
+  VERSION = '2.0.0.beta1'
 
   def self.job_schema_version
-    1
+    2
   end
 end

data/lib/que/worker.rb

@@ -125,7 +125,7 @@ module Que
           log_message[:event] = :job_worked
         end
 
-        Que.log(log_message)
+        Que.log(**log_message)
       end
 
       instance

data/lib/que.rb

@@ -29,8 +29,11 @@ module Que
   require_relative 'que/utils/logging'
   require_relative 'que/utils/middleware'
   require_relative 'que/utils/queue_management'
+  require_relative 'que/utils/ruby2_keywords'
   require_relative 'que/utils/transactions'
 
+  require_relative 'que/version'
+
   require_relative 'que/connection'
   require_relative 'que/connection_pool'
   require_relative 'que/job_methods'
@@ -41,7 +44,6 @@ module Que
   require_relative 'que/migrations'
   require_relative 'que/poller'
   require_relative 'que/result_queue'
-  require_relative 'que/version'
   require_relative 'que/worker'
 
   class << self
@@ -60,6 +62,7 @@ module Que
     include Utils::Logging
     include Utils::Middleware
     include Utils::QueueManagement
+    include Utils::Ruby2Keywords
     include Utils::Transactions
 
     extend Forwardable

data/que.gemspec

@@ -13,6 +13,8 @@ Gem::Specification.new do |spec|
   spec.homepage      = 'https://github.com/que-rb/que'
   spec.license       = 'MIT'
 
+  spec.required_ruby_version = '>= 2.7.0'
+
   files_to_exclude = [
     /\A\.circleci/,
     /\AGemfile/,