op-based counter #141
Open
op-based counter #141
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
d-r-q
approved these changes
May 3, 2022
| @@ -41,7 +42,9 @@ data class LogsDiff( | |||
| resolve(writesFromA[it]!!, writesFromB[it]!!) | |||
| } | |||
| } | |||
| return resolvingEavsByGid.values.map { RawEntity(it.first().gid, it) } | |||
| return resolvingEavsByGid | |||
| .filter { !it.value.isEmpty() } | |||
There was a problem hiding this comment.
Во-первых тут идея ругается, что надо it.value.isNotEmpty()
Во-вторых чёт мне эта фильтрация в целом не очень нравится, давай хотя бы коммент напишем откуда там пустые значения
В-третьих, чёт меня малёха смущает, что это приведёт к утере атрибута сущности, а тут вроде везде речь о сущностях целиком
| @@ -68,6 +71,7 @@ internal fun lastWriterWinsResolve(resolveAttrName: (String) -> Attr<Any>?): (Li | |||
| // temporary dirty hack until crdt counter or custom resolution strategy support is implemented | |||
| attr == Instances.nextEid -> listOf((eavsFromA + eavsFromB).maxByOrNull { it.eav.value as Int }!!.eav) | |||
| @@ -61,17 +63,17 @@ class Index( | |||
| } | |||
| } | |||
|
|
|||
| fun addFacts(facts: List<Eav>): Index = | |||
| addFacts(facts as Iterable<Eav>) | |||
| fun addFacts(facts: List<Eav>, resolveAttr: (String) -> Attr<*>? = { null }): Index = | |||
There was a problem hiding this comment.
Может resolveAttr уже в поля засунуть, раз такая пьянка?
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.
No description provided.