You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@linkis.apache.org by ca...@apache.org on 2022/09/05 02:50:13 UTC
[incubator-linkis] branch dev-1.3.1 updated: fix folder name executer to executor (#3240)
This is an automated email from the ASF dual-hosted git repository.
casion 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 c7e089d7a fix folder name executer to executor (#3240)
c7e089d7a is described below
commit c7e089d7a1db246fc7c380b81c437e030a132c53
Author: QuintinTao <72...@users.noreply.github.com>
AuthorDate: Mon Sep 5 10:50:08 2022 +0800
fix folder name executer to executor (#3240)
---
.../jdbc/{executer => executor}/JDBCEngineConnExecutor.scala | 2 +-
.../manager/engineplugin/jdbc/{executer => executor}/JDBCHelper.java | 2 +-
.../jdbc/{executer => executor}/JDBCMultiDatasourceParser.scala | 2 +-
.../engineplugin/jdbc/{executer => executor}/JDBCSQLCodeParser.scala | 2 +-
.../manager/engineplugin/jdbc/factory/JDBCEngineConnFactory.scala | 2 +-
.../jdbc/{executer => executor}/JDBCMultiDatasourceParserTest.scala | 2 +-
.../engineplugin/jdbc/executor}/TestJDBCEngineConnExecutor.scala | 5 +++--
7 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/linkis-engineconn-plugins/jdbc/src/main/scala/org/apache/linkis/manager/engineplugin/jdbc/executer/JDBCEngineConnExecutor.scala b/linkis-engineconn-plugins/jdbc/src/main/scala/org/apache/linkis/manager/engineplugin/jdbc/executor/JDBCEngineConnExecutor.scala
similarity index 99%
rename from linkis-engineconn-plugins/jdbc/src/main/scala/org/apache/linkis/manager/engineplugin/jdbc/executer/JDBCEngineConnExecutor.scala
rename to linkis-engineconn-plugins/jdbc/src/main/scala/org/apache/linkis/manager/engineplugin/jdbc/executor/JDBCEngineConnExecutor.scala
index 3341c076a..5423d6155 100644
--- a/linkis-engineconn-plugins/jdbc/src/main/scala/org/apache/linkis/manager/engineplugin/jdbc/executer/JDBCEngineConnExecutor.scala
+++ b/linkis-engineconn-plugins/jdbc/src/main/scala/org/apache/linkis/manager/engineplugin/jdbc/executor/JDBCEngineConnExecutor.scala
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.linkis.manager.engineplugin.jdbc.executer
+package org.apache.linkis.manager.engineplugin.jdbc.executor
import org.apache.linkis.common.conf.Configuration
import org.apache.linkis.common.utils.{OverloadUtils, Utils}
diff --git a/linkis-engineconn-plugins/jdbc/src/main/scala/org/apache/linkis/manager/engineplugin/jdbc/executer/JDBCHelper.java b/linkis-engineconn-plugins/jdbc/src/main/scala/org/apache/linkis/manager/engineplugin/jdbc/executor/JDBCHelper.java
similarity index 98%
rename from linkis-engineconn-plugins/jdbc/src/main/scala/org/apache/linkis/manager/engineplugin/jdbc/executer/JDBCHelper.java
rename to linkis-engineconn-plugins/jdbc/src/main/scala/org/apache/linkis/manager/engineplugin/jdbc/executor/JDBCHelper.java
index 792f034e8..35584c923 100644
--- a/linkis-engineconn-plugins/jdbc/src/main/scala/org/apache/linkis/manager/engineplugin/jdbc/executer/JDBCHelper.java
+++ b/linkis-engineconn-plugins/jdbc/src/main/scala/org/apache/linkis/manager/engineplugin/jdbc/executor/JDBCHelper.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.linkis.manager.engineplugin.jdbc.executer;
+package org.apache.linkis.manager.engineplugin.jdbc.executor;
import org.apache.linkis.storage.domain.*;
diff --git a/linkis-engineconn-plugins/jdbc/src/main/scala/org/apache/linkis/manager/engineplugin/jdbc/executer/JDBCMultiDatasourceParser.scala b/linkis-engineconn-plugins/jdbc/src/main/scala/org/apache/linkis/manager/engineplugin/jdbc/executor/JDBCMultiDatasourceParser.scala
similarity index 99%
rename from linkis-engineconn-plugins/jdbc/src/main/scala/org/apache/linkis/manager/engineplugin/jdbc/executer/JDBCMultiDatasourceParser.scala
rename to linkis-engineconn-plugins/jdbc/src/main/scala/org/apache/linkis/manager/engineplugin/jdbc/executor/JDBCMultiDatasourceParser.scala
index 25ecb13b4..16b139643 100644
--- a/linkis-engineconn-plugins/jdbc/src/main/scala/org/apache/linkis/manager/engineplugin/jdbc/executer/JDBCMultiDatasourceParser.scala
+++ b/linkis-engineconn-plugins/jdbc/src/main/scala/org/apache/linkis/manager/engineplugin/jdbc/executor/JDBCMultiDatasourceParser.scala
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.linkis.manager.engineplugin.jdbc.executer
+package org.apache.linkis.manager.engineplugin.jdbc.executor
import org.apache.linkis.common.utils.{JsonUtils, Logging, Utils}
import org.apache.linkis.datasource.client.impl.LinkisDataSourceRemoteClient
diff --git a/linkis-engineconn-plugins/jdbc/src/main/scala/org/apache/linkis/manager/engineplugin/jdbc/executer/JDBCSQLCodeParser.scala b/linkis-engineconn-plugins/jdbc/src/main/scala/org/apache/linkis/manager/engineplugin/jdbc/executor/JDBCSQLCodeParser.scala
similarity index 97%
rename from linkis-engineconn-plugins/jdbc/src/main/scala/org/apache/linkis/manager/engineplugin/jdbc/executer/JDBCSQLCodeParser.scala
rename to linkis-engineconn-plugins/jdbc/src/main/scala/org/apache/linkis/manager/engineplugin/jdbc/executor/JDBCSQLCodeParser.scala
index ee4dec4d7..3d71e2897 100644
--- a/linkis-engineconn-plugins/jdbc/src/main/scala/org/apache/linkis/manager/engineplugin/jdbc/executer/JDBCSQLCodeParser.scala
+++ b/linkis-engineconn-plugins/jdbc/src/main/scala/org/apache/linkis/manager/engineplugin/jdbc/executor/JDBCSQLCodeParser.scala
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.linkis.manager.engineplugin.jdbc.executer
+package org.apache.linkis.manager.engineplugin.jdbc.executor
import org.apache.linkis.manager.engineplugin.jdbc.conf.JDBCConfiguration
diff --git a/linkis-engineconn-plugins/jdbc/src/main/scala/org/apache/linkis/manager/engineplugin/jdbc/factory/JDBCEngineConnFactory.scala b/linkis-engineconn-plugins/jdbc/src/main/scala/org/apache/linkis/manager/engineplugin/jdbc/factory/JDBCEngineConnFactory.scala
index ef2daaa12..bcc039916 100644
--- a/linkis-engineconn-plugins/jdbc/src/main/scala/org/apache/linkis/manager/engineplugin/jdbc/factory/JDBCEngineConnFactory.scala
+++ b/linkis-engineconn-plugins/jdbc/src/main/scala/org/apache/linkis/manager/engineplugin/jdbc/factory/JDBCEngineConnFactory.scala
@@ -23,7 +23,7 @@ import org.apache.linkis.engineconn.common.engineconn.EngineConn
import org.apache.linkis.engineconn.computation.executor.creation.ComputationSingleExecutorEngineConnFactory
import org.apache.linkis.engineconn.executor.entity.LabelExecutor
import org.apache.linkis.manager.engineplugin.jdbc.conf.JDBCConfiguration
-import org.apache.linkis.manager.engineplugin.jdbc.executer.JDBCEngineConnExecutor
+import org.apache.linkis.manager.engineplugin.jdbc.executor.JDBCEngineConnExecutor
import org.apache.linkis.manager.label.entity.engine.{EngineType, RunType}
import org.apache.linkis.manager.label.entity.engine.EngineType.EngineType
import org.apache.linkis.manager.label.entity.engine.RunType.RunType
diff --git a/linkis-engineconn-plugins/jdbc/src/test/java/org/apache/linkis/manager/engineplugin/jdbc/executer/JDBCMultiDatasourceParserTest.scala b/linkis-engineconn-plugins/jdbc/src/test/java/org/apache/linkis/manager/engineplugin/jdbc/executor/JDBCMultiDatasourceParserTest.scala
similarity index 99%
rename from linkis-engineconn-plugins/jdbc/src/test/java/org/apache/linkis/manager/engineplugin/jdbc/executer/JDBCMultiDatasourceParserTest.scala
rename to linkis-engineconn-plugins/jdbc/src/test/java/org/apache/linkis/manager/engineplugin/jdbc/executor/JDBCMultiDatasourceParserTest.scala
index ecb8dcad6..173c01727 100644
--- a/linkis-engineconn-plugins/jdbc/src/test/java/org/apache/linkis/manager/engineplugin/jdbc/executer/JDBCMultiDatasourceParserTest.scala
+++ b/linkis-engineconn-plugins/jdbc/src/test/java/org/apache/linkis/manager/engineplugin/jdbc/executor/JDBCMultiDatasourceParserTest.scala
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.linkis.manager.engineplugin.jdbc.executer
+package org.apache.linkis.manager.engineplugin.jdbc.executor
import org.apache.linkis.datasourcemanager.common.domain.{DataSource, DataSourceType}
import org.apache.linkis.manager.engineplugin.jdbc.JdbcAuthType
diff --git a/linkis-engineconn-plugins/jdbc/src/test/scala/org.apache.linkis.manager.engineplugin.jdbc.executer/TestJDBCEngineConnExecutor.scala b/linkis-engineconn-plugins/jdbc/src/test/scala/org/apache/linkis/manager/engineplugin/jdbc/executor/TestJDBCEngineConnExecutor.scala
similarity index 97%
rename from linkis-engineconn-plugins/jdbc/src/test/scala/org.apache.linkis.manager.engineplugin.jdbc.executer/TestJDBCEngineConnExecutor.scala
rename to linkis-engineconn-plugins/jdbc/src/test/scala/org/apache/linkis/manager/engineplugin/jdbc/executor/TestJDBCEngineConnExecutor.scala
index 143066cf9..26b2a3644 100644
--- a/linkis-engineconn-plugins/jdbc/src/test/scala/org.apache.linkis.manager.engineplugin.jdbc.executer/TestJDBCEngineConnExecutor.scala
+++ b/linkis-engineconn-plugins/jdbc/src/test/scala/org/apache/linkis/manager/engineplugin/jdbc/executor/TestJDBCEngineConnExecutor.scala
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.linkis.manager.engineplugin.jdbc.executer
+package org.apache.linkis.manager.engineplugin.jdbc.executor
import org.apache.linkis.common.ServiceInstance
import org.apache.linkis.common.conf.CommonVars
@@ -31,6 +31,7 @@ import org.apache.linkis.governance.common.conf.GovernanceCommonConf
import org.apache.linkis.governance.common.entity.ExecutionNodeStatus
import org.apache.linkis.governance.common.utils.EngineConnArgumentsParser
import org.apache.linkis.manager.engineplugin.common.launch.process.Environment
+import org.apache.linkis.manager.engineplugin.jdbc.executor.JDBCEngineConnExecutor
import org.apache.linkis.manager.engineplugin.jdbc.factory.JDBCEngineConnFactory
import org.apache.linkis.manager.engineplugin.jdbc.monitor.ProgressMonitor
import org.apache.linkis.manager.label.builder.factory.{
@@ -156,7 +157,7 @@ class TestJDBCEngineConnExecutor {
}
ProgressMonitor.register(
"com.mysql.cj.jdbc.JdbcStatement",
- "org.apache.linkis.manager.engineplugin.jdbc.executer.TestJDBCEngineConnExecutor.TestMonitor"
+ "org.apache.linkis.manager.engineplugin.jdbc.executor.TestJDBCEngineConnExecutor.TestMonitor"
)
// val response = jdbcExecutor.executeLine(engineExecutionContext, cmd)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org