Feature/bma/incr sync perf #6917
There are no files selected for viewing
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| Fix long incremental sync. |
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,99 @@ | ||
| /* | ||
| * Copyright 2022 The Matrix.org Foundation C.I.C. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.matrix.android.sdk.internal.session.sync.handler | ||
|
|
||
| import android.content.Context | ||
| import androidx.work.WorkerParameters | ||
| import com.zhuinden.monarchy.Monarchy | ||
| import org.matrix.android.sdk.api.extensions.tryOrNull | ||
| import org.matrix.android.sdk.api.session.user.model.User | ||
| import org.matrix.android.sdk.internal.SessionManager | ||
| import org.matrix.android.sdk.internal.crypto.crosssigning.UpdateTrustWorker | ||
| import org.matrix.android.sdk.internal.crypto.crosssigning.UpdateTrustWorkerDataRepository | ||
| import org.matrix.android.sdk.internal.di.SessionDatabase | ||
| import org.matrix.android.sdk.internal.session.SessionComponent | ||
| import org.matrix.android.sdk.internal.session.profile.GetProfileInfoTask | ||
| import org.matrix.android.sdk.internal.session.user.UserEntityFactory | ||
| import org.matrix.android.sdk.internal.util.awaitTransaction | ||
| import org.matrix.android.sdk.internal.util.logLimit | ||
| import org.matrix.android.sdk.internal.worker.SessionSafeCoroutineWorker | ||
| import timber.log.Timber | ||
| import javax.inject.Inject | ||
|
|
||
| /** | ||
| * Note: We reuse the same type [UpdateTrustWorker.Params], since the input data are the same. | ||
| */ | ||
| internal class UpdateUserWorker(context: Context, params: WorkerParameters, sessionManager: SessionManager) : | ||
| SessionSafeCoroutineWorker<UpdateTrustWorker.Params>(context, params, sessionManager, UpdateTrustWorker.Params::class.java) { | ||
|
|
||
| @SessionDatabase | ||
| @Inject lateinit var monarchy: Monarchy | ||
| @Inject lateinit var updateTrustWorkerDataRepository: UpdateTrustWorkerDataRepository | ||
| @Inject lateinit var getProfileInfoTask: GetProfileInfoTask | ||
|
|
||
| override fun injectWith(injector: SessionComponent) { | ||
| injector.inject(this) | ||
| } | ||
|
|
||
| override suspend fun doSafeWork(params: UpdateTrustWorker.Params): Result { | ||
| val userList = params.filename | ||
| ?.let { updateTrustWorkerDataRepository.getParam(it) } | ||
| ?.userIds | ||
| ?: params.updatedUserIds.orEmpty() | ||
|
|
||
| // List should not be empty, but let's avoid go further in case of empty list | ||
| if (userList.isNotEmpty()) { | ||
| Timber.v("## UpdateUserWorker - updating users: ${userList.logLimit()}") | ||
| fetchAndUpdateUsers(userList) | ||
| } | ||
|
|
||
| cleanup(params) | ||
| return Result.success() | ||
| } | ||
|
|
||
| private suspend fun fetchAndUpdateUsers(userIdsToFetch: Collection<String>) { | ||
| fetchUsers(userIdsToFetch) | ||
| .takeIf { it.isNotEmpty() } | ||
| ?.saveLocally() | ||
| } | ||
|
|
||
| private suspend fun fetchUsers(userIdsToFetch: Collection<String>) = userIdsToFetch.mapNotNull { | ||
| tryOrNull { | ||
| val profileJson = getProfileInfoTask.execute(GetProfileInfoTask.Params(it)) | ||
| User.fromJson(it, profileJson) | ||
| } | ||
| } | ||
|
|
||
| private suspend fun List<User>.saveLocally() { | ||
| val userEntities = map { user -> UserEntityFactory.create(user) } | ||
| Timber.d("## saveLocally()") | ||
| monarchy.awaitTransaction { | ||
| Timber.d("## saveLocally() - in transaction") | ||
| it.insertOrUpdate(userEntities) | ||
| } | ||
| Timber.d("## saveLocally() - END") | ||
| } | ||
|
|
||
| private fun cleanup(params: UpdateTrustWorker.Params) { | ||
| params.filename | ||
| ?.let { updateTrustWorkerDataRepository.delete(it) } | ||
| } | ||
|
|
||
| override fun buildErrorParams(params: UpdateTrustWorker.Params, message: String): UpdateTrustWorker.Params { | ||
| return params.copy(lastFailureMessage = params.lastFailureMessage ?: message) | ||
| } | ||
| } |
This file contains hidden or 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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I struggle to understand why using the
aggregatorchanges something here. Seeing the implementation ofonUsersDeviceUpdate, I see we only schedule a worker we should not take so much time, right?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In the current code,
crossSigningService.onUsersDeviceUpdate(otherRoomMembers)is called once per room.With the new code this is called once per sync response (which can contains many rooms)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Okay thanks for explaining.