Speed up Zarr3 data reading by fixing VaultPath equality check #7363
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
normanrz
reviewed
Oct 4, 2023
| @@ -76,4 +77,9 @@ class VaultPath(uri: URI, dataVault: DataVault) extends LazyLogging { | |||
| override def toString: String = uri.toString | |||
|
|
|||
| def summary: String = s"VaultPath: ${this.toString} for ${dataVault.getClass.getSimpleName}" | |||
|
|
|||
| override def equals(obj: Any): Boolean = hashCode() == obj.hashCode() | |||
normanrz
approved these changes
Oct 4, 2023
| override def hashCode(): Int = | ||
| new HashCodeBuilder(19, 31).toHashCode | ||
|
|
||
| override def equals(obj: Any): Boolean = true |
There was a problem hiding this comment.
note to self: this should still do the typecheck with match
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.
Different instances of VaultPath were not equal, leading to the caching mechanism in Zarr3Array.scala not working as intended (there, VaultPath objects are used as cache keys). So the Shard index was parsed anew in every single chunk request, and stored in memory hundreds of times.
This PR implements content-dependent equals and hashCode methods for VaultPath, FileSystemVaultPath, and the DataVaults themselves, enabling the cache to work properly.
URL of deployed dev instance (used for testing):
Steps to test:
_ = logger.info(s"cache miss! shardPath: $shardPath")in Zarr3Array.scala line 119