Skip to content

Commit 5e35a78

Browse files
authored
Dremio NoSQL tweaks (apache#159)
Adoptions to OSS PRs, no functional changes. * AuthZ modules and packages - the political rename * Adoptions to cleanup made for the OSS PRs ----- * [Dremio/adopt to OSS PR] NoSQL: Add CDI/common+testing + necessary nosql-store implementations Adds common and test-specific CDI functionality. Requires the NoSQL store implementations `:polaris-persistence-nosql-realms-store-nosql` and `:polaris-nodes-store-nosql`. Those modules have cross-project dependencies for test purposes, hence those are all contained in this PR. CDI for Quarkus will be added in a follow-up. * [Dremio/adopt to OSS PR] NoSQL: Add maintenance implementation * NoSQL: authz renames + moves * Nits + style
1 parent 245509a commit 5e35a78

File tree

73 files changed

+350
-373
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+350
-373
lines changed

bom/build.gradle.kts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,16 +49,16 @@ dependencies {
4949
api(project(":polaris-nodes-spi"))
5050
api(project(":polaris-nodes-store-nosql"))
5151

52+
api(project(":polaris-persistence-nosql-authz-api"))
53+
api(project(":polaris-persistence-nosql-authz-impl"))
54+
api(project(":polaris-persistence-nosql-authz-spi"))
55+
api(project(":polaris-persistence-nosql-authz-store-nosql"))
56+
5257
api(project(":polaris-persistence-nosql-realms-api"))
5358
api(project(":polaris-persistence-nosql-realms-impl"))
5459
api(project(":polaris-persistence-nosql-realms-spi"))
5560
api(project(":polaris-persistence-nosql-realms-store-nosql"))
5661

57-
api(project(":polaris-authz-api"))
58-
api(project(":polaris-authz-impl"))
59-
api(project(":polaris-authz-spi"))
60-
api(project(":polaris-authz-store-nosql"))
61-
6262
api(project(":polaris-persistence-nosql-api"))
6363
api(project(":polaris-persistence-nosql-impl"))
6464
api(project(":polaris-persistence-nosql-benchmark"))

gradle/projects.main.properties

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,26 +63,26 @@ polaris-nodes-api=persistence/nosql/nodes/api
6363
polaris-nodes-impl=persistence/nosql/nodes/impl
6464
polaris-nodes-spi=persistence/nosql/nodes/spi
6565
polaris-nodes-store-nosql=persistence/nosql/nodes/store-nosql
66+
# authz
67+
polaris-persistence-nosql-authz-api=persistence/nosql/authz/api
68+
polaris-persistence-nosql-authz-impl=persistence/nosql/authz/impl
69+
polaris-persistence-nosql-authz-spi=persistence/nosql/authz/spi
70+
polaris-persistence-nosql-authz-store-nosql=persistence/nosql/authz/store-nosql
6671
# realms
6772
polaris-persistence-nosql-realms-api=persistence/nosql/realms/api
6873
polaris-persistence-nosql-realms-impl=persistence/nosql/realms/impl
6974
polaris-persistence-nosql-realms-spi=persistence/nosql/realms/spi
7075
polaris-persistence-nosql-realms-store-nosql=persistence/nosql/realms/store-nosql
71-
# authz
72-
polaris-authz-api=persistence/nosql/authz/api
73-
polaris-authz-impl=persistence/nosql/authz/impl
74-
polaris-authz-spi=persistence/nosql/authz/spi
75-
polaris-authz-store-nosql=persistence/nosql/authz/store-nosql
7676
# persistence / database agnostic
7777
polaris-persistence-nosql-api=persistence/nosql/persistence/api
7878
polaris-persistence-nosql-impl=persistence/nosql/persistence/impl
7979
polaris-persistence-nosql-benchmark=persistence/nosql/persistence/benchmark
8080
polaris-persistence-nosql-metastore=persistence/nosql/persistence/metastore
81+
polaris-persistence-nosql-correctness=persistence/nosql/persistence/correctness
8182
polaris-persistence-nosql-cdi-common=persistence/nosql/persistence/cdi/common
8283
polaris-persistence-nosql-cdi-quarkus=persistence/nosql/persistence/cdi/quarkus
8384
polaris-persistence-nosql-cdi-quarkus-distcache=persistence/nosql/persistence/cdi/quarkus-distcache
8485
polaris-persistence-nosql-cdi-weld=persistence/nosql/persistence/cdi/weld
85-
polaris-persistence-nosql-correctness=persistence/nosql/persistence/correctness
8686
polaris-persistence-nosql-standalone=persistence/nosql/persistence/standalone
8787
polaris-persistence-nosql-testextension=persistence/nosql/persistence/testextension
8888
polaris-persistence-nosql-types=persistence/nosql/persistence/types

persistence/nosql/authz/api/src/main/java/org/apache/polaris/authz/api/Acl.java renamed to persistence/nosql/authz/api/src/main/java/org/apache/polaris/persistence/nosql/authz/api/Acl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
* specific language governing permissions and limitations
1717
* under the License.
1818
*/
19-
package org.apache.polaris.authz.api;
19+
package org.apache.polaris.persistence.nosql.authz.api;
2020

2121
import com.google.errorprone.annotations.CanIgnoreReturnValue;
2222
import jakarta.annotation.Nonnull;

persistence/nosql/authz/api/src/main/java/org/apache/polaris/authz/api/AclChain.java renamed to persistence/nosql/authz/api/src/main/java/org/apache/polaris/persistence/nosql/authz/api/AclChain.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
* specific language governing permissions and limitations
1717
* under the License.
1818
*/
19-
package org.apache.polaris.authz.api;
19+
package org.apache.polaris.persistence.nosql.authz.api;
2020

2121
import java.util.Optional;
2222
import org.apache.polaris.immutables.PolarisImmutable;

persistence/nosql/authz/api/src/main/java/org/apache/polaris/authz/api/AclEntry.java renamed to persistence/nosql/authz/api/src/main/java/org/apache/polaris/persistence/nosql/authz/api/AclEntry.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
* specific language governing permissions and limitations
1717
* under the License.
1818
*/
19-
package org.apache.polaris.authz.api;
19+
package org.apache.polaris.persistence.nosql.authz.api;
2020

2121
import com.fasterxml.jackson.annotation.JsonIgnore;
2222
import com.fasterxml.jackson.annotation.JsonInclude;

persistence/nosql/authz/api/src/main/java/org/apache/polaris/authz/api/Constants.java renamed to persistence/nosql/authz/api/src/main/java/org/apache/polaris/persistence/nosql/authz/api/Constants.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
* specific language governing permissions and limitations
1717
* under the License.
1818
*/
19-
package org.apache.polaris.authz.api;
19+
package org.apache.polaris.persistence.nosql.authz.api;
2020

2121
import static java.util.Collections.emptyIterator;
2222

persistence/nosql/authz/api/src/main/java/org/apache/polaris/authz/api/PredefinedRoles.java renamed to persistence/nosql/authz/api/src/main/java/org/apache/polaris/persistence/nosql/authz/api/PredefinedRoles.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
* specific language governing permissions and limitations
1717
* under the License.
1818
*/
19-
package org.apache.polaris.authz.api;
19+
package org.apache.polaris.persistence.nosql.authz.api;
2020

2121
public final class PredefinedRoles {
2222
private PredefinedRoles() {}

persistence/nosql/authz/api/src/main/java/org/apache/polaris/authz/api/Privilege.java renamed to persistence/nosql/authz/api/src/main/java/org/apache/polaris/persistence/nosql/authz/api/Privilege.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
* specific language governing permissions and limitations
1717
* under the License.
1818
*/
19-
package org.apache.polaris.authz.api;
19+
package org.apache.polaris.persistence.nosql.authz.api;
2020

2121
import static com.google.common.base.Preconditions.checkArgument;
2222

persistence/nosql/authz/api/src/main/java/org/apache/polaris/authz/api/PrivilegeCheck.java renamed to persistence/nosql/authz/api/src/main/java/org/apache/polaris/persistence/nosql/authz/api/PrivilegeCheck.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
* specific language governing permissions and limitations
1717
* under the License.
1818
*/
19-
package org.apache.polaris.authz.api;
19+
package org.apache.polaris.persistence.nosql.authz.api;
2020

2121
import jakarta.annotation.Nonnull;
2222

persistence/nosql/authz/api/src/main/java/org/apache/polaris/authz/api/PrivilegeSet.java renamed to persistence/nosql/authz/api/src/main/java/org/apache/polaris/persistence/nosql/authz/api/PrivilegeSet.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
* specific language governing permissions and limitations
1717
* under the License.
1818
*/
19-
package org.apache.polaris.authz.api;
19+
package org.apache.polaris.persistence.nosql.authz.api;
2020

21-
import static org.apache.polaris.authz.api.Constants.EMPTY_PRIVILEGE_SET;
21+
import static org.apache.polaris.persistence.nosql.authz.api.Constants.EMPTY_PRIVILEGE_SET;
2222

2323
import com.google.errorprone.annotations.CanIgnoreReturnValue;
2424
import jakarta.annotation.Nonnull;

0 commit comments

Comments
 (0)