Subgraph Composition: Fix Entity Ordering with different Idtype #5760
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
zorancv
reviewed
Jan 9, 2025
| let other_str = String::from_utf8(other.id.clone()).map_err(IdCompareError::InvalidUtf8)?; | ||
| Ok(self_str.cmp(&other_str)) | ||
| } | ||
| IdType::Bytes => Ok(self.id.cmp(&other.id)), |
There was a problem hiding this comment.
The same check could be used for the string too. We don't care what is the content of the ID, only if it's equal to the other one. And I would go so far to say that it holds for Int8 case too as we don't mind if the order is ascending or descending, we only need the cmp() to be able to detect equality and have a consistent ordering otherwise which is achieved with byte comparison. So I would keep the Ord a it is and only change the type of the id field in EntityDataExt.
zorancv
requested changes
Jan 9, 2025
| @@ -406,3 +420,71 @@ fn read_immutable_only_range_test() { | |||
| assert_eq!(e.len(), 4); | |||
| }) | |||
| } | |||
|
|
|||
| #[test] | |||
| fn read_range_pool_created_test() { | |||
There was a problem hiding this comment.
Very nice to add a test case!
incrypto32
force-pushed
the
krishna/sgc-multiple-sg-sources-fix
branch
from
0d72898 to
ad34735
Compare
zorancv
approved these changes
Jan 9, 2025
| fn compare_entity_data_ext(a: &EntityDataExt, b: &EntityDataExt) -> std::cmp::Ordering { | ||
| a.block_number | ||
| .cmp(&b.block_number) | ||
| .then_with(|| a.entity.cmp(&b.entity)) |
incrypto32
force-pushed
the
krishna/sgc-multiple-sg-sources-fix
branch
from
ad34735 to
748ff48
Compare
incrypto32
changed the base branch from
krishna/sgc-multiple-sg-sources
to
zoran/subgraph-composition-rework-vid-wrap2
zorancv
force-pushed
the
zoran/subgraph-composition-rework-vid-wrap2
branch
13 times, most recently
from
14671db to
640e7d1
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.