redis_queued_locks 1.21.0 → 1.23.0

data/sig/redis_queued_locks/acquirer/acquire_lock/try_to_lock/log_visitor.rbs

@@ -13,8 +13,8 @@ module RedisQueuedLocks
             Integer queue_ttl,
             String acquirer_id,
             String host_id,
-            Symbol access_strategy,
-            Symbol rw_mode
+            RQL::accessStrategy access_strategy,
+            RQL::readWriteMode rw_mode
           ) -> void
 
           def self.rconn_fetched: (
@@ -25,8 +25,8 @@ module RedisQueuedLocks
             Integer queue_ttl,
             String acquirer_id,
             String host_id,
-            Symbol access_strategy,
-            Symbol rw_mode
+            RQL::accessStrategy access_strategy,
+            RQL::readWriteMode rw_mode
           ) -> void
 
           def self.same_process_conflict_detected: (
@@ -37,8 +37,8 @@ module RedisQueuedLocks
             Integer queue_ttl,
             String acquirer_id,
             String host_id,
-            Symbol access_strategy,
-            Symbol rw_mode
+            RQL::accessStrategy access_strategy,
+            RQL::readWriteMode rw_mode
           ) -> void
 
           def self.same_process_conflict_analyzed: (
@@ -49,8 +49,8 @@ module RedisQueuedLocks
             Integer queue_ttl,
             String acquirer_id,
             String host_id,
-            Symbol access_strategy,
-            Symbol rw_mode,
+            RQL::accessStrategy access_strategy,
+            RQL::readWriteMode rw_mode,
             Symbol sp_conflict_status
           ) -> void
 
@@ -62,8 +62,8 @@ module RedisQueuedLocks
             Integer queue_ttl,
             String acquirer_id,
             String host_id,
-            Symbol access_strategy,
-            Symbol rw_mode,
+            RQL::accessStrategy access_strategy,
+            RQL::readWriteMode rw_mode,
             Symbol sp_conflict_status,
             Integer? ttl,
             ::Float spc_processed_timestamp
@@ -77,8 +77,8 @@ module RedisQueuedLocks
             Integer queue_ttl,
             String acquirer_id,
             String host_id,
-            Symbol access_strategy,
-            Symbol rw_mode,
+            RQL::accessStrategy access_strategy,
+            RQL::readWriteMode rw_mode,
             Symbol sp_conflict_status,
             ::Float spc_processed_timestamp
           ) -> void
@@ -91,8 +91,8 @@ module RedisQueuedLocks
             Integer queue_ttl,
             String acquirer_id,
             String host_id,
-            Symbol access_strategy,
-            Symbol rw_mode,
+            RQL::accessStrategy access_strategy,
+            RQL::readWriteMode rw_mode,
             Symbol sp_conflict_status,
             ::Float spc_processed_timestamp
           ) -> void
@@ -105,8 +105,8 @@ module RedisQueuedLocks
             Integer queue_ttl,
             String acquirer_id,
             String host_id,
-            Symbol access_strategy,
-            Symbol rw_mode,
+            RQL::accessStrategy access_strategy,
+            RQL::readWriteMode rw_mode,
             Symbol sp_conflict_status,
             ::Float spc_processed_timestamp
           ) -> void
@@ -119,8 +119,9 @@ module RedisQueuedLocks
             Integer queue_ttl,
             String acquirer_id,
             String host_id,
