This is an automated email from the ASF dual-hosted git repository. qiaojialin pushed a commit to branch revert-452-hadoop-package-name in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 49c6ac3c201ffa1cd05e59ac5e305db96bb24c96 Author: Jialin Qiao <[email protected]> AuthorDate: Thu Oct 17 20:30:32 2019 +0800 Revert "change hadoop package name (#452)" This reverts commit 42c62e7e152ce97f92a795f12bbb53007d6c69e4. --- docs/Documentation-CHN/UserGuide/9-Tools-Hadoop.md | 4 ++-- docs/Documentation/UserGuide/9-Tools-Hadoop.md | 4 ++-- .../iotdb/{hadoop/tsfile => tsfile/hadoop}/TSFMRReadExample.java | 2 +- .../iotdb/{hadoop/tsfile => tsfile/hadoop}/TSMRWriteExample.java | 4 ++-- .../apache/iotdb/{hadoop/tsfile => tsfile/hadoop}/TsFileHelper.java | 2 +- .../iotdb/{hadoop/tsfile => tsfile/hadoop}/TSFHadoopException.java | 2 +- .../apache/iotdb/{hadoop/tsfile => tsfile/hadoop}/TSFInputFormat.java | 2 +- .../apache/iotdb/{hadoop/tsfile => tsfile/hadoop}/TSFInputSplit.java | 2 +- .../iotdb/{hadoop/tsfile => tsfile/hadoop}/TSFOutputFormat.java | 4 ++-- .../iotdb/{hadoop/tsfile => tsfile/hadoop}/TSFRecordReader.java | 2 +- .../iotdb/{hadoop/tsfile => tsfile/hadoop}/TSFRecordWriter.java | 4 ++-- .../iotdb/{hadoop/tsfile => tsfile/hadoop}/record/HDFSTSRecord.java | 2 +- .../apache/iotdb/{hadoop/tsfile => tsfile/hadoop}/TSFHadoopTest.java | 2 +- .../iotdb/{hadoop/tsfile => tsfile/hadoop}/TSFInputSplitTest.java | 4 ++-- .../iotdb/{hadoop/tsfile => tsfile/hadoop}/TsFileTestHelper.java | 2 +- 15 files changed, 21 insertions(+), 21 deletions(-) diff --git a/docs/Documentation-CHN/UserGuide/9-Tools-Hadoop.md b/docs/Documentation-CHN/UserGuide/9-Tools-Hadoop.md index 54c5ebc..7930dd5 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/hadoop/tsfile/TSFMRReadExample.java +> 注意: 完整的代码示例可以在如下链接中找到：https://github.com/apache/incubator-iotdb/blob/master/example/hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/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/hadoop/tsfile/TSMRWriteExample.java \ No newline at end of file +> 注意: 完整的代码示例可以在如下链接中找到：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 diff --git a/docs/Documentation/UserGuide/9-Tools-Hadoop.md b/docs/Documentation/UserGuide/9-Tools-Hadoop.md index 57b6890..6fd97b9 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/hadoop/tsfile/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/tsfile/hadoop/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/hadoop/tsfile/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/tsfile/hadoop/TSMRWriteExample.java \ No newline at end of file diff --git a/example/hadoop/src/main/java/org/apache/iotdb/hadoop/tsfile/TSFMRReadExample.java b/example/hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/TSFMRReadExample.java similarity index 99% rename from example/hadoop/src/main/java/org/apache/iotdb/hadoop/tsfile/TSFMRReadExample.java rename to example/hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/TSFMRReadExample.java index 5ac0547..97cd5c5 100644 --- a/example/hadoop/src/main/java/org/apache/iotdb/hadoop/tsfile/TSFMRReadExample.java +++ b/example/hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/TSFMRReadExample.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.hadoop.tsfile; +package org.apache.iotdb.tsfile.hadoop; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; diff --git a/example/hadoop/src/main/java/org/apache/iotdb/hadoop/tsfile/TSMRWriteExample.java b/example/hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/TSMRWriteExample.java similarity index 98% rename from example/hadoop/src/main/java/org/apache/iotdb/hadoop/tsfile/TSMRWriteExample.java rename to example/hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/TSMRWriteExample.java index 4f70824..da84711 100644 --- a/example/hadoop/src/main/java/org/apache/iotdb/hadoop/tsfile/TSMRWriteExample.java +++ b/example/hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/TSMRWriteExample.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.hadoop.tsfile; +package org.apache.iotdb.tsfile.hadoop; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; @@ -25,9 +25,9 @@ import org.apache.hadoop.io.*; import org.apache.hadoop.mapreduce.Job; import org.apache.hadoop.mapreduce.Mapper; import org.apache.hadoop.mapreduce.Reducer; -import org.apache.iotdb.hadoop.tsfile.record.HDFSTSRecord; 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.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/example/hadoop/src/main/java/org/apache/iotdb/hadoop/tsfile/TsFileHelper.java b/example/hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/TsFileHelper.java similarity index 99% rename from example/hadoop/src/main/java/org/apache/iotdb/hadoop/tsfile/TsFileHelper.java rename to example/hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/TsFileHelper.java index 795f0e4..912fb49 100644 --- a/example/hadoop/src/main/java/org/apache/iotdb/hadoop/tsfile/TsFileHelper.java +++ b/example/hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/TsFileHelper.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.hadoop.tsfile; +package org.apache.iotdb.tsfile.hadoop; import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding; diff --git a/hadoop/src/main/java/org/apache/iotdb/hadoop/tsfile/TSFHadoopException.java b/hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/TSFHadoopException.java similarity index 97% rename from hadoop/src/main/java/org/apache/iotdb/hadoop/tsfile/TSFHadoopException.java rename to hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/TSFHadoopException.java index efd2238..63fcce7 100644 --- a/hadoop/src/main/java/org/apache/iotdb/hadoop/tsfile/TSFHadoopException.java +++ b/hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/TSFHadoopException.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.hadoop.tsfile; +package org.apache.iotdb.tsfile.hadoop; public class TSFHadoopException extends Exception { diff --git a/hadoop/src/main/java/org/apache/iotdb/hadoop/tsfile/TSFInputFormat.java b/hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/TSFInputFormat.java similarity index 99% rename from hadoop/src/main/java/org/apache/iotdb/hadoop/tsfile/TSFInputFormat.java rename to hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/TSFInputFormat.java index c406b26..298d367 100644 --- a/hadoop/src/main/java/org/apache/iotdb/hadoop/tsfile/TSFInputFormat.java +++ b/hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/TSFInputFormat.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.hadoop.tsfile; +package org.apache.iotdb.tsfile.hadoop; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.BlockLocation; diff --git a/hadoop/src/main/java/org/apache/iotdb/hadoop/tsfile/TSFInputSplit.java b/hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/TSFInputSplit.java similarity index 99% rename from hadoop/src/main/java/org/apache/iotdb/hadoop/tsfile/TSFInputSplit.java rename to hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/TSFInputSplit.java index ac18fe6..72d0269 100644 --- a/hadoop/src/main/java/org/apache/iotdb/hadoop/tsfile/TSFInputSplit.java +++ b/hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/TSFInputSplit.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.hadoop.tsfile; +package org.apache.iotdb.tsfile.hadoop; import org.apache.hadoop.fs.Path; import org.apache.hadoop.io.Writable; diff --git a/hadoop/src/main/java/org/apache/iotdb/hadoop/tsfile/TSFOutputFormat.java b/hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/TSFOutputFormat.java similarity index 95% rename from hadoop/src/main/java/org/apache/iotdb/hadoop/tsfile/TSFOutputFormat.java rename to hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/TSFOutputFormat.java index ee45c18..6df422d 100644 --- a/hadoop/src/main/java/org/apache/iotdb/hadoop/tsfile/TSFOutputFormat.java +++ b/hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/TSFOutputFormat.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.hadoop.tsfile; +package org.apache.iotdb.tsfile.hadoop; 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.hadoop.tsfile.record.HDFSTSRecord; +import org.apache.iotdb.tsfile.hadoop.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/hadoop/tsfile/TSFRecordReader.java b/hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/TSFRecordReader.java similarity index 99% rename from hadoop/src/main/java/org/apache/iotdb/hadoop/tsfile/TSFRecordReader.java rename to hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/TSFRecordReader.java index bc7fe72..8548d9e 100644 --- a/hadoop/src/main/java/org/apache/iotdb/hadoop/tsfile/TSFRecordReader.java +++ b/hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/TSFRecordReader.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.hadoop.tsfile; +package org.apache.iotdb.tsfile.hadoop; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.io.*; diff --git a/hadoop/src/main/java/org/apache/iotdb/hadoop/tsfile/TSFRecordWriter.java b/hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/TSFRecordWriter.java similarity index 95% rename from hadoop/src/main/java/org/apache/iotdb/hadoop/tsfile/TSFRecordWriter.java rename to hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/TSFRecordWriter.java index b600d11..383c31b 100644 --- a/hadoop/src/main/java/org/apache/iotdb/hadoop/tsfile/TSFRecordWriter.java +++ b/hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/TSFRecordWriter.java @@ -16,15 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.hadoop.tsfile; +package org.apache.iotdb.tsfile.hadoop; 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.hadoop.tsfile.record.HDFSTSRecord; import org.apache.iotdb.tsfile.exception.write.WriteProcessException; import org.apache.iotdb.tsfile.fileSystem.HDFSOutput; +import org.apache.iotdb.tsfile.hadoop.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/hadoop/tsfile/record/HDFSTSRecord.java b/hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/record/HDFSTSRecord.java similarity index 99% rename from hadoop/src/main/java/org/apache/iotdb/hadoop/tsfile/record/HDFSTSRecord.java rename to hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/record/HDFSTSRecord.java index 9c6b0fe..307a183 100644 --- a/hadoop/src/main/java/org/apache/iotdb/hadoop/tsfile/record/HDFSTSRecord.java +++ b/hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/record/HDFSTSRecord.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.hadoop.tsfile.record; +package org.apache.iotdb.tsfile.hadoop.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/hadoop/tsfile/TSFHadoopTest.java b/hadoop/src/test/java/org/apache/iotdb/tsfile/hadoop/TSFHadoopTest.java similarity index 99% rename from hadoop/src/test/java/org/apache/iotdb/hadoop/tsfile/TSFHadoopTest.java rename to hadoop/src/test/java/org/apache/iotdb/tsfile/hadoop/TSFHadoopTest.java index 08c6798..c7062f5 100644 --- a/hadoop/src/test/java/org/apache/iotdb/hadoop/tsfile/TSFHadoopTest.java +++ b/hadoop/src/test/java/org/apache/iotdb/tsfile/hadoop/TSFHadoopTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.hadoop.tsfile; +package org.apache.iotdb.tsfile.hadoop; import org.apache.hadoop.io.*; import org.apache.hadoop.mapreduce.InputSplit; diff --git a/hadoop/src/test/java/org/apache/iotdb/hadoop/tsfile/TSFInputSplitTest.java b/hadoop/src/test/java/org/apache/iotdb/tsfile/hadoop/TSFInputSplitTest.java similarity index 96% rename from hadoop/src/test/java/org/apache/iotdb/hadoop/tsfile/TSFInputSplitTest.java rename to hadoop/src/test/java/org/apache/iotdb/tsfile/hadoop/TSFInputSplitTest.java index 117a74e..d9aee7b 100644 --- a/hadoop/src/test/java/org/apache/iotdb/hadoop/tsfile/TSFInputSplitTest.java +++ b/hadoop/src/test/java/org/apache/iotdb/tsfile/hadoop/TSFInputSplitTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.hadoop.tsfile; +package org.apache.iotdb.tsfile.hadoop; import org.apache.hadoop.fs.Path; import org.apache.hadoop.io.DataInputBuffer; @@ -32,7 +32,7 @@ import static org.hamcrest.core.Is.is; import static org.junit.Assert.*; /** - * Test the {@link TSFInputSplit} + * Test the {@link org.apache.iotdb.tsfile.hadoop.TSFInputSplit} * Assert the readFields function and write function is right * * @author Yuan Tian diff --git a/hadoop/src/test/java/org/apache/iotdb/hadoop/tsfile/TsFileTestHelper.java b/hadoop/src/test/java/org/apache/iotdb/tsfile/hadoop/TsFileTestHelper.java similarity index 98% rename from hadoop/src/test/java/org/apache/iotdb/hadoop/tsfile/TsFileTestHelper.java rename to hadoop/src/test/java/org/apache/iotdb/tsfile/hadoop/TsFileTestHelper.java index a805f3e..18efbd6 100644 --- a/hadoop/src/test/java/org/apache/iotdb/hadoop/tsfile/TsFileTestHelper.java +++ b/hadoop/src/test/java/org/apache/iotdb/tsfile/hadoop/TsFileTestHelper.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.hadoop.tsfile; +package org.apache.iotdb.tsfile.hadoop; import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding;
