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

make relationship parsing to be more efficient through precomputation #743

Merged
merged 4 commits into from Aug 17, 2023
Merged

make relationship parsing to be more efficient through precomputation #743

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f437a44
make relationship parsing to be more efficient through precomputation
lumjjb Aug 2, 2023
a35d9c0
fix test to correctly use assumption of no comments in relationships
lumjjb Aug 11, 2023
dced5ab
fix lint errors
lumjjb Aug 11, 2023
0d508b0
fix additional lint errors in tests
lumjjb Aug 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 7 additions & 7 deletions src/spdx_tools/spdx/parser/jsonlikedict/relationship_parser.py
View file
Open in desktop
Expand Up @@ -35,24 +35,26 @@ def parse_all_relationships(self, input_doc_dict: Dict) -> List[Relationship]:
document_describes: List[str] = delete_duplicates_from_list(input_doc_dict.get("documentDescribes", []))
doc_spdx_id: Optional[str] = input_doc_dict.get("SPDXID")

existing_relationships_without_comments: List[Relationship] = self.get_all_relationships_without_comments(relationships)
relationships.extend(
parse_field_or_log_error(
self.logger,
document_describes,
lambda x: self.parse_document_describes(
doc_spdx_id=doc_spdx_id, described_spdx_ids=x, existing_relationships=relationships
doc_spdx_id=doc_spdx_id, described_spdx_ids=x, existing_relationships=existing_relationships_without_comments
),
[],
)
)

package_dicts: List[Dict] = input_doc_dict.get("packages", [])
existing_relationships_without_comments: List[Relationship] = self.get_all_relationships_without_comments(relationships)

relationships.extend(
parse_field_or_log_error(
self.logger,
package_dicts,
lambda x: self.parse_has_files(package_dicts=x, existing_relationships=relationships),
lambda x: self.parse_has_files(package_dicts=x, existing_relationships=existing_relationships_without_comments),
[],
)
)
Expand Down Expand Up @@ -151,13 +153,11 @@ def parse_has_files(
def check_if_relationship_exists(
self, relationship: Relationship, existing_relationships: List[Relationship]
) -> bool:
existing_relationships_without_comments: List[Relationship] = self.get_all_relationships_without_comments(
existing_relationships
)
if relationship in existing_relationships_without_comments:
# assume existing relationships are stripped of comments
if relationship in existing_relationships:
return True
relationship_inverted: Relationship = self.invert_relationship(relationship)
if relationship_inverted in existing_relationships_without_comments:
if relationship_inverted in existing_relationships:
return True

return False
Expand Down