Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove debug logging in editable mapping logic #6783

Merged
merged 1 commit into from
Jan 25, 2023
Merged

Remove debug logging in editable mapping logic #6783

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .../com/scalableminds/webknossos/tracingstore/tracings/editablemapping/EditableMapping.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ case class EditableMapping(
agglomerateToGraph: Map[Long, AgglomerateGraph],
createdTimestamp: Long,
) {
override def toString: String = f"EditableMapping(agglomerates:${agglomerateToGraph.keySet})"
override def toString: String = f"EditableMapping(${agglomerateToGraph.size} agglomerates)"

def toProto: EditableMappingProto =
EditableMappingProto(
Expand Down
11 changes: 1 addition & 10 deletions ...alableminds/webknossos/tracingstore/tracings/editablemapping/EditableMappingService.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ import com.scalableminds.webknossos.tracingstore.tracings.{
VersionedKeyValuePair
}
import com.scalableminds.webknossos.tracingstore.{TSRemoteDatastoreClient, TSRemoteWebKnossosClient}
import com.typesafe.scalalogging.LazyLogging
import net.liftweb.common.{Box, Empty, Full}
import net.liftweb.util.Helpers.tryo
import org.jgrapht.alg.flow.PushRelabelMFImpl
Expand Down Expand Up @@ -84,8 +83,7 @@ class EditableMappingService @Inject()(
extends KeyValueStoreImplicits
with FallbackDataHelper
with FoxImplicits
with ProtoGeometryImplicits
with LazyLogging {
with ProtoGeometryImplicits {

private def generateId: String = UUID.randomUUID.toString

Expand Down Expand Up @@ -189,8 +187,6 @@ class EditableMappingService @Inject()(
closestMaterializedVersion: VersionedKeyValuePair[EditableMapping] <- tracingDataStore.editableMappings
.get(editableMappingId, Some(desiredVersion))(bytes =>
fromProtoBytes[EditableMappingProto](bytes).map(EditableMapping.fromProto))
_ = logger.info(
f"Loading mapping version $desiredVersion, closest materialized is version ${closestMaterializedVersion.version} (${closestMaterializedVersion.value})")
materialized <- applyPendingUpdates(
editableMappingId,
desiredVersion,
Expand All @@ -199,7 +195,6 @@ class EditableMappingService @Inject()(
closestMaterializedVersion.version,
userToken
)
_ = logger.info(s"Materialized mapping: $materialized")
_ <- Fox.runIf(shouldPersistMaterialized(closestMaterializedVersion.version, desiredVersion)) {
tracingDataStore.editableMappings.put(editableMappingId, desiredVersion, materialized.toProto)
}
Expand Down Expand Up @@ -245,7 +240,6 @@ class EditableMappingService @Inject()(

for {
pendingUpdates <- findPendingUpdates(editableMappingId, existingVersion, desiredVersion)
_ = logger.info(s"Applying ${pendingUpdates.length} mapping updates: $pendingUpdates...")
appliedEditableMapping <- updateIter(Some(existingEditableMapping), pendingUpdates)
} yield appliedEditableMapping
}
Expand All @@ -267,14 +261,11 @@ class EditableMappingService @Inject()(
userToken: Option[String]): Fox[EditableMapping] =
for {
agglomerateGraph <- agglomerateGraphForId(mapping, update.agglomerateId, remoteFallbackLayer, userToken)
_ = logger.info(s"Applying one split action on agglomerate ${update.agglomerateId}...")
segmentId1 <- findSegmentIdAtPosition(remoteFallbackLayer, update.segmentPosition1, update.mag, userToken)
segmentId2 <- findSegmentIdAtPosition(remoteFallbackLayer, update.segmentPosition2, update.mag, userToken)
largestExistingAgglomerateId <- largestAgglomerateId(mapping, remoteFallbackLayer, userToken)
agglomerateId2 = largestExistingAgglomerateId + 1L
(graph1, graph2) = splitGraph(agglomerateGraph, segmentId1, segmentId2)
_ = logger.info(
s"Graphs after split: Agglomerate ${update.agglomerateId}: AgglomerateGraph(${graph1.segments.length} segments, ${graph1.edges.length} edges), Aggloemrate $agglomerateId2: AgglomerateGraph(${graph2.segments.length} segments, ${graph2.edges.length} edges)")
splitSegmentToAgglomerate = graph2.segments.map(_ -> agglomerateId2).toMap
} yield
EditableMapping(
Expand Down