Add IT for BanyanDB schema install and update. (#12879)

apache · Dec 18, 2024 · e0d6411 · e0d6411
1 parent a3b563f
commit e0d6411
Show file tree

Hide file tree

Showing 2 changed files with 339 additions and 6 deletions.
diff --git a/...java/org/apache/skywalking/oap/server/storage/plugin/banyandb/BanyanDBIndexInstaller.java b/...java/org/apache/skywalking/oap/server/storage/plugin/banyandb/BanyanDBIndexInstaller.java
@@ -52,8 +52,8 @@
 @Slf4j
 public class BanyanDBIndexInstaller extends ModelInstaller {
     // BanyanDB group setting aligned with the OAP settings
-    private static final Set<String/*group name*/> GROUP_ALIGNED = new HashSet<>();
-    private static final Map<String/*group name*/, Map<String/*rule name*/, IndexRule>> GROUP_INDEX_RULES = new HashMap<>();
+    private final Set<String/*group name*/> groupAligned = new HashSet<>();
+    private final Map<String/*group name*/, Map<String/*rule name*/, IndexRule>> groupIndexRules = new HashMap<>();
     private final BanyanDBStorageConfig config;
 
     public BanyanDBIndexInstaller(Client client, ModuleManager moduleManager, BanyanDBStorageConfig config) {
@@ -239,7 +239,7 @@ private boolean checkResourceExistence(MetadataRegistry.SchemaMetadata metadata,
                 throw new IllegalStateException("unknown metadata kind: " + metadata.getKind());
         }
         if (!RunningMode.isNoInitMode()) {
-            if (!GROUP_ALIGNED.contains(metadata.getGroup())) {
+            if (!groupAligned.contains(metadata.getGroup())) {
                 // create the group if not exist
                 if (!resourceExist.hasGroup()) {
                     try {
@@ -262,7 +262,7 @@ private boolean checkResourceExistence(MetadataRegistry.SchemaMetadata metadata,
                     }
                 }
                 // mark the group as aligned
-                GROUP_ALIGNED.add(metadata.getGroup());
+                groupAligned.add(metadata.getGroup());
             }
         }
         return resourceExist.hasResource();
@@ -317,7 +317,7 @@ private void checkIndexRuleConflicts(String modelName, IndexRule indexRule, Inde
      * Otherwise, return false and mark the index rule as processed.
      */
     private boolean checkIndexRuleProcessed(String modelName, IndexRule indexRule) {
-        Map<String, IndexRule> rules = GROUP_INDEX_RULES.computeIfAbsent(
+        Map<String, IndexRule> rules = groupIndexRules.computeIfAbsent(
             indexRule.getMetadata().getGroup(), k -> new HashMap<>());
         IndexRule existRule = rules.get(indexRule.getMetadata().getName());
         if (existRule != null) {
@@ -457,7 +457,6 @@ private void checkIndexRules(String modelName, List<IndexRule> indexRules, Banya
 
     /**
      * Check if the index rule binding exists and update it if necessary.
-     * If the old index rule is not in the index rule binding, delete it.
      */
     private void checkIndexRuleBinding(List<IndexRule> indexRules,
                                        String group,