diff options
author | robot-piglet <robot-piglet@yandex-team.com> | 2024-09-05 16:14:18 +0300 |
---|---|---|
committer | robot-piglet <robot-piglet@yandex-team.com> | 2024-09-05 16:25:10 +0300 |
commit | e499a26b5883717ac50c8aaf568fcbcf696b64a8 (patch) | |
tree | f355e1c6d85398f5153963e4846a3bf5b3b5ff4c | |
parent | 0c708029742f34234612e3ff3ffd36fa18aad0f8 (diff) | |
download | ydb-e499a26b5883717ac50c8aaf568fcbcf696b64a8.tar.gz |
Intermediate changes
-rw-r--r-- | build/mapping.conf.json | 34 | ||||
-rw-r--r-- | build/ya.conf.json | 61 | ||||
-rw-r--r-- | yt/yt/core/concurrency/unittests/async_looper_ut.cpp | 4 | ||||
-rw-r--r-- | yt/yt/core/rpc/unittests/rpc_ut.cpp | 19 |
4 files changed, 111 insertions, 7 deletions
diff --git a/build/mapping.conf.json b/build/mapping.conf.json index a2562ea0b7..4e3654d71f 100644 --- a/build/mapping.conf.json +++ b/build/mapping.conf.json @@ -61,6 +61,12 @@ "1096776689": "https://devtools-registry.s3.yandex.net/1096776689", "545709503": "https://devtools-registry.s3.yandex.net/545709503", "545709491": "https://devtools-registry.s3.yandex.net/545709491", + "6638626363": "https://devtools-registry.s3.yandex.net/6638626363", + "6638629972": "https://devtools-registry.s3.yandex.net/6638629972", + "6638916300": "https://devtools-registry.s3.yandex.net/6638916300", + "6638917016": "https://devtools-registry.s3.yandex.net/6638917016", + "6638915855": "https://devtools-registry.s3.yandex.net/6638915855", + "6638914429": "https://devtools-registry.s3.yandex.net/6638914429", "721500304": "https://devtools-registry.s3.yandex.net/721500304", "3573990573": "https://devtools-registry.s3.yandex.net/3573990573", "3573996018": "https://devtools-registry.s3.yandex.net/3573996018", @@ -241,6 +247,10 @@ "3877389037": "https://devtools-registry.s3.yandex.net/3877389037", "3877389242": "https://devtools-registry.s3.yandex.net/3877389242", "3877388826": "https://devtools-registry.s3.yandex.net/3877388826", + "6576113077": "https://devtools-registry.s3.yandex.net/6576113077", + "6576113078": "https://devtools-registry.s3.yandex.net/6576113078", + "6576113095": "https://devtools-registry.s3.yandex.net/6576113095", + "6576113106": "https://devtools-registry.s3.yandex.net/6576113106", "6148089711": "https://devtools-registry.s3.yandex.net/6148089711", "6512097221": "https://devtools-registry.s3.yandex.net/6512097221", "6812263131": "https://devtools-registry.s3.yandex.net/6812263131", @@ -688,6 +698,11 @@ "6785543406": "https://devtools-registry.s3.yandex.net/6785543406", "1277521710": "https://devtools-registry.s3.yandex.net/1277521710", "1812152858": "https://devtools-registry.s3.yandex.net/1812152858", + "6639202855": "https://devtools-registry.s3.yandex.net/6639202855", + "4758626187": "https://devtools-registry.s3.yandex.net/4758626187", + "4758626560": "https://devtools-registry.s3.yandex.net/4758626560", + "4758626176": "https://devtools-registry.s3.yandex.net/4758626176", + "4758626361": "https://devtools-registry.s3.yandex.net/4758626361", "289381370": "https://devtools-registry.s3.yandex.net/289381370", "289382642": "https://devtools-registry.s3.yandex.net/289382642", "5776380974": "https://devtools-registry.s3.yandex.net/5776380974", @@ -748,6 +763,8 @@ "3050798466": "https://devtools-registry.s3.yandex.net/3050798466", "3064614561": "https://devtools-registry.s3.yandex.net/3064614561", "3166999959": "https://devtools-registry.s3.yandex.net/3166999959", + "65627450": "https://devtools-registry.s3.yandex.net/65627450", + "65627451": "https://devtools-registry.s3.yandex.net/65627451", "5631222854": "https://devtools-registry.s3.yandex.net/5631222854", "5631220729": "https://devtools-registry.s3.yandex.net/5631220729", "5631255103": "https://devtools-registry.s3.yandex.net/5631255103", @@ -898,6 +915,12 @@ "1096776689": "JAVA_LIBRARY-none-none-j2objc-annotations-1.3.jar", "545709503": "JAVA_LIBRARY-none-none-javax.annotation-api-1.3.1-sources.jar", "545709491": "JAVA_LIBRARY-none-none-javax.annotation-api-1.3.1.jar", + "6638626363": "JAVA_LIBRARY-none-none-kotlin-stdlib-1.9.24-sources.jar", + "6638629972": "JAVA_LIBRARY-none-none-kotlin-stdlib-1.9.24.jar", + "6638916300": "JAVA_LIBRARY-none-none-kotlin-stdlib-jdk7-1.9.24-sources.jar", + "6638917016": "JAVA_LIBRARY-none-none-kotlin-stdlib-jdk7-1.9.24.jar", + "6638915855": "JAVA_LIBRARY-none-none-kotlin-stdlib-jdk8-1.9.24-sources.jar", + "6638914429": "JAVA_LIBRARY-none-none-kotlin-stdlib-jdk8-1.9.24.jar", "721500304": "JAVA_LIBRARY-none-none-listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar", "3573990573": "JAVA_LIBRARY-none-none-proto-google-common-protos-2.9.0-sources.jar", "3573996018": "JAVA_LIBRARY-none-none-proto-google-common-protos-2.9.0.jar", @@ -1078,6 +1101,10 @@ "3877389037": "devtools/huge_python3/python3 for linux-aarch64", "3877389242": "devtools/huge_python3/python3 for linux-ppc64le", "3877388826": "devtools/huge_python3/python3 for win32-clang-cl", + "6576113077": "devtools/ktlint_build/package.json", + "6576113078": "devtools/ktlint_build/package.json", + "6576113095": "devtools/ktlint_build/package.json", + "6576113106": "devtools/ktlint_build/package_win.json", "6148089711": "devtools/local_cache/toolscache/server/ya-tc for darwin", "6512097221": "devtools/local_cache/toolscache/server/ya-tc for darwin", "6812263131": "devtools/local_cache/toolscache/server/ya-tc for darwin", @@ -1525,6 +1552,11 @@ "6785543406": "grpc-java-linux-x86_64-231a5a5d0bf5248caf1a9539ef29dd2b20a9d05d", "1277521710": "infra/kernel/tools/atop/build/atop-static.tar.gz", "1812152858": "junk/zubchick/buf/buf for linux", + "6639202855": "kotlin_kompiler_1.9.24 with plugins", + "4758626187": "ktlint for darwin (0.50.0)", + "4758626560": "ktlint for darwin-arm64 (0.50.0)", + "4758626176": "ktlint for linux (0.50.0)", + "4758626361": "ktlint for windows (0.50.0)", "289381370": "none-none-none-jsr305-3.0.2-sources.jar", "289382642": "none-none-none-jsr305-3.0.2.jar", "5776380974": "none-none-none-result_resources/jdk-darwin-aarch64.yandex.tgz", @@ -1585,6 +1617,8 @@ "3050798466": "openjdk 11.0.15 vanilla for darwin-arm64", "3064614561": "openjdk 11.0.15 vanilla for linux", "3166999959": "openjdk 11.0.15 vanilla for windows", + "65627450": "org.jetbrains-annotations-13.0-sources.jar", + "65627451": "org.jetbrains-annotations-13.0.jar", "5631222854": "python3 for darwin", "5631220729": "python3 for darwin-arm64", "5631255103": "python3 for linux", diff --git a/build/ya.conf.json b/build/ya.conf.json index 160259cd37..e6e50fba2a 100644 --- a/build/ya.conf.json +++ b/build/ya.conf.json @@ -254,6 +254,22 @@ }, "formula": "build/platform/java/jdk/jdk17/jdk.json" }, + "ktlint_bundle": { + "executable": { + "ktlint": [ + "run.bat" + ] + }, + "formula": "build/platform/java/ktlint/ktlint.json" + }, + "ktlint_old_bundle": { + "executable": { + "ktlint_old": [ + "run.bat" + ] + }, + "formula": "build/platform/java/ktlint_old/ktlint.json" + }, "python": { "executable": { "python": [ @@ -1882,6 +1898,45 @@ } } }, + "ktlint_bundle": { + "platforms": [ + { + "default": true, + "host": { + "os": "LINUX" + } + }, + { + "default": true, + "host": { + "os": "WIN" + } + }, + { + "default": true, + "host": { + "os": "DARWIN" + } + }, + { + "default": true, + "host": { + "arch": "arm64", + "os": "DARWIN" + } + } + ], + "tools": { + "ktlint": { + "bottle": "ktlint_bundle", + "executable": "ktlint" + }, + "ktlint_old": { + "bottle": "ktlint_old_bundle", + "executable": "ktlint_old" + } + } + }, "python": { "platforms": [ { @@ -2153,6 +2208,12 @@ "javac17": { "description": "Run javac 17" }, + "ktlint": { + "description": "Run kotlin styler" + }, + "ktlint_old": { + "description": "Run old kotlin styler" + }, "llvm-cov": { "description": "Run llvm-cov Clang utility" }, diff --git a/yt/yt/core/concurrency/unittests/async_looper_ut.cpp b/yt/yt/core/concurrency/unittests/async_looper_ut.cpp index c9598dc4ab..2f021b4374 100644 --- a/yt/yt/core/concurrency/unittests/async_looper_ut.cpp +++ b/yt/yt/core/concurrency/unittests/async_looper_ut.cpp @@ -134,9 +134,9 @@ TEST(TAsyncLooperTest, CancelAsyncStep) looper->Stop(); - EXPECT_TRUE(promise.IsCanceled()); - queue->Shutdown(); + + EXPECT_TRUE(promise.IsCanceled()); } TEST(TAsyncLooperTest, CancelSyncStep) diff --git a/yt/yt/core/rpc/unittests/rpc_ut.cpp b/yt/yt/core/rpc/unittests/rpc_ut.cpp index be2a78de9a..6b67d5f117 100644 --- a/yt/yt/core/rpc/unittests/rpc_ut.cpp +++ b/yt/yt/core/rpc/unittests/rpc_ut.cpp @@ -968,12 +968,19 @@ TYPED_TEST(TNotGrpcTest, RequestQueueByteSizeLimit) TYPED_TEST(TRpcTest, ConcurrencyLimit) { + auto shared_counter = std::make_shared<std::atomic<int>>(0); + std::vector<TFuture<void>> futures; for (int i = 0; i < 10; ++i) { TTestProxy proxy(this->CreateChannel()); proxy.SetDefaultTimeout(TDuration::Seconds(10.0)); auto req = proxy.SlowCall(); - futures.push_back(req->Invoke().AsVoid()); + futures.push_back( + req->Invoke() + .AsVoid() + .Apply(BIND([counter = shared_counter] { + counter->fetch_add(1); + }))); } Sleep(TDuration::MilliSeconds(200)); @@ -982,14 +989,16 @@ TYPED_TEST(TRpcTest, ConcurrencyLimit) { TTestProxy proxy(this->CreateChannel()); auto req = proxy.SlowCall(); - backlogFuture = req->Invoke().AsVoid(); + backlogFuture = + req->Invoke() + .AsVoid() + .Apply(BIND([counter = shared_counter] { + EXPECT_EQ(counter->load(), 10); + })); } EXPECT_TRUE(AllSucceeded(std::move(futures)).Get().IsOK()); - Sleep(TDuration::MilliSeconds(200)); - EXPECT_FALSE(backlogFuture.IsSet()); - EXPECT_TRUE(backlogFuture.Get().IsOK()); } |