[Core] Port 12078 reduce port system load #1318
Open
+149
−122
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
yaelibarg
changed the title
Comment on lines
+160
to
+165
| entities_at_port_with_properties = await ocean.port_client.search_entities( | ||
| user_agent_type, | ||
| include_params=["blueprint", "identifier"] + [ | ||
| f"properties.{prop}" for prop in resource.port.entity.mappings.properties | ||
| ], | ||
| query=query |
There was a problem hiding this comment.
can you move it to a separate function for constructing query?
Comment on lines
167
to
168
| unique_entities = get_unique_entities(objects_diff[0].entity_selector_diff.passed, entities_at_port_with_properties) | ||
| modified_objects = [] |
There was a problem hiding this comment.
Suggested change
| unique_entities = get_unique_entities(objects_diff[0].entity_selector_diff.passed, entities_at_port_with_properties) | |
| modified_objects = [] | |
| changed_entities = get_unique_entities(objects_diff[0].entity_selector_diff.passed, entities_at_port_with_properties) | |
| modified_objects = [] |
Comment on lines
+144
to
+165
| query = { | ||
| "combinator": "and", | ||
| "rules": [ | ||
| { | ||
| "combinator": "or", | ||
| "rules": [ | ||
| { | ||
| "property": "$identifier", | ||
| "operator": "=", | ||
| "value": entity.identifier, | ||
| } | ||
| for entity in objects_diff[0].entity_selector_diff.passed | ||
| ] | ||
| } | ||
| ] | ||
| } | ||
| entities_at_port_with_properties = await ocean.port_client.search_entities( | ||
| user_agent_type, | ||
| include_params=["blueprint", "identifier"] + [ | ||
| f"properties.{prop}" for prop in resource.port.entity.mappings.properties | ||
| ], | ||
| query=query |
There was a problem hiding this comment.
is there a need to search for every batch size? I think the minimum should be 20
port_ocean/core/utils/utils.py
Outdated
Comment on lines
148
to
155
| return [ | ||
| third_party_entity | ||
| for third_party_entity in third_party_entities | ||
| if not any( | ||
| are_entities_equal(third_party_entity, port_entity) | ||
| for port_entity in port_entities | ||
| ) | ||
| ] |
There was a problem hiding this comment.
Suggested change
| return [ | |
| third_party_entity | |
| for third_party_entity in third_party_entities | |
| if not any( | |
| are_entities_equal(third_party_entity, port_entity) | |
| for port_entity in port_entities | |
| ) | |
| ] | |
| port_entity_ids = {port_entity.identifier for port_entity in port_entities} | |
| return [ | |
| third_party_entity | |
| for third_party_entity in third_party_entities | |
| if third_party_entity.identifier not in port_entity_ids | |
| or not any( | |
| are_entities_equal(third_party_entity, port_entity) | |
| for port_entity in port_entities | |
| if port_entity.identifier == third_party_entity.identifier | |
| ) | |
| ] |
There was a problem hiding this comment.
I think this will be more efficient
Comment on lines
+129
to
+131
| diff = DeepDiff( | ||
| first_entity.properties, second_entity.properties, ignore_order=True | ||
| ) |
There was a problem hiding this comment.
what about relations?
There was a problem hiding this comment.
how are you handling decimal numbers?
There was a problem hiding this comment.
do we want to decide on some size / limit of when we are stopping the compare and decide to sync it to port? as it can be quite cpu intensive for big objects
Comment on lines
171
to
174
| logger.bind( | ||
| changed_entities=len(unique_entities), | ||
| total_entities=len(objects_diff[0].entity_selector_diff.passed), | ||
| ).info("Upserting changed entities") |
There was a problem hiding this comment.
Suggested change
| logger.bind( | |
| changed_entities=len(unique_entities), | |
| total_entities=len(objects_diff[0].entity_selector_diff.passed), | |
| ).info("Upserting changed entities") | |
| logger.info("Upserting changed entities", changed_entities=len(unique_entities), | |
| total_entities=len(objects_diff[0].entity_selector_diff.passed)) |
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.
Description
What - reduce the amount of upserts we send to port api
Why - many of the upserts does not contain an actual change, reduce load from port api
How - check if the entity from the third party has a change from the entity in port, and only if there is an actual change, upsert the entity
Type of change
Please leave one option from the following and delete the rest:
All tests should be run against the port production environment(using a testing org).
Core testing checklist
Integration testing checklist
examplesfolder in the integration directory.Preflight checklist