diff --git a/iotdb-client/service-rpc/src/main/java/org/apache/iotdb/rpc/IoTDBJDBCDataSet.java b/iotdb-client/service-rpc/src/main/java/org/apache/iotdb/rpc/IoTDBJDBCDataSet.java index 254c6d685982f..5aff6cb1d6392 100644 --- a/iotdb-client/service-rpc/src/main/java/org/apache/iotdb/rpc/IoTDBJDBCDataSet.java +++ b/iotdb-client/service-rpc/src/main/java/org/apache/iotdb/rpc/IoTDBJDBCDataSet.java @@ -113,8 +113,8 @@ public IoTDBJDBCDataSet( this.zoneId = zoneId; columnSize = columnNameList.size(); - this.columnNameList = new ArrayList<>(); - this.columnTypeList = new ArrayList<>(); + this.columnNameList = new ArrayList<>(columnSize + (ignoreTimeStamp ? 0 : 1)); + this.columnTypeList = new ArrayList<>(columnSize + (ignoreTimeStamp ? 0 : 1)); if (!ignoreTimeStamp) { this.columnNameList.add(TIMESTAMP_STR); this.columnTypeList.add(String.valueOf(TSDataType.INT64)); @@ -222,8 +222,8 @@ public IoTDBJDBCDataSet( this.zoneId = zoneId; columnSize = columnNameList.size(); - this.columnNameList = new ArrayList<>(); - this.columnTypeList = new ArrayList<>(); + this.columnNameList = new ArrayList<>(columnSize + (ignoreTimeStamp ? 0 : 1)); + this.columnTypeList = new ArrayList<>(columnSize + (ignoreTimeStamp ? 0 : 1)); if (!ignoreTimeStamp) { this.columnNameList.add(TIMESTAMP_STR); this.columnTypeList.add(String.valueOf(TSDataType.INT64)); diff --git a/iotdb-client/service-rpc/src/main/java/org/apache/iotdb/rpc/IoTDBRpcDataSet.java b/iotdb-client/service-rpc/src/main/java/org/apache/iotdb/rpc/IoTDBRpcDataSet.java index 2ff01502fb311..615105ae47465 100644 --- a/iotdb-client/service-rpc/src/main/java/org/apache/iotdb/rpc/IoTDBRpcDataSet.java +++ b/iotdb-client/service-rpc/src/main/java/org/apache/iotdb/rpc/IoTDBRpcDataSet.java @@ -111,8 +111,8 @@ public IoTDBRpcDataSet( this.moreData = moreData; columnSize = columnNameList.size(); - this.columnNameList = new ArrayList<>(); - this.columnTypeList = new ArrayList<>(); + this.columnNameList = new ArrayList<>(columnSize + (ignoreTimeStamp ? 0 : 1)); + this.columnTypeList = new ArrayList<>(columnSize + (ignoreTimeStamp ? 0 : 1)); if (!ignoreTimeStamp) { this.columnNameList.add(TIMESTAMP_STR); this.columnTypeList.add(String.valueOf(TSDataType.INT64)); @@ -205,8 +205,8 @@ public IoTDBRpcDataSet( this.moreData = moreData; columnSize = columnNameList.size(); - this.columnNameList = new ArrayList<>(); - this.columnTypeList = new ArrayList<>(); + this.columnNameList = new ArrayList<>(columnSize + (ignoreTimeStamp ? 0 : 1)); + this.columnTypeList = new ArrayList<>(columnSize + (ignoreTimeStamp ? 0 : 1)); if (!ignoreTimeStamp) { this.columnNameList.add(TIMESTAMP_STR); this.columnTypeList.add(String.valueOf(TSDataType.INT64)); diff --git a/iotdb-client/session/src/main/java/org/apache/iotdb/session/Session.java b/iotdb-client/session/src/main/java/org/apache/iotdb/session/Session.java index c8d26f0cefe68..f5901e93624ca 100644 --- a/iotdb-client/session/src/main/java/org/apache/iotdb/session/Session.java +++ b/iotdb-client/session/src/main/java/org/apache/iotdb/session/Session.java @@ -2531,7 +2531,7 @@ private List objectValuesListToByteBufferList( List> typesList, List> measurementsList) throws IoTDBConnectionException { - List buffersList = new ArrayList<>(); + List buffersList = new ArrayList<>(valuesList.size()); for (int i = 0; i < valuesList.size(); i++) { ByteBuffer buffer = SessionUtils.getValueBuffer(typesList.get(i), valuesList.get(i), measurementsList.get(i)); @@ -2870,8 +2870,8 @@ private void updateTSInsertTabletsReq( sortTablet(tablet); } request.addToPrefixPaths(tablet.deviceId); - List measurements = new ArrayList<>(); - List dataTypes = new ArrayList<>(); + List measurements = new ArrayList<>(tablet.getSchemas().size()); + List dataTypes = new ArrayList<>(tablet.getSchemas().size()); request.setIsAligned(isAligned); for (IMeasurementSchema measurementSchema : tablet.getSchemas()) { if (measurementSchema.getMeasurementId() == null) { @@ -3530,9 +3530,9 @@ public void createSchemaTemplate( List> encodings, List compressors) throws IoTDBConnectionException, StatementExecutionException { - List flatMeasurements = new ArrayList<>(); - List flatDataTypes = new ArrayList<>(); - List flatEncodings = new ArrayList<>(); + List flatMeasurements = new ArrayList<>(measurements.size()); + List flatDataTypes = new ArrayList<>(measurements.size()); + List flatEncodings = new ArrayList<>(measurements.size()); for (int idx = 0; idx < measurements.size(); idx++) { flatMeasurements.add(measurements.get(idx).get(0)); flatDataTypes.add(dataTypes.get(idx).get(0)); diff --git a/iotdb-client/session/src/main/java/org/apache/iotdb/session/util/SessionUtils.java b/iotdb-client/session/src/main/java/org/apache/iotdb/session/util/SessionUtils.java index 31ca44aa3ffd9..57a50c4984774 100644 --- a/iotdb-client/session/src/main/java/org/apache/iotdb/session/util/SessionUtils.java +++ b/iotdb-client/session/src/main/java/org/apache/iotdb/session/util/SessionUtils.java @@ -330,7 +330,7 @@ public static List parseSeedNodeUrls(List nodeUrls) { if (nodeUrls == null) { throw new NumberFormatException("nodeUrls is null"); } - List endPointsList = new ArrayList<>(); + List endPointsList = new ArrayList<>(nodeUrls.size()); for (String nodeUrl : nodeUrls) { TEndPoint endPoint = UrlUtils.parseTEndPointIpv4AndIpv6Url(nodeUrl); endPointsList.add(endPoint); diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/write/auth/AuthorPlan.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/write/auth/AuthorPlan.java index 8711cd86587ab..7e7f561b81469 100644 --- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/write/auth/AuthorPlan.java +++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/write/auth/AuthorPlan.java @@ -26,6 +26,7 @@ import org.apache.iotdb.confignode.consensus.request.ConfigPhysicalPlan; import org.apache.iotdb.confignode.consensus.request.ConfigPhysicalPlanType; +import com.google.common.collect.Sets; import org.apache.tsfile.utils.ReadWriteIOUtils; import org.slf4j.Logger; @@ -33,7 +34,6 @@ import java.io.IOException; import java.nio.ByteBuffer; import java.util.ArrayList; -import java.util.HashSet; import java.util.List; import java.util.Objects; import java.util.Set; @@ -181,7 +181,7 @@ protected void deserializeImpl(ByteBuffer buffer) { this.permissions = null; } else { final int permissionsSize = buffer.getInt(); - this.permissions = new HashSet<>(); + this.permissions = Sets.newHashSetWithExpectedSize(permissionsSize); for (int i = 0; i < permissionsSize; i++) { permissions.add(buffer.getInt()); } diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/write/model/UpdateModelInfoPlan.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/write/model/UpdateModelInfoPlan.java index ca74d2daf69dc..168f64d430999 100644 --- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/write/model/UpdateModelInfoPlan.java +++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/write/model/UpdateModelInfoPlan.java @@ -88,7 +88,7 @@ protected void deserializeImpl(ByteBuffer buffer) throws IOException { this.modelName = ReadWriteIOUtils.readString(buffer); this.modelInformation = ModelInformation.deserialize(buffer); int size = ReadWriteIOUtils.readInt(buffer); - this.nodeIds = new ArrayList<>(); + this.nodeIds = new ArrayList<>(size); for (int i = 0; i < size; i++) { this.nodeIds.add(ReadWriteIOUtils.readInt(buffer)); } diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/write/pipe/payload/PipeDeactivateTemplatePlan.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/write/pipe/payload/PipeDeactivateTemplatePlan.java index cf9afa0fd8c9d..22eb6af6848d9 100644 --- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/write/pipe/payload/PipeDeactivateTemplatePlan.java +++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/write/pipe/payload/PipeDeactivateTemplatePlan.java @@ -25,13 +25,13 @@ import org.apache.iotdb.confignode.consensus.request.ConfigPhysicalPlanType; import org.apache.iotdb.db.schemaengine.template.Template; +import com.google.common.collect.Maps; import org.apache.tsfile.utils.ReadWriteIOUtils; import java.io.DataOutputStream; import java.io.IOException; import java.nio.ByteBuffer; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Objects; @@ -69,7 +69,7 @@ protected void serializeImpl(DataOutputStream stream) throws IOException { @Override protected void deserializeImpl(ByteBuffer buffer) throws IOException { int size = ReadWriteIOUtils.readInt(buffer); - templateSetInfo = new HashMap<>(); + templateSetInfo = Maps.newHashMapWithExpectedSize(size); for (int i = 0; i < size; i++) { PartialPath pattern = (PartialPath) PathDeserializeUtil.deserialize(buffer); int templateNum = ReadWriteIOUtils.readInt(buffer); diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/write/pipe/task/OperateMultiplePipesPlanV2.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/write/pipe/task/OperateMultiplePipesPlanV2.java index c9ff9f574483f..5ea97c1c840d5 100644 --- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/write/pipe/task/OperateMultiplePipesPlanV2.java +++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/write/pipe/task/OperateMultiplePipesPlanV2.java @@ -75,8 +75,8 @@ protected void serializeImpl(DataOutputStream stream) throws IOException { @Override protected void deserializeImpl(ByteBuffer buffer) throws IOException { if (ReadWriteIOUtils.readBool(buffer)) { - subPlans = new ArrayList<>(); int size = ReadWriteIOUtils.readInt(buffer); + subPlans = new ArrayList<>(size); for (int i = 0; i < size; i++) { short type = ReadWriteIOUtils.readShort(buffer); if (type == ConfigPhysicalPlanType.CreatePipeV2.getPlanType()) { diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/write/subscription/topic/AlterMultipleTopicsPlan.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/write/subscription/topic/AlterMultipleTopicsPlan.java index d3dd66439f68b..62e674b43d1d3 100644 --- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/write/subscription/topic/AlterMultipleTopicsPlan.java +++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/write/subscription/topic/AlterMultipleTopicsPlan.java @@ -65,8 +65,8 @@ protected void serializeImpl(DataOutputStream stream) throws IOException { @Override protected void deserializeImpl(ByteBuffer buffer) throws IOException { if (ReadWriteIOUtils.readBool(buffer)) { - subPlans = new ArrayList<>(); int size = ReadWriteIOUtils.readInt(buffer); + subPlans = new ArrayList<>(size); for (int i = 0; i < size; i++) { // This will read the type of the plan (AlterTopicPlan), which will be ignored ReadWriteIOUtils.readShort(buffer); diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/schema/DeactivateTemplateProcedure.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/schema/DeactivateTemplateProcedure.java index fffb0fbca1841..8cecbacd39979 100644 --- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/schema/DeactivateTemplateProcedure.java +++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/schema/DeactivateTemplateProcedure.java @@ -48,6 +48,7 @@ import org.apache.iotdb.pipe.api.exception.PipeException; import org.apache.iotdb.rpc.TSStatusCode; +import com.google.common.collect.Maps; import org.apache.tsfile.utils.ReadWriteIOUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -378,7 +379,7 @@ public void deserialize(ByteBuffer byteBuffer) { super.deserialize(byteBuffer); queryId = ReadWriteIOUtils.readString(byteBuffer); int size = ReadWriteIOUtils.readInt(byteBuffer); - Map> templateSetInfo = new HashMap<>(); + Map> templateSetInfo = Maps.newHashMapWithExpectedSize(size); for (int i = 0; i < size; i++) { PartialPath pattern = (PartialPath) PathDeserializeUtil.deserialize(byteBuffer); int templateNum = ReadWriteIOUtils.readInt(byteBuffer); diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/sync/AuthOperationProcedure.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/sync/AuthOperationProcedure.java index b643e6de23b76..22c8741966b52 100644 --- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/sync/AuthOperationProcedure.java +++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/sync/AuthOperationProcedure.java @@ -213,7 +213,7 @@ public void serialize(DataOutputStream stream) throws IOException { public void deserialize(ByteBuffer byteBuffer) { super.deserialize(byteBuffer); int size = ReadWriteIOUtils.readInt(byteBuffer); - this.datanodes = new ArrayList<>(); + this.datanodes = new ArrayList<>(size); for (int i = 0; i < size; i++) { TDataNodeConfiguration datanode = ThriftCommonsSerDeUtils.deserializeTDataNodeConfiguration(byteBuffer); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/processor/twostage/exchange/payload/FetchCombineResultRequest.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/processor/twostage/exchange/payload/FetchCombineResultRequest.java index 03f8721f17bb2..97d6c4503e60b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/processor/twostage/exchange/payload/FetchCombineResultRequest.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/processor/twostage/exchange/payload/FetchCombineResultRequest.java @@ -91,8 +91,8 @@ private FetchCombineResultRequest convertToTPipeTransferReq( private FetchCombineResultRequest translateFromTPipeTransferReq(TPipeTransferReq transferReq) { pipeName = ReadWriteIOUtils.readString(transferReq.body); creationTime = ReadWriteIOUtils.readLong(transferReq.body); - combineIdList = new ArrayList<>(); final int combineIdListSize = ReadWriteIOUtils.readInt(transferReq.body); + combineIdList = new ArrayList<>(combineIdListSize); for (int i = 0; i < combineIdListSize; i++) { combineIdList.add(ReadWriteIOUtils.readString(transferReq.body)); } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/TimeseriesContext.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/TimeseriesContext.java index ecad26bac004c..143cdacb79877 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/TimeseriesContext.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/TimeseriesContext.java @@ -22,6 +22,7 @@ import org.apache.iotdb.db.queryengine.common.schematree.IMeasurementSchemaInfo; import org.apache.iotdb.db.schemaengine.schemaregion.utils.MetaUtils; +import com.google.common.collect.Maps; import org.apache.tsfile.utils.Pair; import org.apache.tsfile.utils.ReadWriteIOUtils; @@ -389,7 +390,8 @@ public static TimeseriesContext deserialize(ByteBuffer buffer) { int activeCountMultiplier = ReadWriteIOUtils.readInt(buffer); boolean logicalView = ReadWriteIOUtils.readBool(buffer); int activeLogicalViewContextMapSize = ReadWriteIOUtils.readInt(buffer); - Map activeLogicalViewContextMap = new HashMap<>(); + Map activeLogicalViewContextMap = + Maps.newHashMapWithExpectedSize(activeLogicalViewContextMapSize); for (int i = 0; i < activeLogicalViewContextMapSize; i++) { activeLogicalViewContextMap.put( ReadWriteIOUtils.readString(buffer), TimeseriesContext.deserialize(buffer)); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceFailureInfo.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceFailureInfo.java index dfaf4aa1b485d..1f18a6543a751 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceFailureInfo.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceFailureInfo.java @@ -164,8 +164,6 @@ public void serialize(DataOutputStream outputStream) throws IOException { public static FragmentInstanceFailureInfo deserialize(ByteBuffer byteBuffer) { final String message = ReadWriteIOUtils.readString(byteBuffer); FragmentInstanceFailureInfo cause; - List suppressed = new ArrayList<>(); - List stack = new ArrayList<>(); int flag = ReadWriteIOUtils.readInt(byteBuffer); if (flag == 0) { cause = null; @@ -173,10 +171,12 @@ public static FragmentInstanceFailureInfo deserialize(ByteBuffer byteBuffer) { cause = deserialize(byteBuffer); } int suppressedSize = ReadWriteIOUtils.readInt(byteBuffer); + List suppressed = new ArrayList<>(suppressedSize); for (int i = 0; i < suppressedSize; i++) { suppressed.add(deserialize(byteBuffer)); } int stackSize = ReadWriteIOUtils.readInt(byteBuffer); + List stack = new ArrayList<>(stackSize); for (int i = 0; i < stackSize; i++) { stack.add(ReadWriteIOUtils.readString(byteBuffer)); } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/FilterAndProjectOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/FilterAndProjectOperator.java index 73f77e826e78a..a14937c6286b7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/FilterAndProjectOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/FilterAndProjectOperator.java @@ -148,7 +148,9 @@ private TsBlock getFilterTsBlock(TsBlock input) { final TimeColumnBuilder timeBuilder = filterTsBlockBuilder.getTimeColumnBuilder(); final ColumnBuilder[] columnBuilders = filterTsBlockBuilder.getValueColumnBuilders(); - List resultColumns = new ArrayList<>(); + List resultColumns = + new ArrayList<>( + input.getValueColumnCount() + (hasNonMappableUDF ? 0 : commonTransformerList.size())); for (int i = 0, n = input.getValueColumnCount(); i < n; i++) { resultColumns.add(input.getColumn(i)); } @@ -213,7 +215,7 @@ private TsBlock getTransformedTsBlock(TsBlock input) { leafColumnTransformer.initFromTsBlock(input); } - List resultColumns = new ArrayList<>(); + List resultColumns = new ArrayList<>(projectOutputTransformerList.size()); for (ColumnTransformer columnTransformer : projectOutputTransformerList) { columnTransformer.tryEvaluate(); resultColumns.add(columnTransformer.getColumn()); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TransformOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TransformOperator.java index e5ae29f0c4adf..d10135259d2ee 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TransformOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TransformOperator.java @@ -289,7 +289,7 @@ public TsBlock next() throws Exception { protected void prepareTsBlockBuilder(TsBlockBuilder tsBlockBuilder) { if (outputDataTypes == null) { - outputDataTypes = new ArrayList<>(); + outputDataTypes = new ArrayList<>(transformers.length); for (LayerReader reader : transformers) { outputDataTypes.add(reader.getDataTypes()[0]); } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/TemplatedInfo.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/TemplatedInfo.java index 8241bf11005d3..07808fe8c8bcd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/TemplatedInfo.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/TemplatedInfo.java @@ -390,14 +390,14 @@ public void serialize(DataOutputStream stream) throws IOException { public static TemplatedInfo deserialize(ByteBuffer byteBuffer) { int measurementSize = ReadWriteIOUtils.readInt(byteBuffer); - List measurementList = new ArrayList<>(); + List measurementList = new ArrayList<>(measurementSize); int cnt = measurementSize; while (cnt-- > 0) { measurementList.add(ReadWriteIOUtils.readString(byteBuffer)); } cnt = measurementSize; - List measurementSchemaList = new ArrayList<>(); + List measurementSchemaList = new ArrayList<>(measurementSize); while (cnt-- > 0) { // MeasurementSchema is ok? measurementSchemaList.add(MeasurementSchema.deserializeFrom(byteBuffer)); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/TypeProvider.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/TypeProvider.java index ef26583119eb6..0b12a95a247bf 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/TypeProvider.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/TypeProvider.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.analyze; +import com.google.common.collect.Maps; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.utils.ReadWriteIOUtils; import org.apache.tsfile.write.schema.IMeasurementSchema; @@ -109,7 +110,7 @@ public void serialize(DataOutputStream stream) throws IOException { public static TypeProvider deserialize(ByteBuffer byteBuffer) { int mapSize = ReadWriteIOUtils.readInt(byteBuffer); - Map typeMap = new HashMap<>(); + Map typeMap = Maps.newHashMapWithExpectedSize(mapSize); while (mapSize > 0) { typeMap.put( ReadWriteIOUtils.readString(byteBuffer), diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/FunctionExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/FunctionExpression.java index 27ff875efd090..5e8c0917e752f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/FunctionExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/FunctionExpression.java @@ -109,7 +109,7 @@ public FunctionExpression(ByteBuffer byteBuffer) { functionAttributes = ReadWriteIOUtils.readLinkedHashMap(byteBuffer); int expressionSize = ReadWriteIOUtils.readInt(byteBuffer); - expressions = new ArrayList<>(); + expressions = new ArrayList<>(expressionSize); for (int i = 0; i < expressionSize; i++) { expressions.add(Expression.deserialize(byteBuffer)); } @@ -304,7 +304,7 @@ public boolean isMappable(Map, TSDataType> expressionTypes) public List getPaths() { if (paths == null) { - paths = new ArrayList<>(); + paths = new ArrayList<>(expressions.size()); for (Expression expression : expressions) { paths.add( expression instanceof TimeSeriesOperand diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ColumnTransformerVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ColumnTransformerVisitor.java index 6c871be905fa2..560c13dbc346b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ColumnTransformerVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ColumnTransformerVisitor.java @@ -379,8 +379,10 @@ public ColumnTransformer visitCaseWhenThenExpression( context.inputDataTypes.add(context.getType(caseWhenThenExpression)); context.cache.put(caseWhenThenExpression, identity); } else { - List whenList = new ArrayList<>(); - List thenList = new ArrayList<>(); + List whenList = + new ArrayList<>(caseWhenThenExpression.getWhenThenExpressions().size()); + List thenList = + new ArrayList<>(caseWhenThenExpression.getWhenThenExpressions().size()); for (WhenThenExpression whenThenExpression : caseWhenThenExpression.getWhenThenExpressions()) { whenList.add(this.process(whenThenExpression.getWhen(), context)); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/CompleteMeasurementSchemaVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/CompleteMeasurementSchemaVisitor.java index f8bb7b8dbe7bd..c1e0555b33c4d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/CompleteMeasurementSchemaVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/CompleteMeasurementSchemaVisitor.java @@ -78,7 +78,7 @@ public Expression visitTernaryExpression( public Expression visitFunctionExpression( FunctionExpression functionExpression, ISchemaTree schemaTree) { List children = functionExpression.getExpressions(); - List replacedChildren = new ArrayList<>(); + List replacedChildren = new ArrayList<>(children.size()); for (Expression child : children) { replacedChildren.add(this.process(child, schemaTree)); } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/IntermediateLayerVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/IntermediateLayerVisitor.java index ff96ab0020db2..92f351e25a419 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/IntermediateLayerVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/IntermediateLayerVisitor.java @@ -413,7 +413,8 @@ private UDFQueryTransformer getUdfTransformer( private IntermediateLayer constructUdfInputIntermediateLayer( FunctionExpression functionExpression, IntermediateLayerVisitorContext context) { - List intermediateLayers = new ArrayList<>(); + List intermediateLayers = + new ArrayList<>(functionExpression.getExpressions().size()); for (Expression expression : functionExpression.getExpressions()) { intermediateLayers.add(this.process(expression, context)); } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metedata/read/LevelTimeSeriesCountNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metedata/read/LevelTimeSeriesCountNode.java index fc964afc0295b..21a3076c2ba78 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metedata/read/LevelTimeSeriesCountNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metedata/read/LevelTimeSeriesCountNode.java @@ -30,6 +30,7 @@ import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.schemaengine.template.Template; +import com.google.common.collect.Maps; import org.apache.tsfile.utils.ReadWriteIOUtils; import jakarta.validation.constraints.NotNull; @@ -37,7 +38,6 @@ import java.io.DataOutputStream; import java.io.IOException; import java.nio.ByteBuffer; -import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Objects; @@ -150,7 +150,7 @@ public static PlanNode deserialize(ByteBuffer buffer) { SchemaFilter schemaFilter = SchemaFilter.deserialize(buffer); boolean includeSystemDatabase = ReadWriteIOUtils.readBool(buffer); int templateNum = ReadWriteIOUtils.readInt(buffer); - Map templateMap = new HashMap<>(); + Map templateMap = Maps.newHashMapWithExpectedSize(templateNum); Template template; for (int i = 0; i < templateNum; i++) { template = new Template(); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metedata/read/SeriesSchemaFetchScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metedata/read/SeriesSchemaFetchScanNode.java index f24cbbd95964b..e6a3e92665092 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metedata/read/SeriesSchemaFetchScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metedata/read/SeriesSchemaFetchScanNode.java @@ -29,12 +29,12 @@ import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.schemaengine.template.Template; +import com.google.common.collect.Maps; import org.apache.tsfile.utils.ReadWriteIOUtils; import java.io.DataOutputStream; import java.io.IOException; import java.nio.ByteBuffer; -import java.util.HashMap; import java.util.Map; /** This class defines the scan task of schema fetcher. */ @@ -130,7 +130,7 @@ public static SeriesSchemaFetchScanNode deserialize(ByteBuffer byteBuffer) { PathPatternTree patternTree = PathPatternTree.deserialize(byteBuffer); int templateNum = ReadWriteIOUtils.readInt(byteBuffer); - Map templateMap = new HashMap<>(); + Map templateMap = Maps.newHashMapWithExpectedSize(templateNum); Template template; for (int i = 0; i < templateNum; i++) { template = new Template(); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metedata/read/TimeSeriesCountNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metedata/read/TimeSeriesCountNode.java index e6ad4b0257206..b9fe8e7922b50 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metedata/read/TimeSeriesCountNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metedata/read/TimeSeriesCountNode.java @@ -30,6 +30,7 @@ import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.schemaengine.template.Template; +import com.google.common.collect.Maps; import org.apache.tsfile.utils.ReadWriteIOUtils; import jakarta.validation.constraints.NotNull; @@ -37,7 +38,6 @@ import java.io.DataOutputStream; import java.io.IOException; import java.nio.ByteBuffer; -import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Objects; @@ -143,7 +143,7 @@ public static PlanNode deserialize(ByteBuffer buffer) { boolean includeSystemDatabase = ReadWriteIOUtils.readBool(buffer); int templateNum = ReadWriteIOUtils.readInt(buffer); - Map templateMap = new HashMap<>(); + Map templateMap = Maps.newHashMapWithExpectedSize(templateNum); Template template; for (int i = 0; i < templateNum; i++) { template = new Template(); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metedata/read/TimeSeriesSchemaScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metedata/read/TimeSeriesSchemaScanNode.java index e1e7986b90e35..598108896e47b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metedata/read/TimeSeriesSchemaScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metedata/read/TimeSeriesSchemaScanNode.java @@ -29,6 +29,7 @@ import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.schemaengine.template.Template; +import com.google.common.collect.Maps; import org.apache.tsfile.utils.ReadWriteIOUtils; import jakarta.validation.constraints.NotNull; @@ -36,7 +37,6 @@ import java.io.DataOutputStream; import java.io.IOException; import java.nio.ByteBuffer; -import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Objects; @@ -121,7 +121,7 @@ public static TimeSeriesSchemaScanNode deserialize(ByteBuffer byteBuffer) { boolean isPrefixPath = ReadWriteIOUtils.readBool(byteBuffer); int templateNum = ReadWriteIOUtils.readInt(byteBuffer); - Map templateMap = new HashMap<>(); + Map templateMap = Maps.newHashMapWithExpectedSize(templateNum); Template template; for (int i = 0; i < templateNum; i++) { template = new Template(); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metedata/write/CreateAlignedTimeSeriesNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metedata/write/CreateAlignedTimeSeriesNode.java index 1fda758e77517..75dfb3026f2b9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metedata/write/CreateAlignedTimeSeriesNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metedata/write/CreateAlignedTimeSeriesNode.java @@ -151,7 +151,7 @@ public void setAttributesList(List> attributesList) { @Override public List getTagOffsets() { if (tagOffsets == null) { - tagOffsets = new ArrayList<>(); + tagOffsets = new ArrayList<>(measurements.size()); for (int i = 0; i < measurements.size(); i++) { tagOffsets.add(Long.parseLong("-1")); } @@ -217,30 +217,30 @@ public static CreateAlignedTimeSeriesNode deserialize(ByteBuffer byteBuffer) { throw new IllegalArgumentException("Can not deserialize CreateAlignedTimeSeriesNode", e); } - measurements = new ArrayList<>(); int size = byteBuffer.getInt(); + measurements = new ArrayList<>(size); for (int i = 0; i < size; i++) { measurements.add(ReadWriteIOUtils.readString(byteBuffer)); } - dataTypes = new ArrayList<>(); + dataTypes = new ArrayList<>(size); for (int i = 0; i < size; i++) { dataTypes.add(TSDataType.values()[byteBuffer.get()]); } - encodings = new ArrayList<>(); + encodings = new ArrayList<>(size); for (int i = 0; i < size; i++) { encodings.add(TSEncoding.values()[byteBuffer.get()]); } - compressors = new ArrayList<>(); + compressors = new ArrayList<>(size); for (int i = 0; i < size; i++) { compressors.add(CompressionType.deserialize(byteBuffer.get())); } byte label = byteBuffer.get(); if (label >= 0) { - aliasList = new ArrayList<>(); + aliasList = new ArrayList<>(label == 1 ? size : 0); if (label == 1) { for (int i = 0; i < size; i++) { aliasList.add(ReadWriteIOUtils.readString(byteBuffer)); @@ -250,7 +250,7 @@ public static CreateAlignedTimeSeriesNode deserialize(ByteBuffer byteBuffer) { label = byteBuffer.get(); if (label >= 0) { - tagsList = new ArrayList<>(); + tagsList = new ArrayList<>(label == 1 ? size : 0); if (label == 1) { for (int i = 0; i < size; i++) { tagsList.add(ReadWriteIOUtils.readMap(byteBuffer)); @@ -260,7 +260,7 @@ public static CreateAlignedTimeSeriesNode deserialize(ByteBuffer byteBuffer) { label = byteBuffer.get(); if (label >= 0) { - attributesList = new ArrayList<>(); + attributesList = new ArrayList<>(label == 1 ? size : 0); if (label == 1) { for (int i = 0; i < size; i++) { attributesList.add(ReadWriteIOUtils.readMap(byteBuffer)); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metedata/write/CreateMultiTimeSeriesNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metedata/write/CreateMultiTimeSeriesNode.java index 94d3e407fb586..84b4d16d87433 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metedata/write/CreateMultiTimeSeriesNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metedata/write/CreateMultiTimeSeriesNode.java @@ -30,6 +30,7 @@ import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.WritePlanNode; +import com.google.common.collect.Maps; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.exception.NotImplementedException; import org.apache.tsfile.file.metadata.enums.CompressionType; @@ -164,8 +165,8 @@ public R accept(PlanVisitor visitor, C schemaRegion) { } public static CreateMultiTimeSeriesNode deserialize(ByteBuffer byteBuffer) { - Map measurementGroupMap = new HashMap<>(); int size = byteBuffer.getInt(); + Map measurementGroupMap = Maps.newHashMapWithExpectedSize(size); PartialPath devicePath; MeasurementGroup measurementGroup; for (int i = 0; i < size; i++) { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metedata/write/MeasurementGroup.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metedata/write/MeasurementGroup.java index 9557e9c3279e8..d89c3f0fff9cf 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metedata/write/MeasurementGroup.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metedata/write/MeasurementGroup.java @@ -341,31 +341,31 @@ public void serialize(DataOutputStream stream) throws IOException { } public void deserialize(ByteBuffer byteBuffer) { - measurements = new ArrayList<>(); int size = byteBuffer.getInt(); + measurements = new ArrayList<>(size); for (int i = 0; i < size; i++) { measurements.add(ReadWriteIOUtils.readString(byteBuffer)); } measurementSet.addAll(measurements); - dataTypes = new ArrayList<>(); + dataTypes = new ArrayList<>(size); for (int i = 0; i < size; i++) { dataTypes.add(TSDataType.values()[byteBuffer.get()]); } - encodings = new ArrayList<>(); + encodings = new ArrayList<>(size); for (int i = 0; i < size; i++) { encodings.add(TSEncoding.values()[byteBuffer.get()]); } - compressors = new ArrayList<>(); + compressors = new ArrayList<>(size); for (int i = 0; i < size; i++) { compressors.add(CompressionType.deserialize(byteBuffer.get())); } byte label = byteBuffer.get(); if (label >= 0) { - aliasList = new ArrayList<>(); + aliasList = new ArrayList<>(label == 1 ? size : 0); if (label == 1) { for (int i = 0; i < size; i++) { aliasList.add(ReadWriteIOUtils.readString(byteBuffer)); @@ -375,7 +375,7 @@ public void deserialize(ByteBuffer byteBuffer) { label = byteBuffer.get(); if (label >= 0) { - tagsList = new ArrayList<>(); + tagsList = new ArrayList<>(label == 1 ? size : 0); if (label == 1) { for (int i = 0; i < size; i++) { tagsList.add(ReadWriteIOUtils.readMap(byteBuffer)); @@ -385,7 +385,7 @@ public void deserialize(ByteBuffer byteBuffer) { label = byteBuffer.get(); if (label >= 0) { - attributesList = new ArrayList<>(); + attributesList = new ArrayList<>(label == 1 ? size : 0); if (label == 1) { for (int i = 0; i < size; i++) { attributesList.add(ReadWriteIOUtils.readMap(byteBuffer)); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metedata/write/view/AlterLogicalViewNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metedata/write/view/AlterLogicalViewNode.java index 7300684ef0a48..d0f6e7dfa50af 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metedata/write/view/AlterLogicalViewNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metedata/write/view/AlterLogicalViewNode.java @@ -31,6 +31,7 @@ import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.rpc.TSStatusCode; +import com.google.common.collect.Maps; import org.apache.tsfile.exception.NotImplementedException; import org.apache.tsfile.utils.ReadWriteIOUtils; @@ -38,7 +39,6 @@ import java.io.IOException; import java.nio.ByteBuffer; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Objects; @@ -158,8 +158,9 @@ protected void serializeAttributes(final DataOutputStream stream) throws IOExcep public static AlterLogicalViewNode deserialize(final ByteBuffer byteBuffer) { // deserialize member variables - final Map viewPathToSourceMap = new HashMap<>(); final int size = byteBuffer.getInt(); + final Map viewPathToSourceMap = + Maps.newHashMapWithExpectedSize(size); PartialPath path; ViewExpression viewExpression; for (int i = 0; i < size; i++) { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metedata/write/view/CreateLogicalViewNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metedata/write/view/CreateLogicalViewNode.java index 25ba8ec288b6c..9afc5a3cea6b1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metedata/write/view/CreateLogicalViewNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metedata/write/view/CreateLogicalViewNode.java @@ -33,6 +33,7 @@ import org.apache.iotdb.db.schemaengine.schemaregion.view.visitor.GetSourcePathsVisitor; import org.apache.iotdb.db.schemaengine.schemaregion.write.req.view.ICreateLogicalViewPlan; +import com.google.common.collect.Maps; import org.apache.tsfile.exception.NotImplementedException; import org.apache.tsfile.utils.ReadWriteIOUtils; @@ -85,7 +86,7 @@ protected final Map convertTargetAndSourceListsToMa if (paths.size() != expressions.size()) { return null; } - Map result = new HashMap<>(); + Map result = Maps.newHashMapWithExpectedSize(paths.size()); for (int i = 0; i < paths.size(); i++) { result.put(paths.get(i), expressions.get(i)); } @@ -205,8 +206,8 @@ protected void serializeAttributes(DataOutputStream stream) throws IOException { public static CreateLogicalViewNode deserialize(ByteBuffer byteBuffer) { // deserialize member variables - Map viewPathToSourceMap = new HashMap<>(); int size = byteBuffer.getInt(); + Map viewPathToSourceMap = Maps.newHashMapWithExpectedSize(size); PartialPath path; ViewExpression viewExpression; for (int i = 0; i < size; i++) { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/AggregationMergeSortNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/AggregationMergeSortNode.java index a5d73bd387513..5b60c5c728a1b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/AggregationMergeSortNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/AggregationMergeSortNode.java @@ -146,7 +146,7 @@ protected void serializeAttributes(DataOutputStream stream) throws IOException { public static AggregationMergeSortNode deserialize(ByteBuffer byteBuffer) { OrderByParameter orderByParameter = OrderByParameter.deserialize(byteBuffer); int columnSize = ReadWriteIOUtils.readInt(byteBuffer); - List outputColumns = new ArrayList<>(); + List outputColumns = new ArrayList<>(columnSize); while (columnSize > 0) { outputColumns.add(ReadWriteIOUtils.readString(byteBuffer)); columnSize--; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/AggregationNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/AggregationNode.java index 83411d6267855..96f3759bc9d51 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/AggregationNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/AggregationNode.java @@ -279,7 +279,7 @@ protected void serializeAttributes(DataOutputStream stream) throws IOException { public static AggregationNode deserialize(ByteBuffer byteBuffer) { int descriptorSize = ReadWriteIOUtils.readInt(byteBuffer); - List aggregationDescriptorList = new ArrayList<>(); + List aggregationDescriptorList = new ArrayList<>(descriptorSize); while (descriptorSize > 0) { aggregationDescriptorList.add(AggregationDescriptor.deserialize(byteBuffer)); descriptorSize--; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/DeviceMergeNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/DeviceMergeNode.java index 799708d859bdb..891f7e96178fc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/DeviceMergeNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/DeviceMergeNode.java @@ -112,7 +112,7 @@ protected void serializeAttributes(DataOutputStream stream) throws IOException { public static DeviceMergeNode deserialize(ByteBuffer byteBuffer) { OrderByParameter mergeOrderParameter = OrderByParameter.deserialize(byteBuffer); int devicesSize = ReadWriteIOUtils.readInt(byteBuffer); - List devices = new ArrayList<>(); + List devices = new ArrayList<>(devicesSize); while (devicesSize > 0) { devices.add(ReadWriteIOUtils.readString(byteBuffer)); devicesSize--; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/DeviceViewNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/DeviceViewNode.java index b6114e1f12729..6a3e13ca88630 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/DeviceViewNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/DeviceViewNode.java @@ -25,13 +25,13 @@ import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.OrderByParameter; +import com.google.common.collect.Maps; import org.apache.tsfile.utils.ReadWriteIOUtils; import java.io.DataOutputStream; import java.io.IOException; import java.nio.ByteBuffer; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Objects; @@ -178,21 +178,22 @@ public static DeviceViewNode deserialize(ByteBuffer byteBuffer) { OrderByParameter mergeOrderParameter = OrderByParameter.deserialize(byteBuffer); int columnSize = ReadWriteIOUtils.readInt(byteBuffer); - List outputColumnNames = new ArrayList<>(); + List outputColumnNames = new ArrayList<>(columnSize); while (columnSize > 0) { outputColumnNames.add(ReadWriteIOUtils.readString(byteBuffer)); columnSize--; } int devicesSize = ReadWriteIOUtils.readInt(byteBuffer); - List devices = new ArrayList<>(); + List devices = new ArrayList<>(devicesSize); while (devicesSize > 0) { devices.add(ReadWriteIOUtils.readString(byteBuffer)); devicesSize--; } int mapSize = ReadWriteIOUtils.readInt(byteBuffer); - Map> deviceToMeasurementIndexesMap = new HashMap<>(mapSize); + Map> deviceToMeasurementIndexesMap = + Maps.newHashMapWithExpectedSize(mapSize); while (mapSize > 0) { String deviceName = ReadWriteIOUtils.readString(byteBuffer); int listSize = ReadWriteIOUtils.readInt(byteBuffer); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/GroupByLevelNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/GroupByLevelNode.java index e2212e8794a6e..0b2d2c7798164 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/GroupByLevelNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/GroupByLevelNode.java @@ -162,7 +162,8 @@ protected void serializeAttributes(DataOutputStream stream) throws IOException { public static GroupByLevelNode deserialize(ByteBuffer byteBuffer) { int descriptorSize = ReadWriteIOUtils.readInt(byteBuffer); - List groupByLevelDescriptors = new ArrayList<>(); + List groupByLevelDescriptors = + new ArrayList<>(descriptorSize); while (descriptorSize > 0) { groupByLevelDescriptors.add(CrossSeriesAggregationDescriptor.deserialize(byteBuffer)); descriptorSize--; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/GroupByTagNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/GroupByTagNode.java index fa6b210b63d2a..1ca33e9cb42da 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/GroupByTagNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/GroupByTagNode.java @@ -27,6 +27,7 @@ import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.GroupByTimeParameter; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; +import com.google.common.collect.Maps; import org.apache.commons.lang3.Validate; import org.apache.tsfile.utils.ReadWriteIOUtils; @@ -36,7 +37,6 @@ import java.io.IOException; import java.nio.ByteBuffer; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Map.Entry; @@ -251,11 +251,12 @@ public static GroupByTagNode deserialize(ByteBuffer byteBuffer) { // Tag values to aggregation descriptors. int numOfEntries = ReadWriteIOUtils.readInt(byteBuffer); Map, List> tagValuesToAggregationDescriptors = - new HashMap<>(); + Maps.newHashMapWithExpectedSize(numOfEntries); while (numOfEntries > 0) { List tagValues = ReadWriteIOUtils.readStringList(byteBuffer); - List aggregationDescriptors = new ArrayList<>(); int numOfAggregationDescriptors = ReadWriteIOUtils.readInt(byteBuffer); + List aggregationDescriptors = + new ArrayList<>(numOfAggregationDescriptors); while (numOfAggregationDescriptors > 0) { byte isNotNull = ReadWriteIOUtils.readByte(byteBuffer); if (isNotNull == 1) { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/MergeSortNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/MergeSortNode.java index bcc54344a3519..47b8996a94e8f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/MergeSortNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/MergeSortNode.java @@ -112,7 +112,7 @@ protected void serializeAttributes(DataOutputStream stream) throws IOException { public static MergeSortNode deserialize(ByteBuffer byteBuffer) { OrderByParameter orderByParameter = OrderByParameter.deserialize(byteBuffer); int columnSize = ReadWriteIOUtils.readInt(byteBuffer); - List outputColumns = new ArrayList<>(); + List outputColumns = new ArrayList<>(columnSize); while (columnSize > 0) { outputColumns.add(ReadWriteIOUtils.readString(byteBuffer)); columnSize--; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/ProjectNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/ProjectNode.java index 2f13ea6d6de32..e9dd32d8ecf4f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/ProjectNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/ProjectNode.java @@ -92,7 +92,7 @@ protected void serializeAttributes(DataOutputStream stream) throws IOException { public static ProjectNode deserialize(ByteBuffer byteBuffer) { int outputColumnNamesSize = ReadWriteIOUtils.readInt(byteBuffer); - List outputColumnNames = new ArrayList<>(); + List outputColumnNames = new ArrayList<>(outputColumnNamesSize); while (outputColumnNamesSize > 0) { outputColumnNames.add(ReadWriteIOUtils.readString(byteBuffer)); outputColumnNamesSize--; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/RawDataAggregationNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/RawDataAggregationNode.java index 066de467c14a8..f92c966a3c4bc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/RawDataAggregationNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/RawDataAggregationNode.java @@ -273,7 +273,7 @@ protected void serializeAttributes(DataOutputStream stream) throws IOException { public static RawDataAggregationNode deserialize(ByteBuffer byteBuffer) { int descriptorSize = ReadWriteIOUtils.readInt(byteBuffer); - List aggregationDescriptorList = new ArrayList<>(); + List aggregationDescriptorList = new ArrayList<>(descriptorSize); while (descriptorSize > 0) { aggregationDescriptorList.add(AggregationDescriptor.deserialize(byteBuffer)); descriptorSize--; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/SingleDeviceViewNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/SingleDeviceViewNode.java index 263223c5d5cde..555ecdb9942ae 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/SingleDeviceViewNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/SingleDeviceViewNode.java @@ -156,7 +156,7 @@ public static SingleDeviceViewNode deserialize(ByteBuffer byteBuffer) { List outputColumnNames = null; if (cacheOutputColumnNames) { int columnSize = ReadWriteIOUtils.readInt(byteBuffer); - outputColumnNames = new ArrayList<>(); + outputColumnNames = new ArrayList<>(columnSize); while (columnSize > 0) { outputColumnNames.add(ReadWriteIOUtils.readString(byteBuffer)); columnSize--; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/SlidingWindowAggregationNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/SlidingWindowAggregationNode.java index cf4646c9c1002..e74ed1191a537 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/SlidingWindowAggregationNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/SlidingWindowAggregationNode.java @@ -170,7 +170,7 @@ protected void serializeAttributes(DataOutputStream stream) throws IOException { public static SlidingWindowAggregationNode deserialize(ByteBuffer byteBuffer) { int descriptorSize = ReadWriteIOUtils.readInt(byteBuffer); - List aggregationDescriptorList = new ArrayList<>(); + List aggregationDescriptorList = new ArrayList<>(descriptorSize); while (descriptorSize > 0) { aggregationDescriptorList.add(AggregationDescriptor.deserialize(byteBuffer)); descriptorSize--; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/TopKNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/TopKNode.java index 27b7d34cea32b..2f75d3bbab928 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/TopKNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/TopKNode.java @@ -129,7 +129,7 @@ public static TopKNode deserialize(ByteBuffer byteBuffer) { int topValue = ReadWriteIOUtils.readInt(byteBuffer); OrderByParameter orderByParameter = OrderByParameter.deserialize(byteBuffer); int columnSize = ReadWriteIOUtils.readInt(byteBuffer); - List outputColumns = new ArrayList<>(); + List outputColumns = new ArrayList<>(columnSize); while (columnSize > 0) { outputColumns.add(ReadWriteIOUtils.readString(byteBuffer)); columnSize--; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/TransformNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/TransformNode.java index 2ca198dd2b8e2..b992fe29c34cc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/TransformNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/TransformNode.java @@ -68,7 +68,7 @@ public TransformNode( @Override public final List getOutputColumnNames() { if (outputColumnNames == null) { - outputColumnNames = new ArrayList<>(); + outputColumnNames = new ArrayList<>(outputExpressions.length); for (Expression expression : outputExpressions) { outputColumnNames.add(expression.getExpressionString()); } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/sink/IdentitySinkNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/sink/IdentitySinkNode.java index 46e7ae5aa6bed..f4ca4fa07aa22 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/sink/IdentitySinkNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/sink/IdentitySinkNode.java @@ -100,7 +100,7 @@ public String toString() { public static IdentitySinkNode deserialize(ByteBuffer byteBuffer) { int size = ReadWriteIOUtils.readInt(byteBuffer); - List downStreamChannelLocationList = new ArrayList<>(); + List downStreamChannelLocationList = new ArrayList<>(size); for (int i = 0; i < size; i++) { downStreamChannelLocationList.add(DownStreamChannelLocation.deserialize(byteBuffer)); } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/sink/ShuffleSinkNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/sink/ShuffleSinkNode.java index ec32f13b37837..e173355aef0bb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/sink/ShuffleSinkNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/sink/ShuffleSinkNode.java @@ -99,7 +99,7 @@ public String toString() { public static ShuffleSinkNode deserialize(ByteBuffer byteBuffer) { int size = ReadWriteIOUtils.readInt(byteBuffer); - List downStreamChannelLocationList = new ArrayList<>(); + List downStreamChannelLocationList = new ArrayList<>(size); for (int i = 0; i < size; i++) { downStreamChannelLocationList.add(DownStreamChannelLocation.deserialize(byteBuffer)); } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/AlignedSeriesAggregationScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/AlignedSeriesAggregationScanNode.java index d81ca0c92bd57..9cdec32cde0a5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/AlignedSeriesAggregationScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/AlignedSeriesAggregationScanNode.java @@ -248,7 +248,8 @@ protected void serializeAttributes(DataOutputStream stream) throws IOException { public static AlignedSeriesAggregationScanNode deserialize(ByteBuffer byteBuffer) { AlignedPath alignedPath = (AlignedPath) PathDeserializeUtil.deserialize(byteBuffer); int aggregateDescriptorSize = ReadWriteIOUtils.readInt(byteBuffer); - List aggregationDescriptorList = new ArrayList<>(); + List aggregationDescriptorList = + new ArrayList<>(aggregateDescriptorSize); for (int i = 0; i < aggregateDescriptorSize; i++) { aggregationDescriptorList.add(AggregationDescriptor.deserialize(byteBuffer)); } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/AlignedSeriesScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/AlignedSeriesScanNode.java index 327899e4bf622..3f8a615a105fd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/AlignedSeriesScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/AlignedSeriesScanNode.java @@ -130,7 +130,7 @@ public PlanNode clone() { @Override public List getOutputColumnNames() { - List outputColumnNames = new ArrayList<>(); + List outputColumnNames = new ArrayList<>(alignedPath.getMeasurementList().size()); String deviceName = alignedPath.getDevice(); for (String measurement : alignedPath.getMeasurementList()) { outputColumnNames.add(deviceName.concat(TsFileConstant.PATH_SEPARATOR + measurement)); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/DeviceRegionScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/DeviceRegionScanNode.java index a4db348342bf1..eba282a4bd21c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/DeviceRegionScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/DeviceRegionScanNode.java @@ -32,6 +32,7 @@ import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import com.google.common.collect.ImmutableList; +import com.google.common.collect.Maps; import org.apache.tsfile.utils.ReadWriteIOUtils; import java.io.DataOutputStream; @@ -102,7 +103,7 @@ public int allowedChildCount() { public static PlanNode deserialize(ByteBuffer buffer) { int size = ReadWriteIOUtils.readInt(buffer); - Map devicePathToContextMap = new HashMap<>(); + Map devicePathToContextMap = Maps.newHashMapWithExpectedSize(size); for (int i = 0; i < size; i++) { PartialPath path = (PartialPath) PathDeserializeUtil.deserialize(buffer); devicePathToContextMap.put(path, DeviceContext.deserialize(buffer)); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesAggregationScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesAggregationScanNode.java index 54a186b98ce57..8178cc19b570b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesAggregationScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesAggregationScanNode.java @@ -238,7 +238,8 @@ protected void serializeAttributes(DataOutputStream stream) throws IOException { public static SeriesAggregationScanNode deserialize(ByteBuffer byteBuffer) { MeasurementPath partialPath = (MeasurementPath) PathDeserializeUtil.deserialize(byteBuffer); int aggregateDescriptorSize = ReadWriteIOUtils.readInt(byteBuffer); - List aggregationDescriptorList = new ArrayList<>(); + List aggregationDescriptorList = + new ArrayList<>(aggregateDescriptorSize); for (int i = 0; i < aggregateDescriptorSize; i++) { aggregationDescriptorList.add(AggregationDescriptor.deserialize(byteBuffer)); } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/TimeseriesRegionScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/TimeseriesRegionScanNode.java index d905c8eca2c4e..2e2e7cb2c237c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/TimeseriesRegionScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/TimeseriesRegionScanNode.java @@ -35,6 +35,7 @@ import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import com.google.common.collect.ImmutableList; +import com.google.common.collect.Maps; import org.apache.tsfile.utils.ReadWriteIOUtils; import org.apache.tsfile.write.schema.IMeasurementSchema; import org.apache.tsfile.write.schema.MeasurementSchema; @@ -132,7 +133,7 @@ public int allowedChildCount() { public static PlanNode deserialize(ByteBuffer buffer) { int size = ReadWriteIOUtils.readInt(buffer); Map>> deviceToTimeseriesSchemaInfo = - new HashMap<>(); + Maps.newHashMapWithExpectedSize(size); for (int i = 0; i < size; i++) { int nodeSize = ReadWriteIOUtils.readInt(buffer); @@ -143,11 +144,12 @@ public static PlanNode deserialize(ByteBuffer buffer) { PartialPath devicePath = new PartialPath(nodes); int pathSize = ReadWriteIOUtils.readInt(buffer); - Map> measurementToSchemaInfo = new HashMap<>(); + Map> measurementToSchemaInfo = + Maps.newHashMapWithExpectedSize(pathSize); for (int j = 0; j < pathSize; j++) { PartialPath path = deserializePartialPath(nodes, buffer); int schemaSize = ReadWriteIOUtils.readInt(buffer); - List schemaInfos = new ArrayList<>(); + List schemaInfos = new ArrayList<>(schemaSize); for (int k = 0; k < schemaSize; k++) { schemaInfos.add(TimeseriesContext.deserialize(buffer)); } @@ -311,12 +313,12 @@ private static PartialPath deserializePartialPath(String[] deviceNodes, ByteBuff return new MeasurementPath(newNodes); } else { int size = ReadWriteIOUtils.readInt(buffer); - List measurements = new ArrayList<>(); - List schemaList = new ArrayList<>(); + List measurements = new ArrayList<>(size); for (int i = 0; i < size; i++) { measurements.add(ReadWriteIOUtils.readString(buffer)); } size = ReadWriteIOUtils.readInt(buffer); + List schemaList = new ArrayList<>(size); for (int i = 0; i < size; i++) { schemaList.add(MeasurementSchema.deserializeFrom(buffer)); } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertMultiTabletsNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertMultiTabletsNode.java index 773881e398e74..0f48c68353378 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertMultiTabletsNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertMultiTabletsNode.java @@ -204,10 +204,9 @@ public List getOutputColumnNames() { public static InsertMultiTabletsNode deserialize(ByteBuffer byteBuffer) { PlanNodeId planNodeId; - List insertTabletNodeList = new ArrayList<>(); - List parentIndex = new ArrayList<>(); - int size = byteBuffer.getInt(); + List insertTabletNodeList = new ArrayList<>(size); + List parentIndex = new ArrayList<>(size); for (int i = 0; i < size; i++) { InsertTabletNode insertTabletNode = new InsertTabletNode(new PlanNodeId("")); insertTabletNode.subDeserialize(byteBuffer); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertRowsNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertRowsNode.java index 7ec81d626df3f..5b7e1fadf9890 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertRowsNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertRowsNode.java @@ -193,10 +193,9 @@ public List getOutputColumnNames() { public static InsertRowsNode deserialize(ByteBuffer byteBuffer) { PlanNodeId planNodeId; - List insertRowNodeList = new ArrayList<>(); - List insertRowNodeIndex = new ArrayList<>(); - int size = byteBuffer.getInt(); + List insertRowNodeList = new ArrayList<>(size); + List insertRowNodeIndex = new ArrayList<>(size); for (int i = 0; i < size; i++) { InsertRowNode insertRowNode = new InsertRowNode(new PlanNodeId("")); insertRowNode.subDeserialize(byteBuffer); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/model/ModelInferenceDescriptor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/model/ModelInferenceDescriptor.java index bf5f391d9e475..21937fbb9b2cc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/model/ModelInferenceDescriptor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/model/ModelInferenceDescriptor.java @@ -23,13 +23,13 @@ import org.apache.iotdb.commons.model.ModelInformation; import org.apache.iotdb.db.queryengine.execution.operator.window.ainode.InferenceWindowParameter; +import com.google.common.collect.Maps; import org.apache.tsfile.utils.ReadWriteIOUtils; import java.io.DataOutputStream; import java.io.IOException; import java.nio.ByteBuffer; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Objects; @@ -55,7 +55,7 @@ private ModelInferenceDescriptor(ByteBuffer buffer) { if (outputColumnNamesSize == 0) { this.outputColumnNames = null; } else { - this.outputColumnNames = new ArrayList<>(); + this.outputColumnNames = new ArrayList<>(outputColumnNamesSize); for (int i = 0; i < outputColumnNamesSize; i++) { this.outputColumnNames.add(ReadWriteIOUtils.readString(buffer)); } @@ -70,7 +70,7 @@ private ModelInferenceDescriptor(ByteBuffer buffer) { if (inferenceAttributesSize == 0) { this.inferenceAttributes = null; } else { - this.inferenceAttributes = new HashMap<>(); + this.inferenceAttributes = Maps.newHashMapWithExpectedSize(inferenceAttributesSize); for (int i = 0; i < inferenceAttributesSize; i++) { this.inferenceAttributes.put( ReadWriteIOUtils.readString(buffer), ReadWriteIOUtils.readString(buffer)); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/CaseWhenThenColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/CaseWhenThenColumnTransformer.java index 94156d1c71b21..7e1d5bc95e192 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/CaseWhenThenColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/CaseWhenThenColumnTransformer.java @@ -47,7 +47,7 @@ public CaseWhenThenColumnTransformer( Validate.isTrue( whenTransformers.size() == thenTransformers.size(), "the size between whenTransformers and thenTransformers needs to be same"); - this.whenThenTransformers = new ArrayList<>(); + this.whenThenTransformers = new ArrayList<>(whenTransformers.size()); for (int i = 0; i < whenTransformers.size(); i++) { this.whenThenTransformers.add(new Pair<>(whenTransformers.get(i), thenTransformers.get(i))); } @@ -83,8 +83,8 @@ private void writeToColumnBuilder( @Override protected void evaluate() { - List whenColumnList = new ArrayList<>(); - List thenColumnList = new ArrayList<>(); + List whenColumnList = new ArrayList<>(whenThenTransformers.size()); + List thenColumnList = new ArrayList<>(whenThenTransformers.size()); for (Pair whenThenTransformer : whenThenTransformers) { whenThenTransformer.left.tryEvaluate(); whenThenTransformer.right.tryEvaluate(); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/logfile/visitor/SchemaRegionPlanDeserializer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/logfile/visitor/SchemaRegionPlanDeserializer.java index 4c8c3120e4119..c246d2efdbefb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/logfile/visitor/SchemaRegionPlanDeserializer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/logfile/visitor/SchemaRegionPlanDeserializer.java @@ -46,6 +46,7 @@ import org.apache.iotdb.db.schemaengine.schemaregion.write.req.view.IPreDeleteLogicalViewPlan; import org.apache.iotdb.db.schemaengine.schemaregion.write.req.view.IRollbackPreDeleteLogicalViewPlan; +import com.google.common.collect.Maps; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.file.metadata.enums.CompressionType; import org.apache.tsfile.file.metadata.enums.TSEncoding; @@ -155,31 +156,31 @@ public ISchemaRegionPlan visitCreateAlignedTimeSeries( } int size = ReadWriteIOUtils.readInt(buffer); - List measurements = new ArrayList<>(); + List measurements = new ArrayList<>(size); for (int i = 0; i < size; i++) { measurements.add(ReadWriteIOUtils.readString(buffer)); } createAlignedTimeSeriesPlan.setMeasurements(measurements); - List dataTypes = new ArrayList<>(); + List dataTypes = new ArrayList<>(size); for (int i = 0; i < size; i++) { dataTypes.add(TSDataType.deserialize(buffer.get())); } createAlignedTimeSeriesPlan.setDataTypes(dataTypes); - List encodings = new ArrayList<>(); + List encodings = new ArrayList<>(size); for (int i = 0; i < size; i++) { encodings.add(TSEncoding.deserialize(buffer.get())); } createAlignedTimeSeriesPlan.setEncodings(encodings); - List compressors = new ArrayList<>(); + List compressors = new ArrayList<>(size); for (int i = 0; i < size; i++) { compressors.add(CompressionType.deserialize(buffer.get())); } createAlignedTimeSeriesPlan.setCompressors(compressors); - List tagOffsets = new ArrayList<>(); + List tagOffsets = new ArrayList<>(size); for (int i = 0; i < size; i++) { tagOffsets.add(buffer.getLong()); } @@ -187,7 +188,7 @@ public ISchemaRegionPlan visitCreateAlignedTimeSeries( // alias if (buffer.get() == 1) { - List aliasList = new ArrayList<>(); + List aliasList = new ArrayList<>(size); for (int i = 0; i < size; i++) { aliasList.add(ReadWriteIOUtils.readString(buffer)); } @@ -196,7 +197,7 @@ public ISchemaRegionPlan visitCreateAlignedTimeSeries( // tags if (buffer.get() == 1) { - List> tagsList = new ArrayList<>(); + List> tagsList = new ArrayList<>(size); for (int i = 0; i < size; i++) { tagsList.add(ReadWriteIOUtils.readMap(buffer)); } @@ -205,7 +206,7 @@ public ISchemaRegionPlan visitCreateAlignedTimeSeries( // attributes if (buffer.get() == 1) { - List> attributesList = new ArrayList<>(); + List> attributesList = new ArrayList<>(size); for (int i = 0; i < size; i++) { attributesList.add(ReadWriteIOUtils.readMap(buffer)); } @@ -267,7 +268,7 @@ public ISchemaRegionPlan visitDeleteTimeSeries( int pathNumber = buffer.getInt(); try { - List deletePathList = new ArrayList<>(); + List deletePathList = new ArrayList<>(pathNumber); for (int i = 0; i < pathNumber; i++) { deletePathList.add(new PartialPath(ReadWriteIOUtils.readString(buffer))); } @@ -349,7 +350,8 @@ public ISchemaRegionPlan visitCreateLogicalView( ICreateLogicalViewPlan createLogicalViewPlan, ByteBuffer buffer) { int viewSize = buffer.getInt(); - Map viewPathToSourceMap = new HashMap<>(); + Map viewPathToSourceMap = + Maps.newHashMapWithExpectedSize(viewSize); for (int i = 0; i < viewSize; i++) { int byteSizeOfPath = buffer.getInt(); byte[] bytesOfPath = new byte[byteSizeOfPath]; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/memtable/AbstractMemTable.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/memtable/AbstractMemTable.java index 1b374ae40c5ec..906fb97b62d4b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/memtable/AbstractMemTable.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/memtable/AbstractMemTable.java @@ -190,7 +190,8 @@ public int insert(InsertRowNode insertRowNode) { String[] measurements = insertRowNode.getMeasurements(); Object[] values = insertRowNode.getValues(); - List schemaList = new ArrayList<>(); + List schemaList = + new ArrayList<>(measurements == null ? 0 : measurements.length); List dataTypes = new ArrayList<>(); int pointsInserted = 0; for (int i = 0; measurements != null && i < measurements.length; i++) { @@ -222,7 +223,8 @@ public int insertAlignedRow(InsertRowNode insertRowNode) { String[] measurements = insertRowNode.getMeasurements(); Object[] values = insertRowNode.getValues(); - List schemaList = new ArrayList<>(); + List schemaList = + new ArrayList<>(measurements == null ? 0 : measurements.length); List dataTypes = new ArrayList<>(); int pointsInserted = 0; for (int i = 0; measurements != null && i < measurements.length; i++) { @@ -333,7 +335,11 @@ public void writeAlignedRow( } public void writeTabletNode(InsertTabletNode insertTabletNode, int start, int end) { - List schemaList = new ArrayList<>(); + List schemaList = + new ArrayList<>( + insertTabletNode.getMeasurements() == null + ? 0 + : insertTabletNode.getMeasurements().length); for (int i = 0; insertTabletNode.getMeasurements() != null && i < insertTabletNode.getMeasurements().length; i++) { @@ -356,7 +362,11 @@ public void writeTabletNode(InsertTabletNode insertTabletNode, int start, int en public void writeAlignedTablet(InsertTabletNode insertTabletNode, int start, int end) { - List schemaList = new ArrayList<>(); + List schemaList = + new ArrayList<>( + insertTabletNode.getMeasurements() == null + ? 0 + : insertTabletNode.getMeasurements().length); for (int i = 0; insertTabletNode.getMeasurements() != null && i < insertTabletNode.getMeasurements().length; i++) { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/memtable/AlignedWritableMemChunk.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/memtable/AlignedWritableMemChunk.java index f0a03964840a2..2c53a3ca916ea 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/memtable/AlignedWritableMemChunk.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/memtable/AlignedWritableMemChunk.java @@ -1040,7 +1040,7 @@ public static AlignedWritableMemChunk deserialize(DataInputStream stream) throws schemaList.add(schema); } int sortedListSize = stream.readInt(); - List sortedList = new ArrayList<>(); + List sortedList = new ArrayList<>(sortedListSize); for (int i = 0; i < sortedListSize; i++) { AlignedTVList tvList = AlignedTVList.deserialize(stream); sortedList.add(tvList); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/memtable/WritableMemChunk.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/memtable/WritableMemChunk.java index 544819c03915c..30bfdb41a422c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/memtable/WritableMemChunk.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/memtable/WritableMemChunk.java @@ -526,7 +526,7 @@ public static WritableMemChunk deserialize(DataInputStream stream) throws IOExce WritableMemChunk memChunk = new WritableMemChunk(); memChunk.schema = MeasurementSchema.deserializeFrom(stream); int sortedListSize = stream.readInt(); - memChunk.sortedList = new ArrayList<>(); + memChunk.sortedList = new ArrayList<>(sortedListSize); for (int i = 0; i < sortedListSize; i++) { TVList tvList = TVList.deserialize(stream); memChunk.sortedList.add(tvList); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/tsfile/timeindex/DeviceTimeIndex.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/tsfile/timeindex/DeviceTimeIndex.java index 2e492647073b0..45db903aac4de 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/tsfile/timeindex/DeviceTimeIndex.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/tsfile/timeindex/DeviceTimeIndex.java @@ -27,6 +27,7 @@ import org.apache.iotdb.db.queryengine.plan.analyze.cache.schema.DataNodeDevicePathCache; import org.apache.iotdb.db.storageengine.dataregion.tsfile.TsFileResource; +import com.google.common.collect.Sets; import com.google.common.util.concurrent.RateLimiter; import org.apache.tsfile.file.metadata.IDeviceID; import org.apache.tsfile.file.metadata.PlainDeviceID; @@ -42,7 +43,6 @@ import java.io.OutputStream; import java.nio.ByteBuffer; import java.util.Arrays; -import java.util.HashSet; import java.util.Map; import java.util.Map.Entry; import java.util.Optional; @@ -198,7 +198,7 @@ public long[] getStartTimes() { public static Set getDevices(InputStream inputStream) throws IOException { int deviceNum = ReadWriteIOUtils.readInt(inputStream); ReadWriteIOUtils.skip(inputStream, 2L * deviceNum * ReadWriteIOUtils.LONG_LEN); - Set devices = new HashSet<>(); + Set devices = Sets.newHashSetWithExpectedSize(deviceNum); for (int i = 0; i < deviceNum; i++) { String path = DataNodeDevicePathCache.getInstance() diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/load/splitter/AlignedChunkData.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/load/splitter/AlignedChunkData.java index 1395eaa420dcc..fce2f0a9062ed 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/load/splitter/AlignedChunkData.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/load/splitter/AlignedChunkData.java @@ -451,7 +451,7 @@ public static AlignedChunkData deserialize(final InputStream stream) final long dataSize = ReadWriteIOUtils.readLong(stream); final boolean needDecodeChunk = ReadWriteIOUtils.readBool(stream); final int chunkHeaderListSize = ReadWriteIOUtils.readInt(stream); - final List chunkHeaderList = new ArrayList<>(); + final List chunkHeaderList = new ArrayList<>(chunkHeaderListSize); for (int i = 0; i < chunkHeaderListSize; i++) { final byte chunkType = ReadWriteIOUtils.readByte(stream); ChunkHeader chunkHeader = ChunkHeader.deserializeFrom(stream, chunkType); @@ -459,7 +459,7 @@ public static AlignedChunkData deserialize(final InputStream stream) chunkHeader.setMeasurementID(MEASUREMENT_ID_CACHE.get(measurementID, m -> m)); chunkHeaderList.add(chunkHeader); } - final List pageNumbers = new ArrayList<>(); + final List pageNumbers = new ArrayList<>(needDecodeChunk ? chunkHeaderListSize : 0); if (needDecodeChunk) { for (int i = 0; i < chunkHeaderListSize; i++) { pageNumbers.add(ReadWriteIOUtils.readInt(stream)); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/rescon/disk/strategy/RandomOnDiskUsableSpaceStrategy.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/rescon/disk/strategy/RandomOnDiskUsableSpaceStrategy.java index cf4b911c0bbd0..8cc6eabd8cd71 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/rescon/disk/strategy/RandomOnDiskUsableSpaceStrategy.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/rescon/disk/strategy/RandomOnDiskUsableSpaceStrategy.java @@ -55,7 +55,7 @@ public int nextFolderIndex() throws DiskSpaceInsufficientException { /** get space list of all folders. */ public List getFolderUsableSpaceList() { - List spaceList = new ArrayList<>(); + List spaceList = new ArrayList<>(folders.size()); for (int i = 0; i < folders.size(); i++) { String folder = folders.get(i); spaceList.add(JVMCommonUtils.getUsableSpace(folder)); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/sort/DiskSpiller.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/sort/DiskSpiller.java index c27b176bd9fe3..1999d220e1c2b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/sort/DiskSpiller.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/sort/DiskSpiller.java @@ -142,7 +142,7 @@ public boolean hasSpilledData() { } private List getFilePaths() { - List filePaths = new ArrayList<>(); + List filePaths = new ArrayList<>(fileIndex); for (int i = 0; i < fileIndex; i++) { filePaths.add(filePrefix + String.format("%05d", i) + FILE_SUFFIX); } @@ -151,7 +151,7 @@ private List getFilePaths() { public List getReaders(SortBufferManager sortBufferManager) throws IoTDBException { List filePaths = getFilePaths(); - List sortReaders = new ArrayList<>(); + List sortReaders = new ArrayList<>(filePaths.size()); try { for (String filePath : filePaths) { sortReaders.add(new FileSpillerReader(filePath, sortBufferManager, serde)); diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/auth/entity/Role.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/auth/entity/Role.java index 581df286ecd9e..7a18d975e3978 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/auth/entity/Role.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/auth/entity/Role.java @@ -22,6 +22,8 @@ import org.apache.iotdb.commons.utils.AuthUtils; import org.apache.iotdb.commons.utils.SerializeUtils; +import com.google.common.collect.Sets; + import java.io.ByteArrayOutputStream; import java.io.DataOutputStream; import java.io.IOException; @@ -230,12 +232,12 @@ public ByteBuffer serialize() { public void deserialize(ByteBuffer buffer) { name = SerializeUtils.deserializeString(buffer); int sysPrivilegeSize = buffer.getInt(); - sysPrivilegeSet = new HashSet<>(); + sysPrivilegeSet = Sets.newHashSetWithExpectedSize(sysPrivilegeSize); for (int i = 0; i < sysPrivilegeSize; i++) { sysPrivilegeSet.add(buffer.getInt()); } int sysPriGrantOptSize = buffer.getInt(); - sysPriGrantOpt = new HashSet<>(); + sysPriGrantOpt = Sets.newHashSetWithExpectedSize(sysPriGrantOptSize); for (int i = 0; i < sysPriGrantOptSize; i++) { sysPriGrantOpt.add(buffer.getInt()); } diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/auth/entity/User.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/auth/entity/User.java index 2b0b6eb304a3d..b037709cdbf9c 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/auth/entity/User.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/auth/entity/User.java @@ -20,12 +20,13 @@ import org.apache.iotdb.commons.utils.SerializeUtils; +import com.google.common.collect.Sets; + import java.io.ByteArrayOutputStream; import java.io.DataOutputStream; import java.io.IOException; import java.nio.ByteBuffer; import java.util.ArrayList; -import java.util.HashSet; import java.util.List; import java.util.Objects; import java.util.Set; @@ -163,13 +164,13 @@ public void deserialize(ByteBuffer buffer) { super.setName(SerializeUtils.deserializeString(buffer)); password = SerializeUtils.deserializeString(buffer); int systemPriSize = buffer.getInt(); - Set sysPri = new HashSet<>(); + Set sysPri = Sets.newHashSetWithExpectedSize(systemPriSize); for (int i = 0; i < systemPriSize; i++) { sysPri.add(buffer.getInt()); } super.setSysPrivilegeSet(sysPri); int sysPriGrantOptSize = buffer.getInt(); - Set grantOpt = new HashSet<>(); + Set grantOpt = Sets.newHashSetWithExpectedSize(sysPriGrantOptSize); for (int i = 0; i < sysPriGrantOptSize; i++) { grantOpt.add(buffer.getInt()); } diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/auth/user/LocalFileUserAccessor.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/auth/user/LocalFileUserAccessor.java index 03a075936778a..52fe8b7a04276 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/auth/user/LocalFileUserAccessor.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/auth/user/LocalFileUserAccessor.java @@ -137,7 +137,7 @@ public User loadUser(String username) throws IOException { if (oldVersion) { IOUtils.loadRolePrivilege(user, dataInputStream, STRING_ENCODING, strBufferLocal); int roleNum = dataInputStream.readInt(); - List roleList = new ArrayList<>(); + List roleList = new ArrayList<>(roleNum); for (int i = 0; i < roleNum; i++) { String roleName = IOUtils.readString(dataInputStream, STRING_ENCODING, strBufferLocal); roleList.add(roleName); diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/consensus/index/impl/StateProgressIndex.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/consensus/index/impl/StateProgressIndex.java index 96a11989e7f09..9081c6786c226 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/consensus/index/impl/StateProgressIndex.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/consensus/index/impl/StateProgressIndex.java @@ -23,6 +23,7 @@ import org.apache.iotdb.commons.consensus.index.ProgressIndexType; import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Maps; import org.apache.tsfile.utils.Binary; import org.apache.tsfile.utils.RamUsageEstimator; import org.apache.tsfile.utils.ReadWriteIOUtils; @@ -213,8 +214,8 @@ public TotalOrderSumTuple getTotalOrderSumTuple() { public static StateProgressIndex deserializeFrom(ByteBuffer byteBuffer) { final long version = ReadWriteIOUtils.readLong(byteBuffer); - final Map state = new HashMap<>(); final int size = ReadWriteIOUtils.readInt(byteBuffer); + final Map state = Maps.newHashMapWithExpectedSize(size); for (int i = 0; i < size; ++i) { final String key = ReadWriteIOUtils.readString(byteBuffer); final Binary value = ReadWriteIOUtils.readBinary(byteBuffer); @@ -229,8 +230,8 @@ public static StateProgressIndex deserializeFrom(ByteBuffer byteBuffer) { public static StateProgressIndex deserializeFrom(InputStream stream) throws IOException { final long version = ReadWriteIOUtils.readLong(stream); - final Map state = new HashMap<>(); final int size = ReadWriteIOUtils.readInt(stream); + final Map state = Maps.newHashMapWithExpectedSize(size); for (int i = 0; i < size; ++i) { final String key = ReadWriteIOUtils.readString(stream); final Binary value = ReadWriteIOUtils.readBinary(stream); diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/model/ModelHyperparameter.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/model/ModelHyperparameter.java index 5f06f2dcabd35..77b8b0b7aaf7b 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/model/ModelHyperparameter.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/model/ModelHyperparameter.java @@ -56,7 +56,7 @@ public String toString() { } public List toStringList() { - List resultList = new ArrayList<>(); + List resultList = new ArrayList<>(keyValueMap.size()); for (Map.Entry keyValuePair : keyValueMap.entrySet()) { resultList.add(keyValuePair.getKey() + "=" + keyValuePair.getValue()); } diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/path/AlignedPath.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/path/AlignedPath.java index 846dfa6a7d03d..eb91584d42c07 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/path/AlignedPath.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/path/AlignedPath.java @@ -345,14 +345,14 @@ public static AlignedPath deserialize(ByteBuffer byteBuffer) { PartialPath partialPath = PartialPath.deserialize(byteBuffer); AlignedPath alignedPath = new AlignedPath(); int measurementSize = ReadWriteIOUtils.readInt(byteBuffer); - List measurements = new ArrayList<>(); + List measurements = new ArrayList<>(measurementSize); for (int i = 0; i < measurementSize; i++) { measurements.add(ReadWriteIOUtils.readString(byteBuffer)); } int measurementSchemaSize = ReadWriteIOUtils.readInt(byteBuffer); List measurementSchemas = null; if (measurementSchemaSize != -1) { - measurementSchemas = new ArrayList<>(); + measurementSchemas = new ArrayList<>(measurementSchemaSize); for (int i = 0; i < measurementSchemaSize; i++) { byte type = ReadWriteIOUtils.readByte(byteBuffer); if (type == 0) { diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/path/PartialPath.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/path/PartialPath.java index 354724bd48749..d9d940bfad141 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/path/PartialPath.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/path/PartialPath.java @@ -870,7 +870,7 @@ public Path toTSFilePath() { } public static List toStringList(List pathList) { - List ret = new ArrayList<>(); + List ret = new ArrayList<>(pathList.size()); for (PartialPath path : pathList) { ret.add(path.getFullPath()); } diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/path/PathPatternNode.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/path/PathPatternNode.java index 3dd274b8c3704..c7f778e18966b 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/path/PathPatternNode.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/path/PathPatternNode.java @@ -19,6 +19,7 @@ package org.apache.iotdb.commons.path; +import com.google.common.collect.Sets; import org.apache.tsfile.utils.Accountable; import org.apache.tsfile.utils.PublicBAOS; import org.apache.tsfile.utils.RamUsageEstimator; @@ -256,7 +257,7 @@ public static > PathPatternNode int typeOrValueSize = ReadWriteIOUtils.readInt(buffer); if (typeOrValueSize >= 0) { // measurement node in PatternTreeMap - Set valueSet = new HashSet<>(); + Set valueSet = Sets.newHashSetWithExpectedSize(typeOrValueSize); for (int i = 0; i < typeOrValueSize; i++) { valueSet.add(serializer.read(buffer)); } diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/sink/payload/pipeconsensus/request/PipeConsensusTransferFileSealWithModReq.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/sink/payload/pipeconsensus/request/PipeConsensusTransferFileSealWithModReq.java index a5e2801668c58..6000c1573041f 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/sink/payload/pipeconsensus/request/PipeConsensusTransferFileSealWithModReq.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/sink/payload/pipeconsensus/request/PipeConsensusTransferFileSealWithModReq.java @@ -24,6 +24,7 @@ import org.apache.iotdb.consensus.pipe.thrift.TCommitId; import org.apache.iotdb.consensus.pipe.thrift.TPipeConsensusTransferReq; +import com.google.common.collect.Maps; import org.apache.tsfile.utils.PublicBAOS; import org.apache.tsfile.utils.ReadWriteIOUtils; @@ -31,7 +32,6 @@ import java.io.IOException; import java.nio.ByteBuffer; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Objects; @@ -117,26 +117,26 @@ protected PipeConsensusTransferFileSealWithModReq convertToTPipeConsensusTransfe public PipeConsensusTransferFileSealWithModReq translateFromTPipeConsensusTransferReq( TPipeConsensusTransferReq req) { - fileNames = new ArrayList<>(); int size = ReadWriteIOUtils.readInt(req.body); + fileNames = new ArrayList<>(size); for (int i = 0; i < size; ++i) { fileNames.add(ReadWriteIOUtils.readString(req.body)); } - fileLengths = new ArrayList<>(); size = ReadWriteIOUtils.readInt(req.body); + fileLengths = new ArrayList<>(size); for (int i = 0; i < size; ++i) { fileLengths.add(ReadWriteIOUtils.readLong(req.body)); } - pointCounts = new ArrayList<>(); size = ReadWriteIOUtils.readInt(req.body); + pointCounts = new ArrayList<>(size); for (int i = 0; i < size; ++i) { pointCounts.add(ReadWriteIOUtils.readLong(req.body)); } - parameters = new HashMap<>(); size = ReadWriteIOUtils.readInt(req.body); + parameters = Maps.newHashMapWithExpectedSize(size); for (int i = 0; i < size; ++i) { final String key = ReadWriteIOUtils.readString(req.body); final String value = ReadWriteIOUtils.readString(req.body); diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/sink/payload/thrift/request/PipeTransferFileSealReqV2.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/sink/payload/thrift/request/PipeTransferFileSealReqV2.java index 976987d72fa63..cbf8ed70fc97e 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/sink/payload/thrift/request/PipeTransferFileSealReqV2.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/sink/payload/thrift/request/PipeTransferFileSealReqV2.java @@ -21,6 +21,7 @@ import org.apache.iotdb.service.rpc.thrift.TPipeTransferReq; +import com.google.common.collect.Maps; import org.apache.tsfile.utils.PublicBAOS; import org.apache.tsfile.utils.ReadWriteIOUtils; @@ -28,7 +29,6 @@ import java.io.IOException; import java.nio.ByteBuffer; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Objects; @@ -87,20 +87,20 @@ protected PipeTransferFileSealReqV2 convertToTPipeTransferReq( } public PipeTransferFileSealReqV2 translateFromTPipeTransferReq(TPipeTransferReq req) { - fileNames = new ArrayList<>(); int size = ReadWriteIOUtils.readInt(req.body); + fileNames = new ArrayList<>(size); for (int i = 0; i < size; ++i) { fileNames.add(ReadWriteIOUtils.readString(req.body)); } - fileLengths = new ArrayList<>(); size = ReadWriteIOUtils.readInt(req.body); + fileLengths = new ArrayList<>(size); for (int i = 0; i < size; ++i) { fileLengths.add(ReadWriteIOUtils.readLong(req.body)); } - parameters = new HashMap<>(); size = ReadWriteIOUtils.readInt(req.body); + parameters = Maps.newHashMapWithExpectedSize(size); for (int i = 0; i < size; ++i) { final String key = ReadWriteIOUtils.readString(req.body); final String value = ReadWriteIOUtils.readString(req.body); diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/sink/payload/thrift/request/PipeTransferHandshakeV2Req.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/sink/payload/thrift/request/PipeTransferHandshakeV2Req.java index 9a81d844e3f43..eeca8536295ad 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/sink/payload/thrift/request/PipeTransferHandshakeV2Req.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/sink/payload/thrift/request/PipeTransferHandshakeV2Req.java @@ -21,13 +21,13 @@ import org.apache.iotdb.service.rpc.thrift.TPipeTransferReq; +import com.google.common.collect.Maps; import org.apache.tsfile.utils.PublicBAOS; import org.apache.tsfile.utils.ReadWriteIOUtils; import java.io.DataOutputStream; import java.io.IOException; import java.nio.ByteBuffer; -import java.util.HashMap; import java.util.Map; import java.util.Objects; @@ -63,8 +63,8 @@ protected final PipeTransferHandshakeV2Req convertToTPipeTransferReq(Map params = new HashMap<>(); final int size = ReadWriteIOUtils.readInt(transferReq.body); + Map params = Maps.newHashMapWithExpectedSize(size); for (int i = 0; i < size; ++i) { final String key = ReadWriteIOUtils.readString(transferReq.body); final String value = ReadWriteIOUtils.readString(transferReq.body); diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/schema/view/viewExpression/multi/FunctionViewExpression.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/schema/view/viewExpression/multi/FunctionViewExpression.java index eace434771788..596fe3ab58784 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/schema/view/viewExpression/multi/FunctionViewExpression.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/schema/view/viewExpression/multi/FunctionViewExpression.java @@ -81,7 +81,7 @@ public FunctionViewExpression(ByteBuffer byteBuffer) { functionName = ReadWriteIOUtils.readString(byteBuffer); functionAttributesKeyValueList = ReadWriteIOUtils.readStringList(byteBuffer); int expressionSize = ReadWriteIOUtils.readInt(byteBuffer); - expressions = new ArrayList<>(); + expressions = new ArrayList<>(expressionSize); for (int i = 0; i < expressionSize; i++) { expressions.add(ViewExpression.deserialize(byteBuffer)); } @@ -92,7 +92,7 @@ public FunctionViewExpression(InputStream inputStream) { functionName = ReadWriteIOUtils.readString(inputStream); functionAttributesKeyValueList = ReadWriteIOUtils.readStringList(inputStream); int expressionSize = ReadWriteIOUtils.readInt(inputStream); - expressions = new ArrayList<>(); + expressions = new ArrayList<>(expressionSize); for (int i = 0; i < expressionSize; i++) { expressions.add(ViewExpression.deserialize(inputStream)); } diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/utils/AuthUtils.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/utils/AuthUtils.java index 20c991d470ad6..37d8af73c6e11 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/utils/AuthUtils.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/utils/AuthUtils.java @@ -465,7 +465,7 @@ public static ByteBuffer serializePartialPathList(List paths) { public static List deserializePartialPathList(ByteBuffer buffer) { int size = buffer.getInt(); - List paths = new ArrayList<>(); + List paths = new ArrayList<>(size); for (int i = 0; i < size; i++) { paths.add((PartialPath) PathDeserializeUtil.deserialize(buffer)); } diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/utils/BasicStructureSerDeUtil.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/utils/BasicStructureSerDeUtil.java index 7d6ff521a8727..bba21ef2f4acf 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/utils/BasicStructureSerDeUtil.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/utils/BasicStructureSerDeUtil.java @@ -19,11 +19,12 @@ package org.apache.iotdb.commons.utils; +import com.google.common.collect.Maps; + import java.io.DataOutputStream; import java.io.IOException; import java.nio.ByteBuffer; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; import java.util.Map; @@ -52,7 +53,7 @@ public static List readStringList(ByteBuffer buffer) { if (size < 0) { return null; } - List stringList = new ArrayList<>(); + List stringList = new ArrayList<>(size); for (int i = 0; i < size; i++) { stringList.add(readString(buffer)); } @@ -215,7 +216,7 @@ public static Map readMap(ByteBuffer buffer) { if (length == -1) { return null; } - Map map = new HashMap<>(length); + Map map = Maps.newHashMapWithExpectedSize(length); for (int i = 0; i < length; i++) { // key String key = readString(buffer); @@ -261,13 +262,13 @@ public static Map> readStringMapLists(ByteBuffer buffer) { if (length == -1) { return null; } - Map> map = new HashMap<>(length); + Map> map = Maps.newHashMapWithExpectedSize(length); for (int i = 0; i < length; i++) { // key String key = readString(buffer); // value int listSize = readInt(buffer); - List valueList = new ArrayList<>(); + List valueList = new ArrayList<>(listSize); for (int j = 0; j < listSize; j++) { String value = readString(buffer); valueList.add(value); @@ -303,13 +304,13 @@ public static Map> readIntMapLists(ByteBuffer buffer) { if (length == -1) { return null; } - Map> map = new HashMap<>(length); + Map> map = Maps.newHashMapWithExpectedSize(length); for (int i = 0; i < length; i++) { // key int key = readInt(buffer); // value int listSize = readInt(buffer); - List valueList = new ArrayList<>(); + List valueList = new ArrayList<>(listSize); for (int j = 0; j < listSize; j++) { int value = readInt(buffer); valueList.add(value); diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/utils/IOUtils.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/utils/IOUtils.java index da6544717b3be..8d771f9947b20 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/utils/IOUtils.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/utils/IOUtils.java @@ -234,7 +234,7 @@ public static void loadRolePrivilege( throws IOException, IllegalPathException { role.setSysPrivilegeSet(0); int pathPriNum = inputStream.readInt(); - List pathPrivilegeList = new ArrayList<>(); + List pathPrivilegeList = new ArrayList<>(pathPriNum); for (int i = 0; i < pathPriNum; i++) { String path = IOUtils.readString(inputStream, encoding, strBufferLocal); PartialPath ppath = new PartialPath(path); diff --git a/library-udf/src/main/java/org/apache/iotdb/library/dprofile/UDTFSegment.java b/library-udf/src/main/java/org/apache/iotdb/library/dprofile/UDTFSegment.java index aead60e7942e9..aa0997cd7c235 100644 --- a/library-udf/src/main/java/org/apache/iotdb/library/dprofile/UDTFSegment.java +++ b/library-udf/src/main/java/org/apache/iotdb/library/dprofile/UDTFSegment.java @@ -104,7 +104,7 @@ public void terminate(PointCollector collector) throws Exception { } else if (method.equals("swab")) { // haven't tested yet seg = Segment.swabAlg(v, maxError, windowSize); } - ArrayList res = new ArrayList<>(); + ArrayList res = new ArrayList<>(seg.size()); for (double[] doubles : seg) { res.add(Segment.approximatedSegment(doubles)); } diff --git a/library-udf/src/main/java/org/apache/iotdb/library/match/PatternExecutor.java b/library-udf/src/main/java/org/apache/iotdb/library/match/PatternExecutor.java index 4e5e73206709e..fea5f60dbdda0 100644 --- a/library-udf/src/main/java/org/apache/iotdb/library/match/PatternExecutor.java +++ b/library-udf/src/main/java/org/apache/iotdb/library/match/PatternExecutor.java @@ -112,7 +112,7 @@ public void setPoints(List points) { } public List scalePoint(List times, List values) { - List points = new ArrayList<>(); + List points = new ArrayList<>(times.size()); TimeScale xScale = new TimeScale(times.get(0), times.get(times.size() - 1), 0, 1000); double minY = values.stream().min(Double::compare).orElseGet(() -> 0.0); double maxY = values.stream().max(Double::compare).orElseGet(() -> 0.0); @@ -199,7 +199,7 @@ private List extractTangents(List points) { if (points.size() < 2) { return new ArrayList<>(); } - List tangents = new ArrayList<>(); + List tangents = new ArrayList<>(points.size()); tangents.add(tangent(points.get(0), points.get(1))); for (int i = 1; i < points.size(); i++) { tangents.add(tangent(points.get(i - 1), points.get(i)));