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

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


    from cace212  Merge pull request #1902 from 
LebronAl/fix_createMultiTimeSeriesPlan_serialization
     add 0aad6a1  fix snapshot overlaps logs during snapshot
     add d53ebb3  fix match index not updated after snapshot catch-up
     add 4f1a193  fix error message when node is down fix handling when client 
is null trigger election when leader is down
     add 42150e9  only skip elections once
     add 4832146  fix members are created twice
     add 6663fe3  fix long wait after node is down fix not catch up after node 
restarts
     add 33db104  fix improper election pause
     add 5f0fab1  add comment for election pause
     add f85bca8  remove close flag add truncate before in snapshot add copy 
factory of snapshot fix planIndex in resource is not correctly recovered fix 
comparing unclosed files during installing snapshot
     add cd4874c  Merge branch 'cluster_new' of 
github.com:apache/incubator-iotdb into cluster_new
     add 699998f  [IOTDB-872] Use system timezone in CLI (Session) (#1846)
     add dc3d9f1  [IOTDB-749] Handle select * from root OOM (#1884)
     add 654662f  fix a sonar bug (#1897)
     add 1b433c1  add more logs in LocalTsFileInput (#1899)
     add 8f6f210  fix a sonar bug (#1900)
     add 67d6100  [IOTDB-970] Change logback rollingPolicy and triggeringPolicy 
(#1895)
     add 8bacba5  Synchronize the English and Chinese version of "Grafana" doc 
(#1901)
     add bfd5af6  [IOTDB-968] Support time predicate in select last (#1898)
     add 972cb9a  Merge branch 'master' into cluster_new
     add a2875a3  fix tests

No new revisions were added by this update.

Summary of changes:
 .../java/org/apache/iotdb/cli/AbstractCli.java     |   2 -
 cli/src/test/resources/logback.xml                 |  52 ++--
 .../java/org/apache/iotdb/cluster/ClientMain.java  |   4 +-
 .../iotdb/cluster/config/ClusterConstant.java      |   7 +-
 .../org/apache/iotdb/cluster/log/Snapshot.java     |  10 +
 .../iotdb/cluster/log/catchup/CatchUpTask.java     |  53 ++--
 .../cluster/log/catchup/SnapshotCatchUpTask.java   |   4 +-
 .../manage/FilePartitionedSnapshotLogManager.java  |  13 +-
 .../log/manage/MetaSingleSnapshotLogManager.java   |   2 +-
 .../log/manage/PartitionedSnapshotLogManager.java  |   3 +-
 .../iotdb/cluster/log/manage/RaftLogManager.java   |   6 +-
 .../iotdb/cluster/log/snapshot/FileSnapshot.java   |  42 +++-
 .../cluster/log/snapshot/MetaSimpleSnapshot.java   |  26 ++
 .../cluster/log/snapshot/PartitionedSnapshot.java  |   9 +
 .../cluster/log/snapshot/SnapshotFactory.java      |   3 +-
 .../iotdb/cluster/query/LocalQueryExecutor.java    |   3 +-
 .../query/last/ClusterLastQueryExecutor.java       |   9 +-
 .../cluster/query/manage/QueryCoordinator.java     |   9 +-
 .../iotdb/cluster/server/DataClusterServer.java    |  27 ++-
 .../handlers/caller/AppendNodeEntryHandler.java    |   3 +-
 .../server/handlers/caller/GenericHandler.java     |   8 +-
 .../server/handlers/caller/HeartbeatHandler.java   |   5 +
 .../server/handlers/caller/LogCatchUpHandler.java  |   6 +-
 .../handlers/forwarder/ForwardPlanHandler.java     |   7 +-
 .../server/heartbeat/DataHeartbeatThread.java      |   9 +-
 .../cluster/server/heartbeat/HeartbeatThread.java  |  15 +-
 .../cluster/server/member/DataGroupMember.java     |  19 +-
 .../cluster/server/member/MetaGroupMember.java     |  35 ++-
 .../iotdb/cluster/server/member/RaftMember.java    |  25 +-
 .../apache/iotdb/cluster/utils/StatusUtils.java    |   6 +-
 .../cluster/client/sync/SyncClientAdaptorTest.java |  12 +-
 .../iotdb/cluster/common/TestLogManager.java       |   2 +-
 .../apache/iotdb/cluster/common/TestSnapshot.java  |  21 ++
 .../iotdb/cluster/log/catchup/CatchUpTaskTest.java |   2 +
 .../cluster/log/manage/RaftLogManagerTest.java     |   2 +-
 .../log/snapshot/PartitionedSnapshotTest.java      |   6 +-
 .../cluster/log/snapshot/PullSnapshotTaskTest.java |   2 +-
 .../handlers/caller/LogCatchUpHandlerTest.java     |   2 +-
 .../handlers/caller/PullSnapshotHandlerTest.java   |   4 +-
 .../cluster/server/member/DataGroupMemberTest.java |  14 +-
 .../iotdb/cluster/server/member/MemberTest.java    |   2 +-
 .../cluster/server/member/MetaGroupMemberTest.java |   2 +-
 docs/UserGuide/Architecture/Files.md               |   6 +-
 docs/UserGuide/Ecosystem Integration/Grafana.md    |   7 +-
 .../DML Data Manipulation Language.md              |   9 +-
 docs/UserGuide/Operation Manual/SQL Reference.md   |  11 +-
 docs/zh/UserGuide/Ecosystem Integration/Grafana.md |   3 +-
 .../DML Data Manipulation Language.md              |   8 +-
 .../zh/UserGuide/Operation Manual/SQL Reference.md |   9 +-
 .../org/apache/iotdb/jdbc/IoTDBConnection.java     |   9 +-
 .../resources/conf/iotdb-engine.properties         |   5 -
 server/src/assembly/resources/conf/logback.xml     | 104 ++++----
 .../java/org/apache/iotdb/db/auth/entity/Role.java |   8 +
 .../java/org/apache/iotdb/db/auth/entity/User.java |  12 +
 .../java/org/apache/iotdb/db/conf/IoTDBConfig.java |  10 -
 .../org/apache/iotdb/db/conf/IoTDBDescriptor.java  |   7 -
 .../iotdb/db/engine/memtable/AbstractMemTable.java |   2 +-
 .../db/engine/memtable/PrimitiveMemTable.java      |   4 +
 .../engine/storagegroup/StorageGroupProcessor.java |  62 +++--
 .../db/engine/storagegroup/TsFileProcessor.java    |  11 +-
 .../db/engine/storagegroup/TsFileResource.java     |  30 +--
 .../java/org/apache/iotdb/db/metadata/MTree.java   |   2 +-
 .../main/java/org/apache/iotdb/db/qp/Planner.java  |   2 +-
 .../apache/iotdb/db/qp/constant/DatetimeUtils.java |   3 +-
 .../iotdb/db/qp/physical/crud/LastQueryPlan.java   |   8 +
 .../qp/strategy/optimizer/ConcatPathOptimizer.java | 110 ++++-----
 .../query/dataset/groupby/GroupByFillDataSet.java  |   2 +-
 .../iotdb/db/query/executor/LastQueryExecutor.java | 113 +++------
 .../db/query/executor/fill/LastPointReader.java    |   3 +
 .../iotdb/db/query/reader/series/SeriesReader.java |   5 +-
 .../org/apache/iotdb/db/service/TSServiceImpl.java |   2 +-
 .../iotdb/db/tools/TsFileResourcePrinter.java      |  13 +-
 .../org/apache/iotdb/db/utils/SerializeUtils.java  |   6 +-
 .../writelog/recover/TsFileRecoverPerformer.java   |  13 +-
 .../apache/iotdb/db/integration/IoTDBLastIT.java   | 104 ++++++++
 .../db/integration/IoTDBQueryMemoryControlIT.java  | 219 +++++++++++++++++
 .../iotdb/db/qp/plan/LogicalPlanSmallTest.java     |  65 ++---
 .../db/writelog/recover/SeqTsFileRecoverTest.java  |   3 -
 .../java/org/apache/iotdb/rpc/TSStatusCode.java    |   2 +
 .../java/org/apache/iotdb/session/Session.java     |  21 +-
 .../apache/iotdb/session/SessionConnection.java    |  14 +-
 .../org/apache/iotdb/session/pool/SessionPool.java |  28 ++-
 .../java/org/apache/iotdb/session/SessionUT.java   | 266 +++++++++++----------
 .../apache/iotdb/session/pool/SessionPoolTest.java |   6 +-
 thrift/rpc-changelist.md                           |   4 +-
 thrift/src/main/thrift/rpc.thrift                  |   7 +-
 .../iotdb/tsfile/read/reader/LocalTsFileInput.java |  60 ++++-
 tsfile/src/test/resources/logback.xml              |  52 ++--
 88 files changed, 1298 insertions(+), 645 deletions(-)
 create mode 100644 
server/src/test/java/org/apache/iotdb/db/integration/IoTDBQueryMemoryControlIT.java

Reply via email to