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.

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

refactor(appengine): extract complex queries #1056

Open
wants to merge 3 commits into
base: master
Choose a base branch
from

Conversation

noaccOS
Copy link
Contributor

@noaccOS noaccOS commented Jan 22, 2025

  • create a new module Data, which holds complex database operations
  • the device_status_from device query has been refactored under DeviceStatus.

depends on #1055

  • This change requires using a fork of exandra because there is no way to set the ttl on main.
  • This change does introduce an edit to the tests: Ecto returns structs, and the ordering of the keys is different compared to the result from CQEx.

What this PR does / why we need it:

Which issue(s) this PR fixes:

Fixes #

Special notes for your reviewer:

Does this PR introduce a user-facing change?
  • Yes
  • No

Additional documentation e.g. usage docs, diagrams, etc.:


Copy link

codecov bot commented Jan 22, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 69.84%. Comparing base (76adaf5) to head (c65f9b4).
Report is 3 commits behind head on master.

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #1056      +/-   ##
==========================================
+ Coverage   69.23%   69.84%   +0.60%     
==========================================
  Files         275      254      -21     
  Lines        7193     5564    -1629     
==========================================
- Hits         4980     3886    -1094     
+ Misses       2213     1678     -535     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@noaccOS noaccOS force-pushed the push-unlstvytkmyv branch 3 times, most recently from 33f00a5 to 3954ba7 Compare January 23, 2025 09:00
Copy link
Collaborator

@Annopaolo Annopaolo left a comment

Choose a reason for hiding this comment

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

L (pretty) GTM

Comment on lines +154 to +176
defp clean_device_introspection(device) do
introspection_major = device.introspection || %{}
introspection_minor = device.introspection_minor || %{}

major_keys = introspection_major |> Map.keys() |> MapSet.new()
minor_keys = introspection_minor |> Map.keys() |> MapSet.new()

corrupted = MapSet.symmetric_difference(major_keys, minor_keys) |> MapSet.to_list()

for interface <- corrupted do
device_id = Device.encode_device_id(device.device_id)

Logger.error("Introspection has either major or minor, but not both. Corrupted entry?",
interface: interface,
device_id: device_id
)
end

introspection_major = introspection_major |> Map.drop(corrupted)
introspection_minor = introspection_minor |> Map.drop(corrupted)

{introspection_major, introspection_minor}
end
Copy link
Collaborator

Choose a reason for hiding this comment

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

Why is this needed? It seems we're adding some defensive code against possible database corruptions, but it would be better handled by crashing

@@ -1,4 +1,4 @@
[
import_deps: [:phoenix, :ecto, :skogsra, :stream_data],
import_deps: [:phoenix, :ecto, :skogsra],
Copy link
Collaborator

Choose a reason for hiding this comment

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

As in #1055, I would not remove the :stream_data formatter

this allows calling `mix format` in dev

Signed-off-by: Francesco Noacco <[email protected]>
@noaccOS noaccOS force-pushed the push-unlstvytkmyv branch 4 times, most recently from 9cdb892 to 2587c48 Compare February 3, 2025 16:50
The first installment in the effort of refactoring the device module.

The change can be made little by little as exandra and cqex queries
can coexist.

This change ports a few queries to exandra, without making any big logic
refactor, but we can see the future direction of this refactor:
Astarte.AppEngine.API.Device.Queries becomes a module to expose _queries_
and not data from the database directly.

For this iteration, this is enough to elegantly use the queries in the
Device module, but more complex queries may require a more in-depth refactor.

The following queries have been ported:
- `retrieve_interfaces_list`
- `retrieve_all_endpoints_for_interface!`
- `retrieve_mapping`
- `prepare_value_type_query` / `execute_value_type_query`

Signed-off-by: Francesco Noacco <[email protected]>
- create a new module `Data`, which holds complex database operations
- the device_status_from device query has been refactored under DeviceStatus.

Signed-off-by: Francesco Noacco <[email protected]>
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.

2 participants