Change Hadoop package name

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
+> 注意: 完整的代码示例可以在如下链接中找到：https://github.com/apache/incubator-iotdb/blob/master/example/hadoop/src/main/java/org/apache/iotdb/hadoop/tsfile/TSMRWriteExample.java

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
+> 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

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.

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;

hadoop/src/main/java/org/apache/iotdb/tsfile/fileSystem/HDFSFile.java → 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;

hadoop/src/main/java/org/apache/iotdb/tsfile/fileSystem/HDFSInput.java → 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;

hadoop/src/main/java/org/apache/iotdb/tsfile/fileSystem/HDFSOutput.java → 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;

hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/TSFHadoopException.java → 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 {
 

hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/TSFInputFormat.java → 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;

hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/TSFInputSplit.java → 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;

hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/TSFOutputFormat.java → 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;

hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/TSFRecordReader.java → 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;

hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/TSFRecordWriter.java → 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;

hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/record/HDFSTSRecord.java → 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;

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;

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

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;

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}

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

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}

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

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;

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._

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(

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(

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);