diff options
author | robot-piglet <robot-piglet@yandex-team.com> | 2023-10-02 15:29:52 +0300 |
---|---|---|
committer | robot-piglet <robot-piglet@yandex-team.com> | 2023-10-02 15:50:37 +0300 |
commit | 97878bbb10b349fa681960421cb49acfc2da58e4 (patch) | |
tree | aa8f201332817d5c3dab431cc6b66f30fc66d1e1 | |
parent | 84cfa51ccf9d99b70be61b6a2c886aed4b168eab (diff) | |
download | ydb-97878bbb10b349fa681960421cb49acfc2da58e4.tar.gz |
Intermediate changes
-rw-r--r-- | build/mapping.conf.json | 56 | ||||
-rw-r--r-- | yt/yt/client/federated/cache.cpp | 32 | ||||
-rw-r--r-- | yt/yt/client/federated/cache.h | 13 |
3 files changed, 90 insertions, 11 deletions
diff --git a/build/mapping.conf.json b/build/mapping.conf.json index d653f253e6b..09137507814 100644 --- a/build/mapping.conf.json +++ b/build/mapping.conf.json @@ -21,6 +21,30 @@ "4561490451": "http://devtools-registry.s3.yandex.net/4561490451", "5002675116": "http://devtools-registry.s3.yandex.net/5002675116", "3676654632": "http://devtools-registry.s3.yandex.net/3676654632", + "1097402508": "http://devtools-registry.s3.yandex.net/1097402508", + "1097402505": "http://devtools-registry.s3.yandex.net/1097402505", + "1233690501": "http://devtools-registry.s3.yandex.net/1233690501", + "1233690325": "http://devtools-registry.s3.yandex.net/1233690325", + "2595361259": "http://devtools-registry.s3.yandex.net/2595361259", + "2595361902": "http://devtools-registry.s3.yandex.net/2595361902", + "626343750": "http://devtools-registry.s3.yandex.net/626343750", + "626343775": "http://devtools-registry.s3.yandex.net/626343775", + "1205168625": "http://devtools-registry.s3.yandex.net/1205168625", + "1205167516": "http://devtools-registry.s3.yandex.net/1205167516", + "1205168433": "http://devtools-registry.s3.yandex.net/1205168433", + "1205168781": "http://devtools-registry.s3.yandex.net/1205168781", + "1205168140": "http://devtools-registry.s3.yandex.net/1205168140", + "1205168973": "http://devtools-registry.s3.yandex.net/1205168973", + "1205167698": "http://devtools-registry.s3.yandex.net/1205167698", + "1205168306": "http://devtools-registry.s3.yandex.net/1205168306", + "1205167422": "http://devtools-registry.s3.yandex.net/1205167422", + "1205168380": "http://devtools-registry.s3.yandex.net/1205168380", + "1205169369": "http://devtools-registry.s3.yandex.net/1205169369", + "1205169092": "http://devtools-registry.s3.yandex.net/1205169092", + "1206235909": "http://devtools-registry.s3.yandex.net/1206235909", + "1206234279": "http://devtools-registry.s3.yandex.net/1206234279", + "1097402471": "http://devtools-registry.s3.yandex.net/1097402471", + "1097402513": "http://devtools-registry.s3.yandex.net/1097402513", "4773516480": "http://devtools-registry.s3.yandex.net/4773516480", "4773521027": "http://devtools-registry.s3.yandex.net/4773521027", "4773507347": "http://devtools-registry.s3.yandex.net/4773507347", @@ -62,6 +86,8 @@ "3833498694": "http://devtools-registry.s3.yandex.net/3833498694", "4940640829": "http://devtools-registry.s3.yandex.net/4940640829", "4940633745": "http://devtools-registry.s3.yandex.net/4940633745", + "56663370": "http://devtools-registry.s3.yandex.net/56663370", + "56663369": "http://devtools-registry.s3.yandex.net/56663369", "4588378868": "http://devtools-registry.s3.yandex.net/4588378868", "4588370003": "http://devtools-registry.s3.yandex.net/4588370003", "4588389789": "http://devtools-registry.s3.yandex.net/4588389789", @@ -70,6 +96,8 @@ "3050798466": "http://devtools-registry.s3.yandex.net/3050798466", "3064614561": "http://devtools-registry.s3.yandex.net/3064614561", "3166999959": "http://devtools-registry.s3.yandex.net/3166999959", + "53100556": "http://devtools-registry.s3.yandex.net/53100556", + "53100555": "http://devtools-registry.s3.yandex.net/53100555", "5054488387": "http://devtools-registry.s3.yandex.net/5054488387", "5054493005": "http://devtools-registry.s3.yandex.net/5054493005", "5054495063": "http://devtools-registry.s3.yandex.net/5054495063", @@ -110,6 +138,30 @@ "4561490451": "JAVA_JDK_ENVIRONMENT-linux-arm64-17.0.7+7-jdk-linux-aarch64.yandex.tgz", "5002675116": "JAVA_JDK_ENVIRONMENT-windows-17.0.7+7-jdk-windows-amd64.yandex.tgz", "3676654632": "JAVA_JDK_ENVIRONMENT-windows-19.0.1.1-jdk-windows-i686.yandex.tgz", + "1097402508": "JAVA_LIBRARY-none-none-apiguardian-api-1.1.0-sources.jar", + "1097402505": "JAVA_LIBRARY-none-none-apiguardian-api-1.1.0.jar", + "1233690501": "JAVA_LIBRARY-none-none-gson-2.8.6-sources.jar", + "1233690325": "JAVA_LIBRARY-none-none-gson-2.8.6.jar", + "2595361259": "JAVA_LIBRARY-none-none-gson-2.8.9-sources.jar", + "2595361902": "JAVA_LIBRARY-none-none-gson-2.8.9.jar", + "626343750": "JAVA_LIBRARY-none-none-jcommander-1.72-sources.jar", + "626343775": "JAVA_LIBRARY-none-none-jcommander-1.72.jar", + "1205168625": "JAVA_LIBRARY-none-none-junit-jupiter-5.5.2-sources.jar", + "1205167516": "JAVA_LIBRARY-none-none-junit-jupiter-5.5.2.jar", + "1205168433": "JAVA_LIBRARY-none-none-junit-jupiter-api-5.5.2-sources.jar", + "1205168781": "JAVA_LIBRARY-none-none-junit-jupiter-api-5.5.2.jar", + "1205168140": "JAVA_LIBRARY-none-none-junit-jupiter-engine-5.5.2-sources.jar", + "1205168973": "JAVA_LIBRARY-none-none-junit-jupiter-engine-5.5.2.jar", + "1205167698": "JAVA_LIBRARY-none-none-junit-jupiter-params-5.5.2-sources.jar", + "1205168306": "JAVA_LIBRARY-none-none-junit-jupiter-params-5.5.2.jar", + "1205167422": "JAVA_LIBRARY-none-none-junit-platform-commons-1.5.2-sources.jar", + "1205168380": "JAVA_LIBRARY-none-none-junit-platform-commons-1.5.2.jar", + "1205169369": "JAVA_LIBRARY-none-none-junit-platform-engine-1.5.2-sources.jar", + "1205169092": "JAVA_LIBRARY-none-none-junit-platform-engine-1.5.2.jar", + "1206235909": "JAVA_LIBRARY-none-none-junit-platform-launcher-1.5.2-sources.jar", + "1206234279": "JAVA_LIBRARY-none-none-junit-platform-launcher-1.5.2.jar", + "1097402471": "JAVA_LIBRARY-none-none-opentest4j-1.2.0-sources.jar", + "1097402513": "JAVA_LIBRARY-none-none-opentest4j-1.2.0.jar", "4773516480": "OTHER_RESOURCE-none-1.20.6-y_go1.20.6.darwin-amd64.tar.gz", "4773521027": "OTHER_RESOURCE-none-1.20.6-y_go1.20.6.darwin-arm64.tar.gz", "4773507347": "OTHER_RESOURCE-none-1.20.6-y_go1.20.6.linux-amd64.tar.gz", @@ -151,6 +203,8 @@ "3833498694": "gdb 11.2 for osx_10.15_catalina", "4940640829": "gdb for linux-aarch64", "4940633745": "gdb for linux-x86_64", + "56663370": "junit-junit-4.12-sources.jar", + "56663369": "junit-junit-4.12.jar", "4588378868": "lld darwin x86_64", "4588370003": "lld for darwin arm64", "4588389789": "lld for linux aarch64", @@ -159,6 +213,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", + "53100556": "org.hamcrest-hamcrest-core-1.3-sources.jar", + "53100555": "org.hamcrest-hamcrest-core-1.3.jar", "5054488387": "ya-tc for darwin", "5054493005": "ya-tc for darwin-arm64", "5054495063": "ya-tc for linux", diff --git a/yt/yt/client/federated/cache.cpp b/yt/yt/client/federated/cache.cpp index d3223c620ed..75d8374a6a9 100644 --- a/yt/yt/client/federated/cache.cpp +++ b/yt/yt/client/federated/cache.cpp @@ -58,9 +58,9 @@ private: } // namespace IClientsCachePtr CreateFederatedClientsCache( + TFederationConfigPtr federatedConfig, const TClustersConfig& config, const NYT::NApi::TClientOptions& options, - TFederationConfigPtr federatedConfig, TString clusterSeparator) { return NYT::New<TClientsCache>( @@ -71,9 +71,25 @@ IClientsCachePtr CreateFederatedClientsCache( } IClientsCachePtr CreateFederatedClientsCache( - const TClustersConfig& config, + TFederationConfigPtr federationConfig, + const TConfig& config, const NYT::NApi::TClientOptions& options, + TString clusterSeparator) +{ + TClustersConfig clustersConfig; + *clustersConfig.MutableDefaultConfig() = config; + + return CreateFederatedClientsCache( + std::move(federationConfig), + std::move(clustersConfig), + std::move(options), + std::move(clusterSeparator)); +} + +IClientsCachePtr CreateFederatedClientsCache( TString chaosBundleName, + const TClustersConfig& config, + const NYT::NApi::TClientOptions& options, TString clusterSeparator) { auto federationConfig = NYT::New<NYT::NClient::NFederated::TFederationConfig>(); @@ -81,25 +97,25 @@ IClientsCachePtr CreateFederatedClientsCache( federationConfig->BundleName = std::move(chaosBundleName); } return CreateFederatedClientsCache( + std::move(federationConfig), std::move(config), std::move(options), - std::move(federationConfig), std::move(clusterSeparator)); } IClientsCachePtr CreateFederatedClientsCache( + TString chaosBundleName, const TConfig& config, const NYT::NApi::TClientOptions& options, - TString chaosBundleName, TString clusterSeparator) { TClustersConfig clustersConfig; *clustersConfig.MutableDefaultConfig() = config; return CreateFederatedClientsCache( - std::move(clustersConfig), - std::move(options), std::move(chaosBundleName), + std::move(clustersConfig), + options, std::move(clusterSeparator)); } @@ -109,9 +125,9 @@ IClientsCachePtr CreateFederatedClientsCache( TString clusterSeparator) { return CreateFederatedClientsCache( + std::move(chaosBundleName), config, NCache::GetClientOpsFromEnvStatic(), - std::move(chaosBundleName), std::move(clusterSeparator)); } @@ -120,9 +136,9 @@ IClientsCachePtr CreateFederatedClientsCache( TString clusterSeparator) { return CreateFederatedClientsCache( + std::move(chaosBundleName), TClustersConfig{}, NCache::GetClientOpsFromEnvStatic(), - std::move(chaosBundleName), std::move(clusterSeparator)); } diff --git a/yt/yt/client/federated/cache.h b/yt/yt/client/federated/cache.h index ebdb6c4b096..93b9831d83a 100644 --- a/yt/yt/client/federated/cache.h +++ b/yt/yt/client/federated/cache.h @@ -25,25 +25,32 @@ IClientsCachePtr CreateFederatedClientsCache( //! Shortcut to create cache with default federation config. IClientsCachePtr CreateFederatedClientsCache( - const TClustersConfig& config, + TFederationConfigPtr federationConfig, + const TConfig& config, const NYT::NApi::TClientOptions& options, + TString clusterSeparator = "+"); + +//! Shortcut to create cache with default federation config. +IClientsCachePtr CreateFederatedClientsCache( TString chaosBundleName, + const TClustersConfig& config, + const NYT::NApi::TClientOptions& options, TString clusterSeparator = "+"); //! Creates clients cache which shares same config (except server name). //! Shortcut to create cache with default federation config. IClientsCachePtr CreateFederatedClientsCache( + TString chaosBundleName, const TConfig& config, const NYT::NApi::TClientOptions& options, - TString chaosBundleName, TString clusterSeparator = "+"); //! Creates clients cache which shares same config (except server name). //! Shortcut to create cache with default federation config. //! Shortcut to use client options from env. IClientsCachePtr CreateFederatedClientsCache( - const TConfig& config, TString chaosBundleName, + const TConfig& config, TString clusterSeparator = "+"); //! Shortcut to create cache with default federation config. |