MOD-7634: Fix NOSTEM by nafraf · Pull Request #4956 · RediSearch/RediSearch

nafraf · 2024-08-23T23:57:28Z

Describe the changes in the pull request

Current state:
NOSTEM field option is used for tokenization, but it is not used during the query.

Example of behavior before the change

127.0.0.1:6379> FT.CREATE idx schema body text name text nostem
OK
127.0.0.1:6379> FT.EXPLAINCLI idx '@body:(cherry)'
1) @body:UNION {
2)   @body:cherry
3)   @body:+cherri(expanded)
4)   @body:cherri(expanded)
5) }
6) 
127.0.0.1:6379> FT.EXPLAINCLI idx '@name:(cherry)'
1) @name:UNION {
2)   @name:cherry
3)   @name:+cherri(expanded)
4)   @name:cherri(expanded)
5) }

What is the change
Don't expand terms if the field contains the option NOSTEM

Adding the outcome (changed state)

127.0.0.1:6380> FT.CREATE idx schema body text name text nostem
OK
127.0.0.1:6380> FT.EXPLAINCLI idx '@body:(cherry)'
1) @body:UNION {
2)   @body:cherry
3)   @body:+cherri(expanded)
4)   @body:cherri(expanded)
5) }
6) 
127.0.0.1:6380> FT.EXPLAINCLI idx '@name:(cherry)'
1) @name:cherry
2)

Which issues this PR fixes

MOD-7634

Main objects this PR modified

...
...

Mark if applicable

This PR introduces API changes
This PR introduces serialization changes

codecov · 2024-08-25T07:28:18Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 86.73%. Comparing base (805d3d8) to head (97d791a).
Report is 18 commits behind head on master.

Additional details and impacted files

@@            Coverage Diff             @@
##           master    #4956      +/-   ##
==========================================
- Coverage   86.73%   86.73%   -0.01%     
==========================================
  Files         193      193              
  Lines       34704    34741      +37     
==========================================
+ Hits        30101    30133      +32     
- Misses       4603     4608       +5

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

* * initial commit * * Use RediSearch branch mirroring fork * * Code Review - Round #1

…4972) change the number of maxPending requests when changing the number of connections

* * initial commit * * code review

* remove compilation flag (wip) * finish removing compilation flag * remove from tests

tests/pytests/test.py

ramp-packer 2.5.10

github-actions · 2024-11-12T01:59:28Z

This pull request is stale because it has been open for 60 days with no activity.

src/ext/default.c

src/query.c

oshadmi

Nice 👍🏼

Co-authored-by: Omer Shadmi <[email protected]>

oshadmi · 2024-12-22T07:57:01Z

/backport

redisearch-backport-pull-request · 2024-12-22T07:57:18Z

Backport failed for 2.8, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin 2.8
git worktree add -d .worktree/backport-4956-to-2.8 origin/2.8
cd .worktree/backport-4956-to-2.8
git switch --create backport-4956-to-2.8
git cherry-pick -x 54af5c8a1054f78093d863f601f0ce68388ce6df

redisearch-backport-pull-request · 2024-12-22T07:57:20Z

Backport failed for 2.6, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin 2.6
git worktree add -d .worktree/backport-4956-to-2.6 origin/2.6
cd .worktree/backport-4956-to-2.6
git switch --create backport-4956-to-2.6
git cherry-pick -x 54af5c8a1054f78093d863f601f0ce68388ce6df

