[incubator-iotdb] branch master updated (52c8744 -> fc05734)

[qi...@apache.org]

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

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


    from 52c8744  Merge pull request #238 from Genius-pig/master
     add 16f0b3b  fix bugs in performacne stats module; add new functions in its MBean
     add 75fad74  add stopCalculatingStats in MeasurementMBean
     add 2f0f4f0  modify log info in performance stats
     new fc05734  Merge pull request #239 from apache/fix_performance_stats

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../iotdb/db/cost/statistic/Measurement.java       | 98 ++++++++++++++--------
 .../iotdb/db/cost/statistic/MeasurementMBean.java  | 14 +++-
 .../db/cost/statistic/PerformanceStatTest.java     | 52 ++++++++++--
 3 files changed, 120 insertions(+), 44 deletions(-)

[incubator-iotdb] 01/01: Merge pull request #239 from apache/fix_performance_stats

[qi...@apache.org]

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

qiaojialin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git

commit fc05734dd2ffe6885f9b40fb2c2ca83e002a96f6
Merge: 52c8744 2f0f4f0
Author: Jialin Qiao <qj...@mails.tsinghua.edu.cn>
AuthorDate: Sat Jul 13 13:25:43 2019 +0800

    Merge pull request #239 from apache/fix_performance_stats
    
    [Jenkins-master-128]fix bugs in performacne stats module; add new functions in its MBean

 .../iotdb/db/cost/statistic/Measurement.java       | 98 ++++++++++++++--------
 .../iotdb/db/cost/statistic/MeasurementMBean.java  | 14 +++-
 .../db/cost/statistic/PerformanceStatTest.java     | 52 ++++++++++--
 3 files changed, 120 insertions(+), 44 deletions(-)