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

feat: [cherry-pick]The expression supports filling elements through templates #37058

Merged
merged 1 commit into from
Oct 28, 2024

Conversation

xiaocai2333
Copy link
Contributor

@xiaocai2333 xiaocai2333 commented Oct 22, 2024

issue: #36672

master pr: #37033

milvus-proto pr: milvus-io/milvus-proto#332

@sre-ci-robot sre-ci-robot added area/dependency Pull requests that update a dependency file size/XXL Denotes a PR that changes 1000+ lines. labels Oct 22, 2024
@xiaocai2333 xiaocai2333 changed the title feat: Support template to parse expression feat: [cherry-pick]Support template to parse expression Oct 22, 2024
@mergify mergify bot added the dco-passed DCO check passed. label Oct 22, 2024
Copy link
Contributor

mergify bot commented Oct 22, 2024

@xiaocai2333 Please associate the related pr of master to the body of your Pull Request. (eg. “pr: #”)

@mergify mergify bot added do-not-merge/missing-related-pr kind/feature Issues related to feature request from users and removed do-not-merge/missing-related-pr labels Oct 22, 2024
Copy link
Contributor

mergify bot commented Oct 22, 2024

@xiaocai2333 E2e jenkins job failed, comment /run-cpu-e2e can trigger the job again.

@xiaocai2333 xiaocai2333 changed the title feat: [cherry-pick]Support template to parse expression feat: [cherry-pick]The expression supports filling elements through templates Oct 22, 2024
@zhengbuqian zhengbuqian self-assigned this Oct 23, 2024
@zhengbuqian
Copy link
Collaborator

can you link the proto changes?

internal/parser/planparserv2/Plan.g4 Outdated Show resolved Hide resolved
internal/parser/planparserv2/Plan.g4 Outdated Show resolved Hide resolved
internal/proxy/task_query.go Outdated Show resolved Hide resolved
internal/parser/planparserv2/plan_parser_v2.go Outdated Show resolved Hide resolved
internal/proto/plan.proto Outdated Show resolved Hide resolved
internal/parser/planparserv2/fill_expression_value.go Outdated Show resolved Hide resolved
@xiaocai2333 xiaocai2333 force-pushed the template_expression_parse-4 branch 2 times, most recently from 6dbffba to 3367309 Compare October 25, 2024 09:52
Copy link

codecov bot commented Oct 25, 2024

Codecov Report

Attention: Patch coverage is 77.35294% with 154 lines in your changes missing coverage. Please review.

Project coverage is 80.53%. Comparing base (9d37ade) to head (f33469d).
Report is 3 commits behind head on 2.4.

Files with missing lines Patch % Lines
internal/parser/planparserv2/utils.go 68.07% 52 Missing and 1 partial ⚠️
internal/parser/planparserv2/parser_visitor.go 80.40% 27 Missing and 21 partials ⚠️
...ernal/parser/planparserv2/fill_expression_value.go 80.11% 28 Missing and 8 partials ⚠️
...lanparserv2/convert_field_data_to_generic_value.go 81.03% 8 Missing and 3 partials ⚠️
internal/parser/planparserv2/node_ret.go 62.50% 2 Missing and 1 partial ⚠️
internal/parser/planparserv2/plan_parser_v2.go 76.92% 2 Missing and 1 partial ⚠️
Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##              2.4   #37058      +/-   ##
==========================================
- Coverage   80.58%   80.53%   -0.05%     
==========================================
  Files        1066     1068       +2     
  Lines      165285   165629     +344     
==========================================
+ Hits       133197   133394     +197     
- Misses      27749    27864     +115     
- Partials     4339     4371      +32     
Files with missing lines Coverage Δ
internal/proxy/task.go 87.80% <ø> (ø)
internal/proxy/task_delete.go 92.25% <100.00%> (ø)
internal/proxy/task_query.go 80.69% <100.00%> (ø)
internal/proxy/task_search.go 74.80% <100.00%> (ø)
internal/parser/planparserv2/node_ret.go 75.00% <62.50%> (-5.00%) ⬇️
internal/parser/planparserv2/plan_parser_v2.go 86.73% <76.92%> (-1.17%) ⬇️
...lanparserv2/convert_field_data_to_generic_value.go 81.03% <81.03%> (ø)
...ernal/parser/planparserv2/fill_expression_value.go 80.11% <80.11%> (ø)
internal/parser/planparserv2/parser_visitor.go 85.92% <80.40%> (-2.09%) ⬇️
internal/parser/planparserv2/utils.go 84.60% <68.07%> (-7.68%) ⬇️

... and 25 files with indirect coverage changes

Copy link
Collaborator

@zhengbuqian zhengbuqian left a comment

Choose a reason for hiding this comment

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

thanks! comments are not blocking.

@xiaocai2333 xiaocai2333 force-pushed the template_expression_parse-4 branch from 3367309 to bf87268 Compare October 27, 2024 09:07
@zhengbuqian
Copy link
Collaborator

/lgtm

@xiaocai2333 xiaocai2333 force-pushed the template_expression_parse-4 branch from bf87268 to f33469d Compare October 28, 2024 02:49
@sre-ci-robot sre-ci-robot removed the lgtm label Oct 28, 2024
@mergify mergify bot added the ci-passed label Oct 28, 2024
@zhengbuqian
Copy link
Collaborator

/lgtm

thanks!

@czs007
Copy link
Collaborator

czs007 commented Oct 28, 2024

/approve

@sre-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: czs007, xiaocai2333

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@sre-ci-robot sre-ci-robot merged commit 9c0f594 into milvus-io:2.4 Oct 28, 2024
14 of 15 checks passed
xiaocai2333 added a commit to xiaocai2333/milvus that referenced this pull request Oct 28, 2024
xiaocai2333 added a commit to xiaocai2333/milvus that referenced this pull request Oct 29, 2024
xiaocai2333 added a commit to xiaocai2333/milvus that referenced this pull request Oct 30, 2024
@xiaocai2333 xiaocai2333 deleted the template_expression_parse-4 branch November 8, 2024 03:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved area/dependency Pull requests that update a dependency file ci-passed dco-passed DCO check passed. kind/feature Issues related to feature request from users lgtm size/XXL Denotes a PR that changes 1000+ lines.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants