You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by ad...@apache.org on 2022/11/21 12:04:05 UTC
[nifi-minifi-cpp] branch main updated (8d20c4482 -> 3b8fb0d36)
This is an automated email from the ASF dual-hosted git repository.
adebreceni pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git
from 8d20c4482 MINIFICPP-1989 - Discard old controller serivice provider from FlowController
new aeaef5364 MINIFICPP-1964 Use URL/URL_HASH instead of GIT_REPOSITORY/GIT_TAG in FetchContentDeclare
new 3b8fb0d36 MINIFICPP-1815 - PersistenceTests transiently fails
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:
cmake/Date.cmake | 4 ++--
cmake/KubernetesClientC.cmake | 8 ++++----
extensions/expression-language/CMakeLists.txt | 4 ++--
extensions/expression-language/Parser.yy | 7 +++++--
libminifi/include/core/ThreadedRepository.h | 4 +++-
5 files changed, 16 insertions(+), 11 deletions(-)
[nifi-minifi-cpp] 02/02: MINIFICPP-1815 - PersistenceTests transiently fails
Posted by ad...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
adebreceni pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git
commit 3b8fb0d369926ba38ae9295debb40e9d2bad6c79
Author: Adam Markovics <nu...@gmail.com>
AuthorDate: Mon Nov 21 13:03:09 2022 +0100
MINIFICPP-1815 - PersistenceTests transiently fails
Signed-off-by: Adam Debreceni <ad...@apache.org>
This closes #1455
---
libminifi/include/core/ThreadedRepository.h | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/libminifi/include/core/ThreadedRepository.h b/libminifi/include/core/ThreadedRepository.h
index e03aed9e5..c991e2d57 100644
--- a/libminifi/include/core/ThreadedRepository.h
+++ b/libminifi/include/core/ThreadedRepository.h
@@ -51,8 +51,10 @@ class ThreadedRepository : public core::Repository, public core::TraceableResour
running_state_.store(RunningState::Running);
return true;
}
- getThread() = std::thread(&ThreadedRepository::run, this);
+
+ // must set Running state before calling run(), as run() might check state
running_state_.store(RunningState::Running);
+ getThread() = std::thread(&ThreadedRepository::run, this);
logger_->log_debug("%s ThreadedRepository monitor thread start", name_);
return true;
[nifi-minifi-cpp] 01/02: MINIFICPP-1964 Use URL/URL_HASH instead of GIT_REPOSITORY/GIT_TAG in FetchContentDeclare
Posted by ad...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
adebreceni pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git
commit aeaef536497a4077ea5c003e6272894111a975bc
Author: Martin Zink <ma...@apache.org>
AuthorDate: Mon Nov 21 13:00:59 2022 +0100
MINIFICPP-1964 Use URL/URL_HASH instead of GIT_REPOSITORY/GIT_TAG in FetchContentDeclare
Signed-off-by: Adam Debreceni <ad...@apache.org>
This closes #1454
---
cmake/Date.cmake | 4 ++--
cmake/KubernetesClientC.cmake | 8 ++++----
extensions/expression-language/CMakeLists.txt | 4 ++--
extensions/expression-language/Parser.yy | 7 +++++--
4 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/cmake/Date.cmake b/cmake/Date.cmake
index 2e52f6ee5..696f51ba4 100644
--- a/cmake/Date.cmake
+++ b/cmake/Date.cmake
@@ -46,8 +46,8 @@ if (WIN32)
endif()
FetchContent_Declare(date_src
- GIT_REPOSITORY https://github.com/HowardHinnant/date.git
- GIT_TAG v3.0.1 # adjust tag/branch/commit as needed
+ URL https://github.com/HowardHinnant/date/archive/refs/tags/v3.0.1.tar.gz
+ URL_HASH SHA256=7a390f200f0ccd207e8cff6757e04817c1a0aec3e327b006b7eb451c57ee3538
)
FetchContent_GetProperties(date_src)
if (NOT date_src_POPULATED)
diff --git a/cmake/KubernetesClientC.cmake b/cmake/KubernetesClientC.cmake
index 5da6d3c5e..f97b7a811 100644
--- a/cmake/KubernetesClientC.cmake
+++ b/cmake/KubernetesClientC.cmake
@@ -36,8 +36,8 @@ set(WEBSOCKETS_PATCH_FILE "${CMAKE_SOURCE_DIR}/thirdparty/libwebsockets/fix-incl
set(WEBSOCKETS_PC ${Bash_EXECUTABLE} -c "set -x &&\
(${Patch_EXECUTABLE} -R -p1 -s -f --dry-run -i ${WEBSOCKETS_PATCH_FILE} || ${Patch_EXECUTABLE} -p1 -i ${WEBSOCKETS_PATCH_FILE})")
FetchContent_Declare(websockets
- GIT_REPOSITORY https://github.com/warmcat/libwebsockets.git
- GIT_TAG b0a749c8e7a8294b68581ce4feac0e55045eb00b # v4.3.2
+ URL https://github.com/warmcat/libwebsockets/archive/refs/tags/v4.3.2.tar.gz
+ URL_HASH SHA256=6a85a1bccf25acc7e8e5383e4934c9b32a102880d1e4c37c70b27ae2a42406e1
PATCH_COMMAND "${WEBSOCKETS_PC}"
)
@@ -48,8 +48,8 @@ set(K8S_PATCH_FILE "${CMAKE_SOURCE_DIR}/thirdparty/kubernetes-client-c/remove-fi
set(K8S_PC ${Bash_EXECUTABLE} -c "set -x &&\
(${Patch_EXECUTABLE} -R -p1 -s -f --dry-run -i ${K8S_PATCH_FILE} || ${Patch_EXECUTABLE} -p1 -i ${K8S_PATCH_FILE})")
FetchContent_Declare(kubernetes
- GIT_REPOSITORY https://github.com/kubernetes-client/c
- GIT_TAG f5f12a807432824963bbea380cdf4d9ba412e00e # v0.4.0
+ URL https://github.com/kubernetes-client/c/archive/refs/tags/v0.5.0.tar.gz
+ URL_HASH SHA256=dbb6e6cd29ae2ac6c15de894aefb9b1e3d48916541d443f089aa0ffad6517ec6
PATCH_COMMAND "${K8S_PC}"
)
diff --git a/extensions/expression-language/CMakeLists.txt b/extensions/expression-language/CMakeLists.txt
index 55d1f9a7c..775b4116a 100644
--- a/extensions/expression-language/CMakeLists.txt
+++ b/extensions/expression-language/CMakeLists.txt
@@ -30,8 +30,8 @@ if(WIN32)
FetchContent_Declare(
winflexbison
- GIT_REPOSITORY "https://github.com/lexxmark/winflexbison.git"
- GIT_TAG "a72f3d6b5102b65f064a5054ba634d3d62e94f41"
+ URL "https://github.com/lexxmark/winflexbison/archive/refs/tags/v2.5.25.tar.gz"
+ URL_HASH "SHA256=8e1b71e037b524ba3f576babb0cf59182061df1f19cd86112f085a882560f60b"
)
FetchContent_GetProperties("winflexbison")
diff --git a/extensions/expression-language/Parser.yy b/extensions/expression-language/Parser.yy
index df84ef895..3a1f4d67a 100644
--- a/extensions/expression-language/Parser.yy
+++ b/extensions/expression-language/Parser.yy
@@ -19,7 +19,7 @@
%require "3.0"
%define api.namespace {org::apache::nifi::minifi::expression}
-%parse-param {Driver* driver}
+%parse-param {Driver* driver}
%locations
%define parser_class_name {Parser}
@@ -34,6 +34,9 @@
#include <expression/Expression.h>
#include "location.hh"
+ #if defined(WIN32) && defined(S_FALSE)
+ #undef S_FALSE // winerror.h #defines S_FALSE, which conflicts with the generated token
+ #endif
namespace org {
namespace apache {
@@ -56,7 +59,7 @@
#include <expression/Expression.h>
#include "Driver.h"
-
+
#undef yylex
#define yylex driver->lex
}