This is an automated email from the ASF dual-hosted git repository.
jiangtian pushed a change to branch cluster_premerge
in repository https://gitbox.apache.org/repos/asf/iotdb.git.
from 6711f95 Merge branch 'master' into cluster_premerge
add a224edc update start-cli bash (#1829)
add 102bd16 [IOTDB-829] Accelerate delete timeseries (#1732)
add ae766b0 [IOTDB-947] Fix error when counting node with wildcard (#1832)
add b323b78 [IOTDB-921] Solve the statement twice call bug (#1784)
add f72064d [IOTDB-928] Make ENCODING optional in create time series
sentence (#1785)
add 6d8e206 Merge branch 'master' into cluster_premerge
No new revisions were added by this update.
Summary of changes:
.../org/apache/iotdb/db/qp/strategy/SqlBase.g4 | 2 +-
cli/src/assembly/resources/sbin/start-cli.bat | 10 +-
cli/src/assembly/resources/sbin/start-cli.sh | 35 ++++++-
.../DDL Data Definition Language.md | 3 +-
docs/UserGuide/Operation Manual/SQL Reference.md | 1 +
.../DDL Data Definition Language.md | 3 +-
.../zh/UserGuide/Operation Manual/SQL Reference.md | 1 +
.../java/org/apache/iotdb/jdbc/IoTDBStatement.java | 64 ++++++++++++-
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 23 +++++
.../org/apache/iotdb/db/engine/StorageEngine.java | 28 +++---
.../iotdb/db/engine/memtable/AbstractMemTable.java | 33 ++++---
.../apache/iotdb/db/engine/memtable/IMemTable.java | 9 +-
.../db/engine/merge/manage/MergeResource.java | 10 +-
.../engine/storagegroup/StorageGroupProcessor.java | 101 +++++++++++----------
.../db/engine/storagegroup/TsFileProcessor.java | 19 ++--
.../org/apache/iotdb/db/metadata/MManager.java | 5 +
.../java/org/apache/iotdb/db/metadata/MTree.java | 53 ++++++++---
.../org/apache/iotdb/db/metadata/PartialPath.java | 53 ++++++++++-
.../org/apache/iotdb/db/monitor/StatMonitor.java | 2 +-
.../apache/iotdb/db/qp/executor/PlanExecutor.java | 21 +----
.../iotdb/db/qp/strategy/LogicalGenerator.java | 17 +++-
.../iotdb/db/query/context/QueryContext.java | 7 +-
.../chunk/metadata/DiskChunkMetadataLoader.java | 7 +-
.../org/apache/iotdb/db/utils/FileLoaderUtils.java | 2 +-
.../iotdb/db/writelog/recover/LogReplayer.java | 10 +-
.../engine/modification/DeletionFileNodeTest.java | 28 +++---
.../db/engine/modification/DeletionQueryTest.java | 52 +++++------
.../storagegroup/StorageGroupProcessorTest.java | 5 +-
.../engine/storagegroup/TsFileProcessorTest.java | 9 +-
.../iotdb/db/integration/IoTDBMultiSeriesIT.java | 29 ++++++
.../iotdb/db/integration/IoTDBSimpleQueryIT.java | 49 ++++++++++
.../org/apache/iotdb/db/metadata/MTreeTest.java | 22 +++++
.../apache/iotdb/db/metadata/PartialPathTest.java | 27 +++++-
thrift/src/main/thrift/rpc.thrift | 2 +-
.../iotdb/tsfile/utils/ReadWriteIOUtils.java | 8 ++
35 files changed, 560 insertions(+), 190 deletions(-)
