Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/version-2' into version-2
Browse files Browse the repository at this point in the history
  • Loading branch information
@UnknownJoe796
UnknownJoe796 committed Mar 16, 2024
2 parents 60bb9d2 + d882d25 commit c4a558e
Show file tree
Hide file tree
Showing 2 changed files with 59 additions and 43 deletions.
93 changes: 53 additions & 40 deletions client/src/commonMain/kotlin/com/lightningkite/lightningserver/db/ModelCache.kt
View file
Expand Up @@ -22,6 +22,7 @@ class ModelCache<T : HasId<ID>, ID : Comparable<ID>>(
inner class WritableModelImpl(val id: ID) : WritableModel<T> {
var live: Int = 0
var lastSet: Double = 0.0
var invalid = false // The invalid logic and code isn't the cleanest, not entirely what I want, but it works.
var ready: Boolean = false

override val serializer: KSerializer<T>
Expand All @@ -36,6 +37,7 @@ class ModelCache<T : HasId<ID>, ID : Comparable<ID>>(
set(value) {
ready = true
lastSet = clockMillis()
invalid = false
field = value
listeners.toList().forEach { it() }
awaiting.toList().forEach { it.resume(value) }
Expand Down Expand Up @@ -70,8 +72,7 @@ class ModelCache<T : HasId<ID>, ID : Comparable<ID>>(
val result = skipCache.replace(id, value)
this.value = result
for (query in queries) {
query.value.onRemoved(id)
query.value.onAdded(result)
query.value.onNewValue(result)
query.value.refreshIfNeeded()
}
}
Expand All @@ -83,11 +84,11 @@ class ModelCache<T : HasId<ID>, ID : Comparable<ID>>(
} catch (e: Exception) {
null
} // TODO: we can do better than this
val oldValue = value
// val oldValue = value
value = result
for (query in queries) {
oldValue?._id?.let { query.value.onRemoved(it) }
result?.let { query.value.onAdded(it) }
// oldValue?._id?.let { query.value.onRemoved(it) }
result?.let { query.value.onNewValue(it) }
query.value.refreshIfNeeded()
}
return result
Expand All @@ -99,18 +100,16 @@ class ModelCache<T : HasId<ID>, ID : Comparable<ID>>(
}

override suspend fun invalidate() {
lastSet = 0.0
invalid = true
}

fun virtualDelete() {
val oldValue = value
value = null
oldValue?.let { value ->
for (query in queries) {
if (query.key.condition(value)) {
query.value.onRemoved(id)
query.value.refreshIfNeeded()
}
query.value.onRemoved(id)
query.value.refreshIfNeeded()
}
}
}
Expand All @@ -122,15 +121,17 @@ class ModelCache<T : HasId<ID>, ID : Comparable<ID>>(
var live: Int = 0
var lastSet: Double = 0.0
var lastInvalidateCheck = clockMillis()
val upToDate: Boolean get() {
val now = clockMillis()
val result = (ready && (live > 0 || (now - lastSet < cacheMs && lastInvalidateCheck > totalInvalidation)))
lastInvalidateCheck = now
return result
}
val upToDate: Boolean
get() {
val now = clockMillis()
val result =
(ready && (live > 0 || (now - lastSet < cacheMs && lastInvalidateCheck > totalInvalidation)))
lastInvalidateCheck = now
return result
}
val comparator = query.orderBy.comparator ?: compareBy { it._id }

var complete: Boolean = false
var hasMorePages: Boolean = false
var ready: Boolean = false
val ids = ArrayList<ID>()
var unreportedChanges = false
Expand All @@ -154,15 +155,21 @@ class ModelCache<T : HasId<ID>, ID : Comparable<ID>>(
}
}

fun onAdded(item: T) {
if (!query.condition(item)) return
if (comparator == null) return
if (!complete) {
fun onNewValue(item: T) {
if (!query.condition(item)) {
unreportedChanges = unreportedChanges || ids.remove(item._id)
return
}
if (hasMorePages) {
val lastItem = cache[ids.lastOrNull() ?: return]?.value ?: return
if (comparator.compare(item, lastItem) > 0) return
}
if (item._id in ids) {
unreportedChanges = true
return
}
for (index in ids.indices) {
val nextItem = cache[ids.lastOrNull() ?: continue]?.value ?: continue
val nextItem = cache[ids.getOrNull(index) ?: continue]?.value ?: continue
if (comparator.compare(item, nextItem) < 0) {
ids.add(index, item._id)
unreportedChanges = true
Expand All @@ -174,16 +181,15 @@ class ModelCache<T : HasId<ID>, ID : Comparable<ID>>(
}

fun onRemoved(id: ID) {
ids.remove(id)
unreportedChanges = true
unreportedChanges = unreportedChanges || ids.remove(id)
}

fun reset(ids: Collection<ID>) {
ready = true
lastSet = clockMillis()
this.ids.clear()
this.ids.addAll(ids)
complete = ids.size < query.limit
hasMorePages = ids.size == query.limit
unreportedChanges = true
}

Expand All @@ -207,7 +213,7 @@ class ModelCache<T : HasId<ID>, ID : Comparable<ID>>(
cache.getOrPut(new._id) { WritableModelImpl(new._id) }.apply {
value = new
}
queries.forEach { it.value.onAdded(new); it.value.refreshIfNeeded() }
queries.forEach { it.value.onNewValue(new); it.value.refreshIfNeeded() }
}
it.remove.forEach { old ->
cache[old]?.virtualDelete()
Expand All @@ -231,7 +237,7 @@ class ModelCache<T : HasId<ID>, ID : Comparable<ID>>(
cache.getOrPut(new._id) { WritableModelImpl(new._id) }.apply {
value = new
}
queries.forEach { it.value.onAdded(new); it.value.refreshIfNeeded() }
queries.forEach { it.value.onNewValue(new); it.value.refreshIfNeeded() }
}

old != null -> {
Expand Down Expand Up @@ -321,7 +327,7 @@ class ModelCache<T : HasId<ID>, ID : Comparable<ID>>(
val id = new._id
val impl = cache.getOrPut(id) { WritableModelImpl(id) }
impl.value = new
queries.forEach { it.value.onAdded(new); it.value.refreshIfNeeded() }
queries.forEach { it.value.onNewValue(new); it.value.refreshIfNeeded() }
return impl
}

Expand All @@ -334,23 +340,18 @@ class ModelCache<T : HasId<ID>, ID : Comparable<ID>>(
impl.value = new
}
queries.forEach {
for (item in newItems) it.value.onAdded(item)
for (item in newItems) it.value.onNewValue(item)
it.value.refreshIfNeeded()
}
return newItems
}

override suspend fun upsert(item: T): WritableModel<T> {
val new = skipCache.upsert(item._id, item)
val id = new._id
val impl = cache.getOrPut(id) { WritableModelImpl(id) }
val old = impl.value
val impl = cache.getOrPut(new._id) { WritableModelImpl(new._id) }
impl.value = new
queries.forEach {
if (old != null) {
it.value.onRemoved(id)
}
it.value.onAdded(new)
it.value.onNewValue(new)
it.value.refreshIfNeeded()
}
return impl
Expand All @@ -376,12 +377,13 @@ class ModelCache<T : HasId<ID>, ID : Comparable<ID>>(
skipCache.query(query.query).let {
for (item in it) cache.getOrPut(item._id) { WritableModelImpl(item._id) }.value = item
query.reset(it.map { it._id })
query.refreshIfNeeded()
}
}
}
val needsUpdates = cache.values.toList().asSequence().filter { it.inUse && !it.upToDate }.map { it.id }.toSet()

val needsUpdates = cache.values.toList().asSequence().filter { (it.inUse && !it.upToDate) || it.invalid }.map { it.id }.toSet()
if (needsUpdates.isNotEmpty()) {
println("Needs Updating")
val limit = 1000
val results = needsUpdates
.chunked(limit)
Expand All @@ -393,10 +395,21 @@ class ModelCache<T : HasId<ID>, ID : Comparable<ID>>(
)
)
}
needsUpdates.forEach { id ->
cache.getOrPut(id) { WritableModelImpl(id) }.value = results.find { it._id == id }
for (id in needsUpdates) {
results.find { it._id == id }?.also { updated ->
cache.getOrPut(id) { WritableModelImpl(id) }.value = updated
for (query in queries.values.toList()) {
query.onNewValue(updated)
}
} ?: run {
cache[id]?.virtualDelete()
}
}
}

for (query in queries.values.toList()) {
query.refreshIfNeeded()
}
}

init {
Expand Down
9 changes: 6 additions & 3 deletions server-core/src/main/kotlin/com/lightningkite/lightningserver/typed/TypescriptSdk.kt
View file
Expand Up @@ -45,7 +45,10 @@ fun Documentable.Companion.typescriptSdk(out: Appendable) = with(out) {
appendLine(" {")
for (index in 0 until it.descriptor.elementsCount) {
append(" ")
append(it.descriptor.getElementName(index))
it.descriptor.getElementName(index).first()
.let { if (it.isJavaIdentifierStart()) it else '_' }.let { append(it) }
it.descriptor.getElementName(index).drop(1)
.map { if (it.isJavaIdentifierPart()) it else '_' }.forEach { append(it) }
append(" = \"")
append(it.descriptor.getElementName(index))
append("\",")
Expand Down Expand Up @@ -426,8 +429,8 @@ private fun KSerializer<*>.write(): String = nullElement()?.let { it.write() + "
}
this.tryTypeParameterSerializers2()?.takeUnless { it.isEmpty() }
?.joinToString(", ", "<", ">") { it.write() }?.let {
out.append(it)
}
out.append(it)
}
}
}
}.toString()
Expand Down

0 comments on commit c4a558e

Please sign in to comment.