This is an automated email from the ASF dual-hosted git repository.
av pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new b45496c6e1c IGNITE-27956 Messages cleanup #2 (#12817)
b45496c6e1c is described below
commit b45496c6e1cfcb46cce0ba626bf31bd6b4140ff0
Author: Anton Vinogradov <[email protected]>
AuthorDate: Thu Feb 26 20:51:05 2026 +0300
IGNITE-27956 Messages cleanup #2 (#12817)
---
.../internal/managers/communication/IgniteIoTestMessage.java | 4 ++--
.../internal/processors/cache/CacheEntryPredicateAdapter.java | 2 +-
.../ignite/internal/processors/cache/GridCacheEntryInfo.java | 2 +-
.../apache/ignite/internal/processors/cache/GridCacheMessage.java | 2 +-
.../cache/distributed/dht/PartitionUpdateCountersMessage.java | 8 ++++----
.../distributed/dht/preloader/GridDhtPartitionExchangeId.java | 2 +-
.../distributed/dht/preloader/IgniteDhtDemandedPartitionsMap.java | 5 +----
.../distributed/dht/preloader/IgniteDhtPartitionCountersMap.java | 3 ---
.../dht/preloader/IgniteDhtPartitionHistorySuppliersMap.java | 2 +-
.../ignite/internal/processors/cache/query/GridCacheSqlQuery.java | 4 ++--
.../internal/processors/cache/transactions/IgniteTxEntry.java | 8 ++++----
.../processors/cache/version/GridCacheRawVersionedEntry.java | 2 +-
.../query/h2/twostep/messages/GridQueryFailResponse.java | 8 ++++----
.../org/apache/ignite/internal/util/UUIDCollectionMessage.java | 3 ++-
.../tcp/internal/TcpConnectionIndexAwareMessage.java | 2 +-
.../spi/discovery/tcp/messages/TcpDiscoveryAuthFailedMessage.java | 2 +-
.../processors/query/h2/twostep/msg/GridH2CacheObject.java | 2 +-
.../processors/query/h2/twostep/msg/GridH2DmlResponse.java | 2 +-
.../processors/query/h2/twostep/msg/GridH2IndexRangeRequest.java | 2 +-
.../processors/query/h2/twostep/msg/GridH2IndexRangeResponse.java | 2 +-
.../internal/processors/query/h2/twostep/msg/GridH2Null.java | 5 +----
.../processors/query/h2/twostep/msg/GridH2QueryRequest.java | 2 +-
.../internal/processors/query/h2/twostep/msg/GridH2RowRange.java | 2 +-
23 files changed, 34 insertions(+), 42 deletions(-)
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/IgniteIoTestMessage.java
b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/IgniteIoTestMessage.java
index 7773fb3bcbb..30458216918 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/IgniteIoTestMessage.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/IgniteIoTestMessage.java
@@ -32,7 +32,7 @@ import
org.apache.ignite.plugin.extensions.communication.MessageWriter;
@IgniteCodeGeneratingFail
public class IgniteIoTestMessage implements Message {
/** */
- private static byte FLAG_PROC_FROM_NIO = 1;
+ private static final byte FLAG_PROC_FROM_NIO = 1;
/** */
private long id;
@@ -44,7 +44,7 @@ public class IgniteIoTestMessage implements Message {
private boolean req;
/** */
- private byte payload[];
+ private byte[] payload;
/** */
private long reqCreateTs;
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicateAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicateAdapter.java
index 560b52155ba..0eaa1fa7a77 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicateAdapter.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicateAdapter.java
@@ -63,7 +63,7 @@ public class CacheEntryPredicateAdapter implements
CacheEntryPredicate {
/** */
public CacheEntryPredicateAdapter(@Nullable CacheObject val) {
- this.type = PredicateType.VALUE;
+ type = PredicateType.VALUE;
this.val = val;
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryInfo.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryInfo.java
index 18ddc901c9b..2a1da2ea5ad 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryInfo.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryInfo.java
@@ -229,7 +229,7 @@ public class GridCacheEntryInfo implements Message {
if (expireTime == 0)
expireTime = -1;
else {
- expireTime = expireTime - U.currentTimeMillis();
+ expireTime -= U.currentTimeMillis();
if (expireTime < 0)
expireTime = 0;
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMessage.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMessage.java
index be7c6b6f567..9b7e2e4943b 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMessage.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMessage.java
@@ -628,7 +628,7 @@ public abstract class GridCacheMessage implements Message {
Marshaller marsh = ctx.marshaller();
for (byte[] bytes : byteCol)
- col.add(bytes == null ? null : U.<T>unmarshal(marsh, bytes,
U.resolveClassLoader(ldr, ctx.gridConfig())));
+ col.add(bytes == null ? null : U.unmarshal(marsh, bytes,
U.resolveClassLoader(ldr, ctx.gridConfig())));
return col;
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/PartitionUpdateCountersMessage.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/PartitionUpdateCountersMessage.java
index 363abf815ec..b6e7743b880 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/PartitionUpdateCountersMessage.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/PartitionUpdateCountersMessage.java
@@ -98,7 +98,7 @@ public class PartitionUpdateCountersMessage implements
Message {
if (idx >= size)
throw new ArrayIndexOutOfBoundsException();
- long off = GridUnsafe.BYTE_ARR_OFF + idx * ITEM_SIZE;
+ long off = GridUnsafe.BYTE_ARR_OFF + (long)idx * ITEM_SIZE;
return GridUnsafe.getInt(data, off);
}
@@ -111,7 +111,7 @@ public class PartitionUpdateCountersMessage implements
Message {
if (idx >= size)
throw new ArrayIndexOutOfBoundsException();
- long off = GridUnsafe.BYTE_ARR_OFF + idx * ITEM_SIZE + 4;
+ long off = GridUnsafe.BYTE_ARR_OFF + (long)idx * ITEM_SIZE + 4;
return GridUnsafe.getLong(data, off);
}
@@ -124,7 +124,7 @@ public class PartitionUpdateCountersMessage implements
Message {
if (idx >= size)
throw new ArrayIndexOutOfBoundsException();
- long off = GridUnsafe.BYTE_ARR_OFF + idx * ITEM_SIZE + 12;
+ long off = GridUnsafe.BYTE_ARR_OFF + (long)idx * ITEM_SIZE + 12;
return GridUnsafe.getLong(data, off);
}
@@ -137,7 +137,7 @@ public class PartitionUpdateCountersMessage implements
Message {
public void add(int part, long init, long updatesCnt) {
ensureSpace(size + 1);
- long off = GridUnsafe.BYTE_ARR_OFF + size++ * ITEM_SIZE;
+ long off = GridUnsafe.BYTE_ARR_OFF + (long)size++ * ITEM_SIZE;
GridUnsafe.putInt(data, off, part); off += 4;
GridUnsafe.putLong(data, off, init); off += 8;
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionExchangeId.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionExchangeId.java
index d20521d02e1..2be15b99307 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionExchangeId.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionExchangeId.java
@@ -82,7 +82,7 @@ public class GridDhtPartitionExchangeId implements Message,
Comparable<GridDhtPa
assert discoEvt != null;
this.nodeId = nodeId;
- this.evt = discoEvt.type();
+ evt = discoEvt.type();
this.topVer = topVer;
this.discoEvt = discoEvt;
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/IgniteDhtDemandedPartitionsMap.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/IgniteDhtDemandedPartitionsMap.java
index 1b14af54a60..e521edafcf1 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/IgniteDhtDemandedPartitionsMap.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/IgniteDhtDemandedPartitionsMap.java
@@ -107,10 +107,7 @@ public class IgniteDhtDemandedPartitionsMap implements
Serializable, Message {
if (full != null && full.remove(partId))
return true;
- if (historical != null && historical.remove(partId))
- return true;
-
- return false;
+ return historical != null && historical.remove(partId);
}
/** */
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/IgniteDhtPartitionCountersMap.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/IgniteDhtPartitionCountersMap.java
index 020e6ca67cb..8c3e1029bb4 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/IgniteDhtPartitionCountersMap.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/IgniteDhtPartitionCountersMap.java
@@ -56,9 +56,6 @@ public class IgniteDhtPartitionCountersMap implements Message
{
CachePartitionFullCountersMap cntrMap = map.get(cacheId);
- if (cntrMap == null)
- return null;
-
return cntrMap;
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/IgniteDhtPartitionHistorySuppliersMap.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/IgniteDhtPartitionHistorySuppliersMap.java
index 315cb23bf51..5bfc1ab8cb3 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/IgniteDhtPartitionHistorySuppliersMap.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/IgniteDhtPartitionHistorySuppliersMap.java
@@ -58,7 +58,7 @@ public class IgniteDhtPartitionHistorySuppliersMap implements
Message {
*/
public synchronized List<UUID> getSupplier(int grpId, int partId, long
cntrSince) {
if (map == null)
- return Collections.EMPTY_LIST;
+ return Collections.emptyList();
List<UUID> suppliers = new ArrayList<>();
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheSqlQuery.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheSqlQuery.java
index ae1c2b28532..f1f8a224d90 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheSqlQuery.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheSqlQuery.java
@@ -100,7 +100,7 @@ public class GridCacheSqlQuery implements Message {
* @return {@code this}.
*/
public GridCacheSqlQuery columns(LinkedHashMap<String, ?> columns) {
- this.cols = columns;
+ cols = columns;
return this;
}
@@ -274,7 +274,7 @@ public class GridCacheSqlQuery implements Message {
* @return {@code this}.
*/
public GridCacheSqlQuery treatReplicatedAsPartitioned(boolean
trearPartitionedAsReplicated) {
- this.treatPartitionedAsReplicated = trearPartitionedAsReplicated;
+ treatPartitionedAsReplicated = trearPartitionedAsReplicated;
return this;
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java
index eb7aef547e8..3ac3db4b47f 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java
@@ -129,7 +129,7 @@ public class IgniteTxEntry implements GridPeerDeployAware,
Message {
/** Visible value for peek. */
@GridToStringInclude
@GridDirectTransient
- private TxEntryValueHolder prevVal = new TxEntryValueHolder();
+ private final TxEntryValueHolder prevVal = new TxEntryValueHolder();
/** Old value before update. */
@GridToStringInclude
@@ -443,7 +443,7 @@ public class IgniteTxEntry implements GridPeerDeployAware,
Message {
* @param partCntr Partition counter.
*/
public void updateCounter(long partCntr) {
- this.partUpdateCntr = partCntr;
+ partUpdateCntr = partCntr;
}
/**
@@ -1096,10 +1096,10 @@ public class IgniteTxEntry implements
GridPeerDeployAware, Message {
* @param ver Entry version.
*/
public void entryReadVersion(GridCacheVersion ver) {
- assert this.serReadVer == null : "Wrong version [serReadVer=" +
serReadVer + ", ver=" + ver + "]";
+ assert serReadVer == null : "Wrong version [serReadVer=" + serReadVer
+ ", ver=" + ver + "]";
assert ver != null;
- this.serReadVer = ver;
+ serReadVer = ver;
}
/**
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheRawVersionedEntry.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheRawVersionedEntry.java
index d6bacd3bae3..ccb93f176dc 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheRawVersionedEntry.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheRawVersionedEntry.java
@@ -123,7 +123,7 @@ public class GridCacheRawVersionedEntry<K, V> extends
DataStreamerEntry implemen
/** {@inheritDoc} */
@Override public V value(CacheObjectValueContext ctx) {
- return val != null ? val.<V>value(ctx, false) : null;
+ return val != null ? val.value(ctx, false) : null;
}
/** {@inheritDoc} */
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryFailResponse.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryFailResponse.java
index f44d8d3eabe..42f57d3864c 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryFailResponse.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryFailResponse.java
@@ -61,14 +61,14 @@ public class GridQueryFailResponse implements Message {
*/
public GridQueryFailResponse(long qryReqId, Throwable err) {
this.qryReqId = qryReqId;
- this.errMsg = err.getMessage();
+ errMsg = err.getMessage();
if (err instanceof QueryCancelledException)
- this.failCode = CANCELLED_BY_ORIGINATOR;
+ failCode = CANCELLED_BY_ORIGINATOR;
else if (err instanceof QueryRetryException)
- this.failCode = RETRY_QUERY;
+ failCode = RETRY_QUERY;
else
- this.failCode = GENERAL_ERROR;
+ failCode = GENERAL_ERROR;
}
/**
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/util/UUIDCollectionMessage.java
b/modules/core/src/main/java/org/apache/ignite/internal/util/UUIDCollectionMessage.java
index 0b4841db8c7..ac538225568 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/util/UUIDCollectionMessage.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/util/UUIDCollectionMessage.java
@@ -18,6 +18,7 @@
package org.apache.ignite.internal.util;
import java.util.Collection;
+import java.util.Objects;
import java.util.UUID;
import org.apache.ignite.internal.Order;
import org.apache.ignite.internal.util.typedef.internal.S;
@@ -67,7 +68,7 @@ public class UUIDCollectionMessage implements Message {
UUIDCollectionMessage that = (UUIDCollectionMessage)o;
- return uuids == that.uuids || (uuids != null &&
uuids.equals(that.uuids));
+ return Objects.equals(uuids, that.uuids);
}
/** {@inheritDoc} */
diff --git
a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/TcpConnectionIndexAwareMessage.java
b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/TcpConnectionIndexAwareMessage.java
index 12ce69b0603..c1a22aae94e 100644
---
a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/TcpConnectionIndexAwareMessage.java
+++
b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/TcpConnectionIndexAwareMessage.java
@@ -22,7 +22,7 @@ import
org.apache.ignite.plugin.extensions.communication.Message;
/** */
public interface TcpConnectionIndexAwareMessage extends Message {
/** */
- public static final int UNDEFINED_CONNECTION_INDEX = -1;
+ public int UNDEFINED_CONNECTION_INDEX = -1;
/**
* @return {@link #UNDEFINED_CONNECTION_INDEX} if standard index has to be
used. Desired connection index otherwise.
diff --git
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryAuthFailedMessage.java
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryAuthFailedMessage.java
index c05cda06e48..992bb1c7c37 100644
---
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryAuthFailedMessage.java
+++
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryAuthFailedMessage.java
@@ -54,7 +54,7 @@ public class TcpDiscoveryAuthFailedMessage extends
TcpDiscoveryAbstractMessage i
public TcpDiscoveryAuthFailedMessage(UUID creatorNodeId, InetAddress
creatorAddr, UUID targetNodeId) {
super(creatorNodeId);
- this.creatorAddrMsg = new InetAddressMessage(creatorAddr);
+ creatorAddrMsg = new InetAddressMessage(creatorAddr);
this.targetNodeId = targetNodeId;
}
diff --git
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2CacheObject.java
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2CacheObject.java
index c0d4634556e..f485deb1a55 100644
---
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2CacheObject.java
+++
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2CacheObject.java
@@ -46,7 +46,7 @@ public class GridH2CacheObject extends GridH2ValueMessage {
* @throws IgniteCheckedException If failed.
*/
public GridH2CacheObject(GridH2ValueCacheObject v) throws
IgniteCheckedException {
- this.obj = v.getCacheObject();
+ obj = v.getCacheObject();
obj.prepareMarshal(v.valueContext());
}
diff --git
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2DmlResponse.java
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2DmlResponse.java
index 9caeb49e0b9..53f56f2292c 100644
---
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2DmlResponse.java
+++
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2DmlResponse.java
@@ -75,7 +75,7 @@ public class GridH2DmlResponse implements Message,
GridCacheQueryMarshallable {
this.reqId = reqId;
this.updCnt = updCnt;
this.errKeys = errKeys;
- this.err = error;
+ err = error;
}
/**
diff --git
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2IndexRangeRequest.java
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2IndexRangeRequest.java
index 163f58ac1af..aa4f30cec07 100644
---
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2IndexRangeRequest.java
+++
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2IndexRangeRequest.java
@@ -119,7 +119,7 @@ public class GridH2IndexRangeRequest implements Message {
* @param segmentId Origin index segment ID.
*/
public void originSegmentId(int segmentId) {
- this.originSegmentId = segmentId;
+ originSegmentId = segmentId;
}
/**
diff --git
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2IndexRangeResponse.java
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2IndexRangeResponse.java
index 5058827c514..1675f27ebcb 100644
---
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2IndexRangeResponse.java
+++
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2IndexRangeResponse.java
@@ -162,7 +162,7 @@ public class GridH2IndexRangeResponse implements Message {
* @param segmentId Origin index segment ID.
*/
public void originSegmentId(int segmentId) {
- this.originSegmentId = segmentId;
+ originSegmentId = segmentId;
}
/**
diff --git
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Null.java
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Null.java
index 6b7a4f3f72d..5c60e56d8ff 100644
---
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Null.java
+++
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Null.java
@@ -65,10 +65,7 @@ public class GridH2Null extends GridH2ValueMessage {
@Override public boolean readFrom(ByteBuffer buf, MessageReader reader) {
reader.setBuffer(buf);
- if (!super.readFrom(buf, reader))
- return false;
-
- return true;
+ return super.readFrom(buf, reader);
}
/** {@inheritDoc} */
diff --git
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2QueryRequest.java
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2QueryRequest.java
index 1f5f7bf8d16..b905b0a5808 100644
---
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2QueryRequest.java
+++
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2QueryRequest.java
@@ -489,7 +489,7 @@ public class GridH2QueryRequest implements Message,
GridCacheQueryMarshallable {
* @return {@code this} for chaining.
*/
public GridH2QueryRequest queryId(long queryId) {
- this.qryId = queryId;
+ qryId = queryId;
return this;
}
diff --git
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2RowRange.java
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2RowRange.java
index b870f9b5920..579a00e0f90 100644
---
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2RowRange.java
+++
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2RowRange.java
@@ -32,7 +32,7 @@ import
org.apache.ignite.plugin.extensions.communication.MessageWriter;
*/
public class GridH2RowRange implements Message {
/** */
- private static int FLAG_PARTIAL = 1;
+ private static final int FLAG_PARTIAL = 1;
/** */
private int rangeId;
