Cosmos Indexing Integration#8

Merged

Richyl2 merged 22 commits into

personal/richyl2/cosmos-storage-integration

Jul 3, 2019

Richyl2 commented Jun 19, 2019

Contributor

Description

The purpose of this PR is to add the base framework for indexing DICOM attributes using Cosmos as the backing store.

Added new CosmosDb project that implements the IDicomIndexDataStore interface
Added configuration to the CosmosDb project that defines which tags should be indexed and surfaced as queryable.

Testing

Added new unit test project for the CosmosDb project
Added to the integration tests validating all methods and expected exceptions from the index data store

Richyl2 added 2 commits

June 18, 2019 16:41


          Added initial work for cosmos indexing strategy

7f0e4c3


          Added settings updater and fixed all tests

44835bd

Richyl2 added the Area-DicomStore label

Richyl2 requested a review from javier-alvarez

June 19, 2019 15:34

Richyl2 added 10 commits

June 19, 2019 16:43


          Updated the build file to install the Cosmos emulator and updated the…

453b2b8

… default query attributes


          Updated build script and added more tests

720095c


          Attempt to get tests running on windows

70879af


          Updated build file

1be66b9


          Updated build file

9e4373d


          Removed condition from build test

15685ed


          Added steps to the test yml file

5afc1cc


          Updated the cosmos tests yml file to use the correct endpoint

d0f569d


          Updated the test build script, added support for series and study que…

3ccb0f1

…rying


          Fixed tests when running in parallel

5f333c1

Richyl2 marked this pull request as ready for review

June 21, 2019 14:37

Richyl2 requested a review from a team as a code owner

June 21, 2019 14:37

javier-alvarez reviewed

View reviewed changes

src/Microsoft.Health.Dicom.CosmosDb/Features/Storage/CosmosQueryBuilder.cs Outdated

javier-alvarez reviewed

View reviewed changes

src/Microsoft.Health.Dicom.CosmosDb/Features/Storage/CosmosQueryBuilder.cs

javier-alvarez reviewed

View reviewed changes

src/Microsoft.Health.Dicom.CosmosDb/Features/Storage/CosmosQueryBuilder.cs

javier-alvarez reviewed

View reviewed changes

src/Microsoft.Health.Dicom.CosmosDb/Features/Storage/DicomCosmosDataStore.cs

javier-alvarez reviewed

View reviewed changes

src/Microsoft.Health.Dicom.CosmosDb/Features/Storage/DicomDocumentClientInitializer.cs

javier-alvarez reviewed

View reviewed changes

src/Microsoft.Health.Dicom.CosmosDb/Features/Storage/Documents/QueryInstance.cs Outdated

javier-alvarez approved these changes

View reviewed changes

Cregganbane reviewed

View reviewed changes

src/Microsoft.Health.Dicom.Core/Features/Validation/DicomIdentifierValidator.cs Outdated

src/Microsoft.Health.Dicom.Core/Features/Persistence/IDicomIndexDataStore.cs

src/Microsoft.Health.Dicom.Core/Features/Persistence/IDicomIndexDataStore.cs Outdated

src/Microsoft.Health.Dicom.Core/Features/Persistence/IDicomIndexDataStore.cs Outdated

src/Microsoft.Health.Dicom.CosmosDb/Features/Storage/Documents/QueryInstance.cs

src/Microsoft.Health.Dicom.CosmosDb/Features/Storage/Documents/QueryInstance.cs

src/Microsoft.Health.Dicom.CosmosDb/Features/Storage/Documents/QueryInstance.cs Outdated

src/Microsoft.Health.Dicom.CosmosDb/Features/Storage/Documents/QueryInstance.cs Outdated

src/Microsoft.Health.Dicom.Core/Features/Persistence/IDicomIndexDataStore.cs Outdated

hansenms reviewed

View reviewed changes

build/test.yml

Richyl2 added 2 commits

June 25, 2019 13:36


          Refactored PR based on comments and added Dicom Attribute for being a…

3d9423e

…ble to store sequence tags. Updated code to also index fields with a multiplicity greater than 1


          Fixed broken test and resolved more PR comments

01dd8de

Richyl2 commented Jun 25, 2019

Contributor Author

@brandonpollett - Could you take a look at this PR when you get the chance?


          Added missing code comment change for the DICOM identifier validator

1fb69cd

Richyl2 commented

View reviewed changes