-            Symbol access_strategy,
-            Symbol rw_mode
+            RQL::accessStrategy access_strategy,
+            RQL::readWriteMode rw_mode,
+            Integer priority
           ) -> void
 
           def self.remove_expired_acqs: (
@@ -131,8 +132,22 @@ module RedisQueuedLocks
             Integer queue_ttl,
             String acquirer_id,
             String host_id,
-            Symbol access_strategy,
-            Symbol rw_mode
+            RQL::accessStrategy access_strategy,
+            RQL::readWriteMode rw_mode
+          ) -> void
+
+          def self.dead_request_removed: (
+            RQL::loggerObj logger,
+            bool log_sampled,
+            bool log_lock_try,
+            String lock_key,
+            Integer queue_ttl,
+            String acquirer_id,
+            String host_id,
+            RQL::accessStrategy access_strategy,
+            RQL::readWriteMode rw_mode,
+            String dead_acquirer,
+            Integer dead_priority
           ) -> void
 
           def self.get_first_from_queue: (
@@ -143,9 +158,10 @@ module RedisQueuedLocks
             Integer queue_ttl,
             String acquirer_id,
             String host_id,
-            Symbol access_strategy,
-            Symbol rw_mode,
-            String? waiting_acquirer
+            RQL::accessStrategy access_strategy,
+            RQL::readWriteMode rw_mode,
+            String? waiting_acquirer,
+            Integer? waiting_priority
           ) -> void
 
           def self.exit__queue_ttl_reached: (
@@ -156,8 +172,8 @@ module RedisQueuedLocks
             Integer queue_ttl,
             String acquirer_id,
             String host_id,
-            Symbol access_strategy,
-            Symbol rw_mode
+            RQL::accessStrategy access_strategy,
+            RQL::readWriteMode rw_mode
           ) -> void
 
           def self.exit__no_first: (
@@ -168,9 +184,10 @@ module RedisQueuedLocks
             Integer queue_ttl,
             String acquirer_id,
             String host_id,
-            Symbol access_strategy,
-            Symbol rw_mode,
+            RQL::accessStrategy access_strategy,
+            RQL::readWriteMode rw_mode,
             String? waiting_acquirer,
+            Integer? waiting_priority,
             Hash[String,untyped] current_lock_data
           ) -> void
 
@@ -182,9 +199,10 @@ module RedisQueuedLocks
             Integer queue_ttl,
             String acquirer_id,
             String host_id,
-            Symbol access_strategy,
-            Symbol rw_mode,
+            RQL::accessStrategy access_strategy,
+            RQL::readWriteMode rw_mode,
             String? waiting_acquirer,
+            Integer? waiting_priority,
             String locked_by_acquirer,
             Hash[String,untyped] current_lock_data
           ) -> void
@@ -197,9 +215,10 @@ module RedisQueuedLocks
             Integer queue_ttl,
             String acquirer_id,
             String host_id,
-            Symbol access_strategy,
-            Symbol rw_mode,
-            String ahead_acquirer
+            RQL::accessStrategy access_strategy,
+            RQL::readWriteMode rw_mode,
+            String ahead_acquirer,
+            Integer? ahead_priority
           ) -> void
 
           def self.exit__read_request_ahead: (
@@ -210,9 +229,10 @@ module RedisQueuedLocks
             Integer queue_ttl,
             String acquirer_id,
             String host_id,
-            Symbol access_strategy,
-            Symbol rw_mode,
-            String ahead_acquirer
+            RQL::accessStrategy access_strategy,
+            RQL::readWriteMode rw_mode,
+            String ahead_acquirer,
+            Integer? ahead_priority
           ) -> void
 
           def self.exit__read_lock_still_obtained: (
@@ -223,9 +243,10 @@ module RedisQueuedLocks
             Integer queue_ttl,
             String acquirer_id,
             String host_id,
-            Symbol access_strategy,
-            Symbol rw_mode,
-            String? waiting_acquirer
+            RQL::accessStrategy access_strategy,
+            RQL::readWriteMode rw_mode,
+            String? waiting_acquirer,
+            Integer? waiting_priority
           ) -> void
 
           def self.obtain__free_to_acquire: (
@@ -236,8 +257,8 @@ module RedisQueuedLocks
             Integer queue_ttl,
             String acquirer_id,
             String host_id,
-            Symbol access_strategy,
-            Symbol rw_mode
+            RQL::accessStrategy access_strategy,
+            RQL::readWriteMode rw_mode
           ) -> void
         end
       end

data/sig/redis_queued_locks/acquirer/acquire_lock/try_to_lock.rbs

@@ -13,6 +13,10 @@ module RedisQueuedLocks
         LOCK_STATE_QUEUE_REPLIES_AT: Integer
         QUEUE_HEAD_REPLY: Integer
         OPPOSITE_QUEUE_HEAD_REPLY: Integer
+        QUEUE_REPLIES: Integer
+        QUEUE_LOCK_INDEX_REPLIES: Integer
+        READ_LOCK_EXTENSION_COMMANDS: Integer
+        MAX_DEAD_REQUEST_REMOVALS: Integer
 
         # { ok: bool, result: Symbol }
         # { ok: bool, result: Symbol }
