Skip to content
This repository has been archived by the owner on Aug 2, 2022. It is now read-only.

[PPL] Implemeted full functionality of commands in phase0 #440

Merged
merged 45 commits into from
May 7, 2020
Merged

[PPL] Implemeted full functionality of commands in phase0 #440

merged 45 commits into from
May 7, 2020

Conversation

chloe-zh
Copy link
Member

@chloe-zh chloe-zh commented Apr 24, 2020 •
edited
Loading

Issue #, if available:

Description of changes:

  • The PR [PPL] Create ANTLR parser and implement basic syntax - Phase0 #429 depicted the scope of the commands to support for this phase, but not all commands are having full functionality but only the basic syntax is implemented. Thus this PR implements the rest of the command functionalities.
  • Added unit tests for the commands and the related classes.
  • Improve the testing coverage, set the coverage verification rate limit to 1.0.

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

chloe-zh added 30 commits April 6, 2020 11:25
@chloe-zh
m
8a44cfc
@chloe-zh
Merge branch 'feature/ppl' of github.com:opendistro-for-elasticsearch…
204bb81 
…/sql into ppl-parser
@chloe-zh
Added antlr files
3bfdb28
@chloe-zh
Merge remote-tracking branch 'upstream/feature/ppl' into ppl-parser
c2f63c0
@chloe-zh
Added wildcard
084f380
@chloe-zh
Implemented parser for commands of simple syntax
8c45b24
@chloe-zh
addressed comments
6b542eb
@chloe-zh
Enabled parsing nested fields and arrays in field
46bb1dc
@chloe-zh
Added unit tests for nested fields
80b0629
@chloe-zh
Added Java doc for classes
ddf9c5a
@chloe-zh
Replaced the imported parser with static methods in the parser
17a8503
@chloe-zh
Addressed comments
784df88
@chloe-zh
Addressed comments
c251f03
@chloe-zh
Addressed comments
3a92f11
@chloe-zh
changed LogicalPlan to UnresolvedPlan; added test for index name with…
412f6f0 
… dots; changed the funcName to String in Function expression
@chloe-zh
Merge branch 'feature/ppl' of github.com:opendistro-for-elasticsearch…
5430902 
…/sql into ppl-parser
@chloe-zh
Enabled the rest of comparison operations; modified related tests
ceced2d
@chloe-zh
Added optional arguments in commands
3ae1480
@chloe-zh
Reverted nest
bd56129
@chloe-zh
Removed constant and replaced it with literalValue in antlr parser
9489e41
@chloe-zh
Simplified the accept methods
a898546
@chloe-zh
Update
daf4767
@chloe-zh
Merge branch 'ppl-parser' into parser
384eec6 
# Conflicts:
#	ppl/src/main/java/com/amazon/opendistroforelasticsearch/sql/ppl/node/AbstractNodeVisitor.java
#	ppl/src/main/java/com/amazon/opendistroforelasticsearch/sql/ppl/parser/AstExpressionBuilder.java
#	ppl/src/main/java/com/amazon/opendistroforelasticsearch/sql/ppl/plans/dsl/DSL.java
#	ppl/src/main/java/com/amazon/opendistroforelasticsearch/sql/ppl/plans/logical/Aggregation.java
#	ppl/src/main/java/com/amazon/opendistroforelasticsearch/sql/ppl/plans/logical/Project.java
#	ppl/src/test/java/com/amazon/opendistroforelasticsearch/sql/ppl/parser/AstExpressionBuilderTest.java
@chloe-zh
Added builder pattern
acb1575
@chloe-zh
Rolled back to remove builder
2cc689b
@chloe-zh
update
42609bc
@chloe-zh
Revert "Added builder pattern"
092adbf 
This reverts commit acb1575
@chloe-zh
update
e8c2eff
@chloe-zh
Merge remote-tracking branch 'upstream/feature/ppl' into ppl-parser
0c78efa
@chloe-zh
Merge remote-tracking branch 'upstream/feature/ppl' into parser
bdddc2c 
# Conflicts:
#	ppl/src/main/antlr/OpenDistroPPLParser.g4
#	ppl/src/main/java/com/amazon/opendistroforelasticsearch/sql/ppl/node/AbstractNodeVisitor.java
#	ppl/src/main/java/com/amazon/opendistroforelasticsearch/sql/ppl/parser/AstBuilder.java
#	ppl/src/main/java/com/amazon/opendistroforelasticsearch/sql/ppl/parser/AstExpressionBuilder.java
#	ppl/src/main/java/com/amazon/opendistroforelasticsearch/sql/ppl/plans/dsl/DSL.java
#	ppl/src/main/java/com/amazon/opendistroforelasticsearch/sql/ppl/plans/logical/Aggregation.java
#	ppl/src/main/java/com/amazon/opendistroforelasticsearch/sql/ppl/plans/logical/Filter.java
#	ppl/src/main/java/com/amazon/opendistroforelasticsearch/sql/ppl/plans/logical/Project.java
#	ppl/src/main/java/com/amazon/opendistroforelasticsearch/sql/ppl/plans/logical/Relation.java
#	ppl/src/main/java/com/amazon/opendistroforelasticsearch/sql/ppl/plans/logical/UnresolvedPlan.java
#	ppl/src/test/java/com/amazon/opendistroforelasticsearch/sql/ppl/parser/AstBuilderTest.java
#	ppl/src/test/java/com/amazon/opendistroforelasticsearch/sql/ppl/parser/AstExpressionBuilderTest.java
@chloe-zh chloe-zh self-assigned this Apr 24, 2020
@penghuo
Copy link
Contributor

