wbrawner/Store
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Avoid using Duration.INFINITE (#189)

Browse source 
It currently breaks consumers compiling with Kotlin
1.4-M3 (not sure why).

Added some TODOs to revert back to using Duration.INFINITE
once Store is compiled with Kotlin 1.4

Closes #188
This commit is contained in:
Chris Banes 2020-07-23 17:08:10 +01:00 committed by GitHub
parent 61762f2f96
commit 9c9f70a16d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
cache/src/main/kotlin/com/dropbox/android/external/cache4/Cache.kt vendored
View file

@ -1,7 +1,9 @@
package com.dropbox.android.external.cache4
import java.util.concurrent.TimeUnit
import kotlin.time.Duration
import kotlin.time.ExperimentalTime
import kotlin.time.toDuration
/**
* An in-memory key-value store with support for time-based (expiration) and size-based evictions.
@ -123,10 +125,13 @@ interface Cache<in Key : Any, Value : Any> {
*/
internal class CacheBuilderImpl : Cache.Builder {
// Ideally these would be set to Duration.INFINITE, but this breaks consumers compiling with
// Kotlin 1.4-M3 (not sure why).
// TODO: revert back to using Duration.INFINITE once Store is compiled with Kotlin 1.4
@ExperimentalTime
private var expireAfterWriteDuration = Duration.INFINITE
private var expireAfterWriteDuration = Double.POSITIVE_INFINITY.toDuration(TimeUnit.SECONDS)
@ExperimentalTime
private var expireAfterAccessDuration = Duration.INFINITE
private var expireAfterAccessDuration = Double.POSITIVE_INFINITY.toDuration(TimeUnit.SECONDS)
private var maxSize = UNSET_LONG
private var concurrencyLevel = DEFAULT_CONCURRENCY_LEVEL
private var clock: Clock? = null

7
store/src/main/java/com/dropbox/android/external/store4/MemoryPolicy.kt vendored
View file

@ -1,7 +1,9 @@
package com.dropbox.android.external.store4
import java.util.concurrent.TimeUnit
import kotlin.time.Duration
import kotlin.time.ExperimentalTime
import kotlin.time.toDuration
/**
* MemoryPolicy holds all required info to create MemoryCache
@ -67,7 +69,10 @@ class MemoryPolicy internal constructor(
}
companion object {
val DEFAULT_DURATION_POLICY: Duration = Duration.INFINITE
// Ideally this would be set to Duration.INFINITE, but this breaks consumers compiling with
// Kotlin 1.4-M3 (not sure why).
// TODO: revert back to using Duration.INFINITE once Store is compiled with Kotlin 1.4
val DEFAULT_DURATION_POLICY: Duration = Double.POSITIVE_INFINITY.toDuration(TimeUnit.SECONDS)
const val DEFAULT_SIZE_POLICY: Long = -1
fun builder(): MemoryPolicyBuilder = MemoryPolicyBuilder()