SPARK-20213: Fix backward logic for nesting.

rdblue · rdblue · commit 90045cfe7c8a · 2017-05-01T18:35:08.000-07:00
diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/SQLExecution.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/SQLExecution.scala
@@ -122,9 +122,9 @@ object SQLExecution extends Logging {
       // To avoid this warning, use nested { ... }
       if (!Option(sc.getLocalProperty(ALLOW_NESTED_EXECUTION)).exists(_.toBoolean)) {
         if (testing) {
-          logWarning(s"$EXECUTION_ID_KEY is already set")
-        } else {
           throw new IllegalArgumentException(s"$EXECUTION_ID_KEY is already set")
+        } else {
+          logWarning(s"$EXECUTION_ID_KEY is already set")
         }
       }
       body

Original file line number	Diff line number	Diff line change
`@@ -122,9 +122,9 @@ object SQLExecution extends Logging {`
`122`	`122`	`// To avoid this warning, use nested { ... }`
`123`	`123`	`if (!Option(sc.getLocalProperty(ALLOW_NESTED_EXECUTION)).exists(_.toBoolean)) {`
`124`	`124`	`if (testing) {`
`125`		`- logWarning(s"$EXECUTION_ID_KEY is already set")`
`126`		`- } else {`
`127`	`125`	`throw new IllegalArgumentException(s"$EXECUTION_ID_KEY is already set")`
	`126`	`+ } else {`
	`127`	`+ logWarning(s"$EXECUTION_ID_KEY is already set")`
`128`	`128`	`}`
`129`	`129`	`}`
`130`	`130`	`body`