arpadboda commented on a change in pull request #917:
URL: https://github.com/apache/nifi-minifi-cpp/pull/917#discussion_r503355047
##########
File path: extensions/libarchive/BinFiles.cpp
##########
@@ -259,9 +279,13 @@ void BinFiles::onTrigger(const
std::shared_ptr<core::ProcessContext> &context, c
}
}
- auto flow = session->get();
+ for (size_t i = 0; i < batchSize_; ++i) {
+ auto flow = session->get();
+
+ if (flow == nullptr) {
+ break;
Review comment:
Wonder if yield should be applied in case 0 FFs were processed
##########
File path: libminifi/include/utils/Enum.h
##########
@@ -0,0 +1,190 @@
+/**
+ * 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 <cstring>
+#include <set>
+
+namespace org {
+namespace apache {
+namespace nifi {
+namespace minifi {
+namespace utils {
+
+#define COMMA(...) ,
+#define MSVC_HACK(x) x
+
+#define PICK_(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14,
_15, ...) _15
+#define COUNT(...) \
+ MSVC_HACK(PICK_(__VA_ARGS__, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1,
0))
+
+#define CONCAT_(a, b) a ## b
+#define CONCAT(a, b) CONCAT_(a, b)
+
+#define CALL(Fn, ...) MSVC_HACK(Fn(__VA_ARGS__))
+#define SPREAD(...) __VA_ARGS__
+
+#define FOR_EACH(fn, delim, ARGS) \
+ CALL(CONCAT(FOR_EACH_, COUNT ARGS), fn, delim, SPREAD ARGS)
+
+#define FOR_EACH_0(...)
+#define FOR_EACH_1(fn, delim, _1) fn(_1)
+#define FOR_EACH_2(fn, delim, _1, _2) fn(_1) delim() fn(_2)
+#define FOR_EACH_3(fn, delim, _1, _2, _3) fn(_1) delim() fn(_2) delim() fn(_3)
+#define FOR_EACH_4(fn, delim, _1, _2, _3, _4) \
+ fn(_1) delim() fn(_2) delim() fn(_3) delim() fn(_4)
+#define FOR_EACH_5(fn, delim, _1, _2, _3, _4, _5) \
+ fn(_1) delim() fn(_2) delim() fn(_3) delim() fn(_4) delim() fn(_5)
+#define FOR_EACH_6(fn, delim, _1, _2, _3, _4, _5, _6) \
+ fn(_1) delim() fn(_2) delim() fn(_3) delim() fn(_4) delim() \
+ fn(_5) delim() fn(_6)
+#define FOR_EACH_7(fn, delim, _1, _2, _3, _4, _5, _6, _7) \
+ fn(_1) delim() fn(_2) delim() fn(_3) delim() fn(_4) delim() \
+ fn(_5) delim() fn(_6) delim() fn(_7)
+#define FOR_EACH_8(fn, delim, _1, _2, _3, _4, _5, _6, _7, _8) \
+ fn(_1) delim() fn(_2) delim() fn(_3) delim() fn(_4) delim() \
+ fn(_5) delim() fn(_6) delim() fn(_7) delim() fn(_8)
+
+#define FIRST_(a, b) a
+#define FIRST(x, ...) FIRST_ x
+#define SECOND_(a, b) b
+#define SECOND(x, ...) SECOND_ x
+#define NOTHING()
+
+#define INCLUDE_BASE_FIELD(x) \
+ x = Base::x
+
+#define SMART_ENUM_BODY(Clazz, ...) \
Review comment:
This smart enum class is nice, but I think some comments in this file
would be useful to tell what is it good for.
The template code is a bit less talkative :)
##########
File path: libminifi/include/utils/Enum.h
##########
@@ -0,0 +1,190 @@
+/**
+ * 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 <cstring>
+#include <set>
+
+namespace org {
+namespace apache {
+namespace nifi {
+namespace minifi {
+namespace utils {
+
+#define COMMA(...) ,
+#define MSVC_HACK(x) x
+
+#define PICK_(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14,
_15, ...) _15
+#define COUNT(...) \
+ MSVC_HACK(PICK_(__VA_ARGS__, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1,
0))
+
+#define CONCAT_(a, b) a ## b
+#define CONCAT(a, b) CONCAT_(a, b)
+
+#define CALL(Fn, ...) MSVC_HACK(Fn(__VA_ARGS__))
+#define SPREAD(...) __VA_ARGS__
+
+#define FOR_EACH(fn, delim, ARGS) \
+ CALL(CONCAT(FOR_EACH_, COUNT ARGS), fn, delim, SPREAD ARGS)
+
+#define FOR_EACH_0(...)
+#define FOR_EACH_1(fn, delim, _1) fn(_1)
+#define FOR_EACH_2(fn, delim, _1, _2) fn(_1) delim() fn(_2)
+#define FOR_EACH_3(fn, delim, _1, _2, _3) fn(_1) delim() fn(_2) delim() fn(_3)
+#define FOR_EACH_4(fn, delim, _1, _2, _3, _4) \
+ fn(_1) delim() fn(_2) delim() fn(_3) delim() fn(_4)
+#define FOR_EACH_5(fn, delim, _1, _2, _3, _4, _5) \
+ fn(_1) delim() fn(_2) delim() fn(_3) delim() fn(_4) delim() fn(_5)
+#define FOR_EACH_6(fn, delim, _1, _2, _3, _4, _5, _6) \
+ fn(_1) delim() fn(_2) delim() fn(_3) delim() fn(_4) delim() \
+ fn(_5) delim() fn(_6)
+#define FOR_EACH_7(fn, delim, _1, _2, _3, _4, _5, _6, _7) \
+ fn(_1) delim() fn(_2) delim() fn(_3) delim() fn(_4) delim() \
+ fn(_5) delim() fn(_6) delim() fn(_7)
+#define FOR_EACH_8(fn, delim, _1, _2, _3, _4, _5, _6, _7, _8) \
Review comment:
I wonder if it can be done in a generic way with variadic arg and using
the first of the variadic part to process and pass the rest to a recursive
call.
##########
File path: libminifi/test/Utils.h
##########
@@ -29,4 +30,11 @@
return std::forward<T>(instance).method(std::forward<Args>(args)...); \
}
-#endif // LIBMINIFI_TEST_UTILS_H_
+std::string repeat(const std::string& str, std::size_t count) {
Review comment:
This belongs to stringultis imho, but also a special case of join.
```
return join("", std::vector<std::string>(count, str));
```
##########
File path: extensions/libarchive/BinFiles.cpp
##########
@@ -38,12 +38,34 @@ namespace nifi {
namespace minifi {
namespace processors {
-core::Property BinFiles::MinSize("Minimum Group Size", "The minimum size of
for the bundle", "0");
-core::Property BinFiles::MaxSize("Maximum Group Size", "The maximum size for
the bundle. If not specified, there is no maximum.", "");
-core::Property BinFiles::MinEntries("Minimum Number of Entries", "The minimum
number of files to include in a bundle", "1");
-core::Property BinFiles::MaxEntries("Maximum Number of Entries", "The maximum
number of files to include in a bundle. If not specified, there is no
maximum.", "");
-core::Property BinFiles::MaxBinAge("Max Bin Age", "The maximum age of a Bin
that will trigger a Bin to be complete. Expected format is <duration> <time
unit>", "");
-core::Property BinFiles::MaxBinCount("Maximum number of Bins", "Specifies the
maximum number of bins that can be held in memory at any one time", "100");
+core::Property BinFiles::MinSize(
+ core::PropertyBuilder::createProperty("Minimum Group Size")
+ ->withDescription("The minimum size of for the bundle")
+ ->withDefaultValue<uint64_t>(0)->build());
+core::Property BinFiles::MaxSize(
+ core::PropertyBuilder::createProperty("Maximum Group Size")
+ ->withDescription("The maximum size for the bundle. If not specified,
there is no maximum.")
+
->withType(core::StandardValidators::get().UNSIGNED_LONG_VALIDATOR)->build());
+core::Property BinFiles::MinEntries(
+ core::PropertyBuilder::createProperty("Minimum Number of Entries")
+ ->withDescription("The minimum number of files to include in a bundle")
+ ->withDefaultValue<uint32_t>(1)->build());
+core::Property BinFiles::MaxEntries(
+ core::PropertyBuilder::createProperty("Maximum Number of Entries")
+ ->withDescription("The maximum number of files to include in a bundle. If
not specified, there is no maximum.")
+
->withType(core::StandardValidators::get().UNSIGNED_INT_VALIDATOR)->build());
+core::Property BinFiles::MaxBinAge(
+ core::PropertyBuilder::createProperty("Max Bin Age")
+ ->withDescription("The maximum age of a Bin that will trigger a Bin to be
complete. Expected format is <duration> <time unit>")
+
->withType(core::StandardValidators::get().TIME_PERIOD_VALIDATOR)->build());
+core::Property BinFiles::MaxBinCount(
+ core::PropertyBuilder::createProperty("Maximum number of Bins")
+ ->withDescription("Specifies the maximum number of bins that can be held
in memory at any one time")
+ ->withDefaultValue<uint32_t>(100)->build());
+core::Property BinFiles::BatchSize(
+ core::PropertyBuilder::createProperty("Batch Size")
+ ->withDescription("Maximum number of FlowFiles processed in a single
session")
+ ->withDefaultValue<uint32_t>(1)->build());
Review comment:
Wonder if this is the best default value...
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
[email protected]
