You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by yu...@apache.org on 2020/07/09 03:20:12 UTC
[incubator-iotdb] branch kyy3 updated (1cc1eb6 -> b8ff795)
This is an automated email from the ASF dual-hosted git repository.
yuyuankang pushed a change to branch kyy3
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
from 1cc1eb6 collections
add 14e828b decouple thrift interface from raft member
add 7597566 fix maven warning about losing some plugin versions
add 8fcdb51 fix restart bug
add 1e2c3e9 premerge for the distributed version (#1326)
add 3129985 Update index.styl
add 12be837 fix LICENSE-binary (#1471)
add 6b1b0e1 Merge branch 'master' into cluster_new
add ade1501 rename connect node and fix readString
add 3634857 add sync interface
add 36d524d [IOTDB-627]Support range deletion for timeseries (#1400)
add 8d8938b Merge branch 'master' into cluster_new
add 3a6e418 disable selector thread when not using async servers
add b8ff795 fix conflict
No new revisions were added by this update.
Summary of changes:
LICENSE-binary | 71 +-
cli/pom.xml | 1 +
.../cluster/client/async/AsyncDataClient.java | 16 +-
.../cluster/client/async/AsyncMetaClient.java | 16 +-
.../cluster/client/sync/SyncClientAdaptor.java | 4 +-
.../SyncClientFactory.java} | 9 +-
.../SyncClientPool.java} | 43 +-
.../iotdb/cluster/client/sync/SyncDataClient.java | 81 ++
.../iotdb/cluster/client/sync/SyncMetaClient.java | 73 ++
.../apache/iotdb/cluster/config/ClusterConfig.java | 11 +
.../iotdb/cluster/log/catchup/CatchUpTask.java | 16 +-
.../iotdb/cluster/log/catchup/LogCatchUpTask.java | 129 +++-
.../cluster/log/catchup/SnapshotCatchUpTask.java | 42 +-
.../cluster/log/snapshot/PullSnapshotTask.java | 41 +-
.../iotdb/cluster/query/ClusterPlanExecutor.java | 89 ++-
.../query/groupby/RemoteGroupByExecutor.java | 13 +-
.../query/last/ClusterLastQueryExecutor.java | 70 +-
.../cluster/query/manage/QueryCoordinator.java | 15 +-
.../iotdb/cluster/query/reader/DataSourceInfo.java | 16 +-
.../reader/RemoteSeriesReaderByTimestamp.java | 62 +-
.../query/reader/RemoteSimpleSeriesReader.java | 82 +-
.../apache/iotdb/cluster/server/ClientServer.java | 10 +-
.../iotdb/cluster/server/DataClusterServer.java | 349 +++++++--
.../iotdb/cluster/server/MetaClusterServer.java | 142 +++-
.../cluster/server/PullSnapshotHintService.java | 29 +-
.../apache/iotdb/cluster/server/RaftServer.java | 59 +-
.../org/apache/iotdb/cluster/server/Response.java | 2 +
.../server/heartbeat/DataHeartbeatThread.java | 10 +-
.../cluster/server/heartbeat/HeartbeatThread.java | 104 ++-
.../server/heartbeat/MetaHeartbeatThread.java | 28 +-
.../cluster/server/member/DataGroupMember.java | 626 ++++++---------
.../cluster/server/member/MetaGroupMember.java | 850 ++++++++++-----------
.../iotdb/cluster/server/member/RaftMember.java | 375 +++++----
.../cluster/server/service/BaseAsyncService.java | 142 ++++
.../cluster/server/service/BaseSyncService.java | 142 ++++
.../cluster/server/service/DataAsyncService.java | 302 ++++++++
.../cluster/server/service/DataSyncService.java | 279 +++++++
.../cluster/server/service/MetaAsyncService.java | 244 ++++++
.../cluster/server/service/MetaSyncService.java | 236 ++++++
.../apache/iotdb/cluster/utils/ClusterUtils.java | 168 ++++
.../iotdb/cluster/common/TestAsyncDataClient.java | 21 +-
.../cluster/log/applier/DataLogApplierTest.java | 12 +-
.../iotdb/cluster/log/catchup/CatchUpTaskTest.java | 2 +-
.../cluster/log/catchup/LogCatchUpTaskTest.java | 2 +-
.../log/catchup/SnapshotCatchUpTaskTest.java | 2 +-
.../cluster/query/manage/QueryCoordinatorTest.java | 2 +-
.../cluster/query/reader/DatasourceInfoTest.java | 2 +-
.../reader/RemoteSeriesReaderByTimestampTest.java | 2 +-
.../query/reader/RemoteSimpleSeriesReaderTest.java | 2 +-
.../server/heartbeat/DataHeartbeatThreadTest.java | 2 +-
.../server/heartbeat/HeartbeatThreadTest.java | 2 +-
.../server/heartbeat/MetaHeartbeatThreadTest.java | 2 +-
.../cluster/server/member/DataGroupMemberTest.java | 65 +-
.../iotdb/cluster/server/member/MemberTest.java | 16 +-
.../cluster/server/member/MetaGroupMemberTest.java | 114 ++-
distribution/pom.xml | 1 +
.../DML Data Manipulation Language.md | 28 +-
docs/UserGuide/Operation Manual/SQL Reference.md | 9 +-
.../DML Data Manipulation Language.md | 25 +-
.../zh/UserGuide/Operation Manual/SQL Reference.md | 9 +-
hadoop/pom.xml | 5 +-
hive-connector/pom.xml | 7 +-
jdbc/pom.xml | 4 +-
licenses/EDL License 1.0 | 11 -
pom.xml | 19 +-
server/pom.xml | 11 +
.../org/apache/iotdb/db/engine/StorageEngine.java | 4 +-
.../apache/iotdb/db/engine/cache/ChunkCache.java | 8 +-
.../iotdb/db/engine/memtable/AbstractMemTable.java | 23 +-
.../apache/iotdb/db/engine/memtable/IMemTable.java | 5 +-
.../db/engine/memtable/IWritableMemChunk.java | 10 +-
.../iotdb/db/engine/memtable/WritableMemChunk.java | 9 +-
.../db/engine/merge/task/MergeMultiChunkTask.java | 3 +-
.../iotdb/db/engine/modification/Deletion.java | 47 +-
.../io/LocalTextModificationAccessor.java | 20 +-
.../engine/storagegroup/StorageGroupProcessor.java | 60 +-
.../db/engine/storagegroup/TsFileProcessor.java | 3 +-
.../org/apache/iotdb/db/metadata/MManager.java | 17 +-
.../iotdb/db/metadata/mnode/StorageGroupMNode.java | 1 -
.../org/apache/iotdb/db/monitor/StatMonitor.java | 2 +-
.../apache/iotdb/db/qp/executor/IPlanExecutor.java | 5 +-
.../apache/iotdb/db/qp/executor/PlanExecutor.java | 9 +-
.../db/qp/logical/crud/DeleteDataOperator.java | 18 +-
.../iotdb/db/qp/physical/crud/DeletePlan.java | 55 +-
.../db/qp/physical/crud/InsertTabletPlan.java | 3 +
.../iotdb/db/qp/strategy/LogicalGenerator.java | 59 +-
.../iotdb/db/qp/strategy/PhysicalGenerator.java | 2 +-
.../org/apache/iotdb/db/service/TSServiceImpl.java | 3 +-
.../java/org/apache/iotdb/db/utils/QueryUtils.java | 40 +-
.../org/apache/iotdb/db/utils/SchemaUtils.java | 1 +
.../iotdb/db/utils/datastructure/TVList.java | 35 +-
.../iotdb/db/writelog/recover/LogReplayer.java | 8 +-
.../iotdb/db/engine/merge/MergeTaskTest.java | 2 +-
.../engine/modification/DeletionFileNodeTest.java | 28 +-
.../db/engine/modification/DeletionQueryTest.java | 52 +-
.../engine/modification/ModificationFileTest.java | 8 +-
.../storagegroup/StorageGroupProcessorTest.java | 2 +-
.../iotdb/db/integration/IoTDBDeletionIT.java | 37 +
.../apache/iotdb/db/integration/IoTDBLastIT.java | 52 ++
.../iotdb/db/qp/plan/LogicalPlanSmallTest.java | 93 +++
.../apache/iotdb/db/qp/plan/PhysicalPlanTest.java | 11 +
.../apache/iotdb/db/writelog/PerformanceTest.java | 4 +-
.../iotdb/db/writelog/WriteLogNodeManagerTest.java | 2 +-
.../apache/iotdb/db/writelog/WriteLogNodeTest.java | 8 +-
.../iotdb/db/writelog/io/LogWriterReaderTest.java | 2 +-
.../db/writelog/io/MultiFileLogReaderTest.java | 2 +-
.../iotdb/db/writelog/recover/LogReplayerTest.java | 6 +-
service-rpc/pom.xml | 3 +-
session/pom.xml | 2 +-
.../java/org/apache/iotdb/session/Session.java | 19 +-
site/src/main/.vuepress/theme/styles/index.styl | 4 +-
thrift/pom.xml | 3 +-
thrift/rpc-changelist.md | 4 +-
thrift/src/main/thrift/rpc.thrift | 3 +-
tsfile/pom.xml | 3 +-
.../iotdb/tsfile/file/metadata/ChunkMetadata.java | 46 +-
.../iotdb/tsfile/read/TsFileSequenceReader.java | 2 +-
.../org/apache/iotdb/tsfile/read/common/Chunk.java | 17 +-
.../apache/iotdb/tsfile/read/common/TimeRange.java | 51 +-
.../read/controller/CachedChunkLoaderImpl.java | 2 +-
.../tsfile/read/reader/chunk/ChunkReader.java | 24 +-
.../read/reader/chunk/ChunkReaderByTimestamp.java | 4 +-
.../iotdb/tsfile/read/reader/page/PageReader.java | 41 +-
.../iotdb/tsfile/utils/ReadWriteIOUtils.java | 3 +
.../tsfile/v1/file/metadata/ChunkMetadataV1.java | 11 +-
.../tsfile/v1/read/TsFileSequenceReaderForV1.java | 2 +-
.../iotdb/tsfile/read/common/TimeRangeTest.java | 70 ++
.../iotdb/tsfile/read/reader/PageReaderTest.java | 55 ++
128 files changed, 4720 insertions(+), 1782 deletions(-)
copy cluster/src/main/java/org/apache/iotdb/cluster/client/{async/AsyncClientFactory.java => sync/SyncClientFactory.java} (80%)
copy cluster/src/main/java/org/apache/iotdb/cluster/client/{async/AsyncClientPool.java => sync/SyncClientPool.java} (69%)
create mode 100644 cluster/src/main/java/org/apache/iotdb/cluster/client/sync/SyncDataClient.java
create mode 100644 cluster/src/main/java/org/apache/iotdb/cluster/client/sync/SyncMetaClient.java
create mode 100644 cluster/src/main/java/org/apache/iotdb/cluster/server/service/BaseAsyncService.java
create mode 100644 cluster/src/main/java/org/apache/iotdb/cluster/server/service/BaseSyncService.java
create mode 100644 cluster/src/main/java/org/apache/iotdb/cluster/server/service/DataAsyncService.java
create mode 100644 cluster/src/main/java/org/apache/iotdb/cluster/server/service/DataSyncService.java
create mode 100644 cluster/src/main/java/org/apache/iotdb/cluster/server/service/MetaAsyncService.java
create mode 100644 cluster/src/main/java/org/apache/iotdb/cluster/server/service/MetaSyncService.java
create mode 100644 cluster/src/main/java/org/apache/iotdb/cluster/utils/ClusterUtils.java
delete mode 100644 licenses/EDL License 1.0