This is an automated email from the ASF dual-hosted git repository. jackietien pushed a commit to branch NewTsFile in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit c0a7ee3b94c1d67a01ba74a1a5209fdadb0f6d48 Author: JackieTien97 <[email protected]> AuthorDate: Thu Nov 26 11:54:46 2020 +0800 fix compile error --- .../iotdb/db/engine/storagegroup/StorageGroupProcessor.java | 11 +++++------ .../apache/iotdb/db/engine/storagegroup/TsFileResource.java | 13 +++++-------- .../apache/iotdb/db/query/aggregation/AggregateResult.java | 2 +- .../iotdb/db/query/aggregation/impl/AvgAggrResult.java | 12 ++++++++++-- .../iotdb/db/query/aggregation/impl/SumAggrResult.java | 10 ++++++++-- .../impl/FixLengthIExternalSortFileDeserializer.java | 2 +- 6 files changed, 30 insertions(+), 20 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 22ddad1..7b8221f 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 @@ -80,7 +80,6 @@ import org.apache.iotdb.db.qp.physical.crud.InsertTabletPlan; import org.apache.iotdb.db.query.context.QueryContext; import org.apache.iotdb.db.query.control.QueryFileManager; import org.apache.iotdb.db.service.IoTDB; -import org.apache.iotdb.db.service.UpgradeSevice; import org.apache.iotdb.db.utils.CopyOnReadLinkedList; import org.apache.iotdb.db.writelog.recover.TsFileRecoverPerformer; import org.apache.iotdb.rpc.RpcUtils; @@ -1738,12 +1737,12 @@ public class StorageGroupProcessor { for (TsFileResource seqTsFileResource : upgradeSeqFileList) { seqTsFileResource.setSeq(true); seqTsFileResource.setUpgradeTsFileResourceCallBack(this::upgradeTsFileResourceCallBack); - seqTsFileResource.doUpgrade(); +// seqTsFileResource.doUpgrade(); } for (TsFileResource unseqTsFileResource : upgradeUnseqFileList) { unseqTsFileResource.setSeq(false); unseqTsFileResource.setUpgradeTsFileResourceCallBack(this::upgradeTsFileResourceCallBack); - unseqTsFileResource.doUpgrade(); +// unseqTsFileResource.doUpgrade(); } } @@ -1787,9 +1786,9 @@ public class StorageGroupProcessor { } } } - if (StorageEngine.getInstance().countUpgradeFiles() == 0) { - UpgradeSevice.getINSTANCE().stop(); - } +// if (StorageEngine.getInstance().countUpgradeFiles() == 0) { +// UpgradeSevice.getINSTANCE().stop(); +// } } } diff --git a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileResource.java b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileResource.java index 58f37b3..5f338ae 100644 --- a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileResource.java +++ b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileResource.java @@ -42,12 +42,9 @@ import org.apache.iotdb.db.engine.StorageEngine; import org.apache.iotdb.db.engine.modification.ModificationFile; import org.apache.iotdb.db.engine.querycontext.ReadOnlyMemChunk; import org.apache.iotdb.db.engine.storagegroup.StorageGroupProcessor.UpgradeTsFileResourceCallBack; -import org.apache.iotdb.db.engine.upgrade.UpgradeTask; import org.apache.iotdb.db.exception.PartitionViolationException; import org.apache.iotdb.db.rescon.CachedStringPool; -import org.apache.iotdb.db.service.UpgradeSevice; import org.apache.iotdb.db.utils.FilePathUtils; -import org.apache.iotdb.db.utils.UpgradeUtils; import org.apache.iotdb.tsfile.common.constant.TsFileConstant; import org.apache.iotdb.tsfile.file.metadata.ChunkMetadata; import org.apache.iotdb.tsfile.file.metadata.TimeseriesMetadata; @@ -570,11 +567,11 @@ public class TsFileResource { return tsFileLock.tryWriteLock(); } - void doUpgrade() { - if (UpgradeUtils.isNeedUpgrade(this)) { - UpgradeSevice.getINSTANCE().submitUpgradeTask(new UpgradeTask(this)); - } - } +// void doUpgrade() { +// if (UpgradeUtils.isNeedUpgrade(this)) { +// UpgradeSevice.getINSTANCE().submitUpgradeTask(new UpgradeTask(this)); +// } +// } public void removeModFile() throws IOException { getModFile().remove(); diff --git a/server/src/main/java/org/apache/iotdb/db/query/aggregation/AggregateResult.java b/server/src/main/java/org/apache/iotdb/db/query/aggregation/AggregateResult.java index 840fd68..fe84d34 100644 --- a/server/src/main/java/org/apache/iotdb/db/query/aggregation/AggregateResult.java +++ b/server/src/main/java/org/apache/iotdb/db/query/aggregation/AggregateResult.java @@ -108,7 +108,7 @@ public abstract class AggregateResult { public static AggregateResult deserializeFrom(ByteBuffer buffer) { AggregationType aggregationType = AggregationType.deserialize(buffer); - TSDataType dataType = TSDataType.deserialize(buffer.getShort()); + TSDataType dataType = TSDataType.deserialize(buffer.get()); boolean ascending = ReadWriteIOUtils.readBool(buffer); AggregateResult aggregateResult = AggregateResultFactory .getAggrResultByType(aggregationType, dataType, ascending); diff --git a/server/src/main/java/org/apache/iotdb/db/query/aggregation/impl/AvgAggrResult.java b/server/src/main/java/org/apache/iotdb/db/query/aggregation/impl/AvgAggrResult.java index 526e41c..4120846 100644 --- a/server/src/main/java/org/apache/iotdb/db/query/aggregation/impl/AvgAggrResult.java +++ b/server/src/main/java/org/apache/iotdb/db/query/aggregation/impl/AvgAggrResult.java @@ -27,6 +27,8 @@ import org.apache.iotdb.db.query.aggregation.AggregationType; import org.apache.iotdb.db.query.reader.series.IReaderByTimestamp; import org.apache.iotdb.tsfile.exception.filter.StatisticsClassException; import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; +import org.apache.iotdb.tsfile.file.metadata.statistics.BooleanStatistics; +import org.apache.iotdb.tsfile.file.metadata.statistics.IntegerStatistics; import org.apache.iotdb.tsfile.file.metadata.statistics.Statistics; import org.apache.iotdb.tsfile.read.common.BatchData; import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils; @@ -68,8 +70,14 @@ public class AvgAggrResult extends AggregateResult { throw new StatisticsClassException("Binary statistics does not support: avg"); } cnt += statistics.getCount(); + double sum; + if (statistics instanceof IntegerStatistics || statistics instanceof BooleanStatistics) { + sum = statistics.getSumLongValue(); + } else { + sum = statistics.getSumDoubleValue(); + } avg = avg * ((double) preCnt / cnt) + ((double) statistics.getCount() / cnt) - * statistics.getSumValue() / statistics.getCount(); + * sum / statistics.getCount(); } @Override @@ -144,7 +152,7 @@ public class AvgAggrResult extends AggregateResult { @Override protected void deserializeSpecificFields(ByteBuffer buffer) { - this.seriesDataType = TSDataType.deserialize(buffer.getShort()); + this.seriesDataType = TSDataType.deserialize(buffer.get()); this.avg = buffer.getDouble(); this.cnt = buffer.getLong(); } diff --git a/server/src/main/java/org/apache/iotdb/db/query/aggregation/impl/SumAggrResult.java b/server/src/main/java/org/apache/iotdb/db/query/aggregation/impl/SumAggrResult.java index 78e8ad4..d51b83e 100644 --- a/server/src/main/java/org/apache/iotdb/db/query/aggregation/impl/SumAggrResult.java +++ b/server/src/main/java/org/apache/iotdb/db/query/aggregation/impl/SumAggrResult.java @@ -26,6 +26,8 @@ import org.apache.iotdb.db.query.aggregation.AggregateResult; import org.apache.iotdb.db.query.aggregation.AggregationType; import org.apache.iotdb.db.query.reader.series.IReaderByTimestamp; import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; +import org.apache.iotdb.tsfile.file.metadata.statistics.BooleanStatistics; +import org.apache.iotdb.tsfile.file.metadata.statistics.IntegerStatistics; import org.apache.iotdb.tsfile.file.metadata.statistics.Statistics; import org.apache.iotdb.tsfile.read.common.BatchData; import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils; @@ -49,7 +51,11 @@ public class SumAggrResult extends AggregateResult { @Override public void updateResultFromStatistics(Statistics statistics) { double preValue = getDoubleValue(); - preValue += statistics.getSumValue(); + if (statistics instanceof IntegerStatistics || statistics instanceof BooleanStatistics) { + preValue += statistics.getSumLongValue(); + } else { + preValue += statistics.getSumDoubleValue(); + } setDoubleValue(preValue); } @@ -118,7 +124,7 @@ public class SumAggrResult extends AggregateResult { @Override protected void deserializeSpecificFields(ByteBuffer buffer) { - seriesDataType = TSDataType.deserialize(buffer.getShort()); + seriesDataType = TSDataType.deserialize(buffer.get()); } @Override diff --git a/server/src/main/java/org/apache/iotdb/db/query/externalsort/serialize/impl/FixLengthIExternalSortFileDeserializer.java b/server/src/main/java/org/apache/iotdb/db/query/externalsort/serialize/impl/FixLengthIExternalSortFileDeserializer.java index b87a852..ed8b4d1 100644 --- a/server/src/main/java/org/apache/iotdb/db/query/externalsort/serialize/impl/FixLengthIExternalSortFileDeserializer.java +++ b/server/src/main/java/org/apache/iotdb/db/query/externalsort/serialize/impl/FixLengthIExternalSortFileDeserializer.java @@ -83,7 +83,7 @@ public class FixLengthIExternalSortFileDeserializer implements IExternalSortFile } private TSDataType readHeader() throws IOException { - return TSDataType.deserialize(ReadWriteIOUtils.readShort(inputStream)); + return TSDataType.deserialize(ReadWriteIOUtils.readByte(inputStream)); } private void setReader(TSDataType type) {