* Fix NOSTEM * Fix testNoStem * Check spec is not NULL * Add comments to testNoStem * MOD-7596: Add mirroring support (#4937) * * initial commit * * Use RediSearch branch mirroring fork * * Code Review - Round #1 * Change maxPending requests when changing the number of connections (#4972) change the number of maxPending requests when changing the number of connections * MOD-7695: Decide Ubuntu Runner Using Variable (#4975) * * initial commit * * code review * Enable MT in comunity eddition by default - [MOD-7160] (#4974) * remove compilation flag (wip) * finish removing compilation flag * remove from tests * MOD-7706 fix ramp-packer version (#4980) ramp-packer 2.5.10 * Fix expansion for modifier lists * Delete event-mirror.yml it is not part of this PR * Simplify bit masking * Update src/query.c Co-authored-by: Omer Shadmi <[email protected]> * Update src/ext/default.c Co-authored-by: Omer Shadmi <[email protected]> --------- Co-authored-by: kei-nan <[email protected]> Co-authored-by: GuyAv46 <[email protected]> Co-authored-by: DvirDukhan <[email protected]> Co-authored-by: Omer Shadmi <[email protected]> (cherry picked from commit 54af5c8)

redisearch-backport-pull-request · 2024-12-22T07:57:23Z

Successfully created backport PR for 2.10:

[2.10] MOD-7634: Fix NOSTEM #5392

redisearch-backport-pull-request · 2024-12-22T07:57:25Z

Successfully created backport PR for 8.0:

[8.0] MOD-7634: Fix NOSTEM #5393

* Fix NOSTEM * Fix testNoStem * Check spec is not NULL * Add comments to testNoStem * MOD-7596: Add mirroring support (#4937) * * initial commit * * Use RediSearch branch mirroring fork * * Code Review - Round #1 * Change maxPending requests when changing the number of connections (#4972) change the number of maxPending requests when changing the number of connections * MOD-7695: Decide Ubuntu Runner Using Variable (#4975) * * initial commit * * code review * Enable MT in comunity eddition by default - [MOD-7160] (#4974) * remove compilation flag (wip) * finish removing compilation flag * remove from tests * MOD-7706 fix ramp-packer version (#4980) ramp-packer 2.5.10 * Fix expansion for modifier lists * Delete event-mirror.yml it is not part of this PR * Simplify bit masking * Update src/query.c Co-authored-by: Omer Shadmi <[email protected]> * Update src/ext/default.c Co-authored-by: Omer Shadmi <[email protected]> --------- Co-authored-by: kei-nan <[email protected]> Co-authored-by: GuyAv46 <[email protected]> Co-authored-by: DvirDukhan <[email protected]> Co-authored-by: Omer Shadmi <[email protected]> (cherry picked from commit 54af5c8)

MOD-7634: Fix NOSTEM (#4956) * Fix NOSTEM * Fix testNoStem * Check spec is not NULL * Add comments to testNoStem * MOD-7596: Add mirroring support (#4937) * * initial commit * * Use RediSearch branch mirroring fork * * Code Review - Round #1 * Change maxPending requests when changing the number of connections (#4972) change the number of maxPending requests when changing the number of connections * MOD-7695: Decide Ubuntu Runner Using Variable (#4975) * * initial commit * * code review * Enable MT in comunity eddition by default - [MOD-7160] (#4974) * remove compilation flag (wip) * finish removing compilation flag * remove from tests * MOD-7706 fix ramp-packer version (#4980) ramp-packer 2.5.10 * Fix expansion for modifier lists * Delete event-mirror.yml it is not part of this PR * Simplify bit masking * Update src/query.c Co-authored-by: Omer Shadmi <[email protected]> * Update src/ext/default.c Co-authored-by: Omer Shadmi <[email protected]> --------- Co-authored-by: kei-nan <[email protected]> Co-authored-by: GuyAv46 <[email protected]> Co-authored-by: DvirDukhan <[email protected]> Co-authored-by: Omer Shadmi <[email protected]> (cherry picked from commit 54af5c8) Co-authored-by: nafraf <[email protected]>

(cherry picked from commit 54af5c8)

* MOD-7634: Fix NOSTEM (#4956) (cherry picked from commit 54af5c8) * Backport IndexSpec_GetFieldByBit()

nafraf added 4 commits August 23, 2024 18:56

Fix NOSTEM

1eb81a8

Fix testNoStem

05deb7d

Check spec is not NULL

dc511a9

Add comments to testNoStem

06aabf0

nafraf changed the title ~~Fix NOSTEM~~ MOD-7634: Fix NOSTEM Aug 25, 2024

nafraf marked this pull request as ready for review August 25, 2024 07:04

nafraf requested a review from oshadmi August 25, 2024 17:42

kei-nan and others added 4 commits August 28, 2024 15:15

MOD-7596: Add mirroring support (#4937)

baaf2fe

* * initial commit * * Use RediSearch branch mirroring fork * * Code Review - Round #1

Change maxPending requests when changing the number of connections (#…

c39a3eb

…4972) change the number of maxPending requests when changing the number of connections

MOD-7695: Decide Ubuntu Runner Using Variable (#4975)

b08373e

* * initial commit * * code review

Enable MT in comunity eddition by default - [MOD-7160] (#4974)

9e1f2da

* remove compilation flag (wip) * finish removing compilation flag * remove from tests

oshadmi reviewed Sep 2, 2024

View reviewed changes

tests/pytests/test.py Outdated Show resolved Hide resolved

DvirDukhan and others added 3 commits September 2, 2024 14:59

MOD-7706 fix ramp-packer version (#4980)

d562549

ramp-packer 2.5.10

Merge branch 'master' into nafraf_fix-nostem

fa6f8b1

Fix expansion for modifier lists

448235a

nafraf requested a review from oshadmi September 6, 2024 21:30

kei-nan force-pushed the master branch from 6adbeea to c1e17d9 Compare September 8, 2024 11:16

nafraf added 3 commits September 8, 2024 11:26

Merge branch 'master' into nafraf_fix-nostem

8094950

Merge branch 'master' into nafraf_fix-nostem

0e6e289

Delete event-mirror.yml it is not part of this PR

05c5924

github-actions bot added the stale label Nov 12, 2024

oshadmi reviewed Nov 25, 2024

View reviewed changes

src/ext/default.c Outdated Show resolved Hide resolved

Merge branch 'master' into nafraf_fix-nostem

55dc035

nafraf removed the stale label Nov 25, 2024

Simplify bit masking

3bfed91

nafraf requested a review from oshadmi November 25, 2024 22:53

Merge branch 'master' into nafraf_fix-nostem

ccde551

oshadmi reviewed Dec 10, 2024

View reviewed changes

src/ext/default.c Outdated Show resolved Hide resolved

oshadmi reviewed Dec 10, 2024

View reviewed changes

src/query.c Outdated Show resolved Hide resolved

oshadmi previously approved these changes Dec 10, 2024

View reviewed changes

Update src/query.c

763eb78

Co-authored-by: Omer Shadmi <[email protected]>

nafraf dismissed oshadmi’s stale review via 763eb78 December 10, 2024 14:36

Update src/ext/default.c

97d791a

Co-authored-by: Omer Shadmi <[email protected]>

nafraf requested a review from oshadmi December 10, 2024 15:08

oshadmi approved these changes Dec 10, 2024

View reviewed changes

nafraf added this pull request to the merge queue Dec 10, 2024

Merged via the queue into master with commit 54af5c8 Dec 10, 2024

nafraf deleted the nafraf_fix-nostem branch December 10, 2024 15:45

oshadmi added backport 2.8 backport 2.6 backport 2.10 backport 8.0 labels Dec 22, 2024

redisearch-backport-pull-request bot mentioned this pull request Dec 22, 2024

[2.10] MOD-7634: Fix NOSTEM #5392

Merged

redisearch-backport-pull-request bot mentioned this pull request Dec 22, 2024

[8.0] MOD-7634: Fix NOSTEM #5393

Merged

nafraf mentioned this pull request Jan 8, 2025

[2.8] MOD-7634: Fix NOSTEM #5475

Merged

nafraf added a commit that referenced this pull request Jan 8, 2025

MOD-7634: Fix NOSTEM (#4956)

74b94af

(cherry picked from commit 54af5c8)

nafraf mentioned this pull request Jan 8, 2025

[2.6] MOD-7634: Fix NOSTEM #5484

Merged

github-merge-queue bot pushed a commit that referenced this pull request Jan 9, 2025

[2.6] MOD-7634: Fix NOSTEM (#5484)

54a82e0

* MOD-7634: Fix NOSTEM (#4956) (cherry picked from commit 54af5c8) * Backport IndexSpec_GetFieldByBit()

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

MOD-7634: Fix NOSTEM#4956

MOD-7634: Fix NOSTEM#4956
nafraf merged 19 commits intomasterfrom
nafraf_fix-nostem

nafraf commented Aug 23, 2024 •

edited

Loading

Uh oh!

codecov bot commented Aug 25, 2024 •

edited

Loading

Uh oh!

Uh oh!

github-actions bot commented Nov 12, 2024

Uh oh!

Uh oh!

Uh oh!

Uh oh!

oshadmi left a comment

Uh oh!

oshadmi commented Dec 22, 2024

Uh oh!

redisearch-backport-pull-request bot commented Dec 22, 2024

Uh oh!

redisearch-backport-pull-request bot commented Dec 22, 2024

Uh oh!

redisearch-backport-pull-request bot commented Dec 22, 2024

Uh oh!

redisearch-backport-pull-request bot commented Dec 22, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Conversation

nafraf commented Aug 23, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

codecov bot commented Aug 25, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Uh oh!

github-actions bot commented Nov 12, 2024

Uh oh!

Uh oh!

Uh oh!

Uh oh!

oshadmi left a comment

Choose a reason for hiding this comment

Uh oh!

oshadmi commented Dec 22, 2024

Uh oh!

redisearch-backport-pull-request bot commented Dec 22, 2024

Uh oh!

redisearch-backport-pull-request bot commented Dec 22, 2024

Uh oh!

redisearch-backport-pull-request bot commented Dec 22, 2024

Uh oh!

redisearch-backport-pull-request bot commented Dec 22, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

nafraf commented Aug 23, 2024 •

edited

Loading

codecov bot commented Aug 25, 2024 •

edited

Loading