martinzink commented on a change in pull request #1188: URL: https://github.com/apache/nifi-minifi-cpp/pull/1188#discussion_r724140510
########## 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()); + searchContent(content); + + return 0; +} + +void DefragTextFlowFiles::LastPatternFinder::searchContent(const std::string &content) { + auto matches_begin = std::sregex_iterator(content.begin(), content.end(), pattern_); + auto number_of_matches = std::distance(matches_begin, std::sregex_iterator()); + if (number_of_matches > 0) { + auto last_match = matches_begin; + for (int i = 1; i < number_of_matches; ++i) + last_match++; + last_pattern_location = last_match->position(0); + if (pattern_location_ == PatternLocation::END_OF_MESSAGE) + last_pattern_location.value() += last_match->str(0).size(); Review comment: good idea thanks, changed it in https://github.com/apache/nifi-minifi-cpp/pull/1188/commits/5d0ae953496ac5710668b1f299efb8e3d2b63d59 ########## 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(); } Review comment: good idea thanks, changed it in https://github.com/apache/nifi-minifi-cpp/pull/1188/commits/5d0ae953496ac5710668b1f299efb8e3d2b63d59 ########## 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()); + searchContent(content); + + return 0; +} + +void DefragTextFlowFiles::LastPatternFinder::searchContent(const std::string &content) { + auto matches_begin = std::sregex_iterator(content.begin(), content.end(), pattern_); + auto number_of_matches = std::distance(matches_begin, std::sregex_iterator()); + if (number_of_matches > 0) { + auto last_match = matches_begin; + for (int i = 1; i < number_of_matches; ++i) + last_match++; + last_pattern_location = last_match->position(0); + if (pattern_location_ == PatternLocation::END_OF_MESSAGE) + last_pattern_location.value() += last_match->str(0).size(); + } else { + last_pattern_location = std::nullopt; + } +} + + +void DefragTextFlowFiles::onTrigger(core::ProcessContext*, core::ProcessSession* session) { + std::lock_guard<std::mutex> defrag_lock(defrag_mutex_); + auto flowFiles = flow_file_store_.getNewFlowFiles(); + for (auto& file : flowFiles) { + processNextFragment(session, file); + } + std::shared_ptr<core::FlowFile> original_flow_file = session->get(); + processNextFragment(session, original_flow_file); + if (buffer_.maxAgeReached() || buffer_.maxSizeReached()) { + buffer_.flushAndReplace(session, Failure, nullptr); + } +} + +void DefragTextFlowFiles::processNextFragment(core::ProcessSession *session, const std::shared_ptr<core::FlowFile>& next_fragment) { + if (next_fragment) { Review comment: good idea thanks, changed it in https://github.com/apache/nifi-minifi-cpp/pull/1188/commits/5d0ae953496ac5710668b1f299efb8e3d2b63d59 ########## 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()); + searchContent(content); + + return 0; +} + +void DefragTextFlowFiles::LastPatternFinder::searchContent(const std::string &content) { + auto matches_begin = std::sregex_iterator(content.begin(), content.end(), pattern_); + auto number_of_matches = std::distance(matches_begin, std::sregex_iterator()); + if (number_of_matches > 0) { + auto last_match = matches_begin; + for (int i = 1; i < number_of_matches; ++i) + last_match++; Review comment: good idea thanks, changed it in https://github.com/apache/nifi-minifi-cpp/pull/1188/commits/5d0ae953496ac5710668b1f299efb8e3d2b63d59 -- 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: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
