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

DM-36489: Add pgSphere support to obscore manager #744

Merged
merged 4 commits into from Oct 21, 2022
Merged

Conversation

andy-slac
Copy link
Contributor

Obscore manager adds generic plugin mechanisms to support spatial columns
and indices. A specific implementation using pgSphere extension adds
two columns and corresponding indices that contain pgSphere polygon and
position (center of bounding circle) to obscore table.

Checklist

  • ran Jenkins
  • added a release note for user-visible changes to doc/changes

I realized that schema migration will be more complicated with separate
subclasses which are controlled by obscore configuration. Merging them
into a single class, as I originally tried to do. It is slightly more
messier, but will work better with schema migration tools.
@codecov
Copy link

codecov bot commented Oct 12, 2022

Codecov Report

Base: 84.81% // Head: 84.82% // Increases project coverage by +0.01% 🎉

Coverage data is based on head (cf37726) compared to base (8aa4553).
Patch coverage: 87.53% of modified lines in pull request are covered.

Additional details and impacted files
@@            Coverage Diff             @@
##             main     #744      +/-   ##
==========================================
+ Coverage   84.81%   84.82%   +0.01%     
==========================================
  Files         254      257       +3     
  Lines       32980    33201     +221     
  Branches     5636     5662      +26     
==========================================
+ Hits        27972    28164     +192     
- Misses       3785     3805      +20     
- Partials     1223     1232       +9     
Impacted Files Coverage Δ
python/lsst/daf/butler/datastores/fileDatastore.py 80.28% <ø> (ø)
...ython/lsst/daf/butler/registry/dimensions/table.py 94.68% <ø> (ø)
...sst/daf/butler/registry/interfaces/_collections.py 77.94% <ø> (ø)
...lsst/daf/butler/registry/queries/_query_backend.py 64.10% <ø> (ø)
...ython/lsst/daf/butler/registry/obscore/_spatial.py 69.76% <69.76%> (ø)
...ython/lsst/daf/butler/registry/obscore/_records.py 77.58% <73.33%> (-3.06%) ⬇️
...ython/lsst/daf/butler/registry/obscore/_manager.py 80.28% <81.25%> (-0.28%) ⬇️
...ython/lsst/daf/butler/registry/obscore/pgsphere.py 87.32% <87.32%> (ø)
...sst/daf/butler/registry/obscore/default_spatial.py 92.30% <92.30%> (ø)
tests/test_obscore.py 97.34% <97.18%> (-0.29%) ⬇️
... and 6 more

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.

@andy-slac andy-slac force-pushed the tickets/DM-36489 branch 4 times, most recently from 48f1574 to f124c44 Compare October 13, 2022 04:50
Copy link
Member

@TallJimbo TallJimbo left a comment

Choose a reason for hiding this comment

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

Looks good; just a few minor comments.

But codecov seems pretty convinced that your tests aren't actually exercising any of the pgSphere stuff, despite the tests' clear intent to do that. I suspect that means something's gone wrong in either the installation or the test-skipping logic.

python/lsst/daf/butler/registry/obscore/pgsphere.py Outdated Show resolved Hide resolved
python/lsst/daf/butler/registry/obscore/pgsphere.py Outdated Show resolved Hide resolved
@andy-slac
Copy link
Contributor Author

But codecov seems pretty convinced that your tests aren't actually exercising any of the pgSphere stuff

I'm not sure that this is true. I checked build_and_test log and every PostgresPgSphereObsCoreTest is tagged as PASSED. Also this codecov page: https://app.codecov.io/gh/lsst/daf_butler/pull/744 shows that coverage is ~85% for pgsphere.py.

Obscore manager adds generic plugin mechanisms to support spatial columns
and indices. A specific implementation using pgSphere extension adds
two columns and corresponding indices that contain pgSphere polygon and
position (center of bounding circle) to obscore table.
@andy-slac andy-slac merged commit cba98bb into main Oct 21, 2022
@andy-slac andy-slac deleted the tickets/DM-36489 branch October 21, 2022 00:43
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.

None yet

2 participants