Merge branch 'master' of https://github.com/apache/spark into SPARK-1413

Author: witgo

examples/src/main/java/org/apache/spark/examples/JavaHdfsLR.java

@@ -138,6 +138,6 @@ public static void main(String[] args) {
 
     System.out.print("Final w: ");
     printWeights(w);
-    System.exit(0);
+    sc.stop();
   }
 }

examples/src/main/java/org/apache/spark/examples/JavaLogQuery.java

@@ -126,6 +126,6 @@ public Stats call(Stats stats, Stats stats2) {
     for (Tuple2<?,?> t : output) {
       System.out.println(t._1() + "\t" + t._2());
     }
-    System.exit(0);
+    jsc.stop();
   }
 }

examples/src/main/java/org/apache/spark/examples/JavaPageRank.java

@@ -117,6 +117,6 @@ public Double call(Double sum) {
         System.out.println(tuple._1() + " has rank: " + tuple._2() + ".");
     }
 
-    System.exit(0);
+    ctx.stop();
   }
 }

examples/src/main/java/org/apache/spark/examples/JavaTC.java

@@ -96,6 +96,6 @@ public Tuple2<Integer, Integer> call(Tuple2<Integer, Integer> e) {
     } while (nextCount != oldCount);
 
     System.out.println("TC has " + tc.count() + " edges.");
-    System.exit(0);
+    sc.stop();
   }
 }

examples/src/main/java/org/apache/spark/examples/JavaWordCount.java

@@ -48,14 +48,14 @@ public Iterable<String> call(String s) {
         return Arrays.asList(SPACE.split(s));
       }
     });
-    
+
     JavaPairRDD<String, Integer> ones = words.mapToPair(new PairFunction<String, String, Integer>() {
       @Override
       public Tuple2<String, Integer> call(String s) {
         return new Tuple2<String, Integer>(s, 1);
       }
     });
-    
+
     JavaPairRDD<String, Integer> counts = ones.reduceByKey(new Function2<Integer, Integer, Integer>() {
       @Override
       public Integer call(Integer i1, Integer i2) {
@@ -67,6 +67,6 @@ public Integer call(Integer i1, Integer i2) {
     for (Tuple2<?,?> tuple : output) {
       System.out.println(tuple._1() + ": " + tuple._2());
     }
-    System.exit(0);
+    ctx.stop();
   }
 }

examples/src/main/java/org/apache/spark/mllib/examples/JavaALS.java

@@ -85,6 +85,6 @@ public static void main(String[] args) {
         outputDir + "/productFeatures");
     System.out.println("Final user/product features written to " + outputDir);
 
-    System.exit(0);
+    sc.stop();
   }
 }

examples/src/main/java/org/apache/spark/mllib/examples/JavaKMeans.java

@@ -79,6 +79,6 @@ public static void main(String[] args) {
     double cost = model.computeCost(points.rdd());
     System.out.println("Cost: " + cost);
 
-    System.exit(0);
+    sc.stop();
   }
 }

examples/src/main/java/org/apache/spark/mllib/examples/JavaLR.java

@@ -77,6 +77,6 @@ public static void main(String[] args) {
 
     System.out.print("Final w: " + model.weights());
 
-    System.exit(0);
+    sc.stop();
   }
 }

examples/src/main/scala/org/apache/spark/examples/BroadcastTest.scala

@@ -56,6 +56,6 @@ object BroadcastTest {
       println("Iteration %d took %.0f milliseconds".format(i, (System.nanoTime - startTime) / 1E6))
     }
 
-    System.exit(0)
+    sc.stop()
   }
 }

examples/src/main/scala/org/apache/spark/examples/CassandraCQLTest.scala

@@ -58,7 +58,7 @@ import org.apache.spark.SparkContext._
     prod_id,
     quantity) VALUES ('charlie', 1385983649000, 'iphone', 2);
 */
- 
+
 /**
  * This example demonstrates how to read and write to cassandra column family created using CQL3
  * using Spark.