diff --git a/server/src/main/java/org/apache/iotdb/db/engine/merge/selector/MaxFileMergeFileSelector.java b/server/src/main/java/org/apache/iotdb/db/engine/merge/selector/MaxFileMergeFileSelector.java index d115a11afacf486f359cc43760634dc6c59f696f..91049d10f3de8a0b4276caa30734018396330e7c 100644 --- a/server/src/main/java/org/apache/iotdb/db/engine/merge/selector/MaxFileMergeFileSelector.java +++ b/server/src/main/java/org/apache/iotdb/db/engine/merge/selector/MaxFileMergeFileSelector.java @@ -316,7 +316,7 @@ public class MaxFileMergeFileSelector implements IMergeFileSelector { long singleSeriesCost = calculateTightFileMemoryCost(seqFile, this::calculateMetadataSize); long multiSeriesCost = concurrentMergeNum * singleSeriesCost; long maxCost = calculateMetadataSize(seqFile); - return multiSeriesCost > maxCost ? maxCost : multiSeriesCost; + return Math.min(multiSeriesCost, maxCost); } // this method traverses all ChunkMetadata to find out which series has the most chunks and uses @@ -325,7 +325,7 @@ public class MaxFileMergeFileSelector implements IMergeFileSelector { long singleSeriesCost = calculateTightFileMemoryCost(unseqFile, TsFileResource::getTsFileSize); long multiSeriesCost = concurrentMergeNum * singleSeriesCost; long maxCost = unseqFile.getTsFileSize(); - return multiSeriesCost > maxCost ? maxCost : multiSeriesCost; + return Math.min(multiSeriesCost, maxCost); } @Override diff --git a/server/src/main/java/org/apache/iotdb/db/engine/merge/task/MergeFileTask.java b/server/src/main/java/org/apache/iotdb/db/engine/merge/task/MergeFileTask.java index a83c36c619b9225adfed5496024f338f1dff2161..f148655f383f83a25936fcde389e024783b01fdc 100644 --- a/server/src/main/java/org/apache/iotdb/db/engine/merge/task/MergeFileTask.java +++ b/server/src/main/java/org/apache/iotdb/db/engine/merge/task/MergeFileTask.java @@ -223,7 +223,7 @@ class MergeFileTask { if (metaData.getStartTime() == startTime) { Chunk chunk = reader.readMemChunk(metaData); fileWriter.writeChunk(chunk, metaData); - maxVersion = metaData.getVersion() > maxVersion ? metaData.getVersion() : maxVersion; + maxVersion = Math.max(metaData.getVersion(), maxVersion); context.incTotalPointWritten(metaData.getNumOfPoints()); break; } diff --git a/server/src/main/java/org/apache/iotdb/db/utils/datastructure/BinaryTVList.java b/server/src/main/java/org/apache/iotdb/db/utils/datastructure/BinaryTVList.java index 00d55f8293097c47f70b2f278de88062bd8dc440..bb61d933720792184ef6562112452ef102c54e86 100644 --- a/server/src/main/java/org/apache/iotdb/db/utils/datastructure/BinaryTVList.java +++ b/server/src/main/java/org/apache/iotdb/db/utils/datastructure/BinaryTVList.java @@ -47,7 +47,7 @@ public class BinaryTVList extends TVList { checkExpansion(); int arrayIndex = size / ARRAY_SIZE; int elementIndex = size % ARRAY_SIZE; - minTime = minTime <= timestamp ? minTime : timestamp; + minTime = Math.min(minTime, timestamp); timestamps.get(arrayIndex)[elementIndex] = timestamp; values.get(arrayIndex)[elementIndex] = value; size++; diff --git a/server/src/main/java/org/apache/iotdb/db/utils/datastructure/BooleanTVList.java b/server/src/main/java/org/apache/iotdb/db/utils/datastructure/BooleanTVList.java index c6389652a7a72dc12f54e4b5f4e80731dee29d73..f199ecde0eb2433ee2372919b14ad33b901c5045 100644 --- a/server/src/main/java/org/apache/iotdb/db/utils/datastructure/BooleanTVList.java +++ b/server/src/main/java/org/apache/iotdb/db/utils/datastructure/BooleanTVList.java @@ -46,7 +46,7 @@ public class BooleanTVList extends TVList { checkExpansion(); int arrayIndex = size / ARRAY_SIZE; int elementIndex = size % ARRAY_SIZE; - minTime = minTime <= timestamp ? minTime : timestamp; + minTime = Math.min(minTime, timestamp); timestamps.get(arrayIndex)[elementIndex] = timestamp; values.get(arrayIndex)[elementIndex] = value; size++; diff --git a/server/src/main/java/org/apache/iotdb/db/utils/datastructure/DoubleTVList.java b/server/src/main/java/org/apache/iotdb/db/utils/datastructure/DoubleTVList.java index b0025009d16d5ba1d76c2a26f03ea5029bdcb6e7..f76890bbba2cb2797d8d790eb9d186d05336ccd2 100644 --- a/server/src/main/java/org/apache/iotdb/db/utils/datastructure/DoubleTVList.java +++ b/server/src/main/java/org/apache/iotdb/db/utils/datastructure/DoubleTVList.java @@ -47,7 +47,7 @@ public class DoubleTVList extends TVList { checkExpansion(); int arrayIndex = size / ARRAY_SIZE; int elementIndex = size % ARRAY_SIZE; - minTime = minTime <= timestamp ? minTime : timestamp; + minTime = Math.min(minTime, timestamp); timestamps.get(arrayIndex)[elementIndex] = timestamp; values.get(arrayIndex)[elementIndex] = value; size++; diff --git a/server/src/main/java/org/apache/iotdb/db/utils/datastructure/FloatTVList.java b/server/src/main/java/org/apache/iotdb/db/utils/datastructure/FloatTVList.java index 39ebc53eab0e87bec3cfec0040e37bf1d795a3c1..5e16e56bdd9b4f4cef2bdfdb16faa52fc69cc2ca 100644 --- a/server/src/main/java/org/apache/iotdb/db/utils/datastructure/FloatTVList.java +++ b/server/src/main/java/org/apache/iotdb/db/utils/datastructure/FloatTVList.java @@ -48,7 +48,7 @@ public class FloatTVList extends TVList { checkExpansion(); int arrayIndex = size / ARRAY_SIZE; int elementIndex = size % ARRAY_SIZE; - minTime = minTime <= timestamp ? minTime : timestamp; + minTime = Math.min(minTime, timestamp); timestamps.get(arrayIndex)[elementIndex] = timestamp; values.get(arrayIndex)[elementIndex] = value; size++; diff --git a/server/src/main/java/org/apache/iotdb/db/utils/datastructure/IntTVList.java b/server/src/main/java/org/apache/iotdb/db/utils/datastructure/IntTVList.java index c89c33dffa1d670e0a500ceb86eb3f8d10cfd324..7667d2b45320f60961b6d1be19032154873bfda7 100644 --- a/server/src/main/java/org/apache/iotdb/db/utils/datastructure/IntTVList.java +++ b/server/src/main/java/org/apache/iotdb/db/utils/datastructure/IntTVList.java @@ -46,7 +46,7 @@ public class IntTVList extends TVList { checkExpansion(); int arrayIndex = size / ARRAY_SIZE; int elementIndex = size % ARRAY_SIZE; - minTime = minTime <= timestamp ? minTime : timestamp; + minTime = Math.min(minTime, timestamp); timestamps.get(arrayIndex)[elementIndex] = timestamp; values.get(arrayIndex)[elementIndex] = value; size++; diff --git a/server/src/main/java/org/apache/iotdb/db/utils/datastructure/LongTVList.java b/server/src/main/java/org/apache/iotdb/db/utils/datastructure/LongTVList.java index def63f2be4f7f2500cb753b31e9842f8b1bcc491..f1d5b6215b960f2686f201905024c23b40d8032f 100644 --- a/server/src/main/java/org/apache/iotdb/db/utils/datastructure/LongTVList.java +++ b/server/src/main/java/org/apache/iotdb/db/utils/datastructure/LongTVList.java @@ -46,7 +46,7 @@ public class LongTVList extends TVList { checkExpansion(); int arrayIndex = size / ARRAY_SIZE; int elementIndex = size % ARRAY_SIZE; - minTime = minTime <= timestamp ? minTime : timestamp; + minTime = Math.min(minTime, timestamp); timestamps.get(arrayIndex)[elementIndex] = timestamp; values.get(arrayIndex)[elementIndex] = value; size++; diff --git a/server/src/main/java/org/apache/iotdb/db/utils/datastructure/TVList.java b/server/src/main/java/org/apache/iotdb/db/utils/datastructure/TVList.java index a93a4b5f2fbf8ec7ece165c2e3f9a2458d8710ff..18e71763a4cc1b0f50f8aa2f0250bed4c794e344 100644 --- a/server/src/main/java/org/apache/iotdb/db/utils/datastructure/TVList.java +++ b/server/src/main/java/org/apache/iotdb/db/utils/datastructure/TVList.java @@ -187,7 +187,7 @@ public abstract class TVList { long time = getTime(i); if (time < lowerBound || time > upperBound) { set(i, newSize++); - minTime = time < minTime ? time : minTime; + minTime = Math.min(time, minTime); } } int deletedNumber = size - newSize; @@ -245,7 +245,7 @@ public abstract class TVList { abstract void clearValue(); /** - * The arrays for sorting are not including in write memory now, + * The arrays for sorting are not including in write memory now, * the memory usage is considered as temporary memory. */ abstract void clearSortedValue(); @@ -452,12 +452,12 @@ public abstract class TVList { long inPutMinTime = Long.MAX_VALUE; boolean inputSorted = true; for (int i = start; i < end; i++) { - inPutMinTime = inPutMinTime <= time[i] ? inPutMinTime : time[i]; + inPutMinTime = Math.min(inPutMinTime, time[i]); if (inputSorted && i < length - 1 && time[i] > time[i + 1]) { inputSorted = false; } } - minTime = inPutMinTime < minTime ? inPutMinTime : minTime; + minTime = Math.min(inPutMinTime, minTime); sorted = sorted && inputSorted && (size == 0 || inPutMinTime >= getTime(size - 1)); } diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/utils/ReadWriteForEncodingUtils.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/utils/ReadWriteForEncodingUtils.java index 60b8917fbff88dedcccb7a9396a1d15a2f9b12ce..0b1f8b0c5474060fb983e654cca6a1ec04445c0c 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/utils/ReadWriteForEncodingUtils.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/utils/ReadWriteForEncodingUtils.java @@ -44,7 +44,7 @@ public class ReadWriteForEncodingUtils { int max = 1; for (int num : list) { int bitWidth = 32 - Integer.numberOfLeadingZeros(num); - max = bitWidth > max ? bitWidth : max; + max = Math.max(bitWidth, max); } return max; } @@ -59,7 +59,7 @@ public class ReadWriteForEncodingUtils { int max = 1; for (long num : list) { int bitWidth = 64 - Long.numberOfLeadingZeros(num); - max = bitWidth > max ? bitWidth : max; + max = Math.max(bitWidth, max); } return max; }