[GitHub] [incubator-iotdb] qiaojialin commented on a change in pull request #258: [IOTDB-143]Development of merge

2019-08-15 Thread GitBox
qiaojialin commented on a change in pull request #258: [IOTDB-143]Development of merge URL: https://github.com/apache/incubator-iotdb/pull/258#discussion_r313297965 ## File path: tsfile/src/main/java/org/apache/iotdb/tsfile/read/controller/MetadataQuerier.java ## @@ -62,4

[GitHub] [incubator-iotdb] qiaojialin commented on a change in pull request #258: [IOTDB-143]Development of merge

2019-08-15 Thread GitBox
qiaojialin commented on a change in pull request #258: [IOTDB-143]Development of merge URL: https://github.com/apache/incubator-iotdb/pull/258#discussion_r313248755 ## File path: server/src/main/java/org/apache/iotdb/db/utils/TsPrimitiveType.java ## @@ -74,6 +74,30 @@ publ

[GitHub] [incubator-iotdb] qiaojialin commented on a change in pull request #258: [IOTDB-143]Development of merge

2019-08-15 Thread GitBox
qiaojialin commented on a change in pull request #258: [IOTDB-143]Development of merge URL: https://github.com/apache/incubator-iotdb/pull/258#discussion_r313734754 ## File path: server/src/main/java/org/apache/iotdb/db/utils/MergeUtils.java ## @@ -0,0 +1,354 @@ +/** + * L

[GitHub] [incubator-iotdb] qiaojialin commented on a change in pull request #258: [IOTDB-143]Development of merge

2019-08-15 Thread GitBox
qiaojialin commented on a change in pull request #258: [IOTDB-143]Development of merge URL: https://github.com/apache/incubator-iotdb/pull/258#discussion_r313248648 ## File path: server/src/main/java/org/apache/iotdb/db/utils/TsPrimitiveType.java ## @@ -74,6 +74,30 @@ publ

[GitHub] [incubator-iotdb] qiaojialin commented on a change in pull request #258: [IOTDB-143]Development of merge

2019-08-15 Thread GitBox
qiaojialin commented on a change in pull request #258: [IOTDB-143]Development of merge URL: https://github.com/apache/incubator-iotdb/pull/258#discussion_r314219509 ## File path: server/src/main/java/org/apache/iotdb/db/query/reader/resourceRelated/CachedUnseqResourceMergeReader.ja

[GitHub] [incubator-iotdb] qiaojialin commented on a change in pull request #258: [IOTDB-143]Development of merge

2019-08-15 Thread GitBox
qiaojialin commented on a change in pull request #258: [IOTDB-143]Development of merge URL: https://github.com/apache/incubator-iotdb/pull/258#discussion_r313685171 ## File path: server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java ## @@

[GitHub] [incubator-iotdb] qiaojialin commented on a change in pull request #258: [IOTDB-143]Development of merge

2019-08-15 Thread GitBox
qiaojialin commented on a change in pull request #258: [IOTDB-143]Development of merge URL: https://github.com/apache/incubator-iotdb/pull/258#discussion_r313716134 ## File path: server/src/main/java/org/apache/iotdb/db/engine/merge/manage/MergeManager.java ## @@ -0,0 +1,

[GitHub] [incubator-iotdb] qiaojialin commented on a change in pull request #258: [IOTDB-143]Development of merge

2019-08-15 Thread GitBox
qiaojialin commented on a change in pull request #258: [IOTDB-143]Development of merge URL: https://github.com/apache/incubator-iotdb/pull/258#discussion_r313352319 ## File path: tsfile/src/main/java/org/apache/iotdb/tsfile/write/writer/ForceAppendTsFileWriter.java ## @@

[GitHub] [incubator-iotdb] qiaojialin commented on a change in pull request #258: [IOTDB-143]Development of merge

2019-08-15 Thread GitBox
qiaojialin commented on a change in pull request #258: [IOTDB-143]Development of merge URL: https://github.com/apache/incubator-iotdb/pull/258#discussion_r313829348 ## File path: server/src/main/java/org/apache/iotdb/db/engine/merge/selector/MaxFileMergeFileSelector.java #

[GitHub] [incubator-iotdb] qiaojialin commented on a change in pull request #258: [IOTDB-143]Development of merge

2019-08-15 Thread GitBox
qiaojialin commented on a change in pull request #258: [IOTDB-143]Development of merge URL: https://github.com/apache/incubator-iotdb/pull/258#discussion_r313736890 ## File path: server/src/main/java/org/apache/iotdb/db/utils/MergeUtils.java ## @@ -0,0 +1,354 @@ +/** + * L

