You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@nifi.apache.org by GitBox <gi...@apache.org> on 2021/10/06 14:51:45 UTC
[GitHub] [nifi-minifi-cpp] szaszm commented on a change in pull request #1188: MINIFICPP-1651: Added DefragTextFlowFiles processor
szaszm commented on a change in pull request #1188:
URL: https://github.com/apache/nifi-minifi-cpp/pull/1188#discussion_r723156567
##########
File path: extensions/standard-processors/processors/DefragTextFlowFiles.cpp
##########
@@ -0,0 +1,336 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "DefragTextFlowFiles.h"
+
+#include <vector>
+
+#include "core/Resource.h"
+#include "serialization/PayloadSerializer.h"
+#include "utils/TextFragmentUtils.h"
+
+
+namespace org::apache::nifi::minifi::processors {
+
+core::Relationship DefragTextFlowFiles::Success("success", "Flowfiles that have no fragmented messages in them");
+core::Relationship DefragTextFlowFiles::Original("original", "The FlowFiles that were used to create the defragmented flowfiles");
Review comment:
Is there any difference between using this and cloning the flow files at the source(s) by starting two connections from the source relationship(s)?
##########
File path: libminifi/include/utils/FlowFileStore.h
##########
@@ -0,0 +1,51 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#pragma once
+
+#include <memory>
+#include <unordered_set>
+#include <utility>
+
+#include "core/FlowFile.h"
+namespace org::apache::nifi::minifi::utils {
+
+class FlowFileStore {
+ public:
+ std::unordered_set<std::shared_ptr<core::FlowFile>> getNewFlowFiles() {
+ bool hasNewFlowFiles = true;
+ if (!has_new_flow_file_.compare_exchange_strong(hasNewFlowFiles, false, std::memory_order_acquire, std::memory_order_relaxed)) {
+ return {};
+ }
+ std::lock_guard<std::mutex> guard(flow_file_mutex_);
+ return std::move(incoming_files_);
+ }
+
+ void put(const std::shared_ptr<core::FlowFile>& flowFile) {
+ {
+ std::lock_guard<std::mutex> guard(flow_file_mutex_);
+ incoming_files_.emplace(std::move(flowFile));
Review comment:
Why try to move from a const reference? Take by value or just insert a copy.
##########
File path: libminifi/test/ReadFromFlowFileTestProcessor.cpp
##########
@@ -0,0 +1,67 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include "ReadFromFlowFileTestProcessor.h"
+
+#include <string>
+#include <utility>
+#include <vector>
+
+namespace org::apache::nifi::minifi::processors {
+
+const std::string ReadFromFlowFileTestProcessor::OnScheduleLogStr = "ReadFromFlowFileTestProcessor::onSchedule executed";
+const std::string ReadFromFlowFileTestProcessor::OnTriggerLogStr = "ReadFromFlowFileTestProcessor::onTrigger executed";
+const std::string ReadFromFlowFileTestProcessor::OnUnScheduleLogStr = "ReadFromFlowFileTestProcessor::onUnSchedule";
+
+core::Relationship ReadFromFlowFileTestProcessor::Success("success", "success operational on the flow record");
+
+void ReadFromFlowFileTestProcessor::initialize() {
+ setSupportedRelationships({ Success });
+}
+
+void ReadFromFlowFileTestProcessor::onSchedule(core::ProcessContext*, core::ProcessSessionFactory*) {
+ logger_->log_info("%s", OnScheduleLogStr);
+}
+
+namespace {
+struct ReadFlowFileIntoBuffer : public InputStreamCallback {
+ std::vector<uint8_t> buffer_;
+
+ int64_t process(const std::shared_ptr<io::BaseStream> &stream) override {
+ size_t bytes_read = stream->read(buffer_, stream->size());
+ return io::isError(bytes_read) ? -1 : gsl::narrow<int64_t>(bytes_read);
+ }
+};
Review comment:
#1182 proposes to remove similarly trivial callback classes. Take a look if you think there is value in that.
##########
File path: libminifi/include/utils/FlowFileStore.h
##########
@@ -0,0 +1,51 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#pragma once
+
+#include <memory>
+#include <unordered_set>
+#include <utility>
+
+#include "core/FlowFile.h"
+namespace org::apache::nifi::minifi::utils {
+
+class FlowFileStore {
Review comment:
Similarly to TextFragmentUtils, I think this is not a general purpose utility, so it should probably go somewhere else. I think `minifi::core` would be fine, next to `FlowFile`.
##########
File path: extensions/standard-processors/processors/DefragTextFlowFiles.h
##########
@@ -0,0 +1,121 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#pragma once
+
+#include <regex>
+#include <memory>
+#include <string>
+#include <set>
+
+#include "core/Processor.h"
+#include "utils/FlowFileStore.h"
+#include "utils/Enum.h"
+#include "serialization/PayloadSerializer.h"
+
+
+namespace org::apache::nifi::minifi::processors {
+
+class DefragTextFlowFiles : public core::Processor {
+ public:
+ explicit DefragTextFlowFiles(const std::string& name, const utils::Identifier& uuid = {})
+ : Processor(name, uuid) {
+ logger_ = logging::LoggerFactory<DefragTextFlowFiles>::getLogger();
+ }
+ EXTENSIONAPI static core::Relationship Self;
+ EXTENSIONAPI static core::Relationship Success;
+ EXTENSIONAPI static core::Relationship Original;
+ EXTENSIONAPI static core::Relationship Failure;
+
+ EXTENSIONAPI static core::Property Pattern;
+ EXTENSIONAPI static core::Property PatternLoc;
+ EXTENSIONAPI static core::Property MaxBufferAge;
+ EXTENSIONAPI static core::Property MaxBufferSize;
+
+ void initialize() override;
+ void onSchedule(core::ProcessContext* context, core::ProcessSessionFactory* sessionFactory) override;
+ void onTrigger(core::ProcessContext* context, core::ProcessSession* session) override;
+ void restore(const std::shared_ptr<core::FlowFile>& flowFile) override;
+ std::set<std::shared_ptr<core::Connectable>> getOutGoingConnections(const std::string &relationship) const override;
+
+ SMART_ENUM(PatternLocation,
+ (END_OF_MESSAGE, "End of Message"),
+ (START_OF_MESSAGE, "Start of Message")
+ )
+
+ class LastPatternFinder : public InputStreamCallback {
+ public:
+ LastPatternFinder(const std::regex& pattern, PatternLocation pattern_location) : pattern_(pattern), pattern_location_(pattern_location) {}
+ ~LastPatternFinder() override = default;
+ int64_t process(const std::shared_ptr<io::BaseStream>& stream) override;
+
+ bool foundPattern() const { return last_pattern_location.has_value(); }
+ const std::optional<size_t>& getLastPatternPosition() const { return last_pattern_location; }
+
+ protected:
+ void searchContent(const std::string& content);
+ const std::regex& pattern_;
+ PatternLocation pattern_location_;
+ std::optional<size_t> last_pattern_location;
+ };
Review comment:
Does this need to be public? Does it need to be in the header? If not, consider moving it to the .cpp file.
##########
File path: libminifi/test/ReadFromFlowFileTestProcessor.h
##########
@@ -0,0 +1,60 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <string>
+#include <memory>
+
+#include "core/Processor.h"
+#include "core/ProcessSession.h"
+#include "core/Core.h"
+#include "core/Resource.h"
+
+#pragma once
+
+namespace org::apache::nifi::minifi::processors {
+
+class ReadFromFlowFileTestProcessor : public core::Processor {
+ public:
+ static const std::string OnScheduleLogStr;
+ static const std::string OnTriggerLogStr;
+ static const std::string OnUnScheduleLogStr;
+
+ explicit ReadFromFlowFileTestProcessor(const std::string& name, const utils::Identifier& uuid = utils::Identifier())
+ : Processor(name, uuid), logger_(logging::LoggerFactory<ReadFromFlowFileTestProcessor>::getLogger()) {
+ }
+
+ static constexpr char const* ProcessorName = "ReadFromFlowFileTestProcessor";
+ static core::Relationship Success;
+
+ public:
+ void onSchedule(core::ProcessContext *context, core::ProcessSessionFactory *sessionFactory) override;
+ void onTrigger(core::ProcessContext *context, core::ProcessSession *session) override;
+ void initialize() override;
+ void onUnSchedule() override;
+
+ const std::string& getContent() {
+ return content_;
+ }
+
+ private:
+ std::shared_ptr<logging::Logger> logger_;
+ std::string content_;
+};
+
+REGISTER_RESOURCE(ReadFromFlowFileTestProcessor, "ReadFromFlowFileTestProcessor (only for testing purposes)");
Review comment:
Resource registration should be in the implementation file since #1138
##########
File path: libminifi/include/utils/TextFragmentUtils.h
##########
@@ -0,0 +1,34 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#pragma once
+
+#include <string>
+#include "Export.h"
+
+namespace org::apache::nifi::minifi::utils {
+class TextFragmentUtils {
+ public:
+ MINIFIAPI static const char *BASE_NAME_ATTRIBUTE;
+ MINIFIAPI static const char *POST_NAME_ATTRIBUTE;
+ MINIFIAPI static const char *OFFSET_ATTRIBUTE;
Review comment:
Please make these `const`, as nobody should be able to reassign them. Consider making them `inline constexpr` for simplicity.
##########
File path: libminifi/include/utils/TextFragmentUtils.h
##########
@@ -0,0 +1,34 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#pragma once
+
+#include <string>
+#include "Export.h"
+
+namespace org::apache::nifi::minifi::utils {
+class TextFragmentUtils {
Review comment:
This class is specific to two processors, not a general purpose utility. I think it should go in standard-processors. The namespace could maybe be `org::apache::nifi::minifi::processors::utils`?
I also recomment not using a class as a namespace (with only static members). Make a namespace instead, like `org::apache::nifi::minifi::processors::utils::textfragment`.
##########
File path: extensions/standard-processors/processors/DefragTextFlowFiles.h
##########
@@ -0,0 +1,121 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#pragma once
+
+#include <regex>
+#include <memory>
+#include <string>
+#include <set>
+
+#include "core/Processor.h"
+#include "utils/FlowFileStore.h"
+#include "utils/Enum.h"
+#include "serialization/PayloadSerializer.h"
+
+
+namespace org::apache::nifi::minifi::processors {
+
+class DefragTextFlowFiles : public core::Processor {
+ public:
+ explicit DefragTextFlowFiles(const std::string& name, const utils::Identifier& uuid = {})
+ : Processor(name, uuid) {
+ logger_ = logging::LoggerFactory<DefragTextFlowFiles>::getLogger();
+ }
+ EXTENSIONAPI static core::Relationship Self;
+ EXTENSIONAPI static core::Relationship Success;
+ EXTENSIONAPI static core::Relationship Original;
+ EXTENSIONAPI static core::Relationship Failure;
+
+ EXTENSIONAPI static core::Property Pattern;
+ EXTENSIONAPI static core::Property PatternLoc;
+ EXTENSIONAPI static core::Property MaxBufferAge;
+ EXTENSIONAPI static core::Property MaxBufferSize;
Review comment:
I think these should be `const`. It would be a disaster if some random code modified these globals.
##########
File path: libminifi/test/ReadFromFlowFileTestProcessor.h
##########
@@ -0,0 +1,60 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <string>
+#include <memory>
+
+#include "core/Processor.h"
+#include "core/ProcessSession.h"
+#include "core/Core.h"
+#include "core/Resource.h"
+
+#pragma once
+
+namespace org::apache::nifi::minifi::processors {
+
+class ReadFromFlowFileTestProcessor : public core::Processor {
+ public:
+ static const std::string OnScheduleLogStr;
+ static const std::string OnTriggerLogStr;
+ static const std::string OnUnScheduleLogStr;
+
+ explicit ReadFromFlowFileTestProcessor(const std::string& name, const utils::Identifier& uuid = utils::Identifier())
+ : Processor(name, uuid), logger_(logging::LoggerFactory<ReadFromFlowFileTestProcessor>::getLogger()) {
Review comment:
Logger headers are not included. Please add `"core/logging/Logger.h"` (for the Logger type) and `"core/logging/LoggerConfiguration.h"` (for `LoggerFactory`).
##########
File path: libminifi/test/ReadFromFlowFileTestProcessor.cpp
##########
@@ -0,0 +1,67 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include "ReadFromFlowFileTestProcessor.h"
+
+#include <string>
+#include <utility>
+#include <vector>
+
+namespace org::apache::nifi::minifi::processors {
+
+const std::string ReadFromFlowFileTestProcessor::OnScheduleLogStr = "ReadFromFlowFileTestProcessor::onSchedule executed";
+const std::string ReadFromFlowFileTestProcessor::OnTriggerLogStr = "ReadFromFlowFileTestProcessor::onTrigger executed";
+const std::string ReadFromFlowFileTestProcessor::OnUnScheduleLogStr = "ReadFromFlowFileTestProcessor::onUnSchedule";
+
+core::Relationship ReadFromFlowFileTestProcessor::Success("success", "success operational on the flow record");
+
+void ReadFromFlowFileTestProcessor::initialize() {
+ setSupportedRelationships({ Success });
+}
+
+void ReadFromFlowFileTestProcessor::onSchedule(core::ProcessContext*, core::ProcessSessionFactory*) {
+ logger_->log_info("%s", OnScheduleLogStr);
+}
+
+namespace {
+struct ReadFlowFileIntoBuffer : public InputStreamCallback {
+ std::vector<uint8_t> buffer_;
+
+ int64_t process(const std::shared_ptr<io::BaseStream> &stream) override {
+ size_t bytes_read = stream->read(buffer_, stream->size());
+ return io::isError(bytes_read) ? -1 : gsl::narrow<int64_t>(bytes_read);
+ }
+};
+}
+
+void ReadFromFlowFileTestProcessor::onTrigger(core::ProcessContext* context, core::ProcessSession* session) {
+ logger_->log_info("%s", OnTriggerLogStr);
Review comment:
Consider adding `gsl_Expects(context && session);` to declare that this function doesn't accept null pointers without breaking the interface. I consider it unsafe to dereference pointers without checking, unless it's guaranteed to not be null.
##########
File path: libminifi/test/WriteToFlowFileTestProcessor.h
##########
@@ -0,0 +1,61 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <string>
+#include <memory>
+#include <utility>
+
+#include "core/Processor.h"
+#include "core/ProcessSession.h"
+#include "core/Core.h"
+#include "core/Resource.h"
+
+#pragma once
+
+namespace org::apache::nifi::minifi::processors {
+
+class WriteToFlowFileTestProcessor : public core::Processor {
Review comment:
My comments on ReadFromFlowFileTestProcessor apply here, too.
##########
File path: libminifi/test/ReadFromFlowFileTestProcessor.h
##########
@@ -0,0 +1,60 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <string>
+#include <memory>
+
+#include "core/Processor.h"
+#include "core/ProcessSession.h"
+#include "core/Core.h"
+#include "core/Resource.h"
+
+#pragma once
+
+namespace org::apache::nifi::minifi::processors {
+
+class ReadFromFlowFileTestProcessor : public core::Processor {
+ public:
+ static const std::string OnScheduleLogStr;
+ static const std::string OnTriggerLogStr;
+ static const std::string OnUnScheduleLogStr;
Review comment:
`const char* const` or `const std::string_view` is enough here IMO. No need for another potentially throwing static initialization.
##########
File path: extensions/standard-processors/processors/DefragTextFlowFiles.h
##########
@@ -0,0 +1,121 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#pragma once
+
+#include <regex>
+#include <memory>
+#include <string>
+#include <set>
+
+#include "core/Processor.h"
+#include "utils/FlowFileStore.h"
+#include "utils/Enum.h"
+#include "serialization/PayloadSerializer.h"
+
+
+namespace org::apache::nifi::minifi::processors {
+
+class DefragTextFlowFiles : public core::Processor {
+ public:
+ explicit DefragTextFlowFiles(const std::string& name, const utils::Identifier& uuid = {})
+ : Processor(name, uuid) {
+ logger_ = logging::LoggerFactory<DefragTextFlowFiles>::getLogger();
Review comment:
Use a default member initializer instead. Also, please add the necessary headers: `"core/logging/Logger.h"` (for `Logger`) and `"core/logging/LoggerConfiguration.h"` (for `LoggerFactory`).
##########
File path: libminifi/test/WriteToFlowFileTestProcessor.cpp
##########
@@ -0,0 +1,74 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "WriteToFlowFileTestProcessor.h"
+
+#include <string>
+#include <vector>
+
+namespace org::apache::nifi::minifi::processors {
+
+const std::string WriteToFlowFileTestProcessor::OnScheduleLogStr = "WriteToFlowFileTestProcessor::onSchedule executed";
+const std::string WriteToFlowFileTestProcessor::OnTriggerLogStr = "WriteToFlowFileTestProcessor::onTrigger executed";
+const std::string WriteToFlowFileTestProcessor::OnUnScheduleLogStr = "WriteToFlowFileTestProcessor::onUnSchedule";
+
+core::Relationship WriteToFlowFileTestProcessor::Success("success", "success operational on the flow record");
+
+
+void WriteToFlowFileTestProcessor::initialize() {
+ setSupportedProperties({});
+ setSupportedRelationships({Success});
+}
+
+void WriteToFlowFileTestProcessor::onSchedule(core::ProcessContext*, core::ProcessSessionFactory*) {
+ logger_->log_info("%s", OnScheduleLogStr);
+}
+
+namespace {
+struct WriteBufferToFlowFile : public OutputStreamCallback {
+ const std::vector<uint8_t> buffer_;
+
+ explicit WriteBufferToFlowFile(const std::string& buffer) : buffer_(buffer.begin(), buffer.end()) {}
Review comment:
There is no need to copy the content to the callback class. Just store a pointer to the original and use that buffer directly. (tip: `gsl::span`)
##########
File path: extensions/standard-processors/processors/DefragTextFlowFiles.cpp
##########
@@ -0,0 +1,336 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "DefragTextFlowFiles.h"
+
+#include <vector>
+
+#include "core/Resource.h"
+#include "serialization/PayloadSerializer.h"
+#include "utils/TextFragmentUtils.h"
+
+
+namespace org::apache::nifi::minifi::processors {
+
+core::Relationship DefragTextFlowFiles::Success("success", "Flowfiles that have no fragmented messages in them");
+core::Relationship DefragTextFlowFiles::Original("original", "The FlowFiles that were used to create the defragmented flowfiles");
+core::Relationship DefragTextFlowFiles::Failure("failure", "Flowfiles that failed the defragmentation process");
+core::Relationship DefragTextFlowFiles::Self("__self__", "Marks the FlowFile to be owned by this processor");
+
+core::Property DefragTextFlowFiles::Pattern(
+ core::PropertyBuilder::createProperty("Pattern")
+ ->withDescription("A regular expression to match at the start or end of messages.")
+ ->withDefaultValue("")->isRequired(true)->build());
+
+core::Property DefragTextFlowFiles::PatternLoc(
+ core::PropertyBuilder::createProperty("Pattern Location")->withDescription("Where to look for the pattern.")
+ ->withAllowableValues(PatternLocation::values())
+ ->withDefaultValue(toString(PatternLocation::START_OF_MESSAGE))->build());
+
+
+core::Property DefragTextFlowFiles::MaxBufferSize(
+ core::PropertyBuilder::createProperty("Max Buffer Size")
+ ->withDescription("The maximum buffer size, if the buffer exceeds this, it will be transferred to failure. Expected format is <size> <data unit>")
+ ->withType(core::StandardValidators::get().DATA_SIZE_VALIDATOR)->build());
+
+core::Property DefragTextFlowFiles::MaxBufferAge(
+ core::PropertyBuilder::createProperty("Max Buffer Age")->
+ withDescription("The maximum age of a buffer after which the buffer will be transferred to failure. Expected format is <duration> <time unit>")->build());
+
+void DefragTextFlowFiles::initialize() {
+ std::lock_guard<std::mutex> defrag_lock(defrag_mutex_);
+
+ setSupportedRelationships({Success, Original, Failure});
+ setSupportedProperties({Pattern, PatternLoc, MaxBufferAge, MaxBufferSize});
+}
+
+void DefragTextFlowFiles::onSchedule(core::ProcessContext* context, core::ProcessSessionFactory*) {
+ std::lock_guard<std::mutex> defrag_lock(defrag_mutex_);
+
+ std::string max_buffer_age_str;
+ if (context->getProperty(MaxBufferAge.getName(), max_buffer_age_str)) {
+ core::TimeUnit unit;
+ uint64_t max_buffer_age;
+ if (core::Property::StringToTime(max_buffer_age_str, max_buffer_age, unit) && core::Property::ConvertTimeUnitToMS(max_buffer_age, unit, max_buffer_age)) {
+ buffer_.setMaxAge(max_buffer_age);
+ logger_->log_trace("The Buffer maximum age is configured to be %d", max_buffer_age);
+ }
+ }
+
+ std::string max_buffer_size_str;
+ if (context->getProperty(MaxBufferSize.getName(), max_buffer_size_str)) {
+ uint64_t max_buffer_size = core::DataSizeValue(max_buffer_size_str).getValue();
+ if (max_buffer_size > 0) {
+ buffer_.setMaxSize(max_buffer_size);
+ logger_->log_trace("The Buffer maximum size is configured to be %d", max_buffer_size);
+ }
+ }
+
+ context->getProperty(PatternLoc.getName(), pattern_location_);
+
+ std::string pattern_str;
+ if (context->getProperty(Pattern.getName(), pattern_str)) {
+ pattern_ = std::regex(pattern_str);
+ logger_->log_trace("The Pattern is configured to be %s", pattern_str);
+ }
+}
+
+int64_t DefragTextFlowFiles::LastPatternFinder::process(const std::shared_ptr<io::BaseStream>& stream) {
+ if (nullptr == stream)
+ return 0;
+ std::vector<uint8_t> buffer;
+ const auto ret = stream->read(buffer, stream->size());
+ if (io::isError(ret))
+ return -1;
+ std::string content(buffer.begin(), buffer.end());
Review comment:
Consider using the string directly as a read destination. You need a resize, but it avoids a copy.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@nifi.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org