src/Microsoft.Health.Dicom.Core/Features/Validation/DicomIdentifierValidator.cs Outdated

jackliums reviewed

View reviewed changes

src/Microsoft.Health.Dicom.CosmosDb/Features/Storage/DocumentClientExtensions.cs Outdated

jackliums reviewed

View reviewed changes

src/Microsoft.Health.Dicom.CosmosDb/Features/Storage/DicomCosmosDataStore.cs Outdated

brendankowitz reviewed

View reviewed changes

src/Microsoft.Health.Dicom.CosmosDb/Features/Storage/Documents/QueryInstance.cs Outdated

Cregganbane reviewed

View reviewed changes

src/Microsoft.Health.Dicom.Core/Features/Persistence/DicomAttributeId.cs Outdated

src/Microsoft.Health.Dicom.Core/Features/Persistence/DicomAttributeId.cs Outdated

Richyl2 added 2 commits

June 26, 2019 13:23


          Refactored based on PR comments

275fcc0


          Fixed typo in test build script file

a6cb0ee

Cregganbane reviewed

View reviewed changes

src/Microsoft.Health.Dicom.CosmosDb/Features/Storage/DicomDocumentClientInitializer.cs

jackliums reviewed

View reviewed changes

src/Microsoft.Health.Dicom.Core/Features/Persistence/DicomAttributeId.cs Outdated

jackliums reviewed

View reviewed changes

src/Microsoft.Health.Dicom.Core.UnitTests/Features/Persistence/DicomAttributeIdExtensions.cs Outdated

jackliums reviewed

View reviewed changes

src/Microsoft.Health.Dicom.Core/Features/Persistence/DicomAttributeIdExtensions.cs

jackliums reviewed

View reviewed changes

src/Microsoft.Health.Dicom.Core/Features/Persistence/DicomAttributeIdExtensions.cs Outdated

jackliums reviewed

View reviewed changes

src/Microsoft.Health.Dicom.CosmosDb/Features/Storage/CosmosQueryBuilder.cs Outdated

jackliums reviewed

View reviewed changes

src/Microsoft.Health.Dicom.CosmosDb/Features/Storage/DicomCosmosDataStore.cs Outdated

jackliums reviewed

View reviewed changes

src/Microsoft.Health.Dicom.CosmosDb/Features/Storage/Documents/QuerySeriesDocument.cs Outdated

jackliums reviewed

View reviewed changes

src/Microsoft.Health.Dicom.CosmosDb/Features/Storage/Documents/QuerySeriesDocument.cs Outdated

jackliums reviewed

View reviewed changes

src/Microsoft.Health.Dicom.CosmosDb/Features/Storage/Documents/QueryInstance.cs Outdated

jackliums reviewed

View reviewed changes

src/Microsoft.Health.Dicom.CosmosDb/Features/Storage/Documents/QuerySeriesDocument.cs Outdated

jackliums reviewed

View reviewed changes

src/Microsoft.Health.Dicom.CosmosDb/Features/Storage/Documents/QuerySeriesDocument.cs Outdated

jackliums reviewed

View reviewed changes

src/Microsoft.Health.Dicom.CosmosDb/Features/Storage/Documents/QuerySeriesDocument.cs Outdated

Richyl2 added 2 commits

July 2, 2019 11:42


          Removed hard-coded paramter names from query strings and shortened un…

a1fce50

…ique identifier names


          Normalized document casing for Cosmos documents

9f62bbf

brendankowitz reviewed

View reviewed changes

src/Microsoft.Health.Dicom.CosmosDb/Features/Storage/DicomCosmosDataStore.cs

brendankowitz reviewed

View reviewed changes

src/Microsoft.Health.Dicom.CosmosDb/Features/Storage/DicomCosmosDataStore.cs Outdated

brendankowitz approved these changes

View reviewed changes


          Updated PR based on final comments

1e712bb

Richyl2 merged commit 10bb6bf into master

Richyl2 deleted the personal/richyl2/cosmos-storage-integration branch

July 22, 2019 10:04

npagare mentioned this pull request

VS Build fails with the error - Cannot launch container because the following port(s) are already in use: 63839 #1460

Closed

renovate Bot mentioned this pull request

Update dependency Microsoft.Health.Operations to v11 - autoclosed #3511

Closed

1 task

renovate Bot mentioned this pull request

Update dependency swashbuckle.aspnetcore.cli to v10 #3512

Open

1 task

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

+4 more reviewers

Labels

Area-DicomStore