You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ji...@apache.org on 2020/12/04 07:53:32 UTC
[iotdb] 01/01: Merge branch 'cluster_new' into
cluster_extract_application
This is an automated email from the ASF dual-hosted git repository.
jiangtian pushed a commit to branch cluster_extract_application
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 0a972b6c0f03cee9ebdd5702b63b179b5d3e1e81
Merge: 0c3ab92 39cb51a
Author: jt <jt...@163.com>
AuthorDate: Fri Dec 4 15:52:09 2020 +0800
Merge branch 'cluster_new' into cluster_extract_application
# Conflicts:
# cluster/src/main/java/org/apache/iotdb/cluster/server/member/RaftMember.java
README.md | 2 +-
README_ZH.md | 2 +-
antlr/pom.xml | 2 +-
.../antlr4/org/apache/iotdb/db/qp/sql/SqlBase.g4 | 5 -
cli/pom.xml | 4 +-
client-cpp/client-cpp-example/pom.xml | 4 +-
client-cpp/pom.xml | 4 +-
client-py/pom.xml | 2 +-
client-py/pypi/setup.py | 2 +-
cluster/pom.xml | 10 +-
.../iotdb/cluster/log/catchup/CatchUpTask.java | 27 +-
.../log/manage/UnCommittedEntryManager.java | 45 +-
.../apache/iotdb/cluster/metadata/CMManager.java | 15 +-
.../cluster/partition/slot/SlotPartitionTable.java | 53 +-
.../groupby/ClusterGroupByNoVFilterDataSet.java | 17 +-
.../groupby/ClusterGroupByVFilterDataSet.java | 18 +-
.../handlers/caller/AppendNodeEntryHandler.java | 1 -
.../iotdb/cluster/server/member/RaftMember.java | 7 +-
.../cluster/server/service/DataSyncService.java | 2 +-
.../caller/AppendNodeEntryHandlerTest.java | 78 +--
compile-tools/boost/pom.xml | 2 +-
compile-tools/pom.xml | 4 +-
compile-tools/thrift/pom.xml | 2 +-
cross-tests/pom.xml | 2 +-
distribution/pom.xml | 2 +-
docker/src/main/Dockerfile | 4 +-
docs/Download/README.md | 47 +-
docs/SystemDesign/TsFile/Format.md | 2 +-
docs/UserGuide/Client/Command Line Interface.md | 1 +
docs/UserGuide/Concept/SDT.md | 45 ++
docs/UserGuide/Operation Manual/SQL Reference.md | 10 +-
docs/zh/Download/README.md | 47 +-
docs/zh/SystemDesign/TsFile/Format.md | 2 +-
docs/zh/UserGuide/Client/Command Line Interface.md | 2 +-
docs/zh/UserGuide/Concept/Data Type.md | 2 +-
.../pom.xml => docs/zh/UserGuide/Concept/SDT.md | 45 +-
.../UserGuide/Ecosystem Integration/Hive TsFile.md | 6 +-
.../zh/UserGuide/Operation Manual/SQL Reference.md | 10 +-
docs/zh/UserGuide/Server/Download.md | 14 +-
example/flink/pom.xml | 2 +-
example/hadoop/pom.xml | 6 +-
example/jdbc/pom.xml | 2 +-
example/kafka/pom.xml | 2 +-
.../main/java/org/apache/iotdb/kafka/Constant.java | 2 +
example/mqtt/pom.xml | 2 +-
example/pom.xml | 3 +-
example/{jdbc => pulsar}/pom.xml | 18 +-
.../java/org/apache/iotdb/pulsar/Constant.java | 15 +-
.../org/apache/iotdb/pulsar/PulsarConsumer.java | 108 ++++
.../apache/iotdb/pulsar/PulsarConsumerThread.java | 70 +++
.../org/apache/iotdb/pulsar/PulsarProducer.java | 82 +++
example/rocketmq/pom.xml | 2 +-
example/session/pom.xml | 2 +-
.../main/java/org/apache/iotdb/SessionExample.java | 14 +
example/tsfile/pom.xml | 2 +-
flink-iotdb-connector/pom.xml | 2 +-
.../java/org/apache/iotdb/flink/IoTDBSink.java | 25 +-
flink-tsfile-connector/pom.xml | 2 +-
grafana/pom.xml | 2 +-
.../controller/DatabaseConnectController.java | 4 +-
.../iotdb/web/grafana/dao/impl/BasicDaoImpl.java | 29 +-
.../web/grafana/dao/impl/BasicDaoImplTest.java | 55 ++
hadoop/pom.xml | 4 +-
hive-connector/pom.xml | 6 +-
jdbc/pom.xml | 2 +-
pom.xml | 2 +-
server/pom.xml | 2 +-
.../resources/conf/iotdb-engine.properties | 10 +-
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 14 +-
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 6 +-
.../org/apache/iotdb/db/engine/StorageEngine.java | 27 +-
.../db/engine/compaction/TsFileManagement.java | 21 +
.../level/LevelCompactionTsFileManagement.java | 42 +-
.../no/NoCompactionTsFileManagement.java | 22 +-
.../engine/compaction/utils/CompactionUtils.java | 2 +-
.../iotdb/db/engine/flush/FlushManagerMBean.java | 8 +-
.../iotdb/db/engine/flush/MemTableFlushTask.java | 2 +-
.../iotdb/db/engine/memtable/AbstractMemTable.java | 52 +-
.../db/engine/memtable/IWritableMemChunk.java | 24 +-
.../iotdb/db/engine/memtable/WritableMemChunk.java | 35 +-
.../db/engine/querycontext/ReadOnlyMemChunk.java | 37 +-
.../engine/storagegroup/StorageGroupProcessor.java | 80 ++-
.../db/engine/storagegroup/TsFileProcessor.java | 163 +++---
.../db/engine/storagegroup/TsFileResource.java | 75 +--
.../iotdb/db/exception/BatchProcessException.java | 9 +-
.../org/apache/iotdb/db/metadata/MManager.java | 193 +++----
.../org/apache/iotdb/db/metrics/sink/Sink.java | 6 +-
.../org/apache/iotdb/db/metrics/source/Source.java | 2 +-
.../org/apache/iotdb/db/monitor/StatMonitor.java | 1 -
.../apache/iotdb/db/qp/executor/PlanExecutor.java | 213 ++++----
.../apache/iotdb/db/qp/physical/PhysicalPlan.java | 21 +
.../qp/physical/sys/CreateMultiTimeSeriesPlan.java | 87 ++--
.../db/qp/physical/sys/CreateTimeSeriesPlan.java | 6 +-
.../dataset/groupby/GroupByEngineDataSet.java | 7 +-
.../groupby/GroupByWithValueFilterDataSet.java | 2 +
.../org/apache/iotdb/db/service/StaticResps.java | 98 +---
.../org/apache/iotdb/db/service/TSServiceImpl.java | 108 +---
.../org/apache/iotdb/db/utils/SchemaUtils.java | 1 -
.../org/apache/iotdb/db/utils/SerializeUtils.java | 233 +++++----
.../iotdb/db/utils/datastructure/TVList.java | 128 ++---
.../db/writelog/node/ExclusiveWriteLogNode.java | 1 -
.../db/engine/memtable/PrimitiveMemTableTest.java | 2 +-
.../engine/storagegroup/TsFileProcessorTest.java | 8 +-
.../iotdb/db/integration/IoTDBCompactionIT.java | 99 ++++
.../db/integration/IoTDBInsertWithQueryIT.java | 503 ++++++++++++++++++
.../iotdb/db/integration/IoTDBRestartIT.java | 61 ++-
.../iotdb/db/integration/IoTDBSimpleQueryIT.java | 422 ++++++++++++++-
service-rpc/pom.xml | 2 +-
.../iotdb/rpc/AutoScalingBufferReadTransport.java | 14 +-
.../iotdb/rpc/AutoScalingBufferWriteTransport.java | 19 +-
.../java/org/apache/iotdb/rpc/IoTDBRpcDataSet.java | 7 +-
.../org/apache/iotdb/rpc/NonOpenTransport.java | 22 +-
.../org/apache/iotdb/rpc/RpcTransportFactory.java | 3 +-
.../rpc/TCompressedElasticFramedTransport.java | 56 +-
.../apache/iotdb/rpc/TElasticFramedTransport.java | 18 +-
.../iotdb/rpc/TSnappyElasticFramedTransport.java | 9 +-
.../rpc/TimeoutChangeableTFastFramedTransport.java | 12 +-
.../TimeoutChangeableTSnappyFramedTransport.java | 11 +-
session/pom.xml | 2 +-
.../apache/iotdb/session/IoTDBSessionSimpleIT.java | 47 ++
site/README-zh.md | 8 +-
site/README.md | 15 +-
site/pom.xml | 568 +++++++++++++++++----
site/src/main/.vuepress/config.js | 198 ++++++-
site/src/main/package.json | 6 +-
spark-iotdb-connector/pom.xml | 2 +-
spark-tsfile/pom.xml | 4 +-
thrift/pom.xml | 2 +-
tsfile/pom.xml | 2 +-
.../iotdb/tsfile/compress/IUnCompressor.java | 2 +-
.../iotdb/tsfile/encoding/encoder/SDTEncoder.java | 448 ++++++++++++++++
.../tsfile/encoding/encoder/TSEncodingBuilder.java | 14 +-
.../iotdb/tsfile/read/TsFileSequenceReader.java | 18 +-
.../tsfile/read/query/dataset/QueryDataSet.java | 14 +-
.../iotdb/tsfile/utils/ReadWriteIOUtils.java | 114 +----
.../iotdb/tsfile/write/chunk/ChunkWriterImpl.java | 121 ++++-
.../apache/iotdb/tsfile/write/record/Tablet.java | 5 +-
.../iotdb/tsfile/encoding/SDTEncoderTest.java | 176 +++++++
138 files changed, 4228 insertions(+), 1558 deletions(-)
diff --cc server/src/main/java/org/apache/iotdb/db/metadata/MManager.java
index f51b2aa,397805c..71ffdf7
--- a/server/src/main/java/org/apache/iotdb/db/metadata/MManager.java
+++ b/server/src/main/java/org/apache/iotdb/db/metadata/MManager.java
@@@ -26,10 -26,8 +26,9 @@@ import java.io.File
import java.io.FileReader;
import java.io.IOException;
import java.nio.file.Files;
- import java.nio.file.Path;
import java.util.ArrayDeque;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;