You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ag...@apache.org on 2021/05/18 11:09:39 UTC
[ignite-3] branch ignite-14389 updated: IGNITE-14389 Fixed code
style
This is an automated email from the ASF dual-hosted git repository.
agura pushed a commit to branch ignite-14389
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
The following commit(s) were added to refs/heads/ignite-14389 by this push:
new 743605b IGNITE-14389 Fixed code style
743605b is described below
commit 743605b79dbadb16f7e434b247eb3b4809c63a93
Author: Andrey Gura <ag...@apache.org>
AuthorDate: Tue May 18 14:09:19 2021 +0300
IGNITE-14389 Fixed code style
---
.../client/ITMetaStorageServiceTest.java | 12 +++++++-
.../internal/metastorage/client/CursorImpl.java | 4 ++-
.../internal/metastorage/client/EntryImpl.java | 2 +-
.../ignite/metastorage/client/Condition.java | 2 +-
.../common/command/WatchRangeKeysCommand.java | 2 +-
.../ignite/internal/metastorage/server/Entry.java | 8 ++---
.../server/SimpleInMemoryKeyValueStorage.java | 36 +++++++++++++++++++---
.../ignite/internal/metastorage/server/Value.java | 28 +++++++++++++++++
.../metastorage/server/ExistenceConditionTest.java | 2 +-
.../server/SimpleInMemoryKeyValueStorageTest.java | 24 ++++++---------
.../internal/table/distributed/TableManager.java | 3 --
11 files changed, 90 insertions(+), 33 deletions(-)
diff --git a/modules/metastorage-client/src/integrationTest/java/org/apache/ignite/internal/metastorage/client/ITMetaStorageServiceTest.java b/modules/metastorage-client/src/integrationTest/java/org/apache/ignite/internal/metastorage/client/ITMetaStorageServiceTest.java
index 03536e2..f86d7d8 100644
--- a/modules/metastorage-client/src/integrationTest/java/org/apache/ignite/internal/metastorage/client/ITMetaStorageServiceTest.java
+++ b/modules/metastorage-client/src/integrationTest/java/org/apache/ignite/internal/metastorage/client/ITMetaStorageServiceTest.java
@@ -34,9 +34,19 @@ import org.apache.ignite.internal.util.Cursor;
import org.apache.ignite.lang.IgniteUuid;
import org.apache.ignite.lang.ByteArray;
import org.apache.ignite.lang.IgniteLogger;
-import org.apache.ignite.metastorage.client.*;
import org.apache.ignite.internal.metastorage.server.KeyValueStorage;
import org.apache.ignite.internal.metastorage.server.raft.MetaStorageCommandListener;
+import org.apache.ignite.metastorage.client.CompactedException;
+import org.apache.ignite.metastorage.client.Condition;
+import org.apache.ignite.metastorage.client.Conditions;
+import org.apache.ignite.metastorage.client.Entry;
+import org.apache.ignite.metastorage.client.EntryEvent;
+import org.apache.ignite.metastorage.client.MetaStorageService;
+import org.apache.ignite.metastorage.client.Operation;
+import org.apache.ignite.metastorage.client.OperationTimeoutException;
+import org.apache.ignite.metastorage.client.Operations;
+import org.apache.ignite.metastorage.client.WatchEvent;
+import org.apache.ignite.metastorage.client.WatchListener;
import org.apache.ignite.network.ClusterLocalConfiguration;
import org.apache.ignite.network.ClusterService;
import org.apache.ignite.network.ClusterServiceFactory;
diff --git a/modules/metastorage-client/src/main/java/org/apache/ignite/internal/metastorage/client/CursorImpl.java b/modules/metastorage-client/src/main/java/org/apache/ignite/internal/metastorage/client/CursorImpl.java
index fb71816..cee0934 100644
--- a/modules/metastorage-client/src/main/java/org/apache/ignite/internal/metastorage/client/CursorImpl.java
+++ b/modules/metastorage-client/src/main/java/org/apache/ignite/internal/metastorage/client/CursorImpl.java
@@ -45,9 +45,11 @@ public class CursorImpl<T> implements Cursor<T> {
/** Meta storage raft group service. */
private final RaftGroupService metaStorageRaftGrpSvc;
+ /** */
private final Iterator<T> it;
- private final Function<Object, T> fn ;
+ /** */
+ private final Function<Object, T> fn;
/**
* @param metaStorageRaftGrpSvc Meta storage raft group service.
diff --git a/modules/metastorage-client/src/main/java/org/apache/ignite/internal/metastorage/client/EntryImpl.java b/modules/metastorage-client/src/main/java/org/apache/ignite/internal/metastorage/client/EntryImpl.java
index 66a5328..c6c1e87 100644
--- a/modules/metastorage-client/src/main/java/org/apache/ignite/internal/metastorage/client/EntryImpl.java
+++ b/modules/metastorage-client/src/main/java/org/apache/ignite/internal/metastorage/client/EntryImpl.java
@@ -91,7 +91,7 @@ public final class EntryImpl implements Entry {
}
/** {@inheritDoc} */
- public boolean equals(Object o) {
+ @Override public boolean equals(Object o) {
if (this == o)
return true;
diff --git a/modules/metastorage-client/src/main/java/org/apache/ignite/metastorage/client/Condition.java b/modules/metastorage-client/src/main/java/org/apache/ignite/metastorage/client/Condition.java
index 42f87cb..2ce73d5 100644
--- a/modules/metastorage-client/src/main/java/org/apache/ignite/metastorage/client/Condition.java
+++ b/modules/metastorage-client/src/main/java/org/apache/ignite/metastorage/client/Condition.java
@@ -309,7 +309,7 @@ public final class Condition {
/**
* Defines an abstract condition with the key which identifies an entry which condition will be applied to.
*/
- private static abstract class AbstractCondition implements InnerCondition {
+ private abstract static class AbstractCondition implements InnerCondition {
/** Entry key. */
private final byte[] key;
diff --git a/modules/metastorage-common/src/main/java/org/apache/ignite/internal/metastorage/common/command/WatchRangeKeysCommand.java b/modules/metastorage-common/src/main/java/org/apache/ignite/internal/metastorage/common/command/WatchRangeKeysCommand.java
index 80e4b46..49839cf 100644
--- a/modules/metastorage-common/src/main/java/org/apache/ignite/internal/metastorage/common/command/WatchRangeKeysCommand.java
+++ b/modules/metastorage-common/src/main/java/org/apache/ignite/internal/metastorage/common/command/WatchRangeKeysCommand.java
@@ -53,7 +53,7 @@ public final class WatchRangeKeysCommand implements WriteCommand {
long revision
) {
this.keyFrom = keyFrom == null ? null : keyFrom.bytes();
- this.keyTo = keyTo == null ? null : keyTo.bytes();
+ this.keyTo = keyTo == null ? null : keyTo.bytes();
this.revision = revision;
}
diff --git a/modules/metastorage-server/src/main/java/org/apache/ignite/internal/metastorage/server/Entry.java b/modules/metastorage-server/src/main/java/org/apache/ignite/internal/metastorage/server/Entry.java
index 22f1aec..48460c7 100644
--- a/modules/metastorage-server/src/main/java/org/apache/ignite/internal/metastorage/server/Entry.java
+++ b/modules/metastorage-server/src/main/java/org/apache/ignite/internal/metastorage/server/Entry.java
@@ -39,7 +39,7 @@ import org.jetbrains.annotations.Nullable;
public class Entry {
/** Entry key. Couldn't be {@code null}. */
@NotNull
- final private byte[] key;
+ private final byte[] key;
/**
* Entry value.
@@ -48,7 +48,7 @@ public class Entry {
* </p>
*/
@Nullable
- final private byte[] val;
+ private final byte[] val;
/**
* Revision number corresponding to this particular entry.
@@ -57,7 +57,7 @@ public class Entry {
* {@code rev > 0} for regular and {@link #tombstone()} entries.
* </p>
*/
- final private long rev;
+ private final long rev;
/**
* Update counter corresponds to this particular entry.
@@ -66,7 +66,7 @@ public class Entry {
* {@code updCntr > 0} for regular and {@link #tombstone()} entries.
* </p>
*/
- final private long updCntr;
+ private final long updCntr;
/**
* Constructor.
diff --git a/modules/metastorage-server/src/main/java/org/apache/ignite/internal/metastorage/server/SimpleInMemoryKeyValueStorage.java b/modules/metastorage-server/src/main/java/org/apache/ignite/internal/metastorage/server/SimpleInMemoryKeyValueStorage.java
index d37f0bb..6595380 100644
--- a/modules/metastorage-server/src/main/java/org/apache/ignite/internal/metastorage/server/SimpleInMemoryKeyValueStorage.java
+++ b/modules/metastorage-server/src/main/java/org/apache/ignite/internal/metastorage/server/SimpleInMemoryKeyValueStorage.java
@@ -297,7 +297,6 @@ public class SimpleInMemoryKeyValueStorage implements KeyValueStorage {
return new WatchCursor(rev, keySet::contains);
}
-
@Override public void compact() {
synchronized (mux) {
NavigableMap<byte[], List<Long>> compactedKeysIdx = new TreeMap<>(CMP);
@@ -336,11 +335,12 @@ public class SimpleInMemoryKeyValueStorage implements KeyValueStorage {
}
}
+ /** */
@NotNull
private Collection<Entry> doGetAll(List<byte[]> keys, long rev) {
assert keys != null : "keys list can't be null.";
assert !keys.isEmpty() : "keys list can't be empty.";
- assert rev > 0 || rev == LATEST_REV: "Revision must be positive.";
+ assert rev > 0 || rev == LATEST_REV : "Revision must be positive.";
Collection<Entry> res = new ArrayList<>(keys.size());
@@ -395,7 +395,7 @@ public class SimpleInMemoryKeyValueStorage implements KeyValueStorage {
private static long maxRevision(List<Long> revs, long upperBoundRev) {
int i = revs.size() - 1;
- for (; i >= 0 ; i--) {
+ for (; i >= 0; i--) {
long rev = revs.get(i);
if (rev <= upperBoundRev)
@@ -420,7 +420,7 @@ public class SimpleInMemoryKeyValueStorage implements KeyValueStorage {
if (lastVal.tombstone())
return Entry.tombstone(key, lastRev, lastVal.updateCounter());
- return new Entry(key, lastVal.bytes() , lastRev, lastVal.updateCounter());
+ return new Entry(key, lastVal.bytes(), lastRev, lastVal.updateCounter());
}
private long doPut(byte[] key, byte[] bytes, long curRev) {
@@ -487,11 +487,13 @@ public class SimpleInMemoryKeyValueStorage implements KeyValueStorage {
}
}
+ /** */
private static long lastRevision(List<Long> revs) {
return revs.get(revs.size() - 1);
}
- private static List<Long> listOf(long val) {
+ /** */
+ private static List<Long> listOf(long val) {
List<Long> res = new ArrayList<>();
res.add(val);
@@ -499,15 +501,30 @@ public class SimpleInMemoryKeyValueStorage implements KeyValueStorage {
return res;
}
+ /** */
private class RangeCursor implements Cursor<Entry> {
+ /** */
private final byte[] keyFrom;
+
+ /** */
private final byte[] keyTo;
+
+ /** */
private final long rev;
+
+ /** */
private final Iterator<Entry> it;
+
+ /** */
private Entry nextRetEntry;
+
+ /** */
private byte[] lastRetKey;
+
+ /** */
private boolean finished;
+ /** */
RangeCursor(byte[] keyFrom, byte[] keyTo, long rev) {
this.keyFrom = keyFrom;
this.keyTo = keyTo;
@@ -613,12 +630,21 @@ public class SimpleInMemoryKeyValueStorage implements KeyValueStorage {
}
}
+ /** */
private class WatchCursor implements Cursor<WatchEvent> {
+ /** */
private final Predicate<byte[]> p;
+
+ /** */
private final Iterator<WatchEvent> it;
+
+ /** */
private long lastRetRev;
+
+ /** */
private long nextRetRev = -1;
+ /** */
WatchCursor(long rev, Predicate<byte[]> p) {
this.p = p;
this.lastRetRev = rev - 1;
diff --git a/modules/metastorage-server/src/main/java/org/apache/ignite/internal/metastorage/server/Value.java b/modules/metastorage-server/src/main/java/org/apache/ignite/internal/metastorage/server/Value.java
index a438fd4..ce79b17 100644
--- a/modules/metastorage-server/src/main/java/org/apache/ignite/internal/metastorage/server/Value.java
+++ b/modules/metastorage-server/src/main/java/org/apache/ignite/internal/metastorage/server/Value.java
@@ -19,25 +19,53 @@ package org.apache.ignite.internal.metastorage.server;
import org.jetbrains.annotations.NotNull;
+/**
+ * Meta storage value with update counter.
+ */
public class Value {
+ /** Tombstone constant. */
public static final byte[] TOMBSTONE = new byte[0];
+ /** Value. */
private final byte[] bytes;
+
+ /** Update counter. */
private final long updCntr;
+ /**
+ * Constructs value.
+ *
+ * @param bytes Value bytes or {@code #TOMBSTONE}.
+ * @param updCntr Update cpunter.
+ */
public Value(@NotNull byte[] bytes, long updCntr) {
this.bytes = bytes;
this.updCntr = updCntr;
}
+ /**
+ * Returns value bytes.
+ *
+ * @return Value bytes.
+ */
public byte[] bytes() {
return bytes;
}
+ /**
+ * Returns update counter.
+ *
+ * @return Update counter.
+ */
public long updateCounter() {
return updCntr;
}
+ /**
+ * Returns {@code true} if value is tombstone.
+ *
+ * @return {@code True} if value is tombstone, otherwise - {@code false}.
+ */
boolean tombstone() {
return bytes == TOMBSTONE;
}
diff --git a/modules/metastorage-server/src/test/java/org/apache/ignite/internal/metastorage/server/ExistenceConditionTest.java b/modules/metastorage-server/src/test/java/org/apache/ignite/internal/metastorage/server/ExistenceConditionTest.java
index 7d58743..ec4a573 100644
--- a/modules/metastorage-server/src/test/java/org/apache/ignite/internal/metastorage/server/ExistenceConditionTest.java
+++ b/modules/metastorage-server/src/test/java/org/apache/ignite/internal/metastorage/server/ExistenceConditionTest.java
@@ -37,7 +37,7 @@ public class ExistenceConditionTest {
private static final byte[] VAL = new byte[] {1};
/** Regular entry. */
- private static final Entry ENTRY = new Entry(KEY, VAL, 1, 1);
+ private static final Entry ENTRY = new Entry(KEY, VAL, 1, 1);
/** Empty entry. */
private static final Entry EMPTY = Entry.empty(KEY);
diff --git a/modules/metastorage-server/src/test/java/org/apache/ignite/internal/metastorage/server/SimpleInMemoryKeyValueStorageTest.java b/modules/metastorage-server/src/test/java/org/apache/ignite/internal/metastorage/server/SimpleInMemoryKeyValueStorageTest.java
index 9fe8ba7..595f40a 100644
--- a/modules/metastorage-server/src/test/java/org/apache/ignite/internal/metastorage/server/SimpleInMemoryKeyValueStorageTest.java
+++ b/modules/metastorage-server/src/test/java/org/apache/ignite/internal/metastorage/server/SimpleInMemoryKeyValueStorageTest.java
@@ -117,7 +117,7 @@ class SimpleInMemoryKeyValueStorageTest {
assertEquals(4, entries.size());
- Map<ByteArray, Entry> map = entries.stream().collect(Collectors.toMap(e -> new ByteArray(e.key()), identity()));
+ Map<ByteArray, Entry> map = entries.stream().collect(Collectors.toMap(e -> new ByteArray(e.key()), identity()));
// Test regular put value.
Entry e1 = map.get(new ByteArray(key1));
@@ -192,7 +192,7 @@ class SimpleInMemoryKeyValueStorageTest {
assertEquals(4, entries.size());
- Map<ByteArray, Entry> map = entries.stream().collect(Collectors.toMap(e -> new ByteArray(e.key()), identity()));
+ Map<ByteArray, Entry> map = entries.stream().collect(Collectors.toMap(e -> new ByteArray(e.key()), identity()));
// Test regular put value.
Entry e1 = map.get(new ByteArray(key1));
@@ -230,7 +230,7 @@ class SimpleInMemoryKeyValueStorageTest {
assertEquals(4, entries.size());
- map = entries.stream().collect(Collectors.toMap(e -> new ByteArray(e.key()), identity()));
+ map = entries.stream().collect(Collectors.toMap(e -> new ByteArray(e.key()), identity()));
// Test regular put value.
e1 = map.get(new ByteArray(key1));
@@ -334,7 +334,7 @@ class SimpleInMemoryKeyValueStorageTest {
assertEquals(4, entries.size());
- Map<ByteArray, Entry> map = entries.stream().collect(Collectors.toMap(e -> new ByteArray(e.key()), identity()));
+ Map<ByteArray, Entry> map = entries.stream().collect(Collectors.toMap(e -> new ByteArray(e.key()), identity()));
// Test regular put value.
Entry e1 = map.get(new ByteArray(key1));
@@ -408,7 +408,7 @@ class SimpleInMemoryKeyValueStorageTest {
assertEquals(3, entries.size());
- Map<ByteArray, Entry> map = entries.stream().collect(Collectors.toMap(e -> new ByteArray(e.key()), identity()));
+ Map<ByteArray, Entry> map = entries.stream().collect(Collectors.toMap(e -> new ByteArray(e.key()), identity()));
// Test regular put value.
Entry e1 = map.get(new ByteArray(key1));
@@ -443,7 +443,7 @@ class SimpleInMemoryKeyValueStorageTest {
assertEquals(4, entries.size());
- map = entries.stream().collect(Collectors.toMap(e -> new ByteArray(e.key()), identity()));
+ map = entries.stream().collect(Collectors.toMap(e -> new ByteArray(e.key()), identity()));
// Test regular put value.
e1 = map.get(new ByteArray(key1));
@@ -627,7 +627,7 @@ class SimpleInMemoryKeyValueStorageTest {
assertEquals(4, entries.size());
- Map<ByteArray, Entry> map = entries.stream().collect(Collectors.toMap(e -> new ByteArray(e.key()), identity()));
+ Map<ByteArray, Entry> map = entries.stream().collect(Collectors.toMap(e -> new ByteArray(e.key()), identity()));
// Test regular put value.
Entry e1 = map.get(new ByteArray(key1));
@@ -702,7 +702,7 @@ class SimpleInMemoryKeyValueStorageTest {
assertEquals(4, entries.size());
- Map<ByteArray, Entry> map = entries.stream().collect(Collectors.toMap(e -> new ByteArray(e.key()), identity()));
+ Map<ByteArray, Entry> map = entries.stream().collect(Collectors.toMap(e -> new ByteArray(e.key()), identity()));
// Test regular put value.
Entry e1 = map.get(new ByteArray(key1));
@@ -713,7 +713,6 @@ class SimpleInMemoryKeyValueStorageTest {
assertFalse(e1.tombstone());
assertFalse(e1.empty());
-
// Test rewritten value.
Entry e2 = map.get(new ByteArray(key2));
@@ -723,7 +722,6 @@ class SimpleInMemoryKeyValueStorageTest {
assertFalse(e2.tombstone());
assertFalse(e2.empty());
-
// Test removed value.
Entry e3 = map.get(new ByteArray(key3));
@@ -745,7 +743,7 @@ class SimpleInMemoryKeyValueStorageTest {
assertEquals(4, entries.size());
- map = entries.stream().collect(Collectors.toMap(e -> new ByteArray(e.key()), identity()));
+ map = entries.stream().collect(Collectors.toMap(e -> new ByteArray(e.key()), identity()));
// Test regular put value.
e1 = map.get(new ByteArray(key1));
@@ -1570,7 +1568,6 @@ class SimpleInMemoryKeyValueStorageTest {
byte[] key3 = k(3);
byte[] val3 = kv(3, 3);
-
assertEquals(0, storage.revision());
assertEquals(0, storage.updateCounter());
@@ -1794,7 +1791,6 @@ class SimpleInMemoryKeyValueStorageTest {
assertFalse(it.hasNext());
}
-
@Test
public void watchCursorForKey() {
byte[] key1 = k(1);
@@ -1805,7 +1801,6 @@ class SimpleInMemoryKeyValueStorageTest {
byte[] val2_1 = kv(2, 21);
byte[] val2_2 = kv(2, 22);
-
assertEquals(0, storage.revision());
assertEquals(0, storage.updateCounter());
@@ -1893,7 +1888,6 @@ class SimpleInMemoryKeyValueStorageTest {
byte[] val3_1 = kv(3, 31);
byte[] val3_2 = kv(3, 32);
-
assertEquals(0, storage.revision());
assertEquals(0, storage.updateCounter());
diff --git a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/TableManager.java b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/TableManager.java
index c2710f8..241c5a2 100644
--- a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/TableManager.java
+++ b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/TableManager.java
@@ -50,10 +50,7 @@ import org.apache.ignite.internal.vault.VaultManager;
import org.apache.ignite.lang.ByteArray;
import org.apache.ignite.lang.IgniteLogger;
import org.apache.ignite.metastorage.client.Conditions;
-import org.apache.ignite.metastorage.client.Key;
import org.apache.ignite.metastorage.client.Operations;
-import org.apache.ignite.metastorage.client.WatchEvent;
-import org.apache.ignite.metastorage.client.WatchListener;
import org.apache.ignite.network.ClusterNode;
import org.apache.ignite.raft.client.service.RaftGroupService;
import org.apache.ignite.table.Table;