Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
server:database
arangodb3
0006-EncryptionFeature-is-enterprise-only.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File 0006-EncryptionFeature-is-enterprise-only.patch of Package arangodb3
From b25ee828f01da739f3dc7e9b60b3e5ebbc82df7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf@gmail.com> Date: Thu, 9 Mar 2023 11:13:33 +0100 Subject: [PATCH 6/7] EncryptionFeature is enterprise only MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Klaus Kämpf <kkaempf@gmail.com> --- client-tools/Dump/DumpFeature.cpp | 7 ++++--- client-tools/Export/ExportFeature.cpp | 3 ++- client-tools/Import/ImportFeature.cpp | 3 ++- client-tools/Restore/RestoreFeature.cpp | 9 ++++++--- client-tools/Shell/V8ClientConnection.cpp | 6 ++++-- 5 files changed, 18 insertions(+), 10 deletions(-) diff --git a/client-tools/Dump/DumpFeature.cpp b/client-tools/Dump/DumpFeature.cpp index 27469520bdd..d4750047646 100644 --- a/client-tools/Dump/DumpFeature.cpp +++ b/client-tools/Dump/DumpFeature.cpp @@ -864,14 +864,14 @@ Result DumpFeature::runDump(httpclient::SimpleHttpClient& client, // inject current database LOG_TOPIC("4af42", INFO, Logger::DUMP) << "Dumping database '" << dbName << "' (" << dbId << ")"; - EncryptionFeature* encryption{}; +#ifdef USE_ENTERPRISE if (Server::contains<EncryptionFeature>()) { if (server().hasFeature<EncryptionFeature>()) { encryption = &server().getFeature<EncryptionFeature>(); } } - +#endif _directory = std::make_unique<ManagedDirectory>( encryption, arangodb::basics::FileUtils::buildFilename( @@ -1151,12 +1151,13 @@ void DumpFeature::start() { double const start = TRI_microtime(); EncryptionFeature* encryption{}; +#ifdef USE_ENTERPRISE if (Server::contains<EncryptionFeature>()) { if (server().hasFeature<EncryptionFeature>()) { encryption = &server().getFeature<EncryptionFeature>(); } } - +#endif // set up the output directory, not much else _directory = std::make_unique<ManagedDirectory>( encryption, _options.outputPath, !_options.overwrite, true, diff --git a/client-tools/Export/ExportFeature.cpp b/client-tools/Export/ExportFeature.cpp index 0e2bc10477f..f3cb6aff3cb 100644 --- a/client-tools/Export/ExportFeature.cpp +++ b/client-tools/Export/ExportFeature.cpp @@ -267,12 +267,13 @@ void ExportFeature::validateOptions( void ExportFeature::prepare() { EncryptionFeature* encryption{}; +#ifdef USE_ENTERPRISE if constexpr (Server::contains<EncryptionFeature>()) { if (server().hasFeature<EncryptionFeature>()) { encryption = &server().getFeature<EncryptionFeature>(); } } - +#endif _directory = std::make_unique<ManagedDirectory>(encryption, _outputDirectory, !_overwrite, true, _useGzip); if (_directory->status().fail()) { diff --git a/client-tools/Import/ImportFeature.cpp b/client-tools/Import/ImportFeature.cpp index 5bbc16abaf5..8488cb73d72 100644 --- a/client-tools/Import/ImportFeature.cpp +++ b/client-tools/Import/ImportFeature.cpp @@ -494,12 +494,13 @@ void ImportFeature::start() { _httpClient->disconnect(); // we do not reuse this anymore EncryptionFeature* encryption{}; +#ifdef USE_ENTERPRISE if constexpr (Server::contains<EncryptionFeature>()) { if (server().hasFeature<EncryptionFeature>()) { encryption = &server().getFeature<EncryptionFeature>(); } } - +#endif SimpleHttpClientParams params = _httpClient->params(); arangodb::import::ImportHelper ih(encryption, client, client.endpoint(), params, _chunkSize, _threadCount, diff --git a/client-tools/Restore/RestoreFeature.cpp b/client-tools/Restore/RestoreFeature.cpp index 0f7023f94bf..e40d5471209 100644 --- a/client-tools/Restore/RestoreFeature.cpp +++ b/client-tools/Restore/RestoreFeature.cpp @@ -1068,12 +1068,13 @@ std::vector<RestoreFeature::DatabaseInfo> RestoreFeature::determineDatabaseList( basics::FileUtils::buildFilename(_options.inputPath, it); if (basics::FileUtils::isDirectory(path)) { EncryptionFeature* encryption{}; +#ifdef USE_ENTERPRISE if constexpr (Server::contains<EncryptionFeature>()) { if (server().hasFeature<EncryptionFeature>()) { encryption = &server().getFeature<EncryptionFeature>(); } } - +#endif ManagedDirectory dbDirectory(encryption, path, false, false, false); databases.push_back({it, VPackBuilder{}, ""}); getDBProperties(dbDirectory, databases.back().properties); @@ -1959,12 +1960,13 @@ void RestoreFeature::start() { double const start = TRI_microtime(); EncryptionFeature* encryption{}; +#ifdef USE_ENTERPRISE if constexpr (Server::contains<EncryptionFeature>()) { if (server().hasFeature<EncryptionFeature>()) { encryption = &server().getFeature<EncryptionFeature>(); } } - +#endif // set up the output directory, not much else _directory = std::make_unique<ManagedDirectory>( encryption, _options.inputPath, false, false, true); @@ -2131,12 +2133,13 @@ void RestoreFeature::start() { << "Restoring database '" << db.name << "'"; EncryptionFeature* encryption{}; +#ifdef USE_ENTERPRISE if constexpr (Server::contains<EncryptionFeature>()) { if (server().hasFeature<EncryptionFeature>()) { encryption = &server().getFeature<EncryptionFeature>(); } } - +#endif _directory = std::make_unique<ManagedDirectory>( encryption, basics::FileUtils::buildFilename(_options.inputPath, db.directory), diff --git a/client-tools/Shell/V8ClientConnection.cpp b/client-tools/Shell/V8ClientConnection.cpp index 89a57ac1095..a73729cf072 100644 --- a/client-tools/Shell/V8ClientConnection.cpp +++ b/client-tools/Shell/V8ClientConnection.cpp @@ -1386,12 +1386,13 @@ static void ClientConnection_importCsv( ArangoshServer& server = v8connection->server(); EncryptionFeature* encryption{}; +#ifdef USE_ENTERPRISE if constexpr (ArangoshServer::contains<EncryptionFeature>()) { if (server.hasFeature<EncryptionFeature>()) { encryption = &server.getFeature<EncryptionFeature>(); } } - +#endif v8::Local<v8::External> wrap = v8::Local<v8::External>::Cast(args.Data()); ClientFeature* client = static_cast<ClientFeature*>(wrap->Value()); @@ -1480,12 +1481,13 @@ static void ClientConnection_importJson( ArangoshServer& server = v8connection->server(); EncryptionFeature* encryption{}; +#ifdef USE_ENTERPRISE if constexpr (ArangoshServer::contains<EncryptionFeature>()) { if (server.hasFeature<EncryptionFeature>()) { encryption = &server.getFeature<EncryptionFeature>(); } } - +#endif v8::Local<v8::External> wrap = v8::Local<v8::External>::Cast(args.Data()); ClientFeature* client = static_cast<ClientFeature*>(wrap->Value()); -- 2.39.2
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
