File 0007-drop-static_assert-as-they-re-non-const.patch of Package arangodb3
From 5af0264d4fb65248f2b7f78c5d9eecc111e02656 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf@gmail.com>
Date: Thu, 9 Mar 2023 11:15:57 +0100
Subject: [PATCH 7/7] drop static_assert as they're non-const
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Klaus Kämpf <kkaempf@gmail.com>
---
arangod/Cluster/ClusterFeature.cpp | 2 --
arangod/GeneralServer/GeneralServerFeature.cpp | 2 --
arangod/Network/NetworkFeature.cpp | 2 --
arangod/Pregel/PregelFeature.cpp | 2 --
arangod/Replication/ReplicationFeature.cpp | 4 ----
arangod/Replication/ReplicationMetricsFeature.cpp | 2 --
arangod/RestServer/QueryRegistryFeature.cpp | 2 --
arangod/Transaction/ManagerFeature.cpp | 2 --
arangod/V8Server/V8DealerFeature.cpp | 2 --
client-tools/Restore/RestoreFeature.cpp | 1 -
client-tools/Shell/ClientFeature.h | 4 ----
lib/ApplicationFeatures/ConfigFeature.h | 2 --
12 files changed, 27 deletions(-)
diff --git a/arangod/Cluster/ClusterFeature.cpp b/arangod/Cluster/ClusterFeature.cpp
index eebb022d6e5..09be06d0d0f 100644
--- a/arangod/Cluster/ClusterFeature.cpp
+++ b/arangod/Cluster/ClusterFeature.cpp
@@ -63,8 +63,6 @@ ClusterFeature::ClusterFeature(Server& server)
_metrics{server.getFeature<metrics::MetricsFeature>()},
_agency_comm_request_time_ms(
_metrics.add(arangodb_agencycomm_request_time_msec{})) {
- static_assert(
- Server::isCreatedAfter<ClusterFeature, metrics::MetricsFeature>());
setOptional(true);
startsAfter<application_features::CommunicationFeaturePhase>();
diff --git a/arangod/GeneralServer/GeneralServerFeature.cpp b/arangod/GeneralServer/GeneralServerFeature.cpp
index c410c4d5d67..8fe2a9e5d76 100644
--- a/arangod/GeneralServer/GeneralServerFeature.cpp
+++ b/arangod/GeneralServer/GeneralServerFeature.cpp
@@ -169,8 +169,6 @@ GeneralServerFeature::GeneralServerFeature(Server& server)
arangodb_http2_connections_total{})),
_vstConnections(server.getFeature<metrics::MetricsFeature>().add(
arangodb_vst_connections_total{})) {
- static_assert(
- Server::isCreatedAfter<GeneralServerFeature, metrics::MetricsFeature>());
setOptional(true);
startsAfter<application_features::AqlFeaturePhase>();
diff --git a/arangod/Network/NetworkFeature.cpp b/arangod/Network/NetworkFeature.cpp
index d58349dc251..9e41598ba92 100644
--- a/arangod/Network/NetworkFeature.cpp
+++ b/arangod/Network/NetworkFeature.cpp
@@ -66,8 +66,6 @@ NetworkFeature::NetworkFeature(Server& server)
: NetworkFeature(server,
network::ConnectionPool::Config{
server.getFeature<metrics::MetricsFeature>()}) {
- static_assert(
- Server::isCreatedAfter<NetworkFeature, metrics::MetricsFeature>());
this->_numIOThreads = 2; // override default
}
diff --git a/arangod/Pregel/PregelFeature.cpp b/arangod/Pregel/PregelFeature.cpp
index a504a22b638..f94d1b1bf9e 100644
--- a/arangod/Pregel/PregelFeature.cpp
+++ b/arangod/Pregel/PregelFeature.cpp
@@ -255,8 +255,6 @@ PregelFeature::PregelFeature(Server& server)
_softShutdownOngoing(false),
_metrics(std::make_shared<PregelMetrics>(
server.getFeature<metrics::MetricsFeature>())) {
- static_assert(
- Server::isCreatedAfter<PregelFeature, metrics::MetricsFeature>());
setOptional(true);
startsAfter<DatabaseFeature>();
startsAfter<application_features::V8FeaturePhase>();
diff --git a/arangod/Replication/ReplicationFeature.cpp b/arangod/Replication/ReplicationFeature.cpp
index 6d60ec7603b..0f789a8cd0e 100644
--- a/arangod/Replication/ReplicationFeature.cpp
+++ b/arangod/Replication/ReplicationFeature.cpp
@@ -97,10 +97,6 @@ ReplicationFeature::ReplicationFeature(Server& server)
_quickKeysLimit(1000000),
_inventoryRequests(server.getFeature<metrics::MetricsFeature>().add(
arangodb_replication_cluster_inventory_requests_total{})) {
- static_assert(
- Server::isCreatedAfter<ReplicationFeature,
- application_features::CommunicationFeaturePhase,
- metrics::MetricsFeature>());
setOptional(true);
startsAfter<BasicFeaturePhaseServer>();
diff --git a/arangod/Replication/ReplicationMetricsFeature.cpp b/arangod/Replication/ReplicationMetricsFeature.cpp
index 4762ed450a2..5c106493ffd 100644
--- a/arangod/Replication/ReplicationMetricsFeature.cpp
+++ b/arangod/Replication/ReplicationMetricsFeature.cpp
@@ -156,8 +156,6 @@ ReplicationMetricsFeature::ReplicationMetricsFeature(Server& server)
arangodb_replication_synchronous_requests_total_time_total{})),
_syncOpsTotal(server.getFeature<metrics::MetricsFeature>().add(
arangodb_replication_synchronous_requests_total_number_total{})) {
- static_assert(Server::isCreatedAfter<ReplicationMetricsFeature,
- metrics::MetricsFeature>());
setOptional(true);
startsAfter<BasicFeaturePhaseServer>();
diff --git a/arangod/RestServer/QueryRegistryFeature.cpp b/arangod/RestServer/QueryRegistryFeature.cpp
index 24918c89494..57df1b017e8 100644
--- a/arangod/RestServer/QueryRegistryFeature.cpp
+++ b/arangod/RestServer/QueryRegistryFeature.cpp
@@ -217,8 +217,6 @@ QueryRegistryFeature::QueryRegistryFeature(Server& server)
_localQueryMemoryLimitReached(
server.getFeature<metrics::MetricsFeature>().add(
arangodb_aql_local_query_memory_limit_reached_total{})) {
- static_assert(
- Server::isCreatedAfter<QueryRegistryFeature, metrics::MetricsFeature>());
setOptional(false);
startsAfter<V8FeaturePhase>();
diff --git a/arangod/Transaction/ManagerFeature.cpp b/arangod/Transaction/ManagerFeature.cpp
index 3aa2c3dbd6f..85becaafe63 100644
--- a/arangod/Transaction/ManagerFeature.cpp
+++ b/arangod/Transaction/ManagerFeature.cpp
@@ -54,8 +54,6 @@ ManagerFeature::ManagerFeature(Server& server)
_streamingIdleTimeout(defaultStreamingIdleTimeout),
_numExpiredTransactions(server.getFeature<metrics::MetricsFeature>().add(
arangodb_transactions_expired_total{})) {
- static_assert(
- Server::isCreatedAfter<ManagerFeature, metrics::MetricsFeature>());
setOptional(false);
startsAfter<BasicFeaturePhaseServer>();
diff --git a/arangod/V8Server/V8DealerFeature.cpp b/arangod/V8Server/V8DealerFeature.cpp
index 0da7b8f36e3..cdaebd17373 100644
--- a/arangod/V8Server/V8DealerFeature.cpp
+++ b/arangod/V8Server/V8DealerFeature.cpp
@@ -151,8 +151,6 @@ V8DealerFeature::V8DealerFeature(Server& server)
arangodb_v8_context_exited_total{})),
_contextsEnterFailures(server.getFeature<metrics::MetricsFeature>().add(
arangodb_v8_context_enter_failures_total{})) {
- static_assert(
- Server::isCreatedAfter<V8DealerFeature, metrics::MetricsFeature>());
setOptional(true);
startsAfter<ClusterFeaturePhase>();
diff --git a/client-tools/Restore/RestoreFeature.cpp b/client-tools/Restore/RestoreFeature.cpp
index e40d5471209..63e7b41646f 100644
--- a/client-tools/Restore/RestoreFeature.cpp
+++ b/client-tools/Restore/RestoreFeature.cpp
@@ -1665,7 +1665,6 @@ RestoreFeature::RestoreFeature(Server& server, int& exitCode)
Logger::RESTORE},
_clientTaskQueue{server, ::processJob},
_exitCode{exitCode} {
- static_assert(Server::isCreatedAfter<RestoreFeature, HttpEndpointProvider>());
setOptional(false);
startsAfter<application_features::BasicFeaturePhaseClient>();
diff --git a/client-tools/Shell/ClientFeature.h b/client-tools/Shell/ClientFeature.h
index 7462cddf973..f70f76cf40a 100644
--- a/client-tools/Shell/ClientFeature.h
+++ b/client-tools/Shell/ClientFeature.h
@@ -61,12 +61,8 @@ class ClientFeature final : public HttpEndpointProvider {
maxNumEndpoints,
connectionTimeout,
requestTimeout} {
- static_assert(Server::template isCreatedAfter<HttpEndpointProvider,
- CommunicationFeaturePhase>());
if (Server::template contains<ShellConsoleFeature>()) {
- static_assert(Server::template isCreatedAfter<HttpEndpointProvider,
- ShellConsoleFeature>());
_console = &server.template getFeature<ShellConsoleFeature>();
}
diff --git a/lib/ApplicationFeatures/ConfigFeature.h b/lib/ApplicationFeatures/ConfigFeature.h
index bbdd537e98e..177d429e839 100644
--- a/lib/ApplicationFeatures/ConfigFeature.h
+++ b/lib/ApplicationFeatures/ConfigFeature.h
@@ -54,8 +54,6 @@ class ConfigFeature final : public application_features::ApplicationFeature {
_file(configFilename),
_progname(progname),
_checkConfiguration(false) {
- static_assert(
- Server::template isCreatedAfter<ConfigFeature, VersionFeature>());
setOptional(false);
startsAfter<LoggerFeature, Server>();
--
2.39.2
