Fix NULL variable bug

stratosphere · May 2, 2016 · 45845ef · 45845ef
1 parent faa454a
commit 45845ef
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/src/main/java/org/apache/sysml/hops/BinaryOp.java b/src/main/java/org/apache/sysml/hops/BinaryOp.java
@@ -1543,10 +1543,9 @@ private MMBinaryMethod optFindMMBinaryMethodFlink(Hop left, Hop right) {
 			||(m1_dim1 >= 1 && m2_dim1 == 1 )) ) //rhs row vector
 		{
 			double size = OptimizerUtils.estimateSize(m2_dim1, m2_dim2);
-			/*
-			if( OptimizerUtils.checkSparkBroadcastMemoryBudget(size) ) { //TODO: check this
+			if( OptimizerUtils.checkFlinkBroadcastMemoryBudget(size) ) { //TODO: check this
 				return MMBinaryMethod.MR_BINARY_M;
-			}*/
+			}
 		}
 
 		//MR_BINARY_R as robust fallback strategy

diff --git a/...che/sysml/runtime/instructions/flink/functions/MatrixVectorBinaryOpPartitionFunction.java b/...che/sysml/runtime/instructions/flink/functions/MatrixVectorBinaryOpPartitionFunction.java
@@ -79,8 +79,8 @@ public Tuple2<MatrixIndexes, MatrixBlock> map(Tuple2<MatrixIndexes, MatrixBlock>
 		throws Exception 
 	{
 		//get the rhs block 
-		int rix= (int)((_vtype==VectorType.COL_VECTOR) ? arg0.f0.getRowIndex() : 1);
-		int cix= (int)((_vtype==VectorType.COL_VECTOR) ? 1 : arg0.f0.getColumnIndex());
+		long rix= ((_vtype==VectorType.COL_VECTOR) ? arg0.f0.getRowIndex() : 1L);
+		long cix= ((_vtype==VectorType.COL_VECTOR) ? 1L : arg0.f0.getColumnIndex());
 		MatrixBlock in2 = _pmV.get(rix).get(cix);
 
 		//execute the binary operation