You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by qi...@apache.org on 2020/11/22 10:15:11 UTC

[iotdb] branch fix_doc_sg created (now 0823c6c)

This is an automated email from the ASF dual-hosted git repository.

qiaojialin pushed a change to branch fix_doc_sg
in repository https://gitbox.apache.org/repos/asf/iotdb.git.


      at 0823c6c  fix doc

This branch includes the following new commits:

     new 58b7825  format config
     new 66f881b  Merge remote-tracking branch 'origin/master'
     new 3951cae  Merge remote-tracking branch 'origin/master'
     new 54d424c  Merge remote-tracking branch 'origin/master'
     new c590e0c  Merge remote-tracking branch 'origin/master'
     new b7f4e9e  Merge remote-tracking branch 'origin/master'
     new 685d679  Merge remote-tracking branch 'origin/master'
     new c330eaf  Merge remote-tracking branch 'origin/master'
     new ffe320a  Merge remote-tracking branch 'origin/master'
     new 76dafbb  Merge remote-tracking branch 'origin/master'
     new 751aaa4  Merge remote-tracking branch 'origin/master'
     new 1877b29  Merge remote-tracking branch 'origin/master'
     new d635aff  Merge remote-tracking branch 'origin/master'
     new 3895dd1  Merge remote-tracking branch 'origin/master'
     new 6eb6fd3  Merge remote-tracking branch 'origin/master'
     new 889dae8  Merge remote-tracking branch 'origin/master'
     new 3ff97d7  Merge remote-tracking branch 'origin/master'
     new 1dbb539  Merge remote-tracking branch 'origin/master'
     new 1c4a2fb  Merge remote-tracking branch 'origin/master'
     new bb220eb  Merge remote-tracking branch 'origin/master'
     new 0823c6c  fix doc

The 21 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.



[iotdb] 17/21: Merge remote-tracking branch 'origin/master'

Posted by qi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

qiaojialin pushed a commit to branch fix_doc_sg
in repository https://gitbox.apache.org/repos/asf/iotdb.git

commit 3ff97d756462586718c4c7138a13f09738b52afe
Merge: 889dae8 50b6b79
Author: qiaojialin <64...@qq.com>
AuthorDate: Wed Nov 18 20:10:27 2020 +0800

    Merge remote-tracking branch 'origin/master'

 .../level/LevelCompactionTsFileManagement.java         | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)


[iotdb] 01/21: format config

Posted by qi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

qiaojialin pushed a commit to branch fix_doc_sg
in repository https://gitbox.apache.org/repos/asf/iotdb.git

commit 58b7825d1e79e1d18986f777b067b3a5390f705c
Author: qiaojialin <64...@qq.com>
AuthorDate: Sat Nov 7 10:12:54 2020 +0800

    format config
---
 server/src/assembly/resources/conf/iotdb-engine.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/src/assembly/resources/conf/iotdb-engine.properties b/server/src/assembly/resources/conf/iotdb-engine.properties
index e72b908..4d914f3 100644
--- a/server/src/assembly/resources/conf/iotdb-engine.properties
+++ b/server/src/assembly/resources/conf/iotdb-engine.properties
@@ -278,7 +278,7 @@ compaction_strategy=LEVEL_COMPACTION
 
 # Works when the compaction_strategy is LEVEL_COMPACTION.
 # Whether to merge unseq files into seq files or not.
-enable_unseq_compaction = true
+enable_unseq_compaction=true
 
 # Works when the compaction_strategy is LEVEL_COMPACTION.
 # The max seq file num of each level.


[iotdb] 05/21: Merge remote-tracking branch 'origin/master'

Posted by qi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

qiaojialin pushed a commit to branch fix_doc_sg
in repository https://gitbox.apache.org/repos/asf/iotdb.git

commit c590e0c50d2b5f2f808af8531cc023708a4235d2
Merge: 54d424c 1c78fa2
Author: qiaojialin <64...@qq.com>
AuthorDate: Sat Nov 7 15:46:49 2020 +0800

    Merge remote-tracking branch 'origin/master'

 .../iotdb/db/auth/authorizer/BasicAuthorizer.java  |  2 +-
 .../apache/iotdb/db/qp/executor/PlanExecutor.java  | 13 -----------
 .../apache/iotdb/db/qp/physical/PhysicalPlan.java  | 11 +++++++++
 .../iotdb/db/qp/physical/crud/InsertPlan.java      | 18 +++++++++++++++
 .../iotdb/db/qp/physical/crud/InsertRowPlan.java   | 26 ++++++++++++++++++++--
 .../db/qp/physical/crud/InsertTabletPlan.java      | 17 ++++++++++++++
 .../org/apache/iotdb/db/service/TSServiceImpl.java | 11 ++++-----
 7 files changed, 77 insertions(+), 21 deletions(-)