penghuo commented Apr 27, 2020

Add javadoc.

@chloe-zh chloe-zh marked this pull request as ready for review April 28, 2020 21:53
@chloe-zh chloe-zh requested review from penghuo and dai-chen April 28, 2020 21:54
dai-chen
dai-chen reviewed May 4, 2020
View reviewed changes
...rc/main/java/com/amazon/opendistroforelasticsearch/sql/ast/expression/AggregateFunction.java Outdated Show resolved Hide resolved
ppl/src/test/java/com/amazon/opendistroforelasticsearch/sql/ppl/PPLServiceTest.java Outdated Show resolved Hide resolved
core/src/main/java/com/amazon/opendistroforelasticsearch/sql/ast/expression/AttributeList.java Outdated Show resolved Hide resolved
core/src/main/java/com/amazon/opendistroforelasticsearch/sql/ast/expression/Field.java Outdated Show resolved Hide resolved
core/src/main/java/com/amazon/opendistroforelasticsearch/sql/ast/expression/Field.java Show resolved Hide resolved
...src/main/java/com/amazon/opendistroforelasticsearch/sql/ppl/parser/AstExpressionBuilder.java Outdated Show resolved Hide resolved
core/src/main/java/com/amazon/opendistroforelasticsearch/sql/ast/tree/Relation.java Show resolved Hide resolved
@chloe-zh chloe-zh requested a review from zhongnansu May 4, 2020 20:09
@penghuo
Copy link
Contributor

penghuo commented May 6, 2020

Please exclude exclude setting from core/build.gradle

    afterEvaluate {
        classDirectories.setFrom(files(classDirectories.files.collect {
            fileTree(dir: it,
                    exclude: ['**/ast/**'])
        }))
    }

penghuo
penghuo approved these changes May 6, 2020
View reviewed changes
Copy link
Contributor

@penghuo penghuo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

dai-chen
dai-chen approved these changes May 7, 2020
View reviewed changes
Copy link
Member

@dai-chen dai-chen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Thanks!

@chloe-zh chloe-zh merged commit 242ca1f into opendistro-for-elasticsearch:feature/ppl May 7, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@dai-chen dai-chen dai-chen approved these changes

@penghuo penghuo penghuo approved these changes

@zhongnansu zhongnansu Awaiting requested review from zhongnansu

Assignees

@chloe-zh chloe-zh

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@chloe-zh @penghuo @dai-chen