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.

Sign up for GitHub

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

Improve performance of position calculation by using search endpoint #481

Merged
merged 6 commits into from
Dec 17, 2021
Merged

Improve performance of position calculation by using search endpoint #481

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
55b3eba
updating default value for as baseurl
helrond Dec 17, 2021
50ca22a
improve performance of fetching child counts/
helrond Dec 17, 2021
e42d63b
update tests
helrond Dec 17, 2021
858ab3b
use correct repository
helrond Dec 17, 2021
b1e90c5
use correct baseurl and repo
helrond Dec 17, 2021
6892fd5
use correct repo id
helrond Dec 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
126 changes: 63 additions & 63 deletions fixtures/cassettes/fetcher/ArchivesSpace-deleted-agent_corporate_entity.json
View file
Open in desktop

Large diffs are not rendered by default.

126 changes: 63 additions & 63 deletions fixtures/cassettes/fetcher/ArchivesSpace-deleted-agent_family.json
View file
Open in desktop

Large diffs are not rendered by default.

126 changes: 63 additions & 63 deletions fixtures/cassettes/fetcher/ArchivesSpace-deleted-agent_person.json
View file
Open in desktop

Large diffs are not rendered by default.

126 changes: 63 additions & 63 deletions fixtures/cassettes/fetcher/ArchivesSpace-deleted-archival_object.json
View file
Open in desktop

Large diffs are not rendered by default.

126 changes: 63 additions & 63 deletions fixtures/cassettes/fetcher/ArchivesSpace-deleted-resource.json
View file
Open in desktop

Large diffs are not rendered by default.

