fixed int->long; a bug in the case a window had no scheduled vertices

Aapo Kyrola · Aapo Kyrola · commit a26c474ffa5e · 2012-09-13T20:29:47.000-07:00
diff --git a/src/edu/cmu/graphchi/engine/GraphChiEngine.java b/src/edu/cmu/graphchi/engine/GraphChiEngine.java
@@ -223,6 +223,7 @@ public void run(GraphChiProgram<VertexDataType, EdgeDataType> program, int niter
                         subIntervalStart = subIntervalEnd + 1;
                         vertexDataHandler.releaseAndCommit();
                     }  else {
+                    	subIntervalStart = subIntervalEnd + 1;
                         System.out.println("Skipped interval - no vertices scheduled.");
                     }
                 }
diff --git a/src/edu/cmu/graphchi/engine/auxdata/DegreeData.java b/src/edu/cmu/graphchi/engine/auxdata/DegreeData.java
@@ -39,7 +39,7 @@ public void load(int _vertexSt, int _vertexEn) throws IOException {
         vertexEn = _vertexEn;
 
         int dataSize = (vertexEn - vertexSt + 1) * 4 * 2;
-        int dataStart = vertexSt * 4 * 2;
+        long dataStart = (long) vertexSt * 4l * 2l;
 
         degreeData = new byte[dataSize];
 
diff --git a/src/edu/cmu/graphchi/engine/auxdata/VertexData.java b/src/edu/cmu/graphchi/engine/auxdata/VertexData.java
@@ -65,7 +65,7 @@ public VertexData(int nvertices, String baseFilename, BytesToValueConverter<Vert
     public void releaseAndCommit() throws IOException {
         assert(currentBlockId >= 0);
         byte[] data = blockManager.getRawBlock(currentBlockId);
-        int dataStart = vertexSt * converter.sizeOf();
+        long dataStart = (long) vertexSt * (long) converter.sizeOf();
 
         vertexDataFile.seek(dataStart);
         vertexDataFile.write(data);
@@ -81,7 +81,7 @@ public void load(int _vertexSt, int _vertexEn) throws IOException {
         vertexEn = _vertexEn;
 
         int dataSize = (vertexEn - vertexSt + 1) * converter.sizeOf();
-        int dataStart = vertexSt * converter.sizeOf();
+        long dataStart = (long) vertexSt * (long) converter.sizeOf();
 
         currentBlockId =  blockManager.allocateBlock(dataSize);
 

Original file line number	Diff line number	Diff line change
`@@ -223,6 +223,7 @@ public void run(GraphChiProgram<VertexDataType, EdgeDataType> program, int niter`
`223`	`223`	`subIntervalStart = subIntervalEnd + 1;`
`224`	`224`	`vertexDataHandler.releaseAndCommit();`
`225`	`225`	`} else {`
	`226`	`+ subIntervalStart = subIntervalEnd + 1;`
`226`	`227`	`System.out.println("Skipped interval - no vertices scheduled.");`
`227`	`228`	`}`
`228`	`229`	`}`