GEODE-7864: Prevent implicit narrowing. (apache#4870)

ringles · Apr 17, 2020 · b0bd165 · b0bd165
1 parent bfbb398
commit b0bd165
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/ServerLocator.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/ServerLocator.java
@@ -465,7 +465,7 @@ private void logServers() {
       }
       this.lastLogTime = now;
 
-      int queues = 0;
+      float queues = 0f;
       int connections = 0;
       for (ServerLoad l : loadMap.values()) {
         queues += l.getSubscriptionConnectionLoad();

diff --git a/...g/apache/geode/internal/cache/partitioned/rebalance/model/PartitionedRegionLoadModel.java b/...g/apache/geode/internal/cache/partitioned/rebalance/model/PartitionedRegionLoadModel.java
@@ -753,8 +753,8 @@ public Set<PartitionMemberInfo> getPartitionedMemberDetails(String region) {
   /**
    * For testing only, calculate the total variance of the members
    */
-  public float getVarianceForTest() {
-    float variance = 0;
+  public double getVarianceForTest() {
+    double variance = 0;
 
     for (Member member : this.members.values()) {
       variance += variance(member.getTotalLoad(), member.getWeight(), getAverageLoad());
@@ -766,8 +766,8 @@ public float getVarianceForTest() {
   /**
    * For testing only, calculate the total variance of the members
    */
-  public float getPrimaryVarianceForTest() {
-    float variance = 0;
+  public double getPrimaryVarianceForTest() {
+    double variance = 0;
 
     for (Member member : this.members.values()) {
       variance += variance(member.getPrimaryLoad(), member.getWeight(), getPrimaryAverage());

diff --git a/...pache/geode/internal/cache/partitioned/rebalance/PartitionedRegionLoadModelJUnitTest.java b/...pache/geode/internal/cache/partitioned/rebalance/PartitionedRegionLoadModelJUnitTest.java
@@ -1497,8 +1497,8 @@ public void testRebalancingWithOfflineMembers() throws UnknownHostException {
   }
 
   private int doMoves(RebalanceDirector director, PartitionedRegionLoadModel model) {
-    float initialVariance = model.getVarianceForTest();
-    float initialPrimaryVariance = model.getPrimaryVarianceForTest();
+    double initialVariance = model.getVarianceForTest();
+    double initialPrimaryVariance = model.getPrimaryVarianceForTest();
     if (DEBUG) {
       System.out.println("Initial Model\n" + model + "\nVariance= " + initialVariance
           + ", Primary variance=" + initialPrimaryVariance + "\n---------------");
@@ -1509,8 +1509,8 @@ private int doMoves(RebalanceDirector director, PartitionedRegionLoadModel model
     while (director.nextStep() && moveCount < MAX_MOVES) {
 
       moveCount++;
-      float variance = model.getVarianceForTest();
-      float primaryVariance = model.getPrimaryVarianceForTest();
+      double variance = model.getVarianceForTest();
+      double primaryVariance = model.getPrimaryVarianceForTest();
       if (DEBUG) {
         System.out.println("---------------\nMove " + moveCount + "\n" + model + "\nVariance= "
             + variance + ", Primary variance=" + primaryVariance + "\n---------------");