This is an automated email from the ASF dual-hosted git repository.
zyk pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git
from fc5d228abb3 fix(session): remove ignored logs (#11749)
add 6351e765b40 PBTree Mode supports node-level read/write locking with
concurrent flush and querying (#11736)
No new revisions were added by this update.
Summary of changes:
.../persistence/schema/ConfigMTreeStore.java | 7 +
.../metric/SchemaEngineCachedMetric.java | 65 +-
.../schemaengine/metric/SchemaMetricManager.java | 4 +-
.../rescon/CachedSchemaRegionStatistics.java | 12 +-
.../schemaengine/rescon/SchemaResourceManager.java | 6 +-
.../schemaregion/impl/SchemaRegionPBTreeImpl.java | 10 +-
.../schemaregion/mtree/IMTreeStore.java | 3 +
.../mtree/impl/mem/MTreeBelowSGMemoryImpl.java | 20 +-
.../schemaregion/mtree/impl/mem/MemMTreeStore.java | 9 +-
.../mtree/impl/pbtree/CachedMTreeStore.java | 335 +++++----
.../mtree/impl/pbtree/MTreeBelowSGCachedImpl.java | 72 +-
.../mtree/impl/pbtree/PBTreeFactory.java | 104 +++
.../pbtree/ReentrantReadOnlyCachedMTreeStore.java | 10 +-
.../mtree/impl/pbtree/cache/CacheManager.java | 741 ------------------
.../impl/pbtree/cache/CacheMemoryManager.java | 363 ---------
.../impl/pbtree/flush/PBTreeFlushExecutor.java | 122 ++-
.../mtree/impl/pbtree/flush/Scheduler.java | 232 ++++++
.../{cache/CacheEntry.java => lock/LockEntry.java} | 29 +-
.../mtree/impl/pbtree/lock/LockManager.java | 147 ++++
.../{ => lock}/StampedWriterPreferredLock.java | 28 +-
.../pbtree/memcontrol/IReleaseFlushStrategy.java | 3 -
.../{MemManager.java => MemoryStatistics.java} | 4 +-
.../ReleaseFlushStrategyNumBasedImpl.java | 5 -
.../ReleaseFlushStrategySizeBasedImpl.java | 11 +-
.../IMemoryManager.java} | 35 +-
.../mtree/impl/pbtree/memory/MemoryManager.java | 596 +++++++++++++++
.../impl/pbtree/memory/ReleaseFlushMonitor.java | 376 ++++++++++
.../buffer/INodeBuffer.java} | 48 +-
.../impl/pbtree/memory/buffer/NodeBuffer.java | 188 +++++
.../impl/pbtree/{ => memory}/cache/CacheEntry.java | 24 +-
.../cache/INodeCache.java} | 36 +-
.../cache/LRUNodeCache.java} | 58 +-
.../cache/PlainNodeCache.java} | 36 +-
.../mtree/impl/pbtree/mnode/ICachedMNode.java | 7 +-
.../impl/pbtree/mnode/basic/CachedBasicMNode.java | 13 +-
.../mnode/container/CachedMNodeContainer.java | 8 +-
.../mnode/impl/CachedAboveDatabaseMNode.java | 13 +-
.../pbtree/mnode/impl/CachedDatabaseMNode.java | 13 +-
.../pbtree/mnode/impl/CachedMeasurementMNode.java | 13 +-
.../impl/pbtree/mnode/info/CacheMNodeInfo.java | 15 +-
.../mtree/impl/pbtree/schemafile/ISchemaPage.java | 35 +-
.../impl/pbtree/schemafile/ISegmentedPage.java | 2 +-
.../mtree/impl/pbtree/schemafile/InternalPage.java | 9 +
.../impl/pbtree/schemafile/MockSchemaFile.java | 20 +-
.../mtree/impl/pbtree/schemafile/SchemaFile.java | 9 +-
.../mtree/impl/pbtree/schemafile/SchemaPage.java | 47 +-
.../impl/pbtree/schemafile/SegmentedPage.java | 16 +-
.../schemafile/pagemgr/BTreePageManager.java | 379 ++++++----
.../pbtree/schemafile/pagemgr/IPageManager.java | 9 +-
.../pbtree/schemafile/pagemgr/PageManager.java | 834 ++++++++++++++-------
.../schemaregion/mtree/traverser/Traverser.java | 9 +-
.../mtree/lock/StampedWriterPreferredLockTest.java | 16 +-
.../db/metadata/mtree/schemafile/MonitorTest.java | 85 +++
.../mtree/schemafile/SchemaFileLogTest.java | 4 +-
.../metadata/mtree/schemafile/SchemaFileTest.java | 1 -
.../schemaRegion/SchemaStatisticsTest.java | 16 +-
.../datanode/src/test/resources/logback-test.xml | 1 +
.../commons/concurrent/IoTDBThreadPoolFactory.java | 22 +
.../iotdb/commons/concurrent/ThreadName.java | 16 +-
.../threadpool/WrappedThreadPoolExecutor.java | 18 +
60 files changed, 3326 insertions(+), 2043 deletions(-)
create mode 100644
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/mtree/impl/pbtree/PBTreeFactory.java
delete mode 100644
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/mtree/impl/pbtree/cache/CacheManager.java
delete mode 100644
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/mtree/impl/pbtree/cache/CacheMemoryManager.java
create mode 100644
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/mtree/impl/pbtree/flush/Scheduler.java
copy
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/mtree/impl/pbtree/{cache/CacheEntry.java
=> lock/LockEntry.java} (71%)
create mode 100644
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/mtree/impl/pbtree/lock/LockManager.java
rename
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/mtree/impl/pbtree/{
=> lock}/StampedWriterPreferredLock.java (93%)
rename
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/mtree/impl/pbtree/memcontrol/{MemManager.java
=> MemoryStatistics.java} (96%)
rename
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/mtree/impl/pbtree/{cache/ICacheManager.java
=> memory/IMemoryManager.java} (62%)
create mode 100644
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/mtree/impl/pbtree/memory/MemoryManager.java
create mode 100644
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/mtree/impl/pbtree/memory/ReleaseFlushMonitor.java
copy
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/mtree/impl/pbtree/{mnode/impl/CachedAboveDatabaseMNode.java
=> memory/buffer/INodeBuffer.java} (54%)
create mode 100644
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/mtree/impl/pbtree/memory/buffer/NodeBuffer.java
rename
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/mtree/impl/pbtree/{
=> memory}/cache/CacheEntry.java (68%)
copy
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/mtree/impl/pbtree/{mnode/info/CacheMNodeInfo.java
=> memory/cache/INodeCache.java} (61%)
rename
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/mtree/impl/pbtree/{cache/LRUCacheManager.java
=> memory/cache/LRUNodeCache.java} (79%)
rename
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/mtree/impl/pbtree/{cache/PlainCacheManager.java
=> memory/cache/PlainNodeCache.java} (65%)
create mode 100644
iotdb-core/datanode/src/test/java/org/apache/iotdb/db/metadata/mtree/schemafile/MonitorTest.java
