This is an automated email from the ASF dual-hosted git repository.
sunzesong pushed a change to branch mtree_checkpoint
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
discard 20b6bc3 [IOTDB-726] CheckPoint of MTree
discard 9befe29 Merge remote-tracking branch 'origin/master' into
mtree_checkpoint
discard 83df79b [IOTDB-726] CheckPoint of MTree
add c345c23 fix some error in documents (#1342)
add 3bad01d Lazy Contruct AliasMap in InternalMNode (#1343)
add bdc587b [IOTDB-759] Refactor MNode by removing InternalMNode
add 765c420 [IOTDB-726] CheckPoint of MTree
add 8f87fd3 fix cannot set version when recover the uncompleted files
(#1346)
add e68d6c0 [IOTDB-727] Use the same String in MManager and
TsFileResource (#1332)
add 20cea74 Merge remote-tracking branch 'origin/master' into
mtree_checkpoint
add 5bab6c6 Merge master
add 2c4ab85 add more debug log in tag = (#1349)
add 75c842d disable auto deploy the website because of vuepress OOM
(#1353)
add 051ef4d [IOTDB-765] Failed to get upgrade.txt file when using HDFS
storage (#1357)
add 81f7e59 Merge remote-tracking branch 'origin/master' into
mtree_checkpoint
add a5e9dd0 Accelerate cache usage: combine get and contains (#1356)
add efa77dd enhance merge task management
add 75c7486 clear task map when stopped
add ecfe945 Merge branch 'master' into enhance_merge_management
add 02a0795 fix test and task comparison
add 7e18e35 fix show merge grammar
add 98720f2 fix test
add b8fd77b Merge pull request #1338 from apache/enhance_merge_management
add 3cf4eea updated python client to ver-0.10
add 049bbfd Merge remote-tracking branch 'origin/master' into
mtree_checkpoint
add db6baca Fix review comment and code smell
add 1d416e2 Fix code smell
add 6324b42 Add props of MeasurementMNode
add fd8f0af init children of MNode when used
add de58e20 fix getChildren()
add 878b317 optimize getChild()
add bf062fb use StringBuilder
add b78bd3e fix typo
add 8945a7f grant sbin/* tools/* conf/*.sh exectuable permission
add 5cc1950 add v0.10 release to RELEASE_NOTES.md
add fe73244 Refactor the execution path of InsertTabletPlan (#1361)
add 77ba871 [IOTDB-762] Fix set version IndexOutofBound (#1375)
add 21c1658 Fix session doc (#1374)
add 785d119 [ISSUE-1281] Show timeseries with heat sort (#1341)
add 51754db Merge remote-tracking branch 'origin/master' into
mtree_checkpoint
add 517b583 Merge master
new 0236967 [IOTDB-726] CheckPoint of MTree
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (20b6bc3)
\
N -- N -- N refs/heads/mtree_checkpoint (0236967)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
Jenkinsfile | 40 +--
README.md | 2 +-
README_ZH.md | 2 +-
RELEASE_NOTES.md | 181 +++++++++++++
client-py/src/client_example.py | 64 +++--
distribution/src/assembly/distribution.xml | 40 ++-
docs/Development/VoteRelease.md | 2 +-
docs/UserGuide/Client/Programming - Native API.md | 30 ++-
.../Ecosystem Integration/Spark TsFile.md | 2 +-
.../DDL Data Definition Language.md | 8 +-
docs/UserGuide/Operation Manual/SQL Reference.md | 8 +
docs/UserGuide/Server/Docker Image.md | 8 +-
docs/zh/Development/VoteRelease.md | 2 +-
docs/zh/UserGuide/Client/Programming - JDBC.md | 2 +-
.../UserGuide/Client/Programming - Native API.md | 34 ++-
.../Ecosystem Integration/Spark TsFile.md | 2 +-
.../DDL Data Definition Language.md | 9 +-
.../zh/UserGuide/Operation Manual/SQL Reference.md | 8 +
docs/zh/UserGuide/Server/Docker Image.md | 8 +-
docs/zh/UserGuide/System Tools/Sync Tool.md | 2 +-
.../main/java/org/apache/iotdb/SessionExample.java | 6 +-
.../java/org/apache/iotdb/jdbc/IoTDBStatement.java | 20 +-
.../test/java/org/apache/iotdb/jdbc/BatchTest.java | 27 +-
.../resources/conf/iotdb-engine.properties | 4 +-
.../org/apache/iotdb/db/qp/strategy/SqlBase.g4 | 7 +-
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 2 +-
.../org/apache/iotdb/db/conf/IoTDBConstant.java | 6 +
.../org/apache/iotdb/db/engine/StorageEngine.java | 12 +-
.../apache/iotdb/db/engine/cache/ChunkCache.java | 22 +-
.../iotdb/db/engine/cache/ChunkMetadataCache.java | 10 +-
.../db/engine/cache/TimeSeriesMetadataCache.java | 20 +-
.../iotdb/db/engine/merge/manage/MergeFuture.java | 153 +++++++++++
.../iotdb/db/engine/merge/manage/MergeManager.java | 196 +++++++++++++-
.../db/engine/merge/manage/MergeManagerMBean.java | 8 +-
.../db/engine/merge/manage/MergeThreadPool.java | 48 ++++
.../iotdb/db/engine/merge/task/MergeFileTask.java | 107 ++++++--
.../db/engine/merge/task/MergeMultiChunkTask.java | 216 +++++++++++-----
.../iotdb/db/engine/merge/task/MergeTask.java | 84 +++++-
.../db/engine/merge/task/RecoverMergeTask.java | 13 +-
.../engine/storagegroup/StorageGroupProcessor.java | 57 ++--
.../db/engine/storagegroup/TsFileResource.java | 4 +
.../apache/iotdb/db/engine/upgrade/UpgradeLog.java | 5 +-
.../db/exception/BatchInsertionException.java | 22 +-
.../org/apache/iotdb/db/metadata/MManager.java | 242 +++++++++++++----
.../java/org/apache/iotdb/db/metadata/MTree.java | 177 +++++++++----
.../apache/iotdb/db/metadata/MetadataConstant.java | 4 +
.../iotdb/db/metadata/mnode/InternalMNode.java | 130 ----------
.../org/apache/iotdb/db/metadata/mnode/MNode.java | 135 +++++++++-
.../iotdb/db/metadata/mnode/MeasurementMNode.java | 77 +++++-
.../iotdb/db/metadata/mnode/StorageGroupMNode.java | 22 +-
.../main/java/org/apache/iotdb/db/qp/Planner.java | 2 +
.../apache/iotdb/db/qp/constant/SQLConstant.java | 4 +
.../apache/iotdb/db/qp/executor/IPlanExecutor.java | 4 +-
.../apache/iotdb/db/qp/executor/PlanExecutor.java | 108 ++++++--
.../org/apache/iotdb/db/qp/logical/Operator.java | 3 +-
...eOperator.java => ShowMergeStatusOperator.java} | 7 +-
.../db/qp/logical/sys/ShowTimeSeriesOperator.java | 9 +-
.../db/qp/physical/crud/AlignByDevicePlan.java | 2 +
.../db/qp/physical/sys/ShowMergeStatusPlan.java | 9 +-
.../apache/iotdb/db/qp/physical/sys/ShowPlan.java | 2 +-
.../db/qp/physical/sys/ShowTimeSeriesPlan.java | 15 +-
.../iotdb/db/qp/strategy/LogicalGenerator.java | 162 ++++++------
.../iotdb/db/qp/strategy/PhysicalGenerator.java | 66 ++---
.../org/apache/iotdb/db/service/RPCService.java | 4 +-
.../org/apache/iotdb/db/service/ServiceType.java | 2 +-
.../org/apache/iotdb/db/service/StaticResps.java | 12 +
.../org/apache/iotdb/db/service/TSServiceImpl.java | 103 +++-----
.../db/tools/upgrade/TsFileOnlineUpgradeTool.java | 121 +++++----
.../iotdb/db/engine/merge/MergeManagerTest.java | 168 ++++++++++++
.../iotdb/db/integration/IoTDBMergeTest.java | 50 +++-
.../integration/IoTDBSortedShowTimeseriesIT.java | 287 +++++++++++++++++++++
.../iotdb/db/metadata/MManagerImproveTest.java | 5 +-
.../org/apache/iotdb/db/metadata/MTreeTest.java | 40 +--
.../apache/iotdb/db/utils/VersionUtilsTest.java | 55 ++++
...ceFromReaderTest.java => DeviceStringTest.java} | 118 ++-------
service-rpc/rpc-changelist.md | 25 +-
.../apache/iotdb/rpc/BatchExecutionException.java | 3 +-
.../main/java/org/apache/iotdb/rpc/RpcUtils.java | 39 +--
.../java/org/apache/iotdb/rpc/TSStatusCode.java | 1 +
service-rpc/src/main/thrift/rpc.thrift | 22 +-
.../java/org/apache/iotdb/session/Session.java | 48 ++--
.../org/apache/iotdb/session/pool/SessionPool.java | 40 +--
.../org/apache/iotdb/session/IoTDBSessionIT.java | 12 +-
tsfile/format-changelist.md | 4 +-
.../iotdb/tsfile/utils/ReadWriteIOUtils.java | 12 +-
.../apache/iotdb/tsfile/utils/VersionUtils.java | 8 +-
86 files changed, 2809 insertions(+), 1053 deletions(-)
create mode 100644
server/src/main/java/org/apache/iotdb/db/engine/merge/manage/MergeFuture.java
copy
tsfile/src/main/java/org/apache/iotdb/tsfile/common/cache/Accountable.java =>
server/src/main/java/org/apache/iotdb/db/engine/merge/manage/MergeManagerMBean.java
(84%)
create mode 100644
server/src/main/java/org/apache/iotdb/db/engine/merge/manage/MergeThreadPool.java
copy jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBSQLException.java =>
server/src/main/java/org/apache/iotdb/db/exception/BatchInsertionException.java
(63%)
delete mode 100644
server/src/main/java/org/apache/iotdb/db/metadata/mnode/InternalMNode.java
copy
server/src/main/java/org/apache/iotdb/db/qp/logical/sys/{ClearCacheOperator.java
=> ShowMergeStatusOperator.java} (84%)
copy
tsfile/src/main/java/org/apache/iotdb/tsfile/common/cache/Accountable.java =>
server/src/main/java/org/apache/iotdb/db/qp/physical/sys/ShowMergeStatusPlan.java
(82%)
create mode 100644
server/src/test/java/org/apache/iotdb/db/engine/merge/MergeManagerTest.java
create mode 100644
server/src/test/java/org/apache/iotdb/db/integration/IoTDBSortedShowTimeseriesIT.java
create mode 100644
server/src/test/java/org/apache/iotdb/db/utils/VersionUtilsTest.java
copy
server/src/test/java/org/apache/iotdb/db/writelog/recover/{RecoverResourceFromReaderTest.java
=> DeviceStringTest.java} (50%)
