You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@iotdb.apache.org by qi...@apache.org on 2020/04/25 14:15:42 UTC

[incubator-iotdb] branch tag_manage updated (5d40561 -> 4b118f6)

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

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


    from 5d40561  reformat code
     add 1471600  fix zh 3-Server/1-Download.md
     add 5d52f7d  Merge remote-tracking branch 'origin/master'
     add e2656a2  [IOTDB-125] Potential Concurrency bug while deleting and inserting happen together (#1088)
     add 3f9709f  record mlog at last (#1098)
     add 4b118f6  resolve conflict

No new revisions were added by this update.

Summary of changes:
 docs/zh/UserGuide/3-Server/1-Download.md           |  36 +---
 .../java/org/apache/iotdb/jdbc/IoTDBStatement.java |  12 +-
 .../engine/storagegroup/StorageGroupProcessor.java |  57 +++---
 ...stException.java => DeleteFailedException.java} |  15 +-
 .../org/apache/iotdb/db/metadata/MManager.java     | 213 ++++++++++-----------
 .../iotdb/db/metadata/mnode/InternalMNode.java     |  59 +++++-
 .../org/apache/iotdb/db/metadata/mnode/MNode.java  |   8 +-
 .../apache/iotdb/db/qp/executor/PlanExecutor.java  |  71 ++++---
 .../iotdb/db/query/reader/series/SeriesReader.java |  26 +--
 .../org/apache/iotdb/db/service/TSServiceImpl.java |  26 ++-
 .../apache/iotdb/db/integration/IoTDBLastIT.java   |   6 +-
 .../iotdb/db/metadata/MManagerImproveTest.java     |  24 ++-
 .../java/org/apache/iotdb/rpc/TSStatusCode.java    |   1 +
 13 files changed, 295 insertions(+), 259 deletions(-)
 copy server/src/main/java/org/apache/iotdb/db/exception/metadata/{AliasAlreadyExistException.java => DeleteFailedException.java} (72%)