Skip to content

Fixes #299

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

Merged
merged 2 commits into from
Jan 31, 2025
Merged

Fixes #299

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
687924e
[fix] fixed `JcLocation` caching
MchKosticyn Jan 31, 2025
d3de6bb
[fix] fixed `Approximations` feature
MchKosticyn Jan 31, 2025
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
4 changes: 2 additions & 2 deletions jacodb-approximations/src/main/kotlin/org/jacodb/approximation/Approximations.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,13 +178,13 @@ private class ApproximationIndexer(
val approximationClassName = classNode.name.className.toApproximationName()

// Ensure that each approximation has one and only one
require(originalClassName !in originalToApproximation) {
require(originalToApproximation.getOrDefault(originalClassName, approximationClassName) == approximationClassName) {
"An error occurred during approximations indexing: you tried to add `$approximationClassName` " +
"as an approximation for `$originalClassName`, but the target class is already " +
"associated with approximation `${originalToApproximation[originalClassName]}`. " +
"Only bijection between classes is allowed."
}
require(approximationClassName !in approximationToOriginal) {
require(approximationToOriginal.getOrDefault(approximationClassName, originalClassName) == originalClassName) {
"An error occurred during approximations indexing: you tried to add `$approximationClassName` " +
"as an approximation for `$originalClassName`, but this approximation is already used for " +
"`${approximationToOriginal[approximationClassName]}`. " +
Expand Down
8 changes: 3 additions & 5 deletions jacodb-core/src/main/kotlin/org/jacodb/impl/storage/PersistentByteCodeLocation.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,10 +87,9 @@ class PersistentByteCodeLocation(
}
}

override val jcLocation: JcByteCodeLocation?
get() {
return cachedLocation ?: data.toJcLocation()
}
override val jcLocation: JcByteCodeLocation? by lazy(LazyThreadSafetyMode.PUBLICATION) {
cachedLocation ?: data.toJcLocation()
}

override val path: String
get() = data.path
Expand Down Expand Up @@ -138,4 +137,3 @@ class PersistentByteCodeLocation(
}
}
}