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 2020/04/08 12:25:47 UTC
[incubator-iotdb] 05/06: fix compile error caused by rebase
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 4846b4aa8a4f61713cf3fd45c64ef7356b294e8b
Author: 仲炜 <zw...@alibaba-inc.com>
AuthorDate: Wed Apr 1 19:39:32 2020 +0800
fix compile error caused by rebase
---
.../java/org/apache/iotdb/flink/TsFlieUtils.java | 16 ++++++------
.../apache/iotdb/flink/util/TsFileWriteUtil.java | 30 ++++++++++------------
2 files changed, 21 insertions(+), 25 deletions(-)
diff --git a/example/flink/src/main/java/org/apache/iotdb/flink/TsFlieUtils.java b/example/flink/src/main/java/org/apache/iotdb/flink/TsFlieUtils.java
index ed7b722..5b1ffba 100644
--- a/example/flink/src/main/java/org/apache/iotdb/flink/TsFlieUtils.java
+++ b/example/flink/src/main/java/org/apache/iotdb/flink/TsFlieUtils.java
@@ -25,6 +25,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.LongDataPoint;
import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
+import org.apache.iotdb.tsfile.write.schema.Schema;
import java.io.File;
@@ -33,21 +34,20 @@ import java.io.File;
*/
public class TsFlieUtils {
+ private static final String DEFAULT_TEMPLATE = "template";
+
public static void writeTsFile(String path) {
try {
File f = FSFactoryProducer.getFSFactory().getFile(path);
if (f.exists()) {
f.delete();
}
- TsFileWriter tsFileWriter = new TsFileWriter(f);
+ Schema schema = new Schema();
+ schema.extendTemplate(DEFAULT_TEMPLATE, new MeasurementSchema("sensor_1", TSDataType.FLOAT, TSEncoding.RLE));
+ schema.extendTemplate(DEFAULT_TEMPLATE, new MeasurementSchema("sensor_2", TSDataType.INT32, TSEncoding.TS_2DIFF));
+ schema.extendTemplate(DEFAULT_TEMPLATE, new MeasurementSchema("sensor_3", TSDataType.INT32, TSEncoding.TS_2DIFF));
- // add measurements into file schema
- tsFileWriter
- .addMeasurement(new MeasurementSchema("sensor_1", TSDataType.INT64, TSEncoding.RLE));
- tsFileWriter
- .addMeasurement(new MeasurementSchema("sensor_2", TSDataType.INT64, TSEncoding.RLE));
- tsFileWriter
- .addMeasurement(new MeasurementSchema("sensor_3", TSDataType.INT64, TSEncoding.RLE));
+ TsFileWriter tsFileWriter = new TsFileWriter(f, schema);
// construct TSRecord
for (int i = 0; i < 100; i++) {
diff --git a/flink-tsfile-connector/src/test/java/org/apache/iotdb/flink/util/TsFileWriteUtil.java b/flink-tsfile-connector/src/test/java/org/apache/iotdb/flink/util/TsFileWriteUtil.java
index 8dd413c..21d9ab7 100644
--- a/flink-tsfile-connector/src/test/java/org/apache/iotdb/flink/util/TsFileWriteUtil.java
+++ b/flink-tsfile-connector/src/test/java/org/apache/iotdb/flink/util/TsFileWriteUtil.java
@@ -28,6 +28,7 @@ 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.schema.MeasurementSchema;
+import org.apache.iotdb.tsfile.write.schema.Schema;
/**
* Utils used to prepare TsFiles for testing.
@@ -35,21 +36,19 @@ import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
public class TsFileWriteUtil {
public static final String TMP_DIR = "target";
+ private static final String DEFAULT_TEMPLATE = "template";
public static void create1(String tsfilePath) throws Exception {
File f = new File(tsfilePath);
if (f.exists()) {
f.delete();
}
- TsFileWriter tsFileWriter = new TsFileWriter(f);
+ Schema schema = new Schema();
+ schema.extendTemplate(DEFAULT_TEMPLATE, new MeasurementSchema("sensor_1", TSDataType.FLOAT, TSEncoding.RLE));
+ schema.extendTemplate(DEFAULT_TEMPLATE, new MeasurementSchema("sensor_2", TSDataType.INT32, TSEncoding.TS_2DIFF));
+ schema.extendTemplate(DEFAULT_TEMPLATE, new MeasurementSchema("sensor_3", TSDataType.INT32, TSEncoding.TS_2DIFF));
- // add measurements into file schema
- tsFileWriter
- .addMeasurement(new MeasurementSchema("sensor_1", TSDataType.FLOAT, TSEncoding.RLE));
- tsFileWriter
- .addMeasurement(new MeasurementSchema("sensor_2", TSDataType.INT32, TSEncoding.TS_2DIFF));
- tsFileWriter
- .addMeasurement(new MeasurementSchema("sensor_3", TSDataType.INT32, TSEncoding.TS_2DIFF));
+ TsFileWriter tsFileWriter = new TsFileWriter(f, schema);
// construct TSRecord
TSRecord tsRecord = new TSRecord(1, "device_1");
@@ -139,15 +138,12 @@ public class TsFileWriteUtil {
if (f.exists()) {
f.delete();
}
- TsFileWriter tsFileWriter = new TsFileWriter(f);
-
- // add measurements into file schema
- tsFileWriter
- .addMeasurement(new MeasurementSchema("sensor_1", TSDataType.FLOAT, TSEncoding.RLE));
- tsFileWriter
- .addMeasurement(new MeasurementSchema("sensor_2", TSDataType.INT32, TSEncoding.TS_2DIFF));
- tsFileWriter
- .addMeasurement(new MeasurementSchema("sensor_3", TSDataType.INT32, TSEncoding.TS_2DIFF));
+ Schema schema = new Schema();
+ schema.extendTemplate(DEFAULT_TEMPLATE, new MeasurementSchema("sensor_1", TSDataType.FLOAT, TSEncoding.RLE));
+ schema.extendTemplate(DEFAULT_TEMPLATE, new MeasurementSchema("sensor_2", TSDataType.INT32, TSEncoding.TS_2DIFF));
+ schema.extendTemplate(DEFAULT_TEMPLATE, new MeasurementSchema("sensor_3", TSDataType.INT32, TSEncoding.TS_2DIFF));
+
+ TsFileWriter tsFileWriter = new TsFileWriter(f, schema);
// construct TSRecord
TSRecord tsRecord = new TSRecord(9, "device_1");