126 changes: 63 additions & 63 deletions fixtures/cassettes/fetcher/ArchivesSpace-deleted-subject.json
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions fixtures/cassettes/fetcher/ArchivesSpace-updated-agent_corporate_entity.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
{
"request": {
"method": "POST",
"uri": "http://192.168.1.4:8089/users/admin/login",
"uri": "https://as.rockarch.org/api/users/admin/login",
"body": null,
"headers": {
"User-Agent": [
Expand Down Expand Up @@ -57,7 +57,7 @@
{
"request": {
"method": "GET",
"uri": "http://192.168.1.4:8089/version",
"uri": "https://as.rockarch.org/api/version",
"body": null,
"headers": {
"User-Agent": [
Expand Down Expand Up @@ -169,7 +169,7 @@
{
"request": {
"method": "GET",
"uri": "http://192.168.1.4:8089/agents/corporate_entities?all_ids=True",
"uri": "https://as.rockarch.org/api/agents/corporate_entities?all_ids=True",
"body": null,
"headers": {
"User-Agent": [
Expand Down Expand Up @@ -219,7 +219,7 @@
{
"request": {
"method": "GET",
"uri": "http://192.168.1.4:8089/agents/corporate_entities?id_set%5B%5D=1&id_set%5B%5D=2&id_set%5B%5D=3&resolve%5B%5D=ancestors&resolve%5B%5D=ancestors%3A%3Alinked_agents&resolve%5B%5D=instances%3A%3Atop_container&resolve%5B%5D=linked_agents&resolve%5B%5D=subjects",
"uri": "https://as.rockarch.org/api/agents/corporate_entities?id_set%5B%5D=1&id_set%5B%5D=2&id_set%5B%5D=3&resolve%5B%5D=ancestors&resolve%5B%5D=ancestors%3A%3Alinked_agents&resolve%5B%5D=instances%3A%3Atop_container&resolve%5B%5D=linked_agents&resolve%5B%5D=subjects",
"body": null,
"headers": {
"User-Agent": [
Expand Down Expand Up @@ -267,4 +267,4 @@
}
}
]
}
}
8 changes: 4 additions & 4 deletions fixtures/cassettes/fetcher/ArchivesSpace-updated-agent_family.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
{
"request": {
"method": "POST",
"uri": "http://192.168.1.4:8089/users/admin/login",
"uri": "https://as.rockarch.org/api/users/admin/login",
"body": null,
"headers": {
"User-Agent": [
Expand Down Expand Up @@ -57,7 +57,7 @@
{
"request": {
"method": "GET",
"uri": "http://192.168.1.4:8089/version",
"uri": "https://as.rockarch.org/api/version",
"body": null,
"headers": {
"User-Agent": [
Expand Down Expand Up @@ -169,7 +169,7 @@
{
"request": {
"method": "GET",
"uri": "http://192.168.1.4:8089/agents/families?all_ids=True",
"uri": "https://as.rockarch.org/api/agents/families?all_ids=True",
"body": null,
"headers": {
"User-Agent": [
Expand Down Expand Up @@ -217,4 +217,4 @@
}
}
]
}
}
12 changes: 6 additions & 6 deletions fixtures/cassettes/fetcher/ArchivesSpace-updated-agent_person.json
View file
Open in desktop

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions fixtures/cassettes/fetcher/ArchivesSpace-updated-archival_object.json
View file
Open in desktop

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions fixtures/cassettes/fetcher/ArchivesSpace-updated-resource.json
View file
Open in desktop

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions fixtures/cassettes/fetcher/ArchivesSpace-updated-subject.json
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions fixtures/cassettes/fetcher/Cartographer-updated-arrangement_map_component.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
{
"request": {
"method": "POST",
"uri": "http://192.168.1.4:8089/users/admin/login",
"uri": "https://as.rockarch.org/api/users/admin/login",
"body": null,
"headers": {
"User-Agent": [
Expand Down Expand Up @@ -57,7 +57,7 @@
{
"request": {
"method": "GET",
"uri": "http://192.168.1.4:8089/version",
"uri": "https://as.rockarch.org/api/version",
"body": null,
"headers": {
"User-Agent": [
Expand Down Expand Up @@ -816,4 +816,4 @@
}
}
]
}
}
14,125 changes: 58 additions & 14,067 deletions fixtures/cassettes/merger/agent_corporate_entity-merge.json
View file
Open in desktop

Large diffs are not rendered by default.

725 changes: 58 additions & 667 deletions fixtures/cassettes/merger/agent_family-merge.json
View file
Open in desktop

Large diffs are not rendered by default.

7,157 changes: 58 additions & 7,099 deletions fixtures/cassettes/merger/agent_person-merge.json
View file
Open in desktop

Large diffs are not rendered by default.

192 changes: 96 additions & 96 deletions fixtures/cassettes/merger/archival_object-merge.json
View file
Open in desktop

Large diffs are not rendered by default.

82 changes: 41 additions & 41 deletions fixtures/cassettes/merger/arrangement_map_component-merge.json
View file
Open in desktop

Large diffs are not rendered by default.

6,464 changes: 1,016 additions & 5,448 deletions fixtures/cassettes/merger/position.json
View file
Open in desktop

Large diffs are not rendered by default.

26 changes: 13 additions & 13 deletions fixtures/cassettes/merger/resource-merge.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
{
"request": {
"method": "POST",
"uri": "http://192.168.1.9:8089/users/admin/login",
"uri": "https://api.rockarch.org/api/users/admin/login",
"body": null,
"headers": {
"User-Agent": [
Expand Down Expand Up @@ -57,7 +57,7 @@
{
"request": {
"method": "GET",
"uri": "http://192.168.1.9:8089/version",
"uri": "https://api.rockarch.org/api/version",
"body": null,
"headers": {
"User-Agent": [
Expand Down Expand Up @@ -169,7 +169,7 @@
{
"request": {
"method": "GET",
"uri": "http://rac-vch-prod.ad.rockarchive.org:8000/api/find-by-uri/?uri=%2Frepositories%2F101%2Fresources%2F3",
"uri": "http://rac-vch-prod.ad.rockarchive.org:8000/api/find-by-uri/?uri=%2Frepositories%2F2%2Fresources%2F3",
"body": null,
"headers": {
"User-Agent": [
Expand Down Expand Up @@ -228,7 +228,7 @@
{
"request": {
"method": "GET",
"uri": "http://192.168.1.9:8089/repositories/101/resources/3/tree/root",
"uri": "https://api.rockarch.org/api/repositories/2/resources/3/tree/root",
"body": null,
"headers": {
"User-Agent": [
Expand Down Expand Up @@ -271,14 +271,14 @@
]
},
"body": {
"string": "{\"child_count\":1,\"waypoints\":1,\"waypoint_size\":200,\"title\":\"Nelson A. Rockefeller personal papers, Politics - George L. Hinman, Series J.2\",\"uri\":\"/repositories/101/resources/3\",\"slugged_url\":\"\",\"jsonmodel_type\":\"resource\",\"parsed_title\":\"Nelson A. Rockefeller personal papers, Politics - George L. Hinman, Series J.2\",\"level\":\"series\",\"precomputed_waypoints\":{\"\":{\"0\":[{\"child_count\":5,\"waypoints\":1,\"waypoint_size\":200,\"title\":\"Congressional Quarterly\",\"slugged_url\":\"\",\"parsed_title\":\"Congressional Quarterly\",\"uri\":\"/repositories/101/archival_objects/1622\",\"position\":0,\"parent_id\":null,\"jsonmodel_type\":\"archival_object\",\"level\":\"subseries\",\"dates\":[{\"type\":\"inclusive\",\"label\":\"creation\",\"expression\":\"1960-1971\",\"begin\":\"1960\",\"end\":\"1971\"}]}]}}}\n"
"string": "{\"child_count\":1,\"waypoints\":1,\"waypoint_size\":200,\"title\":\"Nelson A. Rockefeller personal papers, Politics - George L. Hinman, Series J.2\",\"uri\":\"/repositories/2/resources/3\",\"slugged_url\":\"\",\"jsonmodel_type\":\"resource\",\"parsed_title\":\"Nelson A. Rockefeller personal papers, Politics - George L. Hinman, Series J.2\",\"level\":\"series\",\"precomputed_waypoints\":{\"\":{\"0\":[{\"child_count\":5,\"waypoints\":1,\"waypoint_size\":200,\"title\":\"Congressional Quarterly\",\"slugged_url\":\"\",\"parsed_title\":\"Congressional Quarterly\",\"uri\":\"/repositories/2/archival_objects/1622\",\"position\":0,\"parent_id\":null,\"jsonmodel_type\":\"archival_object\",\"level\":\"subseries\",\"dates\":[{\"type\":\"inclusive\",\"label\":\"creation\",\"expression\":\"1960-1971\",\"begin\":\"1960\",\"end\":\"1971\"}]}]}}}\n"
}
}
},
{
"request": {
"method": "GET",
"uri": "http://192.168.1.9:8089/repositories/101/resources/3/tree/waypoint?offset=0",
"uri": "https://api.rockarch.org/api/repositories/2/resources/3/tree/waypoint?offset=0",
"body": null,
"headers": {
"User-Agent": [
Expand Down Expand Up @@ -321,14 +321,14 @@
]
},
"body": {
"string": "[{\"child_count\":5,\"waypoints\":1,\"waypoint_size\":200,\"title\":\"Congressional Quarterly\",\"slugged_url\":\"\",\"parsed_title\":\"Congressional Quarterly\",\"uri\":\"/repositories/101/archival_objects/1622\",\"position\":0,\"parent_id\":null,\"jsonmodel_type\":\"archival_object\",\"level\":\"subseries\",\"dates\":[{\"type\":\"inclusive\",\"label\":\"creation\",\"expression\":\"1960-1971\",\"begin\":\"1960\",\"end\":\"1971\"}]}]\n"
"string": "[{\"child_count\":5,\"waypoints\":1,\"waypoint_size\":200,\"title\":\"Congressional Quarterly\",\"slugged_url\":\"\",\"parsed_title\":\"Congressional Quarterly\",\"uri\":\"/repositories/2/archival_objects/1622\",\"position\":0,\"parent_id\":null,\"jsonmodel_type\":\"archival_object\",\"level\":\"subseries\",\"dates\":[{\"type\":\"inclusive\",\"label\":\"creation\",\"expression\":\"1960-1971\",\"begin\":\"1960\",\"end\":\"1971\"}]}]\n"
}
}
},
{
"request": {
"method": "GET",
"uri": "http://rac-vch-prod.ad.rockarchive.org:8000/api/find-by-uri/?uri=%2Frepositories%2F101%2Fresources%2F4",
"uri": "http://rac-vch-prod.ad.rockarchive.org:8000/api/find-by-uri/?uri=%2Frepositories%2F2%2Fresources%2F4",
"body": null,
"headers": {
"User-Agent": [
Expand Down Expand Up @@ -387,7 +387,7 @@
{
"request": {
"method": "GET",
"uri": "http://192.168.1.9:8089/repositories/101/resources/4/tree/root",
"uri": "https://api.rockarch.org/api/repositories/2/resources/4/tree/root",
"body": null,
"headers": {
"User-Agent": [
Expand Down Expand Up @@ -430,14 +430,14 @@
]
},
"body": {
"string": "{\"child_count\":1,\"waypoints\":1,\"waypoint_size\":200,\"title\":\"Cary Reich papers\",\"uri\":\"/repositories/101/resources/4\",\"slugged_url\":\"\",\"jsonmodel_type\":\"resource\",\"parsed_title\":\"Cary Reich papers\",\"level\":\"collection\",\"precomputed_waypoints\":{\"\":{\"0\":[{\"child_count\":10,\"waypoints\":1,\"waypoint_size\":200,\"title\":\"Original Audio Tapes\",\"slugged_url\":\"\",\"parsed_title\":\"Original Audio Tapes\",\"uri\":\"/repositories/101/archival_objects/2336\",\"position\":0,\"parent_id\":null,\"jsonmodel_type\":\"archival_object\",\"level\":\"series\"}]}}}\n"
"string": "{\"child_count\":1,\"waypoints\":1,\"waypoint_size\":200,\"title\":\"Cary Reich papers\",\"uri\":\"/repositories/2/resources/4\",\"slugged_url\":\"\",\"jsonmodel_type\":\"resource\",\"parsed_title\":\"Cary Reich papers\",\"level\":\"collection\",\"precomputed_waypoints\":{\"\":{\"0\":[{\"child_count\":10,\"waypoints\":1,\"waypoint_size\":200,\"title\":\"Original Audio Tapes\",\"slugged_url\":\"\",\"parsed_title\":\"Original Audio Tapes\",\"uri\":\"/repositories/2/archival_objects/2336\",\"position\":0,\"parent_id\":null,\"jsonmodel_type\":\"archival_object\",\"level\":\"series\"}]}}}\n"
}
}
},
{
"request": {
"method": "GET",
"uri": "http://192.168.1.9:8089/repositories/101/resources/4/tree/waypoint?offset=0",
"uri": "https://api.rockarch.org/api/repositories/2/resources/4/tree/waypoint?offset=0",
"body": null,
"headers": {
"User-Agent": [
Expand Down Expand Up @@ -480,9 +480,9 @@
]
},
"body": {
"string": "[{\"child_count\":10,\"waypoints\":1,\"waypoint_size\":200,\"title\":\"Original Audio Tapes\",\"slugged_url\":\"\",\"parsed_title\":\"Original Audio Tapes\",\"uri\":\"/repositories/101/archival_objects/2336\",\"position\":0,\"parent_id\":null,\"jsonmodel_type\":\"archival_object\",\"level\":\"series\"}]\n"
"string": "[{\"child_count\":10,\"waypoints\":1,\"waypoint_size\":200,\"title\":\"Original Audio Tapes\",\"slugged_url\":\"\",\"parsed_title\":\"Original Audio Tapes\",\"uri\":\"/repositories/2/archival_objects/2336\",\"position\":0,\"parent_id\":null,\"jsonmodel_type\":\"archival_object\",\"level\":\"series\"}]\n"
}
}
}
]
}
}
Loading