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

fix(search&aggregate):fix error overwrite and typo #3220 #3224

Merged
merged 12 commits into from
Feb 20, 2025
Merged

fix(search&aggregate):fix error overwrite and typo #3220 #3224

merged 12 commits into from
Feb 20, 2025

Conversation

bitsark
Copy link
Contributor

@bitsark bitsark commented Jan 9, 2025

@bitsark
fix (redis#3220)
77a3aed 
* LOAD has NO AS param(https://redis.io/docs/latest/commands/ft.aggregate/)

* fix typo: WITHCOUT -> WITHCOUNT
@bitsark bitsark changed the title fix (#3220) fix error overwrite in search command #3220 Jan 10, 2025
@bitsark bitsark changed the title fix error overwrite in search command #3220 fix(search&aggregate):fix error overwrite and typo #3220 Jan 10, 2025
@bitsark
Copy link
Contributor Author

bitsark commented Jan 10, 2025

Fixes #3220

@ndyakov
Copy link
Collaborator

ndyakov commented Feb 4, 2025

@bitsark the RE build is falling, a test related to ft.aggregate states it expects an error, but got nil. Seems related, can you look at it?

@bitsark
Copy link
Contributor Author

bitsark commented Feb 6, 2025

@bitsark the RE build is falling, a test related to ft.aggregate states it expects an error, but got nil. Seems related, can you look at it?

sure, i will check the problem

@ndyakov
Copy link
Collaborator

ndyakov commented Feb 6, 2025

@bitsark I do see LOAD {field} AS {name} examples in https://github.com/RediSearch/RediSearch/blob/e155b7db40eeff5f29b47c6308810b2dda906c7c/docs/docs/indexing/_index.md?plain=1#L608 , and with a local test I can see the AS parameter working. Not sure if it is correctly implemented in the library, this is something we can add a test for ?

@bitsark
Copy link
Contributor Author

bitsark commented Feb 6, 2025

@bitsark I do see LOAD {field} AS {name} examples in https://github.com/RediSearch/RediSearch/blob/e155b7db40eeff5f29b47c6308810b2dda906c7c/docs/docs/indexing/_index.md?plain=1#L608 , and with a local test I can see the AS parameter working. Not sure if it is correctly implemented in the library, this is something we can add a test for ?

@ndyakov i will recheck this problem

@bitsark
Copy link
Contributor Author

bitsark commented Feb 6, 2025

@bitsark I do see LOAD {field} AS {name} examples in https://github.com/RediSearch/RediSearch/blob/e155b7db40eeff5f29b47c6308810b2dda906c7c/docs/docs/indexing/_index.md?plain=1#L608 , and with a local test I can see the AS parameter working. Not sure if it is correctly implemented in the library, this is something we can add a test for ?

@ndyakov the bug fixed in the pr is like:
FT.AGGREGATE itemIdx '*' LOAD 4 as aliasLoadName name $.price AS originalPrice
is not same as the example.

@ndyakov
Copy link
Collaborator

ndyakov commented Feb 6, 2025

@bitsark i can see the As field removed in the diff. I do think the calculation of the arguments look odd and is probably broken, but the As should be left since it is possible to have an alias for a loaded field, don't you think? Can you provide an example go code to reproduce the bug you are referring to?

@bitsark
Copy link
Contributor Author

bitsark commented Feb 6, 2025

@bitsark i can see the As field removed in the diff. I do think the calculation of the arguments look odd and is probably broken, but the As should be left since it is possible to have an alias for a loaded field, don't you think? Can you provide an example go code to reproduce the bug you are referring to?

@ndyakov , I reproduce the bug now. you are right. I misunderstood the bug. I will commit a new fix.

@ndyakov ndyakov self-assigned this Feb 7, 2025
@ndyakov ndyakov self-requested a review February 7, 2025 08:58
@bitsark
fix (redis#3220)
fd47606 
    * fixed the calculation bug of the count of load params
ndyakov
ndyakov previously approved these changes Feb 17, 2025
View reviewed changes
@ndyakov ndyakov self-requested a review February 17, 2025 19:33
ndyakov
ndyakov previously approved these changes Feb 17, 2025
View reviewed changes
Copy link
Collaborator

@ndyakov ndyakov left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bitsark let's fix the tests. I would suggest trying to update the RE version instead of having such condition in the tests.

@ndyakov
Copy link
Collaborator

ndyakov commented Feb 18, 2025

@bitsark merged an update to fix the linter.

@ndyakov ndyakov merged commit 7e517ec into redis:master Feb 20, 2025
15 checks passed
ndyakov added a commit that referenced this pull request Feb 20, 2025
@bitsark @ndyakov @ofekshenawa
fix(search&aggregate):fix error overwrite and typo #3220 (#3224)
81e383d 
* fix (#3220)

* LOAD has NO AS param(https://redis.io/docs/latest/commands/ft.aggregate/)

* fix typo: WITHCOUT -> WITHCOUNT

* fix (#3220):

    * Compatible with known RediSearch issue in test

* fix (#3220)

    * fixed the calculation bug of the count of load params

* test should not include special condition

* return errors when they occur

---------

Co-authored-by: Nedyalko Dyakov <[email protected]>
Co-authored-by: ofekshenawa <[email protected]>
@ndyakov ndyakov mentioned this pull request Feb 21, 2025
Merged
ndyakov added a commit that referenced this pull request Feb 21, 2025
@ndyakov @ofekshenawa
@LINKIWI @Cgol9 @shawnwgit @zhuhaicity @bitsark @vladvildanov
release: 9.7.1 patch (#3278)
3d041a1 
* Add guidance on unstable RESP3 support for RediSearch commands to README (#3177)

* Add UnstableResp3 to docs

* Add RawVal and RawResult to wordlist

* Explain more about SetVal

* Add UnstableResp to wordlist

* Eliminate redundant dial mutex causing unbounded connection queue contention (#3088)

* Eliminate redundant dial mutex causing unbounded connection queue contention

* Dialer connection timeouts unit test

---------

Co-authored-by: ofekshenawa <[email protected]>

* SortByWithCount FTSearchOptions fix (#3201)

* SortByWithCount FTSearchOptions fix

* FTSearch test fix

* Another FTSearch test fix

* Another FTSearch test fix

---------

Co-authored-by: Christopher Golling <[email protected]>

* Fix race condition in clusterNodes.Addrs() (#3219)

Resolve a race condition in the clusterNodes.Addrs() method.
Previously, the method returned a reference to a string slice, creating
the potential for concurrent reads by the caller while the slice was
being modified by the garbage collection process.

Co-authored-by: Nedyalko Dyakov <[email protected]>

* chore: fix some comments (#3226)

Signed-off-by: zhuhaicity <[email protected]>
Co-authored-by: Nedyalko Dyakov <[email protected]>

* fix(aggregate, search): ft.aggregate bugfixes (#3263)

* fix: rearange args for ft.aggregate

apply should be before any groupby or sortby

* improve test

* wip: add scorer and addscores

* enable all tests

* fix ftsearch with count test

* make linter happy

* Addscores is available in later redisearch releases.

For safety state it is available in redis ce 8

* load an apply seem to break scorer and addscores

* fix: add unstableresp3 to cluster client (#3266)

* fix: add unstableresp3 to cluster client

* propagate unstableresp3

* proper test that will ignore error, but fail if client panics

* add separate test for clusterclient constructor

* fix: flaky ClientKillByFilter test (#3268)

* Reinstate read-only lock on hooks access in dialHook (#3225)

* use limit when limitoffset is zero (#3275)

* remove redis 8 comments

* update package versions

* use latest golangci-lint

* fix(search&aggregate):fix error overwrite and typo  #3220 (#3224)

* fix (#3220)

* LOAD has NO AS param(https://redis.io/docs/latest/commands/ft.aggregate/)

* fix typo: WITHCOUT -> WITHCOUNT

* fix (#3220):

    * Compatible with known RediSearch issue in test

* fix (#3220)

    * fixed the calculation bug of the count of load params

* test should not include special condition

* return errors when they occur

---------

Co-authored-by: Nedyalko Dyakov <[email protected]>
Co-authored-by: ofekshenawa <[email protected]>

* Recognize byte slice for key argument in cluster client hash slot computation (#3049)

Co-authored-by: Vladyslav Vildanov <[email protected]>
Co-authored-by: ofekshenawa <[email protected]>

---------

Signed-off-by: zhuhaicity <[email protected]>
Co-authored-by: ofekshenawa <[email protected]>
Co-authored-by: LINKIWI <[email protected]>
Co-authored-by: Cgol9 <[email protected]>
Co-authored-by: Christopher Golling <[email protected]>
Co-authored-by: Shawn Wang <[email protected]>
Co-authored-by: ZhuHaiCheng <[email protected]>
Co-authored-by: herodot <[email protected]>
Co-authored-by: Vladyslav Vildanov <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ndyakov ndyakov ndyakov approved these changes

Assignees

@ndyakov ndyakov

@bitsark bitsark

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@bitsark @ndyakov @ofekshenawa