You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ja...@apache.org on 2021/06/04 07:46:55 UTC
[iotdb] branch DeadLockTryFix updated (fbe0074 -> a2d4dd2)
This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a change to branch DeadLockTryFix
in repository https://gitbox.apache.org/repos/asf/iotdb.git.
from fbe0074 format code
add 8219ea0 [To rel/0.12][IOTDB-1411] thriftMaxFrameSize and thriftDefaultBufferSize does not in effect (#3331)
add 414e3d8 enable the client library test for all changes (#3328) (#3332)
add 7b085b3 [To rel/0.12]Upgrade libthrift from 0.12.0/0.13.0 to 0.14.1 and updated related classes or files (#3216)
add da162af [IOTDB-1419][To rel/0.12] fix continuous compaction doesn't take effect when enablePartition (#3326)
add bbc7c8b [To rel/0.12] [IOTDB-1415] Fix OOM caused by ChunkCache (#3312)
add 0a90a0d [To rel/0.12] Update release note for v0.12.1 (#3230)
add 63127bc change default force full merge config (#3195)
new a2d4dd2 fix conflicts
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:
.github/workflows/client.yml | 16 +-
LICENSE-binary | 2 +-
RELEASE_NOTES.md | 66 +++++-
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 +-
jdbc/src/main/feature/feature.xml | 2 +-
.../org/apache/iotdb/jdbc/IoTDBConnection.java | 9 +-
pom.xml | 10 +-
server/pom.xml | 5 +
.../resources/conf/iotdb-engine.properties | 2 +-
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 4 +-
.../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} | 38 ++--
.../db/engine/compaction/TsFileManagement.java | 28 +--
.../engine/storagegroup/StorageGroupProcessor.java | 107 +++++-----
.../virtualSg/VirtualStorageGroupManager.java | 2 +-
.../db/query/reader/chunk/DiskChunkLoader.java | 9 +-
.../chunk/metadata/DiskChunkMetadataLoader.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 ++-
.../storagegroup/StorageGroupProcessorTest.java | 2 +-
.../apache/iotdb/db/utils/EnvironmentUtils.java | 12 +-
.../iotdb/rpc/AutoScalingBufferReadTransport.java | 13 ++
.../iotdb/rpc/AutoScalingBufferWriteTransport.java | 15 ++
.../org/apache/iotdb/rpc/RpcTransportFactory.java | 3 +-
.../rpc/TCompressedElasticFramedTransport.java | 2 +-
...OpenTransport.java => TConfigurationConst.java} | 28 +--
.../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 +-
.../apache/iotdb/session/pool/SessionPoolTest.java | 117 ++++++++---
.../src/test/resources/logback.xml | 3 +-
.../iotdb/tsfile/file/metadata/ChunkMetadata.java | 17 +-
56 files changed, 773 insertions(+), 619 deletions(-)
delete mode 100644 server/src/main/java/org/apache/iotdb/db/engine/cache/LRULinkedHashMap.java
copy server/src/main/java/org/apache/iotdb/db/{qp/logical/sys/DeletePartitionOperator.java => engine/compaction/StorageGroupCompactionTask.java} (51%)
copy service-rpc/src/main/java/org/apache/iotdb/rpc/{NonOpenTransport.java => TConfigurationConst.java} (68%)
create mode 100644 service-rpc/src/main/java/org/apache/iotdb/rpc/TNonblockingSocketWrapper.java
create mode 100644 service-rpc/src/main/java/org/apache/iotdb/rpc/TSocketWrapper.java
copy {hive-connector => session}/src/test/resources/logback.xml (94%)
[iotdb] 01/01: fix conflicts
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a commit to branch DeadLockTryFix
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit a2d4dd2b8db8cf7d546fc48a832c2c4e48830655
Merge: fbe0074 63127bc
Author: JackieTien97 <Ja...@foxmail.com>
AuthorDate: Fri Jun 4 15:46:28 2021 +0800
fix conflicts
.github/workflows/client.yml | 16 +-
LICENSE-binary | 2 +-
RELEASE_NOTES.md | 66 +++++-
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 +-
jdbc/src/main/feature/feature.xml | 2 +-
.../org/apache/iotdb/jdbc/IoTDBConnection.java | 9 +-
pom.xml | 10 +-
server/pom.xml | 5 +
.../resources/conf/iotdb-engine.properties | 2 +-
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 4 +-
.../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 | 28 +--
.../engine/storagegroup/StorageGroupProcessor.java | 107 +++++-----
.../virtualSg/VirtualStorageGroupManager.java | 2 +-
.../db/query/reader/chunk/DiskChunkLoader.java | 9 +-
.../chunk/metadata/DiskChunkMetadataLoader.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 ++-
.../storagegroup/StorageGroupProcessorTest.java | 2 +-
.../apache/iotdb/db/utils/EnvironmentUtils.java | 12 +-
.../iotdb/rpc/AutoScalingBufferReadTransport.java | 13 ++
.../iotdb/rpc/AutoScalingBufferWriteTransport.java | 15 ++
.../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 +-
.../apache/iotdb/session/pool/SessionPoolTest.java | 117 ++++++++---
session/src/test/resources/logback.xml | 40 ++++
.../iotdb/tsfile/file/metadata/ChunkMetadata.java | 17 +-
56 files changed, 843 insertions(+), 597 deletions(-)