You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@linkis.apache.org by pe...@apache.org on 2022/10/10 09:23:54 UTC
[incubator-linkis] branch dev-1.3.1 updated: modify folder name executer to executor (#3552)
This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch dev-1.3.1
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
The following commit(s) were added to refs/heads/dev-1.3.1 by this push:
new 8d5bf2955 modify folder name executer to executor (#3552)
8d5bf2955 is described below
commit 8d5bf29559f7a2e8d112e83482ab50fcef648f09
Author: QuintinTao <72...@users.noreply.github.com>
AuthorDate: Mon Oct 10 17:23:48 2022 +0800
modify folder name executer to executor (#3552)
* modify folder name executer to executor
---
.../ElasticSearchEngineConnExecutor.scala | 6 +++---
.../ElasticSearchExecutorOrder.scala | 2 +-
.../client/ElasticSearchExecutor.scala | 4 ++--
.../client/ElasticSearchResponse.scala | 2 +-
.../{executer => executor}/client/EsClient.scala | 2 +-
.../client/EsClientFactory.scala | 2 +-
.../client/ResponseHandler.scala | 4 ++--
.../client/impl/ElasticSearchExecutorImpl.scala | 6 +++---
.../client/impl/ResponseHandlerImpl.scala | 8 ++++----
.../factory/ElasticSearchJsonExecutorFactory.scala | 2 +-
.../factory/ElasticSearchSqlExecutorFactory.scala | 2 +-
.../TestElasticSearchEngineConnPlugin.scala} | 19 ++++++++++++++-----
12 files changed, 34 insertions(+), 25 deletions(-)
diff --git a/linkis-engineconn-plugins/elasticsearch/src/main/scala/org/apache/linkis/engineplugin/elasticsearch/executer/ElasticSearchEngineConnExecutor.scala b/linkis-engineconn-plugins/elasticsearch/src/main/scala/org/apache/linkis/engineplugin/elasticsearch/executor/ElasticSearchEngineConnExecutor.scala
similarity index 97%
rename from linkis-engineconn-plugins/elasticsearch/src/main/scala/org/apache/linkis/engineplugin/elasticsearch/executer/ElasticSearchEngineConnExecutor.scala
rename to linkis-engineconn-plugins/elasticsearch/src/main/scala/org/apache/linkis/engineplugin/elasticsearch/executor/ElasticSearchEngineConnExecutor.scala
index e99b0aefa..d20448127 100644
--- a/linkis-engineconn-plugins/elasticsearch/src/main/scala/org/apache/linkis/engineplugin/elasticsearch/executer/ElasticSearchEngineConnExecutor.scala
+++ b/linkis-engineconn-plugins/elasticsearch/src/main/scala/org/apache/linkis/engineplugin/elasticsearch/executor/ElasticSearchEngineConnExecutor.scala
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.linkis.engineplugin.elasticsearch.executer
+package org.apache.linkis.engineplugin.elasticsearch.executor
import org.apache.linkis.common.utils.{Logging, OverloadUtils, Utils}
import org.apache.linkis.engineconn.common.conf.{EngineConnConf, EngineConnConstant}
@@ -29,13 +29,13 @@ import org.apache.linkis.engineplugin.elasticsearch.conf.{
ElasticSearchConfiguration,
ElasticSearchEngineConsoleConf
}
-import org.apache.linkis.engineplugin.elasticsearch.executer.client.{
+import org.apache.linkis.engineplugin.elasticsearch.executor.client.{
ElasticSearchErrorResponse,
ElasticSearchExecutor,
ElasticSearchJsonResponse,
ElasticSearchTableResponse
}
-import org.apache.linkis.engineplugin.elasticsearch.executer.client.ElasticSearchErrorResponse
+import org.apache.linkis.engineplugin.elasticsearch.executor.client.ElasticSearchErrorResponse
import org.apache.linkis.governance.common.entity.ExecutionNodeStatus
import org.apache.linkis.manager.common.entity.resource.{
CommonNodeResource,
diff --git a/linkis-engineconn-plugins/elasticsearch/src/main/scala/org/apache/linkis/engineplugin/elasticsearch/executer/ElasticSearchExecutorOrder.scala b/linkis-engineconn-plugins/elasticsearch/src/main/scala/org/apache/linkis/engineplugin/elasticsearch/executor/ElasticSearchExecutorOrder.scala
similarity index 93%
copy from linkis-engineconn-plugins/elasticsearch/src/main/scala/org/apache/linkis/engineplugin/elasticsearch/executer/ElasticSearchExecutorOrder.scala
copy to linkis-engineconn-plugins/elasticsearch/src/main/scala/org/apache/linkis/engineplugin/elasticsearch/executor/ElasticSearchExecutorOrder.scala
index 29f424d87..ea49f9fe2 100644
--- a/linkis-engineconn-plugins/elasticsearch/src/main/scala/org/apache/linkis/engineplugin/elasticsearch/executer/ElasticSearchExecutorOrder.scala
+++ b/linkis-engineconn-plugins/elasticsearch/src/main/scala/org/apache/linkis/engineplugin/elasticsearch/executor/ElasticSearchExecutorOrder.scala
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.linkis.engineplugin.elasticsearch.executer
+package org.apache.linkis.engineplugin.elasticsearch.executor
object ElasticSearchExecutorOrder extends Enumeration {
diff --git a/linkis-engineconn-plugins/elasticsearch/src/main/scala/org/apache/linkis/engineplugin/elasticsearch/executer/client/ElasticSearchExecutor.scala b/linkis-engineconn-plugins/elasticsearch/src/main/scala/org/apache/linkis/engineplugin/elasticsearch/executor/client/ElasticSearchExecutor.scala
similarity index 91%
rename from linkis-engineconn-plugins/elasticsearch/src/main/scala/org/apache/linkis/engineplugin/elasticsearch/executer/client/ElasticSearchExecutor.scala
rename to linkis-engineconn-plugins/elasticsearch/src/main/scala/org/apache/linkis/engineplugin/elasticsearch/executor/client/ElasticSearchExecutor.scala
index f4eb778c4..72e1953e3 100644
--- a/linkis-engineconn-plugins/elasticsearch/src/main/scala/org/apache/linkis/engineplugin/elasticsearch/executer/client/ElasticSearchExecutor.scala
+++ b/linkis-engineconn-plugins/elasticsearch/src/main/scala/org/apache/linkis/engineplugin/elasticsearch/executor/client/ElasticSearchExecutor.scala
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package org.apache.linkis.engineplugin.elasticsearch.executer.client
+package org.apache.linkis.engineplugin.elasticsearch.executor.client
import org.apache.linkis.common.utils.Logging
-import org.apache.linkis.engineplugin.elasticsearch.executer.client.impl.ElasticSearchExecutorImpl
+import org.apache.linkis.engineplugin.elasticsearch.executor.client.impl.ElasticSearchExecutorImpl
import org.apache.linkis.scheduler.executer.ExecuteResponse
import java.io.IOException
diff --git a/linkis-engineconn-plugins/elasticsearch/src/main/scala/org/apache/linkis/engineplugin/elasticsearch/executer/client/ElasticSearchResponse.scala b/linkis-engineconn-plugins/elasticsearch/src/main/scala/org/apache/linkis/engineplugin/elasticsearch/executor/client/ElasticSearchResponse.scala
similarity index 95%
rename from linkis-engineconn-plugins/elasticsearch/src/main/scala/org/apache/linkis/engineplugin/elasticsearch/executer/client/ElasticSearchResponse.scala
rename to linkis-engineconn-plugins/elasticsearch/src/main/scala/org/apache/linkis/engineplugin/elasticsearch/executor/client/ElasticSearchResponse.scala
index 13a5716e3..b01b10955 100644
--- a/linkis-engineconn-plugins/elasticsearch/src/main/scala/org/apache/linkis/engineplugin/elasticsearch/executer/client/ElasticSearchResponse.scala
+++ b/linkis-engineconn-plugins/elasticsearch/src/main/scala/org/apache/linkis/engineplugin/elasticsearch/executor/client/ElasticSearchResponse.scala
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.linkis.engineplugin.elasticsearch.executer.client
+package org.apache.linkis.engineplugin.elasticsearch.executor.client
import org.apache.linkis.storage.domain.Column
import org.apache.linkis.storage.resultset.table.TableRecord
diff --git a/linkis-engineconn-plugins/elasticsearch/src/main/scala/org/apache/linkis/engineplugin/elasticsearch/executer/client/EsClient.scala b/linkis-engineconn-plugins/elasticsearch/src/main/scala/org/apache/linkis/engineplugin/elasticsearch/executor/client/EsClient.scala
similarity index 98%
rename from linkis-engineconn-plugins/elasticsearch/src/main/scala/org/apache/linkis/engineplugin/elasticsearch/executer/client/EsClient.scala
rename to linkis-engineconn-plugins/elasticsearch/src/main/scala/org/apache/linkis/engineplugin/elasticsearch/executor/client/EsClient.scala
index 5ad65aa0d..8b894b466 100644
--- a/linkis-engineconn-plugins/elasticsearch/src/main/scala/org/apache/linkis/engineplugin/elasticsearch/executer/client/EsClient.scala
+++ b/linkis-engineconn-plugins/elasticsearch/src/main/scala/org/apache/linkis/engineplugin/elasticsearch/executor/client/EsClient.scala
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.linkis.engineplugin.elasticsearch.executer.client
+package org.apache.linkis.engineplugin.elasticsearch.executor.client
import org.apache.linkis.common.utils.Utils
import org.apache.linkis.engineplugin.elasticsearch.conf.ElasticSearchConfiguration._
diff --git a/linkis-engineconn-plugins/elasticsearch/src/main/scala/org/apache/linkis/engineplugin/elasticsearch/executer/client/EsClientFactory.scala b/linkis-engineconn-plugins/elasticsearch/src/main/scala/org/apache/linkis/engineplugin/elasticsearch/executor/client/EsClientFactory.scala
similarity index 98%
rename from linkis-engineconn-plugins/elasticsearch/src/main/scala/org/apache/linkis/engineplugin/elasticsearch/executer/client/EsClientFactory.scala
rename to linkis-engineconn-plugins/elasticsearch/src/main/scala/org/apache/linkis/engineplugin/elasticsearch/executor/client/EsClientFactory.scala
index eef332420..c4e3ef17f 100644
--- a/linkis-engineconn-plugins/elasticsearch/src/main/scala/org/apache/linkis/engineplugin/elasticsearch/executer/client/EsClientFactory.scala
+++ b/linkis-engineconn-plugins/elasticsearch/src/main/scala/org/apache/linkis/engineplugin/elasticsearch/executor/client/EsClientFactory.scala
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.linkis.engineplugin.elasticsearch.executer.client
+package org.apache.linkis.engineplugin.elasticsearch.executor.client
import org.apache.linkis.common.conf.CommonVars
import org.apache.linkis.engineplugin.elasticsearch.conf.ElasticSearchConfiguration._
diff --git a/linkis-engineconn-plugins/elasticsearch/src/main/scala/org/apache/linkis/engineplugin/elasticsearch/executer/client/ResponseHandler.scala b/linkis-engineconn-plugins/elasticsearch/src/main/scala/org/apache/linkis/engineplugin/elasticsearch/executor/client/ResponseHandler.scala
similarity index 95%
rename from linkis-engineconn-plugins/elasticsearch/src/main/scala/org/apache/linkis/engineplugin/elasticsearch/executer/client/ResponseHandler.scala
rename to linkis-engineconn-plugins/elasticsearch/src/main/scala/org/apache/linkis/engineplugin/elasticsearch/executor/client/ResponseHandler.scala
index 2b3317624..d259ea7b6 100644
--- a/linkis-engineconn-plugins/elasticsearch/src/main/scala/org/apache/linkis/engineplugin/elasticsearch/executer/client/ResponseHandler.scala
+++ b/linkis-engineconn-plugins/elasticsearch/src/main/scala/org/apache/linkis/engineplugin/elasticsearch/executor/client/ResponseHandler.scala
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package org.apache.linkis.engineplugin.elasticsearch.executer.client
+package org.apache.linkis.engineplugin.elasticsearch.executor.client
import org.apache.linkis.common.utils.Logging
-import org.apache.linkis.engineplugin.elasticsearch.executer.client.impl.ResponseHandlerImpl
+import org.apache.linkis.engineplugin.elasticsearch.executor.client.impl.ResponseHandlerImpl
import org.apache.linkis.storage.domain._
import java.util.Locale
diff --git a/linkis-engineconn-plugins/elasticsearch/src/main/scala/org/apache/linkis/engineplugin/elasticsearch/executer/client/impl/ElasticSearchExecutorImpl.scala b/linkis-engineconn-plugins/elasticsearch/src/main/scala/org/apache/linkis/engineplugin/elasticsearch/executor/client/impl/ElasticSearchExecutorImpl.scala
similarity index 95%
rename from linkis-engineconn-plugins/elasticsearch/src/main/scala/org/apache/linkis/engineplugin/elasticsearch/executer/client/impl/ElasticSearchExecutorImpl.scala
rename to linkis-engineconn-plugins/elasticsearch/src/main/scala/org/apache/linkis/engineplugin/elasticsearch/executor/client/impl/ElasticSearchExecutorImpl.scala
index 7237145d5..8d910c023 100644
--- a/linkis-engineconn-plugins/elasticsearch/src/main/scala/org/apache/linkis/engineplugin/elasticsearch/executer/client/impl/ElasticSearchExecutorImpl.scala
+++ b/linkis-engineconn-plugins/elasticsearch/src/main/scala/org/apache/linkis/engineplugin/elasticsearch/executor/client/impl/ElasticSearchExecutorImpl.scala
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.linkis.engineplugin.elasticsearch.executer.client.impl
+package org.apache.linkis.engineplugin.elasticsearch.executor.client.impl
import org.apache.linkis.common.utils.Utils
import org.apache.linkis.engineplugin.elasticsearch.conf.ElasticSearchConfiguration
import org.apache.linkis.engineplugin.elasticsearch.exception.EsConvertResponseException
-import org.apache.linkis.engineplugin.elasticsearch.executer.client.{
+import org.apache.linkis.engineplugin.elasticsearch.executor.client.{
ElasticSearchErrorResponse,
ElasticSearchExecutor,
ElasticSearchResponse,
@@ -28,7 +28,7 @@ import org.apache.linkis.engineplugin.elasticsearch.executer.client.{
EsClientFactory,
ResponseHandler
}
-import org.apache.linkis.engineplugin.elasticsearch.executer.client.ResponseHandler
+import org.apache.linkis.engineplugin.elasticsearch.executor.client.ResponseHandler
import org.apache.linkis.protocol.constants.TaskConstant
import org.apache.linkis.scheduler.executer.{
AliasOutputExecuteResponse,
diff --git a/linkis-engineconn-plugins/elasticsearch/src/main/scala/org/apache/linkis/engineplugin/elasticsearch/executer/client/impl/ResponseHandlerImpl.scala b/linkis-engineconn-plugins/elasticsearch/src/main/scala/org/apache/linkis/engineplugin/elasticsearch/executor/client/impl/ResponseHandlerImpl.scala
similarity index 95%
rename from linkis-engineconn-plugins/elasticsearch/src/main/scala/org/apache/linkis/engineplugin/elasticsearch/executer/client/impl/ResponseHandlerImpl.scala
rename to linkis-engineconn-plugins/elasticsearch/src/main/scala/org/apache/linkis/engineplugin/elasticsearch/executor/client/impl/ResponseHandlerImpl.scala
index 9371971a2..23e6a4cba 100644
--- a/linkis-engineconn-plugins/elasticsearch/src/main/scala/org/apache/linkis/engineplugin/elasticsearch/executer/client/impl/ResponseHandlerImpl.scala
+++ b/linkis-engineconn-plugins/elasticsearch/src/main/scala/org/apache/linkis/engineplugin/elasticsearch/executor/client/impl/ResponseHandlerImpl.scala
@@ -15,18 +15,18 @@
* limitations under the License.
*/
-package org.apache.linkis.engineplugin.elasticsearch.executer.client.impl
+package org.apache.linkis.engineplugin.elasticsearch.executor.client.impl
import org.apache.linkis.common.utils.Utils
import org.apache.linkis.engineplugin.elasticsearch.exception.EsConvertResponseException
-import org.apache.linkis.engineplugin.elasticsearch.executer.client.{
+import org.apache.linkis.engineplugin.elasticsearch.executor.client.{
ElasticSearchJsonResponse,
ElasticSearchResponse,
ElasticSearchTableResponse,
ResponseHandler
}
-import org.apache.linkis.engineplugin.elasticsearch.executer.client.ResponseHandler
-import org.apache.linkis.engineplugin.elasticsearch.executer.client.ResponseHandler._
+import org.apache.linkis.engineplugin.elasticsearch.executor.client.ResponseHandler
+import org.apache.linkis.engineplugin.elasticsearch.executor.client.ResponseHandler._
import org.apache.linkis.storage.domain._
import org.apache.linkis.storage.resultset.table.TableRecord
diff --git a/linkis-engineconn-plugins/elasticsearch/src/main/scala/org/apache/linkis/engineplugin/elasticsearch/factory/ElasticSearchJsonExecutorFactory.scala b/linkis-engineconn-plugins/elasticsearch/src/main/scala/org/apache/linkis/engineplugin/elasticsearch/factory/ElasticSearchJsonExecutorFactory.scala
index c3937d1a7..efee33041 100644
--- a/linkis-engineconn-plugins/elasticsearch/src/main/scala/org/apache/linkis/engineplugin/elasticsearch/factory/ElasticSearchJsonExecutorFactory.scala
+++ b/linkis-engineconn-plugins/elasticsearch/src/main/scala/org/apache/linkis/engineplugin/elasticsearch/factory/ElasticSearchJsonExecutorFactory.scala
@@ -22,7 +22,7 @@ import org.apache.linkis.engineconn.common.engineconn.EngineConn
import org.apache.linkis.engineconn.computation.executor.creation.ComputationExecutorFactory
import org.apache.linkis.engineconn.computation.executor.execute.ComputationExecutor
import org.apache.linkis.engineplugin.elasticsearch.conf.ElasticSearchConfiguration
-import org.apache.linkis.engineplugin.elasticsearch.executer.ElasticSearchEngineConnExecutor
+import org.apache.linkis.engineplugin.elasticsearch.executor.ElasticSearchEngineConnExecutor
import org.apache.linkis.governance.common.paser.JsonCodeParser
import org.apache.linkis.manager.label.entity.Label
import org.apache.linkis.manager.label.entity.engine.RunType
diff --git a/linkis-engineconn-plugins/elasticsearch/src/main/scala/org/apache/linkis/engineplugin/elasticsearch/factory/ElasticSearchSqlExecutorFactory.scala b/linkis-engineconn-plugins/elasticsearch/src/main/scala/org/apache/linkis/engineplugin/elasticsearch/factory/ElasticSearchSqlExecutorFactory.scala
index 63496b64d..a32d6c937 100644
--- a/linkis-engineconn-plugins/elasticsearch/src/main/scala/org/apache/linkis/engineplugin/elasticsearch/factory/ElasticSearchSqlExecutorFactory.scala
+++ b/linkis-engineconn-plugins/elasticsearch/src/main/scala/org/apache/linkis/engineplugin/elasticsearch/factory/ElasticSearchSqlExecutorFactory.scala
@@ -23,7 +23,7 @@ import org.apache.linkis.engineconn.computation.executor.creation.ComputationExe
import org.apache.linkis.engineconn.computation.executor.execute.ComputationExecutor
import org.apache.linkis.engineconn.core.executor.ExecutorManager
import org.apache.linkis.engineplugin.elasticsearch.conf.ElasticSearchConfiguration
-import org.apache.linkis.engineplugin.elasticsearch.executer.ElasticSearchEngineConnExecutor
+import org.apache.linkis.engineplugin.elasticsearch.executor.ElasticSearchEngineConnExecutor
import org.apache.linkis.governance.common.paser.SQLCodeParser
import org.apache.linkis.manager.label.entity.Label
import org.apache.linkis.manager.label.entity.engine.RunType
diff --git a/linkis-engineconn-plugins/elasticsearch/src/main/scala/org/apache/linkis/engineplugin/elasticsearch/executer/ElasticSearchExecutorOrder.scala b/linkis-engineconn-plugins/elasticsearch/src/test/scala/org/apache/linkis/engineplugin/elasticsearch/TestElasticSearchEngineConnPlugin.scala
similarity index 55%
rename from linkis-engineconn-plugins/elasticsearch/src/main/scala/org/apache/linkis/engineplugin/elasticsearch/executer/ElasticSearchExecutorOrder.scala
rename to linkis-engineconn-plugins/elasticsearch/src/test/scala/org/apache/linkis/engineplugin/elasticsearch/TestElasticSearchEngineConnPlugin.scala
index 29f424d87..4b854d9cf 100644
--- a/linkis-engineconn-plugins/elasticsearch/src/main/scala/org/apache/linkis/engineplugin/elasticsearch/executer/ElasticSearchExecutorOrder.scala
+++ b/linkis-engineconn-plugins/elasticsearch/src/test/scala/org/apache/linkis/engineplugin/elasticsearch/TestElasticSearchEngineConnPlugin.scala
@@ -15,11 +15,20 @@
* limitations under the License.
*/
-package org.apache.linkis.engineplugin.elasticsearch.executer
+package org.apache.linkis.engineplugin.elasticsearch
-object ElasticSearchExecutorOrder extends Enumeration {
+import org.junit.jupiter.api.{Assertions, Test}
+
+class TestElasticSearchEngineConnPlugin {
+
+ @Test
+ def testGetEngineResourceFactory: Unit = {
+ val elasticSearchEngineConnPlugin = new ElasticSearchEngineConnPlugin
+ elasticSearchEngineConnPlugin.init(null)
+ Assertions.assertNotNull(elasticSearchEngineConnPlugin.getEngineConnFactory)
+ Assertions.assertNotNull(elasticSearchEngineConnPlugin.getEngineConnLaunchBuilder)
+ Assertions.assertNotNull(elasticSearchEngineConnPlugin.getEngineResourceFactory)
+ Assertions.assertNotNull(elasticSearchEngineConnPlugin.getDefaultLabels)
+ }
- type ElasticSearchExecutorOrder = Value
- val SQL = Value(1)
- val JSON = Value(3)
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org