You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by lt...@apache.org on 2019/07/11 02:07:48 UTC

[incubator-iotdb] branch dynamic_parameters updated (c9665db -> d438e0b)

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

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


    omit c9665db  fix ut test
    omit 5f7b9cb  fix ut test
    omit 3c2e7ed  Merge branch 'master' into dynamic_parameters
    omit fbd0117  change a wait memtable log from debug to info level
    omit 937d589  Merge pull request #234 from apache/enhance_resource
    omit 01e5e1b  recover when resource file does not exist while tsfile is complete
    omit 11d3316  Merge pull request #233 from apache/fix_file_name_compare
    omit 09d30d0  fix file name compare bug
    omit fd05a3c  [IOTDB-129]Fix statistic bug when restoring incomplete tsfile (#230)
     add 9228f5a  [IOTDB-129]Fix statistic bug when restoring incomplete tsfile (#230)
     add 8af53a8  fix file name compare bug
     add 50e8835  recover when resource file does not exist while tsfile is complete
     add 5a03de3  change a wait memtable log from debug to info level
     add d438e0b  fix ut test

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   (c9665db)
            \
             N -- N -- N   refs/heads/dynamic_parameters (d438e0b)

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:
 .../apache/iotdb/db/conf/adapter/CompressionRatio.java |  2 +-
 .../java/org/apache/iotdb/db/engine/StorageEngine.java | 18 ++++++------------
 .../db/engine/modification/DeletionFileNodeTest.java   |  2 ++
 .../db/engine/modification/DeletionQueryTest.java      |  2 ++
 .../db/engine/modification/ModificationFileTest.java   |  2 ++
 5 files changed, 13 insertions(+), 13 deletions(-)