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.

Sign up for GitHub

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

Jump to bottom

[AUTHZ] Displays the columns involved in extracting the aggregation operator #4532

Closed
wants to merge 1 commit into from
Closed

[AUTHZ] Displays the columns involved in extracting the aggregation operator #4532

wants to merge 1 commit into from

Conversation

yikf
Copy link
Contributor

@yikf yikf commented Mar 16, 2023

Why are the changes needed?

This PR aims to display the columns involved in extracting the aggregation operator.

How was this patch tested?

  • Add some test cases that check the changes thoroughly including negative and positive cases if possible

  • Add screenshots for manual tests if appropriate

  • Run test locally before make a pull request

@yikf yikf marked this pull request as draft March 16, 2023 02:38
@yikf
Copy link
Contributor Author

yikf commented Mar 16, 2023

Could you please take a look if you find time, thanks @yaooqinn @bowenliang123

Although the Aggregate involved columns will sink into the Project, is it necessary to display the extracted agg columns to prevent Spark Optimizer Rule changes?

@yikf yikf marked this pull request as ready for review March 16, 2023 02:48
@yaooqinn
Copy link
Member

Make sense to me. Can we also add some tests with having/grouping cases?

@bowenliang123
Copy link
Contributor

bowenliang123 commented Mar 16, 2023 •
edited

I suggest providing relevant tests for evaluation with/without extracting aggregation columns.
Possibly, this extraction won't bring much gain to cover more cases.

@bowenliang123
Copy link
Contributor

As new tests for aggregation pass successfully without extracting columns from Aggregate, I prefer to keep the tests but not the extraction.

@yikf
Copy link
Contributor Author

yikf commented Mar 16, 2023

As new tests for aggregation pass successfully without extracting columns from Aggregate, I prefer to keep the tests but not the extraction.

Do you mean just add test coverage instead of changing the code?

@bowenliang123
Copy link
Contributor

As new tests for aggregation pass successfully without extracting columns from Aggregate, I prefer to keep the tests but not the extraction.

Do you mean just add test coverage instead of changing the code?

Yes, I think so.

@yikf
Copy link
Contributor Author

yikf commented Mar 16, 2023

As new tests for aggregation pass successfully without extracting columns from Aggregate, I prefer to keep the tests but not the extraction.

Do you mean just add test coverage instead of changing the code?

Yes, I think so.

In fact, this PR is not a bug fix, existing logic can also extract agg columns, this is because Spark pushes agg columns down to the project operator, while kyuubi overrides the project operator.

Adding this pr is just an optimization in case the agg column is not pushed down to project after the spark optimizer rule is changed

@bowenliang123
Copy link
Contributor

Well noticed, it's good to add ut for extending coverage in aggregation with and without aggregation columns used in output projections.

yaooqinn
yaooqinn reviewed Mar 16, 2023
View reviewed changes
...spark-authz/src/test/scala/org/apache/kyuubi/plugin/spark/authz/PrivilegesBuilderSuite.scala Outdated
@@ -1645,6 +1645,26 @@ class HiveCatalogPrivilegeBuilderSuite extends PrivilegesBuilderSuite {
val accessType = ranger.AccessType(po, operationType, isInput = false)
assert(accessType === AccessType.CREATE)
}

test("Displays the columns involved in extracting the aggregation operator") {
Copy link
Member

Choose a reason for hiding this comment

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

can we also test the having-clause

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done

Copy link
Member

Choose a reason for hiding this comment

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

KYUUBI #4532:

@yikf yikf force-pushed the agg-authZ branch 2 times, most recently from 83eec61 to 28e6174 Compare March 16, 2023 03:54
yaooqinn
yaooqinn approved these changes Mar 16, 2023
View reviewed changes
Copy link
Member

@yaooqinn yaooqinn left a comment

Choose a reason for hiding this comment

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

LGTM

@codecov-commenter
Copy link

Codecov Report

Merging #4532 (6a3468f) into master (41e9505) will decrease coverage by 0.04%.
The diff coverage is 100.00%.

@@             Coverage Diff              @@
##             master    #4532      +/-   ##
============================================
- Coverage     53.35%   53.32%   -0.04%     
  Complexity       13       13              
============================================
  Files           571      571              
  Lines         31372    31376       +4     
  Branches       4224     4225       +1     
============================================
- Hits          16738    16730       -8     
- Misses        13057    13069      +12     
  Partials       1577     1577
Impacted Files Coverage Δ
.../kyuubi/plugin/spark/authz/PrivilegesBuilder.scala 90.62% <100.00%> (+0.40%) ⬆️

... and 9 files with indirect coverage changes

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

@yikf yikf self-assigned this Mar 16, 2023
@yikf yikf closed this in 709899f Mar 16, 2023
@yikf yikf added this to the v1.7.1 milestone Mar 16, 2023
@yikf
Copy link
Contributor Author

yikf commented Mar 16, 2023

thanks all, merged to master/1.7

yikf added a commit that referenced this pull request Mar 16, 2023
@yikf
[KYUUBI #4532] [AUTHZ] Displays the columns involved in extracting th…
48a1383 
…e aggregation operator

### _Why are the changes needed?_

This PR aims to display the columns involved in extracting the aggregation operator.

### _How was this patch tested?_
- [ ] Add some test cases that check the changes thoroughly including negative and positive cases if possible

- [ ] Add screenshots for manual tests if appropriate

- [ ] [Run test](https://kyuubi.readthedocs.io/en/master/develop_tools/testing.html#running-tests) locally before make a pull request

Closes #4532 from Yikf/agg-authZ.

Closes #4532

6a3468f [Yikf] Displays the columns involved in extracting the aggregation operator

Authored-by: Yikf <yikaifei@apache.org>
Signed-off-by: Yikf <yikaifei@apache.org>
(cherry picked from commit 709899f)
Signed-off-by: Yikf <yikaifei@apache.org>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@yaooqinn yaooqinn yaooqinn approved these changes

Assignees

@yikf yikf

Labels
module:authz module:extensions module:spark
Projects
None yet
Milestone
v1.7.1
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@yikf @yaooqinn @bowenliang123 @codecov-commenter