[incubator-ratis] branch master updated: RATIS-1052. Math operands should be cast before assignment (#192)

[runzhiwang]

This is an automated email from the ASF dual-hosted git repository.

runzhiwang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ratis.git


The following commit(s) were added to refs/heads/master by this push:
     new 6dd5145  RATIS-1052. Math operands should be cast before assignment 
(#192)
6dd5145 is described below

commit 6dd51454994a843fde10933d2ec3daedd6fb36de
Author: maobaolong <307499...@qq.com>
AuthorDate: Tue Sep 8 21:12:29 2020 +0800

    RATIS-1052. Math operands should be cast before assignment (#192)
---
 .../java/org/apache/ratis/examples/counter/client/CounterClient.java    | 2 +-
 .../src/main/java/org/apache/ratis/examples/filestore/cli/Client.java   | 2 +-
 .../src/main/java/org/apache/ratis/logservice/common/Constants.java     | 2 +-
 .../src/main/java/org/apache/ratis/server/impl/LeaderState.java         | 2 +-
 .../main/java/org/apache/ratis/server/raftlog/segmented/LogSegment.java | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git 
a/ratis-examples/src/main/java/org/apache/ratis/examples/counter/client/CounterClient.java
 
b/ratis-examples/src/main/java/org/apache/ratis/examples/counter/client/CounterClient.java
index 9607178..faa0cd8 100644
--- 
a/ratis-examples/src/main/java/org/apache/ratis/examples/counter/client/CounterClient.java
+++ 
b/ratis-examples/src/main/java/org/apache/ratis/examples/counter/client/CounterClient.java
@@ -67,7 +67,7 @@ public final class CounterClient {
 
     //shutdown the executor service and wait until they finish their work
     executorService.shutdown();
-    executorService.awaitTermination(increment * 500, TimeUnit.MILLISECONDS);
+    executorService.awaitTermination(increment * 500L, TimeUnit.MILLISECONDS);
 
     //send GET command and print the response
     RaftClientReply count = raftClient.sendReadOnly(Message.valueOf("GET"));
diff --git 
a/ratis-examples/src/main/java/org/apache/ratis/examples/filestore/cli/Client.java
 
b/ratis-examples/src/main/java/org/apache/ratis/examples/filestore/cli/Client.java
index d2b9585..916d1c1 100644
--- 
a/ratis-examples/src/main/java/org/apache/ratis/examples/filestore/cli/Client.java
+++ 
b/ratis-examples/src/main/java/org/apache/ratis/examples/filestore/cli/Client.java
@@ -57,7 +57,7 @@ public abstract class Client extends SubCommandBase {
     RaftServerConfigKeys.Log.setPreallocatedSize(raftProperties,
         SizeInBytes.valueOf(raftSegmentPreallocatedSize));
     RaftServerConfigKeys.Log.setSegmentSizeMax(raftProperties,
-        SizeInBytes.valueOf(1 * 1024 * 1024 * 1024));
+        SizeInBytes.valueOf(1 * 1024 * 1024 * 1024L));
 
     RaftServerConfigKeys.Log.setSegmentCacheNumMax(raftProperties, 2);
 
diff --git 
a/ratis-logservice/src/main/java/org/apache/ratis/logservice/common/Constants.java
 
b/ratis-logservice/src/main/java/org/apache/ratis/logservice/common/Constants.java
index 94c0989..4afc4b9 100644
--- 
a/ratis-logservice/src/main/java/org/apache/ratis/logservice/common/Constants.java
+++ 
b/ratis-logservice/src/main/java/org/apache/ratis/logservice/common/Constants.java
@@ -58,7 +58,7 @@ public final class Constants {
     public static final long DEFAULT_RPC_TIMEOUT = 100000;// 100 sec (?)
 
     public static final String RATIS_RAFT_SEGMENT_SIZE_KEY = 
"ratis.raft.segment.size";
-    public static final long DEFAULT_RATIS_RAFT_SEGMENT_SIZE = 32 * 1024 
*1024;// 32MB
+    public static final long DEFAULT_RATIS_RAFT_SEGMENT_SIZE = 32 * 1024 * 
1024L;// 32MB
 
     public static final String LOG_SERVICE_HEARTBEAT_INTERVAL_KEY =
             "logservice.heartbeat.interval"; // in ms
diff --git 
a/ratis-server/src/main/java/org/apache/ratis/server/impl/LeaderState.java 
b/ratis-server/src/main/java/org/apache/ratis/server/impl/LeaderState.java
index 11631e5..0b1a9e1 100644
--- a/ratis-server/src/main/java/org/apache/ratis/server/impl/LeaderState.java
+++ b/ratis-server/src/main/java/org/apache/ratis/server/impl/LeaderState.java
@@ -552,7 +552,7 @@ public class LeaderState {
       long committed) {
     Preconditions.assertTrue(!follower.isAttendingVote());
     final Timestamp progressTime = 
Timestamp.currentTime().addTimeMs(-server.getMaxTimeoutMs());
-    final Timestamp timeoutTime = 
Timestamp.currentTime().addTimeMs(-3*server.getMaxTimeoutMs());
+    final Timestamp timeoutTime = Timestamp.currentTime().addTimeMs(-3L * 
server.getMaxTimeoutMs());
     if (follower.getLastRpcResponseTime().compareTo(timeoutTime) < 0) {
       LOG.debug("{} detects a follower {} timeout ({}) for bootstrapping", 
this, follower, timeoutTime);
       return BootStrapProgress.NOPROGRESS;
diff --git 
a/ratis-server/src/main/java/org/apache/ratis/server/raftlog/segmented/LogSegment.java
 
b/ratis-server/src/main/java/org/apache/ratis/server/raftlog/segmented/LogSegment.java
index 5ce48f7..93e5049 100644
--- 
a/ratis-server/src/main/java/org/apache/ratis/server/raftlog/segmented/LogSegment.java
+++ 
b/ratis-server/src/main/java/org/apache/ratis/server/raftlog/segmented/LogSegment.java
@@ -62,7 +62,7 @@ public class LogSegment implements Comparable<Long> {
 
   static long getEntrySize(LogEntryProto entry) {
     final int serialized = 
ServerProtoUtils.removeStateMachineData(entry).getSerializedSize();
-    return serialized + CodedOutputStream.computeUInt32SizeNoTag(serialized) + 
4;
+    return serialized + CodedOutputStream.computeUInt32SizeNoTag(serialized) + 
4L;
   }
 
   static class LogRecord {