Signatures of memory consumption methods fixed.

avitorovic · May 6, 2016 · 70ebfc6 · 70ebfc6
1 parent e26211e
commit 70ebfc6
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 21 deletions.
diff --git a/squall-core/src/main/java/ch/epfl/data/squall/storm_components/StormDstJoin.java b/squall-core/src/main/java/ch/epfl/data/squall/storm_components/StormDstJoin.java
@@ -430,9 +430,9 @@ protected void printStatistics(int type) {
 				+ ", Total:,"
 				+ totalSize
 				+ ", Memory used: ,"
-				+ StatisticsUtilities.bytesToMegabytes(memory)
+				+ StatisticsUtilities.bytesToKBs(memory)
 				+ ","
-				+ StatisticsUtilities.bytesToMegabytes(runtime
+				+ StatisticsUtilities.bytesToKBs(runtime
 					.totalMemory()));
 		    else if (type == SystemParameters.INPUT_PRINT)
 			LOG.info(","
@@ -448,9 +448,9 @@ else if (type == SystemParameters.INPUT_PRINT)
 				+ ", Total:,"
 				+ totalSize
 				+ ", Memory used: ,"
-				+ StatisticsUtilities.bytesToMegabytes(memory)
+				+ StatisticsUtilities.bytesToKBs(memory)
 				+ ","
-				+ StatisticsUtilities.bytesToMegabytes(runtime
+				+ StatisticsUtilities.bytesToKBs(runtime
 					.totalMemory()));
 		    else if (type == SystemParameters.OUTPUT_PRINT)
 			LOG.info("," + "RESULT," + _thisTaskID + ","
@@ -474,9 +474,9 @@ else if (type == SystemParameters.FINAL_PRINT) {
 				+ ", Total:,"
 				+ totalSize
 				+ ", Memory used: ,"
-				+ StatisticsUtilities.bytesToMegabytes(memory)
+				+ StatisticsUtilities.bytesToKBs(memory)
 				+ ","
-				+ StatisticsUtilities.bytesToMegabytes(runtime
+				+ StatisticsUtilities.bytesToKBs(runtime
 					.totalMemory()));
 			LOG.info("," + "RESULT," + _thisTaskID + ","
 				+ "TimeStamp:," + ts + ",Sent Tuples,"
@@ -505,9 +505,9 @@ else if (type == SystemParameters.FINAL_PRINT) {
 			    + ", Total:,"
 			    + totalSize
 			    + ", Memory used: ,"
-			    + StatisticsUtilities.bytesToMegabytes(memory)
+			    + StatisticsUtilities.bytesToKBs(memory)
 			    + ","
-			    + StatisticsUtilities.bytesToMegabytes(runtime
+			    + StatisticsUtilities.bytesToKBs(runtime
 				    .totalMemory()));
 		    LOG.info("," + "RESULT," + _thisTaskID + ","
 			    + "TimeStamp:," + ts + ",Sent Tuples,"

diff --git a/squall-core/src/main/java/ch/epfl/data/squall/storm_components/StormJoinerBoltComponent.java b/squall-core/src/main/java/ch/epfl/data/squall/storm_components/StormJoinerBoltComponent.java
@@ -447,9 +447,9 @@ protected void printStatistics(int type, int size1, int size2, Logger LOG) {
 				+ ", Total:,"
 				+ totalSize
 				+ ", Memory used: ,"
-				+ StatisticsUtilities.bytesToMegabytes(memory)
+				+ StatisticsUtilities.bytesToKBs(memory)
 				+ ","
-				+ StatisticsUtilities.bytesToMegabytes(runtime
+				+ StatisticsUtilities.bytesToKBs(runtime
 					.totalMemory()));
 		    else if (type == SystemParameters.INPUT_PRINT)
 			LOG.info(","
@@ -465,9 +465,9 @@ else if (type == SystemParameters.INPUT_PRINT)
 				+ ", Total:,"
 				+ totalSize
 				+ ", Memory used: ,"
-				+ StatisticsUtilities.bytesToMegabytes(memory)
+				+ StatisticsUtilities.bytesToKBs(memory)
 				+ ","
-				+ StatisticsUtilities.bytesToMegabytes(runtime
+				+ StatisticsUtilities.bytesToKBs(runtime
 					.totalMemory()));
 		    else if (type == SystemParameters.OUTPUT_PRINT)
 			LOG.info("," + "RESULT," + _thisTaskID + ","
@@ -491,9 +491,9 @@ else if (type == SystemParameters.FINAL_PRINT) {
 				+ ", Total:,"
 				+ totalSize
 				+ ", Memory used: ,"
-				+ StatisticsUtilities.bytesToMegabytes(memory)
+				+ StatisticsUtilities.bytesToKBs(memory)
 				+ ","
-				+ StatisticsUtilities.bytesToMegabytes(runtime
+				+ StatisticsUtilities.bytesToKBs(runtime
 					.totalMemory()));
 			LOG.info("," + "RESULT," + _thisTaskID + ","
 				+ "TimeStamp:," + ts + ",Sent Tuples,"
@@ -522,9 +522,9 @@ else if (type == SystemParameters.FINAL_PRINT) {
 			    + ", Total:,"
 			    + totalSize
 			    + ", Memory used: ,"
-			    + StatisticsUtilities.bytesToMegabytes(memory)
+			    + StatisticsUtilities.bytesToKBs(memory)
 			    + ","
-			    + StatisticsUtilities.bytesToMegabytes(runtime
+			    + StatisticsUtilities.bytesToKBs(runtime
 				    .totalMemory()));
 		    LOG.info("," + "RESULT," + _thisTaskID + ","
 			    + "TimeStamp:," + ts + ",Sent Tuples,"

diff --git a/squall-core/src/main/java/ch/epfl/data/squall/utilities/statistics/StatisticsUtilities.java b/squall-core/src/main/java/ch/epfl/data/squall/utilities/statistics/StatisticsUtilities.java
@@ -31,7 +31,7 @@
 import ch.epfl.data.squall.utilities.SystemParameters;
 
 public class StatisticsUtilities implements Serializable {
-    public static double bytesToMegabytes(long bytes) {
+    public static double bytesToKBs(long bytes) {
 	return bytes / 1024;
     }
 
@@ -91,8 +91,8 @@ public void printInitialStats(Logger LOG, int thisTaskID,
 		+ ", Total:,"
 		+ (firstRelationSize + secondRelationSize
 			+ firstTaggedRelationSize + secondTaggedRelationSize)
-		+ ", Memory used: ," + bytesToMegabytes(memory) + ","
-		+ bytesToMegabytes(runtime.totalMemory()));
+		+ ", Memory used: ," + bytesToKBs(memory) + ","
+		+ bytesToKBs(runtime.totalMemory()));
     }
 
     public void printMemoryStats(int heirarchyPosition, Logger LOG,
@@ -117,9 +117,9 @@ public void printMemoryStats(int heirarchyPosition, Logger LOG,
 			+ ", Total:,"
 			+ (numberOfTuplesMemory)
 			+ ", Memory used: ,"
-			+ StatisticsUtilities.bytesToMegabytes(memory)
+			+ StatisticsUtilities.bytesToKBs(memory)
 			+ ","
-			+ StatisticsUtilities.bytesToMegabytes(runtime
+			+ StatisticsUtilities.bytesToKBs(runtime
 				.totalMemory()));
 	    }
     }