Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix merge conflict on function name #664

Merged
merged 1 commit into from
Jun 28, 2022
Merged

Fix merge conflict on function name #664

merged 1 commit into from
Jun 28, 2022

Conversation

seankao-az
Copy link
Collaborator

@seankao-az seankao-az commented Jun 28, 2022

Description

This PR is to fix a conflict that should've been solved before merging #646 .

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

Signed-off-by: Sean Kao <seankao@amazon.com>
@codecov-commenter
Copy link

codecov-commenter commented Jun 28, 2022

Codecov Report

Merging #664 (7960428) into main (9e2a9ff) will increase coverage by 31.92%.
The diff coverage is n/a.

@@              Coverage Diff              @@
##               main     #664       +/-   ##
=============================================
+ Coverage     62.76%   94.69%   +31.92%     
- Complexity        0     2816     +2816     
=============================================
  Files            10      281      +271     
  Lines           658     7592     +6934     
  Branches        119      558      +439     
=============================================
+ Hits            413     7189     +6776     
- Misses          192      349      +157     
- Partials         53       54        +1     
Flag Coverage Δ
query-workbench 62.76% <ø> (ø)
sql-engine 97.72% <ø> (?)

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
...earch/response/agg/CompositeAggregationParser.java 100.00% <0.00%> (ø)
...ript/aggregation/dsl/AggregationBuilderHelper.java 100.00% <0.00%> (ø)
.../opensearch/sql/planner/physical/EvalOperator.java 100.00% <0.00%> (ø)
...pensearch/sql/planner/physical/WindowOperator.java 100.00% <0.00%> (ø)
...ql/planner/physical/collector/MetricCollector.java 100.00% <0.00%> (ø)
...rch/sql/opensearch/storage/script/ScriptUtils.java 100.00% <0.00%> (ø)
...g/opensearch/sql/data/model/AbstractExprValue.java 100.00% <0.00%> (ø)
.../org/opensearch/sql/planner/logical/LogicalAD.java 100.00% <0.00%> (ø)
...pensearch/sql/ppl/parser/AstExpressionBuilder.java 100.00% <0.00%> (ø)
...cript/aggregation/ExpressionAggregationScript.java 100.00% <0.00%> (ø)
... and 261 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 9e2a9ff...7960428. Read the comment docs.

@seankao-az seankao-az marked this pull request as ready for review June 28, 2022 20:39
@seankao-az seankao-az requested a review from a team as a code owner June 28, 2022 20:39
Copy link
Member

@joshuali925 joshuali925 left a comment

Choose a reason for hiding this comment

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

LGTM

fixup for 9e2a9ff

@seankao-az seankao-az merged commit 058159d into opensearch-project:main Jun 28, 2022
@seankao-az seankao-az deleted the hotfix-ppl-parse-test branch June 28, 2022 21:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants