From 0732bbb74efa06baafb0d28ee7bf6937a1b079b6 Mon Sep 17 00:00:00 2001 From: Sergey Patrikeev Date: Tue, 26 May 2020 23:30:19 +0300 Subject: [PATCH] Index diagnostic: rename MaxNTimeBucket to TimeStats. GitOrigin-RevId: bf882d96e157d49d47b7653ad3ff976551e2c00b --- .../indexing/diagnostic/IndexDiagnosticJson.kt | 2 +- .../diagnostic/IndexingJobStatistics.kt | 18 +++++++++--------- .../{MaxNTimeBucket.kt => TimeStats.kt} | 2 +- ...{MaxNTimeBucketTest.kt => TimeStatsTest.kt} | 12 ++++++------ 4 files changed, 17 insertions(+), 17 deletions(-) rename platform/lang-impl/src/com/intellij/util/indexing/diagnostic/{MaxNTimeBucket.kt => TimeStats.kt} (96%) rename platform/lang-impl/testSources/com/intellij/util/indexing/{MaxNTimeBucketTest.kt => TimeStatsTest.kt} (88%) diff --git a/platform/lang-impl/src/com/intellij/util/indexing/diagnostic/IndexDiagnosticJson.kt b/platform/lang-impl/src/com/intellij/util/indexing/diagnostic/IndexDiagnosticJson.kt index 81240b2c5f31..3463af60acca 100644 --- a/platform/lang-impl/src/com/intellij/util/indexing/diagnostic/IndexDiagnosticJson.kt +++ b/platform/lang-impl/src/com/intellij/util/indexing/diagnostic/IndexDiagnosticJson.kt @@ -59,7 +59,7 @@ data class JsonTimeStats( } } -fun MaxNTimeBucket.toTimeStats(): JsonTimeStats? { +fun TimeStats.toTimeStats(): JsonTimeStats? { if (isEmpty) { return null } diff --git a/platform/lang-impl/src/com/intellij/util/indexing/diagnostic/IndexingJobStatistics.kt b/platform/lang-impl/src/com/intellij/util/indexing/diagnostic/IndexingJobStatistics.kt index 5885252bf6a0..9e418a0a5d1f 100644 --- a/platform/lang-impl/src/com/intellij/util/indexing/diagnostic/IndexingJobStatistics.kt +++ b/platform/lang-impl/src/com/intellij/util/indexing/diagnostic/IndexingJobStatistics.kt @@ -4,31 +4,31 @@ package com.intellij.util.indexing.diagnostic class IndexingJobStatistics { private val timeBucketSize = 128 - val timesPerIndexer: Map + val timesPerIndexer: Map get() = _timesPerIndexer - val indexingTimesPerFileType: Map + val indexingTimesPerFileType: Map get() = _indexingTimesPerFileType - val contentLoadingTimesPerFileType: Map + val contentLoadingTimesPerFileType: Map get() = _contentLoadingTimesPerFileType val numberOfFilesPerFileType: Map get() = _numberOfFilesPerFileType - private val _timesPerIndexer = hashMapOf() - private val _indexingTimesPerFileType = hashMapOf() - private val _contentLoadingTimesPerFileType = hashMapOf() + private val _timesPerIndexer = hashMapOf() + private val _indexingTimesPerFileType = hashMapOf() + private val _contentLoadingTimesPerFileType = hashMapOf() private val _numberOfFilesPerFileType = hashMapOf() @Synchronized fun addFileStatistics(fileStatistics: FileIndexingStatistics, contentLoadingTime: Long) { fileStatistics.perIndexerTimes.forEach { (indexId, time) -> - _timesPerIndexer.getOrPut(indexId.name) { MaxNTimeBucket(timeBucketSize) }.addTime(time) + _timesPerIndexer.getOrPut(indexId.name) { TimeStats(timeBucketSize) }.addTime(time) } val fileTypeName = fileStatistics.fileType.name _numberOfFilesPerFileType.compute(fileTypeName) { _, currentNumber -> (currentNumber ?: 0) + 1 } - _indexingTimesPerFileType.computeIfAbsent(fileTypeName) { MaxNTimeBucket(timeBucketSize) }.addTime(fileStatistics.indexingTime) - _contentLoadingTimesPerFileType.computeIfAbsent(fileTypeName) { MaxNTimeBucket(timeBucketSize) }.addTime(contentLoadingTime) + _indexingTimesPerFileType.computeIfAbsent(fileTypeName) { TimeStats(timeBucketSize) }.addTime(fileStatistics.indexingTime) + _contentLoadingTimesPerFileType.computeIfAbsent(fileTypeName) { TimeStats(timeBucketSize) }.addTime(contentLoadingTime) } } \ No newline at end of file diff --git a/platform/lang-impl/src/com/intellij/util/indexing/diagnostic/MaxNTimeBucket.kt b/platform/lang-impl/src/com/intellij/util/indexing/diagnostic/TimeStats.kt similarity index 96% rename from platform/lang-impl/src/com/intellij/util/indexing/diagnostic/MaxNTimeBucket.kt rename to platform/lang-impl/src/com/intellij/util/indexing/diagnostic/TimeStats.kt index 83b6853cc10e..a34082884d5c 100644 --- a/platform/lang-impl/src/com/intellij/util/indexing/diagnostic/MaxNTimeBucket.kt +++ b/platform/lang-impl/src/com/intellij/util/indexing/diagnostic/TimeStats.kt @@ -7,7 +7,7 @@ import java.util.* * Bucket of times with size of at most [sizeLimit]. * Maintains exact min, max, mean of all added times. */ -class MaxNTimeBucket(private val sizeLimit: Int) { +class TimeStats(private val sizeLimit: Int) { private val _maxNTimes: PriorityQueue = PriorityQueue() private var _count: Long? = null diff --git a/platform/lang-impl/testSources/com/intellij/util/indexing/MaxNTimeBucketTest.kt b/platform/lang-impl/testSources/com/intellij/util/indexing/TimeStatsTest.kt similarity index 88% rename from platform/lang-impl/testSources/com/intellij/util/indexing/MaxNTimeBucketTest.kt rename to platform/lang-impl/testSources/com/intellij/util/indexing/TimeStatsTest.kt index 9e7e34614206..34caa4a7aa6d 100644 --- a/platform/lang-impl/testSources/com/intellij/util/indexing/MaxNTimeBucketTest.kt +++ b/platform/lang-impl/testSources/com/intellij/util/indexing/TimeStatsTest.kt @@ -3,14 +3,14 @@ package com.intellij.util.indexing import com.intellij.testFramework.assertions.Assertions.assertThat import com.intellij.testFramework.assertions.Assertions.assertThatThrownBy -import com.intellij.util.indexing.diagnostic.MaxNTimeBucket +import com.intellij.util.indexing.diagnostic.TimeStats import org.junit.Test import kotlin.random.Random -class MaxNTimeBucketTest { +class TimeStatsTest { @Test fun `empty bucket`() { - val bucket = MaxNTimeBucket(1) + val bucket = TimeStats(1) assertThat(bucket.isEmpty) assertThatThrownBy { bucket.minTime } assertThatThrownBy { bucket.maxTime } @@ -20,7 +20,7 @@ class MaxNTimeBucketTest { @Test fun `one time`() { - val bucket = MaxNTimeBucket(1) + val bucket = TimeStats(1) val time = 42L bucket.addTime(time) assertThat(!bucket.isEmpty) @@ -32,7 +32,7 @@ class MaxNTimeBucketTest { @Test fun `two times`() { - val bucket = MaxNTimeBucket(2) + val bucket = TimeStats(2) val one = 10L val two = 20L bucket.addTime(one) @@ -48,7 +48,7 @@ class MaxNTimeBucketTest { fun limit() { val numberOfTimes = 1000 val bucketSize = 10 - val bucket = MaxNTimeBucket(bucketSize) + val bucket = TimeStats(bucketSize) val times = arrayListOf() repeat(numberOfTimes) { val time = Random.nextLong()