Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2337 from Kotlin/version-1.4.0
Version 1.4.0
- Loading branch information
Showing
80 changed files
with
1,655 additions
and
2,026 deletions.
There are no files selected for viewing
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
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
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
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
34 changes: 34 additions & 0 deletions
34
benchmarks/src/jmh/kotlin/benchmarks/flow/CombineFlowsBenchmark.kt
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| /* | ||
| * Copyright 2016-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. | ||
| */ | ||
|
|
||
| package benchmarks.flow | ||
|
|
||
| import kotlinx.coroutines.* | ||
| import kotlinx.coroutines.flow.* | ||
| import org.openjdk.jmh.annotations.* | ||
| import java.util.concurrent.* | ||
|
|
||
| @Warmup(iterations = 5, time = 1, timeUnit = TimeUnit.SECONDS) | ||
| @Measurement(iterations = 5, time = 1, timeUnit = TimeUnit.SECONDS) | ||
| @Fork(value = 1) | ||
| @BenchmarkMode(Mode.Throughput) | ||
| @OutputTimeUnit(TimeUnit.MILLISECONDS) | ||
| @State(Scope.Benchmark) | ||
| open class CombineFlowsBenchmark { | ||
|
|
||
| @Param("10", "100", "1000") | ||
| private var size = 10 | ||
|
|
||
| @Benchmark | ||
| fun combine() = runBlocking { | ||
| combine((1 until size).map { flowOf(it) }) { a -> a}.collect() | ||
| } | ||
|
|
||
| @Benchmark | ||
| fun combineTransform() = runBlocking { | ||
| val list = (1 until size).map { flowOf(it) }.toList() | ||
| combineTransform((1 until size).map { flowOf(it) }) { emit(it) }.collect() | ||
| } | ||
| } | ||
|
|
47 changes: 47 additions & 0 deletions
47
benchmarks/src/jmh/kotlin/benchmarks/flow/CombineTwoFlowsBenchmark.kt
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| /* | ||
| * Copyright 2016-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. | ||
| */ | ||
|
|
||
| package benchmarks.flow | ||
|
|
||
| import kotlinx.coroutines.* | ||
| import kotlinx.coroutines.flow.* | ||
| import kotlinx.coroutines.flow.internal.* | ||
| import org.openjdk.jmh.annotations.* | ||
| import java.util.concurrent.* | ||
|
|
||
| @Warmup(iterations = 5, time = 1, timeUnit = TimeUnit.SECONDS) | ||
| @Measurement(iterations = 5, time = 1, timeUnit = TimeUnit.SECONDS) | ||
| @Fork(value = 1) | ||
| @BenchmarkMode(Mode.Throughput) | ||
| @OutputTimeUnit(TimeUnit.MILLISECONDS) | ||
| @State(Scope.Benchmark) | ||
| open class CombineTwoFlowsBenchmark { | ||
|
|
||
| @Param("100", "100000", "1000000") | ||
| private var size = 100000 | ||
|
|
||
| @Benchmark | ||
| fun combinePlain() = runBlocking { | ||
| val flow = (1 until size.toLong()).asFlow() | ||
| flow.combine(flow) { a, b -> a + b }.collect() | ||
| } | ||
|
|
||
| @Benchmark | ||
| fun combineTransform() = runBlocking { | ||
| val flow = (1 until size.toLong()).asFlow() | ||
| flow.combineTransform(flow) { a, b -> emit(a + b) }.collect() | ||
| } | ||
|
|
||
| @Benchmark | ||
| fun combineVararg() = runBlocking { | ||
| val flow = (1 until size.toLong()).asFlow() | ||
| combine(listOf(flow, flow)) { arr -> arr[0] + arr[1] }.collect() | ||
| } | ||
|
|
||
| @Benchmark | ||
| fun combineTransformVararg() = runBlocking { | ||
| val flow = (1 until size.toLong()).asFlow() | ||
| combineTransform(listOf(flow, flow)) { arr -> emit(arr[0] + arr[1]) }.collect() | ||
| } | ||
| } |
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,17 +1,18 @@ | ||
| /* | ||
| * Copyright 2016-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. | ||
| */ | ||
|
|
||
| pluginManagement { | ||
| val build_snapshot_train: String? by settings | ||
| repositories { | ||
| val cacheRedirectorEnabled = System.getenv("CACHE_REDIRECTOR")?.toBoolean() == true | ||
|
|
||
| if (cacheRedirectorEnabled) { | ||
| println("Redirecting repositories for buildSrc buildscript") | ||
|
|
||
| maven("https://cache-redirector.jetbrains.com/plugins.gradle.org/m2") | ||
| } else { | ||
| maven("https://plugins.gradle.org/m2") | ||
| } | ||
| if (build_snapshot_train?.toBoolean() == true) { | ||
| mavenLocal() | ||
| } | ||
| } | ||
| } |
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
Oops, something went wrong.