You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by ma...@apache.org on 2015/01/07 21:00:29 UTC
[7/8] incubator-nifi git commit: Merge branch 'NIFI-22' into develop
Merge branch 'NIFI-22' into develop
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/b29333b9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/b29333b9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/b29333b9
Branch: refs/heads/develop
Commit: b29333b9b6f04f1f0219c6e3781e1c67b4414be4
Parents: c487458 14cba2a
Author: Mark Payne <ma...@hotmail.com>
Authored: Wed Jan 7 14:33:26 2015 -0500
Committer: Mark Payne <ma...@hotmail.com>
Committed: Wed Jan 7 14:33:26 2015 -0500
----------------------------------------------------------------------
.../language/antlr/AttributeExpressionLexer.g | 5 +-
.../language/antlr/AttributeExpressionParser.g | 8 +-
.../attribute/expression/language/Query.java | 153 +++++++++----------
.../evaluation/functions/IsEmptyEvaluator.java | 43 ++++++
.../functions/ReplaceEmptyEvaluator.java | 50 ++++++
.../evaluation/reduce/CountEvaluator.java | 56 +++++++
.../evaluation/reduce/JoinEvaluator.java | 59 +++++++
.../evaluation/reduce/ReduceEvaluator.java | 23 +++
.../evaluation/selection/MappingEvaluator.java | 61 ++++++++
.../expression/language/TestQuery.java | 65 ++++++++
10 files changed, 439 insertions(+), 84 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/b29333b9/commons/nifi-expression-language/src/test/java/org/apache/nifi/attribute/expression/language/TestQuery.java
----------------------------------------------------------------------