This is an automated email from the ASF dual-hosted git repository.
casion pushed a commit to branch dev-1.1.1
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
The following commit(s) were added to refs/heads/dev-1.1.1 by this push:
new 83159c1 Fix Flinki plugin getEngineConnLaunchBuilder implementation
judgment error (#1885)
83159c1 is described below
commit 83159c14dd708260986b6466d6aa31a34f90d427
Author: peacewong <[email protected]>
AuthorDate: Sat Apr 2 18:17:24 2022 +0800
Fix Flinki plugin getEngineConnLaunchBuilder implementation judgment error
(#1885)
* rename scalar-->scala
* fix issue #1884
---
.../engineconnplugin/flink/FlinkEngineConnPlugin.scala | 17 +++++++----------
.../engineplugin/openlookeng/OpenLooKengECPlugin.scala | 0
.../factory/OpenLooKengEngineConnFactory.scala | 0
3 files changed, 7 insertions(+), 10 deletions(-)
diff --git
a/linkis-engineconn-plugins/engineconn-plugins/flink/src/main/scala/org/apache/linkis/engineconnplugin/flink/FlinkEngineConnPlugin.scala
b/linkis-engineconn-plugins/engineconn-plugins/flink/src/main/scala/org/apache/linkis/engineconnplugin/flink/FlinkEngineConnPlugin.scala
index 852c7f2..c5267dc 100644
---
a/linkis-engineconn-plugins/engineconn-plugins/flink/src/main/scala/org/apache/linkis/engineconnplugin/flink/FlinkEngineConnPlugin.scala
+++
b/linkis-engineconn-plugins/engineconn-plugins/flink/src/main/scala/org/apache/linkis/engineconnplugin/flink/FlinkEngineConnPlugin.scala
@@ -30,32 +30,29 @@ import org.apache.linkis.manager.label.entity.Label
class FlinkEngineConnPlugin extends EngineConnPlugin {
private var engineResourceFactory: EngineResourceFactory = _
- private var engineConnLaunchBuilder: EngineConnLaunchBuilder = _
+
private var engineConnFactory: EngineConnFactory = _
- private val lock = new Array[Byte](0)
+ private val resourceLocker = new Array[Byte](0)
+
+ private val engineFactoryLocker = new Array[Byte](0)
override def init(params: java.util.Map[String, Any]): Unit = {}
override def getEngineResourceFactory: EngineResourceFactory = {
- if (null == engineResourceFactory) lock.synchronized {
+ if (null == engineResourceFactory) resourceLocker.synchronized {
if (null == engineResourceFactory) engineResourceFactory = new
FlinkEngineConnResourceFactory
}
engineResourceFactory
}
override def getEngineConnLaunchBuilder: EngineConnLaunchBuilder = {
- if (null == engineResourceFactory) lock.synchronized {
- if (null == engineConnLaunchBuilder) {
- engineConnLaunchBuilder = new FlinkEngineConnLaunchBuilder()
- }
- }
- engineConnLaunchBuilder
+ new FlinkEngineConnLaunchBuilder()
}
override def getEngineConnFactory: EngineConnFactory = {
- if (null == engineConnFactory) lock.synchronized {
+ if (null == engineConnFactory) engineFactoryLocker.synchronized {
if (null == engineConnFactory) {
engineConnFactory = new FlinkEngineConnFactory
}
diff --git
a/linkis-engineconn-plugins/engineconn-plugins/openlookeng/src/main/scalar/org/apache/linkis/engineplugin/openlookeng/OpenLooKengECPlugin.scala
b/linkis-engineconn-plugins/engineconn-plugins/openlookeng/src/main/scala/org/apache/linkis/engineplugin/openlookeng/OpenLooKengECPlugin.scala
similarity index 100%
rename from
linkis-engineconn-plugins/engineconn-plugins/openlookeng/src/main/scalar/org/apache/linkis/engineplugin/openlookeng/OpenLooKengECPlugin.scala
rename to
linkis-engineconn-plugins/engineconn-plugins/openlookeng/src/main/scala/org/apache/linkis/engineplugin/openlookeng/OpenLooKengECPlugin.scala
diff --git
a/linkis-engineconn-plugins/engineconn-plugins/openlookeng/src/main/scalar/org/apache/linkis/engineplugin/openlookeng/factory/OpenLooKengEngineConnFactory.scala
b/linkis-engineconn-plugins/engineconn-plugins/openlookeng/src/main/scala/org/apache/linkis/engineplugin/openlookeng/factory/OpenLooKengEngineConnFactory.scala
similarity index 100%
rename from
linkis-engineconn-plugins/engineconn-plugins/openlookeng/src/main/scalar/org/apache/linkis/engineplugin/openlookeng/factory/OpenLooKengEngineConnFactory.scala
rename to
linkis-engineconn-plugins/engineconn-plugins/openlookeng/src/main/scala/org/apache/linkis/engineplugin/openlookeng/factory/OpenLooKengEngineConnFactory.scala
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
