Skip to content

Move nodeids to nosql package parent #2931

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Move nodeids to nosql package parent #2931

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
364de3c
Move `nodeids` to `nosql` package parent
dimas-b Oct 28, 2025
a370348
review: persistence.nosql.nodeids
dimas-b Oct 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .../org/apache/polaris/nodeids/api/Node.java → ...s/persistence/nosql/nodeids/api/Node.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.polaris.nodeids.api;
package org.apache.polaris.persistence.nosql.nodeids.api;

import jakarta.annotation.Nullable;
import java.time.Instant;
Expand Down
2 changes: 1 addition & 1 deletion ...apache/polaris/nodeids/api/NodeLease.java → ...sistence/nosql/nodeids/api/NodeLease.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.polaris.nodeids.api;
package org.apache.polaris.persistence.nosql.nodeids.api;

import jakarta.annotation.Nullable;

Expand Down
2 changes: 1 addition & 1 deletion ...e/polaris/nodeids/api/NodeManagement.java → ...nce/nosql/nodeids/api/NodeManagement.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.polaris.nodeids.api;
package org.apache.polaris.persistence.nosql.nodeids.api;

import jakarta.annotation.Nonnull;
import jakarta.enterprise.context.ApplicationScoped;
Expand Down
2 changes: 1 addition & 1 deletion ...ris/nodeids/api/NodeManagementConfig.java → ...sql/nodeids/api/NodeManagementConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.polaris.nodeids.api;
package org.apache.polaris.persistence.nosql.nodeids.api;

import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
Expand Down
22 changes: 11 additions & 11 deletions ...aris/nodeids/impl/NodeManagementImpl.java → ...osql/nodeids/impl/NodeManagementImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.polaris.nodeids.impl;
package org.apache.polaris.persistence.nosql.nodeids.impl;

import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkState;
Expand Down Expand Up @@ -51,18 +51,18 @@
import org.apache.polaris.ids.api.MonotonicClock;
import org.apache.polaris.ids.spi.IdGeneratorFactory;
import org.apache.polaris.ids.spi.IdGeneratorSource;
import org.apache.polaris.nodeids.api.ImmutableNode;
import org.apache.polaris.nodeids.api.Node;
import org.apache.polaris.nodeids.api.NodeLease;
import org.apache.polaris.nodeids.api.NodeManagement;
import org.apache.polaris.nodeids.api.NodeManagementConfig;
import org.apache.polaris.nodeids.spi.ImmutableBuildableNodeManagementState;
import org.apache.polaris.nodeids.spi.ImmutableNodeState;
import org.apache.polaris.nodeids.spi.NodeState;
import org.apache.polaris.nodeids.spi.NodeStore;
import org.apache.polaris.nodeids.spi.NodeStoreFactory;
import org.apache.polaris.nosql.async.AsyncExec;
import org.apache.polaris.nosql.async.Cancelable;
import org.apache.polaris.persistence.nosql.nodeids.api.ImmutableNode;
import org.apache.polaris.persistence.nosql.nodeids.api.Node;
import org.apache.polaris.persistence.nosql.nodeids.api.NodeLease;
import org.apache.polaris.persistence.nosql.nodeids.api.NodeManagement;
import org.apache.polaris.persistence.nosql.nodeids.api.NodeManagementConfig;
import org.apache.polaris.persistence.nosql.nodeids.spi.ImmutableBuildableNodeManagementState;
import org.apache.polaris.persistence.nosql.nodeids.spi.ImmutableNodeState;
import org.apache.polaris.persistence.nosql.nodeids.spi.NodeState;
import org.apache.polaris.persistence.nosql.nodeids.spi.NodeStore;
import org.apache.polaris.persistence.nosql.nodeids.spi.NodeStoreFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down
4 changes: 2 additions & 2 deletions ...org/apache/polaris/nodeids/impl/Util.java → .../persistence/nosql/nodeids/impl/Util.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.polaris.nodeids.impl;
package org.apache.polaris.persistence.nosql.nodeids.impl;

