You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@linkis.apache.org by al...@apache.org on 2022/05/31 08:45:00 UTC
[incubator-linkis] branch dev-1.1.3 updated: Optimize label manager logic to remove label keyValue (#2200)
This is an automated email from the ASF dual-hosted git repository.
allenlliu pushed a commit to branch dev-1.1.3
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
The following commit(s) were added to refs/heads/dev-1.1.3 by this push:
new e92799f11 Optimize label manager logic to remove label keyValue (#2200)
e92799f11 is described below
commit e92799f1190078870d5788967465b0f4b25ea720
Author: peacewong <wp...@gmail.com>
AuthorDate: Tue May 31 16:44:55 2022 +0800
Optimize label manager logic to remove label keyValue (#2200)
---
.../persistence/impl/DefaultLabelManagerPersistence.java | 14 +++++---------
.../impl/DefaultResourceLabelPersistence.java | 16 +++++-----------
.../service/impl/DefaultResourceManager.scala | 3 ++-
3 files changed, 12 insertions(+), 21 deletions(-)
diff --git a/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/java/org/apache/linkis/manager/persistence/impl/DefaultLabelManagerPersistence.java b/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/java/org/apache/linkis/manager/persistence/impl/DefaultLabelManagerPersistence.java
index 8a51af698..4819185ab 100644
--- a/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/java/org/apache/linkis/manager/persistence/impl/DefaultLabelManagerPersistence.java
+++ b/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/java/org/apache/linkis/manager/persistence/impl/DefaultLabelManagerPersistence.java
@@ -79,7 +79,7 @@ public class DefaultLabelManagerPersistence implements LabelManagerPersistence {
// 此处需要修正，要拿到 label_value_key label_value_content labelValue中有多对参数
Map<String, String> labelValueKeyAndContent = persistenceLabel.getValue();
- replaceIntoLabelKeyValues(labelValueKeyAndContent, labelId);
+ // replaceIntoLabelKeyValues(labelValueKeyAndContent, labelId);
}
@Override
@@ -117,9 +117,9 @@ public class DefaultLabelManagerPersistence implements LabelManagerPersistence {
persistenceLabel.setUpdateTime(new Date());
labelManagerMapper.updateLabel(id, persistenceLabel);
labelManagerMapper.deleteLabelKeyVaules(id);
- if (!persistenceLabel.getValue().isEmpty()) {
+ /* if (!persistenceLabel.getValue().isEmpty()) {
replaceIntoLabelKeyValues(persistenceLabel.getValue(), id);
- }
+ }*/
}
private void replaceIntoLabelKeyValues(
@@ -171,16 +171,12 @@ public class DefaultLabelManagerPersistence implements LabelManagerPersistence {
}
@Override
+ @Deprecated
public List<PersistenceLabel> getLabelsByValueList(
List<Map<String, String>> valueList, Label.ValueRelation valueRelation) {
if (PersistenceUtils.valueListIsEmpty(valueList)) return Collections.emptyList();
if (valueRelation == null) valueRelation = Label.ValueRelation.ALL;
- return labelManagerMapper
- .dimListLabelByValueList(
- PersistenceUtils.filterEmptyValueList(valueList), valueRelation.name())
- .stream()
- .map(PersistenceUtils::setValue)
- .collect(Collectors.toList());
+ return null;
}
@Override
diff --git a/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/java/org/apache/linkis/manager/persistence/impl/DefaultResourceLabelPersistence.java b/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/java/org/apache/linkis/manager/persistence/impl/DefaultResourceLabelPersistence.java
index 77a413188..fbabf3fed 100644
--- a/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/java/org/apache/linkis/manager/persistence/impl/DefaultResourceLabelPersistence.java
+++ b/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/java/org/apache/linkis/manager/persistence/impl/DefaultResourceLabelPersistence.java
@@ -68,26 +68,20 @@ public class DefaultResourceLabelPersistence implements ResourceLabelPersistence
* @return
*/
@Override
+ @Deprecated
public List<PersistenceLabel> getResourceLabels(List<LabelKeyValue> labelKeyValues) {
if (CollectionUtils.isEmpty(labelKeyValues)) return Collections.emptyList();
- return labelManagerMapper.listResourceLabelByValues(labelKeyValues).stream()
- .map(PersistenceUtils::setValue)
- .collect(Collectors.toList());
+ return Collections.emptyList();
}
@Override
+ @Deprecated
public List<PersistenceLabel> getResourceLabels(
Map<String, Map<String, String>> labelKeyAndValuesMap,
Label.ValueRelation valueRelation) {
if (PersistenceUtils.KeyValueMapIsEmpty(labelKeyAndValuesMap))
return Collections.emptyList();
- return labelManagerMapper
- .dimlistResourceLabelByKeyValueMap(
- PersistenceUtils.filterEmptyKeyValueMap(labelKeyAndValuesMap),
- valueRelation.name())
- .stream()
- .map(PersistenceUtils::setValue)
- .collect(Collectors.toList());
+ return null;
}
@Override
@@ -193,7 +187,7 @@ public class DefaultResourceLabelPersistence implements ResourceLabelPersistence
blankIds.stream()
.map(PersistenceUtils::entryToTunple)
.collect(Collectors.toMap(Tunple::getKey, Tunple::getValue));
- labelManagerMapper.batchDeleteResourceByLabelKeyValuesMaps(keyValueMaps);
+ // labelManagerMapper.batchDeleteResourceByLabelKeyValuesMaps(keyValueMaps);
}
}
}
diff --git a/linkis-computation-governance/linkis-manager/linkis-resource-manager/src/main/scala/org/apache/linkis/resourcemanager/service/impl/DefaultResourceManager.scala b/linkis-computation-governance/linkis-manager/linkis-resource-manager/src/main/scala/org/apache/linkis/resourcemanager/service/impl/DefaultResourceManager.scala
index d948633b5..4663ac733 100644
--- a/linkis-computation-governance/linkis-manager/linkis-resource-manager/src/main/scala/org/apache/linkis/resourcemanager/service/impl/DefaultResourceManager.scala
+++ b/linkis-computation-governance/linkis-manager/linkis-resource-manager/src/main/scala/org/apache/linkis/resourcemanager/service/impl/DefaultResourceManager.scala
@@ -271,7 +271,8 @@ class DefaultResourceManager extends ResourceManager with Logging with Initializ
labelResourceService.setEngineConnLabelResource(engineInstanceLabel, resource, labelContainer.getCombinedUserCreatorEngineTypeLabel.getStringValue)
- val persistenceEngineLabel = labelManagerPersistence.getLabelsByKeyValue(engineInstanceLabel.getLabelKey, engineInstanceLabel.getValue, null)
+ val persistenceLabel = labelFactory.convertLabel(engineInstanceLabel, classOf[PersistenceLabel])
+ val persistenceEngineLabel = labelManagerPersistence.getLabelByKeyValue(persistenceLabel.getLabelKey, persistenceLabel.getStringValue)
// fire timeout check scheduled job
if (RMConfiguration.RM_WAIT_EVENT_TIME_OUT.getValue > 0) Utils.defaultScheduler.schedule(
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org