From 6e276ee64d17eff6345582b4d1780a324cb7e57a Mon Sep 17 00:00:00 2001 From: Oleg Doronin Date: Wed, 26 Nov 2025 21:42:39 +0000 Subject: [PATCH 1/2] fix some comments for export column tables --- ydb/apps/ydbd/export.cpp | 26 ------------------------- ydb/apps/ydbd/export.h | 12 ------------ ydb/core/tx/datashard/export_common.cpp | 12 ++++++++---- 3 files changed, 8 insertions(+), 42 deletions(-) delete mode 100644 ydb/apps/ydbd/export.cpp delete mode 100644 ydb/apps/ydbd/export.h diff --git a/ydb/apps/ydbd/export.cpp b/ydb/apps/ydbd/export.cpp deleted file mode 100644 index de0efb5a834f..000000000000 --- a/ydb/apps/ydbd/export.cpp +++ /dev/null @@ -1,26 +0,0 @@ -#include "export.h" - -#include - -NKikimr::NDataShard::IExport* TDataShardExportFactory::CreateExportToYt( - const IExport::TTask& task, const IExport::TTableColumns& columns) const -{ - Y_UNUSED(task); - Y_UNUSED(columns); - return nullptr; // not supported -} - -NKikimr::NDataShard::IExport* TDataShardExportFactory::CreateExportToS3( - const IExport::TTask& task, const IExport::TTableColumns& columns) const -{ -#ifndef KIKIMR_DISABLE_S3_OPS - return new NKikimr::NDataShard::TS3Export(task, columns); -#else - Y_UNUSED(task); - Y_UNUSED(columns); - return nullptr; -#endif -} - -void TDataShardExportFactory::Shutdown() { -} diff --git a/ydb/apps/ydbd/export.h b/ydb/apps/ydbd/export.h deleted file mode 100644 index 9d077f16aa5e..000000000000 --- a/ydb/apps/ydbd/export.h +++ /dev/null @@ -1,12 +0,0 @@ -#pragma once - -#include - -class TDataShardExportFactory : public NKikimr::NDataShard::IExportFactory { - using IExport = NKikimr::NDataShard::IExport; - -public: - IExport* CreateExportToYt(const IExport::TTask& task, const IExport::TTableColumns& columns) const override; - IExport* CreateExportToS3(const IExport::TTask& task, const IExport::TTableColumns& columns) const override; - void Shutdown() override; -}; diff --git a/ydb/core/tx/datashard/export_common.cpp b/ydb/core/tx/datashard/export_common.cpp index 52857ab3feab..a2003a61e1da 100644 --- a/ydb/core/tx/datashard/export_common.cpp +++ b/ydb/core/tx/datashard/export_common.cpp @@ -24,8 +24,10 @@ static void ResortColumns( return it->second; }); } -static TMaybe GenRowTableScheme(const TMap& columns, - const NKikimrSchemeOp::TPathDescription& pathDesc) { +static TMaybe GenRowTableScheme( + const TMap& columns, + const NKikimrSchemeOp::TPathDescription& pathDesc) +{ if (!pathDesc.HasTable()) { return Nothing(); } @@ -68,8 +70,10 @@ static TMaybe GenRowTableScheme(const TMap GenColumnTableScheme(const TMap& columns, - const NKikimrSchemeOp::TPathDescription& pathDesc) { +static TMaybe GenColumnTableScheme( + const TMap& columns, + const NKikimrSchemeOp::TPathDescription& pathDesc) +{ if (!pathDesc.HasColumnTableDescription()) { return Nothing(); } From e79cb165a1b74541de5630596a737dc3bb2cf85a Mon Sep 17 00:00:00 2001 From: Oleg Doronin Date: Thu, 27 Nov 2025 16:28:15 +0000 Subject: [PATCH 2/2] clean --- ydb/apps/ydbd/ya.make | 2 -- 1 file changed, 2 deletions(-) diff --git a/ydb/apps/ydbd/ya.make b/ydb/apps/ydbd/ya.make index 594cd76c0931..f6618a1106dc 100644 --- a/ydb/apps/ydbd/ya.make +++ b/ydb/apps/ydbd/ya.make @@ -23,8 +23,6 @@ IF (OS_WINDOWS) ENDIF() SRCS( - export.cpp - export.h main.cpp )