[iotdb] 21/21: fix doc

Posted by qi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

qiaojialin pushed a commit to branch fix_doc_sg
in repository https://gitbox.apache.org/repos/asf/iotdb.git

commit 0823c6cded44f5092143313be098f5cc86028760
Author: qiaojialin <64...@qq.com>
AuthorDate: Sun Nov 22 18:14:45 2020 +0800

    fix doc
---
 docs/zh/UserGuide/Operation Manual/DDL Data Definition Language.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/zh/UserGuide/Operation Manual/DDL Data Definition Language.md b/docs/zh/UserGuide/Operation Manual/DDL Data Definition Language.md
index 349e2f7..ba083e0 100644
--- a/docs/zh/UserGuide/Operation Manual/DDL Data Definition Language.md	
+++ b/docs/zh/UserGuide/Operation Manual/DDL Data Definition Language.md	
@@ -32,7 +32,7 @@ IoTDB > set storage group to root.sgcc
 
 根据以上两条SQL语句,我们可以创建出两个存储组。
 
-需要注意的是,当系统中已经存在某个存储组或存储组的父亲节点或者孩子节点被设置为存储组的情况下,用户不可创建存储组。例如在已经有`root.ln`和`root.sgcc`这两个存储组的情况下,创建`root.ln.wf01`存储组是不可行的。系统将给出相应的错误提示,如下所示:
+需要注意的是,存储组的父子节点都不能再设置存储组。例如在已经有`root.ln`和`root.sgcc`这两个存储组的情况下,创建`root.ln.wf01`存储组是不可行的。系统将给出相应的错误提示,如下所示:
 
 ```
 IoTDB> set storage group to root.ln.wf01


[iotdb] 02/21: Merge remote-tracking branch 'origin/master'

Posted by qi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

qiaojialin pushed a commit to branch fix_doc_sg
in repository https://gitbox.apache.org/repos/asf/iotdb.git

commit 66f881b512c04a890aa3e74576107770f46a6041
Merge: 58b7825 e5418c4
Author: qiaojialin <64...@qq.com>
AuthorDate: Sat Nov 7 11:48:40 2020 +0800

    Merge remote-tracking branch 'origin/master'

 .travis.yml                                        |   2 +-
 cli/src/main/java/org/apache/iotdb/cli/Cli.java    |   4 +-
 cli/src/main/java/org/apache/iotdb/cli/WinCli.java |   3 +-
 .../org/apache/iotdb/db/engine/StorageEngine.java  |  15 +++-
 .../db/engine/compaction/TsFileManagement.java     |   6 +-
 .../org/apache/iotdb/db/metadata/MetaUtils.java    |  18 +++-
 .../apache/iotdb/db/service/RegisterManager.java   |   1 +
 .../org/apache/iotdb/db/service/TSServiceImpl.java |   7 +-
 .../apache/iotdb/db/metadata/MetaUtilsTest.java    |  24 +++--
 .../db/sync/receiver/load/FileLoaderTest.java      |   2 +-
 .../recover/SyncReceiverLogAnalyzerTest.java       |   2 +-
 .../apache/iotdb/db/utils/EnvironmentUtils.java    | 100 +++++++++++++--------
 server/src/test/resources/logback.xml              |   2 +
 .../apache/iotdb/session/IoTDBSessionSimpleIT.java |  56 ++++++++++++
 14 files changed, 175 insertions(+), 67 deletions(-)


[iotdb] 14/21: Merge remote-tracking branch 'origin/master'

Posted by qi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

qiaojialin pushed a commit to branch fix_doc_sg
in repository https://gitbox.apache.org/repos/asf/iotdb.git

commit 3895dd169f1b50d8e40c8926b9bd628a60a50c92
Merge: d635aff 84c1f9c
Author: qiaojialin <64...@qq.com>
AuthorDate: Mon Nov 16 13:53:32 2020 +0800

    Merge remote-tracking branch 'origin/master'

 .github/workflows/main-ci.yml                      | 112 +++++++++++++++++
 .github/workflows/sonar_and_coverall.yml           |  76 ++++++++++++
 README.md                                          |  11 ++
 README_ZH.md                                       |  13 +-
 .../apache/iotdb/db/qp/executor/PlanExecutor.java  |   4 -
 .../iotdb/db/integration/IoTDBDeletionIT.java      |  29 +++++
 .../org/apache/iotdb/session/pool/SessionPool.java | 133 ++++++++++++++++-----
 .../apache/iotdb/session/pool/SessionPoolTest.java |  18 +++
 site/src/main/.vuepress/theme/components/Page.vue  |   3 +
 .../fileOutputFactory/LocalFSOutputFactory.java    |   3 +-
 ...SameMeasurementsWithDifferentDataTypesTest.java |  14 ++-
 .../write/writer/ForceAppendTsFileWriterTest.java  |  14 ++-
 12 files changed, 388 insertions(+), 42 deletions(-)


[iotdb] 08/21: Merge remote-tracking branch 'origin/master'

Posted by qi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

qiaojialin pushed a commit to branch fix_doc_sg
in repository https://gitbox.apache.org/repos/asf/iotdb.git

commit c330eaf0dc787edbbd008fd2d61d33a5f425e5b1
Merge: 685d679 c2e69c9
Author: qiaojialin <64...@qq.com>
AuthorDate: Tue Nov 10 17:13:33 2020 +0800

    Merge remote-tracking branch 'origin/master'

 .travis.yml                                        | 12 +--
 .../file-changelists/TsFileResource-changelist.md  | 16 +++-
 server/file-changelists/role-changelist.md         | 14 ++++
 .../storage_group_version-changelist.md            | 20 -----
 server/file-changelists/user-changelist.md         | 14 ++++
 .../org/apache/iotdb/db/metadata/MManager.java     |  3 +
 .../iotdb/db/metrics/server/ServerArgument.java    | 91 +++++++++++-----------
 .../org/apache/iotdb/db/service/TSServiceImpl.java | 10 ++-
 site/pom.xml                                       | 12 +--
 .../iotdb/tsfile/utils/ReadWriteIOUtils.java       |  6 +-
 10 files changed, 115 insertions(+), 83 deletions(-)


[iotdb] 13/21: Merge remote-tracking branch 'origin/master'

Posted by qi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

qiaojialin pushed a commit to branch fix_doc_sg
in repository https://gitbox.apache.org/repos/asf/iotdb.git

commit d635aff6bbe98ff579582fe4b629a1bbe1690258
Merge: 1877b29 a5af774
Author: qiaojialin <64...@qq.com>
AuthorDate: Fri Nov 13 10:18:31 2020 +0800

    Merge remote-tracking branch 'origin/master'

 server/src/assembly/resources/conf/iotdb-env.bat   |  2 +-
 .../org/apache/iotdb/db/service/TSServiceImpl.java | 67 +++++++++++++++-------
 2 files changed, 46 insertions(+), 23 deletions(-)


[iotdb] 16/21: Merge remote-tracking branch 'origin/master'

Posted by qi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

qiaojialin pushed a commit to branch fix_doc_sg
in repository https://gitbox.apache.org/repos/asf/iotdb.git

commit 889dae8e11a8351a050df85d8fdef53c7e3b4281
Merge: 6eb6fd3 f2e9161
Author: qiaojialin <64...@qq.com>
AuthorDate: Wed Nov 18 20:08:20 2020 +0800

    Merge remote-tracking branch 'origin/master'

 .../org/apache/iotdb/db/qp/strategy/SqlBase.g4     |  52 +++--
 .../java/org/apache/iotdb/cli/AbstractCli.java     |   9 +-
 cli/src/main/java/org/apache/iotdb/cli/Cli.java    |   2 +-
 cli/src/main/java/org/apache/iotdb/cli/WinCli.java |   8 +-
 .../java/org/apache/iotdb/cli/AbstractCliIT.java   |  29 ++-
 .../resources/conf/iotdb-engine.properties         |  31 ++-
 server/src/assembly/resources/sbin/start-server.sh |   2 +
 .../org/apache/iotdb/db/auth/AuthorityChecker.java |   5 +-
 .../java/org/apache/iotdb/db/conf/IoTDBConfig.java |  79 ++++++-
 .../org/apache/iotdb/db/conf/IoTDBDescriptor.java  |  22 ++
 .../db/conf/directories/DirectoryManager.java      |   4 +
 .../index/DistanceMetricException.java}            |  17 +-
 .../index/IllegalIndexParamException.java}         |  17 +-
 .../db/exception/index/IndexManagerException.java  |  35 ++++
 .../index/IndexRuntimeException.java}              |  20 +-
 .../db/exception/index/QueryIndexException.java    |  30 +++
 .../index/UnsupportedIndexTypeException.java       |  31 +++
 .../iotdb/db/index/common/IndexConstant.java       |  37 ++++
 .../apache/iotdb/db/index/common/IndexType.java    |  87 ++++++++
 .../apache/iotdb/db/index/common/IndexUtils.java   |  36 ++++
 .../java/org/apache/iotdb/db/metadata/MTree.java   |  15 +-
 .../iotdb/db/metadata/MetadataOperationType.java   |   2 +
 .../main/java/org/apache/iotdb/db/qp/Planner.java  |   5 +-
 .../apache/iotdb/db/qp/constant/SQLConstant.java   |   5 +
 .../apache/iotdb/db/qp/executor/PlanExecutor.java  |   7 +
 .../org/apache/iotdb/db/qp/logical/Operator.java   |   3 +-
 .../logical/crud/QueryIndexOperator.java}          |  41 +++-
 .../db/qp/logical/sys/CreateIndexOperator.java     |  62 ++++++
 .../logical/sys/DropIndexOperator.java}            |  32 ++-
 .../apache/iotdb/db/qp/physical/PhysicalPlan.java  |  12 +-
 .../iotdb/db/qp/physical/crud/QueryIndexPlan.java  |  75 +++++++
 .../iotdb/db/qp/physical/sys/CreateIndexPlan.java  | 182 ++++++++++++++++
 .../iotdb/db/qp/physical/sys/DropIndexPlan.java    | 132 ++++++++++++
 .../iotdb/db/qp/strategy/LogicalGenerator.java     | 229 ++++++++++++++++++++-
 .../iotdb/db/qp/strategy/PhysicalGenerator.java    |  23 +++
 .../qp/strategy/optimizer/ConcatPathOptimizer.java |  15 +-
 .../query/dataset/groupby/GroupByFillDataSet.java  |  15 +-
 .../iotdb/db/query/executor/LastQueryExecutor.java | 199 ++++++++++--------
 .../iotdb/db/service/thrift/ThriftService.java     |   6 +-
 .../iotdb/db/utils/datastructure/BinaryTVList.java |   5 +
 .../db/utils/datastructure/BooleanTVList.java      |   5 +
 .../iotdb/db/utils/datastructure/DoubleTVList.java |   5 +
 .../iotdb/db/utils/datastructure/FloatTVList.java  |   5 +
 .../iotdb/db/utils/datastructure/IntTVList.java    |   5 +
 .../iotdb/db/utils/datastructure/LongTVList.java   |   5 +
 .../iotdb/db/utils/datastructure/TVList.java       |   5 +
 .../apache/iotdb/db/integration/IoTDBLastIT.java   |   2 -
 .../iotdb/db/qp/plan/IndexLogicalPlanTest.java     | 156 ++++++++++++++
 .../qp/plan/IndexSubMatchingPhysicalPlanTest.java  | 160 ++++++++++++++
 .../plan/IndexWholeMatchingPhysicalPlanTest.java   | 154 ++++++++++++++
 server/src/test/resources/iotdb-engine.properties  |   3 +-
 .../java/org/apache/iotdb/rpc/TSStatusCode.java    |   4 +
 .../iotdb/tsfile/utils/ReadWriteIOUtils.java       |  23 +++
 53 files changed, 1941 insertions(+), 209 deletions(-)



[iotdb] 10/21: Merge remote-tracking branch 'origin/master'

Posted by qi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

qiaojialin pushed a commit to branch fix_doc_sg
in repository https://gitbox.apache.org/repos/asf/iotdb.git

commit 76dafbb1daa95cdde62349c792c9b428c70b6132
Merge: ffe320a feb2001
Author: qiaojialin <64...@qq.com>
AuthorDate: Wed Nov 11 11:31:45 2020 +0800

    Merge remote-tracking branch 'origin/master'

 .../engine/storagegroup/StorageGroupProcessor.java | 36 ++++++++++++++++++----
 1 file changed, 30 insertions(+), 6 deletions(-)


[iotdb] 04/21: Merge remote-tracking branch 'origin/master'

Posted by qi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

qiaojialin pushed a commit to branch fix_doc_sg
in repository https://gitbox.apache.org/repos/asf/iotdb.git

commit 54d424c8989be2619b8dde2da0b33189549de77a
Merge: 3951cae 0bd3bdc
Author: qiaojialin <64...@qq.com>
AuthorDate: Sat Nov 7 14:40:27 2020 +0800

    Merge remote-tracking branch 'origin/master'

 .../db/engine/compaction/level/LevelCompactionTsFileManagement.java   | 4 ++++
 1 file changed, 4 insertions(+)


[iotdb] 09/21: Merge remote-tracking branch 'origin/master'

Posted by qi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

qiaojialin pushed a commit to branch fix_doc_sg
in repository https://gitbox.apache.org/repos/asf/iotdb.git

commit ffe320a14a04f45349aae6a901d87e48542b5e86
Merge: c330eaf 5bbbdbd
Author: qiaojialin <64...@qq.com>
AuthorDate: Wed Nov 11 09:57:02 2020 +0800

    Merge remote-tracking branch 'origin/master'

 .../compaction/CompactionMergeTaskPoolManager.java | 12 ++++-
 .../db/engine/compaction/TsFileManagement.java     |  7 +--
 .../level/LevelCompactionTsFileManagement.java     | 54 ++++++++++++++--------
 .../iotdb/db/engine/merge/manage/MergeManager.java | 25 ++++++++--
 .../iotdb/db/engine/merge/task/MergeFileTask.java  |  5 --
 .../db/engine/querycontext/ReadOnlyMemChunk.java   |  1 +
 .../engine/storagegroup/TsFileProcessorTest.java   | 14 +++---
 .../iotdb/db/integration/IoTDBAggregationIT.java   | 36 +++++++++++++--
 8 files changed, 109 insertions(+), 45 deletions(-)


[iotdb] 03/21: Merge remote-tracking branch 'origin/master'

Posted by qi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

qiaojialin pushed a commit to branch fix_doc_sg
in repository https://gitbox.apache.org/repos/asf/iotdb.git

commit 3951cae0ecfab8795a870a2e880ea4e5e8205f88
Merge: 66f881b 8df4d57
Author: qiaojialin <64...@qq.com>
AuthorDate: Sat Nov 7 13:55:51 2020 +0800

    Merge remote-tracking branch 'origin/master'

 .travis.yml                                              | 12 ++++++------
 .../java/org/apache/iotdb/db/conf/IoTDBConstant.java     |  1 +
 .../iotdb/db/query/executor/AggregationExecutor.java     | 16 ++++++++++++++--
 3 files changed, 21 insertions(+), 8 deletions(-)


[iotdb] 18/21: Merge remote-tracking branch 'origin/master'

Posted by qi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

qiaojialin pushed a commit to branch fix_doc_sg
in repository https://gitbox.apache.org/repos/asf/iotdb.git

commit 1dbb539dde75d2bb3bb04a1716edcdefb6c63f14
Merge: 3ff97d7 5f287ae
Author: qiaojialin <64...@qq.com>
AuthorDate: Wed Nov 18 20:23:55 2020 +0800

    Merge remote-tracking branch 'origin/master'

 server/src/assembly/resources/conf/iotdb-engine.properties            | 4 ++--
 server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java        | 2 +-
 .../main/java/org/apache/iotdb/db/qp/strategy/PhysicalGenerator.java  | 2 +-
 .../test/java/org/apache/iotdb/db/integration/IoTDBMultiSeriesIT.java | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)



[iotdb] 07/21: Merge remote-tracking branch 'origin/master'

Posted by qi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

qiaojialin pushed a commit to branch fix_doc_sg
in repository https://gitbox.apache.org/repos/asf/iotdb.git

commit 685d679fc184792b483ef97e823f00b1696658fc
Merge: b7f4e9e 766af3b
Author: qiaojialin <64...@qq.com>
AuthorDate: Mon Nov 9 10:02:30 2020 +0800

    Merge remote-tracking branch 'origin/master'

 hadoop/pom.xml                |  13 ++++
 hive-connector/pom.xml        |  15 ++++
 pom.xml                       | 166 +++++++++++++++++++++---------------------
 spark-iotdb-connector/pom.xml |  13 ++++
 4 files changed, 124 insertions(+), 83 deletions(-)


[iotdb] 11/21: Merge remote-tracking branch 'origin/master'

Posted by qi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

qiaojialin pushed a commit to branch fix_doc_sg
in repository https://gitbox.apache.org/repos/asf/iotdb.git

commit 751aaa463064a00553c89d8c6a14a41faefd186b
Merge: 76dafbb d5be2f9
Author: qiaojialin <64...@qq.com>
AuthorDate: Wed Nov 11 15:17:37 2020 +0800

    Merge remote-tracking branch 'origin/master'

 docs/SystemDesign/Tools/Sync.md                    |  2 +-
 docs/UserGuide/Server/ServerFileList.md            |  4 +-
 docs/UserGuide/Server/Single Node Setup.md         |  4 +-
 docs/UserGuide/System Tools/JMX Tool.md            |  2 +-
 .../UserGuide/System Tools/Load External Tsfile.md |  4 +-
 .../System Tools/Monitor and Log Tools.md          | 31 +++++++-------
 .../Query History Visualization Tool.md            |  6 +--
 docs/UserGuide/System Tools/Sync Tool.md           |  2 +-
 docs/UserGuide/System Tools/Watermark Tool.md      |  2 +-
 docs/UserGuide/UserGuideReadme.md                  |  4 +-
 .../level/LevelCompactionTsFileManagement.java     | 48 +++++++++++++++++-----
 .../compaction/utils/CompactionLogAnalyzer.java    | 12 +++---
 .../engine/storagegroup/StorageGroupProcessor.java | 44 ++++++++++----------
 .../org/apache/iotdb/db/service/TSServiceImpl.java |  8 ++--
 .../writelog/recover/TsFileRecoverPerformer.java   | 18 ++++----
 .../recover/RecoverResourceFromReaderTest.java     |  2 +-
 .../db/writelog/recover/SeqTsFileRecoverTest.java  |  4 +-
 .../writelog/recover/UnseqTsFileRecoverTest.java   |  2 +-
 .../java/org/apache/iotdb/session/Session.java     |  6 +++
 19 files changed, 122 insertions(+), 83 deletions(-)


[iotdb] 06/21: Merge remote-tracking branch 'origin/master'

Posted by qi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

qiaojialin pushed a commit to branch fix_doc_sg
in repository https://gitbox.apache.org/repos/asf/iotdb.git

commit b7f4e9e0ba2403ecf54d3f2f07aaa82a6648a7f3
Merge: c590e0c bf3a4c7
Author: qiaojialin <64...@qq.com>
AuthorDate: Sat Nov 7 21:20:40 2020 +0800

    Merge remote-tracking branch 'origin/master'

 .../level/LevelCompactionTsFileManagement.java      | 13 +++++++++----
 .../iotdb/db/engine/merge/manage/MergeResource.java | 21 ++++++++++++++-------
 2 files changed, 23 insertions(+), 11 deletions(-)


[iotdb] 19/21: Merge remote-tracking branch 'origin/master'

Posted by qi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

qiaojialin pushed a commit to branch fix_doc_sg
in repository https://gitbox.apache.org/repos/asf/iotdb.git

commit 1c4a2fbd68be848668e021eb52e0bc1015f930d7
Merge: 1dbb539 344c387
Author: qiaojialin <64...@qq.com>
AuthorDate: Thu Nov 19 08:56:26 2020 +0800

    Merge remote-tracking branch 'origin/master'

 .../level/LevelCompactionTsFileManagement.java     | 23 +++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)


[iotdb] 20/21: Merge remote-tracking branch 'origin/master'

Posted by qi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

qiaojialin pushed a commit to branch fix_doc_sg
in repository https://gitbox.apache.org/repos/asf/iotdb.git

commit bb220eb8091a2726c13e59e7a21c8c722f331958
Merge: 1c4a2fb c815166
Author: qiaojialin <64...@qq.com>
AuthorDate: Sun Nov 22 17:50:14 2020 +0800

    Merge remote-tracking branch 'origin/master'

 docs/Development/ContributeGuide.md                |   2 +-
 docs/SystemDesign/TsFile/Format.md                 |  18 +-
 docs/UserGuide/Client/Programming - Native API.md  |  22 +-
 .../DML Data Manipulation Language.md              |  16 +-
 docs/zh/Development/ContributeGuide.md             |   2 +-
 docs/zh/SystemDesign/TsFile/Format.md              |  20 +-
 .../UserGuide/Client/Programming - Native API.md   |  18 +
 .../DML Data Manipulation Language.md              |  15 +-
 .../iotdb/flink/tsfile/TsFileOutputFormat.java     |  17 +-
 .../apache/iotdb/hadoop/fileSystem/HDFSFile.java   |   6 +-
 .../iotdb/db/auth/authorizer/OpenIdAuthorizer.java |   2 +-
 .../org/apache/iotdb/db/concurrent/ThreadName.java |   2 +-
 .../iotdb/db/cost/statistic/Measurement.java       |   4 +-
 .../org/apache/iotdb/db/engine/StorageEngine.java  |   2 +-
 .../compaction/CompactionMergeTaskPoolManager.java |  10 +-
 .../iotdb/db/engine/memtable/WritableMemChunk.java |   1 -
 .../iotdb/db/engine/merge/manage/MergeManager.java |  16 +-
 .../merge/selector/MaxFileMergeFileSelector.java   |   4 +-
 .../iotdb/db/engine/merge/task/MergeFileTask.java  |   2 +-
 .../engine/storagegroup/StorageGroupProcessor.java |   4 +-
 .../db/engine/storagegroup/TsFileProcessor.java    |   4 +-
 .../org/apache/iotdb/db/metadata/MManager.java     |  44 +-
 .../iotdb/db/metrics/server/MetricsSystem.java     |   6 +-
 .../iotdb/db/metrics/server/ServerArgument.java    |   8 +-
 .../org/apache/iotdb/db/mqtt/PublishHandler.java   |   4 +-
 .../main/java/org/apache/iotdb/db/qp/Planner.java  |   1 -
 .../db/qp/physical/crud/AlignByDevicePlan.java     |   2 +-
 .../db/query/executor/fill/LastPointReader.java    |   4 +-
 .../iotdb/db/query/reader/series/SeriesReader.java |  16 +-
 .../java/org/apache/iotdb/db/service/IService.java |   4 +-
 .../org/apache/iotdb/db/service/StartupChecks.java |  10 +-
 .../org/apache/iotdb/db/service/TSServiceImpl.java |   4 +-
 .../apache/iotdb/db/sync/conf/SyncConstant.java    |   2 +-
 .../db/sync/receiver/transfer/SyncServiceImpl.java |  14 +-
 .../iotdb/db/sync/sender/transfer/SyncClient.java  |  24 +-
 .../db/tools/watermark/WatermarkDetector.java      |   1 -
 .../iotdb/db/utils/datastructure/BinaryTVList.java |   2 +-
 .../db/utils/datastructure/BooleanTVList.java      |   2 +-
 .../iotdb/db/utils/datastructure/DoubleTVList.java |   2 +-
 .../iotdb/db/utils/datastructure/FloatTVList.java  |   2 +-
 .../iotdb/db/utils/datastructure/IntTVList.java    |   2 +-
 .../iotdb/db/utils/datastructure/LongTVList.java   |   2 +-
 .../iotdb/db/utils/datastructure/TVList.java       |   8 +-
 .../src/main/resources/iotdb/ui/static/index.html  |   2 +-
 .../engine/storagegroup/TsFileProcessorTest.java   |   8 +-
 .../iotdb/db/integration/IOTDBGroupByIT.java       |   2 +-
 .../integration/IOTDBGroupByInnerIntervalIT.java   |   2 +-
 .../iotdb/db/integration/IoTDBAggregationIT.java   |   8 +-
 .../integration/IoTDBAggregationLargeDataIT.java   |   4 +-
 .../integration/IoTDBAggregationSmallDataIT.java   |   4 +-
 .../iotdb/db/integration/IoTDBAuthorizationIT.java |   2 +-
 .../apache/iotdb/db/integration/IoTDBDaemonIT.java |   2 +-
 .../db/integration/IoTDBDeleteStorageGroupIT.java  |  10 +-
 .../db/integration/IoTDBFloatPrecisionIT.java      |   2 +-
 .../iotdb/db/integration/IoTDBGroupByFillIT.java   |   2 +-
 .../integration/IoTDBGroupByFillWithRangeIT.java   |   2 +-
 .../iotdb/db/integration/IoTDBInsertNaNIT.java     |   2 +-
 .../iotdb/db/integration/IoTDBLargeDataIT.java     |   4 +-
 .../iotdb/db/integration/IoTDBMultiSeriesIT.java   |   2 +-
 .../iotdb/db/integration/IoTDBRecoverIT.java       |   6 +-
 .../db/integration/IoTDBRecoverUnclosedIT.java     |   2 +-
 .../iotdb/db/integration/IoTDBSimpleQueryIT.java   |   3 +-
 .../apache/iotdb/db/integration/IoTDBTagIT.java    |  16 +-
 .../org/apache/iotdb/db/metadata/MTreeTest.java    |   3 +-
 .../java/org/apache/iotdb/session/Session.java     |   2 +-
 site/README-zh.md                                  |   8 +-
 site/README.md                                     |   8 +-
 site/pom.xml                                       | 769 +++++++++++----------
 thrift/src/main/thrift/rpc.thrift                  | 206 +++---
 thrift/src/main/thrift/sync.thrift                 |  18 +-
 .../read/controller/MetadataQuerierByFileImpl.java |   2 +-
 .../iotdb/tsfile/utils/RamUsageEstimator.java      |   4 +-
 .../tsfile/utils/ReadWriteForEncodingUtils.java    |   4 +-
 .../iotdb/tsfile/read/ReadInPartitionTest.java     |   4 +-
 74 files changed, 758 insertions(+), 706 deletions(-)


[iotdb] 15/21: Merge remote-tracking branch 'origin/master'

Posted by qi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

qiaojialin pushed a commit to branch fix_doc_sg
in repository https://gitbox.apache.org/repos/asf/iotdb.git

commit 6eb6fd3927b6a9b157762b50ed8d859ee941c213
Merge: 3895dd1 b84c5a6
Author: qiaojialin <64...@qq.com>
AuthorDate: Tue Nov 17 18:39:29 2020 +0800

    Merge remote-tracking branch 'origin/master'

 .../db/engine/compaction/utils/CompactionUtils.java    |  3 +++
 .../java/org/apache/iotdb/db/metadata/MLogWriter.java  |  1 +
 .../org/apache/iotdb/db/utils/EnvironmentUtils.java    | 18 ++++++++----------
 3 files changed, 12 insertions(+), 10 deletions(-)


[iotdb] 12/21: Merge remote-tracking branch 'origin/master'

Posted by qi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

qiaojialin pushed a commit to branch fix_doc_sg
in repository https://gitbox.apache.org/repos/asf/iotdb.git

commit 1877b29783e8785de15fcd31c75bc73eedd984ec
Merge: 751aaa4 420bdc3
Author: qiaojialin <64...@qq.com>
AuthorDate: Thu Nov 12 21:46:38 2020 +0800

    Merge remote-tracking branch 'origin/master'

 docs/SystemDesign/TsFile/Format.md                 |   6 +
 docs/zh/SystemDesign/TsFile/Format.md              |   6 +
 .../org/apache/iotdb/db/engine/StorageEngine.java  |  42 ++++++-
 .../db/engine/compaction/TsFileManagement.java     |  19 +--
 .../iotdb/db/engine/merge/task/MergeFileTask.java  | 128 ++-------------------
 .../engine/storagegroup/StorageGroupProcessor.java |  39 +++----
 .../org/apache/iotdb/db/metadata/MManager.java     |  27 +++--
 .../query/dataset/groupby/GroupByFillDataSet.java  |  12 +-
 .../groupby/GroupByWithValueFilterDataSet.java     |  19 ++-
 .../groupby/GroupByWithoutValueFilterDataSet.java  |  37 +++---
 .../db/query/executor/AggregationExecutor.java     |  31 +++--
 .../iotdb/db/query/executor/FillQueryExecutor.java |  61 +++++-----
 .../iotdb/db/query/executor/LastQueryExecutor.java |  47 ++++----
 .../db/query/executor/RawDataQueryExecutor.java    |  56 +++++----
 .../iotdb/db/query/reader/series/SeriesReader.java |   6 +
 .../query/timegenerator/ServerTimeGenerator.java   |  28 ++++-
 .../db/sync/receiver/load/FileLoaderManager.java   |   4 +-
 .../apache/iotdb/db/engine/merge/MergeLogTest.java |   2 +-
 .../iotdb/db/engine/merge/MergePerfTest.java       |   4 +-
 .../iotdb/db/engine/merge/MergeTaskTest.java       |   6 +-
 .../apache/iotdb/db/engine/merge/MergeTest.java    |   1 +
 .../engine/modification/DeletionFileNodeTest.java  | 106 +++++++++++------
 .../db/integration/IoTDBOverlappedPageIT.java      |  14 ++-
 .../main/java/org/apache/iotdb/session/Config.java |   4 +-
 site/src/main/.vuepress/config.js                  |   3 +-
 .../iotdb/tsfile/read/TsFileSequenceReader.java    |   1 +
 .../read/query/timegenerator/TimeGenerator.java    |   4 +-
 .../tsfile/v1/file/metadata/TsFileMetadataV1.java  |  13 +--
 28 files changed, 390 insertions(+), 336 deletions(-)