This is an automated email from the ASF dual-hosted git repository. xuekaifeng pushed a commit to branch IOTDB-615-Use-binary-rather-than-string-in-insert-plan in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 0ebcea9aeca97e5abad268fbc080e744f19d803c Author: 151250176 <[email protected]> AuthorDate: Tue May 19 16:13:43 2020 +0800 fix bugs --- .../recover/RecoverResourceFromReaderTest.java | 19 +++++++++++++------ .../iotdb/session/IoTDBSessionIteratorIT.java | 21 ++++++++++++++------- 2 files changed, 27 insertions(+), 13 deletions(-) diff --git a/server/src/test/java/org/apache/iotdb/db/writelog/recover/RecoverResourceFromReaderTest.java b/server/src/test/java/org/apache/iotdb/db/writelog/recover/RecoverResourceFromReaderTest.java index a881e01..3c1435b 100644 --- a/server/src/test/java/org/apache/iotdb/db/writelog/recover/RecoverResourceFromReaderTest.java +++ b/server/src/test/java/org/apache/iotdb/db/writelog/recover/RecoverResourceFromReaderTest.java @@ -88,7 +88,8 @@ public class RecoverResourceFromReaderTest { for (int i = 0; i < 10; i++) { for (int j = 0; j < 10; j++) { Path path = new Path(("root.sg.device" + i), ("sensor" + j)); - MeasurementSchema measurementSchema = new MeasurementSchema("sensor" + j, TSDataType.INT64, TSEncoding.PLAIN); + MeasurementSchema measurementSchema = new MeasurementSchema("sensor" + j, TSDataType.INT64, + TSEncoding.PLAIN); schema.registerTimeseries(path, measurementSchema); MManager.getInstance().createTimeseries(path.getFullPath(), measurementSchema.getType(), measurementSchema.getEncodingType(), measurementSchema.getCompressor(), @@ -138,18 +139,23 @@ public class RecoverResourceFromReaderTest { for (int j = 0; j < 10; j++) { String[] measurements = new String[10]; String[] values = new String[10]; + TSDataType[] types = new TSDataType[10]; for (int k = 0; k < 10; k++) { measurements[k] = "sensor" + k; + types[k] = TSDataType.INT64; values[k] = String.valueOf(k + 10); } - InsertPlan insertPlan = new InsertPlan("root.sg.device" + j, i, measurements, values); + InsertPlan insertPlan = new InsertPlan("root.sg.device" + j, i, measurements, + types, values); node.write(insertPlan); } node.notifyStartFlush(); } - InsertPlan insertPlan = new InsertPlan("root.sg.device99", 1, "sensor4", "4"); + InsertPlan insertPlan = new InsertPlan("root.sg.device99", 1, new String[]{"sensor4"}, + new TSDataType[]{TSDataType.INT64}, new String[]{"4"}); node.write(insertPlan); - insertPlan = new InsertPlan("root.sg.device99", 300, "sensor2", "2"); + insertPlan = new InsertPlan("root.sg.device99", 300, new String[]{"sensor2"}, + new TSDataType[]{TSDataType.INT64}, new String[]{"2"}); node.write(insertPlan); node.close(); @@ -174,10 +180,11 @@ public class RecoverResourceFromReaderTest { .getBufferedOutputStream(resourceFile.getPath())) { ReadWriteIOUtils.write(123, outputStream); } - + TsFileRecoverPerformer performer = new TsFileRecoverPerformer(logNodePrefix, versionController, resource, true, false); - ActiveTimeSeriesCounter.getInstance().init(resource.getFile().getParentFile().getParentFile().getName()); + ActiveTimeSeriesCounter.getInstance() + .init(resource.getFile().getParentFile().getParentFile().getName()); performer.recover(); assertEquals(1, (long) resource.getStartTimeMap().get("root.sg.device99")); assertEquals(300, (long) resource.getEndTimeMap().get("root.sg.device99")); diff --git a/session/src/test/java/org/apache/iotdb/session/IoTDBSessionIteratorIT.java b/session/src/test/java/org/apache/iotdb/session/IoTDBSessionIteratorIT.java index 64c9fad..ed6a24b 100644 --- a/session/src/test/java/org/apache/iotdb/session/IoTDBSessionIteratorIT.java +++ b/session/src/test/java/org/apache/iotdb/session/IoTDBSessionIteratorIT.java @@ -153,22 +153,29 @@ public class IoTDBSessionIteratorIT { CompressionType.SNAPPY); String deviceId = "root.sg1.d1"; List<String> measurements = new ArrayList<>(); + List<TSDataType> types = new ArrayList<>(); measurements.add("s1"); measurements.add("s2"); + types.add(TSDataType.INT32); + types.add(TSDataType.FLOAT); + for (long time = 0; time < 10; time++) { - List<String> values = new ArrayList<>(); - values.add("1"); - values.add("2"); - session.insertRecord(deviceId, time, measurements, values); + List<Object> values = new ArrayList<>(); + values.add(1); + values.add(2f); + session.insertRecord(deviceId, time, measurements, types, values); } deviceId = "root.sg1.d2"; measurements = new ArrayList<>(); + types = new ArrayList<>(); measurements.add("s1"); + types.add(TSDataType.DOUBLE); + for (long time = 5; time < 10; time++) { - List<String> values = new ArrayList<>(); - values.add("4"); - session.insertRecord(deviceId, time, measurements, values); + List<Object> values = new ArrayList<>(); + values.add(4d); + session.insertRecord(deviceId, time, measurements, types, values); } }
