Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Feature-2199] Optimize label manager logic to remove label keyValue #2200

Merged
merged 1 commit into from
May 31, 2022
Merged

[Feature-2199] Optimize label manager logic to remove label keyValue #2200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 5 additions & 9 deletions .../main/java/org/apache/linkis/manager/persistence/impl/DefaultLabelManagerPersistence.java
View file
Open in desktop
Expand Up @@ -79,7 +79,7 @@ public void addLabel(PersistenceLabel persistenceLabel) {
// 此处需要修正，要拿到 label_value_key label_value_content labelValue中有多对参数
Map<String, String> labelValueKeyAndContent = persistenceLabel.getValue();

replaceIntoLabelKeyValues(labelValueKeyAndContent, labelId);
// replaceIntoLabelKeyValues(labelValueKeyAndContent, labelId);
}

@Override
Expand Down Expand Up @@ -117,9 +117,9 @@ public void updateLabel(int id, PersistenceLabel persistenceLabel) {
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(
Expand Down Expand Up @@ -171,16 +171,12 @@ public List<PersistenceLabel> getLabelsByValue(
}

@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
Expand Down
16 changes: 5 additions & 11 deletions ...main/java/org/apache/linkis/manager/persistence/impl/DefaultResourceLabelPersistence.java
View file
Open in desktop
Expand Up @@ -68,26 +68,20 @@ public void setResourceManagerMapper(ResourceManagerMapper resourceManagerMapper
* @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
Expand Down Expand Up @@ -193,7 +187,7 @@ public void removeResourceByLabels(List<PersistenceLabel> labels) {
blankIds.stream()
.map(PersistenceUtils::entryToTunple)
.collect(Collectors.toMap(Tunple::getKey, Tunple::getValue));
labelManagerMapper.batchDeleteResourceByLabelKeyValuesMaps(keyValueMaps);
// labelManagerMapper.batchDeleteResourceByLabelKeyValuesMaps(keyValueMaps);
}
}
}
3 changes: 2 additions & 1 deletion ...rc/main/scala/org/apache/linkis/resourcemanager/service/impl/DefaultResourceManager.scala
View file
Open in desktop
Expand Up @@ -270,7 +270,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(
Expand Down