This is an automated email from the ASF dual-hosted git repository. qiaojialin pushed a commit to branch rel/0.10 in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit c11f9a756b64ac55fb7d84284dcf031adf3907a7 Author: JackieTien97 <[email protected]> AuthorDate: Mon Jul 13 14:54:04 2020 +0800 reformat code --- .../iotdb/hadoop/tsfile/TSFRecordReader.java | 27 +++++++++++++--------- .../iotdb/hadoop/tsfile/TSFRecordWriter.java | 3 ++- 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/hadoop/src/main/java/org/apache/iotdb/hadoop/tsfile/TSFRecordReader.java b/hadoop/src/main/java/org/apache/iotdb/hadoop/tsfile/TSFRecordReader.java index a0e3983..3d042cc 100644 --- a/hadoop/src/main/java/org/apache/iotdb/hadoop/tsfile/TSFRecordReader.java +++ b/hadoop/src/main/java/org/apache/iotdb/hadoop/tsfile/TSFRecordReader.java @@ -18,8 +18,20 @@ */ package org.apache.iotdb.hadoop.tsfile; +import static java.util.stream.Collectors.toList; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; import org.apache.hadoop.conf.Configuration; -import org.apache.hadoop.io.*; +import org.apache.hadoop.io.BooleanWritable; +import org.apache.hadoop.io.DoubleWritable; +import org.apache.hadoop.io.FloatWritable; +import org.apache.hadoop.io.IntWritable; +import org.apache.hadoop.io.LongWritable; +import org.apache.hadoop.io.MapWritable; +import org.apache.hadoop.io.NullWritable; +import org.apache.hadoop.io.Text; import org.apache.hadoop.mapreduce.InputSplit; import org.apache.hadoop.mapreduce.RecordReader; import org.apache.hadoop.mapreduce.TaskAttemptContext; @@ -35,12 +47,6 @@ import org.apache.iotdb.tsfile.read.query.dataset.QueryDataSet; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; - -import static java.util.stream.Collectors.toList; - public class TSFRecordReader extends RecordReader<NullWritable, MapWritable> implements IReaderSet { private static final Logger logger = LoggerFactory.getLogger(TSFRecordReader.class); @@ -100,12 +106,11 @@ public class TSFRecordReader extends RecordReader<NullWritable, MapWritable> imp ReadOnlyTsFile queryEngine = new ReadOnlyTsFile(reader); for (String deviceId : deviceIds) { List<Path> paths = measurementIds.stream() - .map( - measurementId -> new Path(deviceId + TsFileConstant.PATH_SEPARATOR + measurementId)) - .collect(toList()); + .map(measurementId -> new Path(deviceId + TsFileConstant.PATH_SEPARATOR + measurementId)) + .collect(toList()); QueryExpression queryExpression = QueryExpression.create(paths, null); QueryDataSet dataSet = queryEngine.query(queryExpression, - split.getStart(), split.getStart() + split.getLength()); + split.getStart(), split.getStart() + split.getLength()); dataSetList.add(dataSet); deviceIdList.add(deviceId); } diff --git a/hadoop/src/main/java/org/apache/iotdb/hadoop/tsfile/TSFRecordWriter.java b/hadoop/src/main/java/org/apache/iotdb/hadoop/tsfile/TSFRecordWriter.java index 7e064d6..ca468f3 100644 --- a/hadoop/src/main/java/org/apache/iotdb/hadoop/tsfile/TSFRecordWriter.java +++ b/hadoop/src/main/java/org/apache/iotdb/hadoop/tsfile/TSFRecordWriter.java @@ -45,7 +45,8 @@ public class TSFRecordWriter extends RecordWriter<NullWritable, HDFSTSRecord> { } @Override - public synchronized void write(NullWritable key, HDFSTSRecord value) throws IOException, InterruptedException { + public synchronized void write(NullWritable key, HDFSTSRecord value) + throws IOException, InterruptedException { try { writer.write(value.convertToTSRecord()); } catch (WriteProcessException e) {
