-
Notifications
You must be signed in to change notification settings - Fork 157
perf(auth): collapse N+1 in getComputingUnitAccess into one join #5648
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
Merged
Yicong-Huang
merged 8 commits into
apache:main
from
Ma77Ball:perf/computing-unit-access-single-join
Jun 14, 2026
+131
−22
Merged
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
9fd8d7c
added a notification for when users don't follow the appropriate temp…
Ma77Ball 8f2cfbd
changed issues to cover more templates
Ma77Ball 9e0930a
Merge branch 'apache:main' into ci/template-compliance-warning
Ma77Ball 668d1e6
Merge pull request #59 from Ma77Ball/ci/template-compliance-warning
Ma77Ball fb92119
● perf(auth): collapse N+1 in getComputingUnitAccess
Ma77Ball 9e17a98
removed unrelated changes and added test cases
Ma77Ball f8d84c0
Merge branch 'main' into perf/computing-unit-access-single-join
Ma77Ball 08e717e
Merge branch 'main' into perf/computing-unit-access-single-join
Ma77Ball File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
105 changes: 105 additions & 0 deletions
105
common/auth/src/test/scala/org/apache/texera/auth/util/ComputingUnitAccessSpec.scala
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,105 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| package org.apache.texera.auth.util | ||
|
|
||
| import org.apache.texera.dao.MockTexeraDB | ||
| import org.apache.texera.dao.jooq.generated.enums.PrivilegeEnum | ||
| import org.apache.texera.dao.jooq.generated.tables.daos.{ | ||
| ComputingUnitUserAccessDao, | ||
| UserDao, | ||
| WorkflowComputingUnitDao | ||
| } | ||
| import org.apache.texera.dao.jooq.generated.tables.pojos.{ | ||
| ComputingUnitUserAccess, | ||
| User, | ||
| WorkflowComputingUnit | ||
| } | ||
| import org.scalatest.BeforeAndAfterAll | ||
| import org.scalatest.flatspec.AnyFlatSpec | ||
| import org.scalatest.matchers.should.Matchers | ||
|
|
||
| // Exercises getComputingUnitAccess against an embedded Postgres seeded with a | ||
| // computing unit (cuid=100) owned by uid=1, plus a READ grant (uid=2) and a | ||
| // WRITE grant (uid=3). Covers every branch of the single-join resolution: | ||
| // missing unit, owner, explicit grant, and a user with no grant. | ||
| class ComputingUnitAccessSpec | ||
| extends AnyFlatSpec | ||
| with Matchers | ||
| with BeforeAndAfterAll | ||
| with MockTexeraDB { | ||
|
|
||
| private val cuid = 100 | ||
|
|
||
| private def newUser(uid: Int, name: String): User = { | ||
| val u = new User | ||
| u.setUid(uid) | ||
| u.setName(name) | ||
| u.setPassword("password") | ||
| u | ||
| } | ||
|
|
||
| override def beforeAll(): Unit = { | ||
| initializeDBAndReplaceDSLContext() | ||
| val config = getDSLContext.configuration() | ||
|
|
||
| val userDao = new UserDao(config) | ||
| Seq(1 -> "owner", 2 -> "reader", 3 -> "writer", 4 -> "stranger").foreach { | ||
| case (uid, name) => userDao.insert(newUser(uid, name)) | ||
| } | ||
|
|
||
| val unit = new WorkflowComputingUnit | ||
| unit.setUid(1) | ||
| unit.setName("cu") | ||
| unit.setCuid(cuid) | ||
| new WorkflowComputingUnitDao(config).insert(unit) | ||
|
|
||
| val accessDao = new ComputingUnitUserAccessDao(config) | ||
| Seq(2 -> PrivilegeEnum.READ, 3 -> PrivilegeEnum.WRITE).foreach { | ||
| case (uid, privilege) => | ||
| val access = new ComputingUnitUserAccess | ||
| access.setCuid(cuid) | ||
| access.setUid(uid) | ||
| access.setPrivilege(privilege) | ||
| accessDao.insert(access) | ||
| } | ||
| } | ||
|
|
||
| override def afterAll(): Unit = shutdownDB() | ||
|
|
||
| "getComputingUnitAccess" should "return NONE when the computing unit does not exist" in { | ||
| ComputingUnitAccess.getComputingUnitAccess(999, 1) shouldBe PrivilegeEnum.NONE | ||
| } | ||
|
|
||
| it should "return WRITE for the owner regardless of any access row" in { | ||
| ComputingUnitAccess.getComputingUnitAccess(cuid, 1) shouldBe PrivilegeEnum.WRITE | ||
| } | ||
|
|
||
| it should "return the granted READ privilege for a non-owner" in { | ||
| ComputingUnitAccess.getComputingUnitAccess(cuid, 2) shouldBe PrivilegeEnum.READ | ||
| } | ||
|
|
||
| it should "return the granted WRITE privilege for a non-owner" in { | ||
| ComputingUnitAccess.getComputingUnitAccess(cuid, 3) shouldBe PrivilegeEnum.WRITE | ||
| } | ||
|
|
||
| it should "return NONE for a user with no access row on an existing unit" in { | ||
| ComputingUnitAccess.getComputingUnitAccess(cuid, 4) shouldBe PrivilegeEnum.NONE | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.