This is an automated email from the ASF dual-hosted git repository. ejttianyu pushed a commit to branch dev_new_merge in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 53f59d8d39858e0c87476eef8e70db6498540c01 Author: EJTTianyu <[email protected]> AuthorDate: Fri Jun 12 15:19:14 2020 +0800 add exception log --- .../iotdb/db/engine/MetadataManagerHelper.java | 1 + .../apache/iotdb/db/engine/merge/MergeTest.java | 45 ++++++++++++---------- .../iotdb/db/integration/IoTDBSensorUpdateIT.java | 3 -- 3 files changed, 26 insertions(+), 23 deletions(-) diff --git a/server/src/test/java/org/apache/iotdb/db/engine/MetadataManagerHelper.java b/server/src/test/java/org/apache/iotdb/db/engine/MetadataManagerHelper.java index 78806da..77ea60d 100644 --- a/server/src/test/java/org/apache/iotdb/db/engine/MetadataManagerHelper.java +++ b/server/src/test/java/org/apache/iotdb/db/engine/MetadataManagerHelper.java @@ -84,6 +84,7 @@ public class MetadataManagerHelper { TSEncoding.PLAIN, compressionType, Collections.emptyMap()); } catch (Exception e) { + System.err.println(e); throw new RuntimeException("Initialize the metadata manager failed", e); } } diff --git a/server/src/test/java/org/apache/iotdb/db/engine/merge/MergeTest.java b/server/src/test/java/org/apache/iotdb/db/engine/merge/MergeTest.java index 15626ba..2885fa5 100644 --- a/server/src/test/java/org/apache/iotdb/db/engine/merge/MergeTest.java +++ b/server/src/test/java/org/apache/iotdb/db/engine/merge/MergeTest.java @@ -167,29 +167,34 @@ public abstract class MergeTest { void prepareFile(TsFileResource tsFileResource, long timeOffset, long ptNum, long valueOffset) throws IOException, WriteProcessException { - TsFileWriter fileWriter = new TsFileWriter(tsFileResource.getFile()); - for (String deviceId : deviceIds) { - for (MeasurementSchema measurementSchema : measurementSchemas) { - fileWriter.registerTimeseries( - new Path(deviceId, measurementSchema.getMeasurementId()), measurementSchema); - } - } - for (long i = timeOffset; i < timeOffset + ptNum; i++) { - for (int j = 0; j < deviceNum; j++) { - TSRecord record = new TSRecord(i, deviceIds[j]); - for (int k = 0; k < measurementNum; k++) { - record.addTuple(DataPoint.getDataPoint(measurementSchemas[k].getType(), - measurementSchemas[k].getMeasurementId(), String.valueOf(i + valueOffset))); + try { + TsFileWriter fileWriter = new TsFileWriter(tsFileResource.getFile()); + + for (String deviceId : deviceIds) { + for (MeasurementSchema measurementSchema : measurementSchemas) { + fileWriter.registerTimeseries( + new Path(deviceId, measurementSchema.getMeasurementId()), measurementSchema); } - fileWriter.write(record); - tsFileResource.updateStartTime(deviceIds[j], i); - tsFileResource.updateEndTime(deviceIds[j], i); } - if ((i + 1) % flushInterval == 0) { - fileWriter.flushAllChunkGroups(); + for (long i = timeOffset; i < timeOffset + ptNum; i++) { + for (int j = 0; j < deviceNum; j++) { + TSRecord record = new TSRecord(i, deviceIds[j]); + for (int k = 0; k < measurementNum; k++) { + record.addTuple(DataPoint.getDataPoint(measurementSchemas[k].getType(), + measurementSchemas[k].getMeasurementId(), String.valueOf(i + valueOffset))); + } + fileWriter.write(record); + tsFileResource.updateStartTime(deviceIds[j], i); + tsFileResource.updateEndTime(deviceIds[j], i); + } + if ((i + 1) % flushInterval == 0) { + fileWriter.flushAllChunkGroups(); + } } + fileWriter.writeVersion(tsFileResource.getHistoricalVersions().iterator().next()); + fileWriter.close(); + } catch (Exception e){ + System.err.println(e); } - fileWriter.writeVersion(tsFileResource.getHistoricalVersions().iterator().next()); - fileWriter.close(); } } \ No newline at end of file diff --git a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBSensorUpdateIT.java b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBSensorUpdateIT.java index 9999f9b..c404297 100644 --- a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBSensorUpdateIT.java +++ b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBSensorUpdateIT.java @@ -25,8 +25,6 @@ import java.sql.DriverManager; import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Statement; -import org.apache.iotdb.db.conf.IoTDBDescriptor; -import org.apache.iotdb.db.engine.merge.seqMerge.SeqMergeFileStrategy; import org.apache.iotdb.db.utils.EnvironmentUtils; import org.apache.iotdb.jdbc.Config; import org.junit.After; @@ -39,7 +37,6 @@ public class IoTDBSensorUpdateIT { public void setUp() throws Exception { EnvironmentUtils.closeStatMonitor(); EnvironmentUtils.envSetUp(); - IoTDBDescriptor.getInstance().getConfig().setSeqMergeFileStrategy(SeqMergeFileStrategy.INPLACE); Class.forName(Config.JDBC_DRIVER_NAME); }
