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/10/18 01:48:42 UTC
[incubator-linkis] branch dev-1.3.1 updated: fix: update selete to select (#3674)
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 6920bde05 fix: update selete to select (#3674)
6920bde05 is described below
commit 6920bde05ad95d7da3ff6bd895c2bee3726ef854
Author: ruY <43...@users.noreply.github.com>
AuthorDate: Tue Oct 18 09:48:36 2022 +0800
fix: update selete to select (#3674)
---
.../main/java/org/apache/linkis/configuration/dao/ConfigMapper.java | 2 +-
.../java/org/apache/linkis/configuration/dao/impl/ConfigMapper.xml | 2 +-
.../linkis/configuration/service/impl/ConfigKeyServiceImpl.java | 4 ++--
.../apache/linkis/configuration/service/ConfigurationService.scala | 2 +-
.../java/org/apache/linkis/configuration/dao/ConfigMapperTest.java | 4 ++--
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/dao/ConfigMapper.java b/linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/dao/ConfigMapper.java
index 55294398b..cd6d8ce9d 100644
--- a/linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/dao/ConfigMapper.java
+++ b/linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/dao/ConfigMapper.java
@@ -55,7 +55,7 @@ public interface ConfigMapper {
ConfigKey selectKeyByKeyID(@Param("id") Long keyID);
- List<ConfigKey> seleteKeyByKeyName(@Param("keyName") String keyName);
+ List<ConfigKey> selectKeyByKeyName(@Param("keyName") String keyName);
List<ConfigKey> listKeyByStringValue(@Param("stringValue") String stringValue);
diff --git a/linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/dao/impl/ConfigMapper.xml b/linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/dao/impl/ConfigMapper.xml
index b22b135b2..7dafb0a39 100644
--- a/linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/dao/impl/ConfigMapper.xml
+++ b/linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/dao/impl/ConfigMapper.xml
@@ -136,7 +136,7 @@
WHERE id = #{id}
</select>
- <select id="seleteKeyByKeyName" resultMap="ConfigKeyMap">
+ <select id="selectKeyByKeyName" resultMap="ConfigKeyMap">
SELECT <include refid="Config_Key_Column"/>
FROM linkis_ps_configuration_config_key
WHERE `key` = #{keyName}
diff --git a/linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/service/impl/ConfigKeyServiceImpl.java b/linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/service/impl/ConfigKeyServiceImpl.java
index 6e54e742b..dd768ac17 100644
--- a/linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/service/impl/ConfigKeyServiceImpl.java
+++ b/linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/service/impl/ConfigKeyServiceImpl.java
@@ -68,7 +68,7 @@ public class ConfigKeyServiceImpl implements ConfigKeyService {
}
LabelParameterParser.labelCheck(labelList);
- List<ConfigKey> configKeys = configMapper.seleteKeyByKeyName(configKeyValue.getKey());
+ List<ConfigKey> configKeys = configMapper.selectKeyByKeyName(configKeyValue.getKey());
if (null == configKeys || configKeys.isEmpty()) {
throw new ConfigurationException(
CONFIG_KEY_NOT_EXISTS.getErrorDesc() + configKeyValue.getKey());
@@ -135,7 +135,7 @@ public class ConfigKeyServiceImpl implements ConfigKeyService {
throw new ConfigurationException(CONFIGKEY_CANNOT_BE_NULL.getErrorDesc());
}
LabelParameterParser.labelCheck(labelList);
- List<ConfigKey> configKeys = configMapper.seleteKeyByKeyName(key);
+ List<ConfigKey> configKeys = configMapper.selectKeyByKeyName(key);
if (null == configKeys || configKeys.isEmpty()) {
throw new ConfigurationException(CONFIG_KEY_NOT_EXISTS.getErrorDesc() + key);
diff --git a/linkis-public-enhancements/linkis-configuration/src/main/scala/org/apache/linkis/configuration/service/ConfigurationService.scala b/linkis-public-enhancements/linkis-configuration/src/main/scala/org/apache/linkis/configuration/service/ConfigurationService.scala
index 887ff3575..269438eca 100644
--- a/linkis-public-enhancements/linkis-configuration/src/main/scala/org/apache/linkis/configuration/service/ConfigurationService.scala
+++ b/linkis-public-enhancements/linkis-configuration/src/main/scala/org/apache/linkis/configuration/service/ConfigurationService.scala
@@ -203,7 +203,7 @@ class ConfigurationService extends Logging {
if (setting.getId != null) {
key = configMapper.selectKeyByKeyID(setting.getId)
} else {
- val keys = configMapper.seleteKeyByKeyName(setting.getKey)
+ val keys = configMapper.selectKeyByKeyName(setting.getKey)
if (null != keys && !keys.isEmpty) {
key = keys.get(0)
}
diff --git a/linkis-public-enhancements/linkis-configuration/src/test/java/org/apache/linkis/configuration/dao/ConfigMapperTest.java b/linkis-public-enhancements/linkis-configuration/src/test/java/org/apache/linkis/configuration/dao/ConfigMapperTest.java
index 62c8bb1e7..57cacd7a3 100644
--- a/linkis-public-enhancements/linkis-configuration/src/test/java/org/apache/linkis/configuration/dao/ConfigMapperTest.java
+++ b/linkis-public-enhancements/linkis-configuration/src/test/java/org/apache/linkis/configuration/dao/ConfigMapperTest.java
@@ -123,10 +123,10 @@ public class ConfigMapperTest extends BaseDaoTest {
}
@Test
- void testSeleteKeyByKeyName() {
+ void testSelectKeyByKeyName() {
// TODO 查询结果转换异常
// ConfigKey configKey =
- // configMapper.seleteKeyByKeyName("wds.linkis.rm.yarnqueue");
+ // configMapper.selectKeyByKeyName("wds.linkis.rm.yarnqueue");
// assertEquals("ide", configKey.getDefaultValue());
// System.out.println(configKey.getDefaultValue());
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org