[incubator-skywalking] branch master updated (a3a85e5 -> 4962cbb)

[wu...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

wusheng pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git.


    from a3a85e5  Support Exporter in core (#2368)
     new 940130e  Added 4 expressions in OAL syntax: >, <, >=, <=
     new 610a537  fixed expressions error.
     new 923e472  Fixed failures with test cases
     new 4962cbb  Merge pull request #2370 from peng-yongsheng/feature/oal_expression

The 4649 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:
 .../apache/skywalking/oal/tool/grammar/OALLexer.g4 |  8 +++-
 .../skywalking/oal/tool/grammar/OALParser.g4       | 24 +++++++++-
 .../skywalking/oal/tool/parser/DeepAnalysis.java   | 20 ++++++++
 .../skywalking/oal/tool/parser/OALListener.java    | 20 ++++++++
 .../code-templates/DispatcherTemplate.ftl          |  6 +++
 .../oal/tool/output/FileGeneratorTest.java         | 18 ++++---
 .../oal/tool/parser/ScriptParserTest.java          | 55 ++++++++++++++++++++++
 .../expectedFiles/ServiceDispatcherExpected.java   |  3 ++
 .../GreaterEqualMatch.java}                        | 20 ++++++--
 .../GreaterMatch.java}                             | 20 ++++++--
 .../LessEqualMatch.java}                           | 20 ++++++--
 .../LessMatch.java}                                | 20 ++++++--
 12 files changed, 208 insertions(+), 26 deletions(-)
 copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/{annotation/IndicatorAnnotationUtils.java => expression/GreaterEqualMatch.java} (69%)
 copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/{annotation/IndicatorAnnotationUtils.java => expression/GreaterMatch.java} (70%)
 copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/{annotation/IndicatorAnnotationUtils.java => expression/LessEqualMatch.java} (69%)
 copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/{annotation/IndicatorAnnotationUtils.java => expression/LessMatch.java} (70%)