From 85d8ee416fec276953640e190023d67715059e7c Mon Sep 17 00:00:00 2001 From: Jem Mawson Date: Fri, 29 Nov 2024 16:16:16 +1100 Subject: [PATCH] Removes unused destructured variables across multiple services and test files. This change simplifies code by removing unnecessary variable declarations that were previously part of destructuring operations but never used. The pattern `val (x, _)` has been replaced with `val (x)` where the second destructured value was not needed. GitOrigin-RevId: 862906a2550fcf918754fc7051819de1d6621cff --- misk-aws/src/main/kotlin/misk/jobqueue/sqs/SqsJob.kt | 2 +- misk-aws/src/main/kotlin/misk/jobqueue/sqs/SqsJobConsumer.kt | 4 ++-- misk-aws/src/main/kotlin/misk/jobqueue/sqs/SqsJobQueue.kt | 2 +- .../kotlin/misk/clustering/dynamo/DynamoClusterWatcherTask.kt | 4 ++-- .../src/main/kotlin/misk/hibernate/SchemaValidator.kt | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/misk-aws/src/main/kotlin/misk/jobqueue/sqs/SqsJob.kt b/misk-aws/src/main/kotlin/misk/jobqueue/sqs/SqsJob.kt index eae407ec736..27d44d89930 100644 --- a/misk-aws/src/main/kotlin/misk/jobqueue/sqs/SqsJob.kt +++ b/misk-aws/src/main/kotlin/misk/jobqueue/sqs/SqsJob.kt @@ -82,7 +82,7 @@ internal class SqsJob( metrics.visibilityTime.labels(queueName.value, queueName.value).set(visibilityTime.toDouble()) } private fun deleteMessage(queue: ResolvedQueue, message: Message) { - val (deleteDuration, _) = queue.call { + val (deleteDuration) = queue.call { timed { it.deleteMessage(queue.url, message.receiptHandle) } } metrics.sqsDeleteTime.record( diff --git a/misk-aws/src/main/kotlin/misk/jobqueue/sqs/SqsJobConsumer.kt b/misk-aws/src/main/kotlin/misk/jobqueue/sqs/SqsJobConsumer.kt index 45af2c23331..39f4946e72b 100644 --- a/misk-aws/src/main/kotlin/misk/jobqueue/sqs/SqsJobConsumer.kt +++ b/misk-aws/src/main/kotlin/misk/jobqueue/sqs/SqsJobConsumer.kt @@ -255,7 +255,7 @@ internal class SqsJobConsumer @Inject internal constructor( MDC.put(SQS_JOB_ID_STRUCTURED_MDC, message.id) MDC.put(SQS_QUEUE_NAME_MDC, message.queueName.value) MDC.put(SQS_QUEUE_TYPE_MDC, SQS_QUEUE_TYPE) - val (duration, _) = timed { handler.handleJob(message) } + val (duration) = timed { handler.handleJob(message) } metrics.handlerDispatchTime.record( duration.toMillis().toDouble(), queue.queueName, queue.queueName @@ -322,7 +322,7 @@ internal class SqsJobConsumer @Inject internal constructor( try { MDC.put(SQS_QUEUE_NAME_MDC, messages.first().queueName.value) MDC.put(SQS_QUEUE_TYPE_MDC, SQS_QUEUE_TYPE) - val (duration, _) = timed { handler.handleJobs(messages) } + val (duration) = timed { handler.handleJobs(messages) } metrics.handlerDispatchTime.record( duration.toMillis().toDouble(), queue.queueName, queue.queueName diff --git a/misk-aws/src/main/kotlin/misk/jobqueue/sqs/SqsJobQueue.kt b/misk-aws/src/main/kotlin/misk/jobqueue/sqs/SqsJobQueue.kt index 6ad0d013488..ccab294a5b8 100644 --- a/misk-aws/src/main/kotlin/misk/jobqueue/sqs/SqsJobQueue.kt +++ b/misk-aws/src/main/kotlin/misk/jobqueue/sqs/SqsJobQueue.kt @@ -43,7 +43,7 @@ internal class SqsJobQueue @Inject internal constructor( attributes: Map ) { executeWithTracingAndErrorHandling(queueName, 1) { span: Span, queue: ResolvedQueue -> - val (sendDuration, _) = queue.call { client -> + val (sendDuration) = queue.call { client -> val sendRequest = SendMessageRequest().apply { queueUrl = queue.url messageBody = body diff --git a/misk-clustering-dynamodb/src/main/kotlin/misk/clustering/dynamo/DynamoClusterWatcherTask.kt b/misk-clustering-dynamodb/src/main/kotlin/misk/clustering/dynamo/DynamoClusterWatcherTask.kt index 6a826a25880..eeef07e5320 100644 --- a/misk-clustering-dynamodb/src/main/kotlin/misk/clustering/dynamo/DynamoClusterWatcherTask.kt +++ b/misk-clustering-dynamodb/src/main/kotlin/misk/clustering/dynamo/DynamoClusterWatcherTask.kt @@ -57,7 +57,7 @@ internal class DynamoClusterWatcherTask @Inject constructor( } private fun updateOurselfInDynamo() { - val (duration, _) = timed { + val (duration) = timed { val self = cluster.snapshot.self.name val member = DyClusterMember() member.name = self @@ -72,7 +72,7 @@ internal class DynamoClusterWatcherTask @Inject constructor( } internal fun recordCurrentDynamoCluster() { - val (duration, _) = timed { + val (duration) = timed { val members = mutableSetOf() val threshold = clock.instant().minusSeconds(dynamoClusterConfig.stale_threshold_seconds).toEpochMilli() val request = ScanEnhancedRequest.builder() diff --git a/misk-hibernate/src/main/kotlin/misk/hibernate/SchemaValidator.kt b/misk-hibernate/src/main/kotlin/misk/hibernate/SchemaValidator.kt index 3fc9cef99f5..c64ba4e3e41 100644 --- a/misk-hibernate/src/main/kotlin/misk/hibernate/SchemaValidator.kt +++ b/misk-hibernate/src/main/kotlin/misk/hibernate/SchemaValidator.kt @@ -36,7 +36,7 @@ internal class SchemaValidator { allDbTables.addAll(dbSchema.tables) } - val (dbOnly, hibernateOnly, _) = splitChildren( + val (dbOnly, hibernateOnly) = splitChildren( allDbTables.toList(), hibernateSchema.tables )