diff options
author | abcdef <akotov@ydb.tech> | 2023-06-29 08:50:47 +0300 |
---|---|---|
committer | abcdef <akotov@ydb.tech> | 2023-06-29 08:50:47 +0300 |
commit | f9603f9e2e68ebe8589955459a35665c2d35b0df (patch) | |
tree | a78872fb68a40ba2326aa1e33a01f52e5b1786d7 | |
parent | 4ffb95e25bda4c00767ee3da0a19f3c1585ba6db (diff) | |
download | ydb-f9603f9e2e68ebe8589955459a35665c2d35b0df.tar.gz |
the driver is passed by reference
драйвер передаётся по ссылке
7 files changed, 9 insertions, 10 deletions
diff --git a/ydb/public/lib/ydb_cli/commands/topic_workload/topic_workload_reader.cpp b/ydb/public/lib/ydb_cli/commands/topic_workload/topic_workload_reader.cpp index 68b6729590..93b4e72796 100644 --- a/ydb/public/lib/ydb_cli/commands/topic_workload/topic_workload_reader.cpp +++ b/ydb/public/lib/ydb_cli/commands/topic_workload/topic_workload_reader.cpp @@ -8,10 +8,10 @@ using namespace NYdb::NConsoleClient; void TTopicWorkloadReader::ReaderLoop(TTopicWorkloadReaderParams& params) { - auto topicClient = std::make_unique<NYdb::NTopic::TTopicClient>(*params.Driver); + auto topicClient = std::make_unique<NYdb::NTopic::TTopicClient>(params.Driver); auto consumerName = TCommandWorkloadTopicDescribe::GenerateConsumerName(params.ConsumerIdx); - auto describeTopicResult = TCommandWorkloadTopicDescribe::DescribeTopic(params.Database, params.TopicName, *params.Driver); + auto describeTopicResult = TCommandWorkloadTopicDescribe::DescribeTopic(params.Database, params.TopicName, params.Driver); auto consumers = describeTopicResult.GetConsumers(); if (!std::any_of(consumers.begin(), consumers.end(), [consumerName](const auto& consumer) { return consumer.GetConsumerName() == consumerName; })) { diff --git a/ydb/public/lib/ydb_cli/commands/topic_workload/topic_workload_reader.h b/ydb/public/lib/ydb_cli/commands/topic_workload/topic_workload_reader.h index 1a3b43292d..0ee310d080 100644 --- a/ydb/public/lib/ydb_cli/commands/topic_workload/topic_workload_reader.h +++ b/ydb/public/lib/ydb_cli/commands/topic_workload/topic_workload_reader.h @@ -12,7 +12,7 @@ namespace NYdb { namespace NConsoleClient { struct TTopicWorkloadReaderParams { size_t TotalSec; - NYdb::TDriver* Driver; + const NYdb::TDriver& Driver; std::shared_ptr<TLog> Log; std::shared_ptr<TTopicWorkloadStatsCollector> StatsCollector; std::shared_ptr<std::atomic_bool> ErrorFlag; diff --git a/ydb/public/lib/ydb_cli/commands/topic_workload/topic_workload_run_full.cpp b/ydb/public/lib/ydb_cli/commands/topic_workload/topic_workload_run_full.cpp index 5a3473e296..9f8ede18a6 100644 --- a/ydb/public/lib/ydb_cli/commands/topic_workload/topic_workload_run_full.cpp +++ b/ydb/public/lib/ydb_cli/commands/topic_workload/topic_workload_run_full.cpp @@ -136,7 +136,7 @@ void TCommandWorkloadTopicRunFull::StartConsumerThreads(std::vector<std::future< for (ui32 threadIdx = 0; threadIdx < ConsumerThreadCount; ++threadIdx, ++readerIdx) { TTopicWorkloadReaderParams readerParams{ .TotalSec = TotalSec, - .Driver = Driver.get(), + .Driver = *Driver, .Log = Log, .StatsCollector = StatsCollector, .ErrorFlag = ErrorFlag, @@ -166,7 +166,7 @@ void TCommandWorkloadTopicRunFull::StartProducerThreads(std::vector<std::future< TTopicWorkloadWriterParams writerParams{ .TotalSec = TotalSec, .WarmupSec = WarmupSec, - .Driver = Driver.get(), + .Driver = *Driver, .Log = Log, .StatsCollector = StatsCollector, .ErrorFlag = ErrorFlag, diff --git a/ydb/public/lib/ydb_cli/commands/topic_workload/topic_workload_run_read.cpp b/ydb/public/lib/ydb_cli/commands/topic_workload/topic_workload_run_read.cpp index d846332e32..4f166de46b 100644 --- a/ydb/public/lib/ydb_cli/commands/topic_workload/topic_workload_run_read.cpp +++ b/ydb/public/lib/ydb_cli/commands/topic_workload/topic_workload_run_read.cpp @@ -90,7 +90,7 @@ int TCommandWorkloadTopicRunRead::Run(TConfig& config) { for (ui32 consumerThreadIdx = 0; consumerThreadIdx < ConsumerThreadCount; ++consumerThreadIdx) { TTopicWorkloadReaderParams readerParams{ .TotalSec = TotalSec, - .Driver = Driver.get(), + .Driver = *Driver, .Log = Log, .StatsCollector = StatsCollector, .ErrorFlag = ErrorFlag, diff --git a/ydb/public/lib/ydb_cli/commands/topic_workload/topic_workload_run_write.cpp b/ydb/public/lib/ydb_cli/commands/topic_workload/topic_workload_run_write.cpp index a25a9b0132..484c9ffb37 100644 --- a/ydb/public/lib/ydb_cli/commands/topic_workload/topic_workload_run_write.cpp +++ b/ydb/public/lib/ydb_cli/commands/topic_workload/topic_workload_run_write.cpp @@ -109,7 +109,7 @@ int TCommandWorkloadTopicRunWrite::Run(TConfig& config) { TTopicWorkloadWriterParams writerParams{ .TotalSec = TotalSec, .WarmupSec = WarmupSec, - .Driver = Driver.get(), + .Driver = *Driver, .Log = Log, .StatsCollector = StatsCollector, .ErrorFlag = ErrorFlag, diff --git a/ydb/public/lib/ydb_cli/commands/topic_workload/topic_workload_writer.cpp b/ydb/public/lib/ydb_cli/commands/topic_workload/topic_workload_writer.cpp index 5f9dccdb76..c8bc253703 100644 --- a/ydb/public/lib/ydb_cli/commands/topic_workload/topic_workload_writer.cpp +++ b/ydb/public/lib/ydb_cli/commands/topic_workload/topic_workload_writer.cpp @@ -220,13 +220,12 @@ bool TTopicWorkloadWriterWorker::ProcessSessionClosedEvent( void TTopicWorkloadWriterWorker::CreateWorker() { WRITE_LOG(Params.Log, ELogPriority::TLOG_INFO, TStringBuilder() << "Create writer worker for ProducerId " << Params.ProducerId << " PartitionId " << Params.PartitionId); - Y_VERIFY(Params.Driver); NYdb::NTopic::TWriteSessionSettings settings; settings.Codec((NYdb::NTopic::ECodec)Params.Codec); settings.Path(Params.TopicName); settings.ProducerId(Params.ProducerId); settings.PartitionId(Params.PartitionId); - WriteSession = NYdb::NTopic::TTopicClient(*Params.Driver).CreateWriteSession(settings); + WriteSession = NYdb::NTopic::TTopicClient(Params.Driver).CreateWriteSession(settings); } void TTopicWorkloadWriterWorker::WriterLoop(TTopicWorkloadWriterParams& params) { diff --git a/ydb/public/lib/ydb_cli/commands/topic_workload/topic_workload_writer.h b/ydb/public/lib/ydb_cli/commands/topic_workload/topic_workload_writer.h index 062f644f17..867c8f1411 100644 --- a/ydb/public/lib/ydb_cli/commands/topic_workload/topic_workload_writer.h +++ b/ydb/public/lib/ydb_cli/commands/topic_workload/topic_workload_writer.h @@ -14,7 +14,7 @@ namespace NYdb { struct TTopicWorkloadWriterParams { size_t TotalSec; ui32 WarmupSec; - NYdb::TDriver* Driver; + const NYdb::TDriver& Driver; std::shared_ptr<TLog> Log; std::shared_ptr<TTopicWorkloadStatsCollector> StatsCollector; std::shared_ptr<std::atomic<bool>> ErrorFlag; |