You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ha...@apache.org on 2022/11/25 07:17:15 UTC
[iotdb] branch Opti_mem_check created (now 9c9dcc43b8)
This is an automated email from the ASF dual-hosted git repository.
haonan pushed a change to branch Opti_mem_check
in repository https://gitbox.apache.org/repos/asf/iotdb.git
at 9c9dcc43b8 Remove redundant PartialPath init in TsFileProcessor
This branch includes the following new commits:
new 9c9dcc43b8 Remove redundant PartialPath init in TsFileProcessor
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[iotdb] 01/01: Remove redundant PartialPath init in TsFileProcessor
Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
haonan pushed a commit to branch Opti_mem_check
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 9c9dcc43b89474553df4a7a349c826bc77cb3aaa
Author: HTHou <hh...@outlook.com>
AuthorDate: Fri Nov 25 15:17:02 2022 +0800
Remove redundant PartialPath init in TsFileProcessor
---
.../db/engine/storagegroup/TsFileProcessor.java | 38 ++++------------------
1 file changed, 6 insertions(+), 32 deletions(-)
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileProcessor.java b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileProcessor.java
index f98ba38670..6b98732236 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileProcessor.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileProcessor.java
@@ -20,7 +20,6 @@ package org.apache.iotdb.db.engine.storagegroup;
import org.apache.iotdb.common.rpc.thrift.TSStatus;
import org.apache.iotdb.commons.conf.CommonDescriptor;
-import org.apache.iotdb.commons.exception.IllegalPathException;
import org.apache.iotdb.commons.exception.MetadataException;
import org.apache.iotdb.commons.path.AlignedPath;
import org.apache.iotdb.commons.path.PartialPath;
@@ -376,12 +375,7 @@ public class TsFileProcessor {
long textDataIncrement = 0L;
long chunkMetadataIncrement = 0L;
// get device id
- IDeviceID deviceID;
- try {
- deviceID = getDeviceID(deviceId);
- } catch (IllegalPathException e) {
- throw new WriteProcessException(e);
- }
+ IDeviceID deviceID = getDeviceID(deviceId);
for (int i = 0; i < dataTypes.length; i++) {
// skip failed Measurements
@@ -419,12 +413,7 @@ public class TsFileProcessor {
long chunkMetadataIncrement = 0L;
AlignedWritableMemChunk alignedMemChunk = null;
// get device id
- IDeviceID deviceID;
- try {
- deviceID = getDeviceID(deviceId);
- } catch (IllegalPathException e) {
- throw new WriteProcessException(e);
- }
+ IDeviceID deviceID = getDeviceID(deviceId);
if (workMemTable.checkIfChunkDoesNotExist(deviceID, AlignedPath.VECTOR_PLACEHOLDER)) {
// ChunkMetadataIncrement
@@ -478,12 +467,7 @@ public class TsFileProcessor {
long[] memIncrements = new long[3]; // memTable, text, chunk metadata
// get device id
- IDeviceID deviceID;
- try {
- deviceID = getDeviceID(deviceId);
- } catch (IllegalPathException e) {
- throw new WriteProcessException(e);
- }
+ IDeviceID deviceID = getDeviceID(deviceId);
for (int i = 0; i < dataTypes.length; i++) {
// skip failed Measurements
@@ -513,12 +497,7 @@ public class TsFileProcessor {
long[] memIncrements = new long[3]; // memTable, text, chunk metadata
// get device id
- IDeviceID deviceID;
- try {
- deviceID = getDeviceID(deviceId);
- } catch (IllegalPathException e) {
- throw new WriteProcessException(e);
- }
+ IDeviceID deviceID = getDeviceID(deviceId);
updateAlignedMemCost(dataTypes, deviceID, measurements, start, end, memIncrements, columns);
long memTableIncrement = memIncrements[0];
@@ -1502,13 +1481,8 @@ public class TsFileProcessor {
return shouldClose;
}
- private IDeviceID getDeviceID(String deviceId) throws IllegalPathException {
- try {
- return DeviceIDFactory.getInstance().getDeviceID(new PartialPath(deviceId));
- } catch (IllegalPathException e) {
- logger.error("device id is illegal");
- throw e;
- }
+ private IDeviceID getDeviceID(String deviceId) {
+ return DeviceIDFactory.getInstance().getDeviceID(deviceId);
}
public boolean isEmpty() {