aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkamardin <kamardin@yandex-team.ru>2022-02-10 16:52:24 +0300
committerDaniil Cherednik <dcherednik@yandex-team.ru>2022-02-10 16:52:24 +0300
commita815b0df01710081be7ee69fbb91ca234f0af5dc (patch)
treeab7fbbf3253d4c0e2793218f09378908beb025fb
parentfae3e0fbb525e4ccd97c762179d2d7e24249366d (diff)
downloadydb-a815b0df01710081be7ee69fbb91ca234f0af5dc.tar.gz
Restoring authorship annotation for <kamardin@yandex-team.ru>. Commit 2 of 2.
-rw-r--r--ydb/core/grpc_services/table_profiles.cpp18
-rw-r--r--ydb/public/api/protos/ydb_common.proto2
-rw-r--r--ydb/public/api/protos/ydb_table.proto6
-rw-r--r--ydb/public/sdk/cpp/client/ydb_table/table.cpp8
-rw-r--r--ydb/services/ydb/ydb_ut.cpp6
5 files changed, 20 insertions, 20 deletions
diff --git a/ydb/core/grpc_services/table_profiles.cpp b/ydb/core/grpc_services/table_profiles.cpp
index 09ad04f55bf..367de4cc89e 100644
--- a/ydb/core/grpc_services/table_profiles.cpp
+++ b/ydb/core/grpc_services/table_profiles.cpp
@@ -218,9 +218,9 @@ bool TTableProfiles::ApplyTableProfile(const Ydb::Table::TableProfile &profile,
settings.SetAllowOtherKinds(false);
}
switch (policy.keep_in_memory()) {
- case Ydb::FeatureFlag::STATUS_UNSPECIFIED:
+ case Ydb::FeatureFlag::STATUS_UNSPECIFIED:
break;
- case Ydb::FeatureFlag::ENABLED:
+ case Ydb::FeatureFlag::ENABLED:
if (!AppData()->FeatureFlags.GetEnablePublicApiKeepInMemory()) {
code = Ydb::StatusIds::BAD_REQUEST;
error = "Setting keep_in_memory to ENABLED is not allowed";
@@ -228,7 +228,7 @@ bool TTableProfiles::ApplyTableProfile(const Ydb::Table::TableProfile &profile,
}
GetDefaultFamilyDescription(storagePolicy)->SetColumnCache(NKikimrSchemeOp::ColumnCacheEver);
break;
- case Ydb::FeatureFlag::DISABLED:
+ case Ydb::FeatureFlag::DISABLED:
GetDefaultFamilyDescription(storagePolicy)->ClearColumnCache();
break;
default:
@@ -325,12 +325,12 @@ bool TTableProfiles::ApplyTableProfile(const Ydb::Table::TableProfile &profile,
if (policy.replicas_count())
replicationPolicy.SetFollowerCount(policy.replicas_count());
switch (policy.create_per_availability_zone()) {
- case Ydb::FeatureFlag::STATUS_UNSPECIFIED:
+ case Ydb::FeatureFlag::STATUS_UNSPECIFIED:
break;
- case Ydb::FeatureFlag::ENABLED:
+ case Ydb::FeatureFlag::ENABLED:
replicationPolicy.SetCrossDataCenter(true);
break;
- case Ydb::FeatureFlag::DISABLED:
+ case Ydb::FeatureFlag::DISABLED:
replicationPolicy.SetCrossDataCenter(false);
break;
default:
@@ -340,12 +340,12 @@ bool TTableProfiles::ApplyTableProfile(const Ydb::Table::TableProfile &profile,
return false;
}
switch (policy.allow_promotion()) {
- case Ydb::FeatureFlag::STATUS_UNSPECIFIED:
+ case Ydb::FeatureFlag::STATUS_UNSPECIFIED:
break;
- case Ydb::FeatureFlag::ENABLED:
+ case Ydb::FeatureFlag::ENABLED:
replicationPolicy.SetAllowFollowerPromotion(true);
break;
- case Ydb::FeatureFlag::DISABLED:
+ case Ydb::FeatureFlag::DISABLED:
replicationPolicy.SetAllowFollowerPromotion(false);
break;
default:
diff --git a/ydb/public/api/protos/ydb_common.proto b/ydb/public/api/protos/ydb_common.proto
index c91ee210c50..a63e202f821 100644
--- a/ydb/public/api/protos/ydb_common.proto
+++ b/ydb/public/api/protos/ydb_common.proto
@@ -1,7 +1,7 @@
syntax = "proto3";
option cc_enable_arenas = true;
-package Ydb;
+package Ydb;
option java_package = "com.yandex.ydb.common";
option java_outer_classname = "CommonProtos";
diff --git a/ydb/public/api/protos/ydb_table.proto b/ydb/public/api/protos/ydb_table.proto
index 8307b597253..c8063d9475c 100644
--- a/ydb/public/api/protos/ydb_table.proto
+++ b/ydb/public/api/protos/ydb_table.proto
@@ -127,7 +127,7 @@ message StoragePolicy {
StoragePool log = 3;
StoragePool data = 4;
StoragePool external = 5;
- Ydb.FeatureFlag.Status keep_in_memory = 6;
+ Ydb.FeatureFlag.Status keep_in_memory = 6;
repeated ColumnFamilyPolicy column_families = 7;
}
@@ -221,10 +221,10 @@ message ReplicationPolicy {
uint32 replicas_count = 2;
// If this feature in enabled then requested number of replicas
// will be created in each availability zone.
- Ydb.FeatureFlag.Status create_per_availability_zone = 3;
+ Ydb.FeatureFlag.Status create_per_availability_zone = 3;
// If this feature in enabled then read-only replicas can be promoted
// to leader.
- Ydb.FeatureFlag.Status allow_promotion = 4;
+ Ydb.FeatureFlag.Status allow_promotion = 4;
}
message CachingPolicy {
diff --git a/ydb/public/sdk/cpp/client/ydb_table/table.cpp b/ydb/public/sdk/cpp/client/ydb_table/table.cpp
index 0ea74d7a149..610fec38847 100644
--- a/ydb/public/sdk/cpp/client/ydb_table/table.cpp
+++ b/ydb/public/sdk/cpp/client/ydb_table/table.cpp
@@ -3643,15 +3643,15 @@ static void ConvertCreateTableSettingsToProto(const TCreateTableSettings& settin
if (policy.CreatePerAvailabilityZone_) {
proto->mutable_replication_policy()->set_create_per_availability_zone(
policy.CreatePerAvailabilityZone_.GetRef()
- ? Ydb::FeatureFlag_Status::FeatureFlag_Status_ENABLED
- : Ydb::FeatureFlag_Status::FeatureFlag_Status_DISABLED
+ ? Ydb::FeatureFlag_Status::FeatureFlag_Status_ENABLED
+ : Ydb::FeatureFlag_Status::FeatureFlag_Status_DISABLED
);
}
if (policy.AllowPromotion_) {
proto->mutable_replication_policy()->set_allow_promotion(
policy.AllowPromotion_.GetRef()
- ? Ydb::FeatureFlag_Status::FeatureFlag_Status_ENABLED
- : Ydb::FeatureFlag_Status::FeatureFlag_Status_DISABLED
+ ? Ydb::FeatureFlag_Status::FeatureFlag_Status_ENABLED
+ : Ydb::FeatureFlag_Status::FeatureFlag_Status_DISABLED
);
}
}
diff --git a/ydb/services/ydb/ydb_ut.cpp b/ydb/services/ydb/ydb_ut.cpp
index 23a53d5113a..2d370630799 100644
--- a/ydb/services/ydb/ydb_ut.cpp
+++ b/ydb/services/ydb/ydb_ut.cpp
@@ -4216,7 +4216,7 @@ Y_UNIT_TEST_SUITE(TTableProfileTests) {
profile.set_preset_name("profile1");
profile.mutable_storage_policy()->mutable_syslog()->set_media("ssd");
profile.mutable_storage_policy()->mutable_data()->set_media("ssd");
- profile.mutable_storage_policy()->set_keep_in_memory(Ydb::FeatureFlag::ENABLED);
+ profile.mutable_storage_policy()->set_keep_in_memory(Ydb::FeatureFlag::ENABLED);
CreateTable(server, "/Root/ydb_ut_tenant/table-3", profile);
NKikimrSchemeOp::TTableDescription description;
@@ -4242,7 +4242,7 @@ Y_UNIT_TEST_SUITE(TTableProfileTests) {
profile.mutable_storage_policy()->set_preset_name("storage2");
profile.mutable_storage_policy()->mutable_log()->set_media("hdd");
profile.mutable_storage_policy()->mutable_external()->set_media("hdd");
- profile.mutable_storage_policy()->set_keep_in_memory(Ydb::FeatureFlag::DISABLED);
+ profile.mutable_storage_policy()->set_keep_in_memory(Ydb::FeatureFlag::DISABLED);
CreateTable(server, "/Root/ydb_ut_tenant/table-4", profile);
NKikimrSchemeOp::TTableDescription description;
@@ -4268,7 +4268,7 @@ Y_UNIT_TEST_SUITE(TTableProfileTests) {
profile.mutable_storage_policy()->set_preset_name("default");
profile.mutable_storage_policy()->mutable_syslog()->set_media("ssd");
profile.mutable_storage_policy()->mutable_log()->set_media("ssd");
- profile.mutable_storage_policy()->set_keep_in_memory(Ydb::FeatureFlag::ENABLED);
+ profile.mutable_storage_policy()->set_keep_in_memory(Ydb::FeatureFlag::ENABLED);
CreateTable(server, "/Root/ydb_ut_tenant/table-5", profile);
NKikimrSchemeOp::TTableDescription description;