nick/amethyst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge branch 'vitorpamplona:main' into followset-improvements

Browse Source
This commit is contained in:
KotlinGeekDev
2025-10-08 01:53:14 +00:00
committed by GitHub
parent 049430cd2e 0045426840
commit 192a257780
20 changed files with 830 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quartz/src/androidMain/kotlin/com/vitorpamplona/quartz/nip01Core/core/Address.kt
+6 -6
View File
@@ -40,16 +40,16 @@ actual data class Address actual constructor(
dTag.bytesUsedInMemory()
actual override fun compareTo(other: Address): Int {
val result = kind.compareTo(other.kind)
return if (result == 0) {
val result2 = pubKeyHex.compareTo(other.pubKeyHex)
if (result2 == 0) {
val kindComparison = kind.compareTo(other.kind)
return if (kindComparison == 0) {
val pubkeyComparison = pubKeyHex.compareTo(other.pubKeyHex)
if (pubkeyComparison == 0) {
dTag.compareTo(other.dTag)
} else {
result2
pubkeyComparison
}
} else {
result
kindComparison
}
}
quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip01Core/core/AddressSerializer.kt
+7 -1
View File
@@ -31,7 +31,13 @@ class AddressSerializer {
kind: Int,
pubKeyHex: HexKey,
dTag: String = "",
) = "$kind:$pubKeyHex:$dTag"
) = buildString {
append(kind)
append(":")
append(pubKeyHex)
append(":")
append(dTag)
}
fun parse(addressId: String): Address? {
if (addressId.isBlank()) return null
quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/utils/cache/ICacheOperations.kt
Vendored
+102
View File
@@ -70,6 +70,108 @@ interface ICacheOperations<K, V> {
fun <U> associateWith(transform: (K, V) -> U?): Map<K, U?>
// --
// Sub map operations
// --
fun filter(
from: K,
to: K,
consumer: CacheCollectors.BiFilter<K, V>,
): List<V>
fun filterIntoSet(
from: K,
to: K,
consumer: CacheCollectors.BiFilter<K, V>,
): Set<V>
fun <R> map(
from: K,
to: K,
consumer: CacheCollectors.BiNotNullMapper<K, V, R>,
): List<R>
fun <R> mapNotNull(
from: K,
to: K,
consumer: CacheCollectors.BiMapper<K, V, R?>,
): List<R>
fun <R> mapNotNullIntoSet(
from: K,
to: K,
consumer: CacheCollectors.BiMapper<K, V, R?>,
): Set<R>
fun <R> mapFlatten(
from: K,
to: K,
consumer: CacheCollectors.BiMapper<K, V, Collection<R>?>,
): List<R>
fun <R> mapFlattenIntoSet(
from: K,
to: K,
consumer: CacheCollectors.BiMapper<K, V, Collection<R>?>,
): Set<R>
fun maxOrNullOf(
from: K,
to: K,
filter: CacheCollectors.BiFilter<K, V>,
comparator: Comparator<V>,
): V?
fun sumOf(
from: K,
to: K,
consumer: CacheCollectors.BiSumOf<K, V>,
): Int
fun sumOfLong(
from: K,
to: K,
consumer: CacheCollectors.BiSumOfLong<K, V>,
): Long
fun <R> groupBy(
from: K,
to: K,
consumer: CacheCollectors.BiNotNullMapper<K, V, R>,
): Map<R, List<V>>
fun <R> countByGroup(
from: K,
to: K,
consumer: CacheCollectors.BiNotNullMapper<K, V, R>,
): Map<R, Int>
fun <R> sumByGroup(
from: K,
to: K,
groupMap: CacheCollectors.BiNotNullMapper<K, V, R>,
sumOf: CacheCollectors.BiNotNullMapper<K, V, Long>,
): Map<R, Long>
fun count(
from: K,
to: K,
consumer: CacheCollectors.BiFilter<K, V>,
): Int
fun <T, U> associate(
from: K,
to: K,
transform: (K, V) -> Pair<T, U>,
): Map<T, U>
fun <U> associateWith(
from: K,
to: K,
transform: (K, V) -> U?,
): Map<K, U?>
fun joinToString(
separator: CharSequence = ", ",
prefix: CharSequence = "",
quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/utils/cache/LargeCache.kt
Vendored
+98
View File
@@ -92,6 +92,104 @@ expect class LargeCache<K, V>() : ICacheOperations<K, V> {
override fun <U> associateWith(transform: (K, V) -> U?): Map<K, U?>
override fun filter(
from: K,
to: K,
consumer: CacheCollectors.BiFilter<K, V>,
): List<V>
override fun filterIntoSet(
from: K,
to: K,
consumer: CacheCollectors.BiFilter<K, V>,
): Set<V>
override fun <R> map(
from: K,
to: K,
consumer: CacheCollectors.BiNotNullMapper<K, V, R>,
): List<R>
override fun <R> mapNotNull(
from: K,
to: K,
consumer: CacheCollectors.BiMapper<K, V, R?>,
): List<R>
override fun <R> mapNotNullIntoSet(
from: K,
to: K,
consumer: CacheCollectors.BiMapper<K, V, R?>,
): Set<R>
override fun <R> mapFlatten(
from: K,
to: K,
consumer: CacheCollectors.BiMapper<K, V, Collection<R>?>,
): List<R>
override fun <R> mapFlattenIntoSet(
from: K,
to: K,
consumer: CacheCollectors.BiMapper<K, V, Collection<R>?>,
): Set<R>
override fun maxOrNullOf(
from: K,
to: K,
filter: CacheCollectors.BiFilter<K, V>,
comparator: Comparator<V>,
): V?
override fun sumOf(
from: K,
to: K,
consumer: CacheCollectors.BiSumOf<K, V>,
): Int
override fun sumOfLong(
from: K,
to: K,
consumer: CacheCollectors.BiSumOfLong<K, V>,
): Long
override fun <R> groupBy(
from: K,
to: K,
consumer: CacheCollectors.BiNotNullMapper<K, V, R>,
): Map<R, List<V>>
override fun <R> countByGroup(
from: K,
to: K,
consumer: CacheCollectors.BiNotNullMapper<K, V, R>,
): Map<R, Int>
override fun <R> sumByGroup(
from: K,
to: K,
groupMap: CacheCollectors.BiNotNullMapper<K, V, R>,
sumOf: CacheCollectors.BiNotNullMapper<K, V, Long>,
): Map<R, Long>
override fun count(
from: K,
to: K,
consumer: CacheCollectors.BiFilter<K, V>,
): Int
override fun <T, U> associate(
from: K,
to: K,
transform: (K, V) -> Pair<T, U>,
): Map<T, U>
override fun <U> associateWith(
from: K,
to: K,
transform: (K, V) -> U?,
): Map<K, U?>
override fun joinToString(
separator: CharSequence,
prefix: CharSequence,
quartz/src/iosMain/kotlin/com/vitorpamplona/quartz/utils/cache/LargeCache.ios.kt
Vendored
+130
View File
@@ -147,6 +147,136 @@ actual class LargeCache<K, V> : ICacheOperations<K, V> {
TODO("Not yet implemented")
}
actual override fun filter(
from: K,
to: K,
consumer: CacheCollectors.BiFilter<K, V>,
): List<V> {
TODO("Not yet implemented")
}
actual override fun filterIntoSet(
from: K,
to: K,
consumer: CacheCollectors.BiFilter<K, V>,
): Set<V> {
TODO("Not yet implemented")
}
actual override fun <R> map(
from: K,
to: K,
consumer: CacheCollectors.BiNotNullMapper<K, V, R>,
): List<R> {
TODO("Not yet implemented")
}
actual override fun <R> mapNotNull(
from: K,
to: K,
consumer: CacheCollectors.BiMapper<K, V, R?>,
): List<R> {
TODO("Not yet implemented")
}
actual override fun <R> mapNotNullIntoSet(
from: K,
to: K,
consumer: CacheCollectors.BiMapper<K, V, R?>,
): Set<R> {
TODO("Not yet implemented")
}
actual override fun <R> mapFlatten(
from: K,
to: K,
consumer: CacheCollectors.BiMapper<K, V, Collection<R>?>,
): List<R> {
TODO("Not yet implemented")
}
actual override fun <R> mapFlattenIntoSet(
from: K,
to: K,
consumer: CacheCollectors.BiMapper<K, V, Collection<R>?>,
): Set<R> {
TODO("Not yet implemented")
}
actual override fun maxOrNullOf(
from: K,
to: K,
filter: CacheCollectors.BiFilter<K, V>,
comparator: Comparator<V>,
): V? {
TODO("Not yet implemented")
}
actual override fun sumOf(
from: K,
to: K,
consumer: CacheCollectors.BiSumOf<K, V>,
): Int {
TODO("Not yet implemented")
}
actual override fun sumOfLong(
from: K,
to: K,
consumer: CacheCollectors.BiSumOfLong<K, V>,
): Long {
TODO("Not yet implemented")
}
actual override fun <R> groupBy(
from: K,
to: K,
consumer: CacheCollectors.BiNotNullMapper<K, V, R>,
): Map<R, List<V>> {
TODO("Not yet implemented")
}
actual override fun <R> countByGroup(
from: K,
to: K,
consumer: CacheCollectors.BiNotNullMapper<K, V, R>,
): Map<R, Int> {
TODO("Not yet implemented")
}
actual override fun <R> sumByGroup(
from: K,
to: K,
groupMap: CacheCollectors.BiNotNullMapper<K, V, R>,
sumOf: CacheCollectors.BiNotNullMapper<K, V, Long>,
): Map<R, Long> {
TODO("Not yet implemented")
}
actual override fun count(
from: K,
to: K,
consumer: CacheCollectors.BiFilter<K, V>,
): Int {
TODO("Not yet implemented")
}
actual override fun <T, U> associate(
from: K,
to: K,
transform: (K, V) -> Pair<T, U>,
): Map<T, U> {
TODO("Not yet implemented")
}
actual override fun <U> associateWith(
from: K,
to: K,
transform: (K, V) -> U?,
): Map<K, U?> {
TODO("Not yet implemented")
}
actual override fun joinToString(
separator: CharSequence,
prefix: CharSequence,
quartz/src/jvmAndroid/kotlin/com/vitorpamplona/quartz/utils/cache/CacheOperations.kt
Vendored
+171
View File
@@ -36,6 +36,12 @@ class MyBiConsumer<K, V>(
interface CacheOperations<K, V> : ICacheOperations<K, V> {
fun forEach(consumer: BiConsumer<K, V>)
fun forEach(
from: K,
to: K,
consumer: BiConsumer<K, V>,
)
override fun size(): Int
override fun forEach(consumer: ICacheBiConsumer<K, V>) {
@@ -144,6 +150,171 @@ interface CacheOperations<K, V> : ICacheOperations<K, V> {
return runner.results
}
// ----
// submap operations
// ----
override fun filter(
from: K,
to: K,
consumer: CacheCollectors.BiFilter<K, V>,
): List<V> {
val runner = BiFilterCollector(consumer)
forEach(from, to, runner)
return runner.results
}
override fun filterIntoSet(
from: K,
to: K,
consumer: CacheCollectors.BiFilter<K, V>,
): Set<V> {
val runner = BiFilterUniqueCollector(consumer)
forEach(from, to, runner)
return runner.results
}
override fun <R> map(
from: K,
to: K,
consumer: CacheCollectors.BiNotNullMapper<K, V, R>,
): List<R> {
val runner = BiNotNullMapCollector(consumer)
forEach(from, to, runner)
return runner.results
}
override fun <R> mapNotNull(
from: K,
to: K,
consumer: CacheCollectors.BiMapper<K, V, R?>,
): List<R> {
val runner = BiMapCollector(consumer)
forEach(from, to, runner)
return runner.results
}
override fun <R> mapNotNullIntoSet(
from: K,
to: K,
consumer: CacheCollectors.BiMapper<K, V, R?>,
): Set<R> {
val runner = BiMapUniqueCollector(consumer)
forEach(from, to, runner)
return runner.results
}
override fun <R> mapFlatten(
from: K,
to: K,
consumer: CacheCollectors.BiMapper<K, V, Collection<R>?>,
): List<R> {
val runner = BiMapFlattenCollector(consumer)
forEach(from, to, runner)
return runner.results
}
override fun <R> mapFlattenIntoSet(
from: K,
to: K,
consumer: CacheCollectors.BiMapper<K, V, Collection<R>?>,
): Set<R> {
val runner = BiMapFlattenUniqueCollector(consumer)
forEach(from, to, runner)
return runner.results
}
override fun maxOrNullOf(
from: K,
to: K,
filter: CacheCollectors.BiFilter<K, V>,
comparator: Comparator<V>,
): V? {
val runner = BiMaxOfCollector(filter, comparator)
forEach(from, to, runner)
return runner.maxV
}
override fun sumOf(
from: K,
to: K,
consumer: CacheCollectors.BiSumOf<K, V>,
): Int {
val runner = BiSumOfCollector(consumer)
forEach(from, to, runner)
return runner.sum
}
override fun sumOfLong(
from: K,
to: K,
consumer: CacheCollectors.BiSumOfLong<K, V>,
): Long {
val runner = BiSumOfLongCollector(consumer)
forEach(from, to, runner)
return runner.sum
}
override fun <R> groupBy(
from: K,
to: K,
consumer: CacheCollectors.BiNotNullMapper<K, V, R>,
): Map<R, List<V>> {
val runner = BiGroupByCollector(consumer)
forEach(from, to, runner)
return runner.results
}
override fun <R> countByGroup(
from: K,
to: K,
consumer: CacheCollectors.BiNotNullMapper<K, V, R>,
): Map<R, Int> {
val runner = BiCountByGroupCollector(consumer)
forEach(from, to, runner)
return runner.results
}
override fun <R> sumByGroup(
from: K,
to: K,
groupMap: CacheCollectors.BiNotNullMapper<K, V, R>,
sumOf: CacheCollectors.BiNotNullMapper<K, V, Long>,
): Map<R, Long> {
val runner = BiSumByGroupCollector(groupMap, sumOf)
forEach(from, to, runner)
return runner.results
}
override fun count(
from: K,
to: K,
consumer: CacheCollectors.BiFilter<K, V>,
): Int {
val runner = BiCountIfCollector(consumer)
forEach(from, to, runner)
return runner.count
}
override fun <T, U> associate(
from: K,
to: K,
transform: (K, V) -> Pair<T, U>,
): Map<T, U> {
val runner = BiAssociateCollector(size(), transform)
forEach(from, to, runner)
return runner.results
}
override fun <U> associateWith(
from: K,
to: K,
transform: (K, V) -> U?,
): Map<K, U?> {
val runner = BiAssociateWithCollector(size(), transform)
forEach(from, to, runner)
return runner.results
}
override fun joinToString(
separator: CharSequence,
prefix: CharSequence,
quartz/src/jvmAndroid/kotlin/com/vitorpamplona/quartz/utils/cache/LargeCache.jvmAndroid.kt
Vendored
+10
View File
@@ -79,4 +79,14 @@ actual class LargeCache<K, V> : CacheOperations<K, V> {
override fun forEach(consumer: BiConsumer<K, V>) {
cache.forEach(consumer)
}
override fun forEach(
from: K,
to: K,
consumer: BiConsumer<K, V>,
) {
cache
.subMap(from, true, to, true)
.forEach(consumer)
}
}