update

xiaohei-info · Jan 14, 2019 · c5a8d85 · c5a8d85
1 parent de51f49
commit c5a8d85
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/streamingpro-mlsql/src/test/scala/streaming/core/SpecFunctions.scala b/streamingpro-mlsql/src/test/scala/streaming/core/SpecFunctions.scala
@@ -23,11 +23,12 @@ import java.sql.{DriverManager, Statement}
 
 import net.csdn.ServiceFramwork
 import net.csdn.bootstrap.Bootstrap
-import org.apache.commons.io.{FileUtils, IOUtils}
+import org.apache.commons.io.FileUtils
 import org.apache.http.HttpVersion
 import org.apache.http.client.fluent.{Form, Request}
 import org.apache.http.util.EntityUtils
-import org.apache.spark.sql.{SQLContext, SparkSession}
+import org.apache.spark.sql.SparkSession
+import streaming.common.shell.ShellCommand
 import streaming.dsl.{MLSQLExecuteContext, ScriptSQLExec, ScriptSQLExecListener}
 
 /**
@@ -90,7 +91,7 @@ trait SpecFunctions {
       stat = con.createStatement()
       stat.execute(ddlStr)
 
-    }  finally {
+    } finally {
       if (stat != null) {
         stat.close()
       }

diff --git a/streamingpro-mlsql/src/test/scala/streaming/test/pythonalg/PythonMLSpec2.scala b/streamingpro-mlsql/src/test/scala/streaming/test/pythonalg/PythonMLSpec2.scala
@@ -66,7 +66,7 @@ class PythonMLSpec2 extends BasicSparkOperation with SpecFunctions with BasicMLS
       //执行sql
       implicit val spark = runtime.sparkSession
       mockServer
-      ShellCommand.exec("rm -rf /tmp/jack2/")
+      ShellCommand.exec("rm -rf /tmp/william")
       //SPARK_VERSION
       val sq = createSSEL(spark, "")
       val projectName = "sklearn_elasticnet_wine"
@@ -131,7 +131,7 @@ class PythonMLSpec2 extends BasicSparkOperation with SpecFunctions with BasicMLS
       //执行sql
       implicit val spark = runtime.sparkSession
       mockServer
-      ShellCommand.exec("rm -rf /tmp/jack2/")
+      ShellCommand.exec("rm -rf /tmp/william")
       val sq = createSSEL(spark, "")
       val projectName = "sklearn_elasticnet_wine"
       var projectPath = getExampleProject(projectName)
@@ -170,7 +170,7 @@ class PythonMLSpec2 extends BasicSparkOperation with SpecFunctions with BasicMLS
       //执行sql
       implicit val spark = runtime.sparkSession
       mockServer
-      ShellCommand.exec("rm -rf /tmp/jack2/")
+      ShellCommand.exec("rm -rf /tmp/william")
       val sq = createSSEL(spark, "")
       //train
       ScriptSQLExec.parse(ScriptCode._j2, sq)
@@ -188,7 +188,7 @@ class PythonMLSpec2 extends BasicSparkOperation with SpecFunctions with BasicMLS
       //执行sql
       implicit val spark = runtime.sparkSession
       mockServer
-      ShellCommand.exec("rm -rf /tmp/jack2/")
+      ShellCommand.exec("rm -rf /tmp/william")
       val sq = createSSEL(spark, "")
       //train
       ScriptSQLExec.parse(ScriptCode._j1, sq)
@@ -206,7 +206,7 @@ class PythonMLSpec2 extends BasicSparkOperation with SpecFunctions with BasicMLS
       //执行sql
       implicit val spark = runtime.sparkSession
       mockServer
-      ShellCommand.exec("rm -rf /tmp/jack2/")
+      ShellCommand.exec("rm -rf /tmp/william")
       ShellCommand.exec("mkdir -p /tmp/resource")
       ShellCommand.exec("touch /tmp/resource/a.txt")
       val sq = createSSEL(spark, "")