Skip to content

Support timeout = 0 in search query #2934

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

Merged
merged 12 commits into from
Sep 14, 2023
Merged

Support timeout = 0 in search query #2934

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
b7e52cb
Support query timeout = 0
meiravgri Sep 12, 2023
b59492b
added a test to quety.timeout(0)
meiravgri Sep 12, 2023
3fb2c68
raise an exception if query TIMEOUT is a non negative integer
meiravgri Sep 12, 2023
25d4ddf
fixed the query test to catach AttributeError
meiravgri Sep 12, 2023
7a020bd
Moved validating timeout to timeout()
meiravgri Sep 12, 2023
6590130
updates test to catch the exception when query.timeout() is called
meiravgri Sep 12, 2023
fb2b710
Update redis/commands/search/query.py
meiravgri Sep 12, 2023
3d06d80
Revert "Update redis/commands/search/query.py"
meiravgri Sep 14, 2023
e4a0f89
Revert "updates test to catch the exception when query.timeout() is c…
meiravgri Sep 14, 2023
e2c7dd7
Revert "Moved validating timeout to timeout()"
meiravgri Sep 14, 2023
0acc0c7
Revert "fixed the query test to catach AttributeError"
meiravgri Sep 14, 2023
e5ca6e3
Revert "raise an exception if query TIMEOUT is a non negative integer"
meiravgri Sep 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion redis/commands/search/query.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ def _get_args_tags(self):
args += self._ids
if self._slop >= 0:
args += ["SLOP", self._slop]
if self._timeout:
if self._timeout is not None:
args += ["TIMEOUT", self._timeout]
if self._in_order:
args.append("INORDER")
Expand Down
2 changes: 2 additions & 0 deletions tests/test_search.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2264,6 +2264,8 @@ def test_withsuffixtrie(client: redis.Redis):
def test_query_timeout(r: redis.Redis):
q1 = Query("foo").timeout(5000)
assert q1.get_args() == ["foo", "TIMEOUT", 5000, "LIMIT", 0, 10]
q1 = Query("foo").timeout(0)
assert q1.get_args() == ["foo", "TIMEOUT", 0, "LIMIT", 0, 10]
q2 = Query("foo").timeout("not_a_number")
with pytest.raises(redis.ResponseError):
r.ft().search(q2)