You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ch...@apache.org on 2021/06/04 11:11:49 UTC
[iotdb] branch fix_ci_bug_0604 created (now fd366cd)
This is an automated email from the ASF dual-hosted git repository.
chaow pushed a change to branch fix_ci_bug_0604
in repository https://gitbox.apache.org/repos/asf/iotdb.git.
at fd366cd fix ci bug
This branch includes the following new commits:
new c00b9c7 Merge branch 'rel/0.12' of github.com:apache/iotdb into 0.12
new fd366cd fix ci bug
The 2 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] 01/02: Merge branch 'rel/0.12' of github.com:apache/iotdb
into 0.12
Posted by ch...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
chaow pushed a commit to branch fix_ci_bug_0604
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit c00b9c7ca30020f8187f3af993c6a3f4cbd7e5e9
Merge: b7fd1c1 b9e3dd3
Author: chaow <94...@qq.com>
AuthorDate: Fri Jun 4 18:53:09 2021 +0800
Merge branch 'rel/0.12' of github.com:apache/iotdb into 0.12
.github/workflows/client.yml | 16 +-
LICENSE-binary | 2 +-
RELEASE_NOTES.md | 66 +++++-
.../antlr4/org/apache/iotdb/db/qp/sql/SqlBase.g4 | 27 ++-
client-cpp/src/main/CMakeLists.txt | 2 +-
client-cpp/src/test/CMakeLists.txt | 2 +-
cluster/pom.xml | 2 +-
.../cluster/client/async/AsyncDataClient.java | 4 +-
.../client/async/AsyncDataHeartbeatClient.java | 4 +-
.../cluster/client/async/AsyncMetaClient.java | 4 +-
.../client/async/AsyncMetaHeartbeatClient.java | 4 +-
.../iotdb/cluster/client/sync/SyncDataClient.java | 2 +
.../client/sync/SyncDataHeartbeatClient.java | 2 +
.../iotdb/cluster/client/sync/SyncMetaClient.java | 2 +
.../client/sync/SyncMetaHeartbeatClient.java | 2 +
.../cluster/client/sync/SyncDataClientTest.java | 6 +-
.../cluster/client/sync/SyncMetaClientTest.java | 6 +-
.../cluster/common/TestAsyncClientFactory.java | 4 +-
.../cluster/common/TestSyncClientFactory.java | 13 +
.../cluster/log/snapshot/DataSnapshotTest.java | 14 ++
.../cluster/log/snapshot/PullSnapshotTaskTest.java | 14 ++
compile-tools/thrift/pom.xml | 2 +-
.../DML-Data-Manipulation-Language.md | 14 ++
.../DML-Data-Manipulation-Language.md | 15 ++
jdbc/src/main/feature/feature.xml | 2 +-
.../iotdb/jdbc/AbstractIoTDBJDBCResultSet.java | 4 +-
.../org/apache/iotdb/jdbc/IoTDBConnection.java | 9 +-
.../iotdb/jdbc/IoTDBNonAlignJDBCResultSet.java | 3 +
.../org/apache/iotdb/jdbc/IoTDBResultMetadata.java | 8 +-
.../apache/iotdb/jdbc/IoTDBResultMetadataTest.java | 2 +-
pom.xml | 10 +-
server/pom.xml | 5 +
.../resources/conf/iotdb-engine.properties | 10 +-
.../org/apache/iotdb/db/auth/AuthorityChecker.java | 3 +-
.../db/auth/authorizer/LocalFileAuthorizer.java | 3 +-
.../iotdb/db/auth/user/BasicUserManager.java | 10 +-
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 26 +-
.../org/apache/iotdb/db/conf/IoTDBConstant.java | 3 +-
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 25 +-
.../org/apache/iotdb/db/engine/StorageEngine.java | 20 ++
.../db/engine/cache/CacheHitRatioMonitor.java | 16 +-
.../engine/cache/CacheHitRatioMonitorMXBean.java | 8 +-
.../apache/iotdb/db/engine/cache/ChunkCache.java | 161 ++++++-------
.../iotdb/db/engine/cache/LRULinkedHashMap.java | 138 -----------
.../db/engine/cache/TimeSeriesMetadataCache.java | 230 ++++++++----------
.../compaction/CompactionMergeTaskPoolManager.java | 31 ++-
.../compaction/StorageGroupCompactionTask.java | 48 ++++
.../db/engine/compaction/TsFileManagement.java | 32 +--
.../engine/compaction/utils/CompactionUtils.java | 81 +++++--
.../merge/selector/MaxFileMergeFileSelector.java | 9 +-
.../db/engine/merge/task/MergeMultiChunkTask.java | 13 +-
.../engine/storagegroup/StorageGroupProcessor.java | 177 +++++++-------
.../virtualSg/VirtualStorageGroupManager.java | 16 +-
.../org/apache/iotdb/db/metadata/MManager.java | 7 +-
.../java/org/apache/iotdb/db/metadata/MTree.java | 3 +
.../apache/iotdb/db/qp/constant/SQLConstant.java | 2 +
.../apache/iotdb/db/qp/executor/PlanExecutor.java | 44 ++++
.../iotdb/db/qp/logical/crud/QueryOperator.java | 22 ++
.../logical/sys/ShowLockInfoOperator.java} | 30 +--
.../physical/crud/InsertRowsOfOneDevicePlan.java | 3 -
.../iotdb/db/qp/physical/crud/QueryPlan.java | 22 ++
.../physical/sys/ShowLockInfoPlan.java} | 30 +--
.../apache/iotdb/db/qp/physical/sys/ShowPlan.java | 3 +-
.../apache/iotdb/db/qp/sql/IoTDBSqlVisitor.java | 75 +++---
.../iotdb/db/qp/strategy/PhysicalGenerator.java | 11 +-
.../db/query/aggregation/impl/CountAggrResult.java | 24 +-
.../db/query/dataset/AlignByDeviceDataSet.java | 3 +
.../dataset/RawQueryDataSetWithoutValueFilter.java | 68 ++++--
.../dataset/groupby/LocalGroupByExecutor.java | 3 +
.../db/query/reader/chunk/DiskChunkLoader.java | 9 +-
.../chunk/metadata/DiskChunkMetadataLoader.java | 2 +-
.../iotdb/db/query/reader/series/SeriesReader.java | 8 +-
.../org/apache/iotdb/db/service/StartupChecks.java | 2 +-
.../org/apache/iotdb/db/service/TSServiceImpl.java | 12 +-
.../apache/iotdb/db/sync/conf/SyncConstant.java | 5 +-
.../iotdb/db/sync/sender/transfer/SyncClient.java | 27 ++-
.../apache/iotdb/db/tools/TsFileRewriteTool.java | 18 ++
.../db/tools/upgrade/TsFileOnlineUpgradeTool.java | 4 +-
.../apache/iotdb/db/utils/QueryDataSetUtils.java | 22 +-
.../auth/authorizer/LocalFileAuthorizerTest.java | 4 +-
.../db/auth/user/LocalFileUserManagerTest.java | 4 +-
.../db/engine/compaction/CompactionChunkTest.java | 4 +-
.../compaction/LevelCompactionMergeTest.java | 80 ++++++-
.../engine/merge/MaxFileMergeFileSelectorTest.java | 73 ++++++
.../iotdb/db/engine/merge/MergeTaskTest.java | 7 +-
.../apache/iotdb/db/engine/merge/MergeTest.java | 9 +-
.../storagegroup/StorageGroupProcessorTest.java | 2 +-
.../iotdb/db/integration/IoTDBDisableAlignIT.java | 2 +-
.../iotdb/db/integration/IoTDBGroupByUnseqIT.java | 189 +++++++++++++++
.../db/integration/IoTDBOverlappedPageIT.java | 86 +++++--
.../iotdb/db/integration/IoTDBSimpleQueryIT.java | 39 +++
.../db/integration/IoTDBWithoutAllNullIT.java | 264 +++++++++++++++++++++
.../db/integration/IoTDBWithoutAnyNullIT.java | 221 +++++++++++++++++
.../iotdb/db/metadata/MManagerBasicTest.java | 39 ++-
.../apache/iotdb/db/utils/EnvironmentUtils.java | 12 +-
.../iotdb/rpc/AutoScalingBufferReadTransport.java | 13 +
.../iotdb/rpc/AutoScalingBufferWriteTransport.java | 15 ++
.../java/org/apache/iotdb/rpc/IoTDBRpcDataSet.java | 8 +-
.../org/apache/iotdb/rpc/RpcTransportFactory.java | 3 +-
.../rpc/TCompressedElasticFramedTransport.java | 2 +-
.../org/apache/iotdb/rpc/TConfigurationConst.java | 29 +--
.../apache/iotdb/rpc/TElasticFramedTransport.java | 20 +-
.../iotdb/rpc/TNonblockingSocketWrapper.java | 60 +++++
.../java/org/apache/iotdb/rpc/TSocketWrapper.java | 68 ++++++
.../apache/iotdb/session/SessionConnection.java | 13 +-
.../org/apache/iotdb/session/SessionDataSet.java | 2 +-
.../iotdb/session/pool/SessionDataSetWrapper.java | 3 +-
.../apache/iotdb/session/IoTDBSessionSimpleIT.java | 2 +-
.../apache/iotdb/session/pool/SessionPoolTest.java | 117 ++++++---
session/src/test/resources/logback.xml | 40 ++++
.../iotdb/tsfile/file/metadata/ChunkMetadata.java | 17 +-
.../apache/iotdb/tsfile/read/common/RowRecord.java | 47 +++-
.../tsfile/read/query/dataset/QueryDataSet.java | 33 ++-
113 files changed, 2442 insertions(+), 876 deletions(-)
[iotdb] 02/02: fix ci bug
Posted by ch...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
chaow pushed a commit to branch fix_ci_bug_0604
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit fd366cdc98776dd77761fbf1fef95f6a886febc6
Author: chaow <94...@qq.com>
AuthorDate: Fri Jun 4 19:10:53 2021 +0800
fix ci bug
---
.../org/apache/iotdb/session/IoTDBSessionSimpleIT.java | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/session/src/test/java/org/apache/iotdb/session/IoTDBSessionSimpleIT.java b/session/src/test/java/org/apache/iotdb/session/IoTDBSessionSimpleIT.java
index a227a3d..a458a89 100644
--- a/session/src/test/java/org/apache/iotdb/session/IoTDBSessionSimpleIT.java
+++ b/session/src/test/java/org/apache/iotdb/session/IoTDBSessionSimpleIT.java
@@ -611,13 +611,13 @@ public class IoTDBSessionSimpleIT {
});
Assert.assertArrayEquals(
dataSet.getColumnTypes().toArray(new String[0]),
- new TSDataType[] {
- TSDataType.INT64,
- TSDataType.INT64,
- TSDataType.FLOAT,
- TSDataType.BOOLEAN,
- TSDataType.INT32,
- TSDataType.INT32
+ new String[] {
+ TSDataType.INT64.toString(),
+ TSDataType.INT64.toString(),
+ TSDataType.FLOAT.toString(),
+ TSDataType.BOOLEAN.toString(),
+ TSDataType.INT32.toString(),
+ TSDataType.INT32.toString()
});
long time = 1L;
//