[GitHub] [incubator-iotdb] qiaojialin commented on a change in pull request #258: [IOTDB-143]Development of merge

2019-08-15 Thread GitBox
qiaojialin commented on a change in pull request #258: [IOTDB-143]Development of merge URL: https://github.com/apache/incubator-iotdb/pull/258#discussion_r313823707 ## File path: server/src/main/java/org/apache/iotdb/db/engine/merge/manage/MergeResource.java ## @@ -0,0 +1

[GitHub] [incubator-iotdb] qiaojialin commented on a change in pull request #258: [IOTDB-143]Development of merge

2019-08-15 Thread GitBox
qiaojialin commented on a change in pull request #258: [IOTDB-143]Development of merge URL: https://github.com/apache/incubator-iotdb/pull/258#discussion_r313687987 ## File path: server/src/main/java/org/apache/iotdb/db/engine/merge/recover/MergeLogger.java ## @@ -0,0 +1,

[GitHub] [incubator-iotdb] qiaojialin commented on a change in pull request #258: [IOTDB-143]Development of merge

2019-08-15 Thread GitBox
qiaojialin commented on a change in pull request #258: [IOTDB-143]Development of merge URL: https://github.com/apache/incubator-iotdb/pull/258#discussion_r314576210 ## File path: server/src/main/java/org/apache/iotdb/db/engine/merge/recover/LogAnalyzer.java ## @@ -0,0 +1,

[GitHub] [incubator-iotdb] qiaojialin commented on a change in pull request #258: [IOTDB-143]Development of merge

2019-08-15 Thread GitBox
qiaojialin commented on a change in pull request #258: [IOTDB-143]Development of merge URL: https://github.com/apache/incubator-iotdb/pull/258#discussion_r313364622 ## File path: server/src/main/java/org/apache/iotdb/db/query/control/FileReaderManager.java ## @@ -34,7 +35

[GitHub] [incubator-iotdb] qiaojialin commented on a change in pull request #258: [IOTDB-143]Development of merge

2019-08-15 Thread GitBox
qiaojialin commented on a change in pull request #258: [IOTDB-143]Development of merge URL: https://github.com/apache/incubator-iotdb/pull/258#discussion_r313370128 ## File path: server/src/main/java/org/apache/iotdb/db/query/control/JobFileManager.java ## @@ -91,13 +89,1

[GitHub] [incubator-iotdb] qiaojialin commented on a change in pull request #258: [IOTDB-143]Development of merge

2019-08-15 Thread GitBox
qiaojialin commented on a change in pull request #258: [IOTDB-143]Development of merge URL: https://github.com/apache/incubator-iotdb/pull/258#discussion_r313197710 ## File path: server/src/assembly/resources/conf/iotdb-engine.properties ## @@ -155,7 +155,52 @@ concurrent_

[GitHub] [incubator-iotdb] qiaojialin commented on a change in pull request #258: [IOTDB-143]Development of merge

2019-08-15 Thread GitBox
qiaojialin commented on a change in pull request #258: [IOTDB-143]Development of merge URL: https://github.com/apache/incubator-iotdb/pull/258#discussion_r314206947 ## File path: server/src/main/java/org/apache/iotdb/db/engine/merge/manage/MergeResource.java ## @@ -0,0 +1

[GitHub] [incubator-iotdb] qiaojialin commented on a change in pull request #258: [IOTDB-143]Development of merge

2019-08-15 Thread GitBox
qiaojialin commented on a change in pull request #258: [IOTDB-143]Development of merge URL: https://github.com/apache/incubator-iotdb/pull/258#discussion_r313694327 ## File path: server/src/main/java/org/apache/iotdb/db/engine/merge/manage/MergeResource.java ## @@ -0,0 +1

[GitHub] [incubator-iotdb] qiaojialin commented on a change in pull request #258: [IOTDB-143]Development of merge

2019-08-15 Thread GitBox
qiaojialin commented on a change in pull request #258: [IOTDB-143]Development of merge URL: https://github.com/apache/incubator-iotdb/pull/258#discussion_r313190255 ## File path: client/src/main/java/org/apache/iotdb/cli/client/AbstractClient.java ## @@ -728,12 +728,10 @@

[GitHub] [incubator-iotdb] qiaojialin commented on a change in pull request #258: [IOTDB-143]Development of merge

