You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by hx...@apache.org on 2019/09/26 17:19:04 UTC

[incubator-iotdb] 04/12: fix tsfile example data type

This is an automated email from the ASF dual-hosted git repository.

hxd pushed a commit to branch rel/0.8
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git

commit 66d0d9d4cd794e62dd9cd31bc6ba826ed697fc9a
Author: qiaojialin <64...@qq.com>
AuthorDate: Fri Sep 6 15:35:14 2019 +0800

    fix tsfile example data type
---
 docs/Documentation/UserGuide/7-TsFile/2-Usage.md   | 20 ++++---
 .../java/org/apache/iotdb/tsfile/TsFileWrite.java  | 66 +++-------------------
 2 files changed, 20 insertions(+), 66 deletions(-)

diff --git a/docs/Documentation/UserGuide/7-TsFile/2-Usage.md b/docs/Documentation/UserGuide/7-TsFile/2-Usage.md
index 89b2b68..b38d7c2 100644
--- a/docs/Documentation/UserGuide/7-TsFile/2-Usage.md
+++ b/docs/Documentation/UserGuide/7-TsFile/2-Usage.md
@@ -219,22 +219,24 @@ public class TsFileWrite {
 
       // 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/tsfile/example/src/main/java/org/apache/iotdb/tsfile/TsFileWrite.java b/tsfile/example/src/main/java/org/apache/iotdb/tsfile/TsFileWrite.java
index 3b6cfeb..a93a71d 100644
--- a/tsfile/example/src/main/java/org/apache/iotdb/tsfile/TsFileWrite.java
+++ b/tsfile/example/src/main/java/org/apache/iotdb/tsfile/TsFileWrite.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 to TsFile
@@ -46,73 +47,24 @@ public class TsFileWrite {
 
       // 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();