import com.google.common.annotations.VisibleForTesting;
import java.util.Optional;
import org.apache.polaris.ids.api.IdGeneratorSpec;
import org.apache.polaris.ids.api.ImmutableBuildableIdGeneratorSpec;
import org.apache.polaris.nodeids.spi.NodeManagementState;
import org.apache.polaris.persistence.nosql.nodeids.spi.NodeManagementState;

public final class Util {
private Util() {}
Expand Down
2 changes: 1 addition & 1 deletion ...he/polaris/nodeids/impl/package-info.java → ...ence/nosql/nodeids/impl/package-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@
* under the License.
*/
/** Node management implementation, do not directly use the types in this package. */
package org.apache.polaris.nodeids.impl;
package org.apache.polaris.persistence.nosql.nodeids.impl;
8 changes: 4 additions & 4 deletions .../polaris/nodeids/impl/TestNodeLeases.java → ...ce/nosql/nodeids/impl/TestNodeLeases.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.polaris.nodeids.impl;
package org.apache.polaris.persistence.nosql.nodeids.impl;

import static java.time.temporal.ChronoUnit.MILLIS;
import static java.util.Objects.requireNonNull;
import static org.apache.polaris.nodeids.impl.NodeManagementImpl.RESCHEDULE_AFTER_FAILURE;
import static org.apache.polaris.persistence.nosql.nodeids.impl.NodeManagementImpl.RESCHEDULE_AFTER_FAILURE;
import static org.assertj.core.api.InstanceOfAssertFactories.BOOLEAN;

import jakarta.annotation.Nonnull;
Expand All @@ -29,9 +29,9 @@
import java.util.concurrent.atomic.AtomicBoolean;
import org.apache.polaris.ids.api.IdGeneratorSpec;
import org.apache.polaris.ids.mocks.MutableMonotonicClock;
import org.apache.polaris.nodeids.api.NodeManagementConfig;
import org.apache.polaris.nodeids.spi.NodeState;
import org.apache.polaris.nosql.async.MockAsyncExec;
import org.apache.polaris.persistence.nosql.nodeids.api.NodeManagementConfig;
import org.apache.polaris.persistence.nosql.nodeids.spi.NodeState;
import org.assertj.core.api.SoftAssertions;
import org.assertj.core.api.junit.jupiter.InjectSoftAssertions;
import org.assertj.core.api.junit.jupiter.SoftAssertionsExtension;
Expand Down
14 changes: 7 additions & 7 deletions .../nodeids/impl/TestNodeManagementImpl.java → .../nodeids/impl/TestNodeManagementImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.polaris.nodeids.impl;
package org.apache.polaris.persistence.nosql.nodeids.impl;

import static java.util.Objects.requireNonNull;
import static org.assertj.core.api.InstanceOfAssertFactories.type;
Expand All @@ -34,14 +34,14 @@
import org.apache.polaris.ids.api.SnowflakeIdGenerator;
import org.apache.polaris.ids.impl.MonotonicClockImpl;
import org.apache.polaris.ids.mocks.MutableMonotonicClock;
import org.apache.polaris.nodeids.api.NodeLease;
import org.apache.polaris.nodeids.api.NodeManagementConfig;
import org.apache.polaris.nodeids.spi.ImmutableBuildableNodeManagementState;
import org.apache.polaris.nodeids.spi.NodeManagementState;
import org.apache.polaris.nodeids.spi.NodeStore;
import org.apache.polaris.nodeids.spi.NodeStoreFactory;
import org.apache.polaris.nosql.async.AsyncExec;
import org.apache.polaris.nosql.async.java.JavaPoolAsyncExec;
import org.apache.polaris.persistence.nosql.nodeids.api.NodeLease;
import org.apache.polaris.persistence.nosql.nodeids.api.NodeManagementConfig;
import org.apache.polaris.persistence.nosql.nodeids.spi.ImmutableBuildableNodeManagementState;
import org.apache.polaris.persistence.nosql.nodeids.spi.NodeManagementState;
import org.apache.polaris.persistence.nosql.nodeids.spi.NodeStore;
import org.apache.polaris.persistence.nosql.nodeids.spi.NodeStoreFactory;
import org.assertj.core.api.SoftAssertions;
import org.assertj.core.api.junit.jupiter.InjectSoftAssertions;
import org.assertj.core.api.junit.jupiter.SoftAssertionsExtension;
Expand Down
6 changes: 3 additions & 3 deletions ...e/polaris/nodeids/impl/MockNodeStore.java → ...nce/nosql/nodeids/impl/MockNodeStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.polaris.nodeids.impl;
package org.apache.polaris.persistence.nosql.nodeids.impl;

import jakarta.annotation.Nonnull;
import jakarta.annotation.Nullable;
import java.util.Map;
import java.util.Optional;
import java.util.concurrent.ConcurrentHashMap;
import org.apache.polaris.nodeids.spi.NodeState;
import org.apache.polaris.nodeids.spi.NodeStore;
import org.apache.polaris.persistence.nosql.nodeids.spi.NodeState;
import org.apache.polaris.persistence.nosql.nodeids.spi.NodeStore;

public class MockNodeStore implements NodeStore {
private final Map<Integer, NodeState> nodeStates = new ConcurrentHashMap<>();
Expand Down
8 changes: 4 additions & 4 deletions ...is/nodeids/impl/MockNodeStoreFactory.java → ...ql/nodeids/impl/MockNodeStoreFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.polaris.nodeids.impl;
package org.apache.polaris.persistence.nosql.nodeids.impl;

import jakarta.annotation.Nonnull;
import java.util.Optional;
import java.util.concurrent.atomic.AtomicReference;
import org.apache.polaris.ids.api.IdGenerator;
import org.apache.polaris.nodeids.spi.NodeManagementState;
import org.apache.polaris.nodeids.spi.NodeStore;
import org.apache.polaris.nodeids.spi.NodeStoreFactory;
import org.apache.polaris.persistence.nosql.nodeids.spi.NodeManagementState;
import org.apache.polaris.persistence.nosql.nodeids.spi.NodeStore;
import org.apache.polaris.persistence.nosql.nodeids.spi.NodeStoreFactory;

public class MockNodeStoreFactory implements NodeStoreFactory {
private final AtomicReference<NodeManagementState> nodeState = new AtomicReference<>();
Expand Down
2 changes: 1 addition & 1 deletion ...aris/nodeids/spi/NodeManagementState.java → ...osql/nodeids/spi/NodeManagementState.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.polaris.nodeids.spi;
package org.apache.polaris.persistence.nosql.nodeids.spi;

import java.util.Optional;
import org.apache.polaris.ids.api.IdGeneratorSpec;
Expand Down
2 changes: 1 addition & 1 deletion ...apache/polaris/nodeids/spi/NodeState.java → ...sistence/nosql/nodeids/spi/NodeState.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.polaris.nodeids.spi;
package org.apache.polaris.persistence.nosql.nodeids.spi;

import java.time.Instant;
import org.apache.polaris.immutables.PolarisImmutable;
Expand Down
2 changes: 1 addition & 1 deletion ...apache/polaris/nodeids/spi/NodeStore.java → ...sistence/nosql/nodeids/spi/NodeStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.polaris.nodeids.spi;
package org.apache.polaris.persistence.nosql.nodeids.spi;

import jakarta.annotation.Nonnull;
import jakarta.annotation.Nullable;
Expand Down
2 changes: 1 addition & 1 deletion ...polaris/nodeids/spi/NodeStoreFactory.java → ...e/nosql/nodeids/spi/NodeStoreFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.polaris.nodeids.spi;
package org.apache.polaris.persistence.nosql.nodeids.spi;

import jakarta.annotation.Nonnull;
import java.util.Optional;
Expand Down
Loading