@@ -25,7 +29,7 @@ module RedisQueuedLocks
         #     hst_id: String,
         #     ts: Integer?,
         #     ttl: Integer?,
-        #     rw_mode: Symbol
+        #     rw_mode: RQL::readWriteMode
         #   }
         # }
 
@@ -34,7 +38,7 @@ module RedisQueuedLocks
           RQL::loggerObj logger,
           bool log_lock_try,
           String lock_key,
-          Symbol read_write_mode,
+          RQL::readWriteMode rw_mode,
           String lock_key_queue,
           String read_lock_key_queue,
           String lock_readers_key,
@@ -43,13 +47,14 @@ module RedisQueuedLocks
           String acquirer_id,
           String host_id,
           Integer|Float acquirer_position,
+          Integer priority,
           Integer? ttl,
           Integer queue_ttl,
           bool lock_index_enabled,
           Integer lock_index_grace_period,
           bool fail_fast,
-          Symbol conflict_strategy,
-          Symbol access_strategy,
+          RQL::conflictStrategy conflict_strategy,
+          RQL::accessStrategy access_strategy,
           Hash[String|Symbol,untyped]? meta,
           bool retry_attempt,
           bool log_sampled,
@@ -58,11 +63,89 @@ module RedisQueuedLocks
 
         private
 
+        def same_process_conflict_status: (
+          RQL::conflictStrategy conflict_strategy,
+          bool lock_upgrade
+        ) -> Symbol
+
+        def transact_write_lock_extension: (
+          RedisClient::Multi transact,
+          String lock_key,
+          String lock_name,
+          Integer? ttl,
+          bool lock_index_enabled,
+          Float spc_processed_timestamp
+        ) -> void
+
+        def transact_read_lock_extension: (
+          RedisClient::Multi transact,
+          String lock_readers_key,
+          String? read_lock_key,
+          String lock_name,
+          String acquirer_id,
+          Integer? ttl,
+          bool lock_index_enabled,
+          Float? own_read_lock_expiration,
+          Integer redis_time,
+          Float spc_processed_timestamp
+        ) -> void
+
+        def transact_lock_index_extension: (
+          RedisClient::Multi transact,
+          String lock_name,
+          Integer? ttl,
+          bool lock_index_enabled
+        ) -> void
+
+        def transact_write_lock_work_through: (
+          RedisClient::Multi transact,
+          String lock_key,
+          Float spc_processed_timestamp
+        ) -> void
+
+        def transact_read_lock_work_through: (
+          RedisClient::Multi transact,
+          String? read_lock_key,
+          Float? own_read_lock_expiration,
+          Integer redis_time,
+          Float spc_processed_timestamp
+        ) -> void
+
+        def transact_read_lock_obtaining: (
+          RedisClient::Multi transact,
+          String request_queue,
+          String lock_readers_key,
+          String? read_lock_key,
+          String lock_name,
+          String acquirer_id,
+          Integer? ttl,
+          bool lock_index_enabled,
+          Integer lock_index_grace_period,
+          Hash[String|Symbol,untyped]? meta,
+          Integer redis_time,
+          Float timestamp
+        ) -> void
+
+        def transact_write_lock_obtaining: (
+          RedisClient::Multi transact,
+          String lock_key,
+          String request_queue,
+          String lock_name,
+          String acquirer_id,
+          String host_id,
+          Integer? ttl,
+          bool lock_index_enabled,
+          Integer lock_index_grace_period,
+          Hash[String|Symbol,untyped]? meta,
+          Float timestamp
+        ) -> void
+
         def queue_lock_request: (
           RedisClient::Pipeline pipeline,
           String request_queue,
           String opposite_request_queue,
           Integer|Float acquirer_position,
+          Integer priority,
           String acquirer_id,
           Float acquirer_dead_score,
           String lock_name,
@@ -71,6 +154,14 @@ module RedisQueuedLocks
           Integer lock_index_grace_period
         ) -> void
 
