fix(flexible):change int64 to int32 in proto

sofastack · Aug 2, 2023 · a43518e · a43518e
1 parent d255078
commit a43518e
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 19 deletions.
diff --git a/jraft-core/src/main/java/com/alipay/sofa/jraft/core/CliServiceImpl.java b/jraft-core/src/main/java/com/alipay/sofa/jraft/core/CliServiceImpl.java
@@ -146,7 +146,7 @@ public Status resetFactor(final String groupId, final Configuration conf, Intege
  final Message result = this.cliClientService.resetFactor(leaderId.getEndpoint(), rb.build(), null).get();
  if (result instanceof CliRequests.ResetFactorResponse) {
  final CliRequests.ResetFactorResponse resp = (CliRequests.ResetFactorResponse) result;
- recordFactorChange(groupId, (int) resp.getReadFactor(), (int) resp.getWriteFactor());
+ recordFactorChange(groupId, resp.getReadFactor(), resp.getWriteFactor());
  return Status.OK();
  } else {
  return statusFromResponse(result);

diff --git a/jraft-core/src/main/java/com/alipay/sofa/jraft/core/FSMCallerImpl.java b/jraft-core/src/main/java/com/alipay/sofa/jraft/core/FSMCallerImpl.java
@@ -742,8 +742,8 @@ private void doSnapshotLoad(final LoadSnapshotClosure done) {
  }
  // set factor from meta
  if (meta.hasWriteFactor() || meta.hasReadFactor()) {
- conf.setWriteFactor((int) meta.getWriteFactor());
- conf.setReadFactor((int) meta.getReadFactor());
+ conf.setWriteFactor(meta.getWriteFactor());
+ conf.setReadFactor(meta.getReadFactor());
  }
  this.fsm.onConfigurationCommitted(conf);
  }

diff --git a/jraft-core/src/main/java/com/alipay/sofa/jraft/core/NodeImpl.java b/jraft-core/src/main/java/com/alipay/sofa/jraft/core/NodeImpl.java
@@ -2234,12 +2234,12 @@ private void fillLogEntryPeers(final RaftOutter.EntryMeta entry, final LogEntry
  logEntry.setOldLearners(peers);
  }
  if (entry.hasReadFactor() || entry.hasWriteFactor()) {
- logEntry.setReadFactor((int) entry.getReadFactor());
- logEntry.setWriteFactor((int) entry.getWriteFactor());
+ logEntry.setReadFactor(entry.getReadFactor());
+ logEntry.setWriteFactor(entry.getWriteFactor());
  }
  if (entry.hasOldReadFactor() || entry.hasOldWriteFactor()) {
- logEntry.setOldReadFactor((int) entry.getOldReadFactor());
- logEntry.setOldWriteFactor((int) entry.getOldWriteFactor());
+ logEntry.setOldReadFactor(entry.getOldReadFactor());
+ logEntry.setOldWriteFactor(entry.getOldWriteFactor());
  }
 
  // if enable flexible raft but no factor is in entry ,

diff --git a/jraft-core/src/main/java/com/alipay/sofa/jraft/entity/codec/v2/V2Decoder.java b/jraft-core/src/main/java/com/alipay/sofa/jraft/entity/codec/v2/V2Decoder.java
@@ -105,13 +105,13 @@ public LogEntry decode(final byte[] bs) {
  }
 
  if (entry.hasWriteFactor() || entry.hasReadFactor()) {
- log.setWriteFactor((int) entry.getWriteFactor());
- log.setReadFactor((int) entry.getReadFactor());
+ log.setWriteFactor(entry.getWriteFactor());
+ log.setReadFactor(entry.getReadFactor());
  }
 
  if (entry.hasOldWriteFactor() || entry.hasOldReadFactor()) {
- log.setOldWriteFactor((int) entry.getOldWriteFactor());
- log.setOldReadFactor((int) entry.getOldReadFactor());
+ log.setOldWriteFactor(entry.getOldWriteFactor());
+ log.setOldReadFactor(entry.getOldReadFactor());
  }
 
  final ByteString data = entry.getData();

diff --git a/jraft-core/src/main/java/com/alipay/sofa/jraft/rpc/impl/cli/ResetFactorRequestProcessor.java b/jraft-core/src/main/java/com/alipay/sofa/jraft/rpc/impl/cli/ResetFactorRequestProcessor.java
@@ -53,8 +53,8 @@ protected String getGroupId(ResetFactorRequest request) {
  @Override
  protected Message processRequest0(CliRequestContext ctx, ResetFactorRequest request, RpcRequestClosure done) {
  Node node = ctx.node;
- int readFactor = (int) request.getReadFactor();
- int writeFactor = (int) request.getWriteFactor();
+ int readFactor = request.getReadFactor();
+ int writeFactor = request.getWriteFactor();
  LOG.info("Receive AddPeerRequest to {} from {}, change readFactor to {} , writeFactor to {}",
  ctx.node.getNodeId(), done.getRpcCtx().getRemoteAddress(), readFactor, writeFactor);
  node.resetFactor(readFactor, writeFactor, status -> {

diff --git a/jraft-core/src/main/java/com/alipay/sofa/jraft/storage/impl/LogManagerImpl.java b/jraft-core/src/main/java/com/alipay/sofa/jraft/storage/impl/LogManagerImpl.java
@@ -677,8 +677,8 @@ private Configuration oldConfFromMeta(final SnapshotMeta meta) {
  }
  // load factor from meta
  if (meta.hasOldReadFactor() && meta.hasOldWriteFactor()) {
- oldConf.setReadFactor((int) meta.getOldReadFactor());
- oldConf.setWriteFactor((int) meta.getWriteFactor());
+ oldConf.setReadFactor(meta.getOldReadFactor());
+ oldConf.setWriteFactor(meta.getWriteFactor());
  }
  for (int i = 0; i < meta.getOldLearnersCount(); i++) {
  final PeerId peer = new PeerId();
@@ -687,8 +687,8 @@ private Configuration oldConfFromMeta(final SnapshotMeta meta) {
  }
  // load old factor from meta
  if (meta.hasOldReadFactor() || meta.hasOldWriteFactor()) {
- oldConf.setReadFactor((int) meta.getOldReadFactor());
- oldConf.setWriteFactor((int) meta.getOldWriteFactor());
+ oldConf.setReadFactor(meta.getOldReadFactor());
+ oldConf.setWriteFactor(meta.getOldWriteFactor());
  }
  return oldConf;
  }
@@ -706,8 +706,8 @@ private Configuration confFromMeta(final SnapshotMeta meta) {
  conf.addLearner(peer);
  }
  if (meta.hasReadFactor() || meta.hasWriteFactor()) {
- conf.setReadFactor((int) meta.getReadFactor());
- conf.setWriteFactor((int) meta.getWriteFactor());
+ conf.setReadFactor(meta.getReadFactor());
+ conf.setWriteFactor(meta.getWriteFactor());
  }
  return conf;
  }