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 2021/08/26 10:07:22 UTC
[iotdb] 01/01: Remove change timestamp datatype config
This is an automated email from the ASF dual-hosted git repository.
haonan pushed a commit to branch timestamp
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit ec2ef0329397c606ccbff7f53e6e11568b9c968c
Author: HTHou <hh...@outlook.com>
AuthorDate: Thu Aug 26 18:06:50 2021 +0800
Remove change timestamp datatype config
---
server/src/assembly/resources/conf/iotdb-engine.properties | 4 ----
.../main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java | 6 ------
.../org/apache/iotdb/tsfile/common/conf/TSFileConfig.java | 13 +++++++------
.../apache/iotdb/tsfile/common/conf/TSFileDescriptor.java | 2 --
.../apache/iotdb/tsfile/write/schema/MeasurementSchema.java | 3 +--
.../apache/iotdb/tsfile/write/schema/TimeseriesSchema.java | 3 +--
.../iotdb/tsfile/write/schema/VectorMeasurementSchema.java | 3 +--
7 files changed, 10 insertions(+), 24 deletions(-)
diff --git a/server/src/assembly/resources/conf/iotdb-engine.properties b/server/src/assembly/resources/conf/iotdb-engine.properties
index c07ada1..2ce3195 100644
--- a/server/src/assembly/resources/conf/iotdb-engine.properties
+++ b/server/src/assembly/resources/conf/iotdb-engine.properties
@@ -716,10 +716,6 @@ timestamp_precision=ms
# Datatype: int [xsy]
# max_number_of_points_in_page=1048576
-# Data type configuration
-# Data type for input timestamp, supports INT32 or INT64
-# time_series_data_type=INT64
-
# Max size limitation of input string
# Datatype: int [xsy]
# max_string_length=128
diff --git a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java
index 40d346e..1ce5661 100644
--- a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java
+++ b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java
@@ -957,12 +957,6 @@ public class IoTDBDescriptor {
TSFileDescriptor.getInstance().getConfig().getMaxNumberOfPointsInPage()))));
TSFileDescriptor.getInstance()
.getConfig()
- .setTimeSeriesDataType(
- properties.getProperty(
- "time_series_data_type",
- TSFileDescriptor.getInstance().getConfig().getTimeSeriesDataType()));
- TSFileDescriptor.getInstance()
- .getConfig()
.setMaxStringLength(
Integer.parseInt(
properties.getProperty(
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/common/conf/TSFileConfig.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/common/conf/TSFileConfig.java
index 08db1d1..c67271d 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/common/conf/TSFileConfig.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/common/conf/TSFileConfig.java
@@ -19,6 +19,7 @@
package org.apache.iotdb.tsfile.common.conf;
import org.apache.iotdb.tsfile.file.metadata.enums.CompressionType;
+import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
import org.apache.iotdb.tsfile.fileSystem.FSType;
import java.io.Serializable;
@@ -76,8 +77,8 @@ public class TSFileConfig implements Serializable {
private int maxNumberOfPointsInPage = 1024 * 1024;
/** The maximum degree of a metadataIndex node, default value is 256 */
private int maxDegreeOfIndexNode = 256;
- /** Data type for input timestamp, TsFile supports INT32 or INT64. */
- private String timeSeriesDataType = "INT64";
+ /** Data type for input timestamp, TsFile supports INT64. */
+ private TSDataType timestampDataType = TSDataType.INT64;
/** Max length limitation of input string. */
private int maxStringLength = 128;
/** Floating-point precision. */
@@ -179,14 +180,14 @@ public class TSFileConfig implements Serializable {
this.maxDegreeOfIndexNode = maxDegreeOfIndexNode;
}
- public String getTimeSeriesDataType() {
- return timeSeriesDataType;
+ public TSDataType getTimestampDataType() {
+ return timestampDataType;
}
// TS_2DIFF configuration
- public void setTimeSeriesDataType(String timeSeriesDataType) {
- this.timeSeriesDataType = timeSeriesDataType;
+ public void setTimeSeriesDataType(TSDataType timestampDataType) {
+ this.timestampDataType = timestampDataType;
}
public int getMaxStringLength() {
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/common/conf/TSFileDescriptor.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/common/conf/TSFileDescriptor.java
index d0b6ff4..67b6a03 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/common/conf/TSFileDescriptor.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/common/conf/TSFileDescriptor.java
@@ -127,8 +127,6 @@ public class TSFileDescriptor {
Integer.parseInt(
properties.getProperty(
"max_degree_of_index_node", Integer.toString(conf.getMaxDegreeOfIndexNode()))));
- conf.setTimeSeriesDataType(
- properties.getProperty("time_series_data_type", conf.getTimeSeriesDataType()));
conf.setMaxStringLength(
Integer.parseInt(
properties.getProperty(
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/schema/MeasurementSchema.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/schema/MeasurementSchema.java
index 48dc710..71acadc 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/schema/MeasurementSchema.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/schema/MeasurementSchema.java
@@ -217,8 +217,7 @@ public class MeasurementSchema
public Encoder getTimeEncoder() {
TSEncoding timeEncoding =
TSEncoding.valueOf(TSFileDescriptor.getInstance().getConfig().getTimeEncoder());
- TSDataType timeType =
- TSDataType.valueOf(TSFileDescriptor.getInstance().getConfig().getTimeSeriesDataType());
+ TSDataType timeType = TSFileDescriptor.getInstance().getConfig().getTimestampDataType();
return TSEncodingBuilder.getEncodingBuilder(timeEncoding).getEncoder(timeType);
}
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/schema/TimeseriesSchema.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/schema/TimeseriesSchema.java
index 2d230ee..b1e7a76 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/schema/TimeseriesSchema.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/schema/TimeseriesSchema.java
@@ -149,8 +149,7 @@ public class TimeseriesSchema implements Comparable<TimeseriesSchema>, Serializa
public Encoder getTimeEncoder() {
TSEncoding timeEncoding =
TSEncoding.valueOf(TSFileDescriptor.getInstance().getConfig().getTimeEncoder());
- TSDataType timeType =
- TSDataType.valueOf(TSFileDescriptor.getInstance().getConfig().getTimeSeriesDataType());
+ TSDataType timeType = TSFileDescriptor.getInstance().getConfig().getTimestampDataType();
return TSEncodingBuilder.getEncodingBuilder(timeEncoding).getEncoder(timeType);
}
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/schema/VectorMeasurementSchema.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/schema/VectorMeasurementSchema.java
index 9808978..1e9afd2 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/schema/VectorMeasurementSchema.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/schema/VectorMeasurementSchema.java
@@ -143,8 +143,7 @@ public class VectorMeasurementSchema
public Encoder getTimeEncoder() {
TSEncoding timeEncoding =
TSEncoding.valueOf(TSFileDescriptor.getInstance().getConfig().getTimeEncoder());
- TSDataType timeType =
- TSDataType.valueOf(TSFileDescriptor.getInstance().getConfig().getTimeSeriesDataType());
+ TSDataType timeType = TSFileDescriptor.getInstance().getConfig().getTimestampDataType();
return TSEncodingBuilder.getEncodingBuilder(timeEncoding).getEncoder(timeType);
}