This is an automated email from the ASF dual-hosted git repository. jackietien pushed a commit to branch NewTsFileV2 in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 84cade9e2f6bff89ed445aea1f5319a707e4f538 Merge: 5972d02 7a393ef Author: JackieTien97 <[email protected]> AuthorDate: Thu Jan 21 16:42:39 2021 +0800 merge maste cluster/pom.xml | 16 ++ .../cluster/query/ClusterPhysicalGenerator.java | 15 +- .../iotdb/cluster/query/LoadConfigurationTest.java | 122 ++++++++++++ docs/Download/README.md | 17 +- docs/zh/Download/README.md | 14 +- .../resources/conf/iotdb-engine.properties | 2 +- .../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 2 +- .../org/apache/iotdb/db/conf/IoTDBConfigCheck.java | 6 +- .../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 4 + .../iotdb/db/engine/upgrade/UpgradeTask.java | 5 +- .../iotdb/db/query/control/QueryTimeManager.java | 10 +- .../dataset/RawQueryDataSetWithValueFilter.java | 68 ++++++- .../dataset/RawQueryDataSetWithoutValueFilter.java | 107 +++++----- .../iotdb/db/query/dataset/UDFInputDataSet.java} | 73 ++++--- .../db/query/dataset/UDTFAlignByTimeDataSet.java | 6 +- .../iotdb/db/query/udf/core/access/RowImpl.java | 23 ++- .../iotdb/db/query/udf/core/input/InputLayer.java | 120 ++++++------ .../iotdb/db/query/udf/core/input/SafetyLine.java | 40 ++-- .../iotdb/db/query/udf/datastructure/Cache.java | 99 ++++++++++ .../primitive/ElasticSerializableIntList.java | 25 +-- .../row/ElasticSerializableRowRecordList.java | 69 ++++--- .../row/SerializableRowRecordList.java | 98 ++++------ .../tv/ElasticSerializableTVList.java | 28 ++- .../org/apache/iotdb/db/service/TSServiceImpl.java | 12 +- .../org/apache/iotdb/db/utils/UpgradeUtils.java | 20 +- .../iotdb/db/utils/datastructure/TimeSelector.java | 155 +++++++++++++++ .../iotdb/db/integration/IoTDBDisableAlignIT.java | 6 +- .../ElasticSerializableRowRecordListTest.java | 61 +++--- .../iotdb/db/query/udf/datastructure/LRUCache.java | 59 ++++++ .../db/query/udf/datastructure/LRUCacheTest.java | 115 +++++++++++ .../udf/datastructure/SerializableListTest.java | 2 + .../SerializableRowRecordListTest.java | 49 ++++- .../db/utils/datastructure/TimeSelectorTest.java | 217 +++++++++++++++++++++ .../org/apache/iotdb/session/pool/SessionPool.java | 22 +++ .../apache/iotdb/session/pool/SessionPoolTest.java | 33 +++- .../tsfile/file/metadata/TimeseriesMetadata.java | 8 +- 36 files changed, 1337 insertions(+), 391 deletions(-) diff --cc server/src/main/java/org/apache/iotdb/db/engine/upgrade/UpgradeTask.java index deb8e27,3a977df..8b31642 --- a/server/src/main/java/org/apache/iotdb/db/engine/upgrade/UpgradeTask.java +++ b/server/src/main/java/org/apache/iotdb/db/engine/upgrade/UpgradeTask.java @@@ -99,8 -99,9 +99,9 @@@ public class UpgradeTask extends Wrappe try { File upgradeFolder = upgradeResource.getTsFile().getParentFile(); for (File tempPartitionDir : upgradeFolder.listFiles()) { -- if (tempPartitionDir.isDirectory() && - fsFactory.getFile(tempPartitionDir, upgradeResource.getTsFile().getName()).exists()) { ++ if (tempPartitionDir.isDirectory() && + fsFactory.getFile(tempPartitionDir, upgradeResource.getTsFile().getName() + + TsFileResource.RESOURCE_SUFFIX).exists()) { TsFileResource resource = new TsFileResource( fsFactory.getFile(tempPartitionDir, upgradeResource.getTsFile().getName())); resource.deserialize(); diff --cc server/src/main/java/org/apache/iotdb/db/utils/UpgradeUtils.java index e16a118,da9bddd..44242fb --- a/server/src/main/java/org/apache/iotdb/db/utils/UpgradeUtils.java +++ b/server/src/main/java/org/apache/iotdb/db/utils/UpgradeUtils.java @@@ -63,7 -63,7 +63,7 @@@ public class UpgradeUtils /** * judge whether a tsfile needs to be upgraded */ -- public static boolean isNeedUpgrade(TsFileResource tsFileResource) { ++ public static boolean isNeedUpgrade(TsFileResource tsFileResource) throws Exception { tsFileResource.readLock(); //case the TsFile's length is equal to 0, the TsFile does not need to be upgraded try { diff --cc tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/TimeseriesMetadata.java index e961a3a,4f93f17..7882288 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/TimeseriesMetadata.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/TimeseriesMetadata.java @@@ -35,16 -33,8 +35,12 @@@ import org.apache.iotdb.tsfile.utils.Re public class TimeseriesMetadata implements Accountable { /** + * used for old version tsfile + */ - @Deprecated + private long startOffsetOfChunkMetaDataList; - - + /** - * 0 means this time series has only one chunk, no need to save the statistic again in chunk - * metadata 1 means this time series has more than one chunk, should save the statistic again in - * chunk metadata + * 0 means this time series has only one chunk, no need to save the statistic again in chunk metadata + * 1 means this time series has more than one chunk, should save the statistic again in chunk metadata */ private byte timeSeriesMetadataType;
