NetworkDb: remove stale channels in batch #886
Merged
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
Add methods to delete channels and tags channels as pruned in batch which is much more efficient in sqlite.
Test pruning a few 1000s channels at once.
pm47
reviewed
Mar 7, 2019
| @@ -49,7 +50,9 @@ trait NetworkDb { | |||
|
|
|||
| def listChannelUpdates(): Seq[ChannelUpdate] | |||
|
|
|||
| def addToPruned(shortChannelId: ShortChannelId) | |||
| def addToPruned(shortChannelId: ShortChannelId): Unit = addToPruned(Seq(shortChannelId)) | |||
There was a problem hiding this comment.
Why did you keep def addToPruned(shortChannelId: ShortChannelId)?
There was a problem hiding this comment.
No real reason, I've removed it.
pm47
reviewed
Mar 7, 2019
| @@ -104,19 +106,36 @@ class SqliteNetworkDbSpec extends FunSuite { | |||
| db.updateChannelUpdate(channel_update_1) | |||
| } | |||
|
|
|||
| test("add/remove/test pruned channels") { | |||
| test("remove many channels") { | |||
There was a problem hiding this comment.
Why is this test so much more complicated?
| @@ -344,7 +344,7 @@ class Router(nodeParams: NodeParams, watcher: ActorRef, initialized: Option[Prom | |||
|
|
|||
| case Event(TickPruneStaleChannels, d) => | |||
| // first we select channels that we will prune | |||
| val staleChannels = getStaleChannels(d.channels.values, d.updates) | |||
| val staleChannels = getStaleChannels(d.channels.values, d.updates).toSeq | |||
There was a problem hiding this comment.
can we make take an removeChannels take an Iterable to remove a copy?
It's more consistent with our code base.
pm47
approved these changes
Mar 8, 2019
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.
Use batch queries to remove/prune multiple channels (we currently iterate and use one query per channel). This should allow us to remove stale channels on Android much more efficiently.