You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by xu...@apache.org on 2020/02/26 08:25:53 UTC
[incubator-iotdb] branch IOTDB-524-fix_file_order created (now
d3a2546)
This is an automated email from the ASF dual-hosted git repository.
xuekaifeng pushed a change to branch IOTDB-524-fix_file_order
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
at d3a2546 fix bugs
This branch includes the following new commits:
new 610082b add time partition when recovery
new 829e6a8 Merge branch 'master' of https://github.com/apache/incubator-iotdb
new 890566e Merge branch 'master' of https://github.com/apache/incubator-iotdb
new d3a2546 fix bugs
The 4 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.
[incubator-iotdb] 01/04: add time partition when recovery
Posted by xu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xuekaifeng pushed a commit to branch IOTDB-524-fix_file_order
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 610082b233713e76f2a8067724cb7dc3de60938e
Author: 151250176 <15...@smail.nju.edu.cn>
AuthorDate: Mon Feb 17 10:20:25 2020 +0800
add time partition when recovery
---
.../org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java | 2 ++
1 file changed, 2 insertions(+)
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java
index 86a21f8..f48ca04 100755
--- a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java
@@ -406,6 +406,7 @@ public class StorageGroupProcessor {
workUnsequenceTsFileProcessors
.put(timePartitionId, tsFileProcessor);
tsFileResource.setProcessor(tsFileProcessor);
+ tsFileProcessor.setTimeRangeId(timePartitionId);
writer.makeMetadataVisible();
}
}
@@ -432,6 +433,7 @@ public class StorageGroupProcessor {
this::closeUnsealedTsFileProcessor,
this::unsequenceFlushCallback, false, writer);
tsFileResource.setProcessor(tsFileProcessor);
+ tsFileProcessor.setTimeRangeId(timePartitionId);
writer.makeMetadataVisible();
}
}
[incubator-iotdb] 02/04: Merge branch 'master' of
https://github.com/apache/incubator-iotdb
Posted by xu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xuekaifeng pushed a commit to branch IOTDB-524-fix_file_order
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 829e6a883704bdbe0e6dcc34a6b3cdca4fd83ce4
Merge: 610082b a1a56ef
Author: 151250176 <15...@smail.nju.edu.cn>
AuthorDate: Wed Feb 19 19:55:08 2020 +0800
Merge branch 'master' of https://github.com/apache/incubator-iotdb
.../iotdb/hadoop/tsfile/TSFMRReadExample.java | 3 ---
.../iotdb/hadoop/tsfile/TSMRWriteExample.java | 1 -
example/rocketmq/readme.md | 22 +++++++++++-----------
.../apache/iotdb/hadoop/tsfile/TSFInputFormat.java | 3 ---
.../iotdb/hadoop/tsfile/TSFOutputFormat.java | 3 ---
.../iotdb/hadoop/tsfile/TSFRecordReader.java | 3 ---
.../iotdb/hadoop/tsfile/record/HDFSTSRecord.java | 3 ---
.../iotdb/hadoop/tsfile/TSFInputSplitTest.java | 2 --
.../apache/iotdb/hive/TsFileDeserializerTest.java | 3 ---
.../NewEngineDataSetWithoutValueFilter.java | 8 ++++----
10 files changed, 15 insertions(+), 36 deletions(-)
[incubator-iotdb] 04/04: fix bugs
Posted by xu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xuekaifeng pushed a commit to branch IOTDB-524-fix_file_order
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit d3a2546bfebc5d3e3156a29563582d7050cf848e
Author: 151250176 <15...@smail.nju.edu.cn>
AuthorDate: Wed Feb 26 16:25:28 2020 +0800
fix bugs
---
.../engine/storagegroup/StorageGroupProcessor.java | 37 ++++++++++++++--------
1 file changed, 24 insertions(+), 13 deletions(-)
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java
index 547b9c8..edaa0c8 100755
--- a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java
@@ -18,6 +18,28 @@
*/
package org.apache.iotdb.db.engine.storagegroup;
+import static org.apache.iotdb.db.engine.merge.task.MergeTask.MERGE_SUFFIX;
+import static org.apache.iotdb.db.engine.storagegroup.TsFileResource.TEMP_SUFFIX;
+import static org.apache.iotdb.tsfile.common.constant.TsFileConstant.TSFILE_SUFFIX;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.TreeMap;
+import java.util.TreeSet;
+import java.util.concurrent.locks.ReadWriteLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
import org.apache.commons.io.FileUtils;
import org.apache.iotdb.db.conf.IoTDBConstant;
import org.apache.iotdb.db.conf.IoTDBDescriptor;
@@ -72,17 +94,6 @@ import org.apache.iotdb.tsfile.write.writer.RestorableTsFileIOWriter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.io.File;
-import java.io.IOException;
-import java.util.*;
-import java.util.Map.Entry;
-import java.util.concurrent.locks.ReadWriteLock;
-import java.util.concurrent.locks.ReentrantReadWriteLock;
-
-import static org.apache.iotdb.db.engine.merge.task.MergeTask.MERGE_SUFFIX;
-import static org.apache.iotdb.db.engine.storagegroup.TsFileResource.TEMP_SUFFIX;
-import static org.apache.iotdb.tsfile.common.constant.TsFileConstant.TSFILE_SUFFIX;
-
/**
* For sequence data, a StorageGroupProcessor has some TsFileProcessors, in which there is only one
@@ -143,8 +154,8 @@ public class StorageGroupProcessor {
// includes sealed and unsealed sequence TsFiles
private TreeSet<TsFileResource> sequenceFileTreeSet = new TreeSet<>(
(o1, o2) -> {
- int rangeCompare = o1.getFile().getParentFile().getName()
- .compareTo(o2.getFile().getParentFile().getName());
+ int rangeCompare = Long.compare(Long.parseLong(o1.getFile().getParentFile().getName()),
+ Long.parseLong(o2.getFile().getParentFile().getName()));
return rangeCompare == 0 ? compareFileName(o1.getFile(), o2.getFile()) : rangeCompare;
});
[incubator-iotdb] 03/04: Merge branch 'master' of
https://github.com/apache/incubator-iotdb
Posted by xu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xuekaifeng pushed a commit to branch IOTDB-524-fix_file_order
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 890566ed46eef36c6b2be09fc9bfa634f6c166bf
Merge: 829e6a8 700f9a9
Author: 151250176 <15...@smail.nju.edu.cn>
AuthorDate: Wed Feb 26 16:23:14 2020 +0800
Merge branch 'master' of https://github.com/apache/incubator-iotdb
.gitignore | 3 +
.travis.yml | 6 +-
README.md | 2 +-
client-py/src/client_example.py | 33 +-
.../org/apache/iotdb/client/AbstractClient.java | 104 +-
docker/ReadMe.md | 59 +
docker/src/main/Dockerfile | 1 +
docker/src/main/Dockerfile-0.8.1 | 40 +
docker/src/main/Dockerfile-0.9.0 | 41 +
docker/src/main/Dockerfile-0.9.1 | 41 +
.../SystemDesign/1-TsFile/3-Write.md | 8 +-
.../SystemDesign/1-TsFile/4-Read.md | 541 +++++++-
.../4-StorageEngine/1-StorageEngine.md | 30 +-
.../4-StorageEngine/5-DataPartition.md | 86 ++
.../4-StorageEngine/6-DataManipulation.md | 96 ++
.../SystemDesign/5-DataQuery/1-DataQuery.md | 52 +-
.../SystemDesign/5-DataQuery/2-SeriesReader.md | 414 ++++++
.../SystemDesign/5-DataQuery/3-RawDataQuery.md | 301 +++++
.../SystemDesign/5-DataQuery/4-AggregationQuery.md | 118 ++
.../SystemDesign/5-DataQuery/5-GroupByQuery.md | 192 +++
.../SystemDesign/7-Connector/3-Spark-TsFile.md | 101 ++
.../SystemDesign/7-Connector/4-Spark-IOTDB.md | 89 ++
.../UserGuide/0-Get Started/1-QuickStart.md | 2 +-
.../UserGuide/4-Client/6-Status Codes.md | 65 +
.../2-DML (Data Manipulation Language).md | 4 +-
.../5-Operation Manual/4-SQL Reference.md | 58 +-
docs/Documentation/SystemDesign/0-Content.md | 10 +-
docs/Documentation/SystemDesign/1-TsFile/4-Read.md | 537 ++++++++
docs/Documentation/UserGuide/0-Content.md | 1 +
.../UserGuide/0-Get Started/1-QuickStart.md | 2 +-
.../UserGuide/4-Client/6-Status Codes.md | 66 +
.../2-DML (Data Manipulation Language).md | 20 +-
.../5-Operation Manual/4-SQL Reference.md | 58 +-
.../main/java/org/apache/iotdb/SessionExample.java | 12 +-
hadoop/src/test/resources/logback.xml | 2 +-
.../org/apache/iotdb/hive/TsFileTestHelper.java | 11 +-
.../src/test/resources/logback.xml | 4 +-
.../org/apache/iotdb/jdbc/IoTDBConnection.java | 27 +-
.../resources/conf/iotdb-engine.properties | 37 +-
.../org/apache/iotdb/db/qp/strategy/SqlBase.g4 | 20 +-
.../org/apache/iotdb/db/auth/AuthorityChecker.java | 1 -
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 64 +-
.../org/apache/iotdb/db/conf/IoTDBConstant.java | 2 +
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 89 +-
.../db/conf/adapter/ActiveTimeSeriesCounter.java | 19 +-
.../org/apache/iotdb/db/engine/StorageEngine.java | 54 +-
.../db/engine/cache/CacheHitRatioMonitor.java | 5 +
.../engine/cache/CacheHitRatioMonitorMXBean.java | 2 +
.../apache/iotdb/db/engine/cache/ChunkCache.java | 150 +++
.../iotdb/db/engine/cache/DeviceMetaDataCache.java | 13 +-
.../iotdb/db/engine/cache/RamUsageEstimator.java | 34 +-
.../apache/iotdb/db/engine/flush/FlushManager.java | 33 +-
.../iotdb/db/engine/memtable/AbstractMemTable.java | 42 +-
.../apache/iotdb/db/engine/memtable/IMemTable.java | 8 +-
.../db/engine/memtable/IWritableMemChunk.java | 16 +-
.../db/engine/memtable/MemSeriesLazyMerger.java | 50 -
.../engine/memtable/TimeValuePairInMemTable.java | 45 -
.../db/engine/memtable/TimeValuePairSorter.java | 55 -
.../iotdb/db/engine/memtable/WritableMemChunk.java | 66 +-
.../iotdb/db/engine/merge/manage/MergeManager.java | 40 +
.../db/engine/merge/manage/MergeResource.java | 6 +-
.../iotdb/db/engine/merge/recover/LogAnalyzer.java | 2 +-
.../iotdb/db/engine/merge/task/MergeFileTask.java | 6 +-
.../db/engine/merge/task/MergeMultiChunkTask.java | 17 +-
.../iotdb/db/engine/merge/task/MergeTask.java | 4 +-
.../db/engine/querycontext/QueryDataSource.java | 13 +-
.../db/engine/querycontext/ReadOnlyMemChunk.java | 131 +-
.../engine/storagegroup/StorageGroupProcessor.java | 109 +-
.../db/engine/storagegroup/TsFileProcessor.java | 274 ++--
.../db/engine/storagegroup/TsFileResource.java | 20 +-
.../db/exception/ConfigAdjusterException.java | 5 +-
.../exception/DiskSpaceInsufficientException.java | 4 +-
.../{ProcessException.java => IoTDBException.java} | 10 +-
.../apache/iotdb/db/exception/MergeException.java | 5 +-
.../exception/QueryInBatchStatementException.java | 6 +-
.../iotdb/db/exception/StartupException.java | 12 +-
.../iotdb/db/exception/StorageEngineException.java | 14 +-
.../db/exception/SyncConnectionException.java | 11 +-
.../SyncDeviceOwnerConflictException.java | 8 +-
.../iotdb/db/exception/SystemCheckException.java | 6 +-
.../db/exception/TsFileProcessorException.java | 8 +-
.../IllegalPathException.java} | 10 +-
.../db/exception/metadata/MetadataException.java | 24 +-
...ception.java => PathAlreadyExistException.java} | 9 +-
.../PathNotExistException.java} | 13 +-
.../StorageGroupAlreadySetException.java} | 17 +-
.../StorageGroupNotSetException.java | 4 +-
.../db/exception/path/MTreePathException.java | 38 -
.../exception/query/LogicalOperatorException.java | 16 +-
.../exception/query/LogicalOptimizeException.java | 6 +-
.../db/exception/query/OutOfTTLException.java | 4 +-
.../exception/{path => query}/PathException.java | 13 +-
.../db/exception/query/QueryProcessException.java | 16 +-
.../query/UnSupportedFillTypeException.java | 4 +-
.../JDBCServiceException.java} | 13 +-
.../storageGroup/StorageGroupException.java | 7 +-
.../storageGroup/StorageGroupPathException.java | 30 -
.../StorageGroupProcessorException.java | 10 +-
.../java/org/apache/iotdb/db/metadata/MGraph.java | 419 ------
.../org/apache/iotdb/db/metadata/MManager.java | 1334 ++++++--------------
.../java/org/apache/iotdb/db/metadata/MNode.java | 241 ----
.../java/org/apache/iotdb/db/metadata/MTree.java | 1095 +++++-----------
.../org/apache/iotdb/db/metadata/MetaUtils.java | 60 +-
.../iotdb/db/metadata/MetadataOperationType.java | 15 +-
.../java/org/apache/iotdb/db/metadata/PNode.java | 127 --
.../java/org/apache/iotdb/db/metadata/PTree.java | 244 ----
.../iotdb/db/metadata/mnode/InternalMNode.java | 74 ++
.../apache/iotdb/db/metadata/mnode/LeafMNode.java | 77 ++
.../org/apache/iotdb/db/metadata/mnode/MNode.java | 116 ++
.../iotdb/db/metadata/mnode/StorageGroupMNode.java | 59 +
.../org/apache/iotdb/db/monitor/StatMonitor.java | 21 +-
.../iotdb/db/monitor/collector/FileSize.java | 9 +-
.../db/qp/{QueryProcessor.java => Planner.java} | 31 +-
.../apache/iotdb/db/qp/constant/SQLConstant.java | 3 +-
.../qp/executor/AbstractQueryProcessExecutor.java | 390 ------
...ueryProcessExecutor.java => IPlanExecutor.java} | 48 +-
...QueryProcessExecutor.java => PlanExecutor.java} | 788 ++++++++----
.../org/apache/iotdb/db/qp/logical/Operator.java | 2 +-
.../db/qp/logical/crud/BasicFunctionOperator.java | 12 +-
.../iotdb/db/qp/logical/crud/FilterOperator.java | 41 +-
.../iotdb/db/qp/logical/crud/InOperator.java | 12 +-
.../iotdb/db/qp/logical/crud/QueryOperator.java | 20 +-
.../iotdb/db/qp/logical/sys/PropertyOperator.java | 106 --
.../iotdb/db/qp/physical/crud/AggregationPlan.java | 2 +-
.../db/qp/physical/crud/AlignByDevicePlan.java | 176 +++
.../iotdb/db/qp/physical/crud/FillQueryPlan.java | 2 +-
.../iotdb/db/qp/physical/crud/GroupByPlan.java | 13 +-
.../iotdb/db/qp/physical/crud/QueryPlan.java | 188 +--
.../db/qp/physical/crud/RawDataQueryPlan.java | 76 ++
.../iotdb/db/qp/physical/sys/PropertyPlan.java | 95 --
.../iotdb/db/qp/strategy/LogicalGenerator.java | 89 +-
.../iotdb/db/qp/strategy/PhysicalGenerator.java | 194 ++-
.../qp/strategy/optimizer/ConcatPathOptimizer.java | 20 +-
.../db/qp/strategy/optimizer/IFilterOptimizer.java | 3 +-
.../db/query/aggregation/AggreResultData.java | 192 ---
.../db/query/aggregation/AggregateFunction.java | 122 --
.../db/query/aggregation/AggregateResult.java | 287 +++++
.../db/query/aggregation/AggregationType.java | 100 ++
.../db/query/aggregation/impl/AvgAggrFunc.java | 173 ---
.../db/query/aggregation/impl/AvgAggrResult.java | 140 ++
.../db/query/aggregation/impl/CountAggrFunc.java | 156 ---
.../db/query/aggregation/impl/CountAggrResult.java | 106 ++
.../query/aggregation/impl/FirstValueAggrFunc.java | 154 ---
.../aggregation/impl/FirstValueAggrResult.java | 123 ++
.../query/aggregation/impl/LastValueAggrFunc.java | 151 ---
.../aggregation/impl/LastValueAggrResult.java | 118 ++
.../db/query/aggregation/impl/MaxTimeAggrFunc.java | 135 --
.../query/aggregation/impl/MaxTimeAggrResult.java | 113 ++
.../query/aggregation/impl/MaxValueAggrFunc.java | 170 ---
.../query/aggregation/impl/MaxValueAggrResult.java | 112 ++
.../db/query/aggregation/impl/MinTimeAggrFunc.java | 156 ---
.../query/aggregation/impl/MinTimeAggrResult.java | 108 ++
.../query/aggregation/impl/MinValueAggrFunc.java | 166 ---
.../query/aggregation/impl/MinValueAggrResult.java | 109 ++
.../db/query/aggregation/impl/SumAggrResult.java | 127 ++
.../iotdb/db/query/control/FileReaderManager.java | 21 +-
.../db/query/control/QueryResourceManager.java | 29 +-
.../query/dataset/AggreResultDataPointReader.java | 56 -
...erateDataSet.java => AlignByDeviceDataSet.java} | 139 +-
.../db/query/dataset/NonAlignEngineDataSet.java | 45 +-
.../OldEngineDataSetWithoutValueFilter.java | 153 ---
...er.java => RawQueryDataSetWithValueFilter.java} | 28 +-
...java => RawQueryDataSetWithoutValueFilter.java} | 103 +-
.../iotdb/db/query/dataset/SingleDataSet.java | 3 +-
.../dataset/groupby/GroupByEngineDataSet.java | 86 +-
.../groupby/GroupByWithValueFilterDataSet.java | 69 +-
.../groupby/GroupByWithoutValueFilterDataSet.java | 385 +++---
.../db/query/executor/AggregateEngineExecutor.java | 336 -----
.../db/query/executor/AggregationExecutor.java | 289 +++++
...lEngineExecutor.java => FillQueryExecutor.java} | 57 +-
.../{IEngineQueryRouter.java => IQueryRouter.java} | 6 +-
.../{EngineQueryRouter.java => QueryRouter.java} | 123 +-
...gineExecutor.java => RawDataQueryExecutor.java} | 98 +-
.../db/query/externalsort/ExternalSortJob.java | 2 +-
.../query/externalsort/ExternalSortJobEngine.java | 7 +-
.../db/query/externalsort/ExternalSortJobPart.java | 2 +-
.../iotdb/db/query/externalsort/LineMerger.java | 6 +-
.../MultiSourceExternalSortJobPart.java | 2 +-
.../externalsort/SimpleExternalSortEngine.java | 15 +-
.../SingleSourceExternalSortJobPart.java | 28 +-
.../adapter/ByTimestampReaderAdapter.java | 67 +-
.../serialize/IExternalSortFileDeserializer.java | 6 +-
.../serialize/IExternalSortFileSerializer.java | 2 +-
.../FixLengthIExternalSortFileDeserializer.java | 6 +-
.../impl/FixLengthTimeValuePairSerializer.java | 2 +-
.../iotdb/db/query/factory/AggreFuncFactory.java | 80 --
.../db/query/factory/AggregateResultFactory.java | 104 ++
.../java/org/apache/iotdb/db/query/fill/IFill.java | 70 +-
.../org/apache/iotdb/db/query/fill/LinearFill.java | 51 +-
.../apache/iotdb/db/query/fill/PreviousFill.java | 39 +-
.../filter/TsFileFilter.java} | 15 +-
.../ChunkDataIterator.java} | 44 +-
.../{chunkRelated => chunk}/ChunkReaderWrap.java | 14 +-
.../db/query/reader/chunk/DiskChunkLoader.java | 36 +-
.../DiskChunkReaderByTimestamp.java | 64 +-
.../db/query/reader/chunk/MemChunkLoader.java | 41 +-
.../{chunkRelated => chunk}/MemChunkReader.java | 58 +-
.../chunk/MemPageReader.java} | 31 +-
.../reader/chunkRelated/CachedDiskChunkReader.java | 88 --
.../chunkRelated/MemChunkReaderByTimestamp.java | 78 --
.../FileSeriesReaderByTimestampAdapter.java | 49 -
.../fileRelated/UnSealedTsFileIterateReader.java | 130 --
.../UnSealedTsFileReaderByTimestamp.java | 96 --
.../CachedUnseqResourceMergeReader.java | 11 +-
.../NewUnseqResourceMergeReader.java | 199 ---
.../OldUnseqResourceMergeReader.java | 140 --
.../resourceRelated/ResourceRelatedUtil.java | 48 -
.../resourceRelated/SeqResourceIterateReader.java | 157 ---
.../SeqResourceReaderByTimestamp.java | 190 ---
.../UnseqResourceReaderByTimestamp.java | 101 --
.../db/query/reader/series}/IAggregateReader.java | 36 +-
.../reader/{ => series}/IReaderByTimestamp.java | 9 +-
.../reader/{ => series}/ManagedSeriesReader.java | 8 +-
.../query/reader/series/SeriesAggregateReader.java | 102 ++
.../reader/series/SeriesRawDataBatchReader.java | 132 ++
.../reader/series/SeriesRawDataPointReader.java | 100 ++
.../iotdb/db/query/reader/series/SeriesReader.java | 471 +++++++
.../reader/series/SeriesReaderByTimestamp.java | 93 ++
.../seriesRelated/SeriesReaderByTimestamp.java | 57 -
.../seriesRelated/SeriesReaderWithValueFilter.java | 113 --
.../SeriesReaderWithoutValueFilter.java | 266 ----
.../universal/CachedPriorityMergeReader.java | 8 +-
.../db/query/reader/universal/IterateReader.java | 90 --
.../reader/universal/PriorityMergeReader.java | 48 +-
.../universal/PriorityMergeReaderByTimestamp.java | 75 --
.../timegenerator/AbstractNodeConstructor.java | 75 --
.../query/timegenerator/EngineNodeConstructor.java | 68 -
.../query/timegenerator/EngineTimeGenerator.java | 67 -
.../query/timegenerator/ServerTimeGenerator.java | 75 ++
.../java/org/apache/iotdb/db/service/IService.java | 2 +
.../org/apache/iotdb/db/service/JDBCService.java | 7 +-
.../org/apache/iotdb/db/service/JMXService.java | 10 +-
.../apache/iotdb/db/service/MetricsService.java | 6 +-
.../apache/iotdb/db/service/RegisterManager.java | 2 +-
.../org/apache/iotdb/db/service/StartupChecks.java | 2 +-
.../org/apache/iotdb/db/service/TSServiceImpl.java | 352 +++---
.../db/sync/receiver/transfer/SyncServiceImpl.java | 5 +-
.../db/sync/sender/manage/SyncFileManager.java | 12 +-
.../java/org/apache/iotdb/db/utils/FileUtils.java | 8 +-
.../java/org/apache/iotdb/db/utils/MergeUtils.java | 1 +
.../java/org/apache/iotdb/db/utils/QueryUtils.java | 14 +
.../apache/iotdb/db/utils/RandomDeleteCache.java | 16 +-
.../org/apache/iotdb/db/utils/SchemaUtils.java | 17 +-
.../apache/iotdb/db/utils/TimeValuePairUtils.java | 66 +-
.../iotdb/db/utils/datastructure/BinaryTVList.java | 26 +-
.../db/utils/datastructure/BooleanTVList.java | 27 +-
.../iotdb/db/utils/datastructure/DoubleTVList.java | 31 +-
.../iotdb/db/utils/datastructure/FloatTVList.java | 31 +-
.../iotdb/db/utils/datastructure/IntTVList.java | 27 +-
.../iotdb/db/utils/datastructure/LongTVList.java | 26 +-
.../iotdb/db/utils/datastructure/TVList.java | 122 +-
.../iotdb/db/engine/MetadataManagerHelper.java | 85 +-
.../db/engine/cache/DeviceMetaDataCacheTest.java | 15 +-
.../db/engine/memtable/PrimitiveMemTableTest.java | 80 +-
.../apache/iotdb/db/engine/merge/MergeLogTest.java | 2 +-
.../iotdb/db/engine/merge/MergeOverLapTest.java | 41 +-
.../iotdb/db/engine/merge/MergeTaskTest.java | 192 +--
.../apache/iotdb/db/engine/merge/MergeTest.java | 6 +-
.../engine/modification/DeletionFileNodeTest.java | 77 +-
.../db/engine/modification/DeletionQueryTest.java | 35 +-
.../storagegroup/FileNodeManagerBenchmark.java | 6 +-
.../storagegroup/StorageGroupProcessorTest.java | 48 +-
.../iotdb/db/engine/storagegroup/TTLTest.java | 106 +-
.../engine/storagegroup/TsFileProcessorTest.java | 154 ++-
.../iotdb/db/integration/IOTDBGroupByIT.java | 43 +-
.../integration/IOTDBGroupByInnerIntervalIT.java | 26 +-
.../iotdb/db/integration/IoTDBAggregationIT.java | 178 ++-
.../integration/IoTDBAggregationSmallDataIT.java | 129 +-
...upbyDeviceIT.java => IoTDBAlignByDeviceIT.java} | 67 +-
.../iotdb/db/integration/IoTDBAuthorizationIT.java | 2 +-
.../iotdb/db/integration/IoTDBDisableAlignIT.java | 4 +-
.../db/integration/IoTDBEngineTimeGeneratorIT.java | 10 +-
.../apache/iotdb/db/integration/IoTDBFillIT.java | 2 +-
.../db/integration/IoTDBFlushQueryMergeTest.java | 19 +-
.../integration/IoTDBLoadExternalTsfileTest.java | 38 +-
.../iotdb/db/integration/IoTDBMergeTest.java | 3 +
.../iotdb/db/integration/IoTDBMetadataFetchIT.java | 10 +-
.../iotdb/db/integration/IoTDBMultiSeriesIT.java | 4 +-
.../iotdb/db/integration/IoTDBRecoverIT.java | 2 +
.../db/integration/IoTDBSequenceDataQueryIT.java | 23 +-
.../iotdb/db/integration/IoTDBSeriesReaderIT.java | 53 +-
.../apache/iotdb/db/integration/IoTDBTtlIT.java | 22 +-
.../org/apache/iotdb/db/metadata/MGraphTest.java | 81 --
.../iotdb/db/metadata/MManagerAdvancedTest.java | 85 +-
.../iotdb/db/metadata/MManagerBasicTest.java | 299 ++---
.../iotdb/db/metadata/MManagerImproveTest.java | 137 +-
.../org/apache/iotdb/db/metadata/MTreeTest.java | 295 ++---
.../org/apache/iotdb/db/metadata/MetadataTest.java | 88 --
.../{QueryProcessorTest.java => PlannerTest.java} | 43 +-
.../iotdb/db/qp/bench/QueryParseBenchmark.java | 11 +-
.../iotdb/db/qp/other/TSPlanContextAuthorTest.java | 9 +-
.../db/qp/other/TSPlanContextPropertyTest.java | 92 --
...ncatOptimizer.java => ConcatOptimizerTest.java} | 107 +-
.../iotdb/db/qp/plan/LogicalPlanSmallTest.java | 38 +-
.../apache/iotdb/db/qp/plan/PhysicalPlanTest.java | 300 ++---
.../org/apache/iotdb/db/qp/plan/QPUpdateTest.java | 206 ---
.../apache/iotdb/db/qp/utils/MemIntQpExecutor.java | 196 ---
.../db/query/aggregation/AggregateResultTest.java | 263 ++++
.../iotdb/db/query/component/SimpleFileWriter.java | 54 -
.../dataset/EngineDataSetWithValueFilterTest.java | 14 +-
.../query/executor/GroupByEngineDataSetTest.java | 29 +-
.../query/externalsort/ExternalSortEngineTest.java | 40 +-
.../db/query/externalsort/FakeChunkReaderWrap.java | 6 +-
...ExternalSortFileSerializerDeserializerTest.java | 6 +-
.../iotdb/db/query/reader/ReaderTestHelper.java | 2 +
.../fileRelated/UnSealedTsFileReaderTest.java | 112 --
.../NewUnseqResourceMergeReaderTest.java | 109 --
.../resourceRelated/SeqResourceReaderTest.java | 116 --
.../resourceRelated/UnseqResourceReaderTest.java | 146 ---
.../reader/series/SeriesAggregateReaderTest.java | 116 ++
.../reader/series/SeriesReaderByTimestampTest.java | 84 ++
.../db/query/reader/series/SeriesReaderTest.java | 127 ++
.../reader/series/SeriesReaderTestUtil.java} | 158 ++-
.../reader/seriesRelated/FakedIBatchPoint.java | 110 --
.../reader/seriesRelated/FakedIPointReader.java | 79 --
.../SeriesReaderWithValueFilterTest.java | 59 -
.../SeriesReaderWithoutValueFilterTest.java | 74 --
.../query/reader/universal/FakedSeriesReader.java | 10 +-
.../universal/FakedSeriesReaderByTimestamp.java | 79 --
.../PriorityMergeReaderByTimestampTest.java | 172 ---
.../reader/universal/PriorityMergeReaderTest.java | 8 +-
.../reader/universal/PriorityMergeReaderTest2.java | 13 +-
.../db/sync/receiver/load/FileLoaderTest.java | 6 +-
.../recover/SyncReceiverLogAnalyzerTest.java | 6 +-
.../db/sync/sender/manage/SyncFileManagerTest.java | 2 +-
.../sender/recover/SyncSenderLogAnalyzerTest.java | 2 +-
.../apache/iotdb/db/utils/EnvironmentUtils.java | 69 +-
.../db/utils/datastructure/LongTVListTest.java | 2 +-
.../apache/iotdb/db/writelog/PerformanceTest.java | 15 +-
.../iotdb/db/writelog/recover/LogReplayerTest.java | 21 +-
.../db/writelog/recover/SeqTsFileRecoverTest.java | 9 +-
.../writelog/recover/UnseqTsFileRecoverTest.java | 25 +-
server/src/test/resources/logback.xml | 12 +-
.../main/java/org/apache/iotdb/rpc/RpcUtils.java | 2 +-
.../java/org/apache/iotdb/rpc/TSStatusCode.java | 14 +-
service-rpc/src/main/thrift/rpc.thrift | 3 +-
.../java/org/apache/iotdb/session/Session.java | 23 +-
.../org/apache/iotdb/session/IoTDBSessionIT.java | 62 +-
.../org/apache/iotdb/spark/db/Converter.scala | 37 +-
.../org/apache/iotdb/spark/db/DefaultSource.scala | 37 +-
.../org/apache/iotdb/spark/db/IoTDBOptions.scala | 37 +-
.../scala/org/apache/iotdb/spark/db/IoTDBRDD.scala | 37 +-
.../org/apache/iotdb/spark/db/IoTDBRelation.scala | 37 +-
.../org/apache/iotdb/spark/db/Transformer.scala | 37 +-
.../scala/org/apache/iotdb/spark/db/package.scala | 37 +-
.../org/apache/iotdb/spark/db/IoTDBTest.scala | 37 +-
.../org/apache/iotdb/spark/tsfile/Converter.scala | 37 +-
.../apache/iotdb/spark/tsfile/DefaultSource.scala | 36 +-
.../iotdb/spark/tsfile/NarrowConverter.scala | 37 +-
.../spark/tsfile/NarrowTsFileOutputWriter.scala | 37 +-
.../apache/iotdb/spark/tsfile/Transformer.scala | 37 +-
.../iotdb/spark/tsfile/TsFileWriterFactory.scala | 36 +-
.../apache/iotdb/spark/tsfile/WideConverter.scala | 37 +-
.../spark/tsfile/WideTsFileOutputWriter.scala | 37 +-
.../org/apache/iotdb/spark/tsfile/package.scala | 36 +-
.../apache/iotdb/spark/tsfile/ConverterTest.scala | 37 +-
.../org/apache/iotdb/spark/tsfile/TSFileSuit.scala | 37 +-
.../apache/iotdb/tsfile/common/cache/LRUCache.java | 8 +-
.../iotdb/tsfile/common/conf/TSFileConfig.java | 18 +-
.../iotdb/tsfile/common/conf/TSFileDescriptor.java | 7 +-
.../tsfile/common/constant/TsFileConstant.java | 1 -
.../iotdb/tsfile/file/header/ChunkHeader.java | 8 +-
.../iotdb/tsfile/file/metadata/ChunkMetaData.java | 412 +++---
.../apache/iotdb/tsfile/read/ReadOnlyTsFile.java | 4 +-
.../apache/iotdb/tsfile/read}/TimeValuePair.java | 2 +-
.../iotdb/tsfile/read/TsFileSequenceReader.java | 28 +-
.../apache/iotdb/tsfile/read/common/BatchData.java | 52 +-
.../org/apache/iotdb/tsfile/read/common/Field.java | 40 +-
.../org/apache/iotdb/tsfile/read/common/Path.java | 3 +-
.../apache/iotdb/tsfile/read/common/RowRecord.java | 5 +
.../iotdb/tsfile/read/common/SignalBatchData.java | 5 +
.../common/{RowRecord.java => TimeColumn.java} | 67 +-
...kLoaderImpl.java => CachedChunkLoaderImpl.java} | 16 +-
.../iotdb/tsfile/read/controller/IChunkLoader.java | 8 +-
.../iotdb/tsfile/read/filter/GroupByFilter.java | 22 +-
.../tsfile/read/filter/basic/UnaryFilter.java | 4 +
.../query/dataset/DataSetWithTimeGenerator.java | 4 +-
.../tsfile/read/query/dataset/QueryDataSet.java | 34 -
.../query/executor/ExecutorWithTimeGenerator.java | 4 +-
.../read/query/timegenerator/TimeGenerator.java | 99 +-
.../query/timegenerator/TimeGeneratorImpl.java | 130 --
.../query/timegenerator/TsFileTimeGenerator.java | 51 +
.../read/query/timegenerator/node/AndNode.java | 86 +-
.../read/query/timegenerator/node/LeafNode.java | 54 +-
.../tsfile/read/query/timegenerator/node/Node.java | 5 +-
.../read/query/timegenerator/node/OrNode.java | 121 +-
.../tsfile/read/reader/BatchDataIterator.java | 44 +-
.../iotdb/tsfile/read/reader/IChunkReader.java | 17 +-
.../{IDataReader.java => reader/IPageReader.java} | 13 +-
.../iotdb/tsfile/read}/reader/IPointReader.java | 12 +-
.../tsfile/read/reader/chunk/ChunkReader.java | 87 +-
.../read/reader/chunk/ChunkReaderByTimestamp.java | 4 +-
.../iotdb/tsfile/read/reader/page/PageReader.java | 42 +-
.../reader/series/AbstractFileSeriesReader.java | 37 +-
.../read/reader/series/EmptyFileSeriesReader.java | 5 -
.../org/apache/iotdb/tsfile/utils/PublicBAOS.java | 13 -
.../apache/iotdb/tsfile/write/TsFileWriter.java | 23 +-
.../iotdb/tsfile/write/chunk/ChunkWriterImpl.java | 14 +-
.../apache/iotdb/tsfile/write/page/PageWriter.java | 12 +-
.../tsfile/write/schema/MeasurementSchema.java | 2 +-
.../write/writer/ForceAppendTsFileWriter.java | 8 +-
.../write/writer/RestorableTsFileIOWriter.java | 5 +-
.../iotdb/tsfile/write/writer/TsFileIOWriter.java | 9 +-
.../decoder/delta/DeltaBinaryEncoderLongTest.java | 18 +-
.../apache/iotdb/tsfile/read/ExpressionTest.java | 60 +
.../org/apache/iotdb/tsfile/read/ReadTest.java | 18 +-
.../iotdb/tsfile/read/common/BatchDataTest.java | 82 ++
.../tsfile/read/controller/ChunkLoaderTest.java | 2 +-
.../read/filter/MinTimeMaxTimeFilterTest.java | 6 +
.../read/query/executor/QueryExecutorTest.java | 4 +-
.../tsfile/read/query/timegenerator/NodeTest.java | 38 +-
.../query/timegenerator/ReaderByTimestampTest.java | 4 +-
.../query/timegenerator/TimeGeneratorTest.java | 9 +-
.../iotdb/tsfile/read/reader/ReaderTest.java | 6 +-
.../iotdb/tsfile/utils/TsFileGeneratorForTest.java | 56 +-
.../iotdb/tsfile/utils/TsPrimitiveTypeTest.java | 60 +
.../iotdb/tsfile/write/TsFileWriterTest.java | 26 +-
.../org/apache/iotdb/tsfile/write/WriteTest.java | 12 +-
.../iotdb/tsfile/write/writer/PageWriterTest.java | 18 +-
419 files changed, 13954 insertions(+), 15553 deletions(-)