catmaid / CATMAID

46%

master: 45%

LAST BUILD ON BRANCH issues/1085-treenode-connector-spatial-query

branch: issues/1085-treenode-connector-spatial-query

CHANGE BRANCH

x

Reset

• issues/1085-treenode-connector-spatial-query
• 2016.05.26
• 2016.08.09
• 2016.08.12
• 2016.08.26
• 2016.09.01
• 2016.10.18
• 2016.11.04
• 2016.12.16
• 2017.01.19
• 2017.02.16
• 2017.03.16
• 2017.05.17
• 2017.07.28
• 2017.10.02
• 2017.12.07
• 2018.02.16
• 2018.04.15
• 2018.07.19
• 2018.11.09
• 2019.06.20
• 2020.02.15
• albert-dev
• bug/gha-devserver
• cclauss-patch-1
• ci-test-ordering
• counts
• csv-bug
• debug
• dependabot/npm_and_yarn/dompurify-2.2.6
• dependabot/npm_and_yarn/elliptic-6.5.3
• dependabot/npm_and_yarn/elliptic-6.5.4
• dependabot/npm_and_yarn/glob-parent-5.1.2
• dependabot/npm_and_yarn/handlebars-4.7.7
• dependabot/npm_and_yarn/hosted-git-info-2.8.9
• dependabot/npm_and_yarn/json-pointer-0.6.1
• dependabot/npm_and_yarn/lodash-4.17.19
• dependabot/npm_and_yarn/lodash-4.17.21
• dependabot/npm_and_yarn/prismjs-1.21.0
• dependabot/npm_and_yarn/prismjs-1.23.0
• dependabot/npm_and_yarn/y18n-4.0.1
• dependabot/pip/django/django-3.0.12
• dependabot/pip/django/django-3.0.14
• dependabot/pip/django/djangorestframework-3.11.2
• dependabot/pip/django/pillow-8.1.1
• dependabot/pip/django/pillow-8.2.0
• dependabot/pip/django/pyyaml-5.4
• dev
• dev-synapse-fractions
• dev-test
• docker-update-test
• docs-catpy
• feature/circuit-simulation2
• feature/focal-reqs
• feature/gh-actions
• feature/moving-least-squares-transform
• feature/scipy1.5
• feature/setuptools
• features/1210-3d-viewer-improve-removal-speed
• features/1817-travis
• features/1817-travis-clean
• features/3d-viewer-connector-buffer-geometry
• features/3d-viewer-history-animation
• features/3d-viewer-line-width
• features/3d-viewer-multi-layer-z-sections
• features/3d-viewer-pick-complete-skeleton
• features/3dviewer-ortho-scale-bar
• features/64-bit-concept-ids
• features/admin-user-importer
• features/asgi
• features/better-http-status-codes-on-error
• features/binary-node-query
• features/boss-tile-source
• features/catglancer
• features/celery-periodic-tasks-default
• features/chrome-headless-tests
• features/ci-improve-pypy-config
• features/ci-xenial
• features/class-instance-trigram-index
• features/connector-related-table-fixes
• features/default-update-radius-shortcut
• features/django-1.11
• features/django-1.9
• features/django-2.1
• features/django-2.2
• features/django-3
• features/docker-initial-projects
• features/docker-update
• features/exporter-annotation-based-removal-update
• features/firefox-css-fixes
• features/fix-coveralls-reports
• features/fix-tests
• features/graph-widget-svg-illustrator-fix
• features/h2n5-tile-source
• features/history-tables
• features/history-tables-store-original-txid
• features/ignore-gui-tests-without-credentials
• features/ilastik-integration
• features/image-block-layer
• features/importer-tests
• features/importexportui
• features/improve-version-representation
• features/interval-based-alpha-shapes
• features/label-stack-manager
• features/landmark-layer
• features/landmark-matching-mapping
• features/landmarks
• features/landmarks-fix-num-min-matches
• features/landmarks-remote-projects
• features/layout-menu
• features/limit-node-updates-on-tracing-actions
• features/link-widget
• features/mls-transformations
• features/more-remote-widgets
• features/multi-swc-import
• features/nblast
• features/neuroglancer-precomputed-image-block-source
• features/neuroglancer-skeleton
• features/neuron-history-widget
• features/new-static-api-doc
• features/node-index-update
• features/node-list-cache
• features/node-list-cache-for-zoom
• features/node-query-epoch-datetime
• features/node-query-grid-cache
• features/numpy-update
• features/oauth2
• features/overlay-action-suspend
• features/parallel-grid-cache-update
• features/persistent-tracing-color-settings
• features/pixi-update
• features/pointer-events
• features/postgres-11
• features/postgres-12
• features/postgres-requirements-update
• features/pypy-on-travis
• features/pypy-requirements-update
• features/pypy-update
• features/pypy3.6
• features/python-3-support
• features/python-3-support-trusty
• features/python-3.7
• features/python-3.8
• features/quick-merge-mode
• features/request-headers
• features/sampler-correct-intervals
• features/selenium-tests
• features/simple-trakem2-xml-based-node-update
• features/skeleton-summary-table
• features/stats-summary-table
• features/streaming-cursor-spatial-query
• features/synapse-plot-with-plotly
• features/tests-pypy-5.7.1
• features/tile-layer-flip-y
• features/travis-celery-tests
• features/travis-ci/pip-cache
• features/travis-mypy
• features/travis-ubuntu-18.04
• features/update-coverage-parameters
• features/update-manage.py-location
• features/update-manage.py-location-coveralls
• features/upgrade-karma
• features/upgrade-networkx
• features/use-map-in-overlay
• features/vim-bookmarks
• features/volume-hackathon
• features/webvr
• features/xlsx-export-connectivity-matrix
• fix-ci-tests
• fix-docker-unshallow
• fix-karma-tests
• fix-node-query-cache-table
• fix-selenium-tests-no-change
• fix-tests
• fix-travis-postgres
• fix/export-connectors
• graph-columns
• graph-columns-2
• hotfix/meta-annotation-fulljoin
• issue-templates
• issues/1282-pixi-layer-blend-mode-mode-and-filter
• issues/1710-explicit-downsample-factors
• issues/1710-explicit-downsample-factors-squash
• issues/1902-pixi-webgl-check
• issues/847-stack-mirrors
• issues/847-stack-mirrors-squash
• issues/ci-fix-pypy
• issues/debug-autonomous-node-selection
• issues/docker-build-100
• issues/fix-event-context-off
• issues/fix-geos-version-parsing
• issues/fix-graph-widget-node-filters
• issues/fix-pypy-ci-test
• issues/fix-pypy-ci-tests
• issues/fix-python-3.5-annotations
• issues/fix-pyyaml-vulnerability
• issues/fix-transaction-log-tests
• issues/fix-travis
• issues/n5-image-block-layer-robustness
• issues/pypy-python-3.8
• issues/python3-git-version
• issues/sampler-constrain-interval-expansion
• issues/webgl-error-test
• maintenance/2016.04.18
• maintenance/2016.08.12
• maintenance/2016.08.26
• maintenance/2016.09.01
• maintenance/2016.10.18
• maintenance/2016.11.04
• maintenance/2016.12.16
• maintenance/2017.01.19
• maintenance/2017.02.16
• maintenance/2017.03.16
• maintenance/2017.05.17
• maintenance/2017.07.28
• maintenance/2017.10.02
• maintenance/2017.12.07
• maintenance/2018.02.16
• maintenance/2018.04.15
• maintenance/2018.07.19
• maintenance/2018.07.19+skeleton-api-change
• maintenance/2018.11.09
• maintenance/2019.06.20
• maintenance/2020.02.15
• master
• merges/travis-clean
• migration-fix
• new-find-path-skeletons
• non-arrow-markers
• pg-9.6-compat
• pg12-debug
• py39
• refactor/review-widget-rable-creation
• refactor/review-widget-table-cration
• refactor/review-widget-table-creation
• refactors/build-on-1604
• refactors/tile-source
• refactors/webgl-tracing-overlay
• release/2016.04.18
• release/2016.05.25
• release/2016.05.26
• release/2016.08.09
• release/2016.08.12
• release/2016.08.26
• release/2016.10.18
• release/2016.11.04
• release/2017.01.19
• release/2017.02.16
• release/2017.03.16
• release/2017.07.28
• release/2017.10.02
• release/2017.12.07
• release/2018.02.16
• release/2018.04.15
• release/2018.07.19
• release/2018.11.09
• release/2019.06.20
• release/2020.02.15
• remove-segmentation-tool
• render-service-fix
• replace-imagemagick
• sphinx-qol
• stable
• test-fix
• travis-python-3.6
• travis/fix-pg-10
• travis/matrix-test-pg96
• travis/slimerjs-0.10.0
• vagrant
• vagrant-1804
• vagrant-focal
• vagrant-populate
• vagrant-update
• wip-importexportui

Build # 2178

Build Type

push

travis-ci

Committed by aschampion

Commit Message

Node: spatially query connectors and links

Previously, connectors were queried based on whether they were related
to a treenode in the bounding box or were in a z-section of the bounding
box. This had several downsides:

1. Joining a large set of treenodes into links when few would actually
   exist
2. Links where the connector and treenode were both outside the bounding
   box were omitted even if the link intersected the bounding box
3. Querying connectors by section axis does not generalize to arbitrary
   planes

Instead, query links and connectors spatially via a PostGIS edge table
as is done for treenodes.

There are several possible implementations. The one in this commit
creates an edge table for treenode_connectors that:

1. Indexes based on project, treenode and connector, not
   treenode_connector's ID (which is not used elsewhere and is
   unindexed)
2. Deduplicates edges for multiple treenode_connectors for
   the same treenode and connector but different relations
3. Allows treenode to be NULL, so that connectors can also be added to
   this edge table like root nodes in the treenode_edge table

This increases complexity of the edge table maintenance triggers
substantially, but prevents the need to separately query for connectors
without links.

Run Details

5528 of 11944 relevant lines covered (46.28%)

0.46 hits per line