diff --git a/external/mlsql-autosuggest/pom.xml b/external/mlsql-autosuggest/pom.xml
index e0a4b46c5..0abe4fc0f 100644
--- a/external/mlsql-autosuggest/pom.xml
+++ b/external/mlsql-autosuggest/pom.xml
@@ -5,7 +5,7 @@
streamingpro_2.11
tech.mlsql
- 2.1.0-SNAPSHOT
+ 2.1.1-SNAPSHOT
../../pom.xml
4.0.0
@@ -101,4 +101,4 @@
-
\ No newline at end of file
+
diff --git a/external/mlsql-ets/pom.xml b/external/mlsql-ets/pom.xml
index a4efd75a5..21df62139 100644
--- a/external/mlsql-ets/pom.xml
+++ b/external/mlsql-ets/pom.xml
@@ -5,7 +5,7 @@
streamingpro_2.11
tech.mlsql
- 2.1.0-SNAPSHOT
+ 2.1.1-SNAPSHOT
../../pom.xml
4.0.0
@@ -90,4 +90,4 @@
-
\ No newline at end of file
+
diff --git a/external/mlsql-healthy/pom.xml b/external/mlsql-healthy/pom.xml
index 10d5ac9c9..ae65b08ce 100644
--- a/external/mlsql-healthy/pom.xml
+++ b/external/mlsql-healthy/pom.xml
@@ -5,7 +5,7 @@
streamingpro_2.11
tech.mlsql
- 2.1.0-SNAPSHOT
+ 2.1.1-SNAPSHOT
../../pom.xml
4.0.0
@@ -84,4 +84,4 @@
-
\ No newline at end of file
+
diff --git a/external/mlsql-lang/pom.xml b/external/mlsql-lang/pom.xml
index f721f8b2a..821933371 100644
--- a/external/mlsql-lang/pom.xml
+++ b/external/mlsql-lang/pom.xml
@@ -5,7 +5,7 @@
streamingpro_2.11
tech.mlsql
- 2.1.0-SNAPSHOT
+ 2.1.1-SNAPSHOT
../../pom.xml
4.0.0
@@ -37,4 +37,4 @@
-
\ No newline at end of file
+
diff --git a/external/mlsql-mysql-store/pom.xml b/external/mlsql-mysql-store/pom.xml
index 10f652a4c..5a6f544a5 100644
--- a/external/mlsql-mysql-store/pom.xml
+++ b/external/mlsql-mysql-store/pom.xml
@@ -5,7 +5,7 @@
streamingpro_2.11
tech.mlsql
- 2.1.0-SNAPSHOT
+ 2.1.1-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/external/mlsql-sql-profiler-30/pom.xml b/external/mlsql-sql-profiler-30/pom.xml
index d04b95466..7af583c5d 100644
--- a/external/mlsql-sql-profiler-30/pom.xml
+++ b/external/mlsql-sql-profiler-30/pom.xml
@@ -5,7 +5,7 @@
streamingpro_2.11
tech.mlsql
- 2.1.0-SNAPSHOT
+ 2.1.1-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/external/mlsql-sql-profiler/pom.xml b/external/mlsql-sql-profiler/pom.xml
index 186ef4f79..06ec8a3c7 100644
--- a/external/mlsql-sql-profiler/pom.xml
+++ b/external/mlsql-sql-profiler/pom.xml
@@ -5,7 +5,7 @@
streamingpro_2.11
tech.mlsql
- 2.1.0-SNAPSHOT
+ 2.1.1-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/external/mlsql-watcher/pom.xml b/external/mlsql-watcher/pom.xml
index 34a088885..8ced3a6b7 100644
--- a/external/mlsql-watcher/pom.xml
+++ b/external/mlsql-watcher/pom.xml
@@ -5,7 +5,7 @@
streamingpro_2.11
tech.mlsql
- 2.1.0-SNAPSHOT
+ 2.1.1-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/external/python-controller/pom.xml b/external/python-controller/pom.xml
index 4cac745f0..08024c5fb 100644
--- a/external/python-controller/pom.xml
+++ b/external/python-controller/pom.xml
@@ -5,7 +5,7 @@
streamingpro_2.11
tech.mlsql
- 2.1.0-SNAPSHOT
+ 2.1.1-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/pom.xml b/pom.xml
index 214556413..db1d718c5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
tech.mlsql
streamingpro_2.11
pom
- 2.1.0-SNAPSHOT
+ 2.1.1-SNAPSHOT
StreamingPro Parent POM
https://github.com/allwefantasy/streamingpro
diff --git a/streamingpro-assembly/pom.xml b/streamingpro-assembly/pom.xml
index 8d818caba..4ff09a2ba 100644
--- a/streamingpro-assembly/pom.xml
+++ b/streamingpro-assembly/pom.xml
@@ -5,7 +5,7 @@
tech.mlsql
streamingpro_2.11
- 2.1.0-SNAPSHOT
+ 2.1.1-SNAPSHOT
../pom.xml
diff --git a/streamingpro-cluster/pom.xml b/streamingpro-cluster/pom.xml
index ed93b9366..c556f3442 100644
--- a/streamingpro-cluster/pom.xml
+++ b/streamingpro-cluster/pom.xml
@@ -5,7 +5,7 @@
streamingpro_2.11
tech.mlsql
- 2.1.0-SNAPSHOT
+ 2.1.1-SNAPSHOT
4.0.0
diff --git a/streamingpro-commons/pom.xml b/streamingpro-commons/pom.xml
index c4171a5e0..49b4ef557 100644
--- a/streamingpro-commons/pom.xml
+++ b/streamingpro-commons/pom.xml
@@ -5,7 +5,7 @@
streamingpro_2.11
tech.mlsql
- 2.1.0-SNAPSHOT
+ 2.1.1-SNAPSHOT
4.0.0
diff --git a/streamingpro-core/pom.xml b/streamingpro-core/pom.xml
index 77a391240..e32361d0d 100644
--- a/streamingpro-core/pom.xml
+++ b/streamingpro-core/pom.xml
@@ -5,7 +5,7 @@
streamingpro_2.11
tech.mlsql
- 2.1.0-SNAPSHOT
+ 2.1.1-SNAPSHOT
4.0.0
diff --git a/streamingpro-core/src/main/java/tech/mlsql/log/BaseHttpLogClient.scala b/streamingpro-core/src/main/java/tech/mlsql/log/BaseHttpLogClient.scala
index bd0b01556..1d5f93204 100644
--- a/streamingpro-core/src/main/java/tech/mlsql/log/BaseHttpLogClient.scala
+++ b/streamingpro-core/src/main/java/tech/mlsql/log/BaseHttpLogClient.scala
@@ -18,7 +18,7 @@
package tech.mlsql.log
-import org.apache.http.client.fluent.Request
+import org.apache.http.client.fluent.{Form, Request}
import org.apache.http.entity.ContentType
import streaming.log.WowLog
import tech.mlsql.arrow.python.runner.PythonConf
@@ -38,8 +38,8 @@ trait BaseHttpLogClient extends Logging with WowLog {
val token = _conf.getOrElse("spark.mlsql.log.driver.token", "mlsql")
iter.foreach { line =>
val body = SendLog(token, LogUtils.formatWithOwner(line, owner, groupId)).json
- Request.Post(url).bodyString(body, ContentType.APPLICATION_JSON.withCharset("utf8"))
- .addHeader("Content-Type", "application/x-www-form-urlencoded")
+ Request.Post(url).addHeader("Content-Type", "application/json")
+ .bodyString(body, ContentType.APPLICATION_JSON.withCharset("utf8"))
.execute()
}
diff --git a/streamingpro-core/src/main/java/tech/mlsql/log/DriverLogServer.scala b/streamingpro-core/src/main/java/tech/mlsql/log/DriverLogServer.scala
index 7f873e774..a54456789 100644
--- a/streamingpro-core/src/main/java/tech/mlsql/log/DriverLogServer.scala
+++ b/streamingpro-core/src/main/java/tech/mlsql/log/DriverLogServer.scala
@@ -18,6 +18,8 @@
package tech.mlsql.log
+import net.csdn.common.io.Streams
+
import java.util.concurrent.atomic.AtomicBoolean
import org.eclipse.jetty.server.{Request => JettyRequest}
import org.eclipse.jetty.server.Server
@@ -26,6 +28,8 @@ import tech.mlsql.common.utils.distribute.socket.server.Request
import tech.mlsql.common.utils.log.Logging
import tech.mlsql.common.utils.net.NetTool
import tech.mlsql.common.utils.serder.json.JsonUtils
+
+import java.io.InputStreamReader
import java.net.InetSocketAddress
import javax.servlet.http.{HttpServletRequest, HttpServletResponse}
@@ -86,15 +90,15 @@ class DriverLogServer(accessToken: String) extends BaseHttpLogServer with Loggin
url match {
case x: String if url.contains(requestMapping) =>
try {
- import scala.collection.JavaConverters._
- val params = request.getParameterMap.asScala
- var response: Any = null
+ val context = Streams.copyToString(new InputStreamReader(request.getInputStream, "UTF-8"))
+
+ var logRequest: Any = null
// We always set the complete sendLog in the key of the request parameters.
- if (params != null && params.nonEmpty) {
- response = JsonUtils.fromJson[LogRequest](params.keySet.head).
+ if (context != null && context.nonEmpty) {
+ logRequest = JsonUtils.fromJson[LogRequest](context).
asInstanceOf[ {def unwrap: Request[_]}].unwrap
}
- response match {
+ logRequest match {
case SendLog(token, logLine) =>
if (token != accessToken) {
logInfo(s"$url auth fail. token:$token")
diff --git a/streamingpro-dsl/pom.xml b/streamingpro-dsl/pom.xml
index 1a9451028..d4008dc92 100644
--- a/streamingpro-dsl/pom.xml
+++ b/streamingpro-dsl/pom.xml
@@ -5,7 +5,7 @@
streamingpro_2.11
tech.mlsql
- 2.1.0-SNAPSHOT
+ 2.1.1-SNAPSHOT
4.0.0
diff --git a/streamingpro-it/pom.xml b/streamingpro-it/pom.xml
index 7d030b8e7..afabbc62f 100644
--- a/streamingpro-it/pom.xml
+++ b/streamingpro-it/pom.xml
@@ -5,7 +5,7 @@
streamingpro_2.11
tech.mlsql
- 2.1.0-SNAPSHOT
+ 2.1.1-SNAPSHOT
4.0.0
diff --git a/streamingpro-mlsql/pom.xml b/streamingpro-mlsql/pom.xml
index 2a87a32c1..783198954 100644
--- a/streamingpro-mlsql/pom.xml
+++ b/streamingpro-mlsql/pom.xml
@@ -5,7 +5,7 @@
streamingpro_2.11
tech.mlsql
- 2.1.0-SNAPSHOT
+ 2.1.1-SNAPSHOT
4.0.0
diff --git a/streamingpro-spark-2.3.0-adaptor/pom.xml b/streamingpro-spark-2.3.0-adaptor/pom.xml
index 5074f1e3c..85efb962e 100644
--- a/streamingpro-spark-2.3.0-adaptor/pom.xml
+++ b/streamingpro-spark-2.3.0-adaptor/pom.xml
@@ -5,7 +5,7 @@
streamingpro_2.11
tech.mlsql
- 2.1.0-SNAPSHOT
+ 2.1.1-SNAPSHOT
4.0.0
diff --git a/streamingpro-spark-2.4.0-adaptor/pom.xml b/streamingpro-spark-2.4.0-adaptor/pom.xml
index b7b70c8b6..be8eb00ce 100644
--- a/streamingpro-spark-2.4.0-adaptor/pom.xml
+++ b/streamingpro-spark-2.4.0-adaptor/pom.xml
@@ -5,7 +5,7 @@
streamingpro_2.11
tech.mlsql
- 2.1.0-SNAPSHOT
+ 2.1.1-SNAPSHOT
4.0.0
diff --git a/streamingpro-spark-3.0.0-adaptor/pom.xml b/streamingpro-spark-3.0.0-adaptor/pom.xml
index 96c6c2eae..8b98e0a89 100644
--- a/streamingpro-spark-3.0.0-adaptor/pom.xml
+++ b/streamingpro-spark-3.0.0-adaptor/pom.xml
@@ -5,7 +5,7 @@
streamingpro_2.11
tech.mlsql
- 2.1.0-SNAPSHOT
+ 2.1.1-SNAPSHOT
4.0.0
diff --git a/streamingpro-spark-common/pom.xml b/streamingpro-spark-common/pom.xml
index 111f46fef..55d7286a7 100644
--- a/streamingpro-spark-common/pom.xml
+++ b/streamingpro-spark-common/pom.xml
@@ -5,7 +5,7 @@
streamingpro_2.11
tech.mlsql
- 2.1.0-SNAPSHOT
+ 2.1.1-SNAPSHOT
4.0.0