This is an automated email from the ASF dual-hosted git repository. xuekaifeng pushed a commit to branch virtual_partition_2_merge in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit e731d906b272d29578f1482376f196a343dbfef8 Merge: e0b2d16 91db5fa Author: 151250176 <[email protected]> AuthorDate: Wed Dec 30 09:10:26 2020 +0800 Merge branch 'master' of https://github.com/apache/iotdb into virtual_partition_2_merge # Conflicts: # server/src/test/java/org/apache/iotdb/db/integration/IoTDBRestartIT.java # server/src/test/java/org/apache/iotdb/db/utils/EnvironmentUtils.java .../apache/iotdb/cluster/config/ClusterConfig.java | 14 +- .../apache/iotdb/cluster/server/ClientServer.java | 2 +- .../iotdb/cluster/server/member/RaftMember.java | 8 +- .../Ecosystem Integration/Zeppelin-IoTDB.md | 9 +- .../Operation Manual/UDF User Defined Function.md | 68 +++++++- .../Ecosystem Integration/Zeppelin-IoTDB.md | 9 +- .../Operation Manual/UDF User Defined Function.md | 70 +++++++- .../main/java/org/apache/iotdb/jdbc/Config.java | 2 +- .../apache/iotdb/jdbc/IoTDBConnectionParams.java | 2 +- .../org/apache/iotdb/db/auth/AuthorityChecker.java | 5 +- .../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 31 +++- .../org/apache/iotdb/db/conf/IoTDBConstant.java | 2 + .../compaction/CompactionMergeTaskPoolManager.java | 32 +++- .../db/engine/compaction/TsFileManagement.java | 22 ++- .../level/LevelCompactionTsFileManagement.java | 190 +++++++++++---------- .../no/NoCompactionTsFileManagement.java | 5 - .../engine/compaction/utils/CompactionUtils.java | 12 +- .../iotdb/db/engine/merge/task/MergeFileTask.java | 2 +- .../io/LocalTextModificationAccessor.java | 61 +++++-- .../engine/storagegroup/StorageGroupProcessor.java | 90 +++++----- .../iotdb/db/metadata/logfile/MLogWriter.java | 22 +-- .../apache/iotdb/db/qp/physical/crud/UDFPlan.java | 17 +- .../apache/iotdb/db/qp/physical/crud/UDTFPlan.java | 27 ++- .../apache/iotdb/db/query/dataset/UDTFDataSet.java | 4 +- .../org/apache/iotdb/db/query/udf/api/UDTF.java | 12 ++ .../db/query/udf/api/collector/PointCollector.java | 4 +- .../api/customizer/config/UDTFConfigurations.java | 3 +- .../db/query/udf/core/executor/UDTFExecutor.java | 33 ++-- .../udf/core/transformer/UDFQueryTransformer.java | 18 +- .../iotdb/db/query/udf/service/UDFClassLoader.java | 53 ++++-- .../query/udf/service/UDFClassLoaderManager.java | 122 +++++++++++++ .../udf/service/UDFRegistrationInformation.java | 17 +- .../query/udf/service/UDFRegistrationService.java | 62 ++++--- .../java/org/apache/iotdb/db/service/IoTDB.java | 6 +- .../org/apache/iotdb/db/service/ServiceType.java | 5 +- .../org/apache/iotdb/db/service/TSServiceImpl.java | 13 +- .../db/sync/receiver/load/FileLoaderManager.java | 4 +- .../compaction/LevelCompactionMergeTest.java | 4 +- .../LevelCompactionTsFileManagementTest.java | 1 - .../NoCompactionTsFileManagementTest.java | 1 - .../iotdb/db/integration/IoTDBDeletionIT.java | 35 ++++ .../db/integration/IoTDBLevelCompactionIT.java | 3 + .../iotdb/db/integration/IoTDBRestartIT.java | 40 ++--- .../db/integration/IoTDBRpcCompressionIT.java | 1 - .../integration/IoTDBUDTFAlignByTimeQueryIT.java | 169 ++++++++++++++++++ .../org/apache/iotdb/db/query/udf/example/Max.java | 64 +++++++ .../db/query/udf/example/TerminateTester.java | 64 +++++++ .../apache/iotdb/db/utils/EnvironmentUtils.java | 3 + .../tsfile/encoding/bitpacking/IntPacker.java | 4 +- .../tsfile/encoding/bitpacking/LongPacker.java | 4 +- .../org/apache/iotdb/tsfile/utils/BytesUtils.java | 4 +- 51 files changed, 1131 insertions(+), 324 deletions(-) diff --cc server/src/test/java/org/apache/iotdb/db/integration/IoTDBRestartIT.java index 406e1c8,4a23e84..154c02f --- a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBRestartIT.java +++ b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBRestartIT.java @@@ -28,7 -28,7 +28,8 @@@ import java.sql.DriverManager import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Statement; +import org.apache.iotdb.db.engine.StorageEngine; + import org.apache.iotdb.db.engine.compaction.CompactionMergeTaskPoolManager; import org.apache.iotdb.db.exception.StorageEngineException; import org.apache.iotdb.db.utils.EnvironmentUtils; import org.apache.iotdb.jdbc.Config; diff --cc server/src/test/java/org/apache/iotdb/db/utils/EnvironmentUtils.java index bb479af,5551376..2072151 --- a/server/src/test/java/org/apache/iotdb/db/utils/EnvironmentUtils.java +++ b/server/src/test/java/org/apache/iotdb/db/utils/EnvironmentUtils.java @@@ -39,7 -39,7 +39,8 @@@ import org.apache.iotdb.db.engine.Stora import org.apache.iotdb.db.engine.cache.ChunkCache; import org.apache.iotdb.db.engine.cache.ChunkMetadataCache; import org.apache.iotdb.db.engine.cache.TimeSeriesMetadataCache; +import org.apache.iotdb.db.engine.storagegroup.virtualSg.HashVirtualPartitioner; + import org.apache.iotdb.db.engine.compaction.CompactionMergeTaskPoolManager; import org.apache.iotdb.db.exception.StorageEngineException; import org.apache.iotdb.db.query.context.QueryContext; import org.apache.iotdb.db.query.control.FileReaderManager;