+        def pipeline_dead_requests_removal: (
+          RedisClient::Pipeline pipeline,
+          String request_queue,
+          String opposite_request_queue,
+          Float acquirer_dead_score,
+          Integer priority
+        ) -> void
+
         def pipeline_lock_state: (
           RedisClient::Pipeline pipeline,
           String lock_key,
@@ -81,6 +172,7 @@ module RedisQueuedLocks
           String request_queue,
           String opposite_request_queue,
           Integer|Float acquirer_position,
+          Integer priority,
           Float acquirer_dead_score,
           String lock_name,
           Integer queue_ttl,
@@ -89,7 +181,7 @@ module RedisQueuedLocks
         ) -> void
 
         def find_opposite_request_ahead: (
-          Symbol access_strategy,
+          RQL::accessStrategy access_strategy,
           [String, Float]? opposite_waiting_request,
           Integer|Float acquirer_position,
           String acquirer_id
@@ -104,7 +196,7 @@ module RedisQueuedLocks
 
         def lock_obstacle: (
           bool read_mode,
-          Symbol access_strategy,
+          RQL::accessStrategy access_strategy,
           String acquirer_id,
           String? waiting_acquirer,
           String? opposite_request_ahead,
@@ -122,20 +214,76 @@ module RedisQueuedLocks
           Integer queue_ttl,
           String acquirer_id,
           String host_id,
-          Symbol access_strategy,
-          Symbol read_write_mode,
+          RQL::accessStrategy access_strategy,
+          RQL::readWriteMode rw_mode,
           String? waiting_acquirer,
-          String? opposite_request_ahead,
+          Integer? waiting_priority,
+          [String, Float]? opposite_waiting_request,
           String? current_lock_obtainer
         ) -> void
 
+        def logged_request_priority: (
+          bool log_sampled,
+          bool log_lock_try,
+          [String, Float]? lock_request
+        ) -> Integer?
+
+        def drop_dead_requests_ahead: (
+          RC::client rconn,
+          RQL::readWriteMode rw_mode,
+          String request_queue,
+          String opposite_request_queue,
+          String acquirer_id,
+          Integer|Float acquirer_position,
+          Float acquirer_dead_score,
+          RQL::accessStrategy access_strategy,
+          [String, Float]? waiting_request,
+          [String, Float]? opposite_waiting_request
+        ) -> [[String, Float]?, [String, Float]?, Array[[String, Integer]]]?
+
+        def find_dead_requests_ahead: (
+          bool read_mode,
+          RQL::accessStrategy access_strategy,
+          String acquirer_id,
+          Integer|Float acquirer_position,
+          Float acquirer_dead_score,
+          [String, Float]? waiting_request,
+          [String, Float]? opposite_waiting_request
+        ) -> [[String, Float]?, Integer?, [String, Float]?, Integer?]?
+
+        def pipeline_dead_requests_ahead_removal: (
+          RedisClient::Pipeline pipeline,
+          String request_queue,
+          String opposite_request_queue,
+          Float acquirer_dead_score,
+          [String, Float]? dead_head,
+          Integer? dead_head_priority,
+          [String, Float]? dead_ahead,
+          Integer? dead_ahead_priority
+        ) -> void
+
+        def log_dropped_requests: (
+          RQL::loggerObj logger,
+          bool log_sampled,
+          bool log_lock_try,
+          String lock_key,
+          Integer queue_ttl,
+          String acquirer_id,
+          String host_id,
+          RQL::accessStrategy access_strategy,
+          RQL::readWriteMode rw_mode,
+          Array[[String, Integer]] dropped_requests
+        ) -> void
+
+        def dead_request_priority: ([String, Float] lock_request, Float acquirer_dead_score) -> Integer?
+
         def precheck_lock: (
           RC::client rconn,
           RQL::loggerObj logger,
           bool log_sampled,
           bool log_lock_try,
           String lock_key,
-          Symbol read_write_mode,
+          RQL::readWriteMode rw_mode,
           String lock_readers_key,
           String request_queue,
           String opposite_request_queue,
@@ -143,12 +291,13 @@ module RedisQueuedLocks
           String acquirer_id,
           String host_id,
           Integer|Float acquirer_position,
+          Integer priority,
           Float acquirer_dead_score,
           Integer queue_ttl,
           bool lock_index_enabled,
           Integer lock_index_grace_period,
           bool fail_fast,
-          Symbol access_strategy
+          RQL::accessStrategy access_strategy
         ) -> (lockObstacle | :fail_fast_no_try)?
       end
     end

data/sig/redis_queued_locks/acquirer/acquire_lock/{yield_with_expire → yield_expire}/log_visitor.rbs

@@ -12,8 +12,8 @@ module RedisQueuedLocks
             Integer queue_ttl,
             String acquirer_id,
             String host_id,
-            Symbol access_strategy,
-            Symbol rw_mode
+            RQL::accessStrategy access_strategy,
+            RQL::readWriteMode rw_mode
           ) -> void
 
           def self.decrease_lock: (
@@ -24,8 +24,8 @@ module RedisQueuedLocks
             Integer queue_ttl,
             String acquirer_id,
             String host_id,
-            Symbol access_strategy,
-            Symbol rw_mode
+            RQL::accessStrategy access_strategy,
+            RQL::readWriteMode rw_mode
           ) -> void
         end
       end

