You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by sz...@apache.org on 2022/12/06 16:54:32 UTC
[nifi-minifi-cpp] branch main updated (a3bf25359 -> b90407d5c)
This is an automated email from the ASF dual-hosted git repository.
szaszm pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git
from a3bf25359 MINIFICPP-1990 Add ProcessSession::remove to Python API
new a2d703b86 MINIFICPP-1986 Upgrade action versions
new b90407d5c MINIFICPP-2005 Use gsl::span instead of std::span
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.github/workflows/ci.yml | 26 +++++++++++++-------------
extensions/rocksdb-repos/FlowFileLoader.cpp | 3 ++-
libminifi/test/unit/SwapTestController.h | 3 ++-
3 files changed, 17 insertions(+), 15 deletions(-)
[nifi-minifi-cpp] 02/02: MINIFICPP-2005 Use gsl::span instead of std::span
Posted by sz...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
szaszm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git
commit b90407d5c3da5882b022f7731ee4352fa26244f8
Author: Adam Debreceni <ad...@apache.org>
AuthorDate: Tue Dec 6 17:21:25 2022 +0100
MINIFICPP-2005 Use gsl::span instead of std::span
Due to a compilation error when using clang/libc++
Closes #1468
Signed-off-by: Marton Szasz <sz...@apache.org>
---
extensions/rocksdb-repos/FlowFileLoader.cpp | 3 ++-
libminifi/test/unit/SwapTestController.h | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/extensions/rocksdb-repos/FlowFileLoader.cpp b/extensions/rocksdb-repos/FlowFileLoader.cpp
index f2a13f7bc..983cae449 100644
--- a/extensions/rocksdb-repos/FlowFileLoader.cpp
+++ b/extensions/rocksdb-repos/FlowFileLoader.cpp
@@ -25,6 +25,7 @@
#include "logging/LoggerConfiguration.h"
#include "FlowFileRecord.h"
+#include "utils/gsl.h"
namespace org::apache::nifi::minifi {
@@ -93,7 +94,7 @@ utils::TaskRescheduleInfo FlowFileLoader::loadImpl(const std::vector<SwappedFlow
}
utils::Identifier container_id;
auto flow_file = FlowFileRecord::DeSerialize(
- std::as_bytes(std::span(serialized_items[idx])), content_repo_, container_id);
+ gsl::make_span(serialized_items[idx]).as_span<const std::byte>(), content_repo_, container_id);
if (!flow_file) {
// corrupted flow file
logger_->log_error("Failed to deserialize flow file \"%s\"", serialized_keys[idx]);
diff --git a/libminifi/test/unit/SwapTestController.h b/libminifi/test/unit/SwapTestController.h
index 002e87d61..954746664 100644
--- a/libminifi/test/unit/SwapTestController.h
+++ b/libminifi/test/unit/SwapTestController.h
@@ -29,6 +29,7 @@
#include "../Utils.h"
#include "../Catch.h"
#include "../unit/ProvenanceTestHelper.h"
+#include "../utils/gsl.h"
namespace org::apache::nifi::minifi::test {
@@ -77,7 +78,7 @@ class SwappingFlowFileTestRepo : public TestFlowRepository, public minifi::SwapM
std::string value;
Get(ff_id.id.to_string().c_str(), value);
minifi::utils::Identifier container_id;
- auto ff = minifi::FlowFileRecord::DeSerialize(std::as_bytes(std::span(value)), content_repo_, container_id);
+ auto ff = minifi::FlowFileRecord::DeSerialize(gsl::make_span(value).as_span<const std::byte>(), content_repo_, container_id);
ff->setPenaltyExpiration(ff_id.to_be_processed_after);
load_task.result.push_back(std::move(ff));
}
[nifi-minifi-cpp] 01/02: MINIFICPP-1986 Upgrade action versions
Posted by sz...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
szaszm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git
commit a2d703b86e85cd0e48b44f077825971bf479632a
Author: Gabor Gyimesi <ga...@gmail.com>
AuthorDate: Tue Dec 6 17:20:25 2022 +0100
MINIFICPP-1986 Upgrade action versions
Upgrade actions to avoid Node.js 12 deprecation warnings
Closes #1467
Signed-off-by: Marton Szasz <sz...@apache.org>
---
.github/workflows/ci.yml | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3ecbd4aff..809e65b1c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -10,9 +10,9 @@ jobs:
CCACHE_DIR: ${{ GITHUB.WORKSPACE }}/.ccache
steps:
- id: checkout
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
- id: cache
- uses: actions/cache@v2
+ uses: actions/cache@v3
with:
path: ${{ env.CCACHE_DIR }}
key: macos-xcode-ccache-${{github.ref}}-${{github.sha}}
@@ -49,9 +49,9 @@ jobs:
- name: Support longpaths
run: git config --system core.longpaths true
- id: checkout
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
- name: Set up MSBuild
- uses: microsoft/setup-msbuild@v1.0.2
+ uses: microsoft/setup-msbuild@v1.1
- name: Set up Python
uses: actions/setup-python@v4
with:
@@ -81,9 +81,9 @@ jobs:
timeout-minutes: 120
steps:
- id: checkout
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
- id: cache
- uses: actions/cache@v2
+ uses: actions/cache@v3
with:
path: ~/.ccache
key: ubuntu-20.04-ccache-${{github.ref}}-${{github.sha}}
@@ -113,9 +113,9 @@ jobs:
timeout-minutes: 180
steps:
- id: checkout
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
- id: cache
- uses: actions/cache@v2
+ uses: actions/cache@v3
with:
path: ~/.ccache
key: ubuntu-20.04-all-clang-ccache-${{github.ref}}-${{github.sha}}
@@ -156,7 +156,7 @@ jobs:
- id: flake8_check
run: cd build && make flake8
- id: files
- uses: Ana06/get-changed-files@v2.1.0
+ uses: Ana06/get-changed-files@v2.2.0
continue-on-error: true
- name: clang-tidy
run: |
@@ -178,9 +178,9 @@ jobs:
timeout-minutes: 180
steps:
- id: checkout
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
- id: cache
- uses: actions/cache@v2
+ uses: actions/cache@v3
with:
path: ~/.ccache
key: centos-ccache-${{github.ref}}-${{github.sha}}
@@ -208,9 +208,9 @@ jobs:
timeout-minutes: 180
steps:
- id: checkout
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
- id: cache
- uses: actions/cache@v2
+ uses: actions/cache@v3
with:
path: ~/.ccache
key: docker-ccache-${{github.ref}}-${{github.sha}}