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/01/03 12:13:03 UTC

[incubator-iotdb] branch master updated (7a2e034 -> 73b725e)

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

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


    from 7a2e034  continue writing the last unclosed file (#700)
     add 9e5f4c6  add release check doc
     add aa48a76  Merge branch 'master' of github.com:apache/incubator-iotdb
     new 7a3d5fc  Merge branch 'master' of github.com:apache/incubator-iotdb
     new 39e811b  fix doc
     new 73b725e  Merge branch 'master' of github.com:apache/incubator-iotdb

The 3 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:
 ...-VoteRelease.md => Development-ReleaseCheck.md} | 49 +++-------------------
 docs/Development-VoteRelease.md                    |  2 +-
 docs/Documentation/UserGuide/0-Content.md          |  4 +-
 3 files changed, 9 insertions(+), 46 deletions(-)
 copy docs/{Development-VoteRelease.md => Development-ReleaseCheck.md} (78%)


[incubator-iotdb] 03/03: Merge branch 'master' of github.com:apache/incubator-iotdb

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

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

commit 73b725e02a109943107aa528b103ca50a4db9647
Merge: 39e811b 7a2e034
Author: qiaojialin <64...@qq.com>
AuthorDate: Fri Jan 3 20:12:46 2020 +0800

    Merge branch 'master' of github.com:apache/incubator-iotdb

 .../org/apache/iotdb/client/AbstractClient.java    | 118 ++----
 .../main/java/org/apache/iotdb/tool/ImportCsv.java |   7 +-
 .../iotdb/web/grafana/dao/impl/BasicDaoImpl.java   |   9 +-
 .../main/java/org/apache/iotdb/jdbc/Constant.java  |  29 --
 .../apache/iotdb/jdbc/IoTDBDatabaseMetadata.java   | 207 +--------
 .../iotdb/jdbc/IoTDBMetadataResultMetadata.java    | 193 ---------
 .../apache/iotdb/jdbc/IoTDBMetadataResultSet.java  | 427 -------------------
 .../org/apache/iotdb/jdbc/IoTDBQueryResultSet.java |  14 +-
 .../java/org/apache/iotdb/jdbc/IoTDBStatement.java | 110 +----
 .../iotdb/jdbc/IoTDBDatabaseMetadataTest.java      | 463 ---------------------
 .../jdbc/IoTDBMetadataResultMetadataTest.java      | 108 -----
 .../org/apache/iotdb/jdbc/IoTDBStatementTest.java  | 151 -------
 .../org/apache/iotdb/db/qp/strategy/SqlBase.g4     |  79 +++-
 .../org/apache/iotdb/db/conf/IoTDBConstant.java    |   9 +-
 .../engine/storagegroup/StorageGroupProcessor.java |  39 +-
 .../db/engine/storagegroup/TsFileProcessor.java    |  16 +
 .../db/engine/storagegroup/TsFileResource.java     |  28 ++
 .../org/apache/iotdb/db/metadata/MManager.java     |   2 +-
 .../apache/iotdb/db/qp/constant/SQLConstant.java   |   7 +
 .../qp/executor/AbstractQueryProcessExecutor.java  | 187 +++++++--
 .../db/qp/executor/IQueryProcessExecutor.java      |  11 +-
 .../sys/CountOperator.java}                        |  43 +-
 .../sys/ShowChildPathsOperator.java}               |  35 +-
 .../sys/ShowDevicesOperator.java}                  |  35 +-
 .../sys/ShowTimeSeriesOperator.java}               |  35 +-
 .../physical/sys/{ShowPlan.java => CountPlan.java} |  40 +-
 .../sys/{ShowPlan.java => ShowChildPathsPlan.java} |  34 +-
 .../sys/{ShowPlan.java => ShowDevicesPlan.java}    |  36 +-
 .../apache/iotdb/db/qp/physical/sys/ShowPlan.java  |   3 +-
 .../sys/{ShowPlan.java => ShowTimeSeriesPlan.java} |  35 +-
 .../iotdb/db/qp/strategy/LogicalGenerator.java     |  68 ++-
 .../iotdb/db/qp/strategy/PhysicalGenerator.java    |  19 +
 .../org/apache/iotdb/db/service/StaticResps.java   |  36 ++
 .../org/apache/iotdb/db/service/TSServiceImpl.java |  84 +---
 .../writelog/recover/TsFileRecoverPerformer.java   |  25 +-
 .../iotdb/db/engine/storagegroup/TTLTest.java      |   3 +-
 .../db/integration/IoTDBDeleteStorageGroupIT.java  |   4 +-
 .../integration/IoTDBLoadExternalTsfileTest.java   |   2 +-
 .../iotdb/db/integration/IoTDBMetadataFetchIT.java | 263 +++++++-----
 .../org/apache/iotdb/db/qp/plan/QPUpdateTest.java  |   9 +-
 .../db/writelog/recover/SeqTsFileRecoverTest.java  |  60 ++-
 .../writelog/recover/UnseqTsFileRecoverTest.java   |   2 +-
 service-rpc/rpc-changelist.md                      |   6 +
 service-rpc/src/main/thrift/rpc.thrift             |  10 +-
 44 files changed, 885 insertions(+), 2216 deletions(-)


[incubator-iotdb] 01/03: Merge branch 'master' of github.com:apache/incubator-iotdb

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

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

commit 7a3d5fcf61e92a2d302773ff182f8f325aa6acaa
Merge: aa48a76 d09de2c
Author: qiaojialin <64...@qq.com>
AuthorDate: Fri Jan 3 15:01:27 2020 +0800

    Merge branch 'master' of github.com:apache/incubator-iotdb

 README.md                                          |  60 +++----
 docs/Development-VoteRelease.md                    | 198 +++++++++++++++++++++
 .../org/apache/iotdb/db/engine/StorageEngine.java  |  54 +++---
 .../iotdb/db/engine/flush/TsFileFlushPolicy.java   |  54 ++++++
 .../iotdb/db/engine/merge/task/MergeFileTask.java  |  18 ++
 .../engine/storagegroup/StorageGroupProcessor.java |  50 +++---
 .../db/engine/storagegroup/TsFileProcessor.java    |  10 +-
 .../db/engine/storagegroup/TsFileResource.java     |  58 ++++--
 .../iotdb/db/qp/physical/sys/ShowTTLPlan.java      |  18 +-
 .../org/apache/iotdb/db/service/TSServiceImpl.java |  31 +++-
 .../iotdb/db/tools/TsFileResourcePrinter.java      |   8 +-
 .../org/apache/iotdb/db/utils/FileLoaderUtils.java |  31 ++--
 .../writelog/recover/TsFileRecoverPerformer.java   |  22 +--
 .../db/engine/cache/DeviceMetaDataCacheTest.java   |   3 +-
 .../iotdb/db/engine/merge/MergeOverLapTest.java    |   3 +
 .../apache/iotdb/db/engine/merge/MergeTest.java    |   3 +
 .../storagegroup/StorageGroupProcessorTest.java    |   3 +-
 .../iotdb/db/engine/storagegroup/TTLTest.java      |   3 +-
 .../db/integration/IoTDBFlushQueryMergeTest.java   |  64 ++++++-
 .../iotdb/db/query/reader/ReaderTestHelper.java    |   3 +-
 20 files changed, 547 insertions(+), 147 deletions(-)


[incubator-iotdb] 02/03: 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 master
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git

commit 39e811b84658a462f20a60ad5122a5fb3f3090d9
Author: qiaojialin <64...@qq.com>
AuthorDate: Fri Jan 3 20:12:23 2020 +0800

    fix doc
---
 docs/Development-VoteRelease.md           | 2 +-
 docs/Documentation/UserGuide/0-Content.md | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/Development-VoteRelease.md b/docs/Development-VoteRelease.md
index eadd588..db95aab 100644
--- a/docs/Development-VoteRelease.md
+++ b/docs/Development-VoteRelease.md
@@ -19,7 +19,7 @@
 
 -->
 
-# How to validate a staged release (如何给发布版本投票)
+# How to vote for a release (如何给发布版本投票)
 
 For non-Chinese users, please read https://cwiki.apache.org/confluence/display/IOTDB/Validating+a+staged+Release
 
diff --git a/docs/Documentation/UserGuide/0-Content.md b/docs/Documentation/UserGuide/0-Content.md
index b289fbb..dcef5ac 100644
--- a/docs/Documentation/UserGuide/0-Content.md
+++ b/docs/Documentation/UserGuide/0-Content.md
@@ -42,8 +42,8 @@
 * 5-Docker Image
 # Chapter 4: Client
 * 1-Command Line Interface (CLI)
-* 2-Programming - JDBC
-* 3-Programming - Session
+* 2-Programming - Native API
+* 3-Programming - JDBC
 * 4-Programming - Other Languages
 * 5-Programming - TsFile API
 # Chapter 5: Operation Manual