Optimize performance for the list request /api/datasets #3441
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jfrohnhofen
approved these changes
Nov 22, 2018
| implicit val ctx = GlobalAccessContext | ||
| logger.info("") |
| val result: Fox[Fox[DataLayer]] = for { | ||
| category <- Category.fromString(row.category).toFox ?~> "Could not parse Layer Category" | ||
| boundingBox <- BoundingBox | ||
| .fromSQL(parseArrayTuple(row.boundingbox).map(_.toInt)) | ||
| .toFox ?~> "Could not parse boundingbox" | ||
| elementClass <- ElementClass.fromString(row.elementclass).toFox ?~> "Could not parse Layer ElementClass" | ||
| resolutions <- dataSetResolutionsDAO.findDataResolutionForLayer(dataSetId, row.name) ?~> "Could not find resolution for layer" | ||
| standinResolutions: Option[List[Point3D]] = if (skipResolutions) Some(List.empty) else None | ||
| resolutions <- Fox.fillOption(standinResolutions)( |
There was a problem hiding this comment.
how about using standinResolutions .getOrElse(...).toFox?
| dataSet.logoUrl match { | ||
| case Some(url) => Fox.successful(url) | ||
| case None => organizationDAO.findOne(dataSet._organization)(GlobalAccessContext).map(_.logoUrl) | ||
| case None => | ||
| Fox.fillOption(organization)(organizationDAO.findOne(dataSet._organization)(GlobalAccessContext)).map(_.logoUrl) |
| for { | ||
| organization <- organizationDAO.findOne(dataSet._organization)(GlobalAccessContext) ?~> "organization.notFound" | ||
| dataLayersBox <- dataSetDataLayerDAO.findAllForDataSet(dataSet._id).futureBox | ||
| organization <- Fox.fillOption(organization) { |
| for { | ||
| teamManagerMemberships <- teamManagerMembershipsFor(user._id) | ||
| teamManagerMemberships <- Fox.fillOption(teamMemberships)(teamManagerMembershipsFor(user._id)) |
| @@ -150,6 +150,13 @@ object Fox extends FoxImplicits { | |||
| Fox.successful(None)} | |||
| } | |||
|
|
|||
| def fillOption[A](input: Option[A])(f: => Fox[A])(implicit ec: ExecutionContext): Fox[A] = { | |||
There was a problem hiding this comment.
remove, if Option.getOrElse works in all cases?
| val result: Fox[Fox[DataLayer]] = for { | ||
| category <- Category.fromString(row.category).toFox ?~> "Could not parse Layer Category" | ||
| boundingBox <- BoundingBox | ||
| .fromSQL(parseArrayTuple(row.boundingbox).map(_.toInt)) | ||
| .toFox ?~> "Could not parse boundingbox" | ||
| elementClass <- ElementClass.fromString(row.elementclass).toFox ?~> "Could not parse Layer ElementClass" | ||
| resolutions <- dataSetResolutionsDAO.findDataResolutionForLayer(dataSetId, row.name) ?~> "Could not find resolution for layer" | ||
| standinResolutions: Option[List[Point3D]] = if (skipResolutions) Some(List.empty) else None |
There was a problem hiding this comment.
I find the standinResolutions a bit weird. Can we reduce this to one line? Maybe (not tested):
resolutions <- if (skipResolutions) Fox.successful(Nil) else standinResolutions .getOrElse(...).toFox
|
(as discussed in person, the |
jfrohnhofen
added a commit
that referenced
this pull request
Nov 23, 2018
* origin/master: Optimize performance for the list request /api/datasets (#3441) add annotation dataset foreign key (#3482) thumbnails: correctly use zoom value if specified (#3487) Store Meshes in Postgres (#3367) fix alpha return (#3483) Added script to apply all new evolutions (#3427) Simple fix to speed up dataset gallery (#3480) better errors for screenshot tests, fix imports, refresh screenshots (#3479) (Backend only) Add project priority to progress report json (#3476) Handle missing write access on datastore (#3411) Re-introduce "Flightmode improvements"" (#3473) Circleci-notify: linkify PR number (#3469) Revert "Flightmode improvements" (#3472) also flow-ignore binaryData when using symlinks (#3471) Flightmode improvements (#3392) Circleci custom notification (#3465) enable /api/switch cross-organization (#3464)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Steps to test:
psql postgresql://postgres:postgres@localhost:5432/webknossos < dump-2018-11-09.sql)http://localhost:9000/api/datasetsIssues:
[ ] Updated changelog[ ] Updated migration guide if applicable[ ] Updated documentation if applicable[ ] Needs datastore update after deployment