Github user dianfu commented on a diff in the pull request:
https://github.com/apache/flink/pull/4296#discussion_r130883414
--- Diff:
flink-libraries/flink-cep/src/main/java/org/apache/flink/cep/nfa/compiler/NFACompiler.java
---
@@ -657,25 +663,34 @@ private boolean isPatternOptional(Pattern<T, ?>
pattern) {
true);
IterativeCondition<T> proceedCondition =
getTrueFunction();
- if (currentPattern.getQuantifier().isGreedy()) {
- proceedCondition =
getGreedyCondition(proceedCondition, Lists.newArrayList(takeCondition));
+ if
(currentPattern.getQuantifier().hasProperty(Quantifier.QuantifierProperty.GREEDY))
{
+ proceedCondition = getGreedyCondition(
+ proceedCondition,
+ takeCondition,
+ ignoreCondition,
+ followingTakeCondition);;
}
final State<T> loopingState =
createState(currentPattern.getName(), State.StateType.Normal,
- currentPattern.getQuantifier().isGreedy());
+
currentPattern.getQuantifier().hasProperty(Quantifier.QuantifierProperty.GREEDY));
loopingState.addProceed(sinkState, proceedCondition);
loopingState.addTake(takeCondition);
addStopStateToLooping(loopingState);
if (ignoreCondition != null) {
final State<T> ignoreState =
createState(currentPattern.getName(), State.StateType.Normal,
-
currentPattern.getQuantifier().isGreedy());
+
currentPattern.getQuantifier().hasProperty(Quantifier.QuantifierProperty.GREEDY));
ignoreState.addTake(loopingState,
takeCondition);
ignoreState.addIgnore(ignoreCondition);
loopingState.addIgnore(ignoreState,
ignoreCondition);
+ if
(currentPattern.getQuantifier().hasProperty(Quantifier.QuantifierProperty.GREEDY))
{
--- End diff --
@dawidwys Good advice. Thanks a lot :). I have updated the PR per the
solution you suggested.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
