[iotdb] 02/45: Merge branch 'rocksdb/dev' of v.src.corp.qihoo.net:xt_hadoop/iotdb into rocksdb/dev

[ji...@apache.org]

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

jianyun pushed a commit to branch rocksdb/dev
in repository https://gitbox.apache.org/repos/asf/iotdb.git

commit abc659c8d2f15986f3463d1d7ca1620637392d23
Merge: 5d015a1 3fc653a
Author: lisijia <li...@360.cn>
AuthorDate: Wed Mar 2 10:49:44 2022 +0800

    Merge branch 'rocksdb/dev' of v.src.corp.qihoo.net:xt_hadoop/iotdb into rocksdb/dev

 .../iotdb/db/metadata/rocksdb/MRocksDBManager.java | 69 +++++-----------------
 1 file changed, 15 insertions(+), 54 deletions(-)

diff --cc server/src/main/java/org/apache/iotdb/db/metadata/rocksdb/MRocksDBManager.java
index 37821ec,703fb4f..e009dfc
--- a/server/src/main/java/org/apache/iotdb/db/metadata/rocksdb/MRocksDBManager.java
+++ b/server/src/main/java/org/apache/iotdb/db/metadata/rocksdb/MRocksDBManager.java
@@@ -109,10 -109,9 +109,11 @@@ import java.util.Stack
  import java.util.concurrent.ConcurrentHashMap;
  import java.util.concurrent.ConcurrentLinkedQueue;
  import java.util.concurrent.TimeUnit;
 +import java.util.concurrent.atomic.AtomicInteger;
  import java.util.concurrent.locks.Lock;
 +import java.util.function.Consumer;
  import java.util.function.Function;
+ import java.util.stream.Collectors;
  
  import static org.apache.iotdb.db.conf.IoTDBConstant.MULTI_LEVEL_PATH_WILDCARD;
  import static org.apache.iotdb.db.conf.IoTDBConstant.ONE_LEVEL_PATH_WILDCARD;