This is an automated email from the ASF dual-hosted git repository. neuyilan pushed a commit to branch change_rpc_port in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 51c71786c2dbad57424c20057b961a176fdc5a74 Merge: 1a986e6 103e07f Author: HouliangQi <[email protected]> AuthorDate: Fri Feb 26 09:51:51 2021 +0800 Merge branch 'apache_master' into change_rpc_port .github/workflows/client.yml | 4 +- .github/workflows/{main-mac.yml => main-unix.yml} | 10 +- .github/workflows/main-win.yml | 2 +- .../{main-linux.yml => sonar-coveralls.yml} | 20 +- README.md | 2 + .../java/org/apache/iotdb/cli/AbstractCliIT.java | 2 +- .../org/apache/iotdb/cli/StartClientScriptIT.java | 4 +- client-cpp/pom.xml | 156 ++++---- client-cpp/src/assembly/client-cpp.xml | 1 + cluster/src/assembly/cluster.xml | 8 +- .../cluster/client/sync/SyncClientAdaptor.java | 21 + .../iotdb/cluster/coordinator/Coordinator.java | 33 +- .../cluster/log/applier/AsyncDataLogApplier.java | 8 + .../iotdb/cluster/log/applier/BaseApplier.java | 3 + .../iotdb/cluster/log/applier/DataLogApplier.java | 11 + .../manage/FilePartitionedSnapshotLogManager.java | 18 +- .../log/manage/PartitionedSnapshotLogManager.java | 18 +- .../cluster/log/snapshot/MetaSimpleSnapshot.java | 3 +- .../apache/iotdb/cluster/metadata/CMManager.java | 372 ++++++++++++++---- .../iotdb/cluster/query/ClusterPlanRouter.java | 35 +- .../iotdb/cluster/query/LocalQueryExecutor.java | 18 + .../iotdb/cluster/server/DataClusterServer.java | 13 + .../server/handlers/caller/GetDevicesHandler.java | 60 +++ .../cluster/server/member/DataGroupMember.java | 12 +- .../cluster/server/service/DataAsyncService.java | 10 + .../cluster/server/service/DataSyncService.java | 9 + .../iotdb/cluster/common/TestLogManager.java | 4 +- .../iotdb/cluster/log/CommitLogCallbackTest.java | 4 +- .../cluster/log/applier/MetaLogApplierTest.java | 11 +- .../cluster/log/manage/RaftLogManagerTest.java | 3 +- .../cluster/log/snapshot/DataSnapshotTest.java | 2 +- .../iotdb/cluster/query/LoadConfigurationTest.java | 4 +- .../query/reader/RemoteSimpleSeriesReaderTest.java | 2 +- .../caller/AppendGroupEntryHandlerTest.java | 3 +- .../handlers/caller/ElectionHandlerTest.java | 2 +- compile-tools/thrift/pom.xml | 432 +++++++-------------- compile-tools/thrift/src/assembly/compiler.xml | 37 -- compile-tools/thrift/src/assembly/cpp.xml | 51 --- compile-tools/thrift/src/assembly/python.xml | 38 -- distribution/pom.xml | 31 +- .../src/assembly/{distribution.xml => all.xml} | 57 +-- distribution/src/assembly/cli.xml | 54 +++ .../src/assembly/client-cpp.xml | 39 +- .../src/assembly/{distribution.xml => cluster.xml} | 64 ++- distribution/src/assembly/common-files.xml | 48 +++ distribution/src/assembly/grafana.xml | 48 +++ .../src/assembly/{distribution.xml => server.xml} | 49 +-- docker/src/main/Dockerfile | 2 +- .../DML Data Manipulation Language.md | 38 +- .../DML Data Manipulation Language.md | 36 +- example/client-cpp-example/pom.xml | 214 +++++----- .../iotdb/flink/FlinkTsFileStreamSource.java | 3 +- .../iotdb/hadoop/tsfile/TSFMRReadExample.java | 3 +- .../iotdb/hadoop/tsfile/TSMRWriteExample.java | 3 +- .../java/org/apache/iotdb/flink/IoTDBSink.java | 2 +- .../iotdb/flink/IoTDBSinkBatchInsertTest.java | 2 +- .../iotdb/flink/IoTDBSinkBatchTimerTest.java | 4 +- .../iotdb/flink/tsfile/RowTSRecordConverter.java | 7 +- .../flink/tsfile/RowTsFileConnectorTestBase.java | 2 +- .../flink/tsfile/RowTsFileInputFormatITCase.java | 2 +- .../web/grafana/dao/impl/BasicDaoImplTest.java | 4 +- .../apache/iotdb/hadoop/fileSystem/HDFSFile.java | 7 +- .../apache/iotdb/hadoop/fileSystem/HDFSInput.java | 10 +- .../apache/iotdb/hadoop/fileSystem/HDFSOutput.java | 4 +- .../iotdb/hadoop/tsfile/TSFRecordReader.java | 4 +- .../iotdb/hadoop/tsfile/TSFRecordWriter.java | 2 +- .../apache/iotdb/hadoop/tsfile/TSFHadoopTest.java | 4 +- .../iotdb/hadoop/tsfile/TSFInputSplitTest.java | 2 +- .../org/apache/iotdb/hive/TSFHiveOutputFormat.java | 2 +- .../org/apache/iotdb/hive/TSFHiveRecordReader.java | 2 +- .../java/org/apache/iotdb/hive/TsFileSerDe.java | 4 +- .../org/apache/iotdb/jdbc/IoTDBConnection.java | 2 +- .../org/apache/iotdb/jdbc/IoTDBDataSource.java | 17 +- .../apache/iotdb/jdbc/IoTDBDataSourceFactory.java | 10 +- .../apache/iotdb/jdbc/IoTDBDatabaseMetadata.java | 8 +- .../java/org/apache/iotdb/jdbc/IoTDBDriver.java | 4 +- .../apache/iotdb/jdbc/IoTDBPreparedStatement.java | 24 +- .../java/org/apache/iotdb/jdbc/IoTDBStatement.java | 2 +- .../test/java/org/apache/iotdb/jdbc/BatchTest.java | 2 +- .../org/apache/iotdb/jdbc/IoTDBConnectionTest.java | 6 +- .../apache/iotdb/jdbc/IoTDBResultMetadataTest.java | 4 +- .../org/apache/iotdb/jdbc/IoTDBStatementTest.java | 2 +- .../test/java/org/apache/iotdb/jdbc/UtilsTest.java | 4 +- pom.xml | 35 +- .../system.properties-changelist.md | 8 +- server/pom.xml | 4 - .../iotdb/db/auth/authorizer/OpenIdAuthorizer.java | 6 +- .../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 2 +- .../org/apache/iotdb/db/engine/StorageEngine.java | 5 +- .../engine/storagegroup/StorageGroupProcessor.java | 11 +- .../org/apache/iotdb/db/metadata/MManager.java | 62 ++- .../java/org/apache/iotdb/db/metadata/MTree.java | 31 +- .../org/apache/iotdb/db/metadata/MetaUtils.java | 37 ++ .../org/apache/iotdb/db/metadata/mnode/MNode.java | 49 ++- .../apache/iotdb/db/metrics/server/JettyUtil.java | 6 +- .../iotdb/db/metrics/server/QueryServlet.java | 7 +- .../apache/iotdb/db/mqtt/BrokerAuthenticator.java | 2 +- .../apache/iotdb/db/qp/executor/IPlanExecutor.java | 8 + .../apache/iotdb/db/qp/executor/PlanExecutor.java | 73 ++-- .../org/apache/iotdb/db/qp/logical/Operator.java | 3 +- .../apache/iotdb/db/qp/physical/PhysicalPlan.java | 14 +- .../iotdb/db/qp/physical/crud/AggregationPlan.java | 35 ++ .../db/qp/physical/crud/InsertMultiTabletPlan.java | 16 +- .../iotdb/db/qp/physical/crud/InsertRowPlan.java | 10 +- .../physical/crud/InsertRowsOfOneDevicePlan.java | 4 +- .../iotdb/db/qp/physical/crud/InsertRowsPlan.java | 219 +++++++++++ .../qp/physical/sys/CreateMultiTimeSeriesPlan.java | 14 + .../db/qp/physical/sys/DeleteTimeSeriesPlan.java | 22 ++ .../iotdb/db/qp/physical/sys/ShowDevicesPlan.java | 26 ++ .../db/qp/physical/sys/ShowTimeSeriesPlan.java | 2 +- .../apache/iotdb/db/qp/sql/IoTDBSqlVisitor.java | 2 +- .../iotdb/db/qp/strategy/PhysicalGenerator.java | 11 + .../qp/strategy/optimizer/ConcatPathOptimizer.java | 11 - .../db/query/aggregation/impl/AvgAggrResult.java | 17 + .../db/query/aggregation/impl/CountAggrResult.java | 2 +- .../query/aggregation/impl/MaxValueAggrResult.java | 4 +- .../query/aggregation/impl/MinValueAggrResult.java | 7 +- .../iotdb/db/query/dataset/ShowDevicesResult.java | 44 +++ .../iotdb/db/query/dataset/SingleDataSet.java | 5 +- .../db/query/dataset/UDTFNonAlignDataSet.java | 2 +- .../query/dataset/groupby/GroupByTimeDataSet.java | 8 +- .../db/query/executor/AggregationExecutor.java | 12 +- .../db/query/reader/chunk/DiskChunkLoader.java | 2 +- .../db/query/reader/chunk/MemChunkLoader.java | 4 +- .../db/query/reader/chunk/MemChunkReader.java | 2 +- .../chunk/metadata/MemChunkMetadataLoader.java | 3 +- .../query/reader/series/SeriesAggregateReader.java | 2 +- .../org/apache/iotdb/db/service/JMXService.java | 3 +- .../org/apache/iotdb/db/service/MQTTService.java | 3 +- .../apache/iotdb/db/service/MetricsService.java | 4 +- .../org/apache/iotdb/db/service/RPCService.java | 3 +- .../org/apache/iotdb/db/service/TSServiceImpl.java | 95 +++-- .../org/apache/iotdb/db/service/UpgradeSevice.java | 3 +- .../iotdb/db/sync/receiver/SyncServerManager.java | 3 +- .../db/sync/receiver/transfer/SyncServiceImpl.java | 9 +- .../db/tools/watermark/WatermarkDetector.java | 2 +- .../org/apache/iotdb/db/utils/FilePathUtils.java | 155 ++++---- .../java/org/apache/iotdb/db/utils/FileUtils.java | 3 +- .../org/apache/iotdb/db/utils/SchemaUtils.java | 2 +- .../db/auth/authorizer/OpenIdAuthorizerTest.java | 2 +- .../db/auth/role/LocalFileRoleAccessorTest.java | 2 +- .../db/auth/role/LocalFileRoleManagerTest.java | 2 +- .../db/auth/user/LocalFileUserAccessorTest.java | 2 +- .../IoTDBDefaultThreadExceptionHandlerTest.java | 4 +- .../db/concurrent/IoTDBThreadPoolFactoryTest.java | 8 +- .../db/engine/memtable/MemTableFlushTaskTest.java | 3 +- .../db/engine/memtable/MemtableBenchmark.java | 3 +- .../engine/modification/DeletionFileNodeTest.java | 3 +- .../io/LocalTextModificationAccessorTest.java | 2 +- .../iotdb/db/engine/storagegroup/TTLTest.java | 4 +- .../engine/storagegroup/TsFileProcessorTest.java | 2 +- .../virtualSg/HashVirtualPartitionerTest.java | 2 +- .../db/integration/IoTDBAutoCreateSchemaIT.java | 106 +++++ .../iotdb/db/integration/IoTDBCheckConfigIT.java | 2 +- .../iotdb/db/integration/IoTDBClearCacheIT.java | 3 +- .../apache/iotdb/db/integration/IoTDBCloseIT.java | 3 +- .../iotdb/db/integration/IoTDBCompleteIT.java | 20 +- .../iotdb/db/integration/IoTDBCompressTypeIT.java | 2 +- .../db/integration/IoTDBCreateSnapshotIT.java | 2 +- .../db/integration/IoTDBCreateTimeseriesIT.java | 157 ++++++++ .../apache/iotdb/db/integration/IoTDBDaemonIT.java | 14 +- .../db/integration/IoTDBDeleteStorageGroupIT.java | 2 +- .../db/integration/IoTDBDeleteTimeseriesIT.java | 2 +- .../db/integration/IoTDBEngineTimeGeneratorIT.java | 3 +- .../apache/iotdb/db/integration/IoTDBFillIT.java | 21 +- .../db/integration/IoTDBFloatPrecisionIT.java | 5 +- ...TDBKillQueryTest.java => IoTDBKillQueryIT.java} | 2 +- .../iotdb/db/integration/IoTDBLargeDataIT.java | 12 +- .../apache/iotdb/db/integration/IoTDBLastIT.java | 4 +- .../iotdb/db/integration/IoTDBLimitSlimitIT.java | 11 +- .../iotdb/db/integration/IoTDBMetadataFetchIT.java | 2 +- .../iotdb/db/integration/IoTDBMultiDeviceIT.java | 3 +- .../iotdb/db/integration/IoTDBMultiSeriesIT.java | 8 +- .../db/integration/IoTDBMultiStatementsIT.java | 3 +- .../iotdb/db/integration/IoTDBNumberPathIT.java | 21 +- .../iotdb/db/integration/IoTDBQueryDemoIT.java | 2 +- ...ryTimeoutTest.java => IoTDBQueryTimeoutIT.java} | 2 +- .../iotdb/db/integration/IoTDBQuotedPathIT.java | 2 +- .../iotdb/db/integration/IoTDBRecoverIT.java | 4 +- .../db/integration/IoTDBRecoverUnclosedIT.java | 4 +- .../db/integration/IoTDBRemovePartitionIT.java | 7 +- .../IoTDBSameMeasurementsDifferentTypesIT.java | 3 +- .../iotdb/db/integration/IoTDBSimpleQueryIT.java | 2 +- .../iotdb/db/integration/IoTDBTagAlterIT.java | 2 +- .../apache/iotdb/db/integration/IoTDBTagIT.java | 2 +- .../{IoTDBTracingTest.java => IoTDBTracingIT.java} | 2 +- .../iotdb/db/integration/IoTDBVersionIT.java | 2 +- .../aggregation/IoTDBAggregationByLevelIT.java | 86 ++-- .../aggregation/IoTDBAggregationIT.java | 10 +- .../aggregation/IoTDBAggregationLargeDataIT.java | 7 +- .../db/integration/auth/IoTDBAuthorizationIT.java | 2 +- .../iotdb/db/metadata/MManagerBasicTest.java | 2 +- .../org/apache/iotdb/db/metadata/MTreeTest.java | 29 +- .../apache/iotdb/db/metadata/MetaUtilsTest.java | 35 ++ .../apache/iotdb/db/metadata/PartialPathTest.java | 2 +- .../apache/iotdb/db/metadata/mnode/MNodeTest.java | 71 ++++ .../iotdb/db/qp/logical/IndexLogicalPlanTest.java | 5 +- .../iotdb/db/qp/sql/IoTDBsqlVisitorTest.java | 4 +- .../iotdb/db/query/control/TracingManagerTest.java | 5 +- .../db/query/dataset/ShowDevicesResultTest.java | 31 +- .../reader/series/SeriesAggregateReaderTest.java | 6 +- .../reader/series/SeriesReaderByTimestampTest.java | 6 +- .../db/query/reader/series/SeriesReaderTest.java | 6 +- .../query/reader/series/SeriesReaderTestUtil.java | 6 +- .../org/apache/iotdb/db/script/EnvScriptIT.java | 6 +- .../db/sync/receiver/load/FileLoaderTest.java | 8 +- .../recover/SyncReceiverLogAnalyzerTest.java | 7 +- .../receiver/recover/SyncReceiverLoggerTest.java | 6 +- .../db/sync/sender/manage/SyncFileManagerTest.java | 6 +- .../db/sync/sender/transfer/SyncClientTest.java | 6 +- .../apache/iotdb/db/tools/IoTDBWatermarkTest.java | 7 +- .../org/apache/iotdb/db/tools/MLogParserTest.java | 2 +- .../apache/iotdb/db/utils/FilePathUtilsTest.java | 3 +- .../org/apache/iotdb/db/utils/SchemaUtilsTest.java | 2 +- .../db/utils/datastructure/BinaryTVListTest.java | 2 +- .../db/utils/datastructure/BooleanTVListTest.java | 2 +- .../db/utils/datastructure/DoubleTVListTest.java | 2 +- .../db/utils/datastructure/FloatTVListTest.java | 2 +- .../db/utils/datastructure/IntTVListTest.java | 2 +- .../db/utils/datastructure/LongTVListTest.java | 2 +- .../db/utils/datastructure/PrecisionTest.java | 9 +- .../apache/iotdb/db/writelog/PerformanceTest.java | 5 +- .../iotdb/db/writelog/WriteLogNodeManagerTest.java | 2 +- .../apache/iotdb/db/writelog/WriteLogNodeTest.java | 2 +- .../iotdb/db/writelog/recover/LogReplayerTest.java | 3 +- .../java/org/apache/iotdb/rpc/IoTDBRpcDataSet.java | 2 +- session/pom.xml | 4 - .../apache/iotdb/session/IoTDBSessionSimpleIT.java | 20 + .../apache/iotdb/session/SessionCacheLeaderUT.java | 33 +- .../public/img/contributor-avatar/xww.jpg | Bin 0 -> 64538 bytes .../public/img/contributor-avatar/yrzh.jpg | Bin 0 -> 99556 bytes site/src/main/.vuepress/theme/components/Page.vue | 35 +- .../theme/global-components/Contributor.vue | 14 + .../apache/iotdb/spark/db/EnvironmentUtils.java | 2 +- .../spark/tsfile/qp/common/BasicOperator.java | 4 +- .../tsfile/qp/optimizer/RemoveNotOptimizer.java | 20 +- thrift/src/main/thrift/cluster.thrift | 5 + .../apache/iotdb/tsfile/compress/ICompressor.java | 6 +- .../iotdb/tsfile/compress/IUnCompressor.java | 6 +- .../tsfile/encoding/decoder/BitmapDecoder.java | 21 +- .../tsfile/encoding/decoder/LongRleDecoder.java | 3 +- .../tsfile/encoding/decoder/PlainDecoder.java | 3 +- .../encoding/encoder/RegularDataEncoder.java | 8 +- .../encoding/encoder/SinglePrecisionEncoderV1.java | 3 +- .../iotdb/tsfile/read/UnClosedTsFileReader.java | 4 +- .../tsfile/read/reader/BatchDataIterator.java | 4 +- .../iotdb/tsfile/read/reader/LocalTsFileInput.java | 2 +- .../tsfile/write/chunk/ChunkGroupWriterImpl.java | 6 +- .../write/record/datapoint/BooleanDataPoint.java | 4 +- .../write/record/datapoint/DoubleDataPoint.java | 4 +- .../write/record/datapoint/FloatDataPoint.java | 4 +- .../write/record/datapoint/IntDataPoint.java | 4 +- .../write/record/datapoint/LongDataPoint.java | 4 +- .../write/record/datapoint/StringDataPoint.java | 4 +- .../iotdb/tsfile/encoding/SDTEncoderTest.java | 12 +- .../tsfile/encoding/decoder/BitmapDecoderTest.java | 4 +- .../tsfile/encoding/decoder/FloatDecoderTest.java | 4 +- .../encoding/decoder/GorillaDecoderV1Test.java | 4 +- .../tsfile/encoding/decoder/IntRleDecoderTest.java | 4 +- .../encoding/decoder/LongRleDecoderTest.java | 4 +- .../delta/DeltaBinaryEncoderIntegerTest.java | 2 +- .../decoder/delta/DeltaBinaryEncoderLongTest.java | 2 +- .../regular/RegularDataEncoderIntegerTest.java | 15 +- .../regular/RegularDataEncoderLongTest.java | 15 +- .../file/metadata/TimeSeriesMetadataTest.java | 2 +- .../tsfile/file/metadata/TsFileMetadataTest.java | 2 +- .../iotdb/tsfile/read/TimePlainEncodeReadTest.java | 3 +- .../tsfile/read/TimeSeriesMetadataReadTest.java | 2 +- .../tsfile/read/filter/GroupByFilterTest.java | 2 +- .../read/query/executor/QueryExecutorTest.java | 3 +- .../query/timegenerator/ReaderByTimestampTest.java | 3 +- .../TsFileGeneratorForSeriesReaderByTimestamp.java | 8 +- .../tsfile/read/reader/FakedMultiBatchReader.java | 4 +- .../apache/iotdb/tsfile/utils/BytesUtilsTest.java | 8 +- .../tsfile/utils/ReadWriteStreamUtilsTest.java | 4 +- .../tsfile/utils/ReadWriteToBytesUtilsTest.java | 2 +- .../apache/iotdb/tsfile/utils/RecordUtilsTest.java | 3 +- .../org/apache/iotdb/tsfile/write/PerfTest.java | 2 +- .../iotdb/tsfile/write/ReadPageInMemTest.java | 2 +- .../iotdb/tsfile/write/TsFileReadWriteTest.java | 4 +- .../iotdb/tsfile/write/TsFileWriterTest.java | 2 +- .../org/apache/iotdb/tsfile/write/WriteTest.java | 2 +- 282 files changed, 2901 insertions(+), 1750 deletions(-) diff --cc cluster/src/test/java/org/apache/iotdb/cluster/log/applier/MetaLogApplierTest.java index dcfec31,8f526a3..701c1a4 --- a/cluster/src/test/java/org/apache/iotdb/cluster/log/applier/MetaLogApplierTest.java +++ b/cluster/src/test/java/org/apache/iotdb/cluster/log/applier/MetaLogApplierTest.java @@@ -26,11 -26,8 +26,9 @@@ import org.apache.iotdb.cluster.log.log import org.apache.iotdb.cluster.log.logtypes.PhysicalPlanLog; import org.apache.iotdb.cluster.log.logtypes.RemoveNodeLog; import org.apache.iotdb.cluster.rpc.thrift.Node; +import org.apache.iotdb.cluster.utils.Constants; import org.apache.iotdb.db.exception.StorageEngineException; import org.apache.iotdb.db.exception.metadata.MetadataException; - import org.apache.iotdb.db.exception.metadata.StorageGroupNotSetException; - import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.metadata.PartialPath; import org.apache.iotdb.db.qp.physical.sys.CreateTimeSeriesPlan; import org.apache.iotdb.db.qp.physical.sys.SetStorageGroupPlan; @@@ -79,11 -76,10 +77,10 @@@ public class MetaLogApplierTest extend } @Test - public void testApplyAddNode() - throws QueryProcessException, StorageGroupNotSetException, StorageEngineException { + public void testApplyAddNode() { nodes.clear(); - - Node node = new Node("localhost", 1111, 0, 2222, 55560); + // TODO hxd: + Node node = new Node("localhost", 1111, 0, 2222, Constants.RPC_PORT, "localhost"); AddNodeLog log = new AddNodeLog(); log.setNewNode(node); applier.apply(log);
