Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

update json().arrindex() default values #2611

Merged
merged 6 commits into from Mar 15, 2023
Merged

update json().arrindex() default values #2611

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
bcc0fc2
update json().arrindex() default values
davemcphee Mar 13, 2023
7ca1d37
add unit test
davemcphee Mar 13, 2023
5ff8fcf
fix falsy checks
davemcphee Mar 14, 2023
fd615c6
more unit tests
davemcphee Mar 14, 2023
d76bbed
add asyncio tests
davemcphee Mar 14, 2023
69ea3da
fix lint line length
davemcphee Mar 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 9 additions & 5 deletions redis/commands/json/commands.py
View file
Open in desktop
Expand Up @@ -31,8 +31,8 @@ def arrindex(
name: str,
path: str,
scalar: int,
start: Optional[int] = 0,
stop: Optional[int] = -1,
start: Optional[int] = None,
stop: Optional[int] = None,
) -> List[Union[int, None]]:
"""
Return the index of ``scalar`` in the JSON array under ``path`` at key
Expand All @@ -43,9 +43,13 @@ def arrindex(

For more information see `JSON.ARRINDEX <https://redis.io/commands/json.arrindex>`_.
""" # noqa
return self.execute_command(
"JSON.ARRINDEX", name, str(path), self._encode(scalar), start, stop
)
pieces = [name, str(path), self._encode(scalar)]
if start is not None:
pieces.append(start)
if stop is not None:
pieces.append(stop)

return self.execute_command("JSON.ARRINDEX", *pieces)

def arrinsert(
self, name: str, path: str, index: int, *args: List[JsonType]
Expand Down
12 changes: 9 additions & 3 deletions tests/test_asyncio/test_json.py
View file
Open in desktop
Expand Up @@ -145,9 +145,15 @@ async def test_arrappend(modclient: redis.Redis):

@pytest.mark.redismod
async def test_arrindex(modclient: redis.Redis):
await modclient.json().set("arr", Path.root_path(), [0, 1, 2, 3, 4])
assert 1 == await modclient.json().arrindex("arr", Path.root_path(), 1)
assert -1 == await modclient.json().arrindex("arr", Path.root_path(), 1, 2)
r_path = Path.root_path()
await modclient.json().set("arr", r_path, [0, 1, 2, 3, 4])
assert 1 == await modclient.json().arrindex("arr", r_path, 1)
assert -1 == await modclient.json().arrindex("arr", r_path, 1, 2)
assert 4 == await modclient.json().arrindex("arr", r_path, 4)
assert 4 == await modclient.json().arrindex("arr", r_path, 4, start=0)
assert 4 == await modclient.json().arrindex("arr", r_path, 4, start=0, stop=5000)
assert -1 == await modclient.json().arrindex("arr", r_path, 4, start=0, stop=-1)
assert -1 == await modclient.json().arrindex("arr", r_path, 4, start=1, stop=3)


@pytest.mark.redismod
Expand Down
5 changes: 5 additions & 0 deletions tests/test_json.py
View file
Open in desktop
Expand Up @@ -166,6 +166,11 @@ def test_arrindex(client):
client.json().set("arr", Path.root_path(), [0, 1, 2, 3, 4])
assert 1 == client.json().arrindex("arr", Path.root_path(), 1)
assert -1 == client.json().arrindex("arr", Path.root_path(), 1, 2)
assert 4 == client.json().arrindex("arr", Path.root_path(), 4)
assert 4 == client.json().arrindex("arr", Path.root_path(), 4, start=0)
assert 4 == client.json().arrindex("arr", Path.root_path(), 4, start=0, stop=5000)
assert -1 == client.json().arrindex("arr", Path.root_path(), 4, start=0, stop=-1)
assert -1 == client.json().arrindex("arr", Path.root_path(), 4, start=1, stop=3)


@pytest.mark.redismod
Expand Down