diff options
author | alexnick <alexnick@ydb.tech> | 2022-07-20 16:32:35 +0300 |
---|---|---|
committer | alexnick <alexnick@ydb.tech> | 2022-07-20 16:32:35 +0300 |
commit | 3c7d69ef625871f9fdf0eeca19c0836b347135a1 (patch) | |
tree | b24017c6a33c47e10d2ab1bb5e5fb79e62ebcd99 | |
parent | 53e2e801caef50a19bb28d7f0c59ddbafe334950 (diff) | |
download | ydb-3c7d69ef625871f9fdf0eeca19c0836b347135a1.tar.gz |
fixes for compatibility
-rw-r--r-- | ydb/core/client/server/msgbus_server_pq_metacache.cpp | 2 | ||||
-rw-r--r-- | ydb/core/testlib/test_pq_client.h | 10 | ||||
-rw-r--r-- | ydb/library/persqueue/topic_parser/topic_parser.cpp | 1 | ||||
-rw-r--r-- | ydb/services/lib/actors/pq_schema_actor.cpp | 8 | ||||
-rw-r--r-- | ydb/services/persqueue_v1/persqueue_ut.cpp | 1 |
5 files changed, 10 insertions, 12 deletions
diff --git a/ydb/core/client/server/msgbus_server_pq_metacache.cpp b/ydb/core/client/server/msgbus_server_pq_metacache.cpp index 85d7650857f..ab52a805a91 100644 --- a/ydb/core/client/server/msgbus_server_pq_metacache.cpp +++ b/ydb/core/client/server/msgbus_server_pq_metacache.cpp @@ -36,7 +36,7 @@ void CheckEntrySetHasTopicPath(auto* scNavigate) { if (entry.PQGroupInfo && entry.PQGroupInfo->Description.HasPQTabletConfig()) { if (entry.PQGroupInfo->Description.GetPQTabletConfig().GetTopicPath().empty()) { auto* newGroupInfo = new NSchemeCache::TSchemeCacheNavigate::TPQGroupInfo(*entry.PQGroupInfo); - newGroupInfo->Description.MutablePQTabletConfig()->SetTopicPath(NKikimr::JoinPath(entry.Path)); + newGroupInfo->Description.MutablePQTabletConfig()->SetTopicPath("/" + NKikimr::JoinPath(entry.Path)); entry.PQGroupInfo.Reset(newGroupInfo); } } diff --git a/ydb/core/testlib/test_pq_client.h b/ydb/core/testlib/test_pq_client.h index 6207fecfadd..51c11d780ef 100644 --- a/ydb/core/testlib/test_pq_client.h +++ b/ydb/core/testlib/test_pq_client.h @@ -130,8 +130,8 @@ struct TRequestCreatePQ { auto config = req->MutableConfig(); if (CacheSize) config->SetCacheSize(CacheSize); - config->SetTopicName(Topic); - config->SetTopicPath(TString("/Root/PQ/") + Topic); + //config->SetTopicName(Topic); + //config->SetTopicPath(TString("/Root/PQ/") + Topic); config->MutablePartitionConfig()->SetLifetimeSeconds(LifetimeS); config->MutablePartitionConfig()->SetSourceIdLifetimeSeconds(SourceIdLifetime); config->MutablePartitionConfig()->SetSourceIdMaxCounts(SourceIdMaxCount); @@ -211,12 +211,12 @@ struct TRequestAlterPQ { if (CacheSize) { auto* config = req->MutableConfig(); - config->SetTopicName(Topic); +// config->SetTopicName(Topic); config->SetCacheSize(CacheSize); } if (FillPartitionConfig) { auto* config = req->MutableConfig(); - config->SetTopicName(Topic); +// config->SetTopicName(Topic); config->MutablePartitionConfig()->SetLifetimeSeconds(LifetimeS); if (MirrorFrom) { config->MutablePartitionConfig()->MutableMirrorFrom()->CopyFrom(MirrorFrom.value()); @@ -750,7 +750,7 @@ public: UNIT_ASSERT(resp.TopicInfoSize() == 1); const auto& topicInfo = resp.GetTopicInfo(0); UNIT_ASSERT(topicInfo.GetTopic() == name); - UNIT_ASSERT(topicInfo.GetConfig().GetTopicName() == name); + //UNIT_ASSERT(topicInfo.GetConfig().GetTopicName() == name); if (cacheSize) { UNIT_ASSERT(topicInfo.GetConfig().HasCacheSize()); ui64 actualSize = topicInfo.GetConfig().GetCacheSize(); diff --git a/ydb/library/persqueue/topic_parser/topic_parser.cpp b/ydb/library/persqueue/topic_parser/topic_parser.cpp index 7ea4d0101d3..0bcc7a591ad 100644 --- a/ydb/library/persqueue/topic_parser/topic_parser.cpp +++ b/ydb/library/persqueue/topic_parser/topic_parser.cpp @@ -132,7 +132,6 @@ TDiscoveryConverter::TDiscoveryConverter(bool firstClass, auto name = pqTabletConfig.GetTopicName(); auto path = pqTabletConfig.GetTopicPath(); if (name.empty()) { - Y_VERIFY(!pqTabletConfig.GetTopic().empty()); Y_VERIFY(!path.empty()); TStringBuf pathBuf(path), fst, snd; auto res = pathBuf.TryRSplit("/", fst, snd); diff --git a/ydb/services/lib/actors/pq_schema_actor.cpp b/ydb/services/lib/actors/pq_schema_actor.cpp index 307b555fdd0..e0a0c51eb7f 100644 --- a/ydb/services/lib/actors/pq_schema_actor.cpp +++ b/ydb/services/lib/actors/pq_schema_actor.cpp @@ -502,8 +502,8 @@ namespace NKikimr::NGRpcProxy::V1 { config->SetIdent(converter->GetLegacyProducer()); } - config->SetTopicName(name); - config->SetTopicPath(topicPath); + //config->SetTopicName(name); + //config->SetTopicPath(topicPath); //Sets legacy 'logtype'. @@ -797,8 +797,8 @@ namespace NKikimr::NGRpcProxy::V1 { config->SetIdent(converter->GetLegacyProducer()); } - config->SetTopicName(name); - config->SetTopicPath(topicPath); +// config->SetTopicName(name); +// config->SetTopicPath(topicPath); //Sets legacy 'logtype'. diff --git a/ydb/services/persqueue_v1/persqueue_ut.cpp b/ydb/services/persqueue_v1/persqueue_ut.cpp index ad770b65568..fcd97094716 100644 --- a/ydb/services/persqueue_v1/persqueue_ut.cpp +++ b/ydb/services/persqueue_v1/persqueue_ut.cpp @@ -3236,7 +3236,6 @@ Y_UNIT_TEST_SUITE(TPersQueueTest) { } SourceIdMaxCounts: 6000000 } - TopicName: "rt3.dc1--acc--topic3" Version: 6 LocalDC: true RequireAuthWrite: true |