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:56 UTC
[iotdb] 01/01: fix conflicts
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(-)