This is an automated email from the ASF dual-hosted git repository.
jiangtian pushed a change to branch cluster_new
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
from ff9b684 fix multiple concurrent problems
add 58d18dc Merge branch 'master' into cluster_premerge2
add 90c5a4d disable sync by default (#1325)
add 7766000 Merge remote-tracking branch 'origin/master'
add b6beda8 Merge remote-tracking branch 'origin/master'
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 a2416e8 Merge remote-tracking branch 'origin/master'
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 b13184a remove detail classpath in Win bat scripts (#1377)
add 63de9f3 Merge remote-tracking branch 'origin/master'
add 5fdbe9b add max_degree_of_index_node and tag_attribute_total_size in
starting check
add c95584c [IOTDB-769]Fix precision lost when using PLAIN for
FLOAT/DOUBLE (#1370)
add 94cb03b no last in restart (#1382)
add f2b4a97 Merge branch 'master' into cluster_premerge2
add 361499c Merge branch 'cluster_premerge2' into cluster_new
No new revisions were added by this update.
Summary of changes:
RELEASE_NOTES.md | 181 +++++++++++++
client-py/src/client_example.py | 64 +++--
distribution/src/assembly/distribution.xml | 40 ++-
docs/UserGuide/Client/Programming - Native API.md | 30 ++-
.../DDL Data Definition Language.md | 8 +-
docs/UserGuide/Operation Manual/SQL Reference.md | 8 +
.../UserGuide/Client/Programming - Native API.md | 34 ++-
.../DDL Data Definition Language.md | 9 +-
.../zh/UserGuide/Operation Manual/SQL Reference.md | 8 +
.../src/assembly/resources/sbin/start-server.bat | 5 +-
.../assembly/resources/tools/detect-watermark.bat | 4 +-
.../tools/logVisualize/log-visualizer-cmd.bat | 4 +-
.../tools/logVisualize/log-visualizer-gui.bat | 4 +-
.../src/assembly/resources/tools/memory-tool.bat | 4 +-
.../assembly/resources/tools/start-WalChecker.bat | 5 +-
.../assembly/resources/tools/start-sync-client.bat | 5 +-
.../tools/tsfileToolSet/print-iotdb-data-dir.bat | 4 +-
.../tsfileToolSet/print-tsfile-resource-files.bat | 4 +-
.../tools/tsfileToolSet/print-tsfile-sketch.bat | 4 +-
.../resources/tools/upgrade/offline-upgrade.bat | 2 +-
.../org/apache/iotdb/db/qp/strategy/SqlBase.g4 | 7 +-
.../org/apache/iotdb/db/conf/IoTDBConfigCheck.java | 48 +++-
.../org/apache/iotdb/db/conf/IoTDBConstant.java | 6 +
.../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 | 77 +++++-
.../db/engine/merge/task/RecoverMergeTask.java | 13 +-
.../org/apache/iotdb/db/metadata/MManager.java | 31 ++-
.../java/org/apache/iotdb/db/metadata/MTree.java | 156 +++++++----
.../main/java/org/apache/iotdb/db/qp/Planner.java | 2 +
.../apache/iotdb/db/qp/constant/SQLConstant.java | 4 +
.../apache/iotdb/db/qp/executor/PlanExecutor.java | 51 +++-
.../org/apache/iotdb/db/qp/logical/Operator.java | 3 +-
...eOperator.java => ShowMergeStatusOperator.java} | 7 +-
.../db/qp/logical/sys/ShowTimeSeriesOperator.java | 9 +-
.../db/qp/physical/sys/ShowMergeStatusPlan.java | 8 +-
.../apache/iotdb/db/qp/physical/sys/ShowPlan.java | 2 +-
.../db/qp/physical/sys/ShowTimeSeriesPlan.java | 15 +-
.../iotdb/db/qp/strategy/LogicalGenerator.java | 161 ++++++------
.../iotdb/db/qp/strategy/PhysicalGenerator.java | 64 ++---
.../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 | 2 +
.../iotdb/db/utils/datastructure/DoubleTVList.java | 2 +-
.../iotdb/db/utils/datastructure/FloatTVList.java | 2 +-
.../iotdb/db/engine/merge/MergeManagerTest.java | 168 ++++++++++++
.../iotdb/db/integration/IoTDBMergeTest.java | 50 +++-
.../integration/IoTDBSortedShowTimeseriesIT.java | 287 +++++++++++++++++++++
.../apache/iotdb/db/utils/VersionUtilsTest.java | 55 ++++
.../db/utils/datastructure/PrecisionTest.java | 125 +++++++++
.../apache/iotdb/tsfile/utils/VersionUtils.java | 13 +-
56 files changed, 2139 insertions(+), 402 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
server/src/main/java/org/apache/iotdb/db/qp/logical/sys/{ClearCacheOperator.java
=> ShowMergeStatusOperator.java} (84%)
copy
cluster/src/main/java/org/apache/iotdb/cluster/exception/LogExecutionException.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
create mode 100644
server/src/test/java/org/apache/iotdb/db/utils/datastructure/PrecisionTest.java
