Fix rocky build

apache · Oct 8, 2024 · 2b1465f · 2b1465f
1 parent 85b2110
commit 2b1465f
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 15 deletions.
diff --git a/extension-utils/include/utils/ListingStateManager.h b/extension-utils/include/utils/ListingStateManager.h
@@ -57,9 +57,6 @@ class ListingStateManager {
   void storeState(const ListingState &latest_listing_state);
 
  private:
-  static const std::string LATEST_LISTED_OBJECT_PREFIX;
-  static const std::string LATEST_LISTED_OBJECT_TIMESTAMP;
-
   [[nodiscard]] static uint64_t getLatestListedKeyTimestampInMilliseconds(const std::unordered_map<std::string, std::string> &state);
   [[nodiscard]] static std::unordered_set<std::string> getLatestListedKeys(const std::unordered_map<std::string, std::string> &state);
 

diff --git a/extension-utils/src/utils/ListingStateManager.cpp b/extension-utils/src/utils/ListingStateManager.cpp
@@ -22,8 +22,8 @@
 
 namespace org::apache::nifi::minifi::utils {
 
-const std::string ListingStateManager::LATEST_LISTED_OBJECT_PREFIX = "listed_key.";
-const std::string ListingStateManager::LATEST_LISTED_OBJECT_TIMESTAMP = "listed_timestamp";
+static const std::string LATEST_LISTED_OBJECT_PREFIX = "listed_key.";
+static const std::string LATEST_LISTED_OBJECT_TIMESTAMP = "listed_timestamp";
 
 bool ListingState::wasObjectListedAlready(const ListedObject &object) const {
   return listed_key_timestamp > object.getLastModified() ||

diff --git a/extensions/mqtt/processors/PublishMQTT.h b/extensions/mqtt/processors/PublishMQTT.h
@@ -40,7 +40,8 @@ namespace org::apache::nifi::minifi::processors {
 class PublishMQTT : public processors::AbstractMQTTProcessor {
  public:
   explicit PublishMQTT(std::string_view name, const utils::Identifier& uuid = {})
-      : processors::AbstractMQTTProcessor(name, uuid, std::make_shared<PublishMQTTMetrics>(*this, in_flight_message_counter_)) {
+      : processors::AbstractMQTTProcessor(name, uuid) {
+    metrics_ = gsl::make_not_null(std::make_shared<PublishMQTTMetrics>(*this, in_flight_message_counter_));
   }
 
   EXTENSIONAPI static constexpr const char* Description = "PublishMQTT serializes FlowFile content as an MQTT payload, sending the message to the configured topic and broker.";

diff --git a/extensions/standard-processors/processors/GetFile.h b/extensions/standard-processors/processors/GetFile.h
@@ -84,7 +84,8 @@ class GetFileMetrics : public core::ProcessorMetricsImpl {
 class GetFile : public core::ProcessorImpl {
  public:
   explicit GetFile(std::string_view name, const utils::Identifier& uuid = {})
-      : ProcessorImpl(name, uuid, std::make_shared<GetFileMetrics>(*this)) {
+      : ProcessorImpl(name, uuid) {
+    metrics_ = gsl::make_not_null(std::make_shared<GetFileMetrics>(*this));
   }
   ~GetFile() override = default;
 

diff --git a/utils/include/core/state/Value.h b/utils/include/core/state/Value.h
@@ -70,14 +70,6 @@ class ValueImpl : public Value {
     return type_id;
   }
 
-  static const std::type_index UINT64_TYPE;
-  static const std::type_index INT64_TYPE;
-  static const std::type_index UINT32_TYPE;
-  static const std::type_index INT_TYPE;
-  static const std::type_index BOOL_TYPE;
-  static const std::type_index DOUBLE_TYPE;
-  static const std::type_index STRING_TYPE;
-
  protected:
   template<typename T>
   void setTypeId() {