Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix build on clang14 #1167

Merged
merged 3 commits into from
Jan 19, 2024
Merged

Fix build on clang14 #1167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d842a01
Fix build on clang14
iddqdex Jan 19, 2024
8a24593
revert InitAllowedCodecs
iddqdex Jan 19, 2024
84bd0c3
fix
iddqdex Jan 19, 2024
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
10 changes: 9 additions & 1 deletion ydb/apps/ydb/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
#include <ydb/apps/ydb/commands/ydb_cloud_root.h>
#include <ydb/public/lib/ydb_cli/commands/ydb_common.h>
#include <ydb/public/lib/ydb_cli/commands/ydb_service_topic.h>

TVector<NYdb::NTopic::ECodec> NYdb::NConsoleClient::InitAllowedCodecs() {
return TVector<NYdb::NTopic::ECodec>{
NYdb::NTopic::ECodec::RAW,
NYdb::NTopic::ECodec::ZSTD,
NYdb::NTopic::ECodec::GZIP,
};
}

int main(int argc, char **argv) {
try {
Expand Down
5 changes: 5 additions & 0 deletions ydb/library/workload/workload_query_generator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,11 @@ using TBulkDataGeneratorList = std::list<std::shared_ptr<IBulkDataGenerator>>;
class IWorkloadQueryGenerator {
public:
struct TWorkloadType {
explicit TWorkloadType(int type, const TString& commandName, const TString& description)
: Type(type)
, CommandName(commandName)
, Description(description)
{}
int Type = 0;
TString CommandName;
TString Description;
Expand Down
8 changes: 0 additions & 8 deletions ydb/public/lib/ydb_cli/commands/ydb_service_topic.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,14 +95,6 @@ namespace NYdb::NConsoleClient {
return description.Str();
}

TVector<NYdb::NTopic::ECodec> InitAllowedCodecs() {
return TVector<NYdb::NTopic::ECodec>{
NYdb::NTopic::ECodec::RAW,
NYdb::NTopic::ECodec::ZSTD,
NYdb::NTopic::ECodec::GZIP,
};
}

namespace {
NTopic::ECodec ParseCodec(const TString& codecStr, const TVector<NTopic::ECodec>& allowedCodecs) {
auto exists = ExistingCodecs.find(to_lower(codecStr));
Expand Down
Loading