-
Notifications
You must be signed in to change notification settings - Fork 92
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
MINFICPP-2243 - In ListenHTTP process incoming request only in onTrigger #1826
base: main
Are you sure you want to change the base?
Conversation
52d14ea
to
4e91dbe
Compare
89d9d1a
to
f5af871
Compare
size_t offset_{0}; | ||
std::optional<size_t> size_; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I found these a bit confusing, whose offsets are these. I realized that the network stream, so I'd rename them.
size_t offset_{0}; | |
std::optional<size_t> size_; | |
size_t netstream_offset_{0}; // how much has been read from conn_ | |
std::optional<size_t> netstream_size_limit_; // how much can we read from conn_ |
const auto mg_read_return = mg_read(conn_, out_buffer.data(), std::min(out_buffer.size(), size_.value_or(std::numeric_limits<size_t>::max()) - offset_)); | ||
if (mg_read_return < 0) { | ||
return io::STREAM_ERROR; | ||
} | ||
offset_ += gsl::narrow<size_t>(mg_read_return); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
const auto mg_read_return = mg_read(conn_, out_buffer.data(), std::min(out_buffer.size(), size_.value_or(std::numeric_limits<size_t>::max()) - offset_)); | |
if (mg_read_return < 0) { | |
return io::STREAM_ERROR; | |
} | |
offset_ += gsl::narrow<size_t>(mg_read_return); | |
const auto read_size_limit = netstream_size_limit_.value_or(std::numeric_limits<size_t>::max()) - netstream_offset_; | |
const auto limited_out_buf = out_buffer.subspan(0, std::min(out_buffer.size(), read_size_limit); | |
const auto mg_read_return = mg_read(conn_, limited_out_buf.data(), limited_out_buf.size()); | |
if (mg_read_return < 0) { | |
return io::STREAM_ERROR; | |
} | |
offset_ += gsl::narrow<size_t>(mg_read_return); |
|
||
namespace org::apache::nifi::minifi::processors { | ||
|
||
class ListenHTTP : public core::Processor { | ||
private: | ||
static constexpr std::string_view DEFAULT_BUFFER_SIZE_STR = "20000"; | ||
static constexpr std::string_view DEFAULT_BUFFER_SIZE_STR = "5"; | ||
static const core::Relationship Self; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
static const core::Relationship Self; | |
static constexpr core::RelationshipDefinition Self{"__self__", "Marks the FlowFile to be owned by this processor"}; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I committed this in 4ab6514. Feel free to remove it if you don't like the change.
struct RequestValue { | ||
std::reference_wrapper<core::ProcessSession> session; | ||
std::promise<void> ret; | ||
}; | ||
struct FailureValue { | ||
FailureReason reason; | ||
std::promise<void> ret; | ||
}; | ||
using Request = std::promise<nonstd::expected<RequestValue, FailureValue>>; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why do we have promise in promise here?
Thank you for submitting a contribution to Apache NiFi - MiNiFi C++.
In order to streamline the review of the contribution we ask you
to ensure the following steps have been taken:
For all changes:
Is there a JIRA ticket associated with this PR? Is it referenced
in the commit message?
Does your PR title start with MINIFICPP-XXXX where XXXX is the JIRA number you are trying to resolve? Pay particular attention to the hyphen "-" character.
Has your PR been rebased against the latest commit within the target branch (typically main)?
Is your initial contribution a single, squashed commit?
For code changes:
For documentation related changes:
Note:
Please ensure that once the PR is submitted, you check GitHub Actions CI results for build issues and submit an update to your PR as soon as possible.