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

jiangtian pushed a change to branch dev_merge
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.


    from 81c4b30  add CachedPriorityMergeReader
     add 126eac7  [IOTDB-144]meta data cache for query (#262)
     add 5855477  Merge branch 'master' into dev_merge

No new revisions were added by this update.

Summary of changes:
 License                                            |    1 +
 .../org/apache/iotdb/db/engine/StorageEngine.java  |   10 +
 .../iotdb/db/engine/cache/DeviceMetaDataCache.java |  185 ++--
 .../iotdb/db/engine/cache/LRULinkedHashMap.java    |   90 ++
 .../iotdb/db/engine/cache/RamUsageEstimator.java   | 1019 ++++++++++++++++++++
 .../iotdb/db/engine/cache/TsFileMetaDataCache.java |   99 +-
 .../iotdb/db/engine/cache/TsFileMetadataUtils.java |   61 +-
 .../engine/storagegroup/StorageGroupProcessor.java |   43 +-
 .../iotdb/db/query/control/JobFileManager.java     |    4 +-
 .../resourceRelated/SeqResourceIterateReader.java  |   10 +-
 .../SeqResourceReaderByTimestamp.java              |   11 +-
 .../resourceRelated/UnseqResourceMergeReader.java  |   23 +-
 .../UnseqResourceReaderByTimestamp.java            |   17 +-
 13 files changed, 1415 insertions(+), 158 deletions(-)
 create mode 100644 
server/src/main/java/org/apache/iotdb/db/engine/cache/LRULinkedHashMap.java
 create mode 100644 
server/src/main/java/org/apache/iotdb/db/engine/cache/RamUsageEstimator.java

Reply via email to