aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorivanmorozov <ivanmorozov@yandex-team.com>2022-11-07 15:18:44 +0300
committerivanmorozov <ivanmorozov@yandex-team.com>2022-11-07 15:18:44 +0300
commit8fccbee893cdfab0e7da20ec6cd32ca199a7326b (patch)
tree5cdb200ca225cf3fab39a761f5c44c65975e2ed6
parent561aeaf8479d7bc3ccba32fd81361b863147b010 (diff)
downloadydb-8fccbee893cdfab0e7da20ec6cd32ca199a7326b.tar.gz
correction
-rw-r--r--ydb/core/wrappers/events/common.h22
-rw-r--r--ydb/core/wrappers/fake_storage.cpp2
-rw-r--r--ydb/core/wrappers/s3_wrapper.cpp10
3 files changed, 17 insertions, 17 deletions
diff --git a/ydb/core/wrappers/events/common.h b/ydb/core/wrappers/events/common.h
index 632e63b2386..f99ebfe9db2 100644
--- a/ydb/core/wrappers/events/common.h
+++ b/ydb/core/wrappers/events/common.h
@@ -34,7 +34,7 @@ public:
: Request(request) {
}
- TGenericRequest(const TRequest& request, IRequestContext::TPtr requestContext)
+ explicit TGenericRequest(const TRequest& request, IRequestContext::TPtr requestContext)
: RequestContext(requestContext)
, Request(request)
{
@@ -70,16 +70,16 @@ struct TRequestWithBody: public TGenericRequest<TDerived, EventType, T> {
using TBase = TRequestWithBody<TDerived, EventType, T>;
};
-template <typename TDerived, ui32 EventType, typename TAWSResultExt, typename U = TAWSResultExt>
+template <typename TDerived, ui32 EventType, typename TAwsResultExt, typename U = TAwsResultExt>
struct TBaseGenericResponse: public NActors::TEventLocal<TDerived, EventType> {
private:
using TBase = NActors::TEventLocal<TDerived, EventType>;
IRequestContext::TPtr RequestContext;
public:
- using TOutcome = Aws::Utils::Outcome<TAWSResultExt, Aws::S3::S3Error>;
+ using TOutcome = Aws::Utils::Outcome<TAwsResultExt, Aws::S3::S3Error>;
using TResult = Aws::Utils::Outcome<U, Aws::S3::S3Error>;
- using TAWSResult = U;
- using TAWSOutcome = TResult;
+ using TAwsResult = U;
+ using TAwsOutcome = TResult;
using TKey = std::optional<TString>;
TResult Result;
@@ -88,7 +88,7 @@ public:
: Result(TDerived::ResultFromOutcome(outcome)) {
}
- TBaseGenericResponse(const TOutcome& outcome, IRequestContext::TPtr requestContext)
+ explicit TBaseGenericResponse(const TOutcome& outcome, IRequestContext::TPtr requestContext)
: RequestContext(requestContext)
, Result(TDerived::ResultFromOutcome(outcome)) {
}
@@ -119,10 +119,10 @@ public:
}
};
-template <typename TDerived, ui32 EventType, typename TAWSResult, typename U = TAWSResult>
-struct TGenericResponse: public TBaseGenericResponse<TDerived, EventType, TAWSResult, U> {
+template <typename TDerived, ui32 EventType, typename TAwsResult, typename U = TAwsResult>
+struct TGenericResponse: public TBaseGenericResponse<TDerived, EventType, TAwsResult, U> {
private:
- using TBase = TBaseGenericResponse<TDerived, EventType, TAWSResult, U>;
+ using TBase = TBaseGenericResponse<TDerived, EventType, TAwsResult, U>;
public:
using TOutcome = typename TBase::TOutcome;
using TResult = typename TBase::TResult;
@@ -130,12 +130,12 @@ public:
TKey Key;
- TGenericResponse(const TKey& key, const TOutcome& outcome)
+ explicit TGenericResponse(const TKey& key, const TOutcome& outcome)
: TBase(outcome)
, Key(key) {
}
- TGenericResponse(const TKey& key, const TOutcome& outcome, IRequestContext::TPtr requestContext)
+ explicit TGenericResponse(const TKey& key, const TOutcome& outcome, IRequestContext::TPtr requestContext)
: TBase(outcome, requestContext)
, Key(key)
{
diff --git a/ydb/core/wrappers/fake_storage.cpp b/ydb/core/wrappers/fake_storage.cpp
index 5db1ee5944f..1c4d4cf672f 100644
--- a/ydb/core/wrappers/fake_storage.cpp
+++ b/ydb/core/wrappers/fake_storage.cpp
@@ -50,7 +50,7 @@ TEvListObjectsResponse::TResult TFakeExternalStorage::BuildListObjectsResult(con
const TString prefix(awsPrefix.data(), awsPrefix.size());
THolder<TEvListObjectsResponse> result;
TGuard<TMutex> g(Mutex);
- TEvListObjectsResponse::TAWSResult awsResult;
+ TEvListObjectsResponse::TAwsResult awsResult;
for (auto&& i : bucket) {
if (!!prefix && !i.first.StartsWith(prefix)) {
continue;
diff --git a/ydb/core/wrappers/s3_wrapper.cpp b/ydb/core/wrappers/s3_wrapper.cpp
index 84d7479dd63..715be8c58a4 100644
--- a/ydb/core/wrappers/s3_wrapper.cpp
+++ b/ydb/core/wrappers/s3_wrapper.cpp
@@ -26,7 +26,7 @@ class TS3Wrapper: public TActor<TS3Wrapper> {
template <class T>
void Handle(T& ev) {
- CSOperator->Execute(ev);
+ StorageOperator->Execute(ev);
}
public:
@@ -34,11 +34,11 @@ public:
return NKikimrServices::TActivity::S3_WRAPPER_ACTOR;
}
- explicit TS3Wrapper(IExternalStorageOperator::TPtr csOperator)
+ explicit TS3Wrapper(IExternalStorageOperator::TPtr storageOperator)
: TActor(&TThis::StateWork)
- , CSOperator(csOperator)
+ , StorageOperator(storageOperator)
{
- Y_VERIFY(!!CSOperator, "not initialized operator. incorrect config.");
+ Y_VERIFY(!!StorageOperator, "not initialized operator. incorrect config.");
}
virtual ~TS3Wrapper() = default;
@@ -62,7 +62,7 @@ public:
}
private:
- IExternalStorageOperator::TPtr CSOperator;
+ IExternalStorageOperator::TPtr StorageOperator;
}; // TS3Wrapper