[GitHub] flink pull request #4318: [FLINK-7170] [cep] Fix until condition when the co...

2017-07-25 Thread asfgit
Github user asfgit closed the pull request at:

https://github.com/apache/flink/pull/4318


---
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 infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---


[GitHub] flink pull request #4318: [FLINK-7170] [cep] Fix until condition when the co...

2017-07-25 Thread dawidwys
Github user dawidwys commented on a diff in the pull request:

https://github.com/apache/flink/pull/4318#discussion_r129289506
  
--- Diff: 
flink-libraries/flink-cep/src/main/java/org/apache/flink/cep/nfa/compiler/NFACompiler.java
 ---
@@ -697,15 +701,19 @@ private boolean isPatternOptional(Pattern 
pattern) {
 *
 * @param condition the condition to extend
 * @param untilCondition the until condition to join with the 
given condition
+* @param isTakeCondition whether the {@code condition} is for 
{@code TAKE} edge
 * @return condition with AND applied or the original condition
 */
private IterativeCondition extendWithUntilCondition(
IterativeCondition condition,
-   IterativeCondition untilCondition) {
+   IterativeCondition untilCondition,
+   boolean isTakeCondition) {
if (untilCondition != null && condition != null) {
return new AndCondition<>(new 
NotCondition<>(untilCondition), condition);
} else if (untilCondition != null) {
-   return new NotCondition<>(untilCondition);
+   if (isTakeCondition) {
--- End diff --

This condition could be added to `else if`.


---
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 infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---


[GitHub] flink pull request #4318: [FLINK-7170] [cep] Fix until condition when the co...

2017-07-13 Thread dianfu
GitHub user dianfu opened a pull request:

https://github.com/apache/flink/pull/4318

[FLINK-7170] [cep] Fix until condition when the contiguity is strict

Thanks for contributing to Apache Flink. Before you open your pull request, 
please take the following check list into consideration.
If your changes take all of the items into account, feel free to open your 
pull request. For more information and/or questions please refer to the [How To 
Contribute guide](http://flink.apache.org/how-to-contribute.html).
In addition to going through the list, please provide a meaningful 
description of your changes.

- [ ] General
  - The pull request references the related JIRA issue ("[FLINK-XXX] Jira 
title text")
  - The pull request addresses only one issue
  - Each commit in the PR has a meaningful commit message (including the 
JIRA id)

- [ ] Documentation
  - Documentation has been added for new functionality
  - Old documentation affected by the pull request has been updated
  - JavaDoc for public methods has been added

- [ ] Tests & Build
  - Functionality added by the pull request is covered by tests
  - `mvn clean verify` has been executed successfully locally or a Travis 
build has passed


You can merge this pull request into a Git repository by running:

$ git pull https://github.com/dianfu/flink fix-until-condition

Alternatively you can review and apply these changes as the patch at:

https://github.com/apache/flink/pull/4318.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

This closes #4318


commit 605311b8db8669ab1086eebc953892f90eb27ffa
Author: Dian Fu 
Date:   2017-07-13T09:21:30Z

[FLINK-7170] [cep] Fix until condition when the contiguity is strict




---
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 infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---