Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions ydb/apps/ydbd/export/export.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
#include "export.h"

#include <ydb/core/tx/datashard/export_s3.h>

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() {
// No cleanup required for TDataShardExportFactory.
}
12 changes: 12 additions & 0 deletions ydb/apps/ydbd/export/export.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
#pragma once

#include <ydb/core/tx/datashard/export_iface.h>

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;
};
16 changes: 16 additions & 0 deletions ydb/apps/ydbd/export/ya.make
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
LIBRARY()

SRCS(
export.cpp
)

PEERDIR(
yql/essentials/public/types
ydb/core/tx/columnshard/engines/scheme/defaults/protos
ydb/library/mkql_proto/protos
ydb/library/aclib/protos
ydb/library/formats/arrow/protos
ydb/core/tx/datashard
)

END()
2 changes: 1 addition & 1 deletion ydb/apps/ydbd/main.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "export.h"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

А этот файл почему не удалил? Теперь у нас export.{h,cpp} в двух местах.

#include "export/export.h"
#include <ydb/core/driver_lib/run/main.h>
#include <ydb/core/security/ticket_parser.h>
#include <ydb/core/security/token_manager/token_manager.h>
Expand Down
9 changes: 5 additions & 4 deletions ydb/apps/ydbd/ya.make
Original file line number Diff line number Diff line change
Expand Up @@ -33,27 +33,29 @@ ENDIF()

PEERDIR(
ydb/apps/version
ydb/apps/ydbd/export
ydb/core/driver_lib/run
ydb/core/protos
ydb/core/security
ydb/core/tx/schemeshard
ydb/core/ymq/actor
ydb/core/ymq/base
ydb/library/breakpad
ydb/library/folder_service/mock
ydb/library/keys
ydb/library/pdisk_io
ydb/library/security
ydb/library/yql/udfs/common/clickhouse/client
ydb/library/yql/udfs/common/knn
ydb/library/yql/udfs/common/roaring
yql/essentials/parser/pg_wrapper
yql/essentials/sql/pg
ydb/library/yql/udfs/common/clickhouse/client
yql/essentials/udfs/common/compress_base
yql/essentials/udfs/common/datetime2
yql/essentials/udfs/common/digest
yql/essentials/udfs/common/histogram
yql/essentials/udfs/common/hyperloglog
yql/essentials/udfs/common/ip_base
ydb/library/yql/udfs/common/knn
ydb/library/yql/udfs/common/roaring
yql/essentials/udfs/common/json
yql/essentials/udfs/common/json2
yql/essentials/udfs/common/math
Expand All @@ -68,7 +70,6 @@ PEERDIR(
yql/essentials/udfs/common/url_base
yql/essentials/udfs/common/yson2
yql/essentials/udfs/logs/dsv
ydb/library/breakpad
)

YQL_LAST_ABI_VERSION()
Expand Down
Loading
Loading