Get rid of unnecessary code (#10410)

Author: CyberROFL

ydb/core/wrappers/abstract.h

@@ -3,9 +3,7 @@
 #include <ydb/core/protos/flat_scheme_op.pb.h>
 #include <ydb/core/wrappers/events/abstract.h>
 #include <ydb/core/wrappers/events/common.h>
-#include <ydb/core/wrappers/events/delete_objects.h>
 #include <ydb/core/wrappers/events/get_object.h>
-#include <ydb/core/wrappers/events/list_objects.h>
 #include <ydb/core/wrappers/events/object_exists.h>
 
 #include <memory>

ydb/core/wrappers/events/common.h

@@ -65,7 +65,7 @@ struct TRequestWithBody: public TGenericRequest<TDerived, EventType, T> {
     using TBase = TRequestWithBody<TDerived, EventType, T>;
 };
 
-template <typename TDerived, ui32 EventType, typename T, typename U = T>
+template <typename TDerived, ui32 EventType, typename T, typename U = T, bool HasKey = true>
 struct TGenericResponse: public NActors::TEventLocal<TDerived, EventType> {
 private:
     IRequestContext::TPtr RequestContext;
@@ -90,6 +90,7 @@ struct TGenericResponse: public NActors::TEventLocal<TDerived, EventType> {
         , Key(key)
         , Result(TDerived::ResultFromOutcome(outcome))
     {
+        static_assert(HasKey, "Object has no key");
     }
 
     bool IsSuccess() const {
@@ -114,11 +115,17 @@ struct TGenericResponse: public NActors::TEventLocal<TDerived, EventType> {
         return outcome;
     }
 
+    virtual TString ToStringBody() const {
+        auto result = TStringBuilder();
+        if constexpr (HasKey) {
+            result << " Key: " << (Key ? "null" : *Key);
+        }
+        result << " Result: " << Result;
+        return result;
+    }
+
     TString ToString() const override {
-        return TStringBuilder() << this->ToStringHeader() << " {"
-            << " Key: " << (Key ? "null" : *Key)
-            << " Result: " << Result
-            << " }";
+        return TStringBuilder() << this->ToStringHeader() << " {" << ToStringBody() << " }";
     }
 };
 
@@ -143,12 +150,10 @@ struct TResponseWithBody: public TGenericResponse<TDerived, EventType, T, U> {
     {
     }
 
-    TString ToString() const override {
-        return TStringBuilder() << this->ToStringHeader() << " {"
-            << " Key: " << (this->Key ? "null" : *this->Key)
-            << " Result: " << this->Result
-            << " Body: " << Body.size() << "b"
-            << " }";
+    TString ToStringBody() const override {
+        return TStringBuilder()
+            << TBase::ToStringBody()
+            << " Body: " << Body.size() << "b";
     }
 };
 
@@ -160,48 +165,48 @@ struct TResponseWithBody: public TGenericResponse<TDerived, EventType, T, U> {
 #define DEFINE_GENERIC_REQUEST(name) \
     DEFINE_REQUEST(name, TGenericRequest)
 
-#define DECLARE_GENERIC_RESPONSE(name) \
-    struct TEv##name##Response: public TGenericResponse<TEv##name##Response, Ev##name##Response, Aws::S3::Model::name##Result> { \
+#define DECLARE_GENERIC_RESPONSE_K(name, hasKey) \
+    struct TEv##name##Response: public TGenericResponse<TEv##name##Response, Ev##name##Response, Aws::S3::Model::name##Result, Aws::S3::Model::name##Result, hasKey> { \
     private: \
-        using TBase = TGenericResponse<TEv##name##Response, Ev##name##Response, Aws::S3::Model::name##Result>; \
+        using TBase = TGenericResponse<TEv##name##Response, Ev##name##Response, Aws::S3::Model::name##Result, Aws::S3::Model::name##Result, hasKey>; \
     public: \
         using TBase::TBase;
 
-#define DECLARE_RESPONSE_WITH_BODY(name, result_t) \
-    struct TEv##name##Response: public TResponseWithBody<TEv##name##Response, Ev##name##Response, Aws::S3::Model::name##Result, result_t> { \
-    private: \
-        using TBase = TResponseWithBody<TEv##name##Response, Ev##name##Response, Aws::S3::Model::name##Result, result_t>; \
-    public: \
-        using TBase::TBase;
+#define DEFINE_GENERIC_RESPONSE_K(name, hasKey) \
+    DECLARE_GENERIC_RESPONSE_K(name, hasKey) \
+    }
 
 #define DEFINE_GENERIC_RESPONSE(name) \
-    DECLARE_GENERIC_RESPONSE(name) \
-    }
+    DEFINE_GENERIC_RESPONSE_K(name, true)
 
-#define DEFINE_GENERIC_REQUEST_RESPONSE(name) \
+#define DEFINE_GENERIC_REQUEST_RESPONSE_K(name, hasKey) \
     DEFINE_GENERIC_REQUEST(name); \
-    DEFINE_GENERIC_RESPONSE(name)
+    DEFINE_GENERIC_RESPONSE_K(name, hasKey)
+
+#define DEFINE_GENERIC_REQUEST_RESPONSE(name) \
+    DEFINE_GENERIC_REQUEST_RESPONSE_K(name, true)
 
 DEFINE_REQUEST(PutObject, TRequestWithBody);
 DEFINE_GENERIC_RESPONSE(PutObject);
 
 DEFINE_REQUEST(UploadPart, TRequestWithBody);
 DEFINE_GENERIC_RESPONSE(UploadPart);
 
-DEFINE_GENERIC_REQUEST_RESPONSE(HeadObject);
-DEFINE_GENERIC_REQUEST_RESPONSE(DeleteObject);
-DEFINE_GENERIC_REQUEST_RESPONSE(CreateMultipartUpload);
-DEFINE_GENERIC_REQUEST_RESPONSE(CompleteMultipartUpload);
 DEFINE_GENERIC_REQUEST_RESPONSE(AbortMultipartUpload);
-
-DEFINE_GENERIC_REQUEST(UploadPartCopy);
-DEFINE_GENERIC_RESPONSE(UploadPartCopy);
+DEFINE_GENERIC_REQUEST_RESPONSE(CompleteMultipartUpload);
+DEFINE_GENERIC_REQUEST_RESPONSE(CreateMultipartUpload);
+DEFINE_GENERIC_REQUEST_RESPONSE(DeleteObject);
+DEFINE_GENERIC_REQUEST_RESPONSE_K(DeleteObjects, false);
+DEFINE_GENERIC_REQUEST_RESPONSE(HeadObject);
+DEFINE_GENERIC_REQUEST_RESPONSE_K(ListObjects, false);
+DEFINE_GENERIC_REQUEST_RESPONSE(UploadPartCopy);
 
 #undef DEFINE_REQUEST
 #undef DEFINE_GENERIC_REQUEST
-#undef DECLARE_GENERIC_RESPONSE
-#undef DECLARE_RESPONSE_WITH_BODY
+#undef DECLARE_GENERIC_RESPONSE_K
 #undef DEFINE_GENERIC_RESPONSE
+#undef DEFINE_GENERIC_RESPONSE_K
 #undef DEFINE_GENERIC_REQUEST_RESPONSE
+#undef DEFINE_GENERIC_REQUEST_RESPONSE_K
 
 }

ydb/core/wrappers/events/delete_objects.cpp

@@ -7,9 +7,7 @@ IF (OS_WINDOWS)
 ELSE()
     SRCS(
         common.cpp
-        list_objects.cpp
         object_exists.cpp
-        delete_objects.cpp
         get_object.cpp
         s3_out.cpp
         abstract.cpp

ydb/core/wrappers/events/delete_objects.h

@@ -7,16 +7,6 @@
 #include <contrib/libs/aws-sdk-cpp/aws-cpp-sdk-core/include/aws/core/auth/AWSCredentials.h>
 #include <contrib/libs/aws-sdk-cpp/aws-cpp-sdk-core/include/aws/core/client/AWSClient.h>
 #include <contrib/libs/aws-sdk-cpp/aws-cpp-sdk-core/include/aws/core/client/ClientConfiguration.h>
-#include <contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/include/aws/s3/model/AbortMultipartUploadRequest.h>
-#include <contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/include/aws/s3/model/CreateMultipartUploadRequest.h>
-#include <contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/include/aws/s3/model/CompleteMultipartUploadRequest.h>
-#include <contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/include/aws/s3/model/DeleteObjectRequest.h>
-#include <contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/include/aws/s3/model/GetObjectRequest.h>
-#include <contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/include/aws/s3/model/HeadObjectRequest.h>
-#include <contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/include/aws/s3/model/PutObjectRequest.h>
-#include <contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/include/aws/s3/model/StorageClass.h>
-#include <contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/include/aws/s3/model/UploadPartCopyRequest.h>
-#include <contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/include/aws/s3/model/UploadPartRequest.h>
 #include <contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/include/aws/s3/S3Client.h>
 
 #include <ydb/library/actors/core/log.h>