Skip to content

indegree(), outdegree() - accept array of strings #2807

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.

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 20 commits into from
Jan 23, 2023

Conversation

nafraf
Copy link
Contributor

@nafraf nafraf commented Dec 30, 2022

These changes are to implement #2781

Strings and array of strings are accepted as arguments:

GRAPH.QUERY g "CREATE (a:A)-[:R]->(b:B)"

127.0.0.1:6379> GRAPH.QUERY g "MATCH (a:A) RETURN outdegree(a, 'R', ['R','R'])"
1) 1) "outdegree(a, 'R', ['R','R'])"
2) 1) 1) (integer) 1

127.0.0.1:6379> GRAPH.QUERY g "MATCH (a:A) RETURN outdegree(a, ['R','R'],'R')"
1) 1) "outdegree(a, ['R','R'],'R')"
2) 1) 1) (integer) 1

@codecov
Copy link

codecov bot commented Dec 30, 2022

Codecov Report

Base: 91.17% // Head: 91.17% // Increases project coverage by +0.00% 🎉

Coverage data is based on head (bf8fa75) compared to base (cc57c35).
Patch coverage: 97.72% of modified lines in pull request are covered.

Additional details and impacted files
@@           Coverage Diff           @@
##           master    #2807   +/-   ##
=======================================
  Coverage   91.17%   91.17%           
=======================================
  Files         267      267           
  Lines       25519    25547   +28     
=======================================
+ Hits        23267    23293   +26     
- Misses       2252     2254    +2     
Impacted Files Coverage Δ
src/datatypes/array.c 77.92% <93.75%> (+4.07%) ⬆️
src/arithmetic/entity_funcs/entity_funcs.c 97.56% <100.00%> (+0.29%) ⬆️
src/arithmetic/list_funcs/list_funcs.c 98.98% <100.00%> (-0.03%) ⬇️
src/graph/rg_matrix/rg_extract.c 92.85% <0.00%> (-3.58%) ⬇️
src/procedures/proc_sp_paths.c 95.41% <0.00%> (-0.29%) ⬇️
src/procedures/proc_ss_paths.c 91.56% <0.00%> (ø)

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report at Codecov.
📢 Do you have feedback about the report comment? Let us know in this issue.

@nafraf nafraf marked this pull request as ready for review December 30, 2022 22:14
@swilly22
Copy link
Contributor

@LiorKogan, @nafraf
we would like to support only the following two signatures:

  1. outdegree(NODE, ARRAY_OF_STRINGS)
  2. outdegree(NODE, STR_0, STR_1, ... STR_N)

Either a single array of strings is provided or a variable number of individual strings.
I won't want to support a mixture of the two.

@nafraf
Copy link
Contributor Author

nafraf commented Jan 23, 2023

@swilly22 @LiorKogan
I implemented the validations to limit to two signatures.
These are the messages in case of error:

127.0.0.1:6379> GRAPH.QUERY g "MATCH (a:A) RETURN outdegree(a, 'R', ['R'])"
(error) Type mismatch: expected String but was List
127.0.0.1:6379> GRAPH.QUERY g "MATCH (a:A) RETURN outdegree(a, ['R'], 'R')"
(error) Received 3 arguments, expected at most 2 because second argument is List

@AviAvni AviAvni merged commit 6fe35d2 into RedisGraph:master Jan 23, 2023
@nafraf nafraf deleted the feature#2781 branch January 25, 2023 01:48
raz-mon pushed a commit that referenced this pull request Jan 25, 2023
* _AR_NodeDegree() support T_ARRAY argument

* Add tests

* Fix argument validation

* Free array in case of error detected.

* Duplicate comments and use siarray.array[i]

* Update AR_IN() to use SI_ArrayContainsValue()

* Validate comparedNull pointer

* Support only the following two signatures:

* Test indegree() wrong argument number

* Test wrong signature: string and list

* clean

* revert

