Skip to content

Commit 5cba97a

Browse files
authored
Fixing search module dropindex function not to send invalid third parameter. Updating pipeline infra (#3564)
* Fixing search module dropindex function not to send invalid third parameter. Updating pipeline infra * Fixing linters
1 parent 9251650 commit 5cba97a

File tree

4 files changed

+22
-12
lines changed

4 files changed

+22
-12
lines changed

.github/workflows/integration.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ jobs:
7474
max-parallel: 15
7575
fail-fast: false
7676
matrix:
77-
redis-version: ['8.0-M04-pre', '${{ needs.redis_version.outputs.CURRENT }}', '7.2.7', '6.2.17']
77+
redis-version: ['8.0-M05-pre', '${{ needs.redis_version.outputs.CURRENT }}', '7.2.7', '6.2.17']
7878
python-version: ['3.8', '3.13']
7979
parser-backend: ['plain']
8080
event-loop: ['asyncio']

redis/commands/search/commands.py

+12-2
Original file line numberDiff line numberDiff line change
@@ -255,8 +255,18 @@ def dropindex(self, delete_documents: bool = False):
255255
256256
For more information see `FT.DROPINDEX <https://redis.io/commands/ft.dropindex>`_.
257257
""" # noqa
258-
delete_str = "DD" if delete_documents else ""
259-
return self.execute_command(DROPINDEX_CMD, self.index_name, delete_str)
258+
args = [DROPINDEX_CMD, self.index_name]
259+
260+
delete_str = (
261+
"DD"
262+
if isinstance(delete_documents, bool) and delete_documents is True
263+
else ""
264+
)
265+
266+
if delete_str:
267+
args.append(delete_str)
268+
269+
return self.execute_command(*args)
260270

261271
def _add_document(
262272
self,

tests/test_asyncio/test_search.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -1603,14 +1603,14 @@ async def test_withsuffixtrie(decoded_r: redis.Redis):
16031603
if is_resp2_connection(decoded_r):
16041604
info = await decoded_r.ft().info()
16051605
assert "WITHSUFFIXTRIE" not in info["attributes"][0]
1606-
assert await decoded_r.ft().dropindex("idx")
1606+
assert await decoded_r.ft().dropindex()
16071607

16081608
# create withsuffixtrie index (text field)
16091609
assert await decoded_r.ft().create_index(TextField("t", withsuffixtrie=True))
16101610
await waitForIndex(decoded_r, getattr(decoded_r.ft(), "index_name", "idx"))
16111611
info = await decoded_r.ft().info()
16121612
assert "WITHSUFFIXTRIE" in info["attributes"][0]
1613-
assert await decoded_r.ft().dropindex("idx")
1613+
assert await decoded_r.ft().dropindex()
16141614

16151615
# create withsuffixtrie index (tag field)
16161616
assert await decoded_r.ft().create_index(TagField("t", withsuffixtrie=True))
@@ -1620,14 +1620,14 @@ async def test_withsuffixtrie(decoded_r: redis.Redis):
16201620
else:
16211621
info = await decoded_r.ft().info()
16221622
assert "WITHSUFFIXTRIE" not in info["attributes"][0]["flags"]
1623-
assert await decoded_r.ft().dropindex("idx")
1623+
assert await decoded_r.ft().dropindex()
16241624

16251625
# create withsuffixtrie index (text fields)
16261626
assert await decoded_r.ft().create_index(TextField("t", withsuffixtrie=True))
16271627
await waitForIndex(decoded_r, getattr(decoded_r.ft(), "index_name", "idx"))
16281628
info = await decoded_r.ft().info()
16291629
assert "WITHSUFFIXTRIE" in info["attributes"][0]["flags"]
1630-
assert await decoded_r.ft().dropindex("idx")
1630+
assert await decoded_r.ft().dropindex()
16311631

16321632
# create withsuffixtrie index (tag field)
16331633
assert await decoded_r.ft().create_index(TagField("t", withsuffixtrie=True))

tests/test_search.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -1711,7 +1711,7 @@ def test_max_text_fields(client):
17111711
with pytest.raises(redis.ResponseError):
17121712
client.ft().alter_schema_add((TextField(f"f{x}"),))
17131713

1714-
client.ft().dropindex("idx")
1714+
client.ft().dropindex()
17151715
# Creating the index definition
17161716
client.ft().create_index((TextField("f0"),), max_text_fields=True)
17171717
# Fill the index with fields
@@ -2575,14 +2575,14 @@ def test_withsuffixtrie(client: redis.Redis):
25752575
if is_resp2_connection(client):
25762576
info = client.ft().info()
25772577
assert "WITHSUFFIXTRIE" not in info["attributes"][0]
2578-
assert client.ft().dropindex("idx")
2578+
assert client.ft().dropindex()
25792579

25802580
# create withsuffixtrie index (text fields)
25812581
assert client.ft().create_index(TextField("t", withsuffixtrie=True))
25822582
waitForIndex(client, getattr(client.ft(), "index_name", "idx"))
25832583
info = client.ft().info()
25842584
assert "WITHSUFFIXTRIE" in info["attributes"][0]
2585-
assert client.ft().dropindex("idx")
2585+
assert client.ft().dropindex()
25862586

25872587
# create withsuffixtrie index (tag field)
25882588
assert client.ft().create_index(TagField("t", withsuffixtrie=True))
@@ -2592,14 +2592,14 @@ def test_withsuffixtrie(client: redis.Redis):
25922592
else:
25932593
info = client.ft().info()
25942594
assert "WITHSUFFIXTRIE" not in info["attributes"][0]["flags"]
2595-
assert client.ft().dropindex("idx")
2595+
assert client.ft().dropindex()
25962596

25972597
# create withsuffixtrie index (text fields)
25982598
assert client.ft().create_index(TextField("t", withsuffixtrie=True))
25992599
waitForIndex(client, getattr(client.ft(), "index_name", "idx"))
26002600
info = client.ft().info()
26012601
assert "WITHSUFFIXTRIE" in info["attributes"][0]["flags"]
2602-
assert client.ft().dropindex("idx")
2602+
assert client.ft().dropindex()
26032603

26042604
# create withsuffixtrie index (tag field)
26052605
assert client.ft().create_index(TagField("t", withsuffixtrie=True))

0 commit comments

Comments
 (0)