[iotdb] branch jira_975 updated (ce17452 -> 9f96491)

[su...@apache.org]

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

sunzesong pushed a change to branch jira_975
in repository https://gitbox.apache.org/repos/asf/iotdb.git.


 discard ce17452  [IOTDB-975] Fix reading file error in getChunkMetadataList
    omit 2d25bab  [IOTDB-970] Change logback rollingPolicy and triggeringPolicy
     add 1dae7fa  fix count timeseries bug (#1892)
     add bf6a7cc  [IOTDB-970] Change logback rollingPolicy and triggeringPolicy (#1896)
     add b96bf61  [To rel/0.10] [IOTDB-962] Improve the chunk metadata cache process (#1873)
     add 9f96491  [IOTDB-975] Fix reading file error in getChunkMetadataList

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (ce17452)
            \
             N -- N -- N   refs/heads/jira_975 (9f96491)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

No new revisions were added by this update.

Summary of changes:
 .../iotdb/db/engine/cache/ChunkMetadataCache.java  | 30 +++++++---------------
 .../iotdb/db/engine/merge/task/MergeFileTask.java  |  9 +++++++
 .../engine/storagegroup/StorageGroupProcessor.java |  9 +++++++
 .../java/org/apache/iotdb/db/metadata/MTree.java   |  4 +--
 .../chunk/metadata/DiskChunkMetadataLoader.java    |  9 ++++---
 .../chunk/metadata/MemChunkMetadataLoader.java     |  3 ++-
 .../db/engine/cache/ChunkMetadataCacheTest.java    |  4 +--
 .../apache/iotdb/db/engine/merge/MergeTest.java    |  4 +++
 .../org/apache/iotdb/db/metadata/MTreeTest.java    |  2 ++
 .../query/reader/series/SeriesReaderTestUtil.java  |  4 +++
 .../apache/iotdb/db/utils/EnvironmentUtils.java    |  4 +++
 .../tsfile/file/metadata/TimeseriesMetadata.java   |  2 +-
 .../read/controller/IChunkMetadataLoader.java      |  3 ++-
 13 files changed, 55 insertions(+), 32 deletions(-)