[iotdb] branch master updated: [IOTDB-1703] Fix MManager slow recover with tag (#3997)

[ha...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

haonan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git


The following commit(s) were added to refs/heads/master by this push:
     new 8a039eb  [IOTDB-1703] Fix MManager slow recover with tag (#3997)
8a039eb is described below

commit 8a039ebd0a9add5fe3460555b6d8ce42af50b437
Author: zyk990424 <38...@users.noreply.github.com>
AuthorDate: Fri Sep 17 18:16:58 2021 +0800

    [IOTDB-1703] Fix MManager slow recover with tag (#3997)
---
 server/src/main/java/org/apache/iotdb/db/metadata/mnode/MNode.java    | 2 +-
 server/src/main/java/org/apache/iotdb/db/metadata/tag/TagManager.java | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/server/src/main/java/org/apache/iotdb/db/metadata/mnode/MNode.java b/server/src/main/java/org/apache/iotdb/db/metadata/mnode/MNode.java
index 9a778a1..d7231a6 100644
--- a/server/src/main/java/org/apache/iotdb/db/metadata/mnode/MNode.java
+++ b/server/src/main/java/org/apache/iotdb/db/metadata/mnode/MNode.java
@@ -145,7 +145,7 @@ public abstract class MNode implements IMNode {
     if (fullPath == null) {
       return Objects.equals(getFullPath(), mNode.getFullPath());
     } else {
-      return Objects.equals(fullPath, mNode.fullPath);
+      return Objects.equals(fullPath, mNode.getFullPath());
     }
   }
 
diff --git a/server/src/main/java/org/apache/iotdb/db/metadata/tag/TagManager.java b/server/src/main/java/org/apache/iotdb/db/metadata/tag/TagManager.java
index ba6fa8e..a82f41d 100644
--- a/server/src/main/java/org/apache/iotdb/db/metadata/tag/TagManager.java
+++ b/server/src/main/java/org/apache/iotdb/db/metadata/tag/TagManager.java
@@ -40,7 +40,6 @@ import org.slf4j.LoggerFactory;
 import java.io.IOException;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.CopyOnWriteArraySet;
 
 import static java.util.stream.Collectors.toList;
 
@@ -87,7 +86,7 @@ public class TagManager {
   public void addIndex(String tagKey, String tagValue, IMeasurementMNode measurementMNode) {
     tagIndex
         .computeIfAbsent(tagKey, k -> new ConcurrentHashMap<>())
-        .computeIfAbsent(tagValue, v -> new CopyOnWriteArraySet<>())
+        .computeIfAbsent(tagValue, v -> Collections.synchronizedSet(new HashSet<>()))
         .add(measurementMNode);
   }