Skip to content

Commit

Permalink
Merge branch 'master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
dvora-h authored May 31, 2022
2 parents 8a53aad + bac33d4 commit 4c46715
Show file tree
Hide file tree
Showing 38 changed files with 993 additions and 766 deletions.
1 change: 1 addition & 0 deletions CHANGES
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
* Remove verbose logging when initializing ClusterPubSub, ClusterPipeline or RedisCluster
* Fix broken connection writer lock-up for asyncio (#2065)
* Fix auth bug when provided with no username (#2086)
* Fix missing ClusterPipeline._lock (#2189)

* 4.1.3 (Feb 8, 2022)
* Fix flushdb and flushall (#1926)
Expand Down
8 changes: 4 additions & 4 deletions benchmarks/cluster_async.py
Original file line number Diff line number Diff line change
Expand Up @@ -206,8 +206,8 @@ async def main(loop, gather=None):
host=host,
port=port,
password=password,
max_connections=2 ** 31,
max_connections_per_node=2 ** 31,
max_connections=2**31,
max_connections_per_node=2**31,
readonly=False,
reinitialize_steps=count,
skip_full_coverage_check=True,
Expand All @@ -224,7 +224,7 @@ async def main(loop, gather=None):
password=password,
state_reload_interval=count,
idle_connection_timeout=count,
pool_maxsize=2 ** 31,
pool_maxsize=2**31,
)
print(f"{loop} {gather} {await warmup(aiorc)} aioredis-cluster")
print(await run(aiorc, gather=gather))
Expand All @@ -238,7 +238,7 @@ async def main(loop, gather=None):
reinitialize_steps=count,
read_from_replicas=False,
decode_responses=False,
max_connections=2 ** 31,
max_connections=2**31,
) as rca:
print(f"{loop} {gather} {await warmup(rca)} redispy")
print(await run(rca, gather=gather))
Expand Down
2 changes: 1 addition & 1 deletion dev_requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
click==8.0.4
black==21.11b1
black==22.3.0
flake8==4.0.1
flynt~=0.69.0
isort==5.10.1
Expand Down
5 changes: 5 additions & 0 deletions docs/connections.rst
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,11 @@ ClusterNode (Async)
.. autoclass:: redis.asyncio.cluster.ClusterNode
:members:

ClusterPipeline (Async)
===================
.. autoclass:: redis.asyncio.cluster.ClusterPipeline
:members:


Connection
**********
Expand Down
Loading

0 comments on commit 4c46715

Please sign in to comment.