Merge branch 'master' into fix_unique_cache_key

Author: petyaslavova

.github/workflows/stale-issues.yml

@@ -1,25 +1,95 @@
-name: "Close stale issues"
+name: "Stale Issue Management"
 on:
   schedule:
-  - cron: "0 0 * * *"
+    # Run daily at midnight UTC
+    - cron: "0 0 * * *"
+  workflow_dispatch: # Allow manual triggering
+
+env:
+  # Default stale policy timeframes
+  DAYS_BEFORE_STALE: 365
+  DAYS_BEFORE_CLOSE: 30
+
+  # Accelerated timeline for needs-information issues
+  NEEDS_INFO_DAYS_BEFORE_STALE: 30
+  NEEDS_INFO_DAYS_BEFORE_CLOSE: 7
 
-permissions: {}
 jobs:
   stale:
-    permissions:
-      issues: write  #  to close stale issues (actions/stale)
-      pull-requests: write  #  to close stale PRs (actions/stale)
-
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/stale@v9
-      with:
-        repo-token: ${{ secrets.GITHUB_TOKEN }}
-        stale-issue-message: 'This issue is marked stale. It will be closed in 30 days if it is not updated.'
-        stale-pr-message: 'This pull request is marked stale. It will be closed in 30 days if it is not updated.'
-        days-before-stale: 365
-        days-before-close: 30
-        stale-issue-label: "Stale"
-        stale-pr-label: "Stale"
-        operations-per-run: 20
-        remove-stale-when-updated: true
+      # First step: Handle regular issues (excluding needs-information)
+      - name: Mark regular issues as stale
+        uses: actions/stale@v9
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+
+          # Default stale policy
+          days-before-stale: ${{ env.DAYS_BEFORE_STALE }}
+          days-before-close: ${{ env.DAYS_BEFORE_CLOSE }}
+
+          # Explicit stale label configuration
+          stale-issue-label: "stale"
+          stale-pr-label: "stale"
+
+          stale-issue-message: |
+            This issue has been automatically marked as stale due to inactivity.
+            It will be closed in 30 days if no further activity occurs.
+            If you believe this issue is still relevant, please add a comment to keep it open.
+
+          close-issue-message: |
+            This issue has been automatically closed due to inactivity.
+            If you believe this issue is still relevant, please reopen it or create a new issue with updated information.
+
+          # Exclude needs-information issues from this step
+          exempt-issue-labels: 'no-stale,needs-information'
+
+          # Remove stale label when issue/PR becomes active again
+          remove-stale-when-updated: true
+
+          # Apply to pull requests with same timeline
+          days-before-pr-stale: ${{ env.DAYS_BEFORE_STALE }}
+          days-before-pr-close: ${{ env.DAYS_BEFORE_CLOSE }}
+
+          stale-pr-message: |
+            This pull request has been automatically marked as stale due to inactivity.
+            It will be closed in 30 days if no further activity occurs.
+
+          close-pr-message: |
+            This pull request has been automatically closed due to inactivity.
+            If you would like to continue this work, please reopen the PR or create a new one.
+
+          # Only exclude no-stale PRs (needs-information PRs follow standard timeline)
+          exempt-pr-labels: 'no-stale'
+
+      # Second step: Handle needs-information issues with accelerated timeline
+      - name: Mark needs-information issues as stale
+        uses: actions/stale@v9
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+
+          # Accelerated timeline for needs-information
+          days-before-stale: ${{ env.NEEDS_INFO_DAYS_BEFORE_STALE }}
+          days-before-close: ${{ env.NEEDS_INFO_DAYS_BEFORE_CLOSE }}
+
+          # Explicit stale label configuration
+          stale-issue-label: "stale"
+
+          # Only target ISSUES with needs-information label (not PRs)
+          only-issue-labels: 'needs-information'
+
+          stale-issue-message: |
+            This issue has been marked as stale because it requires additional information
+            that has not been provided for 30 days. It will be closed in 7 days if the
+            requested information is not provided.
+
+          close-issue-message: |
+            This issue has been closed because the requested information was not provided within the specified timeframe.
+            If you can provide the missing information, please reopen this issue or create a new one.
+
+          # Disable PR processing for this step
+          days-before-pr-stale: -1
+          days-before-pr-close: -1
+
+          # Remove stale label when issue becomes active again
+          remove-stale-when-updated: true

doctests/dt_bitmap.py