2019-08-15 Thread GitBox
qiaojialin commented on a change in pull request #258: [IOTDB-143]Development of merge URL: https://github.com/apache/incubator-iotdb/pull/258#discussion_r313704705 ## File path: server/src/main/java/org/apache/iotdb/db/engine/merge/manage/MergeResource.java ## @@ -0,0 +1

[GitHub] [incubator-iotdb] qiaojialin commented on a change in pull request #258: [IOTDB-143]Development of merge

2019-08-15 Thread GitBox
qiaojialin commented on a change in pull request #258: [IOTDB-143]Development of merge URL: https://github.com/apache/incubator-iotdb/pull/258#discussion_r313352890 ## File path: tsfile/src/main/java/org/apache/iotdb/tsfile/write/writer/ForceAppendTsFileWriter.java ## @@

[GitHub] [incubator-iotdb] qiaojialin commented on a change in pull request #258: [IOTDB-143]Development of merge

2019-08-15 Thread GitBox
qiaojialin commented on a change in pull request #258: [IOTDB-143]Development of merge URL: https://github.com/apache/incubator-iotdb/pull/258#discussion_r313197861 ## File path: server/src/assembly/resources/conf/iotdb-engine.properties ## @@ -155,7 +155,52 @@ concurrent_

[GitHub] [incubator-iotdb] qiaojialin commented on a change in pull request #258: [IOTDB-143]Development of merge

2019-08-15 Thread GitBox
qiaojialin commented on a change in pull request #258: [IOTDB-143]Development of merge URL: https://github.com/apache/incubator-iotdb/pull/258#discussion_r313774935 ## File path: server/src/main/java/org/apache/iotdb/db/engine/merge/selector/MergePathSelector.java ## @@ -

[GitHub] [incubator-iotdb] qiaojialin commented on a change in pull request #258: [IOTDB-143]Development of merge

2019-08-15 Thread GitBox
qiaojialin commented on a change in pull request #258: [IOTDB-143]Development of merge URL: https://github.com/apache/incubator-iotdb/pull/258#discussion_r313704248 ## File path: server/src/main/java/org/apache/iotdb/db/engine/merge/manage/MergeResource.java ## @@ -0,0 +1

[GitHub] [incubator-iotdb] qiaojialin commented on a change in pull request #258: [IOTDB-143]Development of merge

2019-08-15 Thread GitBox
qiaojialin commented on a change in pull request #258: [IOTDB-143]Development of merge URL: https://github.com/apache/incubator-iotdb/pull/258#discussion_r313774378 ## File path: server/src/main/java/org/apache/iotdb/db/engine/merge/selector/FileQueryMemMeasurement.java ##

[GitHub] [incubator-iotdb] qiaojialin commented on a change in pull request #258: [IOTDB-143]Development of merge

2019-08-15 Thread GitBox
qiaojialin commented on a change in pull request #258: [IOTDB-143]Development of merge URL: https://github.com/apache/incubator-iotdb/pull/258#discussion_r313684907 ## File path: server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java ## @@

[GitHub] [incubator-iotdb] qiaojialin commented on a change in pull request #258: [IOTDB-143]Development of merge

2019-08-15 Thread GitBox
qiaojialin commented on a change in pull request #258: [IOTDB-143]Development of merge URL: https://github.com/apache/incubator-iotdb/pull/258#discussion_r313681792 ## File path: server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java ## @@

[GitHub] [incubator-iotdb] qiaojialin commented on a change in pull request #258: [IOTDB-143]Development of merge

2019-08-15 Thread GitBox
qiaojialin commented on a change in pull request #258: [IOTDB-143]Development of merge URL: https://github.com/apache/incubator-iotdb/pull/258#discussion_r313201751 ## File path: server/src/main/java/org/apache/iotdb/db/engine/cache/TsFileMetadataUtils.java ## @@ -95,6 +9

[GitHub] [incubator-iotdb] qiaojialin commented on a change in pull request #258: [IOTDB-143]Development of merge

2019-08-15 Thread GitBox
qiaojialin commented on a change in pull request #258: [IOTDB-143]Development of merge URL: https://github.com/apache/incubator-iotdb/pull/258#discussion_r313736246 ## File path: server/src/main/java/org/apache/iotdb/db/utils/MergeUtils.java ## @@ -0,0 +1,354 @@ +/** + * L

[GitHub] [incubator-iotdb] qiaojialin commented on a change in pull request #258: [IOTDB-143]Development of merge

2019-08-15 Thread GitBox
qiaojialin commented on a change in pull request #258: [IOTDB-143]Development of merge URL: https://github.com/apache/incubator-iotdb/pull/258#discussion_r313208276 ## File path: server/src/main/java/org/apache/iotdb/db/query/reader/resourceRelated/UnseqResourceMergeReader.java ##

