Optimize label manager logic to remove label keyValue

apache · May 26, 2022 · 3f480c8 · 3f480c8
1 parent 8299f98
commit 3f480c8
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 21 deletions.
diff --git a/.../main/java/org/apache/linkis/manager/persistence/impl/DefaultLabelManagerPersistence.java b/.../main/java/org/apache/linkis/manager/persistence/impl/DefaultLabelManagerPersistence.java
@@ -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
@@ -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(
@@ -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

diff --git a/...main/java/org/apache/linkis/manager/persistence/impl/DefaultResourceLabelPersistence.java b/...main/java/org/apache/linkis/manager/persistence/impl/DefaultResourceLabelPersistence.java
@@ -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
@@ -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);
         }
     }
 }
diff --git a/...rc/main/scala/org/apache/linkis/resourcemanager/service/impl/DefaultResourceManager.scala b/...rc/main/scala/org/apache/linkis/resourcemanager/service/impl/DefaultResourceManager.scala
@@ -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(