data/sig/redis_queued_locks/acquirer/acquire_lock/yield_expire.rbs

@@ -13,10 +13,10 @@ module RedisQueuedLocks
           String lock_key,
           String lock_readers_key,
           String? read_lock_key,
-          Symbol rw_mode,
+          RQL::readWriteMode rw_mode,
           String acquirer_id,
           String host_id,
-          Symbol access_strategy,
+          RQL::accessStrategy access_strategy,
           bool timed,
           Integer|Float ttl_shift,
           Integer ttl,

data/sig/redis_queued_locks/acquirer/acquire_lock.rbs

@@ -37,9 +37,11 @@ module RedisQueuedLocks
         logger: RQL::loggerObj,
         log_lock_try: bool,
         instrument: untyped?,
-        conflict_strategy: Symbol,
-        read_write_mode: Symbol,
-        access_strategy: Symbol,
+        conflict_strategy: RQL::conflictStrategy,
+        rw_mode: Symbol, # NOTE: (rbs test) validated at runtime (Step 0.1 (RW)): any Symbol is accepted here
+        access_strategy: RQL::accessStrategy,
+        priority: RQL::lockPriority,
+        lock_priorities: Hash[Symbol, Integer],
         log_sampling_enabled: bool,
         log_sampling_percent: Integer,
         log_sampler: RQL::Logging::samplerObj,

data/sig/redis_queued_locks/acquirer/clear_dead_requests.rbs

@@ -11,6 +11,7 @@ module RedisQueuedLocks
         RC::client redis_client,
         Integer scan_size,
         Integer dead_ttl,
+        bool by_priority,
         bool lock_index_enabled,
         RQL::loggerObj logger,
         RQL::instrObj instrumenter,
@@ -29,15 +30,27 @@ module RedisQueuedLocks
         RC::client redis_client,
         Integer scan_size,
         Integer dead_ttl,
+        bool by_priority,
         bool lock_index_enabled
       ) -> Set[String]
 
       private def self.each_lock_queue: (RC::client redis_client, Integer scan_size) { (String lock_queue) -> void } -> void
-      private def self.drop_dead_requests: (RC::client redis_client, Array[String] lock_queues, Float dead_score) -> void
+      private def self.drop_dead_requests: (
+        RC::client redis_client,
+        Array[String] lock_queues,
+        Float dead_score,
+        bool by_priority
+      ) -> Array[Array[[String, Float]]]
+      private def self.drop_dead_requests_by_priority: (
+        RC::client redis_client,
+        Array[String] lock_queues,
+        Float dead_score
+      ) -> Array[Array[[String, Float]]]
       private def self.drop_dead_requests_of_locks: (
         RC::client redis_client,
         Array[String] lock_names,
         Float dead_score,
+        bool by_priority,
         Set[String] processed_queues
       ) -> void
       private def self.each_lock_name_batch: (RC::client redis_client, Integer scan_size) { (Array[String] lock_names) -> void } -> void

data/sig/redis_queued_locks/acquirer/extend_lock_ttl.rbs

@@ -13,7 +13,7 @@ module RedisQueuedLocks
         RC::client redis_client,
         String lock_name,
         Integer milliseconds,
-        Symbol read_write_mode,
+        Symbol rw_mode, # NOTE: (rbs test) validated at runtime: any Symbol is accepted here
         bool all_read_locks,
         String acquirer_id,
         bool lock_index_enabled,
@@ -35,7 +35,7 @@ module RedisQueuedLocks
         String lock_name,
         String lock_key,
         Integer milliseconds,
-        Symbol read_write_mode,
+        RQL::readWriteMode rw_mode,
         bool all_read_locks,
         String acquirer_id,
         bool lock_index_enabled