Skip to content

Dev merge strategy#1360

Closed
EJTTianYu wants to merge 55 commits intomasterfrom
dev_merge_stra
Closed

Dev merge strategy#1360
EJTTianYu wants to merge 55 commits intomasterfrom
dev_merge_stra

Conversation

@EJTTianYu
Copy link
Contributor

No description provided.

张凌哲 and others added 30 commits March 19, 2020 00:25
# Conflicts:
#	server/src/main/java/org/apache/iotdb/db/engine/merge/seqMerge/inplace/task/InplaceMergeTask.java
#	server/src/main/java/org/apache/iotdb/db/engine/merge/seqMerge/inplace/task/MergeFileTask.java
#	server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java
#	server/src/main/java/org/apache/iotdb/db/query/reader/series/SeriesReader.java
#	tsfile/src/main/java/org/apache/iotdb/tsfile/read/TsFileSequenceReader.java
# Conflicts:
#	client/src/test/java/org/apache/iotdb/client/AbstractClientIT.java
#	docs/SystemDesign/5-DataQuery/3-ModificationHandle.md
#	docs/zh/SystemDesign/5-DataQuery/3-ModificationHandle.md
#	jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBQueryResultSet.java
#	server/src/assembly/resources/conf/iotdb-engine.properties
#	server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java
#	server/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java
#	server/src/main/java/org/apache/iotdb/db/engine/cache/TsFileMetaDataCache.java
#	server/src/main/java/org/apache/iotdb/db/engine/merge/manage/MergeResource.java
#	server/src/main/java/org/apache/iotdb/db/engine/merge/selector/MaxFileMergeFileSelector.java
#	server/src/main/java/org/apache/iotdb/db/engine/merge/seqMerge/inplace/task/MergeFileTask.java
#	server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java
#	server/src/main/java/org/apache/iotdb/db/query/reader/series/SeriesReader.java
#	session/src/test/java/org/apache/iotdb/session/CheckPathValidityTest.java
@EJTTianYu EJTTianYu changed the title Dev merge stra Dev merge strategy Jun 13, 2020
@sonarqubecloud
Copy link

SonarCloud Quality Gate failed.

Bug D 11 Bugs
Vulnerability B 14 Vulnerabilities (and Security Hotspot 0 Security Hotspots to review)
Code Smell A 78 Code Smells

No Coverage information No Coverage information
5.5% 5.5% Duplication

warning The version of Java (1.8.0_242) you have used to run this analysis is deprecated and we will stop accepting it from October 2020. Please update to at least Java 11.
Read more here

@qiaojialin qiaojialin deleted the dev_merge_stra branch June 16, 2021 07:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants