You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by as...@apache.org on 2023/08/07 17:14:59 UTC
[ignite-3] branch main updated: IGNITE-15927 Fixed compilation
This is an automated email from the ASF dual-hosted git repository.
ascherbakov pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
The following commit(s) were added to refs/heads/main by this push:
new 194ad21949 IGNITE-15927 Fixed compilation
new 551401872e Merge branch 'main' of https://gitbox.apache.org/repos/asf/ignite-3
194ad21949 is described below
commit 194ad2194932b56196e93e9ddbd30ba3fd1d81d1
Author: Alexey Scherbakov <al...@gmail.com>
AuthorDate: Mon Aug 7 20:12:00 2023 +0300
IGNITE-15927 Fixed compilation
---
.../replicator/PartitionReplicaListener.java | 4 ++--
.../internal/table/impl/DummyInternalTableImpl.java | 18 +-----------------
2 files changed, 3 insertions(+), 19 deletions(-)
diff --git a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/replicator/PartitionReplicaListener.java b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/replicator/PartitionReplicaListener.java
index 5533971e1f..eefaf9b2ab 100644
--- a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/replicator/PartitionReplicaListener.java
+++ b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/replicator/PartitionReplicaListener.java
@@ -141,13 +141,13 @@ import org.apache.ignite.internal.tx.storage.state.TxStateStorage;
import org.apache.ignite.internal.util.ArrayUtils;
import org.apache.ignite.internal.util.Cursor;
import org.apache.ignite.internal.util.CursorUtils;
+import org.apache.ignite.internal.util.ExceptionUtils;
import org.apache.ignite.internal.util.IgniteSpinBusyLock;
import org.apache.ignite.internal.util.IgniteUtils;
import org.apache.ignite.internal.util.Lazy;
import org.apache.ignite.internal.util.PendingComparableValuesTracker;
import org.apache.ignite.lang.ErrorGroups.Replicator;
import org.apache.ignite.lang.IgniteBiTuple;
-import org.apache.ignite.lang.IgniteExceptionUtils;
import org.apache.ignite.lang.IgniteInternalException;
import org.apache.ignite.lang.IgniteUuid;
import org.apache.ignite.network.ClusterNode;
@@ -355,7 +355,7 @@ public class PartitionReplicaListener implements ReplicaListener {
}
if (err != null) {
- IgniteExceptionUtils.sneakyThrow(err);
+ ExceptionUtils.sneakyThrow(err);
}
return rows;
diff --git a/modules/table/src/testFixtures/java/org/apache/ignite/internal/table/impl/DummyInternalTableImpl.java b/modules/table/src/testFixtures/java/org/apache/ignite/internal/table/impl/DummyInternalTableImpl.java
index feb2acbc02..56c41c69e0 100644
--- a/modules/table/src/testFixtures/java/org/apache/ignite/internal/table/impl/DummyInternalTableImpl.java
+++ b/modules/table/src/testFixtures/java/org/apache/ignite/internal/table/impl/DummyInternalTableImpl.java
@@ -124,7 +124,7 @@ public class DummyInternalTableImpl extends InternalTableImpl {
private final ReplicationGroupId groupId;
/** The thread updates safe time on the dummy replica. */
- final private PendingComparableValuesTracker<HybridTimestamp, Void> safeTime;
+ private final PendingComparableValuesTracker<HybridTimestamp, Void> safeTime;
private static final AtomicInteger nextTableId = new AtomicInteger(10_001);
@@ -343,22 +343,6 @@ public class DummyInternalTableImpl extends InternalTableImpl {
);
}
- /**
- * Set a safe timestamp.
- *
- * @param ts Timestamp.
- */
- public void updateSafeTime(HybridTimestamp ts) {
- safeTime.update(ts, null);
- }
-
- /**
- * @return Current safe time,
- */
- public HybridTimestamp getSafeTime() {
- return safeTime.current();
- }
-
/**
* Replica listener.
*