diff --git a/docs/Documentation-CHN/UserGuide/9-Tools-Hadoop.md b/docs/Documentation-CHN/UserGuide/9-Tools-Hadoop.md index 7930dd5afc055..54c5ebcfac142 100644 --- a/docs/Documentation-CHN/UserGuide/9-Tools-Hadoop.md +++ b/docs/Documentation-CHN/UserGuide/9-Tools-Hadoop.md @@ -152,7 +152,7 @@ TSFInputFormat将tsfile中的数据以多个`MapWritable`记录的形式返回 } ``` -> 注意: 完整的代码示例可以在如下链接中找到：https://github.com/apache/incubator-iotdb/blob/master/example/hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/TSFMRReadExample.java +> 注意: 完整的代码示例可以在如下链接中找到：https://github.com/apache/incubator-iotdb/blob/master/example/hadoop/src/main/java/org/apache/iotdb/hadoop/tsfile/TSFMRReadExample.java ### 写示例: 计算平均数并写入Tsfile中 @@ -213,4 +213,4 @@ TSFInputFormat将tsfile中的数据以多个`MapWritable`记录的形式返回 } } ``` -> 注意: 完整的代码示例可以在如下链接中找到：https://github.com/apache/incubator-iotdb/blob/master/example/hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/TSMRWriteExample.java \ No newline at end of file +> 注意: 完整的代码示例可以在如下链接中找到：https://github.com/apache/incubator-iotdb/blob/master/example/hadoop/src/main/java/org/apache/iotdb/hadoop/tsfile/TSMRWriteExample.java \ No newline at end of file diff --git a/docs/Documentation/UserGuide/9-Tools-Hadoop.md b/docs/Documentation/UserGuide/9-Tools-Hadoop.md index 6fd97b94cc367..4a738c7b51adc 100644 --- a/docs/Documentation/UserGuide/9-Tools-Hadoop.md +++ b/docs/Documentation/UserGuide/9-Tools-Hadoop.md @@ -149,7 +149,7 @@ Then, the `mapper` and `reducer` class is how you deal with the `MapWritable` pr } ``` -> Note: For the complete code, please see the following link: https://github.com/apache/incubator-iotdb/blob/master/example/hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/TSFMRReadExample.java +> Note: For the complete code, please see the following link: https://github.com/apache/incubator-iotdb/blob/master/example/hadoop/src/main/java/org/apache/iotdb//hadoop/tsfile/TSFMRReadExample.java ### Write Example: write the average into Tsfile @@ -210,4 +210,4 @@ Then, the `mapper` and `reducer` class is how you deal with the `MapWritable` pr } } ``` -> Note: For the complete code, please see the following link: https://github.com/apache/incubator-iotdb/blob/master/example/hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/TSMRWriteExample.java \ No newline at end of file +> Note: For the complete code, please see the following link: https://github.com/apache/incubator-iotdb/blob/master/example/hadoop/src/main/java/org/apache/iotdb//hadoop/tsfile/TSMRWriteExample.java \ No newline at end of file diff --git a/example/hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/TSFMRReadExample.java b/example/hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/TSFMRReadExample.java index 97cd5c5b9f123..f3c8049a45e04 100644 --- a/example/hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/TSFMRReadExample.java +++ b/example/hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/TSFMRReadExample.java @@ -28,6 +28,9 @@ import java.io.IOException; import java.net.URISyntaxException; +import org.apache.iotdb.hadoop.tsfile.TSFHadoopException; +import org.apache.iotdb.hadoop.tsfile.TSFInputFormat; +import org.apache.iotdb.hadoop.tsfile.TSFOutputFormat; /** * One example for reading TsFile with MapReduce. diff --git a/example/hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/TSMRWriteExample.java b/example/hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/TSMRWriteExample.java index da847115c3e85..c4e75b30f3332 100644 --- a/example/hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/TSMRWriteExample.java +++ b/example/hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/TSMRWriteExample.java @@ -25,9 +25,12 @@ import org.apache.hadoop.mapreduce.Job; import org.apache.hadoop.mapreduce.Mapper; import org.apache.hadoop.mapreduce.Reducer; +import org.apache.iotdb.hadoop.tsfile.TSFHadoopException; +import org.apache.iotdb.hadoop.tsfile.TSFInputFormat; +import org.apache.iotdb.hadoop.tsfile.TSFOutputFormat; import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding; -import org.apache.iotdb.tsfile.hadoop.record.HDFSTSRecord; +import org.apache.iotdb.hadoop.tsfile.record.HDFSTSRecord; import org.apache.iotdb.tsfile.write.record.datapoint.DataPoint; import org.apache.iotdb.tsfile.write.record.datapoint.DoubleDataPoint; import org.apache.iotdb.tsfile.write.record.datapoint.LongDataPoint; diff --git a/hadoop/src/main/java/org/apache/iotdb/tsfile/fileSystem/HDFSFile.java b/hadoop/src/main/java/org/apache/iotdb/hadoop/fileSystem/HDFSFile.java similarity index 99% rename from hadoop/src/main/java/org/apache/iotdb/tsfile/fileSystem/HDFSFile.java rename to hadoop/src/main/java/org/apache/iotdb/hadoop/fileSystem/HDFSFile.java index 236d2c6a297bf..ee900a5deb26f 100644 --- a/hadoop/src/main/java/org/apache/iotdb/tsfile/fileSystem/HDFSFile.java +++ b/hadoop/src/main/java/org/apache/iotdb/hadoop/fileSystem/HDFSFile.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.tsfile.fileSystem; +package org.apache.iotdb.hadoop.fileSystem; import java.io.BufferedInputStream; import java.io.BufferedOutputStream; diff --git a/hadoop/src/main/java/org/apache/iotdb/tsfile/fileSystem/HDFSInput.java b/hadoop/src/main/java/org/apache/iotdb/hadoop/fileSystem/HDFSInput.java similarity index 98% rename from hadoop/src/main/java/org/apache/iotdb/tsfile/fileSystem/HDFSInput.java rename to hadoop/src/main/java/org/apache/iotdb/hadoop/fileSystem/HDFSInput.java index 824ed8459f6e7..f3d6274c68822 100644 --- a/hadoop/src/main/java/org/apache/iotdb/tsfile/fileSystem/HDFSInput.java +++ b/hadoop/src/main/java/org/apache/iotdb/hadoop/fileSystem/HDFSInput.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.fileSystem; +package org.apache.iotdb.hadoop.fileSystem; import java.io.IOException; import java.io.InputStream; diff --git a/hadoop/src/main/java/org/apache/iotdb/tsfile/fileSystem/HDFSOutput.java b/hadoop/src/main/java/org/apache/iotdb/hadoop/fileSystem/HDFSOutput.java similarity index 98% rename from hadoop/src/main/java/org/apache/iotdb/tsfile/fileSystem/HDFSOutput.java rename to hadoop/src/main/java/org/apache/iotdb/hadoop/fileSystem/HDFSOutput.java index 1083dbc8e1bb4..5efbf6a4336b5 100644 --- a/hadoop/src/main/java/org/apache/iotdb/tsfile/fileSystem/HDFSOutput.java +++ b/hadoop/src/main/java/org/apache/iotdb/hadoop/fileSystem/HDFSOutput.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.fileSystem; +package org.apache.iotdb.hadoop.fileSystem; import java.io.IOException; import java.io.OutputStream; diff --git a/hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/TSFHadoopException.java b/hadoop/src/main/java/org/apache/iotdb/hadoop/tsfile/TSFHadoopException.java similarity index 97% rename from hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/TSFHadoopException.java rename to hadoop/src/main/java/org/apache/iotdb/hadoop/tsfile/TSFHadoopException.java index 63fcce7387126..efd223854a264 100644 --- a/hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/TSFHadoopException.java +++ b/hadoop/src/main/java/org/apache/iotdb/hadoop/tsfile/TSFHadoopException.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.hadoop; +package org.apache.iotdb.hadoop.tsfile; public class TSFHadoopException extends Exception { diff --git a/hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/TSFInputFormat.java b/hadoop/src/main/java/org/apache/iotdb/hadoop/tsfile/TSFInputFormat.java similarity index 99% rename from hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/TSFInputFormat.java rename to hadoop/src/main/java/org/apache/iotdb/hadoop/tsfile/TSFInputFormat.java index ab7ea531b4bd1..736bc299142c3 100644 --- a/hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/TSFInputFormat.java +++ b/hadoop/src/main/java/org/apache/iotdb/hadoop/tsfile/TSFInputFormat.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.hadoop; +package org.apache.iotdb.hadoop.tsfile; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.BlockLocation; @@ -27,7 +27,7 @@ import org.apache.hadoop.io.NullWritable; import org.apache.hadoop.mapreduce.*; import org.apache.hadoop.mapreduce.lib.input.FileInputFormat; -import org.apache.iotdb.tsfile.fileSystem.HDFSInput; +import org.apache.iotdb.hadoop.fileSystem.HDFSInput; import org.apache.iotdb.tsfile.file.metadata.ChunkGroupMetaData; import org.apache.iotdb.tsfile.read.TsFileSequenceReader; import org.slf4j.Logger; diff --git a/hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/TSFInputSplit.java b/hadoop/src/main/java/org/apache/iotdb/hadoop/tsfile/TSFInputSplit.java similarity index 99% rename from hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/TSFInputSplit.java rename to hadoop/src/main/java/org/apache/iotdb/hadoop/tsfile/TSFInputSplit.java index 72d0269982dcf..ac18fe688427b 100644 --- a/hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/TSFInputSplit.java +++ b/hadoop/src/main/java/org/apache/iotdb/hadoop/tsfile/TSFInputSplit.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.hadoop; +package org.apache.iotdb.hadoop.tsfile; import org.apache.hadoop.fs.Path; import org.apache.hadoop.io.Writable; diff --git a/hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/TSFOutputFormat.java b/hadoop/src/main/java/org/apache/iotdb/hadoop/tsfile/TSFOutputFormat.java similarity index 95% rename from hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/TSFOutputFormat.java rename to hadoop/src/main/java/org/apache/iotdb/hadoop/tsfile/TSFOutputFormat.java index 6df422dbb19ff..ee45c1888058a 100644 --- a/hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/TSFOutputFormat.java +++ b/hadoop/src/main/java/org/apache/iotdb/hadoop/tsfile/TSFOutputFormat.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.hadoop; +package org.apache.iotdb.hadoop.tsfile; import org.apache.hadoop.fs.Path; import org.apache.hadoop.io.NullWritable; import org.apache.hadoop.mapreduce.RecordWriter; import org.apache.hadoop.mapreduce.TaskAttemptContext; import org.apache.hadoop.mapreduce.lib.output.FileOutputFormat; -import org.apache.iotdb.tsfile.hadoop.record.HDFSTSRecord; +import org.apache.iotdb.hadoop.tsfile.record.HDFSTSRecord; import org.apache.iotdb.tsfile.write.schema.Schema; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/TSFRecordReader.java b/hadoop/src/main/java/org/apache/iotdb/hadoop/tsfile/TSFRecordReader.java similarity index 98% rename from hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/TSFRecordReader.java rename to hadoop/src/main/java/org/apache/iotdb/hadoop/tsfile/TSFRecordReader.java index fef96b3493877..0bf910dd54a4d 100644 --- a/hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/TSFRecordReader.java +++ b/hadoop/src/main/java/org/apache/iotdb/hadoop/tsfile/TSFRecordReader.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.hadoop; +package org.apache.iotdb.hadoop.tsfile; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.io.*; import org.apache.hadoop.mapreduce.InputSplit; import org.apache.hadoop.mapreduce.RecordReader; import org.apache.hadoop.mapreduce.TaskAttemptContext; -import org.apache.iotdb.tsfile.fileSystem.HDFSInput; +import org.apache.iotdb.hadoop.fileSystem.HDFSInput; import org.apache.iotdb.tsfile.common.constant.TsFileConstant; import org.apache.iotdb.tsfile.read.ReadOnlyTsFile; import org.apache.iotdb.tsfile.read.TsFileSequenceReader; diff --git a/hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/TSFRecordWriter.java b/hadoop/src/main/java/org/apache/iotdb/hadoop/tsfile/TSFRecordWriter.java similarity index 93% rename from hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/TSFRecordWriter.java rename to hadoop/src/main/java/org/apache/iotdb/hadoop/tsfile/TSFRecordWriter.java index af9763ceb47a5..e26448685e085 100644 --- a/hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/TSFRecordWriter.java +++ b/hadoop/src/main/java/org/apache/iotdb/hadoop/tsfile/TSFRecordWriter.java @@ -16,15 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.hadoop; +package org.apache.iotdb.hadoop.tsfile; import org.apache.hadoop.fs.Path; import org.apache.hadoop.io.NullWritable; import org.apache.hadoop.mapreduce.RecordWriter; import org.apache.hadoop.mapreduce.TaskAttemptContext; -import org.apache.iotdb.tsfile.fileSystem.HDFSOutput; +import org.apache.iotdb.hadoop.fileSystem.HDFSOutput; import org.apache.iotdb.tsfile.exception.write.WriteProcessException; -import org.apache.iotdb.tsfile.hadoop.record.HDFSTSRecord; +import org.apache.iotdb.hadoop.tsfile.record.HDFSTSRecord; import org.apache.iotdb.tsfile.write.TsFileWriter; import org.apache.iotdb.tsfile.write.schema.Schema; import org.slf4j.Logger; diff --git a/hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/record/HDFSTSRecord.java b/hadoop/src/main/java/org/apache/iotdb/hadoop/tsfile/record/HDFSTSRecord.java similarity index 99% rename from hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/record/HDFSTSRecord.java rename to hadoop/src/main/java/org/apache/iotdb/hadoop/tsfile/record/HDFSTSRecord.java index 307a1830b9d47..9c6b0fe562605 100644 --- a/hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/record/HDFSTSRecord.java +++ b/hadoop/src/main/java/org/apache/iotdb/hadoop/tsfile/record/HDFSTSRecord.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.hadoop.record; +package org.apache.iotdb.hadoop.tsfile.record; import org.apache.hadoop.io.Writable; import org.apache.iotdb.tsfile.exception.write.UnSupportedDataTypeException; diff --git a/hadoop/src/test/java/org/apache/iotdb/tsfile/hadoop/TSFHadoopTest.java b/hadoop/src/test/java/org/apache/iotdb/tsfile/hadoop/TSFHadoopTest.java index c7062f5523c21..ee5e00d2b8233 100644 --- a/hadoop/src/test/java/org/apache/iotdb/tsfile/hadoop/TSFHadoopTest.java +++ b/hadoop/src/test/java/org/apache/iotdb/tsfile/hadoop/TSFHadoopTest.java @@ -23,7 +23,10 @@ import org.apache.hadoop.mapreduce.Job; import org.apache.hadoop.mapreduce.TaskAttemptID; import org.apache.hadoop.mapreduce.task.TaskAttemptContextImpl; -import org.apache.iotdb.tsfile.fileSystem.HDFSInput; +import org.apache.iotdb.hadoop.fileSystem.HDFSInput; +import org.apache.iotdb.hadoop.tsfile.TSFHadoopException; +import org.apache.iotdb.hadoop.tsfile.TSFInputFormat; +import org.apache.iotdb.hadoop.tsfile.TSFRecordReader; import org.apache.iotdb.tsfile.read.TsFileSequenceReader; import org.junit.After; import org.junit.Before; diff --git a/hadoop/src/test/java/org/apache/iotdb/tsfile/hadoop/TSFInputSplitTest.java b/hadoop/src/test/java/org/apache/iotdb/tsfile/hadoop/TSFInputSplitTest.java index d9aee7b54ea2d..f1a03893cff4a 100644 --- a/hadoop/src/test/java/org/apache/iotdb/tsfile/hadoop/TSFInputSplitTest.java +++ b/hadoop/src/test/java/org/apache/iotdb/tsfile/hadoop/TSFInputSplitTest.java @@ -21,6 +21,7 @@ import org.apache.hadoop.fs.Path; import org.apache.hadoop.io.DataInputBuffer; import org.apache.hadoop.io.DataOutputBuffer; +import org.apache.iotdb.hadoop.tsfile.TSFInputSplit; import org.junit.Before; import org.junit.Test; @@ -32,7 +33,7 @@ import static org.junit.Assert.*; /** - * Test the {@link org.apache.iotdb.tsfile.hadoop.TSFInputSplit} + * Test the {@link TSFInputSplit} * Assert the readFields function and write function is right * * @author Yuan Tian diff --git a/spark-tsfile/src/main/java/org/apache/iotdb/spark/tsfile/io/TsFileRecordWriter.java b/spark-tsfile/src/main/java/org/apache/iotdb/spark/tsfile/io/TsFileRecordWriter.java index b7fdf1d776333..172164b7bcdca 100644 --- a/spark-tsfile/src/main/java/org/apache/iotdb/spark/tsfile/io/TsFileRecordWriter.java +++ b/spark-tsfile/src/main/java/org/apache/iotdb/spark/tsfile/io/TsFileRecordWriter.java @@ -24,7 +24,7 @@ import org.apache.hadoop.mapreduce.RecordWriter; import org.apache.hadoop.mapreduce.TaskAttemptContext; import org.apache.iotdb.tsfile.exception.write.WriteProcessException; -import org.apache.iotdb.tsfile.fileSystem.HDFSOutput; +import org.apache.iotdb.hadoop.fileSystem.HDFSOutput; import org.apache.iotdb.tsfile.write.TsFileWriter; import org.apache.iotdb.tsfile.write.record.TSRecord; import org.apache.iotdb.tsfile.write.schema.Schema; diff --git a/spark-tsfile/src/main/scala/org/apache/iotdb/spark/tsfile/DefaultSource.scala b/spark-tsfile/src/main/scala/org/apache/iotdb/spark/tsfile/DefaultSource.scala index 9e794f75331c0..de13b2a3aecc9 100755 --- a/spark-tsfile/src/main/scala/org/apache/iotdb/spark/tsfile/DefaultSource.scala +++ b/spark-tsfile/src/main/scala/org/apache/iotdb/spark/tsfile/DefaultSource.scala @@ -25,10 +25,10 @@ import java.net.URI import org.apache.hadoop.conf.Configuration import org.apache.hadoop.fs.{FileStatus, Path} import org.apache.hadoop.mapreduce.Job +import org.apache.iotdb.hadoop.fileSystem.HDFSInput import org.apache.iotdb.spark.tsfile.DefaultSource.SerializableConfiguration import org.apache.iotdb.spark.tsfile.qp.Executor import org.apache.iotdb.tsfile.common.constant.QueryConstant -import org.apache.iotdb.tsfile.fileSystem.HDFSInput import org.apache.iotdb.tsfile.read.common.Field import org.apache.iotdb.tsfile.read.query.dataset.QueryDataSet import org.apache.iotdb.tsfile.read.{ReadOnlyTsFile, TsFileSequenceReader} diff --git a/spark-tsfile/src/main/scala/org/apache/iotdb/spark/tsfile/NarrowConverter.scala b/spark-tsfile/src/main/scala/org/apache/iotdb/spark/tsfile/NarrowConverter.scala index 944cbe6464ddb..fd7d12b360042 100644 --- a/spark-tsfile/src/main/scala/org/apache/iotdb/spark/tsfile/NarrowConverter.scala +++ b/spark-tsfile/src/main/scala/org/apache/iotdb/spark/tsfile/NarrowConverter.scala @@ -22,11 +22,11 @@ import java.util import org.apache.hadoop.conf.Configuration import org.apache.hadoop.fs.FileStatus +import org.apache.iotdb.hadoop.fileSystem.HDFSInput import org.apache.iotdb.spark.tsfile.qp.QueryProcessor import org.apache.iotdb.tsfile.common.constant.QueryConstant import org.apache.iotdb.tsfile.file.metadata.TsFileMetaData import org.apache.iotdb.tsfile.file.metadata.enums.{TSDataType, TSEncoding} -import org.apache.iotdb.tsfile.fileSystem.HDFSInput import org.apache.iotdb.spark.tsfile.qp.common.{BasicOperator, FilterOperator, SQLConstant, TSQueryPlan} import org.apache.iotdb.tsfile.read.TsFileSequenceReader import org.apache.iotdb.tsfile.read.common.Path diff --git a/spark-tsfile/src/main/scala/org/apache/iotdb/spark/tsfile/WideConverter.scala b/spark-tsfile/src/main/scala/org/apache/iotdb/spark/tsfile/WideConverter.scala index fcc54cf4a6870..f0cfdc12f8381 100755 --- a/spark-tsfile/src/main/scala/org/apache/iotdb/spark/tsfile/WideConverter.scala +++ b/spark-tsfile/src/main/scala/org/apache/iotdb/spark/tsfile/WideConverter.scala @@ -22,10 +22,10 @@ import java.util import org.apache.hadoop.conf.Configuration import org.apache.hadoop.fs.FileStatus +import org.apache.iotdb.hadoop.fileSystem.HDFSInput import org.apache.iotdb.tsfile.common.constant.QueryConstant import org.apache.iotdb.tsfile.file.metadata.TsFileMetaData import org.apache.iotdb.tsfile.file.metadata.enums.{TSDataType, TSEncoding} -import org.apache.iotdb.tsfile.fileSystem.HDFSInput import org.apache.iotdb.tsfile.read.TsFileSequenceReader import org.apache.iotdb.tsfile.read.common.Path import org.apache.iotdb.tsfile.read.expression.impl.{BinaryExpression, GlobalTimeExpression, SingleSeriesExpression} diff --git a/spark-tsfile/src/test/scala/org/apache/iotdb/spark/tsfile/ConverterTest.scala b/spark-tsfile/src/test/scala/org/apache/iotdb/spark/tsfile/ConverterTest.scala index 2554df950ba06..bf5b1e8a4f431 100644 --- a/spark-tsfile/src/test/scala/org/apache/iotdb/spark/tsfile/ConverterTest.scala +++ b/spark-tsfile/src/test/scala/org/apache/iotdb/spark/tsfile/ConverterTest.scala @@ -24,10 +24,10 @@ import java.util import org.apache.hadoop.conf.Configuration import org.apache.hadoop.fs.{FileStatus, FileSystem, Path} +import org.apache.iotdb.hadoop.fileSystem.HDFSInput import org.apache.iotdb.spark.tool.TsFileWriteTool import org.apache.iotdb.tsfile.common.constant.QueryConstant import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType -import org.apache.iotdb.tsfile.fileSystem.HDFSInput import org.apache.iotdb.tsfile.read.TsFileSequenceReader import org.apache.iotdb.tsfile.read.common.Field import org.apache.iotdb.tsfile.utils.Binary diff --git a/spark-tsfile/src/test/scala/org/apache/iotdb/spark/tsfile/HDFSInputTest.java b/spark-tsfile/src/test/scala/org/apache/iotdb/spark/tsfile/HDFSInputTest.java index a4ddfacd8272a..d1a6f9ceaf658 100644 --- a/spark-tsfile/src/test/scala/org/apache/iotdb/spark/tsfile/HDFSInputTest.java +++ b/spark-tsfile/src/test/scala/org/apache/iotdb/spark/tsfile/HDFSInputTest.java @@ -22,7 +22,7 @@ import java.io.IOException; import java.nio.ByteBuffer; import org.apache.iotdb.spark.tool.TsFileWriteTool; -import org.apache.iotdb.tsfile.fileSystem.HDFSInput; +import org.apache.iotdb.hadoop.fileSystem.HDFSInput; import org.junit.After; import org.junit.Assert; import org.junit.Before; diff --git a/spark-tsfile/src/test/scala/org/apache/iotdb/spark/tsfile/TSFileSuit.scala b/spark-tsfile/src/test/scala/org/apache/iotdb/spark/tsfile/TSFileSuit.scala index 7d700a4877df3..d9ea35e5be9be 100644 --- a/spark-tsfile/src/test/scala/org/apache/iotdb/spark/tsfile/TSFileSuit.scala +++ b/spark-tsfile/src/test/scala/org/apache/iotdb/spark/tsfile/TSFileSuit.scala @@ -23,9 +23,9 @@ import java.net.URI import org.apache.hadoop.conf.Configuration import org.apache.hadoop.fs.Path +import org.apache.iotdb.hadoop.fileSystem.HDFSInput import org.apache.iotdb.spark.tool.TsFileWriteTool import org.apache.iotdb.tsfile.common.constant.QueryConstant -import org.apache.iotdb.tsfile.fileSystem.HDFSInput import org.apache.iotdb.tsfile.read.TsFileSequenceReader import org.apache.spark.sql.SparkSession import org.apache.spark.sql.types._ diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/fileSystem/fileInputFactory/HDFSInputFactory.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/fileSystem/fileInputFactory/HDFSInputFactory.java index a2fafaf7fd89a..8226a228a4cdc 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/fileSystem/fileInputFactory/HDFSInputFactory.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/fileSystem/fileInputFactory/HDFSInputFactory.java @@ -32,7 +32,7 @@ public class HDFSInputFactory implements FileInputFactory { static { try { - Class clazz = Class.forName("org.apache.iotdb.tsfile.fileSystem.HDFSInput"); + Class clazz = Class.forName("org.apache.iotdb.hadoop.fileSystem.HDFSInput"); constructor = clazz.getConstructor(String.class); } catch (ClassNotFoundException | NoSuchMethodException e) { logger.error( diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/fileSystem/fileOutputFactory/HDFSOutputFactory.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/fileSystem/fileOutputFactory/HDFSOutputFactory.java index 1c46b695bcf9c..8680cccbc6792 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/fileSystem/fileOutputFactory/HDFSOutputFactory.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/fileSystem/fileOutputFactory/HDFSOutputFactory.java @@ -32,7 +32,7 @@ public class HDFSOutputFactory implements FileOutputFactory { static { try { - Class clazz = Class.forName("org.apache.iotdb.tsfile.fileSystem.HDFSOutput"); + Class clazz = Class.forName("org.apache.iotdb.hadoop.fileSystem.HDFSOutput"); constructor = clazz.getConstructor(String.class, boolean.class); } catch (ClassNotFoundException | NoSuchMethodException e) { logger.error( diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/fileSystem/fsFactory/HDFSFactory.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/fileSystem/fsFactory/HDFSFactory.java index 33eafffce9ee5..f73e17b741d10 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/fileSystem/fsFactory/HDFSFactory.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/fileSystem/fsFactory/HDFSFactory.java @@ -47,7 +47,7 @@ public class HDFSFactory implements FSFactory { static { try { - Class clazz = Class.forName("org.apache.iotdb.tsfile.fileSystem.HDFSFile"); + Class clazz = Class.forName("org.apache.iotdb.hadoop.fileSystem.HDFSFile"); constructorWithPathname = clazz.getConstructor(String.class); constructorWithParentStringAndChild = clazz.getConstructor(String.class, String.class); constructorWithParentFileAndChild = clazz.getConstructor(File.class, String.class);