[GitHub] [incubator-iotdb] qiaojialin commented on a change in pull request #258: [IOTDB-143]Development of merge

2019-08-15 Thread GitBox
qiaojialin commented on a change in pull request #258: [IOTDB-143]Development of merge URL: https://github.com/apache/incubator-iotdb/pull/258#discussion_r313774688 ## File path: server/src/main/java/org/apache/iotdb/db/engine/merge/selector/MergeFileSelector.java ## @@ -

[GitHub] [incubator-iotdb] qiaojialin commented on a change in pull request #258: [IOTDB-143]Development of merge

2019-08-15 Thread GitBox
qiaojialin commented on a change in pull request #258: [IOTDB-143]Development of merge URL: https://github.com/apache/incubator-iotdb/pull/258#discussion_r314209390 ## File path: server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java ## @@

[GitHub] [incubator-iotdb] qiaojialin commented on a change in pull request #258: [IOTDB-143]Development of merge

2019-08-15 Thread GitBox
qiaojialin commented on a change in pull request #258: [IOTDB-143]Development of merge URL: https://github.com/apache/incubator-iotdb/pull/258#discussion_r313262501 ## File path: tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/Chunk.java ## @@ -28,11 +28,12 @@

[GitHub] [incubator-iotdb] qiaojialin commented on a change in pull request #258: [IOTDB-143]Development of merge

2019-08-15 Thread GitBox
qiaojialin commented on a change in pull request #258: [IOTDB-143]Development of merge URL: https://github.com/apache/incubator-iotdb/pull/258#discussion_r313820437 ## File path: server/src/main/java/org/apache/iotdb/db/engine/merge/selector/MaxFileMergeFileSelector.java #

[GitHub] [incubator-iotdb] qiaojialin commented on a change in pull request #258: [IOTDB-143]Development of merge

2019-08-15 Thread GitBox
qiaojialin commented on a change in pull request #258: [IOTDB-143]Development of merge URL: https://github.com/apache/incubator-iotdb/pull/258#discussion_r313346240 ## File path: tsfile/src/main/java/org/apache/iotdb/tsfile/read/TsFileSequenceReader.java ## @@ -612,4 +646

[GitHub] [incubator-iotdb] qiaojialin commented on a change in pull request #258: [IOTDB-143]Development of merge

2019-08-15 Thread GitBox
qiaojialin commented on a change in pull request #258: [IOTDB-143]Development of merge URL: https://github.com/apache/incubator-iotdb/pull/258#discussion_r314575470 ## File path: server/src/main/java/org/apache/iotdb/db/engine/merge/recover/LogAnalyzer.java ## @@ -0,0 +1,

[GitHub] [incubator-iotdb] qiaojialin commented on a change in pull request #258: [IOTDB-143]Development of merge

2019-08-15 Thread GitBox
qiaojialin commented on a change in pull request #258: [IOTDB-143]Development of merge URL: https://github.com/apache/incubator-iotdb/pull/258#discussion_r313852348 ## File path: server/src/main/java/org/apache/iotdb/db/engine/merge/selector/MaxFileMergeFileSelector.java #

[GitHub] [incubator-iotdb] qiaojialin commented on a change in pull request #258: [IOTDB-143]Development of merge

2019-08-15 Thread GitBox
qiaojialin commented on a change in pull request #258: [IOTDB-143]Development of merge URL: https://github.com/apache/incubator-iotdb/pull/258#discussion_r313693421 ## File path: server/src/main/java/org/apache/iotdb/db/engine/merge/recover/MergeLogger.java ## @@ -0,0 +1,

[GitHub] [incubator-iotdb] qiaojialin commented on a change in pull request #258: [IOTDB-143]Development of merge

2019-08-15 Thread GitBox
qiaojialin commented on a change in pull request #258: [IOTDB-143]Development of merge URL: https://github.com/apache/incubator-iotdb/pull/258#discussion_r313691947 ## File path: server/src/main/java/org/apache/iotdb/db/engine/merge/recover/MergeLogger.java ## @@ -0,0 +1,

[GitHub] [incubator-iotdb] qiaojialin commented on a change in pull request #258: [IOTDB-143]Development of merge

2019-08-15 Thread GitBox
qiaojialin commented on a change in pull request #258: [IOTDB-143]Development of merge URL: https://github.com/apache/incubator-iotdb/pull/258#discussion_r313686847 ## File path: server/src/main/java/org/apache/iotdb/db/engine/merge/task/RecoverMergeTask.java ## @@ -0,0 +

