encapsulate insertTargetName in Tablet
diff --git a/tsfile/src/main/java/org/apache/tsfile/write/TsFileWriter.java b/tsfile/src/main/java/org/apache/tsfile/write/TsFileWriter.java
index b18e80c..6fba9b9 100644
--- a/tsfile/src/main/java/org/apache/tsfile/write/TsFileWriter.java
+++ b/tsfile/src/main/java/org/apache/tsfile/write/TsFileWriter.java
@@ -319,7 +319,7 @@
}
private void checkIsTableExist(Tablet tablet) throws WriteProcessException {
- String tableName = tablet.insertTargetName;
+ String tableName = tablet.getTableName();
final TableSchema tableSchema = getSchema().getTableSchemaMap().get(tableName);
if (tableSchema == null) {
throw new NoTableException(tableName);
@@ -341,7 +341,7 @@
private void checkIsTimeseriesExist(Tablet tablet, boolean isAligned)
throws WriteProcessException, IOException {
- final IDeviceID deviceID = IDeviceID.Factory.DEFAULT_FACTORY.create(tablet.insertTargetName);
+ final IDeviceID deviceID = IDeviceID.Factory.DEFAULT_FACTORY.create(tablet.getDeviceId());
IChunkGroupWriter groupWriter = tryToInitialGroupWriter(deviceID, isAligned);
List<IMeasurementSchema> schemas = tablet.getSchemas();
@@ -487,7 +487,7 @@
// get corresponding ChunkGroupWriter and write this Tablet
recordCount +=
groupWriters
- .get(IDeviceID.Factory.DEFAULT_FACTORY.create(tablet.insertTargetName))
+ .get(IDeviceID.Factory.DEFAULT_FACTORY.create(tablet.getDeviceId()))
.write(tablet);
return checkMemorySizeAndMayFlushChunks();
}
@@ -498,7 +498,7 @@
// get corresponding ChunkGroupWriter and write this Tablet
recordCount +=
groupWriters
- .get(IDeviceID.Factory.DEFAULT_FACTORY.create(tablet.insertTargetName))
+ .get(IDeviceID.Factory.DEFAULT_FACTORY.create(tablet.getDeviceId()))
.write(tablet);
return checkMemorySizeAndMayFlushChunks();
}
diff --git a/tsfile/src/main/java/org/apache/tsfile/write/record/Tablet.java b/tsfile/src/main/java/org/apache/tsfile/write/record/Tablet.java
index a3586d0..ddf1c31 100644
--- a/tsfile/src/main/java/org/apache/tsfile/write/record/Tablet.java
+++ b/tsfile/src/main/java/org/apache/tsfile/write/record/Tablet.java
@@ -57,7 +57,7 @@
private static final String NOT_SUPPORT_DATATYPE = "Data type %s is not supported.";
/** DeviceId if using tree-view interfaces or TableName when using table-view interfaces. */
- public String insertTargetName;
+ private String insertTargetName;
/** The list of {@link MeasurementSchema}s for creating the {@link Tablet} */
private List<IMeasurementSchema> schemas;
@@ -929,4 +929,35 @@
return result;
}
}
+
+ /**
+ * A tree-interface.
+ *
+ * @return the insertTargetName as the deviceId
+ */
+ public String getDeviceId() {
+ return insertTargetName;
+ }
+
+ /**
+ * A tree-interface.
+ *
+ * @param deviceId set the deviceId as the insertTargetName
+ */
+ public void setDeviceId(String deviceId) {
+ this.insertTargetName = deviceId;
+ }
+
+ public String getTableName() {
+ return insertTargetName;
+ }
+
+ /**
+ * A table-interface.
+ *
+ * @param tableName set the tableName as the insertTargetName
+ */
+ public void setTableName(String tableName) {
+ this.insertTargetName = tableName;
+ }
}
diff --git a/tsfile/src/test/java/org/apache/tsfile/tableview/PerformanceTest.java b/tsfile/src/test/java/org/apache/tsfile/tableview/PerformanceTest.java
index ddeffb9..f19ed61 100644
--- a/tsfile/src/test/java/org/apache/tsfile/tableview/PerformanceTest.java
+++ b/tsfile/src/test/java/org/apache/tsfile/tableview/PerformanceTest.java
@@ -272,7 +272,7 @@
}
private void fillTreeTablet(Tablet tablet, int tableNum, int deviceNum, int tabletNum) {
- tablet.insertTargetName = genTreeDeviceId(tableNum, deviceNum).toString();
+ tablet.setDeviceId(genTreeDeviceId(tableNum, deviceNum).toString());
for (int i = 0; i < measurementSchemaCnt; i++) {
long[] values = (long[]) tablet.values[i];
for (int valNum = 0; valNum < pointPerSeries; valNum++) {
@@ -295,7 +295,7 @@
private void fillTableTablet(Tablet tablet, int tableNum, int deviceNum, int tabletNum) {
IDeviceID deviceID = genTableDeviceId(tableNum, deviceNum);
- tablet.insertTargetName = deviceID.segment(0).toString();
+ tablet.setTableName(deviceID.segment(0).toString());
for (int i = 0; i < idSchemaCnt; i++) {
String[] strings = ((String[]) tablet.values[i]);
for (int rowNum = 0; rowNum < pointPerSeries; rowNum++) {
