From 394e89771412bc52fb3ede2299396f7a8481c34f Mon Sep 17 00:00:00 2001 From: lwz9103 Date: Mon, 6 Sep 2021 17:01:42 +0800 Subject: [PATCH 1/3] update version to 2.1.0 --- external/mlsql-autosuggest/pom.xml | 4 ++-- external/mlsql-ets/pom.xml | 4 ++-- external/mlsql-healthy/pom.xml | 4 ++-- external/mlsql-lang/pom.xml | 4 ++-- external/mlsql-mysql-store/pom.xml | 2 +- external/mlsql-sql-profiler-30/pom.xml | 2 +- external/mlsql-sql-profiler/pom.xml | 2 +- external/mlsql-watcher/pom.xml | 2 +- external/python-controller/pom.xml | 2 +- pom.xml | 2 +- streamingpro-assembly/pom.xml | 2 +- streamingpro-cluster/pom.xml | 2 +- streamingpro-commons/pom.xml | 2 +- streamingpro-core/pom.xml | 2 +- streamingpro-dsl/pom.xml | 2 +- streamingpro-it/pom.xml | 2 +- streamingpro-mlsql/pom.xml | 2 +- streamingpro-spark-2.3.0-adaptor/pom.xml | 2 +- streamingpro-spark-2.4.0-adaptor/pom.xml | 2 +- streamingpro-spark-3.0.0-adaptor/pom.xml | 2 +- streamingpro-spark-common/pom.xml | 2 +- 21 files changed, 25 insertions(+), 25 deletions(-) diff --git a/external/mlsql-autosuggest/pom.xml b/external/mlsql-autosuggest/pom.xml index e0a4b46c5..67b55d85c 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.0 ../../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..0df9405a2 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.0 ../../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..da5681a36 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.0 ../../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..1fcef0303 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.0 ../../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..3a318298d 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.0 ../../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..75ce68df9 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.0 ../../pom.xml 4.0.0 diff --git a/external/mlsql-sql-profiler/pom.xml b/external/mlsql-sql-profiler/pom.xml index 186ef4f79..dfc984507 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.0 ../../pom.xml 4.0.0 diff --git a/external/mlsql-watcher/pom.xml b/external/mlsql-watcher/pom.xml index 34a088885..d6096e5ce 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.0 ../../pom.xml 4.0.0 diff --git a/external/python-controller/pom.xml b/external/python-controller/pom.xml index 4cac745f0..4863b431d 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.0 ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index 214556413..3202ace2c 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ tech.mlsql streamingpro_2.11 pom - 2.1.0-SNAPSHOT + 2.1.0 StreamingPro Parent POM https://github.com/allwefantasy/streamingpro diff --git a/streamingpro-assembly/pom.xml b/streamingpro-assembly/pom.xml index 8d818caba..f046b0e4a 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.0 ../pom.xml diff --git a/streamingpro-cluster/pom.xml b/streamingpro-cluster/pom.xml index ed93b9366..cd11edaca 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.0 4.0.0 diff --git a/streamingpro-commons/pom.xml b/streamingpro-commons/pom.xml index c4171a5e0..e97778cd9 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.0 4.0.0 diff --git a/streamingpro-core/pom.xml b/streamingpro-core/pom.xml index 77a391240..9a5c3e41f 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.0 4.0.0 diff --git a/streamingpro-dsl/pom.xml b/streamingpro-dsl/pom.xml index 1a9451028..b7c964a8a 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.0 4.0.0 diff --git a/streamingpro-it/pom.xml b/streamingpro-it/pom.xml index 7d030b8e7..a1e7f8437 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.0 4.0.0 diff --git a/streamingpro-mlsql/pom.xml b/streamingpro-mlsql/pom.xml index 2a87a32c1..64e1b5961 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.0 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..ed77c7a09 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.0 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..7b4c1a7ae 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.0 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..99d364e9f 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.0 4.0.0 diff --git a/streamingpro-spark-common/pom.xml b/streamingpro-spark-common/pom.xml index 111f46fef..fc8fe83dd 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.0 4.0.0 From 6a0277b88cf7681fa1ef53ee58d2a1e550deba77 Mon Sep 17 00:00:00 2001 From: "jiachuan.zhu" Date: Mon, 13 Sep 2021 10:43:33 +0800 Subject: [PATCH 2/3] Creating bugfix branch b-2.1.1 and changing version to 2.1.1-SNAPSHOT --- external/mlsql-autosuggest/pom.xml | 2 +- external/mlsql-ets/pom.xml | 2 +- external/mlsql-healthy/pom.xml | 2 +- external/mlsql-lang/pom.xml | 2 +- external/mlsql-mysql-store/pom.xml | 2 +- external/mlsql-sql-profiler-30/pom.xml | 2 +- external/mlsql-sql-profiler/pom.xml | 2 +- external/mlsql-watcher/pom.xml | 2 +- external/python-controller/pom.xml | 2 +- pom.xml | 2 +- streamingpro-assembly/pom.xml | 2 +- streamingpro-cluster/pom.xml | 2 +- streamingpro-commons/pom.xml | 2 +- streamingpro-core/pom.xml | 2 +- streamingpro-dsl/pom.xml | 2 +- streamingpro-it/pom.xml | 2 +- streamingpro-mlsql/pom.xml | 2 +- streamingpro-spark-2.3.0-adaptor/pom.xml | 2 +- streamingpro-spark-2.4.0-adaptor/pom.xml | 2 +- streamingpro-spark-3.0.0-adaptor/pom.xml | 2 +- streamingpro-spark-common/pom.xml | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/external/mlsql-autosuggest/pom.xml b/external/mlsql-autosuggest/pom.xml index 67b55d85c..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 + 2.1.1-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/external/mlsql-ets/pom.xml b/external/mlsql-ets/pom.xml index 0df9405a2..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 + 2.1.1-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/external/mlsql-healthy/pom.xml b/external/mlsql-healthy/pom.xml index da5681a36..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 + 2.1.1-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/external/mlsql-lang/pom.xml b/external/mlsql-lang/pom.xml index 1fcef0303..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 + 2.1.1-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/external/mlsql-mysql-store/pom.xml b/external/mlsql-mysql-store/pom.xml index 3a318298d..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 + 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 75ce68df9..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 + 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 dfc984507..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 + 2.1.1-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/external/mlsql-watcher/pom.xml b/external/mlsql-watcher/pom.xml index d6096e5ce..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 + 2.1.1-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/external/python-controller/pom.xml b/external/python-controller/pom.xml index 4863b431d..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 + 2.1.1-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index 3202ace2c..db1d718c5 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ tech.mlsql streamingpro_2.11 pom - 2.1.0 + 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 f046b0e4a..4ff09a2ba 100644 --- a/streamingpro-assembly/pom.xml +++ b/streamingpro-assembly/pom.xml @@ -5,7 +5,7 @@ tech.mlsql streamingpro_2.11 - 2.1.0 + 2.1.1-SNAPSHOT ../pom.xml diff --git a/streamingpro-cluster/pom.xml b/streamingpro-cluster/pom.xml index cd11edaca..c556f3442 100644 --- a/streamingpro-cluster/pom.xml +++ b/streamingpro-cluster/pom.xml @@ -5,7 +5,7 @@ streamingpro_2.11 tech.mlsql - 2.1.0 + 2.1.1-SNAPSHOT 4.0.0 diff --git a/streamingpro-commons/pom.xml b/streamingpro-commons/pom.xml index e97778cd9..49b4ef557 100644 --- a/streamingpro-commons/pom.xml +++ b/streamingpro-commons/pom.xml @@ -5,7 +5,7 @@ streamingpro_2.11 tech.mlsql - 2.1.0 + 2.1.1-SNAPSHOT 4.0.0 diff --git a/streamingpro-core/pom.xml b/streamingpro-core/pom.xml index 9a5c3e41f..e32361d0d 100644 --- a/streamingpro-core/pom.xml +++ b/streamingpro-core/pom.xml @@ -5,7 +5,7 @@ streamingpro_2.11 tech.mlsql - 2.1.0 + 2.1.1-SNAPSHOT 4.0.0 diff --git a/streamingpro-dsl/pom.xml b/streamingpro-dsl/pom.xml index b7c964a8a..d4008dc92 100644 --- a/streamingpro-dsl/pom.xml +++ b/streamingpro-dsl/pom.xml @@ -5,7 +5,7 @@ streamingpro_2.11 tech.mlsql - 2.1.0 + 2.1.1-SNAPSHOT 4.0.0 diff --git a/streamingpro-it/pom.xml b/streamingpro-it/pom.xml index a1e7f8437..afabbc62f 100644 --- a/streamingpro-it/pom.xml +++ b/streamingpro-it/pom.xml @@ -5,7 +5,7 @@ streamingpro_2.11 tech.mlsql - 2.1.0 + 2.1.1-SNAPSHOT 4.0.0 diff --git a/streamingpro-mlsql/pom.xml b/streamingpro-mlsql/pom.xml index 64e1b5961..783198954 100644 --- a/streamingpro-mlsql/pom.xml +++ b/streamingpro-mlsql/pom.xml @@ -5,7 +5,7 @@ streamingpro_2.11 tech.mlsql - 2.1.0 + 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 ed77c7a09..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 + 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 7b4c1a7ae..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 + 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 99d364e9f..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 + 2.1.1-SNAPSHOT 4.0.0 diff --git a/streamingpro-spark-common/pom.xml b/streamingpro-spark-common/pom.xml index fc8fe83dd..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 + 2.1.1-SNAPSHOT 4.0.0 From 85778cc81b474541f7c62d455831ac90d65770c1 Mon Sep 17 00:00:00 2001 From: hellozepp Date: Tue, 7 Sep 2021 17:54:39 +0800 Subject: [PATCH 3/3] Change ContentType to application/json --- .../java/tech/mlsql/log/BaseHttpLogClient.scala | 6 +++--- .../java/tech/mlsql/log/DriverLogServer.scala | 16 ++++++++++------ 2 files changed, 13 insertions(+), 9 deletions(-) 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")