@@ -6,11 +6,13 @@
 """
 import redis
 
-r = redis.Redis(decode_responses=True)
+# Connect without the usual `decode_responses=True` to
+# see the binary values in the responses more easily.
+r = redis.Redis()
 # HIDE_END
 
 # REMOVE_START
-r.delete("pings:2024-01-01-00:00")
+r.delete("pings:2024-01-01-00:00", "A", "B", "C", "R")
 # REMOVE_END
 
 # STEP_START ping
@@ -38,3 +40,116 @@
 # REMOVE_START
 assert res4 == 1
 # REMOVE_END
+
+# STEP_START bitop_setup
+r.setbit("A", 0, 1)
+r.setbit("A", 1, 1)
+r.setbit("A", 3, 1)
+r.setbit("A", 4, 1)
+
+res5 = r.get("A")
+print("{:08b}".format(int.from_bytes(res5, "big")))
+# >>> 11011000
+
+r.setbit("B", 3, 1)
+r.setbit("B", 4, 1)
+r.setbit("B", 7, 1)
+
+res6 = r.get("B")
+print("{:08b}".format(int.from_bytes(res6, "big")))
+# >>> 00011001
+
+r.setbit("C", 1, 1)
+r.setbit("C", 2, 1)
+r.setbit("C", 4, 1)
+r.setbit("C", 5, 1)
+
+res7 = r.get("C")
+print("{:08b}".format(int.from_bytes(res7, "big")))
+# >>> 01101100
+# STEP_END
+# REMOVE_START
+assert int.from_bytes(res5, "big") == 0b11011000
+assert int.from_bytes(res6, "big") == 0b00011001
+assert int.from_bytes(res7, "big") == 0b01101100
+# REMOVE_END
+
+# STEP_START bitop_and
+r.bitop("AND", "R", "A", "B", "C")
+res8 = r.get("R")
+print("{:08b}".format(int.from_bytes(res8, "big")))
+# >>> 00001000
+# STEP_END
+# REMOVE_START
+assert int.from_bytes(res8, "big") == 0b00001000
+# REMOVE_END
+
+# STEP_START bitop_or
+r.bitop("OR", "R", "A", "B", "C")
+res9 = r.get("R")
+print("{:08b}".format(int.from_bytes(res9, "big")))
+# >>> 11111101
+# STEP_END
+# REMOVE_START
+assert int.from_bytes(res9, "big") == 0b11111101
+# REMOVE_END
+
+# STEP_START bitop_xor
+r.bitop("XOR", "R", "A", "B")
+res10 = r.get("R")
+print("{:08b}".format(int.from_bytes(res10, "big")))
+# >>> 11000001
+# STEP_END
+# REMOVE_START
+assert int.from_bytes(res10, "big") == 0b11000001
+# REMOVE_END
+
+# STEP_START bitop_not
+r.bitop("NOT", "R", "A")
+res11 = r.get("R")
+print("{:08b}".format(int.from_bytes(res11, "big")))
+# >>> 00100111
+# STEP_END
+# REMOVE_START
+assert int.from_bytes(res11, "big") == 0b00100111
+# REMOVE_END
+
+# STEP_START bitop_diff
+r.bitop("DIFF", "R", "A", "B", "C")
+res12 = r.get("R")
+print("{:08b}".format(int.from_bytes(res12, "big")))
+# >>> 10000000
+# STEP_END
+# REMOVE_START
+assert int.from_bytes(res12, "big") == 0b10000000
+# REMOVE_END
+
+# STEP_START bitop_diff1
+r.bitop("DIFF1", "R", "A", "B", "C")
+res13 = r.get("R")
+print("{:08b}".format(int.from_bytes(res13, "big")))
+# >>> 00100101
+# STEP_END
+# REMOVE_START
+assert int.from_bytes(res13, "big") == 0b00100101
+# REMOVE_END
+
+# STEP_START bitop_andor
+r.bitop("ANDOR", "R", "A", "B", "C")
+res14 = r.get("R")
+print("{:08b}".format(int.from_bytes(res14, "big")))
+# >>> 01011000
+# STEP_END
+# REMOVE_START
+assert int.from_bytes(res14, "big") == 0b01011000
+# REMOVE_END
+
+# STEP_START bitop_one
+r.bitop("ONE", "R", "A", "B", "C")
+res15 = r.get("R")
+print("{:08b}".format(int.from_bytes(res15, "big")))
+# >>> 10100101
+# STEP_END
+# REMOVE_START
+assert int.from_bytes(res15, "big") == 0b10100101
+# REMOVE_END

redis/_parsers/base.py

@@ -4,13 +4,13 @@
 from asyncio import IncompleteReadError, StreamReader, TimeoutError
 from typing import Awaitable, Callable, List, Optional, Protocol, Union
 
-from redis.maintenance_events import (
-    MaintenanceEvent,
-    NodeFailedOverEvent,
-    NodeFailingOverEvent,
-    NodeMigratedEvent,
-    NodeMigratingEvent,
-    NodeMovingEvent,
+from redis.maint_notifications import (
+    MaintenanceNotification,
+    NodeFailedOverNotification,
+    NodeFailingOverNotification,
+    NodeMigratedNotification,
+    NodeMigratingNotification,
+    NodeMovingNotification,
 )
 
 if sys.version_info.major >= 3 and sys.version_info.minor >= 11:
@@ -175,14 +175,14 @@ class MaintenanceNotificationsParser:
 
     @staticmethod
     def parse_maintenance_start_msg(response, notification_type):
-        # Expected message format is: <event_type> <seq_number> <time>
+        # Expected message format is: <notification_type> <seq_number> <time>
         id = response[1]
         ttl = response[2]
         return notification_type(id, ttl)
 
     @staticmethod
     def parse_maintenance_completed_msg(response, notification_type):
-        # Expected message format is: <event_type> <seq_number>
+        # Expected message format is: <notification_type> <seq_number>
         id = response[1]
         return notification_type(id)
 
@@ -200,7 +200,7 @@ def parse_moving_msg(response):
             host, port = value.split(":")
             port = int(port) if port is not None else None
 
-        return NodeMovingEvent(id, host, port, ttl)
+        return NodeMovingNotification(id, host, port, ttl)
 
 
 _INVALIDATION_MESSAGE = "invalidate"
@@ -217,25 +217,27 @@ def parse_moving_msg(response):
     _FAILED_OVER_MESSAGE,
 )
 
-MSG_TYPE_TO_EVENT_PARSER_MAPPING: dict[str, tuple[type[MaintenanceEvent], Callable]] = {
+MSG_TYPE_TO_MAINT_NOTIFICATION_PARSER_MAPPING: dict[
+    str, tuple[type[MaintenanceNotification], Callable]
+] = {
     _MIGRATING_MESSAGE: (
-        NodeMigratingEvent,
+        NodeMigratingNotification,
         MaintenanceNotificationsParser.parse_maintenance_start_msg,
     ),
     _MIGRATED_MESSAGE: (
-        NodeMigratedEvent,
+        NodeMigratedNotification,
         MaintenanceNotificationsParser.parse_maintenance_completed_msg,
     ),
     _FAILING_OVER_MESSAGE: (
-        NodeFailingOverEvent,
+        NodeFailingOverNotification,
         MaintenanceNotificationsParser.parse_maintenance_start_msg,
     ),
     _FAILED_OVER_MESSAGE: (
-        NodeFailedOverEvent,
+        NodeFailedOverNotification,
         MaintenanceNotificationsParser.parse_maintenance_completed_msg,
     ),
     _MOVING_MESSAGE: (
-        NodeMovingEvent,
+        NodeMovingNotification,
         MaintenanceNotificationsParser.parse_moving_msg,
     ),
 }
@@ -273,14 +275,20 @@ def handle_push_response(self, response, **kwargs):
                 return self.invalidation_push_handler_func(response)
 
             if msg_type == _MOVING_MESSAGE and self.node_moving_push_handler_func:
-                parser_function = MSG_TYPE_TO_EVENT_PARSER_MAPPING[msg_type][1]
+                parser_function = MSG_TYPE_TO_MAINT_NOTIFICATION_PARSER_MAPPING[
+                    msg_type
+                ][1]
 
                 notification = parser_function(response)
                 return self.node_moving_push_handler_func(notification)
 
             if msg_type in _MAINTENANCE_MESSAGES and self.maintenance_push_handler_func:
-                parser_function = MSG_TYPE_TO_EVENT_PARSER_MAPPING[msg_type][1]
-                notification_type = MSG_TYPE_TO_EVENT_PARSER_MAPPING[msg_type][0]
+                parser_function = MSG_TYPE_TO_MAINT_NOTIFICATION_PARSER_MAPPING[
+                    msg_type
+                ][1]
+                notification_type = MSG_TYPE_TO_MAINT_NOTIFICATION_PARSER_MAPPING[
+                    msg_type
+                ][0]
                 notification = parser_function(response, notification_type)
 
                 if notification is not None:
@@ -342,13 +350,19 @@ async def handle_push_response(self, response, **kwargs):
                 msg_type = msg_type.decode()
 
             if msg_type == _MOVING_MESSAGE and self.node_moving_push_handler_func:
-                parser_function = MSG_TYPE_TO_EVENT_PARSER_MAPPING[msg_type][1]
+                parser_function = MSG_TYPE_TO_MAINT_NOTIFICATION_PARSER_MAPPING[
+                    msg_type
+                ][1]
                 notification = parser_function(response)
                 return await self.node_moving_push_handler_func(notification)
 
             if msg_type in _MAINTENANCE_MESSAGES and self.maintenance_push_handler_func:
-                parser_function = MSG_TYPE_TO_EVENT_PARSER_MAPPING[msg_type][1]
-                notification_type = MSG_TYPE_TO_EVENT_PARSER_MAPPING[msg_type][0]
+                parser_function = MSG_TYPE_TO_MAINT_NOTIFICATION_PARSER_MAPPING[
+                    msg_type
+                ][1]
+                notification_type = MSG_TYPE_TO_MAINT_NOTIFICATION_PARSER_MAPPING[
+                    msg_type
+                ][0]
                 notification = parser_function(response, notification_type)
 
                 if notification is not None: