You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by hx...@apache.org on 2021/08/31 02:57:59 UTC
[iotdb] branch cluster- updated (84d1ee0 -> 3961446)
This is an automated email from the ASF dual-hosted git repository.
hxd pushed a change to branch cluster-
in repository https://gitbox.apache.org/repos/asf/iotdb.git.
from 84d1ee0 apply spotless
add 62135fc [IOTDB-1587] SessionPool optimization: a more aggressive Session creation strategy (#3823)
add 757619c [IOTDB-1580] Error result of order by time desc when enable time partition (#3819)
add 71315e8 change delete logger to debug (#3824)
add d075f87 Bug fix: MAX_TIME is incorrect in cluster mode (#3826)
add 4d66b1d [IOTDB-1569] Timed close TsFileProcessor (#3776)
add 3bacba0 [IOTDB-1586] Support mysql-style Like clause (#3738)
add 17c9677 [ISSUE-3811] Provide a data type column for the last query dataset (#3834)
add 228d62d [IOTDB-1594] Fix show timeseries returns incorrect tag value (#3845)
add a5b738d [ISSUE-3811] Provide a data type column for the last query dataset (#3843)
add 986f57e [IOTDB-1591] Execute CREATE FUNCTION on 1 node, this FUNCTION is invisible to other nodes (#3855)
add 146274c [IOTDB-1572] Optimize WriteableMemChunk's toString() (#3863)
add 33ce2b7 [IOTDB-1592] BugFix: SLimit Not effective in align by device (#3846)
add f5df141 Fix format of Chinese CQ user doc (#3869)
add 253bc96 [ISSUE-3865] Meaningless connection reset issues caused by low default value for SOMAXCONN (#3867)
add 2920d4c Fix load TsFile failed when time partition enabled caused by TsFileReWriteTool NPE (#3870)
add fb18357 Remove timestamp datatype config (#3847)
new 3961446 merge with master
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:
README.md | 8 +
README_ZH.md | 8 +
.../antlr4/org/apache/iotdb/db/qp/sql/SqlBase.g4 | 6 +-
.../iotdb/cluster/query/LocalQueryExecutor.java | 2 +-
docs/Download/README.md | 10 +
.../QueryEngine/ResultSetConstruction.md | 10 +-
docs/SystemDesign/SchemaManager/SchemaManager.md | 2 +-
.../Advanced-Features/UDF-User-Defined-Function.md | 7 +-
docs/UserGuide/Appendix/Config-Manual.md | 9 -
docs/UserGuide/Appendix/SQL-Reference.md | 51 ++--
.../DML-Data-Manipulation-Language.md | 26 +--
docs/zh/Download/README.md | 12 +-
.../QueryEngine/ResultSetConstruction.md | 10 +-
.../zh/SystemDesign/SchemaManager/SchemaManager.md | 2 +-
.../Advanced-Features/Continuous-Query.md | 4 +
.../Advanced-Features/UDF-User-Defined-Function.md | 7 +-
docs/zh/UserGuide/Appendix/Config-Manual.md | 9 -
docs/zh/UserGuide/Appendix/SQL-Reference.md | 53 +++--
.../DML-Data-Manipulation-Language.md | 30 +--
.../main/java/org/apache/iotdb/SessionExample.java | 2 +-
.../resources/conf/iotdb-engine.properties | 41 +++-
server/src/assembly/resources/conf/iotdb-env.sh | 27 +++
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 80 ++++++-
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 128 +++++++---
.../org/apache/iotdb/db/engine/StorageEngine.java | 160 +++++++++----
.../level/LevelCompactionTsFileManagement.java | 12 +-
.../iotdb/db/engine/memtable/WritableMemChunk.java | 22 +-
.../engine/storagegroup/StorageGroupProcessor.java | 76 +++++-
.../db/engine/storagegroup/TsFileProcessor.java | 13 +-
.../virtualSg/VirtualStorageGroupManager.java | 24 +-
.../apache/iotdb/db/metadata/MeasurementMeta.java | 85 -------
.../org/apache/iotdb/db/metadata/Metadata.java | 120 ----------
.../iotdb/db/metadata/logfile/MLogTxtWriter.java | 1 -
.../iotdb/db/metadata/logfile/MLogWriter.java | 1 -
.../{ => logfile}/MetadataOperationType.java | 2 +-
.../db/metadata/{logfile => tag}/TagLogFile.java | 10 +-
.../apache/iotdb/db/metadata/tag/TagManager.java | 1 -
.../iotdb/db/qp/constant/FilterConstant.java | 3 +
.../iotdb/db/qp/logical/crud/LikeOperator.java | 5 -
.../iotdb/db/qp/logical/crud/QueryOperator.java | 9 +-
.../{LikeOperator.java => RegexpOperator.java} | 32 ++-
.../apache/iotdb/db/qp/sql/IoTDBSqlVisitor.java | 7 +-
.../iotdb/db/query/executor/LastQueryExecutor.java | 11 +-
.../org/apache/iotdb/db/service/StaticResps.java | 6 +-
.../apache/iotdb/db/tools/TsFileRewriteTool.java | 2 +-
.../db/engine/memtable/PrimitiveMemTableTest.java | 27 +++
.../storagegroup/StorageGroupProcessorTest.java | 130 ++++++++++-
.../iotdb/db/integration/IoTDBAlignByDeviceIT.java | 38 +--
.../org/apache/iotdb/db/integration/IoTDBAsIT.java | 10 +-
.../apache/iotdb/db/integration/IoTDBLastIT.java | 131 +++++++----
.../apache/iotdb/db/integration/IoTDBLikeIT.java | 169 ++++++++++++++
.../iotdb/db/integration/IoTDBQueryDemoIT.java | 10 +-
...tionDeleteIT.java => IoTDBTimePartitionIT.java} | 69 +++---
.../iotdb/db/qp/logical/LogicalPlanSmallTest.java | 4 +-
.../iotdb/db/qp/physical/PhysicalPlanTest.java | 4 +-
.../java/org/apache/iotdb/session/Session.java | 27 ++-
.../org/apache/iotdb/session/pool/SessionPool.java | 258 ++++++++++++---------
.../iotdb/session/IoTDBSessionComplexIT.java | 2 +-
.../iotdb/session/IoTDBSessionIteratorIT.java | 26 ++-
.../java/org/apache/iotdb/session/SessionTest.java | 6 +-
.../apache/iotdb/session/pool/SessionPoolTest.java | 103 +++++++-
.../.vuepress/public/img/contributor-avatar/cw.jpg | Bin 163225 -> 163226 bytes
.../test/java/org/apache/iotdb/db/sql/Cases.java | 4 +-
.../iotdb/tsfile/common/conf/TSFileConfig.java | 9 +-
.../iotdb/tsfile/common/conf/TSFileDescriptor.java | 2 -
.../iotdb/tsfile/read/filter/ValueFilter.java | 27 +++
.../read/filter/factory/FilterSerializeId.java | 1 +
.../iotdb/tsfile/read/filter/operator/Like.java | 50 +++-
.../filter/operator/{Like.java => Regexp.java} | 14 +-
.../tsfile/write/schema/MeasurementSchema.java | 3 +-
.../tsfile/write/schema/TimeseriesSchema.java | 3 +-
.../write/schema/VectorMeasurementSchema.java | 3 +-
.../iotdb/tsfile/write/writer/TsFileIOWriter.java | 10 +
73 files changed, 1539 insertions(+), 747 deletions(-)
delete mode 100644 server/src/main/java/org/apache/iotdb/db/metadata/MeasurementMeta.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/metadata/Metadata.java
rename server/src/main/java/org/apache/iotdb/db/metadata/{ => logfile}/MetadataOperationType.java (97%)
rename server/src/main/java/org/apache/iotdb/db/metadata/{logfile => tag}/TagLogFile.java (97%)
copy server/src/main/java/org/apache/iotdb/db/qp/logical/crud/{LikeOperator.java => RegexpOperator.java} (80%)
create mode 100644 server/src/test/java/org/apache/iotdb/db/integration/IoTDBLikeIT.java
copy server/src/test/java/org/apache/iotdb/db/integration/{aggregation/IoTDBAggregationDeleteIT.java => IoTDBTimePartitionIT.java} (57%)
copy tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/operator/{Like.java => Regexp.java} (91%)
[iotdb] 01/01: merge with master
Posted by hx...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hxd pushed a commit to branch cluster-
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 39614465637946a369921a38e852764ab3c0f37d
Merge: 84d1ee0 fb18357
Author: xiangdong huang <sa...@gmail.com>
AuthorDate: Tue Aug 31 10:57:23 2021 +0800
merge with master
README.md | 8 +
README_ZH.md | 8 +
.../antlr4/org/apache/iotdb/db/qp/sql/SqlBase.g4 | 6 +-
.../iotdb/cluster/query/LocalQueryExecutor.java | 2 +-
docs/Download/README.md | 10 +
.../QueryEngine/ResultSetConstruction.md | 10 +-
docs/SystemDesign/SchemaManager/SchemaManager.md | 2 +-
.../Advanced-Features/UDF-User-Defined-Function.md | 7 +-
docs/UserGuide/Appendix/Config-Manual.md | 9 -
docs/UserGuide/Appendix/SQL-Reference.md | 51 ++--
.../DML-Data-Manipulation-Language.md | 26 +--
docs/zh/Download/README.md | 12 +-
.../QueryEngine/ResultSetConstruction.md | 10 +-
.../zh/SystemDesign/SchemaManager/SchemaManager.md | 2 +-
.../Advanced-Features/Continuous-Query.md | 4 +
.../Advanced-Features/UDF-User-Defined-Function.md | 7 +-
docs/zh/UserGuide/Appendix/Config-Manual.md | 9 -
docs/zh/UserGuide/Appendix/SQL-Reference.md | 53 +++--
.../DML-Data-Manipulation-Language.md | 30 +--
.../main/java/org/apache/iotdb/SessionExample.java | 2 +-
.../resources/conf/iotdb-engine.properties | 41 +++-
server/src/assembly/resources/conf/iotdb-env.sh | 27 +++
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 80 ++++++-
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 128 +++++++---
.../org/apache/iotdb/db/engine/StorageEngine.java | 160 +++++++++----
.../level/LevelCompactionTsFileManagement.java | 12 +-
.../iotdb/db/engine/memtable/WritableMemChunk.java | 22 +-
.../engine/storagegroup/StorageGroupProcessor.java | 76 +++++-
.../db/engine/storagegroup/TsFileProcessor.java | 13 +-
.../virtualSg/VirtualStorageGroupManager.java | 24 +-
.../apache/iotdb/db/metadata/MeasurementMeta.java | 85 -------
.../org/apache/iotdb/db/metadata/Metadata.java | 120 ----------
.../iotdb/db/metadata/logfile/MLogTxtWriter.java | 1 -
.../iotdb/db/metadata/logfile/MLogWriter.java | 1 -
.../{ => logfile}/MetadataOperationType.java | 2 +-
.../db/metadata/{logfile => tag}/TagLogFile.java | 10 +-
.../apache/iotdb/db/metadata/tag/TagManager.java | 1 -
.../iotdb/db/qp/constant/FilterConstant.java | 3 +
.../iotdb/db/qp/logical/crud/LikeOperator.java | 5 -
.../iotdb/db/qp/logical/crud/QueryOperator.java | 9 +-
.../{LikeOperator.java => RegexpOperator.java} | 32 ++-
.../apache/iotdb/db/qp/sql/IoTDBSqlVisitor.java | 7 +-
.../iotdb/db/query/executor/LastQueryExecutor.java | 11 +-
.../org/apache/iotdb/db/service/StaticResps.java | 6 +-
.../apache/iotdb/db/tools/TsFileRewriteTool.java | 2 +-
.../db/engine/memtable/PrimitiveMemTableTest.java | 27 +++
.../storagegroup/StorageGroupProcessorTest.java | 130 ++++++++++-
.../iotdb/db/integration/IoTDBAlignByDeviceIT.java | 38 +--
.../org/apache/iotdb/db/integration/IoTDBAsIT.java | 10 +-
.../apache/iotdb/db/integration/IoTDBLastIT.java | 131 +++++++----
.../apache/iotdb/db/integration/IoTDBLikeIT.java | 169 ++++++++++++++
.../iotdb/db/integration/IoTDBQueryDemoIT.java | 10 +-
.../iotdb/db/integration/IoTDBTimePartitionIT.java | 92 ++++++++
.../iotdb/db/qp/logical/LogicalPlanSmallTest.java | 4 +-
.../iotdb/db/qp/physical/PhysicalPlanTest.java | 4 +-
.../java/org/apache/iotdb/session/Session.java | 27 ++-
.../org/apache/iotdb/session/pool/SessionPool.java | 258 ++++++++++++---------
.../iotdb/session/IoTDBSessionComplexIT.java | 2 +-
.../iotdb/session/IoTDBSessionIteratorIT.java | 26 ++-
.../java/org/apache/iotdb/session/SessionTest.java | 6 +-
.../apache/iotdb/session/pool/SessionPoolTest.java | 103 +++++++-
.../.vuepress/public/img/contributor-avatar/cw.jpg | Bin 163225 -> 163226 bytes
.../test/java/org/apache/iotdb/db/sql/Cases.java | 4 +-
.../iotdb/tsfile/common/conf/TSFileConfig.java | 9 +-
.../iotdb/tsfile/common/conf/TSFileDescriptor.java | 2 -
.../iotdb/tsfile/read/filter/ValueFilter.java | 27 +++
.../read/filter/factory/FilterSerializeId.java | 1 +
.../iotdb/tsfile/read/filter/operator/Like.java | 50 +++-
.../filter/operator/{Like.java => Regexp.java} | 14 +-
.../tsfile/write/schema/MeasurementSchema.java | 3 +-
.../tsfile/write/schema/TimeseriesSchema.java | 3 +-
.../write/schema/VectorMeasurementSchema.java | 3 +-
.../iotdb/tsfile/write/writer/TsFileIOWriter.java | 10 +
73 files changed, 1596 insertions(+), 713 deletions(-)
diff --cc server/src/main/java/org/apache/iotdb/db/engine/StorageEngine.java
index b38eab5,f6d1a8a..3b11ee6
--- a/server/src/main/java/org/apache/iotdb/db/engine/StorageEngine.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/StorageEngine.java
@@@ -275,16 -279,52 +278,51 @@@ public class StorageEngine implements I
ttlCheckThread.scheduleAtFixedRate(
this::checkTTL, TTL_CHECK_INTERVAL, TTL_CHECK_INTERVAL, TimeUnit.MILLISECONDS);
logger.info("start ttl check thread successfully.");
-
+ startTimedService();
+ }
+
+ private void checkTTL() {
+ try {
+ for (VirtualStorageGroupManager processor : processorMap.values()) {
+ processor.checkTTL();
+ }
+ } catch (ConcurrentModificationException e) {
+ // ignore
+ } catch (Exception e) {
+ logger.error("An error occurred when checking TTL", e);
+ }
+ }
+ private void startTimedService() {
+ // timed flush sequence memtable
+ if (config.isEnableTimedFlushSeqMemtable()) {
- seqMemtableTimedFlushCheckThread = Executors.newSingleThreadScheduledExecutor();
++ seqMemtableTimedFlushCheckThread = IoTDBThreadPoolFactory.newSingleThreadScheduledExecutor("TimedFlushSeqMemtable");
+ seqMemtableTimedFlushCheckThread.scheduleAtFixedRate(
+ this::timedFlushSeqMemTable,
+ config.getSeqMemtableFlushCheckInterval(),
+ config.getSeqMemtableFlushCheckInterval(),
+ TimeUnit.MILLISECONDS);
+ logger.info("start sequence memtable timed flush check thread successfully.");
+ }
+ // timed flush unsequence memtable
if (config.isEnableTimedFlushUnseqMemtable()) {
- memtableTimedFlushCheckThread =
- IoTDBThreadPoolFactory.newSingleThreadScheduledExecutor("TimedFlushMemtable");
- memtableTimedFlushCheckThread.scheduleAtFixedRate(
- this::timedFlushMemTable,
- unseqMemtableTimedFlushCheckThread = Executors.newSingleThreadScheduledExecutor();
++ unseqMemtableTimedFlushCheckThread = IoTDBThreadPoolFactory.newSingleThreadScheduledExecutor("TimedFlushUnSeqMemtable");
+ unseqMemtableTimedFlushCheckThread.scheduleAtFixedRate(
+ this::timedFlushUnseqMemTable,
config.getUnseqMemtableFlushCheckInterval(),
config.getUnseqMemtableFlushCheckInterval(),
TimeUnit.MILLISECONDS);
- logger.info("start memtable timed flush check thread successfully.");
+ logger.info("start unsequence memtable timed flush check thread successfully.");
+ }
+ // timed close tsfile
+ if (config.isEnableTimedCloseTsFile()) {
- tsFileTimedCloseCheckThread = Executors.newSingleThreadScheduledExecutor();
++ tsFileTimedCloseCheckThread = IoTDBThreadPoolFactory.newSingleThreadScheduledExecutor("TsFileCloseChecker");
+ tsFileTimedCloseCheckThread.scheduleAtFixedRate(
+ this::timedCloseTsFileProcessor,
+ config.getCloseTsFileCheckInterval(),
+ config.getCloseTsFileCheckInterval(),
+ TimeUnit.MILLISECONDS);
+ logger.info("start tsfile timed close check thread successfully.");
}
}