Co-authored-by: Avi Avni <avi.avni@gmail.com>
AviAvni added a commit that referenced this pull request Jan 25, 2023
* Fix toInteger() and toIntegerOrNull() don't convert Booleans (#2797)

* AR_TOINTEGER: add case for type T_BOOL

* skip [8] toInteger() failing on invalid arguments

* Update TypeConversion2.feature

Co-authored-by: Avi Avni <avi.avni@gmail.com>

* Fix right(), left() length validation (#2801)

* Fix AR_LEFT, AR_RIGHT length validation

* Test mistmatch type and fix error message

* left(), right(): NULL is a valid type for lenght

* Fix argument validation

Co-authored-by: Avi Avni <avi.avni@gmail.com>

* fix using timeout max as default when default not configured (#2808)

* fix using timeout max as default when default not configured

* fix

* do not cache query params (#2803)

* do not cache query params

* address PR comments

* fix leak

* fix test

* convert params to SIValues

* wip

* delay freeing of parsed params to after the query is parsed

* free parse params when freeing AST

* revert changes to ast_validations.c

* revert arithmetic_expression_construct changes

* emit an error when param value eval fails

Co-authored-by: Avi Avni <avi.avni@gmail.com>

* fix multi-hop traverse with name path (#2743)

* Add varLen property to QGEdge

* Test variable-length edge queries

* Fix spacing

* Fix test, remove direction

* Fix test

* Test zero length edge

* Init varLen in QGEdge_New()

* rename varLen to rangeLen

* Rewrite test11_range_length_edges()

* Use QGEdge_VariableLength() and QGEdge_RangeLength

* Replace QGEdge_RangeLength() by QGEdge_LengthOne()

* rename function

Co-authored-by: Roi Lipman <swilly22@users.noreply.github.com>
Co-authored-by: Avi Avni <avi.avni@gmail.com>

* indegree(), outdegree() - accept array of strings (#2807)

* _AR_NodeDegree() support T_ARRAY argument

* Add tests

* Fix argument validation

* Free array in case of error detected.

* Duplicate comments and use siarray.array[i]

* Update AR_IN() to use SI_ArrayContainsValue()

* Validate comparedNull pointer

* Support only the following two signatures:

* Test indegree() wrong argument number

* Test wrong signature: string and list

* clean

* revert

Co-authored-by: Avi Avni <avi.avni@gmail.com>

* Add ipv6 capability (#2842)

* fix heap remove item (#2827)

* fix heap remove item

* remove utf8 deps

* add test

* wip

* wip

* all unit tests pass

* heap remove element should use pointer cmp instead of cmp cb

* spaces to tabs

Co-authored-by: swilly22 <roi@redislabs.com>
Co-authored-by: Roi Lipman <swilly22@users.noreply.github.com>

* bump version 2.10.6

* Improve edge deletion performance (#2758)

* improve edge deletion

* update simple timer

* improve edge deletion perf

* fix build

* fix test

* fix test

* clean

* address review

Co-authored-by: Roi Lipman <swilly22@users.noreply.github.com>

* update ramp

Co-authored-by: nafraf <nafraf@users.noreply.github.com>
Co-authored-by: Avi Avni <avi.avni@gmail.com>
Co-authored-by: Roi Lipman <swilly22@users.noreply.github.com>
Co-authored-by: Guy Korland <gkorland@gmail.com>
Co-authored-by: swilly22 <roi@redislabs.com>
pnxguide pushed a commit to CMU-SPEED/RedisGraph that referenced this pull request Mar 22, 2023
* _AR_NodeDegree() support T_ARRAY argument

* Add tests

* Fix argument validation

* Free array in case of error detected.

* Duplicate comments and use siarray.array[i]

* Update AR_IN() to use SI_ArrayContainsValue()

* Validate comparedNull pointer

* Support only the following two signatures:

* Test indegree() wrong argument number

* Test wrong signature: string and list

* clean

* revert

Co-authored-by: Avi Avni <avi.avni@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants