implement code review comments

apache · Oct 22, 2015 · 6bb1491 · 6bb1491
1 parent 396c66a
commit 6bb1491
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/core/src/main/scala/org/apache/spark/deploy/SparkSubmit.scala b/core/src/main/scala/org/apache/spark/deploy/SparkSubmit.scala
@@ -266,10 +266,6 @@ object SparkSubmit {
       }
     }
 
-    // SPARK-5966, check deployMode CLUSTER and master local
-    if (clusterManager == LOCAL && deployMode == CLUSTER) {
-      printErrorAndExit("Cluster deploy mode is not compatible with master \"local\"")
-    }
 
     // Update args.deployMode if it is null. It will be passed down as a Spark property later.
     (args.deployMode, deployMode) match {
@@ -333,6 +329,8 @@ object SparkSubmit {
       case (STANDALONE, CLUSTER) if args.isR =>
         printErrorAndExit("Cluster deploy mode is currently not supported for R " +
           "applications on standalone clusters.")
+      case (LOCAL, CLUSTER) =>
+        printErrorAndExit("Cluster deploy mode is not compatible with master \"local\"")
       case (_, CLUSTER) if isShell(args.primaryResource) =>
         printErrorAndExit("Cluster deploy mode is not applicable to Spark shells.")
       case (_, CLUSTER) if isSqlShell(args.mainClass) =>

diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/planning/impatient.sc b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/planning/impatient.sc
@@ -0,0 +1 @@
+1+1;