[GitHub] [incubator-iotdb] qiaojialin commented on a change in pull request #258: [IOTDB-143]Development of merge

2019-08-15 Thread GitBox
qiaojialin commented on a change in pull request #258: [IOTDB-143]Development of merge URL: https://github.com/apache/incubator-iotdb/pull/258#discussion_r313204795 ## File path: server/src/main/java/org/apache/iotdb/db/query/control/QueryResourceManager.java ## @@ -109,5

[GitHub] [incubator-iotdb] qiaojialin commented on a change in pull request #258: [IOTDB-143]Development of merge

2019-08-15 Thread GitBox
qiaojialin commented on a change in pull request #258: [IOTDB-143]Development of merge URL: https://github.com/apache/incubator-iotdb/pull/258#discussion_r313716591 ## File path: server/src/main/java/org/apache/iotdb/db/engine/merge/manage/MergeManager.java ## @@ -0,0 +1,

[GitHub] [incubator-iotdb] qiaojialin commented on a change in pull request #258: [IOTDB-143]Development of merge

2019-08-15 Thread GitBox
qiaojialin commented on a change in pull request #258: [IOTDB-143]Development of merge URL: https://github.com/apache/incubator-iotdb/pull/258#discussion_r313735585 ## File path: server/src/main/java/org/apache/iotdb/db/utils/MergeUtils.java ## @@ -0,0 +1,354 @@ +/** + * L

[GitHub] [incubator-iotdb] qiaojialin commented on a change in pull request #258: [IOTDB-143]Development of merge

2019-08-15 Thread GitBox
qiaojialin commented on a change in pull request #258: [IOTDB-143]Development of merge URL: https://github.com/apache/incubator-iotdb/pull/258#discussion_r313353051 ## File path: tsfile/src/main/java/org/apache/iotdb/tsfile/write/writer/ForceAppendTsFileWriter.java ## @@

[GitHub] [incubator-iotdb] qiaojialin commented on a change in pull request #258: [IOTDB-143]Development of merge

2019-08-15 Thread GitBox
qiaojialin commented on a change in pull request #258: [IOTDB-143]Development of merge URL: https://github.com/apache/incubator-iotdb/pull/258#discussion_r313694613 ## File path: server/src/main/java/org/apache/iotdb/db/engine/merge/manage/MergeResource.java ## @@ -0,0 +1

[GitHub] [incubator-iotdb] qiaojialin commented on a change in pull request #258: [IOTDB-143]Development of merge

2019-08-15 Thread GitBox
qiaojialin commented on a change in pull request #258: [IOTDB-143]Development of merge URL: https://github.com/apache/incubator-iotdb/pull/258#discussion_r314202063 ## File path: server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java ## @@

[GitHub] [incubator-iotdb] qiaojialin commented on a change in pull request #258: [IOTDB-143]Development of merge

2019-08-15 Thread GitBox
qiaojialin commented on a change in pull request #258: [IOTDB-143]Development of merge URL: https://github.com/apache/incubator-iotdb/pull/258#discussion_r313298216 ## File path: tsfile/src/main/java/org/apache/iotdb/tsfile/read/controller/ChunkLoader.java ## @@ -34,4 +34

[GitHub] [incubator-iotdb] qiaojialin commented on a change in pull request #258: [IOTDB-143]Development of merge

2019-08-15 Thread GitBox
qiaojialin commented on a change in pull request #258: [IOTDB-143]Development of merge URL: https://github.com/apache/incubator-iotdb/pull/258#discussion_r313705442 ## File path: server/src/main/java/org/apache/iotdb/db/engine/merge/manage/MergeResource.java ## @@ -0,0 +1

[GitHub] [incubator-iotdb] qiaojialin commented on a change in pull request #258: [IOTDB-143]Development of merge

2019-08-15 Thread GitBox
qiaojialin commented on a change in pull request #258: [IOTDB-143]Development of merge URL: https://github.com/apache/incubator-iotdb/pull/258#discussion_r314208495 ## File path: server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java ## @@

[GitHub] [incubator-iotdb] qiaojialin commented on a change in pull request #258: [IOTDB-143]Development of merge

2019-08-15 Thread GitBox
qiaojialin commented on a change in pull request #258: [IOTDB-143]Development of merge URL: https://github.com/apache/incubator-iotdb/pull/258#discussion_r313691907 ## File path: server/src/main/java/org/apache/iotdb/db/engine/merge/recover/MergeLogger.java ## @@ -0,0 +1,