You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by qi...@apache.org on 2019/09/06 07:35:47 UTC
[incubator-iotdb] 01/01: fix tsfile example data type
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch fix_tsfile_example
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 606c67dbe59e7d6f9de37d38a95879a3c99ac069
Author: qiaojialin <64...@qq.com>
AuthorDate: Fri Sep 6 15:35:14 2019 +0800
fix tsfile example data type
---
docs/Documentation/UserGuide/8-TsFile/2-Usage.md | 20 ++++---
.../iotdb/tsfile/TsFileWriteWithTSRecord.java | 66 +++-------------------
2 files changed, 20 insertions(+), 66 deletions(-)
diff --git a/docs/Documentation/UserGuide/8-TsFile/2-Usage.md b/docs/Documentation/UserGuide/8-TsFile/2-Usage.md
index ae8bb14..329ba40 100644
--- a/docs/Documentation/UserGuide/8-TsFile/2-Usage.md
+++ b/docs/Documentation/UserGuide/8-TsFile/2-Usage.md
@@ -221,22 +221,24 @@ public class TsFileWriteWithTSRecord {
// add measurements into file schema
tsFileWriter
- .addMeasurement(new MeasurementSchema("sensor_1", TSDataType.FLOAT, TSEncoding.RLE));
+ .addMeasurement(new MeasurementSchema("sensor_1", TSDataType.INT64, TSEncoding.RLE));
tsFileWriter
- .addMeasurement(new MeasurementSchema("sensor_2", TSDataType.INT32, TSEncoding.TS_2DIFF));
+ .addMeasurement(new MeasurementSchema("sensor_2", TSDataType.INT64, TSEncoding.RLE));
tsFileWriter
- .addMeasurement(new MeasurementSchema("sensor_3", TSDataType.INT32, TSEncoding.TS_2DIFF));
+ .addMeasurement(new MeasurementSchema("sensor_3", TSDataType.INT64, TSEncoding.RLE));
+
// construct TSRecord
TSRecord tsRecord = new TSRecord(1, "device_1");
- DataPoint dPoint1 = new FloatDataPoint("sensor_1", 1.2f);
- DataPoint dPoint2 = new IntDataPoint("sensor_2", 20);
-
- //For time 1 in device_1, the data will be 1.2, 20, null
+ DataPoint dPoint1 = new LongDataPoint("sensor_1", 1);
+ DataPoint dPoint2 = new LongDataPoint("sensor_2", 2);
+ DataPoint dPoint3 = new LongDataPoint("sensor_3", 3);
tsRecord.addTuple(dPoint1);
tsRecord.addTuple(dPoint2);
-
- // write a TSRecord to TsFile
+ tsRecord.addTuple(dPoint3);
+
+ // write TSRecord
tsFileWriter.write(tsRecord);
+
// close TsFile
tsFileWriter.close();
} catch (Throwable e) {
diff --git a/example/tsfile/src/main/java/org/apache/iotdb/tsfile/TsFileWriteWithTSRecord.java b/example/tsfile/src/main/java/org/apache/iotdb/tsfile/TsFileWriteWithTSRecord.java
index dab14db..f664086 100644
--- a/example/tsfile/src/main/java/org/apache/iotdb/tsfile/TsFileWriteWithTSRecord.java
+++ b/example/tsfile/src/main/java/org/apache/iotdb/tsfile/TsFileWriteWithTSRecord.java
@@ -27,6 +27,7 @@ import org.apache.iotdb.tsfile.write.record.TSRecord;
import org.apache.iotdb.tsfile.write.record.datapoint.DataPoint;
import org.apache.iotdb.tsfile.write.record.datapoint.FloatDataPoint;
import org.apache.iotdb.tsfile.write.record.datapoint.IntDataPoint;
+import org.apache.iotdb.tsfile.write.record.datapoint.LongDataPoint;
import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
/**
* An example of writing data with TSRecord to TsFile
@@ -46,73 +47,24 @@ public class TsFileWriteWithTSRecord {
// add measurements into file schema
tsFileWriter
- .addMeasurement(new MeasurementSchema("sensor_1", TSDataType.FLOAT, TSEncoding.RLE));
+ .addMeasurement(new MeasurementSchema("sensor_1", TSDataType.INT64, TSEncoding.RLE));
tsFileWriter
- .addMeasurement(new MeasurementSchema("sensor_2", TSDataType.INT32, TSEncoding.TS_2DIFF));
+ .addMeasurement(new MeasurementSchema("sensor_2", TSDataType.INT64, TSEncoding.RLE));
tsFileWriter
- .addMeasurement(new MeasurementSchema("sensor_3", TSDataType.INT32, TSEncoding.TS_2DIFF));
+ .addMeasurement(new MeasurementSchema("sensor_3", TSDataType.INT64, TSEncoding.RLE));
+
// construct TSRecord
TSRecord tsRecord = new TSRecord(1, "device_1");
- DataPoint dPoint1 = new FloatDataPoint("sensor_1", 1.2f);
- DataPoint dPoint2 = new IntDataPoint("sensor_2", 20);
- DataPoint dPoint3;
- tsRecord.addTuple(dPoint1);
- tsRecord.addTuple(dPoint2);
-
- // write a TSRecord to TsFile
- tsFileWriter.write(tsRecord);
-
- tsRecord = new TSRecord(2, "device_1");
- dPoint2 = new IntDataPoint("sensor_2", 20);
- dPoint3 = new IntDataPoint("sensor_3", 50);
- tsRecord.addTuple(dPoint2);
- tsRecord.addTuple(dPoint3);
- tsFileWriter.write(tsRecord);
-
- tsRecord = new TSRecord(3, "device_1");
- dPoint1 = new FloatDataPoint("sensor_1", 1.4f);
- dPoint2 = new IntDataPoint("sensor_2", 21);
- tsRecord.addTuple(dPoint1);
- tsRecord.addTuple(dPoint2);
- tsFileWriter.write(tsRecord);
-
- tsRecord = new TSRecord(4, "device_1");
- dPoint1 = new FloatDataPoint("sensor_1", 1.2f);
- dPoint2 = new IntDataPoint("sensor_2", 20);
- dPoint3 = new IntDataPoint("sensor_3", 51);
+ DataPoint dPoint1 = new LongDataPoint("sensor_1", 1);
+ DataPoint dPoint2 = new LongDataPoint("sensor_2", 2);
+ DataPoint dPoint3 = new LongDataPoint("sensor_3", 3);
tsRecord.addTuple(dPoint1);
tsRecord.addTuple(dPoint2);
tsRecord.addTuple(dPoint3);
- tsFileWriter.write(tsRecord);
- tsRecord = new TSRecord(6, "device_1");
- dPoint1 = new FloatDataPoint("sensor_1", 7.2f);
- dPoint2 = new IntDataPoint("sensor_2", 10);
- dPoint3 = new IntDataPoint("sensor_3", 11);
- tsRecord.addTuple(dPoint1);
- tsRecord.addTuple(dPoint2);
- tsRecord.addTuple(dPoint3);
- tsFileWriter.write(tsRecord);
-
- tsRecord = new TSRecord(7, "device_1");
- dPoint1 = new FloatDataPoint("sensor_1", 6.2f);
- dPoint2 = new IntDataPoint("sensor_2", 20);
- dPoint3 = new IntDataPoint("sensor_3", 21);
- tsRecord.addTuple(dPoint1);
- tsRecord.addTuple(dPoint2);
- tsRecord.addTuple(dPoint3);
+ // write TSRecord
tsFileWriter.write(tsRecord);
- tsRecord = new TSRecord(8, "device_1");
- dPoint1 = new FloatDataPoint("sensor_1", 9.2f);
- dPoint2 = new IntDataPoint("sensor_2", 30);
- dPoint3 = new IntDataPoint("sensor_3", 31);
- tsRecord.addTuple(dPoint1);
- tsRecord.addTuple(dPoint2);
- tsRecord.addTuple(dPoint3);
- tsFileWriter.write(tsRecord);
-
- // close TsFile
tsFileWriter.close();
} catch (Throwable e) {
e.printStackTrace();