From 5a40a19ed4f9b6e5bd07fb9ffb75d768b13ce82b Mon Sep 17 00:00:00 2001 From: BUAAserein <65238551+BUAAserein@users.noreply.github.com> Date: Thu, 5 Jan 2023 17:15:37 +0800 Subject: [PATCH] [IOTDB-5284] Fix some iotdb-server code smells (#8754) * fix some code smells --- .../influxdb/function/InfluxFunction.java | 4 ++-- .../function/aggregator/InfluxAggregator.java | 2 +- .../aggregator/InfluxMeanFunction.java | 2 +- .../aggregator/InfluxStddevFunction.java | 3 +-- .../aggregator/InfluxSumFunction.java | 2 +- .../function/selector/InfluxSelector.java | 2 +- .../handler/AbstractQueryHandler.java | 6 +++--- .../influxdb/handler/NewQueryHandler.java | 5 +++-- .../influxdb/handler/TagQueryHandler.java | 2 +- .../statement/InfluxSelectComponent.java | 1 + .../rest/impl/GrafanaApiServiceImpl.java | 2 +- .../db/query/control/FileReaderManager.java | 2 +- .../db/query/control/QueryFileManager.java | 8 ++++---- .../db/service/DataNodeServerCommandLine.java | 2 +- .../iotdb/db/service/SettleService.java | 5 ++--- .../thrift/impl/ClientRPCServiceImpl.java | 2 +- .../impl/DataNodeInternalRPCServiceImpl.java | 2 +- .../org/apache/iotdb/db/sync/SyncService.java | 15 +++++++-------- .../db/sync/datasource/AbstractOpBlock.java | 2 +- .../db/sync/datasource/PipeOpManager.java | 8 ++++---- .../db/sync/datasource/PipeOpSgManager.java | 6 +----- .../db/sync/datasource/TsFileOpBlock.java | 10 +++++----- .../db/sync/externalpipe/ExtPipePlugin.java | 4 ++-- .../externalpipe/ExtPipePluginManager.java | 4 ++-- .../externalpipe/operation/Operation.java | 2 +- .../db/sync/pipedata/DeletionPipeData.java | 1 + .../iotdb/db/sync/pipedata/PipeData.java | 4 ++-- .../db/sync/pipedata/load/DeletionLoader.java | 4 ++-- .../db/sync/pipedata/load/TsFileLoader.java | 5 ++--- .../pipedata/queue/BufferedPipeDataQueue.java | 2 +- .../db/sync/sender/pipe/ExternalPipeSink.java | 2 +- .../iotdb/db/sync/sender/pipe/TsFilePipe.java | 2 +- .../sender/recovery/TsFilePipeLogger.java | 2 +- .../sync/transport/client/SenderManager.java | 2 +- .../transport/server/ReceiverManager.java | 4 ++-- .../iotdb/db/tools/TsFileSelfCheckTool.java | 2 +- .../tools/settle/TsFileAndModSettleTool.java | 6 +++--- .../tools/validate/TsFileValidationTool.java | 2 +- .../db/trigger/executor/TriggerExecutor.java | 2 +- .../trigger/executor/TriggerFireVisitor.java | 19 +++++++++---------- .../service/TriggerInformationUpdater.java | 2 +- .../db/utils/datastructure/AlignedTVList.java | 4 ++-- .../FixedPriorityBlockingQueue.java | 4 ++-- .../iotdb/db/utils/datastructure/TVList.java | 2 +- .../AbstractNodeAllocationStrategy.java | 2 +- .../db/wal/buffer/AbstractWALBuffer.java | 2 +- .../apache/iotdb/db/wal/buffer/WALEntry.java | 4 +++- .../org/apache/iotdb/db/wal/io/LogWriter.java | 2 +- .../apache/iotdb/db/wal/node/WALFakeNode.java | 2 ++ .../org/apache/iotdb/db/wal/node/WALNode.java | 2 +- .../file/AbstractTsFileRecoverPerformer.java | 2 +- .../listener/AbstractResultListener.java | 2 +- 52 files changed, 95 insertions(+), 97 deletions(-) diff --git a/server/src/main/java/org/apache/iotdb/db/protocol/influxdb/function/InfluxFunction.java b/server/src/main/java/org/apache/iotdb/db/protocol/influxdb/function/InfluxFunction.java index 2904d1d220..eee1960f8a 100644 --- a/server/src/main/java/org/apache/iotdb/db/protocol/influxdb/function/InfluxFunction.java +++ b/server/src/main/java/org/apache/iotdb/db/protocol/influxdb/function/InfluxFunction.java @@ -28,11 +28,11 @@ public abstract class InfluxFunction { // contain possible parameters private List expressionList; - public InfluxFunction(List expressionList) { + protected InfluxFunction(List expressionList) { this.expressionList = expressionList; } - public InfluxFunction() {} + protected InfluxFunction() {} public List getExpressions() { return this.expressionList; diff --git a/server/src/main/java/org/apache/iotdb/db/protocol/influxdb/function/aggregator/InfluxAggregator.java b/server/src/main/java/org/apache/iotdb/db/protocol/influxdb/function/aggregator/InfluxAggregator.java index 458f378053..6be48d5830 100644 --- a/server/src/main/java/org/apache/iotdb/db/protocol/influxdb/function/aggregator/InfluxAggregator.java +++ b/server/src/main/java/org/apache/iotdb/db/protocol/influxdb/function/aggregator/InfluxAggregator.java @@ -27,7 +27,7 @@ import java.util.List; public abstract class InfluxAggregator extends InfluxFunction { - public InfluxAggregator(List expressionList) { + protected InfluxAggregator(List expressionList) { super(expressionList); } diff --git a/server/src/main/java/org/apache/iotdb/db/protocol/influxdb/function/aggregator/InfluxMeanFunction.java b/server/src/main/java/org/apache/iotdb/db/protocol/influxdb/function/aggregator/InfluxMeanFunction.java index 78a84fa4b3..153ef25bae 100644 --- a/server/src/main/java/org/apache/iotdb/db/protocol/influxdb/function/aggregator/InfluxMeanFunction.java +++ b/server/src/main/java/org/apache/iotdb/db/protocol/influxdb/function/aggregator/InfluxMeanFunction.java @@ -38,7 +38,7 @@ public class InfluxMeanFunction extends InfluxAggregator { @Override public InfluxFunctionValue calculateBruteForce() { - return new InfluxFunctionValue(numbers.size() == 0 ? numbers : MathUtils.mean(numbers), 0L); + return new InfluxFunctionValue(numbers.isEmpty() ? numbers : MathUtils.mean(numbers), 0L); } @Override diff --git a/server/src/main/java/org/apache/iotdb/db/protocol/influxdb/function/aggregator/InfluxStddevFunction.java b/server/src/main/java/org/apache/iotdb/db/protocol/influxdb/function/aggregator/InfluxStddevFunction.java index 9f66da5190..72619a7456 100644 --- a/server/src/main/java/org/apache/iotdb/db/protocol/influxdb/function/aggregator/InfluxStddevFunction.java +++ b/server/src/main/java/org/apache/iotdb/db/protocol/influxdb/function/aggregator/InfluxStddevFunction.java @@ -36,8 +36,7 @@ public class InfluxStddevFunction extends InfluxAggregator { @Override public InfluxFunctionValue calculateBruteForce() { - return new InfluxFunctionValue( - numbers.size() == 0 ? numbers : MathUtils.popStdDev(numbers), 0L); + return new InfluxFunctionValue(numbers.isEmpty() ? numbers : MathUtils.popStdDev(numbers), 0L); } @Override diff --git a/server/src/main/java/org/apache/iotdb/db/protocol/influxdb/function/aggregator/InfluxSumFunction.java b/server/src/main/java/org/apache/iotdb/db/protocol/influxdb/function/aggregator/InfluxSumFunction.java index 2e8a555fce..0dcb704b8f 100644 --- a/server/src/main/java/org/apache/iotdb/db/protocol/influxdb/function/aggregator/InfluxSumFunction.java +++ b/server/src/main/java/org/apache/iotdb/db/protocol/influxdb/function/aggregator/InfluxSumFunction.java @@ -37,7 +37,7 @@ public class InfluxSumFunction extends InfluxAggregator { @Override public InfluxFunctionValue calculateBruteForce() { - return new InfluxFunctionValue(numbers.size() == 0 ? numbers : MathUtils.sum(numbers), 0L); + return new InfluxFunctionValue(numbers.isEmpty() ? numbers : MathUtils.sum(numbers), 0L); } @Override diff --git a/server/src/main/java/org/apache/iotdb/db/protocol/influxdb/function/selector/InfluxSelector.java b/server/src/main/java/org/apache/iotdb/db/protocol/influxdb/function/selector/InfluxSelector.java index e13013b3b6..69299eca77 100644 --- a/server/src/main/java/org/apache/iotdb/db/protocol/influxdb/function/selector/InfluxSelector.java +++ b/server/src/main/java/org/apache/iotdb/db/protocol/influxdb/function/selector/InfluxSelector.java @@ -32,7 +32,7 @@ public abstract class InfluxSelector extends InfluxFunction { private List relatedValues; - public InfluxSelector(List expressionList) { + protected InfluxSelector(List expressionList) { super(expressionList); } diff --git a/server/src/main/java/org/apache/iotdb/db/protocol/influxdb/handler/AbstractQueryHandler.java b/server/src/main/java/org/apache/iotdb/db/protocol/influxdb/handler/AbstractQueryHandler.java index b2f711b0ea..5a8ce248be 100644 --- a/server/src/main/java/org/apache/iotdb/db/protocol/influxdb/handler/AbstractQueryHandler.java +++ b/server/src/main/java/org/apache/iotdb/db/protocol/influxdb/handler/AbstractQueryHandler.java @@ -223,7 +223,7 @@ public abstract class AbstractQueryHandler { } else { // If there are no common queries, they are all function queries for (InfluxFunction function : functions) { - if (value.size() == 0) { + if (value.isEmpty()) { value.add(function.calculateBruteForce().getTimestamp()); } else { value.set(0, function.calculateBruteForce().getTimestamp()); @@ -298,7 +298,7 @@ public abstract class AbstractQueryHandler { InfluxFunctionValue functionValue = updateByIoTDBFunc(database, measurement, function, sessionid); // InfluxFunctionValue functionValue = function.calculateByIoTDBFunc(); - if (value.size() == 0) { + if (value.isEmpty()) { value.add(functionValue.getTimestamp()); } else { value.set(0, functionValue.getTimestamp()); @@ -445,7 +445,7 @@ public abstract class AbstractQueryHandler { String realQuerySql; realQuerySql = "select * from " + curQueryPath; - if (!(realIotDBCondition.length() == 0)) { + if (realIotDBCondition.length() != 0) { realQuerySql += " where " + realIotDBCondition; } realQuerySql += " align by device"; diff --git a/server/src/main/java/org/apache/iotdb/db/protocol/influxdb/handler/NewQueryHandler.java b/server/src/main/java/org/apache/iotdb/db/protocol/influxdb/handler/NewQueryHandler.java index c42bf95b20..2b29bf5653 100644 --- a/server/src/main/java/org/apache/iotdb/db/protocol/influxdb/handler/NewQueryHandler.java +++ b/server/src/main/java/org/apache/iotdb/db/protocol/influxdb/handler/NewQueryHandler.java @@ -111,8 +111,9 @@ public class NewQueryHandler extends AbstractQueryHandler { TSExecuteStatementResp tsExecuteStatementResp = NewInfluxDBServiceImpl.executeStatement(functionSql, sessionid); Map map = QueryResultUtils.getColumnNameAndValue(tsExecuteStatementResp); - for (String colume : map.keySet()) { - Object o = map.get(colume); + for (Map.Entry entry : map.entrySet()) { + String colume = entry.getKey(); + Object o = entry.getValue(); String fullPath = colume.substring(functionName.length() + 1, colume.length() - 1); String devicePath = StringUtils.getDeviceByPath(fullPath); String specificSql = diff --git a/server/src/main/java/org/apache/iotdb/db/protocol/influxdb/handler/TagQueryHandler.java b/server/src/main/java/org/apache/iotdb/db/protocol/influxdb/handler/TagQueryHandler.java index 76a76f2321..2fd3f58517 100644 --- a/server/src/main/java/org/apache/iotdb/db/protocol/influxdb/handler/TagQueryHandler.java +++ b/server/src/main/java/org/apache/iotdb/db/protocol/influxdb/handler/TagQueryHandler.java @@ -130,7 +130,7 @@ public class TagQueryHandler extends NewQueryHandler { String realQuerySql; realQuerySql = "select * from " + curQueryPath; - if (!(realIotDBCondition.length() == 0)) { + if (realIotDBCondition.length() != 0) { realQuerySql += " where " + realIotDBCondition; } realQuerySql += " align by device"; diff --git a/server/src/main/java/org/apache/iotdb/db/protocol/influxdb/statement/InfluxSelectComponent.java b/server/src/main/java/org/apache/iotdb/db/protocol/influxdb/statement/InfluxSelectComponent.java index 6e425a3097..2c3cb6cf95 100644 --- a/server/src/main/java/org/apache/iotdb/db/protocol/influxdb/statement/InfluxSelectComponent.java +++ b/server/src/main/java/org/apache/iotdb/db/protocol/influxdb/statement/InfluxSelectComponent.java @@ -41,6 +41,7 @@ public final class InfluxSelectComponent extends SelectComponent { super(null); } + @Override public void addResultColumn(ResultColumn resultColumn) { Expression expression = resultColumn.getExpression(); if (expression instanceof FunctionExpression) { diff --git a/server/src/main/java/org/apache/iotdb/db/protocol/rest/impl/GrafanaApiServiceImpl.java b/server/src/main/java/org/apache/iotdb/db/protocol/rest/impl/GrafanaApiServiceImpl.java index f5e1c31de4..96a85f9741 100644 --- a/server/src/main/java/org/apache/iotdb/db/protocol/rest/impl/GrafanaApiServiceImpl.java +++ b/server/src/main/java/org/apache/iotdb/db/protocol/rest/impl/GrafanaApiServiceImpl.java @@ -216,7 +216,7 @@ public class GrafanaApiServiceImpl extends GrafanaApiService { public Response node(List requestBody, SecurityContext securityContext) throws NotFoundException { try { - if (requestBody != null && requestBody.size() > 0) { + if (requestBody != null && !requestBody.isEmpty()) { PartialPath path = new PartialPath(Joiner.on(".").join(requestBody)); String sql = "show child paths " + path; Statement statement = StatementGenerator.createStatement(sql, ZoneId.systemDefault()); diff --git a/server/src/main/java/org/apache/iotdb/db/query/control/FileReaderManager.java b/server/src/main/java/org/apache/iotdb/db/query/control/FileReaderManager.java index 73f0978952..a3e55893c9 100644 --- a/server/src/main/java/org/apache/iotdb/db/query/control/FileReaderManager.java +++ b/server/src/main/java/org/apache/iotdb/db/query/control/FileReaderManager.java @@ -246,7 +246,7 @@ public class FileReaderManager { public synchronized void writeFileReferenceInfo() { DEBUG_LOGGER.info("[closedReferenceMap]\n"); for (Map.Entry entry : closedReferenceMap.entrySet()) { - DEBUG_LOGGER.info(String.format("\t%s: %d\n", entry.getKey(), entry.getValue().get())); + DEBUG_LOGGER.info(String.format("\t%s: %d%n", entry.getKey(), entry.getValue().get())); } DEBUG_LOGGER.info("[unclosedReferenceMap]\n"); for (Map.Entry entry : unclosedReferenceMap.entrySet()) { diff --git a/server/src/main/java/org/apache/iotdb/db/query/control/QueryFileManager.java b/server/src/main/java/org/apache/iotdb/db/query/control/QueryFileManager.java index 756912b144..58af413473 100644 --- a/server/src/main/java/org/apache/iotdb/db/query/control/QueryFileManager.java +++ b/server/src/main/java/org/apache/iotdb/db/query/control/QueryFileManager.java @@ -139,9 +139,9 @@ public class QueryFileManager { sealedFilePathsMap.entrySet()) { long queryId = entry.getKey(); Set tsFileResources = entry.getValue().keySet(); - DEBUG_LOGGER.info(String.format("\t[queryId: %d]\n", queryId)); + DEBUG_LOGGER.info("\t[queryId: {}]\n", queryId); for (TsFileResource tsFileResource : tsFileResources) { - DEBUG_LOGGER.info(String.format("\t\t%s\n", tsFileResource.getTsFile().getAbsolutePath())); + DEBUG_LOGGER.info("\t\t{}\n", tsFileResource.getTsFile().getAbsolutePath()); } } DEBUG_LOGGER.info("[Query Unsealed File Info]\n"); @@ -149,9 +149,9 @@ public class QueryFileManager { unsealedFilePathsMap.entrySet()) { long queryId = entry.getKey(); Set tsFileResources = entry.getValue().keySet(); - DEBUG_LOGGER.info(String.format("\t[queryId: %d]\n", queryId)); + DEBUG_LOGGER.info("\t[queryId: {}]\n", queryId); for (TsFileResource tsFileResource : tsFileResources) { - DEBUG_LOGGER.info(String.format("\t\t%s\n", tsFileResource.getTsFile().getAbsolutePath())); + DEBUG_LOGGER.info("\t\t{}\n", tsFileResource.getTsFile().getAbsolutePath()); } } } diff --git a/server/src/main/java/org/apache/iotdb/db/service/DataNodeServerCommandLine.java b/server/src/main/java/org/apache/iotdb/db/service/DataNodeServerCommandLine.java index 1b540b06ef..2b254b2296 100644 --- a/server/src/main/java/org/apache/iotdb/db/service/DataNodeServerCommandLine.java +++ b/server/src/main/java/org/apache/iotdb/db/service/DataNodeServerCommandLine.java @@ -111,7 +111,7 @@ public class DataNodeServerCommandLine extends ServerCommandLine { TDataNodeRemoveReq removeReq = new TDataNodeRemoveReq(dataNodeLocations); try (ConfigNodeClient configNodeClient = new ConfigNodeClient()) { TDataNodeRemoveResp removeResp = configNodeClient.removeDataNode(removeReq); - LOGGER.info("Remove result {} ", removeResp.toString()); + LOGGER.info("Remove result {} ", removeResp); if (removeResp.getStatus().getCode() != TSStatusCode.SUCCESS_STATUS.getStatusCode()) { throw new IoTDBException( removeResp.getStatus().toString(), removeResp.getStatus().getCode()); diff --git a/server/src/main/java/org/apache/iotdb/db/service/SettleService.java b/server/src/main/java/org/apache/iotdb/db/service/SettleService.java index 4df2a49069..2cd05464b8 100644 --- a/server/src/main/java/org/apache/iotdb/db/service/SettleService.java +++ b/server/src/main/java/org/apache/iotdb/db/service/SettleService.java @@ -123,9 +123,8 @@ public class SettleService implements IService { return; } logger.info( - "Totally find " - + (seqResourcesToBeSettled.size() + unseqResourcesToBeSettled.size()) - + " tsFiles to be settled."); + "Totally find {} tsFiles to be settled.", + seqResourcesToBeSettled.size() + unseqResourcesToBeSettled.size()); // settle seqTsFile for (TsFileResource resource : seqResourcesToBeSettled) { resource.readLock(); diff --git a/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/ClientRPCServiceImpl.java b/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/ClientRPCServiceImpl.java index e53471670f..6bd5294f8a 100644 --- a/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/ClientRPCServiceImpl.java +++ b/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/ClientRPCServiceImpl.java @@ -433,7 +433,7 @@ public class ClientRPCServiceImpl implements IClientRPCServiceWithHandler { QueryDataSetUtils.convertQueryResultByFetchSize(queryExecution, req.fetchSize); List result = pair.left; finished = pair.right; - boolean hasResultSet = !(result.size() == 0); + boolean hasResultSet = !result.isEmpty(); resp.setHasResultSet(hasResultSet); resp.setIsAlign(true); resp.setQueryResult(result); diff --git a/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/DataNodeInternalRPCServiceImpl.java b/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/DataNodeInternalRPCServiceImpl.java index a0cf697979..d1a8d0c8cd 100644 --- a/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/DataNodeInternalRPCServiceImpl.java +++ b/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/DataNodeInternalRPCServiceImpl.java @@ -341,7 +341,7 @@ public class DataNodeInternalRPCServiceImpl implements IDataNodeRPCService.Iface @Override public TLoadResp sendTsFilePieceNode(TTsFilePieceReq req) throws TException { - LOGGER.info(String.format("Receive load node from uuid %s.", req.uuid)); + LOGGER.info("Receive load node from uuid {}.", req.uuid); ConsensusGroupId groupId = ConsensusGroupId.Factory.createFromTConsensusGroupId(req.consensusGroupId); diff --git a/server/src/main/java/org/apache/iotdb/db/sync/SyncService.java b/server/src/main/java/org/apache/iotdb/db/sync/SyncService.java index d9db626a08..849c7abd10 100644 --- a/server/src/main/java/org/apache/iotdb/db/sync/SyncService.java +++ b/server/src/main/java/org/apache/iotdb/db/sync/SyncService.java @@ -349,7 +349,7 @@ public class SyncService implements IService { public void recordMessage(String pipeName, PipeMessage message) { if (!pipes.containsKey(pipeName)) { - logger.warn(String.format("No running PIPE for message %s.", message)); + logger.warn("No running PIPE for message {}.", message); return; } TSStatus status = null; @@ -365,10 +365,10 @@ public class SyncService implements IService { status = syncInfoFetcher.recordMsg(pipeName, message); break; default: - logger.error(String.format("Unknown message type: %s", message)); + logger.error("Unknown message type: {}", message); } if (status != null && status.getCode() != TSStatusCode.SUCCESS_STATUS.getStatusCode()) { - logger.error(String.format("Failed to record message: %s", message)); + logger.error("Failed to record message: {}", message); } } @@ -420,13 +420,13 @@ public class SyncService implements IService { private void startExternalPipeManager(String pipeName, boolean startExtPipe) throws PipeException { if (!(pipes.get(pipeName) instanceof TsFilePipe)) { - logger.error("startExternalPipeManager(), runningPipe is not TsFilePipe. " + pipeName); + logger.error("startExternalPipeManager(), runningPipe is not TsFilePipe. {}", pipeName); return; } PipeSink pipeSink = pipes.get(pipeName).getPipeSink(); if (!(pipeSink instanceof ExternalPipeSink)) { - logger.error("startExternalPipeManager(), pipeSink is not ExternalPipeSink." + pipeSink); + logger.error("startExternalPipeManager(), pipeSink is not ExternalPipeSink. {}", pipeSink); return; } @@ -435,9 +435,8 @@ public class SyncService implements IService { ExtPipePluginRegister.getInstance().getWriteFactory(extPipeSinkTypeName); if (externalPipeSinkWriterFactory == null) { logger.error( - String.format( - "startExternalPipeManager(), can not found ExternalPipe plugin for %s.", - extPipeSinkTypeName)); + "startExternalPipeManager(), can not found ExternalPipe plugin for {}.", + extPipeSinkTypeName); throw new PipeException("Can not found ExternalPipe plugin for " + extPipeSinkTypeName + "."); } diff --git a/server/src/main/java/org/apache/iotdb/db/sync/datasource/AbstractOpBlock.java b/server/src/main/java/org/apache/iotdb/db/sync/datasource/AbstractOpBlock.java index 092882967d..86362a8060 100644 --- a/server/src/main/java/org/apache/iotdb/db/sync/datasource/AbstractOpBlock.java +++ b/server/src/main/java/org/apache/iotdb/db/sync/datasource/AbstractOpBlock.java @@ -42,7 +42,7 @@ public abstract class AbstractOpBlock implements Comparable { // data number of this OpBlock protected long dataCount = -1; - public AbstractOpBlock(String storageGroupName, long pipeDataSerialNumber, long beginIndex) { + protected AbstractOpBlock(String storageGroupName, long pipeDataSerialNumber, long beginIndex) { this.storageGroup = storageGroupName; this.pipeDataSerialNumber = pipeDataSerialNumber; this.beginIndex = beginIndex; diff --git a/server/src/main/java/org/apache/iotdb/db/sync/datasource/PipeOpManager.java b/server/src/main/java/org/apache/iotdb/db/sync/datasource/PipeOpManager.java index 8216b73924..9077e605ed 100644 --- a/server/src/main/java/org/apache/iotdb/db/sync/datasource/PipeOpManager.java +++ b/server/src/main/java/org/apache/iotdb/db/sync/datasource/PipeOpManager.java @@ -228,11 +228,11 @@ public class PipeOpManager { * in list can be discrete */ private void commitFilePipe(List filePipeSerialNumberList) { - if (filePipeSerialNumberList.size() <= 0) { + if (filePipeSerialNumberList.isEmpty()) { return; } - if (filePipeSerialNumberSet.size() <= 0) { + if (filePipeSerialNumberSet.isEmpty()) { logger.error("commitFilePipe(), filePipeSerialNumberSet should not be empty."); return; } @@ -250,7 +250,7 @@ public class PipeOpManager { return; } - if (filePipeSerialNumberSet.size() > 0) { + if (!filePipeSerialNumberSet.isEmpty()) { if (filePipeSerialNumberSet.first() > minNum) { filePipe.commit(filePipeSerialNumberSet.first() - 1); } @@ -276,7 +276,7 @@ public class PipeOpManager { * @return True - PipeOpManager has no Pipe data */ public boolean isEmpty() { - return (filePipeSerialNumberSet.size() <= 0); + return filePipeSerialNumberSet.isEmpty(); } /** diff --git a/server/src/main/java/org/apache/iotdb/db/sync/datasource/PipeOpSgManager.java b/server/src/main/java/org/apache/iotdb/db/sync/datasource/PipeOpSgManager.java index fd5f6eb66a..bf7dc665f7 100644 --- a/server/src/main/java/org/apache/iotdb/db/sync/datasource/PipeOpSgManager.java +++ b/server/src/main/java/org/apache/iotdb/db/sync/datasource/PipeOpSgManager.java @@ -122,11 +122,7 @@ public class PipeOpSgManager { return true; } - if (opBlockBeginIndex > currentOpBlockBeginIndex) { - return true; - } - - return false; + return opBlockBeginIndex > currentOpBlockBeginIndex; } /** diff --git a/server/src/main/java/org/apache/iotdb/db/sync/datasource/TsFileOpBlock.java b/server/src/main/java/org/apache/iotdb/db/sync/datasource/TsFileOpBlock.java index ec218c73f1..7da4932ff2 100644 --- a/server/src/main/java/org/apache/iotdb/db/sync/datasource/TsFileOpBlock.java +++ b/server/src/main/java/org/apache/iotdb/db/sync/datasource/TsFileOpBlock.java @@ -281,7 +281,6 @@ public class TsFileOpBlock extends AbstractOpBlock { timeChunkOffset = entry.getKey(); timeChunkPointCount = chunkInfo.pointCount; iter.remove(); - continue; } else { chunkInfo.isTimeAligned = true; chunkInfo.timeChunkOffsetInFile = timeChunkOffset; @@ -577,9 +576,9 @@ public class TsFileOpBlock extends AbstractOpBlock { new PageReader(pageData, chunkHeader.getDataType(), valueDecoder, timeDecoder, null); BatchData batchData = pageReader.getAllSatisfiedPageData(); if (chunkHeader.getChunkType() == MetaMarker.CHUNK_HEADER) { - logger.debug("points in the page(by pageHeader): " + pageHeader.getNumOfValues()); + logger.debug("points in the page(by pageHeader): {}", pageHeader.getNumOfValues()); } else { - logger.debug("points in the page(by batchData): " + batchData.length()); + logger.debug("points in the page(by batchData): {}", batchData.length()); } if (batchData.isEmpty()) { @@ -1008,7 +1007,7 @@ public class TsFileOpBlock extends AbstractOpBlock { long lengthInChunk = min(chunkPointCount - indexInChunk, remain); if (!sensorFullPath.equals(lastSensorFullPath)) { - if ((tvPairList != null) && (tvPairList.size() > 0)) { + if ((tvPairList != null) && (!tvPairList.isEmpty())) { insertToDataList(dataList, lastSensorFullPath, tvPairList); tvPairList = null; } @@ -1037,7 +1036,7 @@ public class TsFileOpBlock extends AbstractOpBlock { } } - if ((tvPairList != null) && (tvPairList.size() > 0)) { + if ((tvPairList != null) && (!tvPairList.isEmpty())) { insertToDataList(dataList, lastSensorFullPath, tvPairList); } @@ -1174,6 +1173,7 @@ public class TsFileOpBlock extends AbstractOpBlock { * @return * @throws IOException */ + @Override public TsFileMetadata readFileMetadata() throws IOException { if (tsFileMetaData != null) { return tsFileMetaData; diff --git a/server/src/main/java/org/apache/iotdb/db/sync/externalpipe/ExtPipePlugin.java b/server/src/main/java/org/apache/iotdb/db/sync/externalpipe/ExtPipePlugin.java index 572beaf863..e727ab57ca 100644 --- a/server/src/main/java/org/apache/iotdb/db/sync/externalpipe/ExtPipePlugin.java +++ b/server/src/main/java/org/apache/iotdb/db/sync/externalpipe/ExtPipePlugin.java @@ -182,7 +182,7 @@ public class ExtPipePlugin { } alive = true; - logger.info("External pipe " + extPipeTypeName + " begin to START"); + logger.info("External pipe {} begin to START", extPipeTypeName); // == Launch pipe worker threads executorService = @@ -201,7 +201,7 @@ public class ExtPipePlugin { writerInvocationFailures = new ConcurrentHashMap<>(); - logger.info("External pipe " + extPipeTypeName + " finish START."); + logger.info("External pipe {} finish START.", extPipeTypeName); } /** Stop all working threads */ diff --git a/server/src/main/java/org/apache/iotdb/db/sync/externalpipe/ExtPipePluginManager.java b/server/src/main/java/org/apache/iotdb/db/sync/externalpipe/ExtPipePluginManager.java index 1a4c7e0600..ca10ba9f77 100644 --- a/server/src/main/java/org/apache/iotdb/db/sync/externalpipe/ExtPipePluginManager.java +++ b/server/src/main/java/org/apache/iotdb/db/sync/externalpipe/ExtPipePluginManager.java @@ -123,7 +123,7 @@ public class ExtPipePluginManager { // == Start monitor Pipe data thread alive = true; ThreadPoolExecutor tpe = ((ThreadPoolExecutor) monitorService); - if ((tpe.getActiveCount() <= 0) && (tpe.getQueue().size() <= 0)) { + if ((tpe.getActiveCount() <= 0) && (tpe.getQueue().isEmpty())) { monitorService.submit(this::monitorPipeData); } @@ -221,7 +221,7 @@ public class ExtPipePluginManager { sgName, tsFileFullName, modsFileFullName, pipeDataSerialNumber); lastPipeDataSerialNumber = pipeDataSerialNumber; } catch (IOException e) { - logger.error("monitorPipeData(), Can not append TsFile: {}" + tsFileFullName); + logger.error("monitorPipeData(), Can not append TsFile: {}", tsFileFullName); } continue; } else if (pipeData instanceof DeletionPipeData) { diff --git a/server/src/main/java/org/apache/iotdb/db/sync/externalpipe/operation/Operation.java b/server/src/main/java/org/apache/iotdb/db/sync/externalpipe/operation/Operation.java index d048f0d1f2..110e712725 100644 --- a/server/src/main/java/org/apache/iotdb/db/sync/externalpipe/operation/Operation.java +++ b/server/src/main/java/org/apache/iotdb/db/sync/externalpipe/operation/Operation.java @@ -34,7 +34,7 @@ public abstract class Operation { private long startIndex; private long endIndex; - public Operation( + protected Operation( OperationType operationType, String storageGroup, long startIndex, long endIndex) { this.operationType = operationType; this.storageGroup = storageGroup; diff --git a/server/src/main/java/org/apache/iotdb/db/sync/pipedata/DeletionPipeData.java b/server/src/main/java/org/apache/iotdb/db/sync/pipedata/DeletionPipeData.java index b3d63a700c..01ad0bcc90 100644 --- a/server/src/main/java/org/apache/iotdb/db/sync/pipedata/DeletionPipeData.java +++ b/server/src/main/java/org/apache/iotdb/db/sync/pipedata/DeletionPipeData.java @@ -65,6 +65,7 @@ public class DeletionPipeData extends PipeData { + deletion.serializeWithoutFileOffset(stream); } + @Override public void deserialize(DataInputStream stream) throws IOException, IllegalPathException { super.deserialize(stream); database = ReadWriteIOUtils.readString(stream); diff --git a/server/src/main/java/org/apache/iotdb/db/sync/pipedata/PipeData.java b/server/src/main/java/org/apache/iotdb/db/sync/pipedata/PipeData.java index 41a9870bcb..1ab7647b0d 100644 --- a/server/src/main/java/org/apache/iotdb/db/sync/pipedata/PipeData.java +++ b/server/src/main/java/org/apache/iotdb/db/sync/pipedata/PipeData.java @@ -36,9 +36,9 @@ public abstract class PipeData { protected long serialNumber; - public PipeData() {} + protected PipeData() {} - public PipeData(long serialNumber) { + protected PipeData(long serialNumber) { this.serialNumber = serialNumber; } diff --git a/server/src/main/java/org/apache/iotdb/db/sync/pipedata/load/DeletionLoader.java b/server/src/main/java/org/apache/iotdb/db/sync/pipedata/load/DeletionLoader.java index ab840886fa..a976d9ef2b 100644 --- a/server/src/main/java/org/apache/iotdb/db/sync/pipedata/load/DeletionLoader.java +++ b/server/src/main/java/org/apache/iotdb/db/sync/pipedata/load/DeletionLoader.java @@ -65,8 +65,8 @@ public class DeletionLoader implements ILoader { SCHEMA_FETCHER, IoTDBDescriptor.getInstance().getConfig().getQueryTimeoutThreshold()); if (result.status.code != TSStatusCode.SUCCESS_STATUS.getStatusCode()) { - logger.error(String.format("Delete %s error, statement: %s.", deletion, statement)); - logger.error(String.format("Delete result status : %s.", result.status)); + logger.error("Delete {} error, statement: {}.", deletion, statement); + logger.error("Delete result status : {}.", result.status); throw new LoadFileException( String.format("Can not execute delete statement: %s", statement)); } diff --git a/server/src/main/java/org/apache/iotdb/db/sync/pipedata/load/TsFileLoader.java b/server/src/main/java/org/apache/iotdb/db/sync/pipedata/load/TsFileLoader.java index 6d80266b5c..ec2eefd639 100644 --- a/server/src/main/java/org/apache/iotdb/db/sync/pipedata/load/TsFileLoader.java +++ b/server/src/main/java/org/apache/iotdb/db/sync/pipedata/load/TsFileLoader.java @@ -68,9 +68,8 @@ public class TsFileLoader implements ILoader { SCHEMA_FETCHER, IoTDBDescriptor.getInstance().getConfig().getQueryTimeoutThreshold()); if (result.status.code != TSStatusCode.SUCCESS_STATUS.getStatusCode()) { - logger.error( - String.format("Load TsFile %s error, statement: %s.", tsFile.getPath(), statement)); - logger.error(String.format("Load TsFile result status : %s.", result.status)); + logger.error("Load TsFile {} error, statement: {}.", tsFile.getPath(), statement); + logger.error("Load TsFile result status : {}.", result.status); throw new LoadFileException( String.format("Can not execute load TsFile statement: %s", statement)); } diff --git a/server/src/main/java/org/apache/iotdb/db/sync/pipedata/queue/BufferedPipeDataQueue.java b/server/src/main/java/org/apache/iotdb/db/sync/pipedata/queue/BufferedPipeDataQueue.java index 20d6d2ca92..ca91098003 100644 --- a/server/src/main/java/org/apache/iotdb/db/sync/pipedata/queue/BufferedPipeDataQueue.java +++ b/server/src/main/java/org/apache/iotdb/db/sync/pipedata/queue/BufferedPipeDataQueue.java @@ -101,7 +101,7 @@ public class BufferedPipeDataQueue implements PipeDataQueue { if (file.getName().endsWith(SyncConstant.PIPE_LOG_NAME_SUFFIX) && file.length() > 0) { startNumbers.add(SyncPathUtil.getSerialNumberFromPipeLogName(file.getName())); } - if (startNumbers.size() != 0) { + if (!startNumbers.isEmpty()) { Collections.sort(startNumbers); for (Long startTime : startNumbers) { pipeLogStartNumber.offer(startTime); diff --git a/server/src/main/java/org/apache/iotdb/db/sync/sender/pipe/ExternalPipeSink.java b/server/src/main/java/org/apache/iotdb/db/sync/sender/pipe/ExternalPipeSink.java index fb406a5e88..ec133e31e5 100644 --- a/server/src/main/java/org/apache/iotdb/db/sync/sender/pipe/ExternalPipeSink.java +++ b/server/src/main/java/org/apache/iotdb/db/sync/sender/pipe/ExternalPipeSink.java @@ -39,7 +39,7 @@ import java.util.stream.Collectors; public class ExternalPipeSink implements PipeSink { private static final Logger logger = LoggerFactory.getLogger(ExternalPipeSink.class); - private final PipeSinkType pipeSinkType = PipeSinkType.ExternalPipe; + private static final PipeSinkType pipeSinkType = PipeSinkType.ExternalPipe; private String pipeSinkName; private String extPipeSinkTypeName; diff --git a/server/src/main/java/org/apache/iotdb/db/sync/sender/pipe/TsFilePipe.java b/server/src/main/java/org/apache/iotdb/db/sync/sender/pipe/TsFilePipe.java index 43a1419aeb..57b681b5cc 100644 --- a/server/src/main/java/org/apache/iotdb/db/sync/sender/pipe/TsFilePipe.java +++ b/server/src/main/java/org/apache/iotdb/db/sync/sender/pipe/TsFilePipe.java @@ -192,7 +192,7 @@ public class TsFilePipe implements Pipe { // put history data into PipeDataQueue int historyTsFilesSize = historyTsFiles.size(); for (int i = 0; i < historyTsFilesSize; i++) { - long serialNumber = 1 - historyTsFilesSize + i; + long serialNumber = 1L - historyTsFilesSize + i; File tsFile = historyTsFiles.get(i); historyQueueMap .get(entry.getKey()) diff --git a/server/src/main/java/org/apache/iotdb/db/sync/sender/recovery/TsFilePipeLogger.java b/server/src/main/java/org/apache/iotdb/db/sync/sender/recovery/TsFilePipeLogger.java index bd99febac6..f1c46fe38f 100644 --- a/server/src/main/java/org/apache/iotdb/db/sync/sender/recovery/TsFilePipeLogger.java +++ b/server/src/main/java/org/apache/iotdb/db/sync/sender/recovery/TsFilePipeLogger.java @@ -135,7 +135,7 @@ public class TsFilePipeLogger { public void finishCollect() { try { if (SyncPathUtil.createFile(new File(pipeDir, SyncConstant.FINISH_COLLECT_LOCK_NAME))) { - logger.info(String.format("Create finish collecting Lock file in %s.", pipeDir)); + logger.info("Create finish collecting Lock file in {}.", pipeDir); } } catch (IOException e) { logger.warn(String.format("Can not make lock file in %s, because %s", pipeDir, e)); diff --git a/server/src/main/java/org/apache/iotdb/db/sync/transport/client/SenderManager.java b/server/src/main/java/org/apache/iotdb/db/sync/transport/client/SenderManager.java index 0615f19a3a..dc0f97e7c5 100644 --- a/server/src/main/java/org/apache/iotdb/db/sync/transport/client/SenderManager.java +++ b/server/src/main/java/org/apache/iotdb/db/sync/transport/client/SenderManager.java @@ -225,7 +225,7 @@ public class SenderManager { while (!Thread.currentThread().isInterrupted()) { PipeData pipeData = pipe.take(dataRegionId); if (!syncClient.send(pipeData)) { - logger.error(String.format("Can not transfer PipeData %s, skip it.", pipeData)); + logger.error("Can not transfer PipeData {}, skip it.", pipeData); // can do something. SyncService.getInstance() .recordMessage( diff --git a/server/src/main/java/org/apache/iotdb/db/sync/transport/server/ReceiverManager.java b/server/src/main/java/org/apache/iotdb/db/sync/transport/server/ReceiverManager.java index a8ffdab2d3..8ae5dba86d 100644 --- a/server/src/main/java/org/apache/iotdb/db/sync/transport/server/ReceiverManager.java +++ b/server/src/main/java/org/apache/iotdb/db/sync/transport/server/ReceiverManager.java @@ -437,8 +437,8 @@ public class ReceiverManager { IoTDBDescriptor.getInstance().getConfig().getQueryTimeoutThreshold()); if (result.status.code != TSStatusCode.SUCCESS_STATUS.getStatusCode() && result.status.code != TSStatusCode.DATABASE_ALREADY_EXISTS.getStatusCode()) { - logger.error(String.format("Create Database error, statement: %s.", statement)); - logger.error(String.format("Create database result status : %s.", result.status)); + logger.error("Create Database error, statement: {}.", statement); + logger.error("Create database result status : {}.", result.status); return false; } } catch (IllegalPathException e) { diff --git a/server/src/main/java/org/apache/iotdb/db/tools/TsFileSelfCheckTool.java b/server/src/main/java/org/apache/iotdb/db/tools/TsFileSelfCheckTool.java index 657987783f..390911a806 100644 --- a/server/src/main/java/org/apache/iotdb/db/tools/TsFileSelfCheckTool.java +++ b/server/src/main/java/org/apache/iotdb/db/tools/TsFileSelfCheckTool.java @@ -78,7 +78,7 @@ public class TsFileSelfCheckTool { */ public long check(String filename, boolean fastFinish) throws IOException, TsFileStatisticsMistakesException, TsFileTimeseriesMetadataException { - logger.info("file path: " + filename); + logger.info("file path: {}", filename); TsFileSelfCheckToolReader reader = new TsFileSelfCheckToolReader(filename); Map> timeseriesMetadataMap = null; long res = -1; diff --git a/server/src/main/java/org/apache/iotdb/db/tools/settle/TsFileAndModSettleTool.java b/server/src/main/java/org/apache/iotdb/db/tools/settle/TsFileAndModSettleTool.java index 38d62f3d1f..7eb65d9d15 100644 --- a/server/src/main/java/org/apache/iotdb/db/tools/settle/TsFileAndModSettleTool.java +++ b/server/src/main/java/org/apache/iotdb/db/tools/settle/TsFileAndModSettleTool.java @@ -99,7 +99,7 @@ public class TsFileAndModSettleTool { if (arg.endsWith(TSFILE_SUFFIX)) { // it's a file File f = new File(arg); if (!f.exists()) { - logger.warn("Cannot find TsFile : " + arg); + logger.warn("Cannot find TsFile : {}", arg); continue; } files.add(f); @@ -115,11 +115,11 @@ public class TsFileAndModSettleTool { private static List getAllFilesInOneDirBySuffix(String dirPath, String suffix) { File dir = new File(dirPath); if (!dir.isDirectory()) { - logger.warn("It's not a directory path : " + dirPath); + logger.warn("It's not a directory path : {}", dirPath); return Collections.emptyList(); } if (!dir.exists()) { - logger.warn("Cannot find Directory : " + dirPath); + logger.warn("Cannot find Directory : {}", dirPath); return Collections.emptyList(); } List tsFiles = diff --git a/server/src/main/java/org/apache/iotdb/db/tools/validate/TsFileValidationTool.java b/server/src/main/java/org/apache/iotdb/db/tools/validate/TsFileValidationTool.java index 0898b114cd..117d63d79d 100644 --- a/server/src/main/java/org/apache/iotdb/db/tools/validate/TsFileValidationTool.java +++ b/server/src/main/java/org/apache/iotdb/db/tools/validate/TsFileValidationTool.java @@ -556,7 +556,7 @@ public class TsFileValidationTool { } } } - if (seqDataDirList.size() == 0 && fileList.size() == 0) { + if (seqDataDirList.isEmpty() && fileList.isEmpty()) { System.out.println( "Please input correct param, which is [path of data dir] [-pd = print details or not] [-f = path of outFile]. Eg: xxx/iotdb/data/data -pd=true -f=xxx/TsFile_validation_view.txt"); return false; diff --git a/server/src/main/java/org/apache/iotdb/db/trigger/executor/TriggerExecutor.java b/server/src/main/java/org/apache/iotdb/db/trigger/executor/TriggerExecutor.java index 7283729af0..e3887388ad 100644 --- a/server/src/main/java/org/apache/iotdb/db/trigger/executor/TriggerExecutor.java +++ b/server/src/main/java/org/apache/iotdb/db/trigger/executor/TriggerExecutor.java @@ -87,7 +87,7 @@ public class TriggerExecutor { LOGGER.warn( "Trigger {} was fired with wrong event {}", triggerInformation.getTriggerName(), - triggerInformation.getEvent().toString()); + triggerInformation.getEvent()); } return true; } diff --git a/server/src/main/java/org/apache/iotdb/db/trigger/executor/TriggerFireVisitor.java b/server/src/main/java/org/apache/iotdb/db/trigger/executor/TriggerFireVisitor.java index 8d5eb5cdcf..fac8f6f262 100644 --- a/server/src/main/java/org/apache/iotdb/db/trigger/executor/TriggerFireVisitor.java +++ b/server/src/main/java/org/apache/iotdb/db/trigger/executor/TriggerFireVisitor.java @@ -295,7 +295,7 @@ public class TriggerFireVisitor extends PlanVisitor triggerNameList : triggerNameLists) { - if (triggerNameList.size() != 0) { + if (!triggerNameList.isEmpty()) { isAllEmpty = false; break; } @@ -350,7 +350,7 @@ public class TriggerFireVisitor extends PlanVisitor updateFuture; - private static final long UPDATE_INTERVAL = 1000 * 60; + private static final long UPDATE_INTERVAL = 1000L * 60; public void startTriggerInformationUpdater() { if (updateFuture == null) { diff --git a/server/src/main/java/org/apache/iotdb/db/utils/datastructure/AlignedTVList.java b/server/src/main/java/org/apache/iotdb/db/utils/datastructure/AlignedTVList.java index 01d900a8a3..dfba829696 100644 --- a/server/src/main/java/org/apache/iotdb/db/utils/datastructure/AlignedTVList.java +++ b/server/src/main/java/org/apache/iotdb/db/utils/datastructure/AlignedTVList.java @@ -854,9 +854,9 @@ public abstract class AlignedTVList extends TVList { return size; } // time array mem size - size += (long) PrimitiveArrayManager.ARRAY_SIZE * 8L; + size += PrimitiveArrayManager.ARRAY_SIZE * 8L; // index array mem size - size += (long) PrimitiveArrayManager.ARRAY_SIZE * 4L; + size += PrimitiveArrayManager.ARRAY_SIZE * 4L; // array headers mem size size += (long) NUM_BYTES_ARRAY_HEADER * (2 + types.length); // Object references size in ArrayList diff --git a/server/src/main/java/org/apache/iotdb/db/utils/datastructure/FixedPriorityBlockingQueue.java b/server/src/main/java/org/apache/iotdb/db/utils/datastructure/FixedPriorityBlockingQueue.java index 78b257225a..b8a1b04cf4 100644 --- a/server/src/main/java/org/apache/iotdb/db/utils/datastructure/FixedPriorityBlockingQueue.java +++ b/server/src/main/java/org/apache/iotdb/db/utils/datastructure/FixedPriorityBlockingQueue.java @@ -72,7 +72,7 @@ public class FixedPriorityBlockingQueue { final ReentrantLock lock = this.lock; lock.lockInterruptibly(); try { - while (queue.size() == 0) { + while (queue.isEmpty()) { notEmpty.await(); } return queue.pollFirst(); @@ -92,7 +92,7 @@ public class FixedPriorityBlockingQueue { final ReentrantLock lock = this.lock; lock.lockInterruptibly(); try { - while (queue.size() == 0) { + while (queue.isEmpty()) { notEmpty.await(); } return queue.pollLast(); diff --git a/server/src/main/java/org/apache/iotdb/db/utils/datastructure/TVList.java b/server/src/main/java/org/apache/iotdb/db/utils/datastructure/TVList.java index c6105744fa..01d68e445a 100644 --- a/server/src/main/java/org/apache/iotdb/db/utils/datastructure/TVList.java +++ b/server/src/main/java/org/apache/iotdb/db/utils/datastructure/TVList.java @@ -63,7 +63,7 @@ public abstract class TVList implements WALEntryValue { protected AtomicInteger referenceCount; private long version; - public TVList() { + protected TVList() { timestamps = new ArrayList<>(); rowCount = 0; maxTime = Long.MIN_VALUE; diff --git a/server/src/main/java/org/apache/iotdb/db/wal/allocation/AbstractNodeAllocationStrategy.java b/server/src/main/java/org/apache/iotdb/db/wal/allocation/AbstractNodeAllocationStrategy.java index 8224b585ec..857b9a6d1e 100644 --- a/server/src/main/java/org/apache/iotdb/db/wal/allocation/AbstractNodeAllocationStrategy.java +++ b/server/src/main/java/org/apache/iotdb/db/wal/allocation/AbstractNodeAllocationStrategy.java @@ -42,7 +42,7 @@ public abstract class AbstractNodeAllocationStrategy implements NodeAllocationSt /** manage wal folders */ protected FolderManager folderManager; - public AbstractNodeAllocationStrategy() { + protected AbstractNodeAllocationStrategy() { try { folderManager = new FolderManager( diff --git a/server/src/main/java/org/apache/iotdb/db/wal/buffer/AbstractWALBuffer.java b/server/src/main/java/org/apache/iotdb/db/wal/buffer/AbstractWALBuffer.java index c7609c08b3..f6defae3b5 100644 --- a/server/src/main/java/org/apache/iotdb/db/wal/buffer/AbstractWALBuffer.java +++ b/server/src/main/java/org/apache/iotdb/db/wal/buffer/AbstractWALBuffer.java @@ -46,7 +46,7 @@ public abstract class AbstractWALBuffer implements IWALBuffer { /** current wal file log writer */ protected volatile WALWriter currentWALFileWriter; - public AbstractWALBuffer( + protected AbstractWALBuffer( String identifier, String logDirectory, long startFileVersion, long startSearchIndex) throws FileNotFoundException { this.identifier = identifier; diff --git a/server/src/main/java/org/apache/iotdb/db/wal/buffer/WALEntry.java b/server/src/main/java/org/apache/iotdb/db/wal/buffer/WALEntry.java index a79f900122..64beef1b37 100644 --- a/server/src/main/java/org/apache/iotdb/db/wal/buffer/WALEntry.java +++ b/server/src/main/java/org/apache/iotdb/db/wal/buffer/WALEntry.java @@ -56,7 +56,7 @@ public abstract class WALEntry implements SerializedSize { */ protected final WALFlushListener walFlushListener; - public WALEntry(long memTableId, WALEntryValue value, boolean wait) { + protected WALEntry(long memTableId, WALEntryValue value, boolean wait) { this.memTableId = memTableId; this.value = value; if (value instanceof IMemTable) { @@ -93,6 +93,8 @@ public abstract class WALEntry implements SerializedSize { case ROLL_WAL_LOG_WRITER_SIGNAL: case WAL_FILE_INFO_END_MARKER: return new WALSignalEntry(type); + default: + break; } // handle info diff --git a/server/src/main/java/org/apache/iotdb/db/wal/io/LogWriter.java b/server/src/main/java/org/apache/iotdb/db/wal/io/LogWriter.java index 34815c1564..416aadc073 100644 --- a/server/src/main/java/org/apache/iotdb/db/wal/io/LogWriter.java +++ b/server/src/main/java/org/apache/iotdb/db/wal/io/LogWriter.java @@ -44,7 +44,7 @@ public abstract class LogWriter implements ILogWriter { protected final FileChannel logChannel; protected long size; - public LogWriter(File logFile) throws FileNotFoundException { + protected LogWriter(File logFile) throws FileNotFoundException { this.logFile = logFile; this.logStream = new FileOutputStream(logFile, true); this.logChannel = this.logStream.getChannel(); diff --git a/server/src/main/java/org/apache/iotdb/db/wal/node/WALFakeNode.java b/server/src/main/java/org/apache/iotdb/db/wal/node/WALFakeNode.java index bfe20bd03d..07fd08bfaf 100644 --- a/server/src/main/java/org/apache/iotdb/db/wal/node/WALFakeNode.java +++ b/server/src/main/java/org/apache/iotdb/db/wal/node/WALFakeNode.java @@ -64,6 +64,8 @@ public class WALFakeNode implements IWALNode { case FAILURE: walFlushListener.fail(cause); break; + default: + break; } return walFlushListener; } diff --git a/server/src/main/java/org/apache/iotdb/db/wal/node/WALNode.java b/server/src/main/java/org/apache/iotdb/db/wal/node/WALNode.java index 15b71830ca..283eb56bf7 100644 --- a/server/src/main/java/org/apache/iotdb/db/wal/node/WALNode.java +++ b/server/src/main/java/org/apache/iotdb/db/wal/node/WALNode.java @@ -633,7 +633,7 @@ public class WALNode implements IWALNode { } // update iterator - if (insertNodes.size() != 0) { + if (!insertNodes.isEmpty()) { itr = insertNodes.iterator(); return true; } diff --git a/server/src/main/java/org/apache/iotdb/db/wal/recover/file/AbstractTsFileRecoverPerformer.java b/server/src/main/java/org/apache/iotdb/db/wal/recover/file/AbstractTsFileRecoverPerformer.java index 2378b81332..d8b507f643 100644 --- a/server/src/main/java/org/apache/iotdb/db/wal/recover/file/AbstractTsFileRecoverPerformer.java +++ b/server/src/main/java/org/apache/iotdb/db/wal/recover/file/AbstractTsFileRecoverPerformer.java @@ -46,7 +46,7 @@ public abstract class AbstractTsFileRecoverPerformer implements Closeable { /** this writer will be open when .resource file doesn't exist */ protected RestorableTsFileIOWriter writer; - public AbstractTsFileRecoverPerformer(TsFileResource tsFileResource) { + protected AbstractTsFileRecoverPerformer(TsFileResource tsFileResource) { this.tsFileResource = tsFileResource; } diff --git a/server/src/main/java/org/apache/iotdb/db/wal/utils/listener/AbstractResultListener.java b/server/src/main/java/org/apache/iotdb/db/wal/utils/listener/AbstractResultListener.java index 349e464007..8b19dc4470 100644 --- a/server/src/main/java/org/apache/iotdb/db/wal/utils/listener/AbstractResultListener.java +++ b/server/src/main/java/org/apache/iotdb/db/wal/utils/listener/AbstractResultListener.java @@ -31,7 +31,7 @@ public abstract class AbstractResultListener { protected volatile Status status; protected volatile Exception cause; - public AbstractResultListener(boolean wait) { + protected AbstractResultListener(boolean wait) { this.wait = wait; this.status = Status.RUNNING; this.cause = null; -- GitLab