diff --git a/.github/workflows/greetings.yml b/.github/workflows/greetings.yml index 72179bba6..c833f27c4 100644 --- a/.github/workflows/greetings.yml +++ b/.github/workflows/greetings.yml @@ -6,7 +6,7 @@ jobs: greeting: runs-on: ubuntu-latest steps: - - uses: actions/first-interaction@v1.1.1 + - uses: actions/first-interaction@v1.3.0 continue-on-error: true with: repo-token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml index d826c99cf..ec85b06d2 100644 --- a/.github/workflows/unit-test.yml +++ b/.github/workflows/unit-test.yml @@ -53,7 +53,7 @@ jobs: uses: actions/checkout@v4 - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: corretto java-version: ${{ matrix.java }} diff --git a/LICENSE b/LICENSE index 32fb1ef64..b37af99ed 100644 --- a/LICENSE +++ b/LICENSE @@ -213,23 +213,23 @@ mvnw files from https://github.com/apache/maven-wrapper Apache 2.0 The following class is modified from Apache commons-collections -./tsfile/src/main/java/org/apache/iotdb/tsfile/utils/Murmur128Hash.java +./tsfile/src/main/java/org/apache/tsfile/utils/Murmur128Hash.java Relevant pr is: https://github.com/apache/commons-collections/pull/83/ -------------------------------------------------------------------------------- The following files include code modified from Michael Burman's gorilla-tsc project. -./tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/GorillaEncoderV2.java -./tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/IntGorillaEncoder.java -./tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/LongGorillaEncoder.java -./tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/SinglePrecisionEncoderV2.java -./tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/DoublePrecisionEncoderV2.java -./tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/GorillaDecoderV2.java -./tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/IntGorillaDecoder.java -./tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/LongGorillaDecoder.java -./tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/SinglePrecisionDecoderV2.java -./tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/DoublePrecisionDecoderV2.java +./tsfile/src/main/java/org/apache/tsfile/encoding/encoder/GorillaEncoderV2.java +./tsfile/src/main/java/org/apache/tsfile/encoding/encoder/IntGorillaEncoder.java +./tsfile/src/main/java/org/apache/tsfile/encoding/encoder/LongGorillaEncoder.java +./tsfile/src/main/java/org/apache/tsfile/encoding/encoder/SinglePrecisionEncoderV2.java +./tsfile/src/main/java/org/apache/tsfile/encoding/encoder/DoublePrecisionEncoderV2.java +./tsfile/src/main/java/org/apache/tsfile/encoding/decoder/GorillaDecoderV2.java +./tsfile/src/main/java/org/apache/tsfile/encoding/decoder/IntGorillaDecoder.java +./tsfile/src/main/java/org/apache/tsfile/encoding/decoder/LongGorillaDecoder.java +./tsfile/src/main/java/org/apache/tsfile/encoding/decoder/SinglePrecisionDecoderV2.java +./tsfile/src/main/java/org/apache/tsfile/encoding/decoder/DoublePrecisionDecoderV2.java Copyright: 2016-2018 Michael Burman and/or other contributors Project page: https://github.com/burmanm/gorilla-tsc @@ -239,14 +239,14 @@ License: http://www.apache.org/licenses/LICENSE-2.0 The following files include code modified from Panagiotis Liakos, Katia Papakonstantinopoulou and Yannis Kotidis chimp project. -./tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/DoublePrecisionChimpDecoder.java -./tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/IntChimpDecoder.java -./tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/LongChimpDecoder.java -./tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/SinglePrecisionChimpDecoder.java -./tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/DoublePrecisionChimpEncoder.java -./tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/IntChimpEncoder.java -./tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/LongChimpEncoder.java -./tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/SinglePrecisionChimpEncoder.java +./tsfile/src/main/java/org/apache/tsfile/encoding/decoder/DoublePrecisionChimpDecoder.java +./tsfile/src/main/java/org/apache/tsfile/encoding/decoder/IntChimpDecoder.java +./tsfile/src/main/java/org/apache/tsfile/encoding/decoder/LongChimpDecoder.java +./tsfile/src/main/java/org/apache/tsfile/encoding/decoder/SinglePrecisionChimpDecoder.java +./tsfile/src/main/java/org/apache/tsfile/encoding/encoder/DoublePrecisionChimpEncoder.java +./tsfile/src/main/java/org/apache/tsfile/encoding/encoder/IntChimpEncoder.java +./tsfile/src/main/java/org/apache/tsfile/encoding/encoder/LongChimpEncoder.java +./tsfile/src/main/java/org/apache/tsfile/encoding/encoder/SinglePrecisionChimpEncoder.java Copyright: 2022- Panagiotis Liakos, Katia Papakonstantinopoulou and Yannis Kotidis Project page: https://github.com/panagiotisl/chimp @@ -256,7 +256,7 @@ License: http://www.apache.org/licenses/LICENSE-2.0 The following files include code modified from Eclipse Collections project. -./tsfile/src/main/java/org/apache/iotdb/tsfile/utils/ByteArrayList.java +./tsfile/src/main/java/org/apache/tsfile/utils/ByteArrayList.java Copyright: 2021 Goldman Sachs Project page: https://www.eclipse.org/collections diff --git a/NOTICE b/NOTICE index 1e81e8bc0..6e2085f68 100644 --- a/NOTICE +++ b/NOTICE @@ -1,4 +1,4 @@ -Apache IoTDB +Apache TsFile Copyright 2018-2024 The Apache Software Foundation. This product includes software developed at @@ -6,10 +6,8 @@ The Apache Software Foundation (http://www.apache.org/). ============================================================================ -IoTDB project uses 4 Chinese Patents: +TsFile project uses 4 Chinese Patents: * 201711384490X -* 201810111712.9 -* 201711322631.5 * 201711319331.1 According to the Apache 2.0 License. The owner of the patents, Tsinghua University, diff --git a/common-api/src/main/java/org/apache/iotdb/tsfile/read/common/block/TsBlockBuilderStatus.java b/common-api/src/main/java/org/apache/tsfile/block/TsBlockBuilderStatus.java similarity index 93% rename from common-api/src/main/java/org/apache/iotdb/tsfile/read/common/block/TsBlockBuilderStatus.java rename to common-api/src/main/java/org/apache/tsfile/block/TsBlockBuilderStatus.java index 02cbd9d2e..993c1c625 100644 --- a/common-api/src/main/java/org/apache/iotdb/tsfile/read/common/block/TsBlockBuilderStatus.java +++ b/common-api/src/main/java/org/apache/tsfile/block/TsBlockBuilderStatus.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.common.block; +package org.apache.tsfile.block; -import org.apache.iotdb.tsfile.read.common.block.column.ColumnBuilderStatus; +import org.apache.tsfile.block.column.ColumnBuilderStatus; public class TsBlockBuilderStatus { diff --git a/common-api/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/Column.java b/common-api/src/main/java/org/apache/tsfile/block/column/Column.java similarity index 95% rename from common-api/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/Column.java rename to common-api/src/main/java/org/apache/tsfile/block/column/Column.java index 5cc8385da..6db30a27f 100644 --- a/common-api/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/Column.java +++ b/common-api/src/main/java/org/apache/tsfile/block/column/Column.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.common.block.column; +package org.apache.tsfile.block.column; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.utils.Binary; -import org.apache.iotdb.tsfile.utils.TsPrimitiveType; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.utils.Binary; +import org.apache.tsfile.utils.TsPrimitiveType; public interface Column { diff --git a/common-api/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/ColumnBuilder.java b/common-api/src/main/java/org/apache/tsfile/block/column/ColumnBuilder.java similarity index 93% rename from common-api/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/ColumnBuilder.java rename to common-api/src/main/java/org/apache/tsfile/block/column/ColumnBuilder.java index 14b946dbb..df8ecc113 100644 --- a/common-api/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/ColumnBuilder.java +++ b/common-api/src/main/java/org/apache/tsfile/block/column/ColumnBuilder.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.common.block.column; +package org.apache.tsfile.block.column; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.utils.Binary; -import org.apache.iotdb.tsfile.utils.TsPrimitiveType; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.utils.Binary; +import org.apache.tsfile.utils.TsPrimitiveType; public interface ColumnBuilder { diff --git a/common-api/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/ColumnBuilderStatus.java b/common-api/src/main/java/org/apache/tsfile/block/column/ColumnBuilderStatus.java similarity index 94% rename from common-api/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/ColumnBuilderStatus.java rename to common-api/src/main/java/org/apache/tsfile/block/column/ColumnBuilderStatus.java index a3a5e7b4c..2b679003f 100644 --- a/common-api/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/ColumnBuilderStatus.java +++ b/common-api/src/main/java/org/apache/tsfile/block/column/ColumnBuilderStatus.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.common.block.column; +package org.apache.tsfile.block.column; -import org.apache.iotdb.tsfile.read.common.block.TsBlockBuilderStatus; -import org.apache.iotdb.tsfile.utils.RamUsageEstimator; +import org.apache.tsfile.block.TsBlockBuilderStatus; +import org.apache.tsfile.utils.RamUsageEstimator; import java.lang.reflect.Field; import java.lang.reflect.Modifier; diff --git a/common-api/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/ColumnEncoding.java b/common-api/src/main/java/org/apache/tsfile/block/column/ColumnEncoding.java similarity index 96% rename from common-api/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/ColumnEncoding.java rename to common-api/src/main/java/org/apache/tsfile/block/column/ColumnEncoding.java index f8008ae28..273836836 100644 --- a/common-api/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/ColumnEncoding.java +++ b/common-api/src/main/java/org/apache/tsfile/block/column/ColumnEncoding.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.common.block.column; +package org.apache.tsfile.block.column; import java.io.DataOutputStream; import java.io.IOException; diff --git a/common-api/src/main/java/org/apache/iotdb/tsfile/file/metadata/enums/TSDataType.java b/common-api/src/main/java/org/apache/tsfile/enums/TSDataType.java similarity index 97% rename from common-api/src/main/java/org/apache/iotdb/tsfile/file/metadata/enums/TSDataType.java rename to common-api/src/main/java/org/apache/tsfile/enums/TSDataType.java index 8c5ffc7e3..efb8fa027 100644 --- a/common-api/src/main/java/org/apache/iotdb/tsfile/file/metadata/enums/TSDataType.java +++ b/common-api/src/main/java/org/apache/tsfile/enums/TSDataType.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.tsfile.file.metadata.enums; +package org.apache.tsfile.enums; -import org.apache.iotdb.tsfile.exception.write.UnSupportedDataTypeException; +import org.apache.tsfile.write.UnSupportedDataTypeException; import java.io.DataOutputStream; import java.io.FileOutputStream; diff --git a/common-api/src/main/java/org/apache/iotdb/tsfile/utils/Binary.java b/common-api/src/main/java/org/apache/tsfile/utils/Binary.java similarity index 98% rename from common-api/src/main/java/org/apache/iotdb/tsfile/utils/Binary.java rename to common-api/src/main/java/org/apache/tsfile/utils/Binary.java index cd000c870..d1dc347bd 100644 --- a/common-api/src/main/java/org/apache/iotdb/tsfile/utils/Binary.java +++ b/common-api/src/main/java/org/apache/tsfile/utils/Binary.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.utils; +package org.apache.tsfile.utils; import java.io.Serializable; import java.nio.charset.Charset; diff --git a/common-api/src/main/java/org/apache/iotdb/tsfile/utils/Constants.java b/common-api/src/main/java/org/apache/tsfile/utils/Constants.java similarity index 99% rename from common-api/src/main/java/org/apache/iotdb/tsfile/utils/Constants.java rename to common-api/src/main/java/org/apache/tsfile/utils/Constants.java index fad8af193..482f6bd4f 100644 --- a/common-api/src/main/java/org/apache/iotdb/tsfile/utils/Constants.java +++ b/common-api/src/main/java/org/apache/tsfile/utils/Constants.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.tsfile.utils; +package org.apache.tsfile.utils; import java.util.StringTokenizer; diff --git a/common-api/src/main/java/org/apache/iotdb/tsfile/utils/RamUsageEstimator.java b/common-api/src/main/java/org/apache/tsfile/utils/RamUsageEstimator.java similarity index 99% rename from common-api/src/main/java/org/apache/iotdb/tsfile/utils/RamUsageEstimator.java rename to common-api/src/main/java/org/apache/tsfile/utils/RamUsageEstimator.java index 80f1f0223..a42416f05 100644 --- a/common-api/src/main/java/org/apache/iotdb/tsfile/utils/RamUsageEstimator.java +++ b/common-api/src/main/java/org/apache/tsfile/utils/RamUsageEstimator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.tsfile.utils; +package org.apache.tsfile.utils; import java.lang.reflect.Array; import java.lang.reflect.Field; diff --git a/common-api/src/main/java/org/apache/iotdb/tsfile/utils/TsPrimitiveType.java b/common-api/src/main/java/org/apache/tsfile/utils/TsPrimitiveType.java similarity index 98% rename from common-api/src/main/java/org/apache/iotdb/tsfile/utils/TsPrimitiveType.java rename to common-api/src/main/java/org/apache/tsfile/utils/TsPrimitiveType.java index 42d8c96cf..62e2b1eb9 100644 --- a/common-api/src/main/java/org/apache/iotdb/tsfile/utils/TsPrimitiveType.java +++ b/common-api/src/main/java/org/apache/tsfile/utils/TsPrimitiveType.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.utils; +package org.apache.tsfile.utils; -import org.apache.iotdb.tsfile.exception.write.UnSupportedDataTypeException; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.write.UnSupportedDataTypeException; import java.io.Serializable; import java.util.Arrays; diff --git a/common-api/src/main/java/org/apache/iotdb/tsfile/exception/write/UnSupportedDataTypeException.java b/common-api/src/main/java/org/apache/tsfile/write/UnSupportedDataTypeException.java similarity index 95% rename from common-api/src/main/java/org/apache/iotdb/tsfile/exception/write/UnSupportedDataTypeException.java rename to common-api/src/main/java/org/apache/tsfile/write/UnSupportedDataTypeException.java index 8d8f2539d..a7ab7dac1 100644 --- a/common-api/src/main/java/org/apache/iotdb/tsfile/exception/write/UnSupportedDataTypeException.java +++ b/common-api/src/main/java/org/apache/tsfile/write/UnSupportedDataTypeException.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.tsfile.exception.write; +package org.apache.tsfile.write; public class UnSupportedDataTypeException extends RuntimeException { diff --git a/pom.xml b/pom.xml index aee23cfd2..96637b8a0 100644 --- a/pom.xml +++ b/pom.xml @@ -39,6 +39,7 @@ 1.8 1.8 + false @@ -55,7 +56,7 @@ commons-io commons-io - 2.13.0 + 2.15.1 org.apache.commons @@ -91,13 +92,8 @@ org.mockito mockito-core - - 2.23.4 - - - org.powermock - powermock-api-mockito2 - 2.0.9 + + 4.11.0 ch.qos.logback @@ -202,7 +198,7 @@ - org.apache.iotdb,,javax,java,\# + org.apache.tsfile,,javax,java,\# @@ -268,47 +264,6 @@ ${spotless.skip} - - org.eluder.coveralls - coveralls-maven-plugin - - - code-coverage/target/jacoco-merged-reports/jacoco.xml - - UTF-8 - - - iotdb-core/antlr/target/generated-sources/antlr4 - iotdb-protocol/thrift-datanode/target/generated-sources/thrift - iotdb-protocol/thrift-commons/target/generated-sources/thrift - iotdb-protocol/thrift-confignode/target/generated-sources/thrift - iotdb-protocol/thrift-consensus/target/generated-sources/thrift - iotdb-protocol/openapi/target/generated-sources/java/src/gen/java - iotdb-protocol/openapi/target/generated-sources/java/src/main/java - iotdb-core/datanode/target/generated-sources/freemarker/ - iotdb-connector/spark-iotdb-connector/src/main/scala - iotdb-connector/spark-tsfile/src/main/scala - - - - - - javax.xml.bind - jaxb-api - 2.4.0-b180830.0359 - - - com.sun.xml.bind - jaxb-core - 2.3.0 - - - com.sun.xml.bind - jaxb-impl - 2.3.6 - - - + + enforce-java8-compatability + + enforce + + + + + 1.8 + + + + vulnerability-checks @@ -643,11 +612,10 @@ scm:git:ssh://git@github.com/apache/tsfile.git ssh://git@github.com:apache/tsfile.git - - + + GitHub Issues + https://github.com/apache/tsfile/issues + - apache-iotdb-${project.version} + apache-tsfile-${project.version} true @@ -803,7 +771,7 @@ ${project.build.directory} - apache-iotdb-${project.version}-source-release.zip + apache-tsfile-${project.version}-source-release.zip diff --git a/tsfile/pom.xml b/tsfile/pom.xml index 274b5e805..4c76fa893 100644 --- a/tsfile/pom.xml +++ b/tsfile/pom.xml @@ -82,11 +82,6 @@ mockito-core test - - org.powermock - powermock-api-mockito2 - test - ch.qos.logback logback-classic diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/common/cache/Cache.java b/tsfile/src/main/java/org/apache/tsfile/common/cache/Cache.java similarity index 89% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/common/cache/Cache.java rename to tsfile/src/main/java/org/apache/tsfile/common/cache/Cache.java index 49e73188f..7d996bb35 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/common/cache/Cache.java +++ b/tsfile/src/main/java/org/apache/tsfile/common/cache/Cache.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.tsfile.common.cache; +package org.apache.tsfile.common.cache; -import org.apache.iotdb.tsfile.exception.cache.CacheException; +import org.apache.tsfile.exception.cache.CacheException; import java.io.IOException; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/common/cache/LRUCache.java b/tsfile/src/main/java/org/apache/tsfile/common/cache/LRUCache.java similarity index 97% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/common/cache/LRUCache.java rename to tsfile/src/main/java/org/apache/tsfile/common/cache/LRUCache.java index c7db1b5ea..9b79825be 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/common/cache/LRUCache.java +++ b/tsfile/src/main/java/org/apache/tsfile/common/cache/LRUCache.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.tsfile.common.cache; +package org.apache.tsfile.common.cache; import java.io.IOException; import java.util.LinkedHashMap; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/common/conf/TSFileConfig.java b/tsfile/src/main/java/org/apache/tsfile/common/conf/TSFileConfig.java similarity index 98% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/common/conf/TSFileConfig.java rename to tsfile/src/main/java/org/apache/tsfile/common/conf/TSFileConfig.java index 8a257cadf..231328942 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/common/conf/TSFileConfig.java +++ b/tsfile/src/main/java/org/apache/tsfile/common/conf/TSFileConfig.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.tsfile.common.conf; +package org.apache.tsfile.common.conf; -import org.apache.iotdb.tsfile.file.metadata.enums.CompressionType; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.fileSystem.FSType; -import org.apache.iotdb.tsfile.utils.FSUtils; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.file.metadata.enums.CompressionType; +import org.apache.tsfile.fileSystem.FSType; +import org.apache.tsfile.utils.FSUtils; import java.io.Serializable; import java.nio.charset.Charset; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/common/conf/TSFileDescriptor.java b/tsfile/src/main/java/org/apache/tsfile/common/conf/TSFileDescriptor.java similarity index 97% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/common/conf/TSFileDescriptor.java rename to tsfile/src/main/java/org/apache/tsfile/common/conf/TSFileDescriptor.java index 3b060507d..fcd881fb6 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/common/conf/TSFileDescriptor.java +++ b/tsfile/src/main/java/org/apache/tsfile/common/conf/TSFileDescriptor.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.tsfile.common.conf; +package org.apache.tsfile.common.conf; -import org.apache.iotdb.tsfile.common.constant.TsFileConstant; -import org.apache.iotdb.tsfile.utils.Loader; +import org.apache.tsfile.common.constant.TsFileConstant; +import org.apache.tsfile.utils.Loader; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/common/constant/JsonFormatConstant.java b/tsfile/src/main/java/org/apache/tsfile/common/constant/JsonFormatConstant.java similarity index 97% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/common/constant/JsonFormatConstant.java rename to tsfile/src/main/java/org/apache/tsfile/common/constant/JsonFormatConstant.java index f48615a81..8b2036073 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/common/constant/JsonFormatConstant.java +++ b/tsfile/src/main/java/org/apache/tsfile/common/constant/JsonFormatConstant.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.tsfile.common.constant; +package org.apache.tsfile.common.constant; /** This class define several constant string variables used in tsfile schema's keys. */ public class JsonFormatConstant { diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/common/constant/QueryConstant.java b/tsfile/src/main/java/org/apache/tsfile/common/constant/QueryConstant.java similarity index 96% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/common/constant/QueryConstant.java rename to tsfile/src/main/java/org/apache/tsfile/common/constant/QueryConstant.java index 67e41ef63..a05c2dd28 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/common/constant/QueryConstant.java +++ b/tsfile/src/main/java/org/apache/tsfile/common/constant/QueryConstant.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.tsfile.common.constant; +package org.apache.tsfile.common.constant; public class QueryConstant { public static final String RESERVED_TIME = "time"; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/common/constant/TsFileConstant.java b/tsfile/src/main/java/org/apache/tsfile/common/constant/TsFileConstant.java similarity index 97% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/common/constant/TsFileConstant.java rename to tsfile/src/main/java/org/apache/tsfile/common/constant/TsFileConstant.java index ae3dc1bcd..892379e75 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/common/constant/TsFileConstant.java +++ b/tsfile/src/main/java/org/apache/tsfile/common/constant/TsFileConstant.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.tsfile.common.constant; +package org.apache.tsfile.common.constant; import java.util.regex.Pattern; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/compress/ICompressor.java b/tsfile/src/main/java/org/apache/tsfile/compress/ICompressor.java similarity index 93% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/compress/ICompressor.java rename to tsfile/src/main/java/org/apache/tsfile/compress/ICompressor.java index cf1fa5660..36bf48053 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/compress/ICompressor.java +++ b/tsfile/src/main/java/org/apache/tsfile/compress/ICompressor.java @@ -17,14 +17,13 @@ * under the License. */ -package org.apache.iotdb.tsfile.compress; +package org.apache.tsfile.compress; -import org.apache.iotdb.tsfile.exception.compress.CompressionTypeNotSupportedException; -import org.apache.iotdb.tsfile.exception.compress.GZIPCompressOverflowException; -import org.apache.iotdb.tsfile.file.metadata.enums.CompressionType; +import org.apache.tsfile.exception.compress.CompressionTypeNotSupportedException; +import org.apache.tsfile.exception.compress.GZIPCompressOverflowException; +import org.apache.tsfile.file.metadata.enums.CompressionType; import com.github.luben.zstd.Zstd; -import net.jpountz.lz4.LZ4Compressor; import net.jpountz.lz4.LZ4Factory; import org.tukaani.xz.LZMA2Options; import org.tukaani.xz.XZInputStream; @@ -39,11 +38,11 @@ import java.util.zip.GZIPInputStream; import java.util.zip.GZIPOutputStream; -import static org.apache.iotdb.tsfile.file.metadata.enums.CompressionType.GZIP; -import static org.apache.iotdb.tsfile.file.metadata.enums.CompressionType.LZ4; -import static org.apache.iotdb.tsfile.file.metadata.enums.CompressionType.LZMA2; -import static org.apache.iotdb.tsfile.file.metadata.enums.CompressionType.SNAPPY; -import static org.apache.iotdb.tsfile.file.metadata.enums.CompressionType.ZSTD; +import static org.apache.tsfile.file.metadata.enums.CompressionType.GZIP; +import static org.apache.tsfile.file.metadata.enums.CompressionType.LZ4; +import static org.apache.tsfile.file.metadata.enums.CompressionType.LZMA2; +import static org.apache.tsfile.file.metadata.enums.CompressionType.SNAPPY; +import static org.apache.tsfile.file.metadata.enums.CompressionType.ZSTD; /** compress data according to type in schema. */ public interface ICompressor extends Serializable { @@ -68,7 +67,7 @@ static ICompressor getCompressor(CompressionType name) { case SNAPPY: return new SnappyCompressor(); case LZ4: - return new IOTDBLZ4Compressor(); + return new LZ4Compressor(); case GZIP: return new GZIPCompressor(); case ZSTD: @@ -197,20 +196,20 @@ public CompressionType getType() { } } - class IOTDBLZ4Compressor implements ICompressor { + class LZ4Compressor implements ICompressor { /** * This instance should be cached to avoid performance problem. See: * https://github.com/lz4/lz4-java/issues/152 and https://github.com/apache/spark/pull/24905 */ private static final LZ4Factory factory = LZ4Factory.fastestInstance(); - private static final LZ4Compressor compressor = factory.fastCompressor(); + private static final net.jpountz.lz4.LZ4Compressor compressor = factory.fastCompressor(); public static LZ4Factory getFactory() { return factory; } - public IOTDBLZ4Compressor() { + public LZ4Compressor() { super(); } diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/compress/IUnCompressor.java b/tsfile/src/main/java/org/apache/tsfile/compress/IUnCompressor.java similarity index 97% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/compress/IUnCompressor.java rename to tsfile/src/main/java/org/apache/tsfile/compress/IUnCompressor.java index f4302227f..aabac3bfe 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/compress/IUnCompressor.java +++ b/tsfile/src/main/java/org/apache/tsfile/compress/IUnCompressor.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.tsfile.compress; +package org.apache.tsfile.compress; -import org.apache.iotdb.tsfile.exception.compress.CompressionTypeNotSupportedException; -import org.apache.iotdb.tsfile.file.metadata.enums.CompressionType; +import org.apache.tsfile.exception.compress.CompressionTypeNotSupportedException; +import org.apache.tsfile.file.metadata.enums.CompressionType; import com.github.luben.zstd.Zstd; import net.jpountz.lz4.LZ4Compressor; @@ -201,7 +201,7 @@ class LZ4UnCompressor implements IUnCompressor { private static final int MAX_COMPRESS_RATIO = 255; private static final LZ4SafeDecompressor decompressor = - ICompressor.IOTDBLZ4Compressor.getFactory().safeDecompressor(); + ICompressor.LZ4Compressor.getFactory().safeDecompressor(); public LZ4UnCompressor() {} diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/bitpacking/IntPacker.java b/tsfile/src/main/java/org/apache/tsfile/encoding/bitpacking/IntPacker.java similarity index 99% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/bitpacking/IntPacker.java rename to tsfile/src/main/java/org/apache/tsfile/encoding/bitpacking/IntPacker.java index bada5a672..58f4de328 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/bitpacking/IntPacker.java +++ b/tsfile/src/main/java/org/apache/tsfile/encoding/bitpacking/IntPacker.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.tsfile.encoding.bitpacking; +package org.apache.tsfile.encoding.bitpacking; /** * This class is used to encode(decode) Integer in Java with specified bit-width. User need to diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/bitpacking/LongPacker.java b/tsfile/src/main/java/org/apache/tsfile/encoding/bitpacking/LongPacker.java similarity index 99% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/bitpacking/LongPacker.java rename to tsfile/src/main/java/org/apache/tsfile/encoding/bitpacking/LongPacker.java index c6eabe547..cf3dfa991 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/bitpacking/LongPacker.java +++ b/tsfile/src/main/java/org/apache/tsfile/encoding/bitpacking/LongPacker.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.tsfile.encoding.bitpacking; +package org.apache.tsfile.encoding.bitpacking; /** * This class is used to encode(decode) Long in Java with specified bit-width. User need to diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/BitmapDecoder.java b/tsfile/src/main/java/org/apache/tsfile/encoding/decoder/BitmapDecoder.java similarity index 95% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/BitmapDecoder.java rename to tsfile/src/main/java/org/apache/tsfile/encoding/decoder/BitmapDecoder.java index b274b0e8d..e512e71ef 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/BitmapDecoder.java +++ b/tsfile/src/main/java/org/apache/tsfile/encoding/decoder/BitmapDecoder.java @@ -17,13 +17,13 @@ * under the License. */ -package org.apache.iotdb.tsfile.encoding.decoder; +package org.apache.tsfile.encoding.decoder; -import org.apache.iotdb.tsfile.exception.encoding.TsFileDecodingException; -import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding; -import org.apache.iotdb.tsfile.utils.Binary; -import org.apache.iotdb.tsfile.utils.Pair; -import org.apache.iotdb.tsfile.utils.ReadWriteForEncodingUtils; +import org.apache.tsfile.exception.encoding.TsFileDecodingException; +import org.apache.tsfile.file.metadata.enums.TSEncoding; +import org.apache.tsfile.utils.Binary; +import org.apache.tsfile.utils.Pair; +import org.apache.tsfile.utils.ReadWriteForEncodingUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/Decoder.java b/tsfile/src/main/java/org/apache/tsfile/encoding/decoder/Decoder.java similarity index 95% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/Decoder.java rename to tsfile/src/main/java/org/apache/tsfile/encoding/decoder/Decoder.java index 7a01964a7..f1404ae1f 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/Decoder.java +++ b/tsfile/src/main/java/org/apache/tsfile/encoding/decoder/Decoder.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.tsfile.encoding.decoder; +package org.apache.tsfile.encoding.decoder; -import org.apache.iotdb.tsfile.exception.encoding.TsFileDecodingException; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding; -import org.apache.iotdb.tsfile.utils.Binary; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.exception.encoding.TsFileDecodingException; +import org.apache.tsfile.file.metadata.enums.TSEncoding; +import org.apache.tsfile.utils.Binary; import java.io.IOException; import java.math.BigDecimal; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/DeltaBinaryDecoder.java b/tsfile/src/main/java/org/apache/tsfile/encoding/decoder/DeltaBinaryDecoder.java similarity index 95% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/DeltaBinaryDecoder.java rename to tsfile/src/main/java/org/apache/tsfile/encoding/decoder/DeltaBinaryDecoder.java index 7f50cd4bb..a1427fedf 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/DeltaBinaryDecoder.java +++ b/tsfile/src/main/java/org/apache/tsfile/encoding/decoder/DeltaBinaryDecoder.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.tsfile.encoding.decoder; +package org.apache.tsfile.encoding.decoder; -import org.apache.iotdb.tsfile.encoding.encoder.DeltaBinaryEncoder; -import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding; -import org.apache.iotdb.tsfile.utils.BytesUtils; -import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils; +import org.apache.tsfile.encoding.encoder.DeltaBinaryEncoder; +import org.apache.tsfile.file.metadata.enums.TSEncoding; +import org.apache.tsfile.utils.BytesUtils; +import org.apache.tsfile.utils.ReadWriteIOUtils; import java.io.IOException; import java.nio.ByteBuffer; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/DictionaryDecoder.java b/tsfile/src/main/java/org/apache/tsfile/encoding/decoder/DictionaryDecoder.java similarity index 91% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/DictionaryDecoder.java rename to tsfile/src/main/java/org/apache/tsfile/encoding/decoder/DictionaryDecoder.java index aff030a16..8731551c4 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/DictionaryDecoder.java +++ b/tsfile/src/main/java/org/apache/tsfile/encoding/decoder/DictionaryDecoder.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.tsfile.encoding.decoder; +package org.apache.tsfile.encoding.decoder; -import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding; -import org.apache.iotdb.tsfile.utils.Binary; -import org.apache.iotdb.tsfile.utils.ReadWriteForEncodingUtils; +import org.apache.tsfile.file.metadata.enums.TSEncoding; +import org.apache.tsfile.utils.Binary; +import org.apache.tsfile.utils.ReadWriteForEncodingUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/DoublePrecisionChimpDecoder.java b/tsfile/src/main/java/org/apache/tsfile/encoding/decoder/DoublePrecisionChimpDecoder.java similarity index 97% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/DoublePrecisionChimpDecoder.java rename to tsfile/src/main/java/org/apache/tsfile/encoding/decoder/DoublePrecisionChimpDecoder.java index a6e8ddf4f..b8d017bc8 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/DoublePrecisionChimpDecoder.java +++ b/tsfile/src/main/java/org/apache/tsfile/encoding/decoder/DoublePrecisionChimpDecoder.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.tsfile.encoding.decoder; +package org.apache.tsfile.encoding.decoder; import java.nio.ByteBuffer; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/DoublePrecisionDecoderV1.java b/tsfile/src/main/java/org/apache/tsfile/encoding/decoder/DoublePrecisionDecoderV1.java similarity index 95% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/DoublePrecisionDecoderV1.java rename to tsfile/src/main/java/org/apache/tsfile/encoding/decoder/DoublePrecisionDecoderV1.java index 3207adc5c..84838fe41 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/DoublePrecisionDecoderV1.java +++ b/tsfile/src/main/java/org/apache/tsfile/encoding/decoder/DoublePrecisionDecoderV1.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.tsfile.encoding.decoder; +package org.apache.tsfile.encoding.decoder; -import org.apache.iotdb.tsfile.common.conf.TSFileConfig; -import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils; +import org.apache.tsfile.common.conf.TSFileConfig; +import org.apache.tsfile.utils.ReadWriteIOUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/DoublePrecisionDecoderV2.java b/tsfile/src/main/java/org/apache/tsfile/encoding/decoder/DoublePrecisionDecoderV2.java similarity index 91% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/DoublePrecisionDecoderV2.java rename to tsfile/src/main/java/org/apache/tsfile/encoding/decoder/DoublePrecisionDecoderV2.java index 47b56f1c8..fd201ee0e 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/DoublePrecisionDecoderV2.java +++ b/tsfile/src/main/java/org/apache/tsfile/encoding/decoder/DoublePrecisionDecoderV2.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.tsfile.encoding.decoder; +package org.apache.tsfile.encoding.decoder; import java.nio.ByteBuffer; -import static org.apache.iotdb.tsfile.common.conf.TSFileConfig.GORILLA_ENCODING_ENDING_DOUBLE; +import static org.apache.tsfile.common.conf.TSFileConfig.GORILLA_ENCODING_ENDING_DOUBLE; /** * This class includes code modified from Michael Burman's gorilla-tsc project. diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/DoubleRLBEDecoder.java b/tsfile/src/main/java/org/apache/tsfile/encoding/decoder/DoubleRLBEDecoder.java similarity index 97% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/DoubleRLBEDecoder.java rename to tsfile/src/main/java/org/apache/tsfile/encoding/decoder/DoubleRLBEDecoder.java index 5068457aa..883e0252e 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/DoubleRLBEDecoder.java +++ b/tsfile/src/main/java/org/apache/tsfile/encoding/decoder/DoubleRLBEDecoder.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.tsfile.encoding.decoder; +package org.apache.tsfile.encoding.decoder; -import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding; +import org.apache.tsfile.file.metadata.enums.TSEncoding; import java.nio.ByteBuffer; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/DoubleSprintzDecoder.java b/tsfile/src/main/java/org/apache/tsfile/encoding/decoder/DoubleSprintzDecoder.java similarity index 93% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/DoubleSprintzDecoder.java rename to tsfile/src/main/java/org/apache/tsfile/encoding/decoder/DoubleSprintzDecoder.java index 6419deb0c..926d6562a 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/DoubleSprintzDecoder.java +++ b/tsfile/src/main/java/org/apache/tsfile/encoding/decoder/DoubleSprintzDecoder.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.tsfile.encoding.decoder; +package org.apache.tsfile.encoding.decoder; -import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor; -import org.apache.iotdb.tsfile.encoding.bitpacking.LongPacker; -import org.apache.iotdb.tsfile.encoding.fire.LongFire; -import org.apache.iotdb.tsfile.utils.ReadWriteForEncodingUtils; +import org.apache.tsfile.common.conf.TSFileDescriptor; +import org.apache.tsfile.encoding.bitpacking.LongPacker; +import org.apache.tsfile.encoding.fire.LongFire; +import org.apache.tsfile.utils.ReadWriteForEncodingUtils; import java.io.IOException; import java.nio.ByteBuffer; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/FloatDecoder.java b/tsfile/src/main/java/org/apache/tsfile/encoding/decoder/FloatDecoder.java similarity index 91% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/FloatDecoder.java rename to tsfile/src/main/java/org/apache/tsfile/encoding/decoder/FloatDecoder.java index eb627a58b..505b8e69c 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/FloatDecoder.java +++ b/tsfile/src/main/java/org/apache/tsfile/encoding/decoder/FloatDecoder.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.tsfile.encoding.decoder; - -import org.apache.iotdb.tsfile.encoding.encoder.FloatEncoder; -import org.apache.iotdb.tsfile.exception.encoding.TsFileDecodingException; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding; -import org.apache.iotdb.tsfile.utils.Binary; -import org.apache.iotdb.tsfile.utils.ReadWriteForEncodingUtils; +package org.apache.tsfile.encoding.decoder; + +import org.apache.tsfile.encoding.encoder.FloatEncoder; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.exception.encoding.TsFileDecodingException; +import org.apache.tsfile.file.metadata.enums.TSEncoding; +import org.apache.tsfile.utils.Binary; +import org.apache.tsfile.utils.ReadWriteForEncodingUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/FloatRLBEDecoder.java b/tsfile/src/main/java/org/apache/tsfile/encoding/decoder/FloatRLBEDecoder.java similarity index 97% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/FloatRLBEDecoder.java rename to tsfile/src/main/java/org/apache/tsfile/encoding/decoder/FloatRLBEDecoder.java index 57268976c..eb309e1d1 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/FloatRLBEDecoder.java +++ b/tsfile/src/main/java/org/apache/tsfile/encoding/decoder/FloatRLBEDecoder.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.tsfile.encoding.decoder; +package org.apache.tsfile.encoding.decoder; -import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding; +import org.apache.tsfile.file.metadata.enums.TSEncoding; import java.nio.ByteBuffer; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/FloatSprintzDecoder.java b/tsfile/src/main/java/org/apache/tsfile/encoding/decoder/FloatSprintzDecoder.java similarity index 93% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/FloatSprintzDecoder.java rename to tsfile/src/main/java/org/apache/tsfile/encoding/decoder/FloatSprintzDecoder.java index 9fd732e7a..ee515f79e 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/FloatSprintzDecoder.java +++ b/tsfile/src/main/java/org/apache/tsfile/encoding/decoder/FloatSprintzDecoder.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.tsfile.encoding.decoder; +package org.apache.tsfile.encoding.decoder; -import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor; -import org.apache.iotdb.tsfile.encoding.bitpacking.IntPacker; -import org.apache.iotdb.tsfile.encoding.fire.IntFire; -import org.apache.iotdb.tsfile.utils.ReadWriteForEncodingUtils; +import org.apache.tsfile.common.conf.TSFileDescriptor; +import org.apache.tsfile.encoding.bitpacking.IntPacker; +import org.apache.tsfile.encoding.fire.IntFire; +import org.apache.tsfile.utils.ReadWriteForEncodingUtils; import java.io.IOException; import java.nio.ByteBuffer; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/GorillaDecoderV1.java b/tsfile/src/main/java/org/apache/tsfile/encoding/decoder/GorillaDecoderV1.java similarity index 95% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/GorillaDecoderV1.java rename to tsfile/src/main/java/org/apache/tsfile/encoding/decoder/GorillaDecoderV1.java index 6737cd6f0..71c221fb8 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/GorillaDecoderV1.java +++ b/tsfile/src/main/java/org/apache/tsfile/encoding/decoder/GorillaDecoderV1.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.encoding.decoder; +package org.apache.tsfile.encoding.decoder; -import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding; -import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils; +import org.apache.tsfile.file.metadata.enums.TSEncoding; +import org.apache.tsfile.utils.ReadWriteIOUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/GorillaDecoderV2.java b/tsfile/src/main/java/org/apache/tsfile/encoding/decoder/GorillaDecoderV2.java similarity index 96% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/GorillaDecoderV2.java rename to tsfile/src/main/java/org/apache/tsfile/encoding/decoder/GorillaDecoderV2.java index a7c7875fc..feb06957d 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/GorillaDecoderV2.java +++ b/tsfile/src/main/java/org/apache/tsfile/encoding/decoder/GorillaDecoderV2.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.tsfile.encoding.decoder; +package org.apache.tsfile.encoding.decoder; -import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding; +import org.apache.tsfile.file.metadata.enums.TSEncoding; import java.nio.ByteBuffer; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/IntChimpDecoder.java b/tsfile/src/main/java/org/apache/tsfile/encoding/decoder/IntChimpDecoder.java similarity index 96% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/IntChimpDecoder.java rename to tsfile/src/main/java/org/apache/tsfile/encoding/decoder/IntChimpDecoder.java index 41bae7e6e..1b1947cd6 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/IntChimpDecoder.java +++ b/tsfile/src/main/java/org/apache/tsfile/encoding/decoder/IntChimpDecoder.java @@ -17,13 +17,13 @@ * under the License. */ -package org.apache.iotdb.tsfile.encoding.decoder; +package org.apache.tsfile.encoding.decoder; -import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding; +import org.apache.tsfile.file.metadata.enums.TSEncoding; import java.nio.ByteBuffer; -import static org.apache.iotdb.tsfile.common.conf.TSFileConfig.VALUE_BITS_LENGTH_32BIT; +import static org.apache.tsfile.common.conf.TSFileConfig.VALUE_BITS_LENGTH_32BIT; /** * This class includes code modified from Panagiotis Liakos chimp project. diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/IntGorillaDecoder.java b/tsfile/src/main/java/org/apache/tsfile/encoding/decoder/IntGorillaDecoder.java similarity index 86% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/IntGorillaDecoder.java rename to tsfile/src/main/java/org/apache/tsfile/encoding/decoder/IntGorillaDecoder.java index b52d1997a..fd3aede6e 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/IntGorillaDecoder.java +++ b/tsfile/src/main/java/org/apache/tsfile/encoding/decoder/IntGorillaDecoder.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.tsfile.encoding.decoder; +package org.apache.tsfile.encoding.decoder; import java.nio.ByteBuffer; -import static org.apache.iotdb.tsfile.common.conf.TSFileConfig.GORILLA_ENCODING_ENDING_INTEGER; -import static org.apache.iotdb.tsfile.common.conf.TSFileConfig.LEADING_ZERO_BITS_LENGTH_32BIT; -import static org.apache.iotdb.tsfile.common.conf.TSFileConfig.MEANINGFUL_XOR_BITS_LENGTH_32BIT; -import static org.apache.iotdb.tsfile.common.conf.TSFileConfig.VALUE_BITS_LENGTH_32BIT; +import static org.apache.tsfile.common.conf.TSFileConfig.GORILLA_ENCODING_ENDING_INTEGER; +import static org.apache.tsfile.common.conf.TSFileConfig.LEADING_ZERO_BITS_LENGTH_32BIT; +import static org.apache.tsfile.common.conf.TSFileConfig.MEANINGFUL_XOR_BITS_LENGTH_32BIT; +import static org.apache.tsfile.common.conf.TSFileConfig.VALUE_BITS_LENGTH_32BIT; /** * This class includes code modified from Michael Burman's gorilla-tsc project. diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/IntRLBEDecoder.java b/tsfile/src/main/java/org/apache/tsfile/encoding/decoder/IntRLBEDecoder.java similarity index 97% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/IntRLBEDecoder.java rename to tsfile/src/main/java/org/apache/tsfile/encoding/decoder/IntRLBEDecoder.java index eb4b423db..ae46d3e0e 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/IntRLBEDecoder.java +++ b/tsfile/src/main/java/org/apache/tsfile/encoding/decoder/IntRLBEDecoder.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.tsfile.encoding.decoder; +package org.apache.tsfile.encoding.decoder; -import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding; +import org.apache.tsfile.file.metadata.enums.TSEncoding; import java.nio.ByteBuffer; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/IntRleDecoder.java b/tsfile/src/main/java/org/apache/tsfile/encoding/decoder/IntRleDecoder.java similarity index 91% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/IntRleDecoder.java rename to tsfile/src/main/java/org/apache/tsfile/encoding/decoder/IntRleDecoder.java index 219a35c23..c37bfbd16 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/IntRleDecoder.java +++ b/tsfile/src/main/java/org/apache/tsfile/encoding/decoder/IntRleDecoder.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.tsfile.encoding.decoder; +package org.apache.tsfile.encoding.decoder; -import org.apache.iotdb.tsfile.common.conf.TSFileConfig; -import org.apache.iotdb.tsfile.encoding.bitpacking.IntPacker; -import org.apache.iotdb.tsfile.exception.encoding.TsFileDecodingException; -import org.apache.iotdb.tsfile.utils.ReadWriteForEncodingUtils; +import org.apache.tsfile.common.conf.TSFileConfig; +import org.apache.tsfile.encoding.bitpacking.IntPacker; +import org.apache.tsfile.exception.encoding.TsFileDecodingException; +import org.apache.tsfile.utils.ReadWriteForEncodingUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/IntSprintzDecoder.java b/tsfile/src/main/java/org/apache/tsfile/encoding/decoder/IntSprintzDecoder.java similarity index 93% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/IntSprintzDecoder.java rename to tsfile/src/main/java/org/apache/tsfile/encoding/decoder/IntSprintzDecoder.java index 97b8a3159..565165c6e 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/IntSprintzDecoder.java +++ b/tsfile/src/main/java/org/apache/tsfile/encoding/decoder/IntSprintzDecoder.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.tsfile.encoding.decoder; +package org.apache.tsfile.encoding.decoder; -import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor; -import org.apache.iotdb.tsfile.encoding.bitpacking.IntPacker; -import org.apache.iotdb.tsfile.encoding.fire.IntFire; -import org.apache.iotdb.tsfile.utils.ReadWriteForEncodingUtils; +import org.apache.tsfile.common.conf.TSFileDescriptor; +import org.apache.tsfile.encoding.bitpacking.IntPacker; +import org.apache.tsfile.encoding.fire.IntFire; +import org.apache.tsfile.utils.ReadWriteForEncodingUtils; import java.io.IOException; import java.nio.ByteBuffer; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/IntZigzagDecoder.java b/tsfile/src/main/java/org/apache/tsfile/encoding/decoder/IntZigzagDecoder.java similarity index 93% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/IntZigzagDecoder.java rename to tsfile/src/main/java/org/apache/tsfile/encoding/decoder/IntZigzagDecoder.java index af35058c9..3175c49bc 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/IntZigzagDecoder.java +++ b/tsfile/src/main/java/org/apache/tsfile/encoding/decoder/IntZigzagDecoder.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.tsfile.encoding.decoder; +package org.apache.tsfile.encoding.decoder; -import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding; -import org.apache.iotdb.tsfile.utils.ReadWriteForEncodingUtils; +import org.apache.tsfile.file.metadata.enums.TSEncoding; +import org.apache.tsfile.utils.ReadWriteForEncodingUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/LongChimpDecoder.java b/tsfile/src/main/java/org/apache/tsfile/encoding/decoder/LongChimpDecoder.java similarity index 96% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/LongChimpDecoder.java rename to tsfile/src/main/java/org/apache/tsfile/encoding/decoder/LongChimpDecoder.java index 59d063ceb..23712bae8 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/LongChimpDecoder.java +++ b/tsfile/src/main/java/org/apache/tsfile/encoding/decoder/LongChimpDecoder.java @@ -17,13 +17,13 @@ * under the License. */ -package org.apache.iotdb.tsfile.encoding.decoder; +package org.apache.tsfile.encoding.decoder; -import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding; +import org.apache.tsfile.file.metadata.enums.TSEncoding; import java.nio.ByteBuffer; -import static org.apache.iotdb.tsfile.common.conf.TSFileConfig.VALUE_BITS_LENGTH_64BIT; +import static org.apache.tsfile.common.conf.TSFileConfig.VALUE_BITS_LENGTH_64BIT; /** * This class includes code modified from Panagiotis Liakos chimp project. diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/LongGorillaDecoder.java b/tsfile/src/main/java/org/apache/tsfile/encoding/decoder/LongGorillaDecoder.java similarity index 86% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/LongGorillaDecoder.java rename to tsfile/src/main/java/org/apache/tsfile/encoding/decoder/LongGorillaDecoder.java index 61431216f..3610dd11f 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/LongGorillaDecoder.java +++ b/tsfile/src/main/java/org/apache/tsfile/encoding/decoder/LongGorillaDecoder.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.tsfile.encoding.decoder; +package org.apache.tsfile.encoding.decoder; import java.nio.ByteBuffer; -import static org.apache.iotdb.tsfile.common.conf.TSFileConfig.GORILLA_ENCODING_ENDING_LONG; -import static org.apache.iotdb.tsfile.common.conf.TSFileConfig.LEADING_ZERO_BITS_LENGTH_64BIT; -import static org.apache.iotdb.tsfile.common.conf.TSFileConfig.MEANINGFUL_XOR_BITS_LENGTH_64BIT; -import static org.apache.iotdb.tsfile.common.conf.TSFileConfig.VALUE_BITS_LENGTH_64BIT; +import static org.apache.tsfile.common.conf.TSFileConfig.GORILLA_ENCODING_ENDING_LONG; +import static org.apache.tsfile.common.conf.TSFileConfig.LEADING_ZERO_BITS_LENGTH_64BIT; +import static org.apache.tsfile.common.conf.TSFileConfig.MEANINGFUL_XOR_BITS_LENGTH_64BIT; +import static org.apache.tsfile.common.conf.TSFileConfig.VALUE_BITS_LENGTH_64BIT; /** * This class includes code modified from Michael Burman's gorilla-tsc project. diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/LongRLBEDecoder.java b/tsfile/src/main/java/org/apache/tsfile/encoding/decoder/LongRLBEDecoder.java similarity index 97% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/LongRLBEDecoder.java rename to tsfile/src/main/java/org/apache/tsfile/encoding/decoder/LongRLBEDecoder.java index 974ad99d3..a10200053 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/LongRLBEDecoder.java +++ b/tsfile/src/main/java/org/apache/tsfile/encoding/decoder/LongRLBEDecoder.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.tsfile.encoding.decoder; +package org.apache.tsfile.encoding.decoder; -import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding; +import org.apache.tsfile.file.metadata.enums.TSEncoding; import java.nio.ByteBuffer; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/LongRleDecoder.java b/tsfile/src/main/java/org/apache/tsfile/encoding/decoder/LongRleDecoder.java similarity index 91% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/LongRleDecoder.java rename to tsfile/src/main/java/org/apache/tsfile/encoding/decoder/LongRleDecoder.java index 5721fd294..573ffd9ea 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/LongRleDecoder.java +++ b/tsfile/src/main/java/org/apache/tsfile/encoding/decoder/LongRleDecoder.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.tsfile.encoding.decoder; +package org.apache.tsfile.encoding.decoder; -import org.apache.iotdb.tsfile.common.conf.TSFileConfig; -import org.apache.iotdb.tsfile.encoding.bitpacking.LongPacker; -import org.apache.iotdb.tsfile.exception.encoding.TsFileDecodingException; -import org.apache.iotdb.tsfile.utils.ReadWriteForEncodingUtils; +import org.apache.tsfile.common.conf.TSFileConfig; +import org.apache.tsfile.encoding.bitpacking.LongPacker; +import org.apache.tsfile.exception.encoding.TsFileDecodingException; +import org.apache.tsfile.utils.ReadWriteForEncodingUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/LongSprintzDecoder.java b/tsfile/src/main/java/org/apache/tsfile/encoding/decoder/LongSprintzDecoder.java similarity index 92% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/LongSprintzDecoder.java rename to tsfile/src/main/java/org/apache/tsfile/encoding/decoder/LongSprintzDecoder.java index 9f0b2ec4a..468bfcc55 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/LongSprintzDecoder.java +++ b/tsfile/src/main/java/org/apache/tsfile/encoding/decoder/LongSprintzDecoder.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.tsfile.encoding.decoder; +package org.apache.tsfile.encoding.decoder; -import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor; -import org.apache.iotdb.tsfile.encoding.bitpacking.LongPacker; -import org.apache.iotdb.tsfile.encoding.fire.LongFire; -import org.apache.iotdb.tsfile.utils.ReadWriteForEncodingUtils; +import org.apache.tsfile.common.conf.TSFileDescriptor; +import org.apache.tsfile.encoding.bitpacking.LongPacker; +import org.apache.tsfile.encoding.fire.LongFire; +import org.apache.tsfile.utils.ReadWriteForEncodingUtils; import java.io.IOException; import java.nio.ByteBuffer; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/LongZigzagDecoder.java b/tsfile/src/main/java/org/apache/tsfile/encoding/decoder/LongZigzagDecoder.java similarity index 93% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/LongZigzagDecoder.java rename to tsfile/src/main/java/org/apache/tsfile/encoding/decoder/LongZigzagDecoder.java index 931fcf57f..2334d86d2 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/LongZigzagDecoder.java +++ b/tsfile/src/main/java/org/apache/tsfile/encoding/decoder/LongZigzagDecoder.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.tsfile.encoding.decoder; +package org.apache.tsfile.encoding.decoder; -import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding; -import org.apache.iotdb.tsfile.utils.ReadWriteForEncodingUtils; +import org.apache.tsfile.file.metadata.enums.TSEncoding; +import org.apache.tsfile.utils.ReadWriteForEncodingUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/PlainDecoder.java b/tsfile/src/main/java/org/apache/tsfile/encoding/decoder/PlainDecoder.java similarity index 87% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/PlainDecoder.java rename to tsfile/src/main/java/org/apache/tsfile/encoding/decoder/PlainDecoder.java index 4af177991..8ad2e382e 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/PlainDecoder.java +++ b/tsfile/src/main/java/org/apache/tsfile/encoding/decoder/PlainDecoder.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.tsfile.encoding.decoder; +package org.apache.tsfile.encoding.decoder; -import org.apache.iotdb.tsfile.exception.encoding.TsFileDecodingException; -import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding; -import org.apache.iotdb.tsfile.utils.Binary; -import org.apache.iotdb.tsfile.utils.ReadWriteForEncodingUtils; +import org.apache.tsfile.exception.encoding.TsFileDecodingException; +import org.apache.tsfile.file.metadata.enums.TSEncoding; +import org.apache.tsfile.utils.Binary; +import org.apache.tsfile.utils.ReadWriteForEncodingUtils; import java.math.BigDecimal; import java.nio.ByteBuffer; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/RegularDataDecoder.java b/tsfile/src/main/java/org/apache/tsfile/encoding/decoder/RegularDataDecoder.java similarity index 96% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/RegularDataDecoder.java rename to tsfile/src/main/java/org/apache/tsfile/encoding/decoder/RegularDataDecoder.java index bfe455b61..f91b21a46 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/RegularDataDecoder.java +++ b/tsfile/src/main/java/org/apache/tsfile/encoding/decoder/RegularDataDecoder.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.tsfile.encoding.decoder; +package org.apache.tsfile.encoding.decoder; -import org.apache.iotdb.tsfile.encoding.encoder.RegularDataEncoder; -import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding; -import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils; +import org.apache.tsfile.encoding.encoder.RegularDataEncoder; +import org.apache.tsfile.file.metadata.enums.TSEncoding; +import org.apache.tsfile.utils.ReadWriteIOUtils; import java.io.IOException; import java.nio.ByteBuffer; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/RleDecoder.java b/tsfile/src/main/java/org/apache/tsfile/encoding/decoder/RleDecoder.java similarity index 93% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/RleDecoder.java rename to tsfile/src/main/java/org/apache/tsfile/encoding/decoder/RleDecoder.java index 53f812442..30174a0ee 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/RleDecoder.java +++ b/tsfile/src/main/java/org/apache/tsfile/encoding/decoder/RleDecoder.java @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.iotdb.tsfile.encoding.decoder; - -import org.apache.iotdb.tsfile.common.conf.TSFileConfig; -import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor; -import org.apache.iotdb.tsfile.exception.encoding.TsFileDecodingException; -import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding; -import org.apache.iotdb.tsfile.utils.Binary; -import org.apache.iotdb.tsfile.utils.ReadWriteForEncodingUtils; -import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils; +package org.apache.tsfile.encoding.decoder; + +import org.apache.tsfile.common.conf.TSFileConfig; +import org.apache.tsfile.common.conf.TSFileDescriptor; +import org.apache.tsfile.exception.encoding.TsFileDecodingException; +import org.apache.tsfile.file.metadata.enums.TSEncoding; +import org.apache.tsfile.utils.Binary; +import org.apache.tsfile.utils.ReadWriteForEncodingUtils; +import org.apache.tsfile.utils.ReadWriteIOUtils; import java.io.IOException; import java.math.BigDecimal; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/SinglePrecisionChimpDecoder.java b/tsfile/src/main/java/org/apache/tsfile/encoding/decoder/SinglePrecisionChimpDecoder.java similarity index 96% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/SinglePrecisionChimpDecoder.java rename to tsfile/src/main/java/org/apache/tsfile/encoding/decoder/SinglePrecisionChimpDecoder.java index 33a2290ca..5d17e558b 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/SinglePrecisionChimpDecoder.java +++ b/tsfile/src/main/java/org/apache/tsfile/encoding/decoder/SinglePrecisionChimpDecoder.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.tsfile.encoding.decoder; +package org.apache.tsfile.encoding.decoder; import java.nio.ByteBuffer; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/SinglePrecisionDecoderV1.java b/tsfile/src/main/java/org/apache/tsfile/encoding/decoder/SinglePrecisionDecoderV1.java similarity index 95% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/SinglePrecisionDecoderV1.java rename to tsfile/src/main/java/org/apache/tsfile/encoding/decoder/SinglePrecisionDecoderV1.java index 128bf1755..522425964 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/SinglePrecisionDecoderV1.java +++ b/tsfile/src/main/java/org/apache/tsfile/encoding/decoder/SinglePrecisionDecoderV1.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.tsfile.encoding.decoder; +package org.apache.tsfile.encoding.decoder; -import org.apache.iotdb.tsfile.common.conf.TSFileConfig; -import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils; +import org.apache.tsfile.common.conf.TSFileConfig; +import org.apache.tsfile.utils.ReadWriteIOUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/SinglePrecisionDecoderV2.java b/tsfile/src/main/java/org/apache/tsfile/encoding/decoder/SinglePrecisionDecoderV2.java similarity index 91% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/SinglePrecisionDecoderV2.java rename to tsfile/src/main/java/org/apache/tsfile/encoding/decoder/SinglePrecisionDecoderV2.java index ea3d7bc67..9e7b45843 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/SinglePrecisionDecoderV2.java +++ b/tsfile/src/main/java/org/apache/tsfile/encoding/decoder/SinglePrecisionDecoderV2.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.tsfile.encoding.decoder; +package org.apache.tsfile.encoding.decoder; import java.nio.ByteBuffer; -import static org.apache.iotdb.tsfile.common.conf.TSFileConfig.GORILLA_ENCODING_ENDING_FLOAT; +import static org.apache.tsfile.common.conf.TSFileConfig.GORILLA_ENCODING_ENDING_FLOAT; /** * This class includes code modified from Michael Burman's gorilla-tsc project. diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/SprintzDecoder.java b/tsfile/src/main/java/org/apache/tsfile/encoding/decoder/SprintzDecoder.java similarity index 89% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/SprintzDecoder.java rename to tsfile/src/main/java/org/apache/tsfile/encoding/decoder/SprintzDecoder.java index 0d1debfe1..5c7e53fb7 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/SprintzDecoder.java +++ b/tsfile/src/main/java/org/apache/tsfile/encoding/decoder/SprintzDecoder.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.tsfile.encoding.decoder; +package org.apache.tsfile.encoding.decoder; -import org.apache.iotdb.tsfile.encoding.encoder.SprintzEncoder; -import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding; +import org.apache.tsfile.encoding.encoder.SprintzEncoder; +import org.apache.tsfile.file.metadata.enums.TSEncoding; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/BitmapEncoder.java b/tsfile/src/main/java/org/apache/tsfile/encoding/encoder/BitmapEncoder.java similarity index 96% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/BitmapEncoder.java rename to tsfile/src/main/java/org/apache/tsfile/encoding/encoder/BitmapEncoder.java index a25839731..276cb2dde 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/BitmapEncoder.java +++ b/tsfile/src/main/java/org/apache/tsfile/encoding/encoder/BitmapEncoder.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.tsfile.encoding.encoder; +package org.apache.tsfile.encoding.encoder; -import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding; -import org.apache.iotdb.tsfile.utils.ReadWriteForEncodingUtils; +import org.apache.tsfile.file.metadata.enums.TSEncoding; +import org.apache.tsfile.utils.ReadWriteForEncodingUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/DeltaBinaryEncoder.java b/tsfile/src/main/java/org/apache/tsfile/encoding/encoder/DeltaBinaryEncoder.java similarity index 97% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/DeltaBinaryEncoder.java rename to tsfile/src/main/java/org/apache/tsfile/encoding/encoder/DeltaBinaryEncoder.java index adac76fb8..d61f33d92 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/DeltaBinaryEncoder.java +++ b/tsfile/src/main/java/org/apache/tsfile/encoding/encoder/DeltaBinaryEncoder.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.tsfile.encoding.encoder; +package org.apache.tsfile.encoding.encoder; -import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding; -import org.apache.iotdb.tsfile.utils.BytesUtils; -import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils; +import org.apache.tsfile.file.metadata.enums.TSEncoding; +import org.apache.tsfile.utils.BytesUtils; +import org.apache.tsfile.utils.ReadWriteIOUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/DictionaryEncoder.java b/tsfile/src/main/java/org/apache/tsfile/encoding/encoder/DictionaryEncoder.java similarity index 93% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/DictionaryEncoder.java rename to tsfile/src/main/java/org/apache/tsfile/encoding/encoder/DictionaryEncoder.java index 4a55e143f..df9e10464 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/DictionaryEncoder.java +++ b/tsfile/src/main/java/org/apache/tsfile/encoding/encoder/DictionaryEncoder.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.tsfile.encoding.encoder; +package org.apache.tsfile.encoding.encoder; -import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding; -import org.apache.iotdb.tsfile.utils.Binary; -import org.apache.iotdb.tsfile.utils.ReadWriteForEncodingUtils; +import org.apache.tsfile.file.metadata.enums.TSEncoding; +import org.apache.tsfile.utils.Binary; +import org.apache.tsfile.utils.ReadWriteForEncodingUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/DoublePrecisionChimpEncoder.java b/tsfile/src/main/java/org/apache/tsfile/encoding/encoder/DoublePrecisionChimpEncoder.java similarity index 97% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/DoublePrecisionChimpEncoder.java rename to tsfile/src/main/java/org/apache/tsfile/encoding/encoder/DoublePrecisionChimpEncoder.java index cf762de0d..843d17a39 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/DoublePrecisionChimpEncoder.java +++ b/tsfile/src/main/java/org/apache/tsfile/encoding/encoder/DoublePrecisionChimpEncoder.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.tsfile.encoding.encoder; +package org.apache.tsfile.encoding.encoder; import java.io.ByteArrayOutputStream; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/DoublePrecisionEncoderV1.java b/tsfile/src/main/java/org/apache/tsfile/encoding/encoder/DoublePrecisionEncoderV1.java similarity index 97% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/DoublePrecisionEncoderV1.java rename to tsfile/src/main/java/org/apache/tsfile/encoding/encoder/DoublePrecisionEncoderV1.java index 3ddb33d3e..1e96c68ff 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/DoublePrecisionEncoderV1.java +++ b/tsfile/src/main/java/org/apache/tsfile/encoding/encoder/DoublePrecisionEncoderV1.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.tsfile.encoding.encoder; +package org.apache.tsfile.encoding.encoder; -import org.apache.iotdb.tsfile.common.conf.TSFileConfig; +import org.apache.tsfile.common.conf.TSFileConfig; import java.io.ByteArrayOutputStream; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/DoublePrecisionEncoderV2.java b/tsfile/src/main/java/org/apache/tsfile/encoding/encoder/DoublePrecisionEncoderV2.java similarity index 92% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/DoublePrecisionEncoderV2.java rename to tsfile/src/main/java/org/apache/tsfile/encoding/encoder/DoublePrecisionEncoderV2.java index 3a6224e03..9b487be87 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/DoublePrecisionEncoderV2.java +++ b/tsfile/src/main/java/org/apache/tsfile/encoding/encoder/DoublePrecisionEncoderV2.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.tsfile.encoding.encoder; +package org.apache.tsfile.encoding.encoder; import java.io.ByteArrayOutputStream; -import static org.apache.iotdb.tsfile.common.conf.TSFileConfig.GORILLA_ENCODING_ENDING_DOUBLE; +import static org.apache.tsfile.common.conf.TSFileConfig.GORILLA_ENCODING_ENDING_DOUBLE; /** * This class includes code modified from Michael Burman's gorilla-tsc project. diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/DoubleRLBE.java b/tsfile/src/main/java/org/apache/tsfile/encoding/encoder/DoubleRLBE.java similarity index 99% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/DoubleRLBE.java rename to tsfile/src/main/java/org/apache/tsfile/encoding/encoder/DoubleRLBE.java index a9becdc66..40fc8d861 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/DoubleRLBE.java +++ b/tsfile/src/main/java/org/apache/tsfile/encoding/encoder/DoubleRLBE.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.tsfile.encoding.encoder; +package org.apache.tsfile.encoding.encoder; import java.io.ByteArrayOutputStream; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/DoubleSprintzEncoder.java b/tsfile/src/main/java/org/apache/tsfile/encoding/encoder/DoubleSprintzEncoder.java similarity index 93% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/DoubleSprintzEncoder.java rename to tsfile/src/main/java/org/apache/tsfile/encoding/encoder/DoubleSprintzEncoder.java index 9a9ba4cac..297b6a181 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/DoubleSprintzEncoder.java +++ b/tsfile/src/main/java/org/apache/tsfile/encoding/encoder/DoubleSprintzEncoder.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.tsfile.encoding.encoder; +package org.apache.tsfile.encoding.encoder; -import org.apache.iotdb.tsfile.encoding.bitpacking.LongPacker; -import org.apache.iotdb.tsfile.encoding.fire.LongFire; -import org.apache.iotdb.tsfile.exception.encoding.TsFileEncodingException; -import org.apache.iotdb.tsfile.utils.ReadWriteForEncodingUtils; +import org.apache.tsfile.encoding.bitpacking.LongPacker; +import org.apache.tsfile.encoding.fire.LongFire; +import org.apache.tsfile.exception.encoding.TsFileEncodingException; +import org.apache.tsfile.utils.ReadWriteForEncodingUtils; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/Encoder.java b/tsfile/src/main/java/org/apache/tsfile/encoding/encoder/Encoder.java similarity index 93% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/Encoder.java rename to tsfile/src/main/java/org/apache/tsfile/encoding/encoder/Encoder.java index b201fb97d..afdbe1640 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/Encoder.java +++ b/tsfile/src/main/java/org/apache/tsfile/encoding/encoder/Encoder.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.encoding.encoder; +package org.apache.tsfile.encoding.encoder; -import org.apache.iotdb.tsfile.exception.encoding.TsFileEncodingException; -import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding; -import org.apache.iotdb.tsfile.utils.Binary; +import org.apache.tsfile.exception.encoding.TsFileEncodingException; +import org.apache.tsfile.file.metadata.enums.TSEncoding; +import org.apache.tsfile.utils.Binary; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/FloatEncoder.java b/tsfile/src/main/java/org/apache/tsfile/encoding/encoder/FloatEncoder.java similarity index 92% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/FloatEncoder.java rename to tsfile/src/main/java/org/apache/tsfile/encoding/encoder/FloatEncoder.java index 2d477cb93..4655d3d62 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/FloatEncoder.java +++ b/tsfile/src/main/java/org/apache/tsfile/encoding/encoder/FloatEncoder.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.tsfile.encoding.encoder; +package org.apache.tsfile.encoding.encoder; -import org.apache.iotdb.tsfile.exception.encoding.TsFileEncodingException; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding; -import org.apache.iotdb.tsfile.utils.ReadWriteForEncodingUtils; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.exception.encoding.TsFileEncodingException; +import org.apache.tsfile.file.metadata.enums.TSEncoding; +import org.apache.tsfile.utils.ReadWriteForEncodingUtils; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/FloatRLBE.java b/tsfile/src/main/java/org/apache/tsfile/encoding/encoder/FloatRLBE.java similarity index 99% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/FloatRLBE.java rename to tsfile/src/main/java/org/apache/tsfile/encoding/encoder/FloatRLBE.java index ee3677e4b..43f4ac17f 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/FloatRLBE.java +++ b/tsfile/src/main/java/org/apache/tsfile/encoding/encoder/FloatRLBE.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.tsfile.encoding.encoder; +package org.apache.tsfile.encoding.encoder; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/FloatSprintzEncoder.java b/tsfile/src/main/java/org/apache/tsfile/encoding/encoder/FloatSprintzEncoder.java similarity index 93% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/FloatSprintzEncoder.java rename to tsfile/src/main/java/org/apache/tsfile/encoding/encoder/FloatSprintzEncoder.java index 3100514e1..24ae44671 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/FloatSprintzEncoder.java +++ b/tsfile/src/main/java/org/apache/tsfile/encoding/encoder/FloatSprintzEncoder.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.tsfile.encoding.encoder; +package org.apache.tsfile.encoding.encoder; -import org.apache.iotdb.tsfile.encoding.bitpacking.IntPacker; -import org.apache.iotdb.tsfile.encoding.fire.IntFire; -import org.apache.iotdb.tsfile.exception.encoding.TsFileEncodingException; -import org.apache.iotdb.tsfile.utils.ReadWriteForEncodingUtils; +import org.apache.tsfile.encoding.bitpacking.IntPacker; +import org.apache.tsfile.encoding.fire.IntFire; +import org.apache.tsfile.exception.encoding.TsFileEncodingException; +import org.apache.tsfile.utils.ReadWriteForEncodingUtils; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/GorillaEncoderV1.java b/tsfile/src/main/java/org/apache/tsfile/encoding/encoder/GorillaEncoderV1.java similarity index 95% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/GorillaEncoderV1.java rename to tsfile/src/main/java/org/apache/tsfile/encoding/encoder/GorillaEncoderV1.java index 712139043..977e8eadd 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/GorillaEncoderV1.java +++ b/tsfile/src/main/java/org/apache/tsfile/encoding/encoder/GorillaEncoderV1.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.tsfile.encoding.encoder; +package org.apache.tsfile.encoding.encoder; -import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding; +import org.apache.tsfile.file.metadata.enums.TSEncoding; import java.io.ByteArrayOutputStream; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/GorillaEncoderV2.java b/tsfile/src/main/java/org/apache/tsfile/encoding/encoder/GorillaEncoderV2.java similarity index 96% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/GorillaEncoderV2.java rename to tsfile/src/main/java/org/apache/tsfile/encoding/encoder/GorillaEncoderV2.java index 9af575bbc..0088a831c 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/GorillaEncoderV2.java +++ b/tsfile/src/main/java/org/apache/tsfile/encoding/encoder/GorillaEncoderV2.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.tsfile.encoding.encoder; +package org.apache.tsfile.encoding.encoder; -import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding; +import org.apache.tsfile.file.metadata.enums.TSEncoding; import java.io.ByteArrayOutputStream; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/IntChimpEncoder.java b/tsfile/src/main/java/org/apache/tsfile/encoding/encoder/IntChimpEncoder.java similarity index 94% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/IntChimpEncoder.java rename to tsfile/src/main/java/org/apache/tsfile/encoding/encoder/IntChimpEncoder.java index 03c01415b..2d342a593 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/IntChimpEncoder.java +++ b/tsfile/src/main/java/org/apache/tsfile/encoding/encoder/IntChimpEncoder.java @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.iotdb.tsfile.encoding.encoder; +package org.apache.tsfile.encoding.encoder; -import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding; +import org.apache.tsfile.file.metadata.enums.TSEncoding; import java.io.ByteArrayOutputStream; -import static org.apache.iotdb.tsfile.common.conf.TSFileConfig.LEADING_ZERO_BITS_LENGTH_32BIT; -import static org.apache.iotdb.tsfile.common.conf.TSFileConfig.MEANINGFUL_XOR_BITS_LENGTH_32BIT; -import static org.apache.iotdb.tsfile.common.conf.TSFileConfig.VALUE_BITS_LENGTH_32BIT; +import static org.apache.tsfile.common.conf.TSFileConfig.LEADING_ZERO_BITS_LENGTH_32BIT; +import static org.apache.tsfile.common.conf.TSFileConfig.MEANINGFUL_XOR_BITS_LENGTH_32BIT; +import static org.apache.tsfile.common.conf.TSFileConfig.VALUE_BITS_LENGTH_32BIT; /** * This class includes code modified from Panagiotis Liakos chimp project. diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/IntGorillaEncoder.java b/tsfile/src/main/java/org/apache/tsfile/encoding/encoder/IntGorillaEncoder.java similarity index 91% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/IntGorillaEncoder.java rename to tsfile/src/main/java/org/apache/tsfile/encoding/encoder/IntGorillaEncoder.java index fdb4f790a..dd8a7da4e 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/IntGorillaEncoder.java +++ b/tsfile/src/main/java/org/apache/tsfile/encoding/encoder/IntGorillaEncoder.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.tsfile.encoding.encoder; +package org.apache.tsfile.encoding.encoder; import java.io.ByteArrayOutputStream; -import static org.apache.iotdb.tsfile.common.conf.TSFileConfig.GORILLA_ENCODING_ENDING_INTEGER; -import static org.apache.iotdb.tsfile.common.conf.TSFileConfig.LEADING_ZERO_BITS_LENGTH_32BIT; -import static org.apache.iotdb.tsfile.common.conf.TSFileConfig.MEANINGFUL_XOR_BITS_LENGTH_32BIT; -import static org.apache.iotdb.tsfile.common.conf.TSFileConfig.VALUE_BITS_LENGTH_32BIT; +import static org.apache.tsfile.common.conf.TSFileConfig.GORILLA_ENCODING_ENDING_INTEGER; +import static org.apache.tsfile.common.conf.TSFileConfig.LEADING_ZERO_BITS_LENGTH_32BIT; +import static org.apache.tsfile.common.conf.TSFileConfig.MEANINGFUL_XOR_BITS_LENGTH_32BIT; +import static org.apache.tsfile.common.conf.TSFileConfig.VALUE_BITS_LENGTH_32BIT; /** * This class includes code modified from Michael Burman's gorilla-tsc project. diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/IntRLBE.java b/tsfile/src/main/java/org/apache/tsfile/encoding/encoder/IntRLBE.java similarity index 99% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/IntRLBE.java rename to tsfile/src/main/java/org/apache/tsfile/encoding/encoder/IntRLBE.java index 43401f2bf..31603260b 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/IntRLBE.java +++ b/tsfile/src/main/java/org/apache/tsfile/encoding/encoder/IntRLBE.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.tsfile.encoding.encoder; +package org.apache.tsfile.encoding.encoder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/IntRleEncoder.java b/tsfile/src/main/java/org/apache/tsfile/encoding/encoder/IntRleEncoder.java similarity index 93% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/IntRleEncoder.java rename to tsfile/src/main/java/org/apache/tsfile/encoding/encoder/IntRleEncoder.java index c6873ccf9..ec133bea1 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/IntRleEncoder.java +++ b/tsfile/src/main/java/org/apache/tsfile/encoding/encoder/IntRleEncoder.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.tsfile.encoding.encoder; +package org.apache.tsfile.encoding.encoder; -import org.apache.iotdb.tsfile.common.conf.TSFileConfig; -import org.apache.iotdb.tsfile.encoding.bitpacking.IntPacker; -import org.apache.iotdb.tsfile.utils.ReadWriteForEncodingUtils; +import org.apache.tsfile.common.conf.TSFileConfig; +import org.apache.tsfile.encoding.bitpacking.IntPacker; +import org.apache.tsfile.utils.ReadWriteForEncodingUtils; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/IntSprintzEncoder.java b/tsfile/src/main/java/org/apache/tsfile/encoding/encoder/IntSprintzEncoder.java similarity index 93% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/IntSprintzEncoder.java rename to tsfile/src/main/java/org/apache/tsfile/encoding/encoder/IntSprintzEncoder.java index ad7797004..65f2d38cc 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/IntSprintzEncoder.java +++ b/tsfile/src/main/java/org/apache/tsfile/encoding/encoder/IntSprintzEncoder.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.tsfile.encoding.encoder; +package org.apache.tsfile.encoding.encoder; -import org.apache.iotdb.tsfile.encoding.bitpacking.IntPacker; -import org.apache.iotdb.tsfile.encoding.fire.IntFire; -import org.apache.iotdb.tsfile.exception.encoding.TsFileEncodingException; -import org.apache.iotdb.tsfile.utils.ReadWriteForEncodingUtils; +import org.apache.tsfile.encoding.bitpacking.IntPacker; +import org.apache.tsfile.encoding.fire.IntFire; +import org.apache.tsfile.exception.encoding.TsFileEncodingException; +import org.apache.tsfile.utils.ReadWriteForEncodingUtils; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/IntZigzagEncoder.java b/tsfile/src/main/java/org/apache/tsfile/encoding/encoder/IntZigzagEncoder.java similarity index 94% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/IntZigzagEncoder.java rename to tsfile/src/main/java/org/apache/tsfile/encoding/encoder/IntZigzagEncoder.java index 6e145dca1..31983e8c4 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/IntZigzagEncoder.java +++ b/tsfile/src/main/java/org/apache/tsfile/encoding/encoder/IntZigzagEncoder.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.tsfile.encoding.encoder; +package org.apache.tsfile.encoding.encoder; -import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding; -import org.apache.iotdb.tsfile.utils.ReadWriteForEncodingUtils; +import org.apache.tsfile.file.metadata.enums.TSEncoding; +import org.apache.tsfile.utils.ReadWriteForEncodingUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/LongChimpEncoder.java b/tsfile/src/main/java/org/apache/tsfile/encoding/encoder/LongChimpEncoder.java similarity index 94% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/LongChimpEncoder.java rename to tsfile/src/main/java/org/apache/tsfile/encoding/encoder/LongChimpEncoder.java index f8bb1083b..d3076a572 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/LongChimpEncoder.java +++ b/tsfile/src/main/java/org/apache/tsfile/encoding/encoder/LongChimpEncoder.java @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.iotdb.tsfile.encoding.encoder; +package org.apache.tsfile.encoding.encoder; -import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding; +import org.apache.tsfile.file.metadata.enums.TSEncoding; import java.io.ByteArrayOutputStream; -import static org.apache.iotdb.tsfile.common.conf.TSFileConfig.LEADING_ZERO_BITS_LENGTH_64BIT; -import static org.apache.iotdb.tsfile.common.conf.TSFileConfig.MEANINGFUL_XOR_BITS_LENGTH_64BIT; -import static org.apache.iotdb.tsfile.common.conf.TSFileConfig.VALUE_BITS_LENGTH_64BIT; +import static org.apache.tsfile.common.conf.TSFileConfig.LEADING_ZERO_BITS_LENGTH_64BIT; +import static org.apache.tsfile.common.conf.TSFileConfig.MEANINGFUL_XOR_BITS_LENGTH_64BIT; +import static org.apache.tsfile.common.conf.TSFileConfig.VALUE_BITS_LENGTH_64BIT; /** * This class includes code modified from Panagiotis Liakos chimp project. diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/LongGorillaEncoder.java b/tsfile/src/main/java/org/apache/tsfile/encoding/encoder/LongGorillaEncoder.java similarity index 92% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/LongGorillaEncoder.java rename to tsfile/src/main/java/org/apache/tsfile/encoding/encoder/LongGorillaEncoder.java index 0b39592e4..1a13b7d80 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/LongGorillaEncoder.java +++ b/tsfile/src/main/java/org/apache/tsfile/encoding/encoder/LongGorillaEncoder.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.tsfile.encoding.encoder; +package org.apache.tsfile.encoding.encoder; import java.io.ByteArrayOutputStream; -import static org.apache.iotdb.tsfile.common.conf.TSFileConfig.GORILLA_ENCODING_ENDING_LONG; -import static org.apache.iotdb.tsfile.common.conf.TSFileConfig.LEADING_ZERO_BITS_LENGTH_64BIT; -import static org.apache.iotdb.tsfile.common.conf.TSFileConfig.MEANINGFUL_XOR_BITS_LENGTH_64BIT; -import static org.apache.iotdb.tsfile.common.conf.TSFileConfig.VALUE_BITS_LENGTH_64BIT; +import static org.apache.tsfile.common.conf.TSFileConfig.GORILLA_ENCODING_ENDING_LONG; +import static org.apache.tsfile.common.conf.TSFileConfig.LEADING_ZERO_BITS_LENGTH_64BIT; +import static org.apache.tsfile.common.conf.TSFileConfig.MEANINGFUL_XOR_BITS_LENGTH_64BIT; +import static org.apache.tsfile.common.conf.TSFileConfig.VALUE_BITS_LENGTH_64BIT; /** * This class includes code modified from Michael Burman's gorilla-tsc project. diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/LongRLBE.java b/tsfile/src/main/java/org/apache/tsfile/encoding/encoder/LongRLBE.java similarity index 99% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/LongRLBE.java rename to tsfile/src/main/java/org/apache/tsfile/encoding/encoder/LongRLBE.java index 7e489e3cf..24614d199 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/LongRLBE.java +++ b/tsfile/src/main/java/org/apache/tsfile/encoding/encoder/LongRLBE.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.tsfile.encoding.encoder; +package org.apache.tsfile.encoding.encoder; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/LongRleEncoder.java b/tsfile/src/main/java/org/apache/tsfile/encoding/encoder/LongRleEncoder.java similarity index 93% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/LongRleEncoder.java rename to tsfile/src/main/java/org/apache/tsfile/encoding/encoder/LongRleEncoder.java index 963653279..472a407c7 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/LongRleEncoder.java +++ b/tsfile/src/main/java/org/apache/tsfile/encoding/encoder/LongRleEncoder.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.tsfile.encoding.encoder; +package org.apache.tsfile.encoding.encoder; -import org.apache.iotdb.tsfile.common.conf.TSFileConfig; -import org.apache.iotdb.tsfile.encoding.bitpacking.LongPacker; -import org.apache.iotdb.tsfile.utils.ReadWriteForEncodingUtils; +import org.apache.tsfile.common.conf.TSFileConfig; +import org.apache.tsfile.encoding.bitpacking.LongPacker; +import org.apache.tsfile.utils.ReadWriteForEncodingUtils; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/LongSprintzEncoder.java b/tsfile/src/main/java/org/apache/tsfile/encoding/encoder/LongSprintzEncoder.java similarity index 93% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/LongSprintzEncoder.java rename to tsfile/src/main/java/org/apache/tsfile/encoding/encoder/LongSprintzEncoder.java index 83a1218e5..2d91b4cf3 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/LongSprintzEncoder.java +++ b/tsfile/src/main/java/org/apache/tsfile/encoding/encoder/LongSprintzEncoder.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.tsfile.encoding.encoder; +package org.apache.tsfile.encoding.encoder; -import org.apache.iotdb.tsfile.encoding.bitpacking.LongPacker; -import org.apache.iotdb.tsfile.encoding.fire.LongFire; -import org.apache.iotdb.tsfile.exception.encoding.TsFileEncodingException; -import org.apache.iotdb.tsfile.utils.ReadWriteForEncodingUtils; +import org.apache.tsfile.encoding.bitpacking.LongPacker; +import org.apache.tsfile.encoding.fire.LongFire; +import org.apache.tsfile.exception.encoding.TsFileEncodingException; +import org.apache.tsfile.utils.ReadWriteForEncodingUtils; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/LongZigzagEncoder.java b/tsfile/src/main/java/org/apache/tsfile/encoding/encoder/LongZigzagEncoder.java similarity index 94% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/LongZigzagEncoder.java rename to tsfile/src/main/java/org/apache/tsfile/encoding/encoder/LongZigzagEncoder.java index f611815fa..83d756138 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/LongZigzagEncoder.java +++ b/tsfile/src/main/java/org/apache/tsfile/encoding/encoder/LongZigzagEncoder.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.tsfile.encoding.encoder; +package org.apache.tsfile.encoding.encoder; -import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding; -import org.apache.iotdb.tsfile.utils.ReadWriteForEncodingUtils; +import org.apache.tsfile.file.metadata.enums.TSEncoding; +import org.apache.tsfile.utils.ReadWriteForEncodingUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/PlainEncoder.java b/tsfile/src/main/java/org/apache/tsfile/encoding/encoder/PlainEncoder.java similarity index 89% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/PlainEncoder.java rename to tsfile/src/main/java/org/apache/tsfile/encoding/encoder/PlainEncoder.java index 32491089b..e93f1f080 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/PlainEncoder.java +++ b/tsfile/src/main/java/org/apache/tsfile/encoding/encoder/PlainEncoder.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.tsfile.encoding.encoder; - -import org.apache.iotdb.tsfile.common.conf.TSFileConfig; -import org.apache.iotdb.tsfile.exception.encoding.TsFileEncodingException; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding; -import org.apache.iotdb.tsfile.utils.Binary; -import org.apache.iotdb.tsfile.utils.ReadWriteForEncodingUtils; +package org.apache.tsfile.encoding.encoder; + +import org.apache.tsfile.common.conf.TSFileConfig; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.exception.encoding.TsFileEncodingException; +import org.apache.tsfile.file.metadata.enums.TSEncoding; +import org.apache.tsfile.utils.Binary; +import org.apache.tsfile.utils.ReadWriteForEncodingUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/RLBE.java b/tsfile/src/main/java/org/apache/tsfile/encoding/encoder/RLBE.java similarity index 94% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/RLBE.java rename to tsfile/src/main/java/org/apache/tsfile/encoding/encoder/RLBE.java index d428b4f4c..ccb688c2f 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/RLBE.java +++ b/tsfile/src/main/java/org/apache/tsfile/encoding/encoder/RLBE.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.tsfile.encoding.encoder; +package org.apache.tsfile.encoding.encoder; -import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding; +import org.apache.tsfile.file.metadata.enums.TSEncoding; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/RegularDataEncoder.java b/tsfile/src/main/java/org/apache/tsfile/encoding/encoder/RegularDataEncoder.java similarity index 98% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/RegularDataEncoder.java rename to tsfile/src/main/java/org/apache/tsfile/encoding/encoder/RegularDataEncoder.java index 9a2badb6c..f885cbea4 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/RegularDataEncoder.java +++ b/tsfile/src/main/java/org/apache/tsfile/encoding/encoder/RegularDataEncoder.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.tsfile.encoding.encoder; +package org.apache.tsfile.encoding.encoder; -import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding; -import org.apache.iotdb.tsfile.utils.BytesUtils; +import org.apache.tsfile.file.metadata.enums.TSEncoding; +import org.apache.tsfile.utils.BytesUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/RleEncoder.java b/tsfile/src/main/java/org/apache/tsfile/encoding/encoder/RleEncoder.java similarity index 96% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/RleEncoder.java rename to tsfile/src/main/java/org/apache/tsfile/encoding/encoder/RleEncoder.java index 2afb70a4e..9121244ba 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/RleEncoder.java +++ b/tsfile/src/main/java/org/apache/tsfile/encoding/encoder/RleEncoder.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.tsfile.encoding.encoder; - -import org.apache.iotdb.tsfile.common.conf.TSFileConfig; -import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor; -import org.apache.iotdb.tsfile.exception.encoding.TsFileEncodingException; -import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding; -import org.apache.iotdb.tsfile.utils.Binary; -import org.apache.iotdb.tsfile.utils.ReadWriteForEncodingUtils; +package org.apache.tsfile.encoding.encoder; + +import org.apache.tsfile.common.conf.TSFileConfig; +import org.apache.tsfile.common.conf.TSFileDescriptor; +import org.apache.tsfile.exception.encoding.TsFileEncodingException; +import org.apache.tsfile.file.metadata.enums.TSEncoding; +import org.apache.tsfile.utils.Binary; +import org.apache.tsfile.utils.ReadWriteForEncodingUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/SDTEncoder.java b/tsfile/src/main/java/org/apache/tsfile/encoding/encoder/SDTEncoder.java similarity index 99% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/SDTEncoder.java rename to tsfile/src/main/java/org/apache/tsfile/encoding/encoder/SDTEncoder.java index ff8cfb00f..f438c8868 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/SDTEncoder.java +++ b/tsfile/src/main/java/org/apache/tsfile/encoding/encoder/SDTEncoder.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.tsfile.encoding.encoder; +package org.apache.tsfile.encoding.encoder; public class SDTEncoder { diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/SinglePrecisionChimpEncoder.java b/tsfile/src/main/java/org/apache/tsfile/encoding/encoder/SinglePrecisionChimpEncoder.java similarity index 97% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/SinglePrecisionChimpEncoder.java rename to tsfile/src/main/java/org/apache/tsfile/encoding/encoder/SinglePrecisionChimpEncoder.java index b428c3dfe..e31bc592f 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/SinglePrecisionChimpEncoder.java +++ b/tsfile/src/main/java/org/apache/tsfile/encoding/encoder/SinglePrecisionChimpEncoder.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.tsfile.encoding.encoder; +package org.apache.tsfile.encoding.encoder; import java.io.ByteArrayOutputStream; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/SinglePrecisionEncoderV1.java b/tsfile/src/main/java/org/apache/tsfile/encoding/encoder/SinglePrecisionEncoderV1.java similarity index 97% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/SinglePrecisionEncoderV1.java rename to tsfile/src/main/java/org/apache/tsfile/encoding/encoder/SinglePrecisionEncoderV1.java index 1e55735a1..496c74ddf 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/SinglePrecisionEncoderV1.java +++ b/tsfile/src/main/java/org/apache/tsfile/encoding/encoder/SinglePrecisionEncoderV1.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.tsfile.encoding.encoder; +package org.apache.tsfile.encoding.encoder; -import org.apache.iotdb.tsfile.common.conf.TSFileConfig; +import org.apache.tsfile.common.conf.TSFileConfig; import java.io.ByteArrayOutputStream; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/SinglePrecisionEncoderV2.java b/tsfile/src/main/java/org/apache/tsfile/encoding/encoder/SinglePrecisionEncoderV2.java similarity index 92% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/SinglePrecisionEncoderV2.java rename to tsfile/src/main/java/org/apache/tsfile/encoding/encoder/SinglePrecisionEncoderV2.java index 0be2f1f1c..813a1e3fa 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/SinglePrecisionEncoderV2.java +++ b/tsfile/src/main/java/org/apache/tsfile/encoding/encoder/SinglePrecisionEncoderV2.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.tsfile.encoding.encoder; +package org.apache.tsfile.encoding.encoder; import java.io.ByteArrayOutputStream; -import static org.apache.iotdb.tsfile.common.conf.TSFileConfig.GORILLA_ENCODING_ENDING_FLOAT; +import static org.apache.tsfile.common.conf.TSFileConfig.GORILLA_ENCODING_ENDING_FLOAT; /** * This class includes code modified from Michael Burman's gorilla-tsc project. diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/SprintzEncoder.java b/tsfile/src/main/java/org/apache/tsfile/encoding/encoder/SprintzEncoder.java similarity index 89% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/SprintzEncoder.java rename to tsfile/src/main/java/org/apache/tsfile/encoding/encoder/SprintzEncoder.java index 32a7aa2ca..4cdbe5590 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/SprintzEncoder.java +++ b/tsfile/src/main/java/org/apache/tsfile/encoding/encoder/SprintzEncoder.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.tsfile.encoding.encoder; +package org.apache.tsfile.encoding.encoder; -import org.apache.iotdb.tsfile.common.conf.TSFileConfig; -import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor; -import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding; +import org.apache.tsfile.common.conf.TSFileConfig; +import org.apache.tsfile.common.conf.TSFileDescriptor; +import org.apache.tsfile.file.metadata.enums.TSEncoding; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/TSEncodingBuilder.java b/tsfile/src/main/java/org/apache/tsfile/encoding/encoder/TSEncodingBuilder.java similarity index 96% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/TSEncodingBuilder.java rename to tsfile/src/main/java/org/apache/tsfile/encoding/encoder/TSEncodingBuilder.java index 453aadfed..65ef569be 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/TSEncodingBuilder.java +++ b/tsfile/src/main/java/org/apache/tsfile/encoding/encoder/TSEncodingBuilder.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.tsfile.encoding.encoder; - -import org.apache.iotdb.tsfile.common.conf.TSFileConfig; -import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor; -import org.apache.iotdb.tsfile.common.constant.JsonFormatConstant; -import org.apache.iotdb.tsfile.exception.write.UnSupportedDataTypeException; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding; +package org.apache.tsfile.encoding.encoder; + +import org.apache.tsfile.common.conf.TSFileConfig; +import org.apache.tsfile.common.conf.TSFileDescriptor; +import org.apache.tsfile.common.constant.JsonFormatConstant; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.file.metadata.enums.TSEncoding; +import org.apache.tsfile.write.UnSupportedDataTypeException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/fire/Fire.java b/tsfile/src/main/java/org/apache/tsfile/encoding/fire/Fire.java similarity index 97% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/fire/Fire.java rename to tsfile/src/main/java/org/apache/tsfile/encoding/fire/Fire.java index c9049b4a4..cc82f7d98 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/fire/Fire.java +++ b/tsfile/src/main/java/org/apache/tsfile/encoding/fire/Fire.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.tsfile.encoding.fire; +package org.apache.tsfile.encoding.fire; /** * This class is used for Fast Integer REgression in Sprintz encoding method.Users can create a Fire diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/fire/IntFire.java b/tsfile/src/main/java/org/apache/tsfile/encoding/fire/IntFire.java similarity index 97% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/fire/IntFire.java rename to tsfile/src/main/java/org/apache/tsfile/encoding/fire/IntFire.java index 9744ce640..988e00a47 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/fire/IntFire.java +++ b/tsfile/src/main/java/org/apache/tsfile/encoding/fire/IntFire.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.tsfile.encoding.fire; +package org.apache.tsfile.encoding.fire; public class IntFire extends Fire { diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/fire/LongFire.java b/tsfile/src/main/java/org/apache/tsfile/encoding/fire/LongFire.java similarity index 96% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/fire/LongFire.java rename to tsfile/src/main/java/org/apache/tsfile/encoding/fire/LongFire.java index 0429bb3cb..d44755d34 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/fire/LongFire.java +++ b/tsfile/src/main/java/org/apache/tsfile/encoding/fire/LongFire.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.tsfile.encoding.fire; +package org.apache.tsfile.encoding.fire; public class LongFire extends Fire { public LongFire(int learning_rate) { diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/exception/NotCompatibleTsFileException.java b/tsfile/src/main/java/org/apache/tsfile/exception/NotCompatibleTsFileException.java similarity index 96% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/exception/NotCompatibleTsFileException.java rename to tsfile/src/main/java/org/apache/tsfile/exception/NotCompatibleTsFileException.java index bd64edcd1..abcb62811 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/exception/NotCompatibleTsFileException.java +++ b/tsfile/src/main/java/org/apache/tsfile/exception/NotCompatibleTsFileException.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.tsfile.exception; +package org.apache.tsfile.exception; public class NotCompatibleTsFileException extends TsFileRuntimeException { diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/exception/NotImplementedException.java b/tsfile/src/main/java/org/apache/tsfile/exception/NotImplementedException.java similarity index 96% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/exception/NotImplementedException.java rename to tsfile/src/main/java/org/apache/tsfile/exception/NotImplementedException.java index 15b1be2a4..2939f8345 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/exception/NotImplementedException.java +++ b/tsfile/src/main/java/org/apache/tsfile/exception/NotImplementedException.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.tsfile.exception; +package org.apache.tsfile.exception; public class NotImplementedException extends RuntimeException { diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/exception/NullFieldException.java b/tsfile/src/main/java/org/apache/tsfile/exception/NullFieldException.java similarity index 95% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/exception/NullFieldException.java rename to tsfile/src/main/java/org/apache/tsfile/exception/NullFieldException.java index 9582b7ee9..65e9497cb 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/exception/NullFieldException.java +++ b/tsfile/src/main/java/org/apache/tsfile/exception/NullFieldException.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.tsfile.exception; +package org.apache.tsfile.exception; public class NullFieldException extends TsFileRuntimeException { diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/exception/PathParseException.java b/tsfile/src/main/java/org/apache/tsfile/exception/PathParseException.java similarity index 95% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/exception/PathParseException.java rename to tsfile/src/main/java/org/apache/tsfile/exception/PathParseException.java index 1ccf605df..1845491e4 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/exception/PathParseException.java +++ b/tsfile/src/main/java/org/apache/tsfile/exception/PathParseException.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.tsfile.exception; +package org.apache.tsfile.exception; public class PathParseException extends TsFileRuntimeException { diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/exception/TsFileRuntimeException.java b/tsfile/src/main/java/org/apache/tsfile/exception/TsFileRuntimeException.java similarity index 96% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/exception/TsFileRuntimeException.java rename to tsfile/src/main/java/org/apache/tsfile/exception/TsFileRuntimeException.java index 723be9cbe..9bbd16e81 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/exception/TsFileRuntimeException.java +++ b/tsfile/src/main/java/org/apache/tsfile/exception/TsFileRuntimeException.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.tsfile.exception; +package org.apache.tsfile.exception; /** * This Exception is the parent class for all runtime exceptions.
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/exception/TsFileSequenceReaderTimeseriesMetadataIteratorException.java b/tsfile/src/main/java/org/apache/tsfile/exception/TsFileSequenceReaderTimeseriesMetadataIteratorException.java similarity index 95% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/exception/TsFileSequenceReaderTimeseriesMetadataIteratorException.java rename to tsfile/src/main/java/org/apache/tsfile/exception/TsFileSequenceReaderTimeseriesMetadataIteratorException.java index a7e2dfc90..b0905b3d0 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/exception/TsFileSequenceReaderTimeseriesMetadataIteratorException.java +++ b/tsfile/src/main/java/org/apache/tsfile/exception/TsFileSequenceReaderTimeseriesMetadataIteratorException.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.tsfile.exception; +package org.apache.tsfile.exception; public class TsFileSequenceReaderTimeseriesMetadataIteratorException extends RuntimeException { diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/exception/TsFileStatisticsMistakesException.java b/tsfile/src/main/java/org/apache/tsfile/exception/TsFileStatisticsMistakesException.java similarity index 95% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/exception/TsFileStatisticsMistakesException.java rename to tsfile/src/main/java/org/apache/tsfile/exception/TsFileStatisticsMistakesException.java index 3ed9905e0..fa4ec691f 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/exception/TsFileStatisticsMistakesException.java +++ b/tsfile/src/main/java/org/apache/tsfile/exception/TsFileStatisticsMistakesException.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.tsfile.exception; +package org.apache.tsfile.exception; public class TsFileStatisticsMistakesException extends TsFileRuntimeException { diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/exception/cache/CacheException.java b/tsfile/src/main/java/org/apache/tsfile/exception/cache/CacheException.java similarity index 94% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/exception/cache/CacheException.java rename to tsfile/src/main/java/org/apache/tsfile/exception/cache/CacheException.java index f329ebc6c..bbf6719f9 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/exception/cache/CacheException.java +++ b/tsfile/src/main/java/org/apache/tsfile/exception/cache/CacheException.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.tsfile.exception.cache; +package org.apache.tsfile.exception.cache; public class CacheException extends Exception { public CacheException(String message) { diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/exception/compress/CompressionTypeNotSupportedException.java b/tsfile/src/main/java/org/apache/tsfile/exception/compress/CompressionTypeNotSupportedException.java similarity index 96% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/exception/compress/CompressionTypeNotSupportedException.java rename to tsfile/src/main/java/org/apache/tsfile/exception/compress/CompressionTypeNotSupportedException.java index 1eab40377..505162ca9 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/exception/compress/CompressionTypeNotSupportedException.java +++ b/tsfile/src/main/java/org/apache/tsfile/exception/compress/CompressionTypeNotSupportedException.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.tsfile.exception.compress; +package org.apache.tsfile.exception.compress; /** * This exception will be thrown when the codec is not supported by tsfile, meaning there is no diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/exception/compress/GZIPCompressOverflowException.java b/tsfile/src/main/java/org/apache/tsfile/exception/compress/GZIPCompressOverflowException.java similarity index 95% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/exception/compress/GZIPCompressOverflowException.java rename to tsfile/src/main/java/org/apache/tsfile/exception/compress/GZIPCompressOverflowException.java index 16544e857..eba3d600c 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/exception/compress/GZIPCompressOverflowException.java +++ b/tsfile/src/main/java/org/apache/tsfile/exception/compress/GZIPCompressOverflowException.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.tsfile.exception.compress; +package org.apache.tsfile.exception.compress; public class GZIPCompressOverflowException extends RuntimeException { diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/exception/encoding/TsFileDecodingException.java b/tsfile/src/main/java/org/apache/tsfile/exception/encoding/TsFileDecodingException.java similarity index 90% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/exception/encoding/TsFileDecodingException.java rename to tsfile/src/main/java/org/apache/tsfile/exception/encoding/TsFileDecodingException.java index 90bec88a3..8c9bd1c4c 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/exception/encoding/TsFileDecodingException.java +++ b/tsfile/src/main/java/org/apache/tsfile/exception/encoding/TsFileDecodingException.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.tsfile.exception.encoding; +package org.apache.tsfile.exception.encoding; -import org.apache.iotdb.tsfile.exception.TsFileRuntimeException; +import org.apache.tsfile.exception.TsFileRuntimeException; /** * This Exception is used while decoding failed.
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/exception/encoding/TsFileEncodingException.java b/tsfile/src/main/java/org/apache/tsfile/exception/encoding/TsFileEncodingException.java similarity index 90% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/exception/encoding/TsFileEncodingException.java rename to tsfile/src/main/java/org/apache/tsfile/exception/encoding/TsFileEncodingException.java index b2a0c873e..41a1ce4a4 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/exception/encoding/TsFileEncodingException.java +++ b/tsfile/src/main/java/org/apache/tsfile/exception/encoding/TsFileEncodingException.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.tsfile.exception.encoding; +package org.apache.tsfile.exception.encoding; -import org.apache.iotdb.tsfile.exception.TsFileRuntimeException; +import org.apache.tsfile.exception.TsFileRuntimeException; /** * This Exception is used while encoding failed.
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/exception/filter/QueryFilterOptimizationException.java b/tsfile/src/main/java/org/apache/tsfile/exception/filter/QueryFilterOptimizationException.java similarity index 95% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/exception/filter/QueryFilterOptimizationException.java rename to tsfile/src/main/java/org/apache/tsfile/exception/filter/QueryFilterOptimizationException.java index 75aab67af..69a8f5889 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/exception/filter/QueryFilterOptimizationException.java +++ b/tsfile/src/main/java/org/apache/tsfile/exception/filter/QueryFilterOptimizationException.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.tsfile.exception.filter; +package org.apache.tsfile.exception.filter; public class QueryFilterOptimizationException extends Exception { diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/exception/filter/StatisticsClassException.java b/tsfile/src/main/java/org/apache/tsfile/exception/filter/StatisticsClassException.java similarity index 91% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/exception/filter/StatisticsClassException.java rename to tsfile/src/main/java/org/apache/tsfile/exception/filter/StatisticsClassException.java index 69a4a6b41..936ef2119 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/exception/filter/StatisticsClassException.java +++ b/tsfile/src/main/java/org/apache/tsfile/exception/filter/StatisticsClassException.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.tsfile.exception.filter; +package org.apache.tsfile.exception.filter; -import org.apache.iotdb.tsfile.exception.TsFileRuntimeException; +import org.apache.tsfile.exception.TsFileRuntimeException; public class StatisticsClassException extends TsFileRuntimeException { diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/exception/filter/UnSupportFilterDataTypeException.java b/tsfile/src/main/java/org/apache/tsfile/exception/filter/UnSupportFilterDataTypeException.java similarity index 95% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/exception/filter/UnSupportFilterDataTypeException.java rename to tsfile/src/main/java/org/apache/tsfile/exception/filter/UnSupportFilterDataTypeException.java index 9a62f4299..cb4c09f0f 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/exception/filter/UnSupportFilterDataTypeException.java +++ b/tsfile/src/main/java/org/apache/tsfile/exception/filter/UnSupportFilterDataTypeException.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.tsfile.exception.filter; +package org.apache.tsfile.exception.filter; /** Some wrong filter parameters invoke. */ public class UnSupportFilterDataTypeException extends RuntimeException { diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/exception/write/NoMeasurementException.java b/tsfile/src/main/java/org/apache/tsfile/exception/write/NoMeasurementException.java similarity index 95% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/exception/write/NoMeasurementException.java rename to tsfile/src/main/java/org/apache/tsfile/exception/write/NoMeasurementException.java index 3168a0132..5e5745e2f 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/exception/write/NoMeasurementException.java +++ b/tsfile/src/main/java/org/apache/tsfile/exception/write/NoMeasurementException.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.tsfile.exception.write; +package org.apache.tsfile.exception.write; /** This exception means it can not find the measurement while writing a TSRecord. */ public class NoMeasurementException extends WriteProcessException { diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/exception/write/PageException.java b/tsfile/src/main/java/org/apache/tsfile/exception/write/PageException.java similarity index 96% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/exception/write/PageException.java rename to tsfile/src/main/java/org/apache/tsfile/exception/write/PageException.java index f8169ec8a..3d29be3bf 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/exception/write/PageException.java +++ b/tsfile/src/main/java/org/apache/tsfile/exception/write/PageException.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.tsfile.exception.write; +package org.apache.tsfile.exception.write; /** Exception occurs when writing a page. */ public class PageException extends WriteProcessException { diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/exception/write/TsFileNotCompleteException.java b/tsfile/src/main/java/org/apache/tsfile/exception/write/TsFileNotCompleteException.java similarity index 95% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/exception/write/TsFileNotCompleteException.java rename to tsfile/src/main/java/org/apache/tsfile/exception/write/TsFileNotCompleteException.java index ab4708a54..44a4a5156 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/exception/write/TsFileNotCompleteException.java +++ b/tsfile/src/main/java/org/apache/tsfile/exception/write/TsFileNotCompleteException.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.tsfile.exception.write; +package org.apache.tsfile.exception.write; import java.io.IOException; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/exception/write/UnknownColumnTypeException.java b/tsfile/src/main/java/org/apache/tsfile/exception/write/UnknownColumnTypeException.java similarity index 91% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/exception/write/UnknownColumnTypeException.java rename to tsfile/src/main/java/org/apache/tsfile/exception/write/UnknownColumnTypeException.java index 9772b8d6d..26cdeb907 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/exception/write/UnknownColumnTypeException.java +++ b/tsfile/src/main/java/org/apache/tsfile/exception/write/UnknownColumnTypeException.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.tsfile.exception.write; +package org.apache.tsfile.exception.write; -import org.apache.iotdb.tsfile.exception.TsFileRuntimeException; +import org.apache.tsfile.exception.TsFileRuntimeException; /** * This Exception is used while getting an unknown column type.
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/exception/write/WriteProcessException.java b/tsfile/src/main/java/org/apache/tsfile/exception/write/WriteProcessException.java similarity index 96% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/exception/write/WriteProcessException.java rename to tsfile/src/main/java/org/apache/tsfile/exception/write/WriteProcessException.java index 804fa2b43..539afb01f 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/exception/write/WriteProcessException.java +++ b/tsfile/src/main/java/org/apache/tsfile/exception/write/WriteProcessException.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.tsfile.exception.write; +package org.apache.tsfile.exception.write; /** This exception is threw while meeting error in writing procession. */ public class WriteProcessException extends Exception { diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/MetaMarker.java b/tsfile/src/main/java/org/apache/tsfile/file/MetaMarker.java similarity index 96% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/file/MetaMarker.java rename to tsfile/src/main/java/org/apache/tsfile/file/MetaMarker.java index 265717cb9..8f0b6730f 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/MetaMarker.java +++ b/tsfile/src/main/java/org/apache/tsfile/file/MetaMarker.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.tsfile.file; +package org.apache.tsfile.file; -import org.apache.iotdb.tsfile.common.constant.TsFileConstant; +import org.apache.tsfile.common.constant.TsFileConstant; import java.io.IOException; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/header/ChunkGroupHeader.java b/tsfile/src/main/java/org/apache/tsfile/file/header/ChunkGroupHeader.java similarity index 91% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/file/header/ChunkGroupHeader.java rename to tsfile/src/main/java/org/apache/tsfile/file/header/ChunkGroupHeader.java index ec2891561..aebae7064 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/header/ChunkGroupHeader.java +++ b/tsfile/src/main/java/org/apache/tsfile/file/header/ChunkGroupHeader.java @@ -17,13 +17,13 @@ * under the License. */ -package org.apache.iotdb.tsfile.file.header; +package org.apache.tsfile.file.header; -import org.apache.iotdb.tsfile.common.conf.TSFileConfig; -import org.apache.iotdb.tsfile.file.MetaMarker; -import org.apache.iotdb.tsfile.read.reader.TsFileInput; -import org.apache.iotdb.tsfile.utils.ReadWriteForEncodingUtils; -import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils; +import org.apache.tsfile.common.conf.TSFileConfig; +import org.apache.tsfile.file.MetaMarker; +import org.apache.tsfile.read.reader.TsFileInput; +import org.apache.tsfile.utils.ReadWriteForEncodingUtils; +import org.apache.tsfile.utils.ReadWriteIOUtils; import java.io.IOException; import java.io.InputStream; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/header/ChunkHeader.java b/tsfile/src/main/java/org/apache/tsfile/file/header/ChunkHeader.java similarity index 93% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/file/header/ChunkHeader.java rename to tsfile/src/main/java/org/apache/tsfile/file/header/ChunkHeader.java index eb4d05b99..6cb3bee56 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/header/ChunkHeader.java +++ b/tsfile/src/main/java/org/apache/tsfile/file/header/ChunkHeader.java @@ -17,20 +17,20 @@ * under the License. */ -package org.apache.iotdb.tsfile.file.header; - -import org.apache.iotdb.tsfile.common.conf.TSFileConfig; -import org.apache.iotdb.tsfile.file.MetaMarker; -import org.apache.iotdb.tsfile.file.metadata.TimeseriesMetadata; -import org.apache.iotdb.tsfile.file.metadata.enums.CompressionType; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding; -import org.apache.iotdb.tsfile.read.TsFileSequenceReader; -import org.apache.iotdb.tsfile.read.reader.TsFileInput; -import org.apache.iotdb.tsfile.utils.Pair; -import org.apache.iotdb.tsfile.utils.RamUsageEstimator; -import org.apache.iotdb.tsfile.utils.ReadWriteForEncodingUtils; -import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils; +package org.apache.tsfile.file.header; + +import org.apache.tsfile.common.conf.TSFileConfig; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.file.MetaMarker; +import org.apache.tsfile.file.metadata.TimeseriesMetadata; +import org.apache.tsfile.file.metadata.enums.CompressionType; +import org.apache.tsfile.file.metadata.enums.TSEncoding; +import org.apache.tsfile.read.TsFileSequenceReader; +import org.apache.tsfile.read.reader.TsFileInput; +import org.apache.tsfile.utils.Pair; +import org.apache.tsfile.utils.RamUsageEstimator; +import org.apache.tsfile.utils.ReadWriteForEncodingUtils; +import org.apache.tsfile.utils.ReadWriteIOUtils; import java.io.IOException; import java.io.InputStream; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/header/PageHeader.java b/tsfile/src/main/java/org/apache/tsfile/file/header/PageHeader.java similarity index 95% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/file/header/PageHeader.java rename to tsfile/src/main/java/org/apache/tsfile/file/header/PageHeader.java index 4e07f6de5..70387419f 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/header/PageHeader.java +++ b/tsfile/src/main/java/org/apache/tsfile/file/header/PageHeader.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.tsfile.file.header; +package org.apache.tsfile.file.header; -import org.apache.iotdb.tsfile.file.metadata.IMetadata; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.file.metadata.statistics.Statistics; -import org.apache.iotdb.tsfile.utils.ReadWriteForEncodingUtils; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.file.metadata.IMetadata; +import org.apache.tsfile.file.metadata.statistics.Statistics; +import org.apache.tsfile.utils.ReadWriteForEncodingUtils; import java.io.IOException; import java.io.InputStream; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/AlignedChunkMetadata.java b/tsfile/src/main/java/org/apache/tsfile/file/metadata/AlignedChunkMetadata.java similarity index 95% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/AlignedChunkMetadata.java rename to tsfile/src/main/java/org/apache/tsfile/file/metadata/AlignedChunkMetadata.java index 84b0a5005..c92443be1 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/AlignedChunkMetadata.java +++ b/tsfile/src/main/java/org/apache/tsfile/file/metadata/AlignedChunkMetadata.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.tsfile.file.metadata; +package org.apache.tsfile.file.metadata; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.file.metadata.statistics.Statistics; -import org.apache.iotdb.tsfile.read.common.TimeRange; -import org.apache.iotdb.tsfile.read.controller.IChunkLoader; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.file.metadata.statistics.Statistics; +import org.apache.tsfile.read.common.TimeRange; +import org.apache.tsfile.read.controller.IChunkLoader; import java.io.OutputStream; import java.io.Serializable; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/AlignedTimeSeriesMetadata.java b/tsfile/src/main/java/org/apache/tsfile/file/metadata/AlignedTimeSeriesMetadata.java similarity index 96% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/AlignedTimeSeriesMetadata.java rename to tsfile/src/main/java/org/apache/tsfile/file/metadata/AlignedTimeSeriesMetadata.java index e99105a57..956ce1c05 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/AlignedTimeSeriesMetadata.java +++ b/tsfile/src/main/java/org/apache/tsfile/file/metadata/AlignedTimeSeriesMetadata.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.tsfile.file.metadata; +package org.apache.tsfile.file.metadata; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.file.metadata.statistics.Statistics; -import org.apache.iotdb.tsfile.read.controller.IChunkMetadataLoader; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.file.metadata.statistics.Statistics; +import org.apache.tsfile.read.controller.IChunkMetadataLoader; import java.io.Serializable; import java.util.ArrayList; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/ChunkGroupMetadata.java b/tsfile/src/main/java/org/apache/tsfile/file/metadata/ChunkGroupMetadata.java similarity index 96% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/ChunkGroupMetadata.java rename to tsfile/src/main/java/org/apache/tsfile/file/metadata/ChunkGroupMetadata.java index 5c9921421..7b3d27c3b 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/ChunkGroupMetadata.java +++ b/tsfile/src/main/java/org/apache/tsfile/file/metadata/ChunkGroupMetadata.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.tsfile.file.metadata; +package org.apache.tsfile.file.metadata; import java.util.List; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/ChunkMetadata.java b/tsfile/src/main/java/org/apache/tsfile/file/metadata/ChunkMetadata.java similarity index 96% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/ChunkMetadata.java rename to tsfile/src/main/java/org/apache/tsfile/file/metadata/ChunkMetadata.java index 21643c5fe..e491d7bb2 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/ChunkMetadata.java +++ b/tsfile/src/main/java/org/apache/tsfile/file/metadata/ChunkMetadata.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.tsfile.file.metadata; +package org.apache.tsfile.file.metadata; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.file.metadata.statistics.Statistics; -import org.apache.iotdb.tsfile.read.common.TimeRange; -import org.apache.iotdb.tsfile.read.controller.IChunkLoader; -import org.apache.iotdb.tsfile.utils.RamUsageEstimator; -import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.file.metadata.statistics.Statistics; +import org.apache.tsfile.read.common.TimeRange; +import org.apache.tsfile.read.controller.IChunkLoader; +import org.apache.tsfile.utils.RamUsageEstimator; +import org.apache.tsfile.utils.ReadWriteIOUtils; import java.io.IOException; import java.io.InputStream; @@ -36,7 +36,7 @@ import java.util.Objects; import java.util.Optional; -import static org.apache.iotdb.tsfile.utils.Preconditions.checkArgument; +import static org.apache.tsfile.utils.Preconditions.checkArgument; /** Metadata of one chunk. */ public class ChunkMetadata implements IChunkMetadata { diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/IChunkMetadata.java b/tsfile/src/main/java/org/apache/tsfile/file/metadata/IChunkMetadata.java similarity index 87% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/IChunkMetadata.java rename to tsfile/src/main/java/org/apache/tsfile/file/metadata/IChunkMetadata.java index 43f66b7a3..79b964949 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/IChunkMetadata.java +++ b/tsfile/src/main/java/org/apache/tsfile/file/metadata/IChunkMetadata.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.tsfile.file.metadata; +package org.apache.tsfile.file.metadata; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.read.common.TimeRange; -import org.apache.iotdb.tsfile.read.controller.IChunkLoader; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.read.common.TimeRange; +import org.apache.tsfile.read.controller.IChunkLoader; import java.io.IOException; import java.io.OutputStream; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/IMetadata.java b/tsfile/src/main/java/org/apache/tsfile/file/metadata/IMetadata.java similarity index 91% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/IMetadata.java rename to tsfile/src/main/java/org/apache/tsfile/file/metadata/IMetadata.java index 44aae342b..bcc86719c 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/IMetadata.java +++ b/tsfile/src/main/java/org/apache/tsfile/file/metadata/IMetadata.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.tsfile.file.metadata; +package org.apache.tsfile.file.metadata; -import org.apache.iotdb.tsfile.file.metadata.statistics.Statistics; +import org.apache.tsfile.file.metadata.statistics.Statistics; import java.io.Serializable; import java.util.Optional; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/ITimeSeriesMetadata.java b/tsfile/src/main/java/org/apache/tsfile/file/metadata/ITimeSeriesMetadata.java similarity index 88% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/ITimeSeriesMetadata.java rename to tsfile/src/main/java/org/apache/tsfile/file/metadata/ITimeSeriesMetadata.java index 71cf57841..17a1da644 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/ITimeSeriesMetadata.java +++ b/tsfile/src/main/java/org/apache/tsfile/file/metadata/ITimeSeriesMetadata.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.tsfile.file.metadata; +package org.apache.tsfile.file.metadata; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.read.controller.IChunkMetadataLoader; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.read.controller.IChunkMetadataLoader; import java.util.List; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/MetadataIndexConstructor.java b/tsfile/src/main/java/org/apache/tsfile/file/metadata/MetadataIndexConstructor.java similarity index 95% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/MetadataIndexConstructor.java rename to tsfile/src/main/java/org/apache/tsfile/file/metadata/MetadataIndexConstructor.java index 22b102649..2f14d4957 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/MetadataIndexConstructor.java +++ b/tsfile/src/main/java/org/apache/tsfile/file/metadata/MetadataIndexConstructor.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.tsfile.file.metadata; +package org.apache.tsfile.file.metadata; -import org.apache.iotdb.tsfile.common.conf.TSFileConfig; -import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor; -import org.apache.iotdb.tsfile.file.metadata.enums.MetadataIndexNodeType; -import org.apache.iotdb.tsfile.write.writer.TsFileOutput; +import org.apache.tsfile.common.conf.TSFileConfig; +import org.apache.tsfile.common.conf.TSFileDescriptor; +import org.apache.tsfile.file.metadata.enums.MetadataIndexNodeType; +import org.apache.tsfile.write.writer.TsFileOutput; import java.io.IOException; import java.util.ArrayDeque; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/MetadataIndexEntry.java b/tsfile/src/main/java/org/apache/tsfile/file/metadata/MetadataIndexEntry.java similarity index 95% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/MetadataIndexEntry.java rename to tsfile/src/main/java/org/apache/tsfile/file/metadata/MetadataIndexEntry.java index 6ff73a37b..cc48c6671 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/MetadataIndexEntry.java +++ b/tsfile/src/main/java/org/apache/tsfile/file/metadata/MetadataIndexEntry.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.tsfile.file.metadata; +package org.apache.tsfile.file.metadata; -import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils; +import org.apache.tsfile.utils.ReadWriteIOUtils; import java.io.IOException; import java.io.InputStream; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/MetadataIndexNode.java b/tsfile/src/main/java/org/apache/tsfile/file/metadata/MetadataIndexNode.java similarity index 92% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/MetadataIndexNode.java rename to tsfile/src/main/java/org/apache/tsfile/file/metadata/MetadataIndexNode.java index 057db86da..e8efa1928 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/MetadataIndexNode.java +++ b/tsfile/src/main/java/org/apache/tsfile/file/metadata/MetadataIndexNode.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.tsfile.file.metadata; - -import org.apache.iotdb.tsfile.common.conf.TSFileConfig; -import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor; -import org.apache.iotdb.tsfile.file.metadata.enums.MetadataIndexNodeType; -import org.apache.iotdb.tsfile.utils.Pair; -import org.apache.iotdb.tsfile.utils.ReadWriteForEncodingUtils; -import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils; +package org.apache.tsfile.file.metadata; + +import org.apache.tsfile.common.conf.TSFileConfig; +import org.apache.tsfile.common.conf.TSFileDescriptor; +import org.apache.tsfile.file.metadata.enums.MetadataIndexNodeType; +import org.apache.tsfile.utils.Pair; +import org.apache.tsfile.utils.ReadWriteForEncodingUtils; +import org.apache.tsfile.utils.ReadWriteIOUtils; import java.io.IOException; import java.io.InputStream; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/TimeseriesMetadata.java b/tsfile/src/main/java/org/apache/tsfile/file/metadata/TimeseriesMetadata.java similarity index 94% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/TimeseriesMetadata.java rename to tsfile/src/main/java/org/apache/tsfile/file/metadata/TimeseriesMetadata.java index d5d141d8c..17a326e01 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/TimeseriesMetadata.java +++ b/tsfile/src/main/java/org/apache/tsfile/file/metadata/TimeseriesMetadata.java @@ -17,16 +17,16 @@ * under the License. */ -package org.apache.iotdb.tsfile.file.metadata; +package org.apache.tsfile.file.metadata; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.file.metadata.statistics.Statistics; -import org.apache.iotdb.tsfile.read.controller.IChunkMetadataLoader; -import org.apache.iotdb.tsfile.read.reader.TsFileInput; -import org.apache.iotdb.tsfile.utils.PublicBAOS; -import org.apache.iotdb.tsfile.utils.RamUsageEstimator; -import org.apache.iotdb.tsfile.utils.ReadWriteForEncodingUtils; -import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.file.metadata.statistics.Statistics; +import org.apache.tsfile.read.controller.IChunkMetadataLoader; +import org.apache.tsfile.read.reader.TsFileInput; +import org.apache.tsfile.utils.PublicBAOS; +import org.apache.tsfile.utils.RamUsageEstimator; +import org.apache.tsfile.utils.ReadWriteForEncodingUtils; +import org.apache.tsfile.utils.ReadWriteIOUtils; import java.io.IOException; import java.io.InputStream; @@ -38,9 +38,9 @@ import java.util.Optional; import java.util.Set; -import static org.apache.iotdb.tsfile.utils.Preconditions.checkArgument; -import static org.apache.iotdb.tsfile.utils.RamUsageEstimator.sizeOfCharArray; -import static org.apache.iotdb.tsfile.utils.RamUsageEstimator.sizeOfObjectArray; +import static org.apache.tsfile.utils.Preconditions.checkArgument; +import static org.apache.tsfile.utils.RamUsageEstimator.sizeOfCharArray; +import static org.apache.tsfile.utils.RamUsageEstimator.sizeOfObjectArray; public class TimeseriesMetadata implements ITimeSeriesMetadata { diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/TsFileMetadata.java b/tsfile/src/main/java/org/apache/tsfile/file/metadata/TsFileMetadata.java similarity index 94% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/TsFileMetadata.java rename to tsfile/src/main/java/org/apache/tsfile/file/metadata/TsFileMetadata.java index f7b44310f..d7a8bd756 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/TsFileMetadata.java +++ b/tsfile/src/main/java/org/apache/tsfile/file/metadata/TsFileMetadata.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.tsfile.file.metadata; +package org.apache.tsfile.file.metadata; -import org.apache.iotdb.tsfile.utils.BloomFilter; -import org.apache.iotdb.tsfile.utils.ReadWriteForEncodingUtils; -import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils; +import org.apache.tsfile.utils.BloomFilter; +import org.apache.tsfile.utils.ReadWriteForEncodingUtils; +import org.apache.tsfile.utils.ReadWriteIOUtils; import java.io.IOException; import java.io.OutputStream; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/enums/CompressionType.java b/tsfile/src/main/java/org/apache/tsfile/file/metadata/enums/CompressionType.java similarity index 97% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/enums/CompressionType.java rename to tsfile/src/main/java/org/apache/tsfile/file/metadata/enums/CompressionType.java index c1b65d6f3..cca2199e4 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/enums/CompressionType.java +++ b/tsfile/src/main/java/org/apache/tsfile/file/metadata/enums/CompressionType.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.tsfile.file.metadata.enums; +package org.apache.tsfile.file.metadata.enums; public enum CompressionType { /** Do not comprocess. */ diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/enums/MetadataIndexNodeType.java b/tsfile/src/main/java/org/apache/tsfile/file/metadata/enums/MetadataIndexNodeType.java similarity index 98% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/enums/MetadataIndexNodeType.java rename to tsfile/src/main/java/org/apache/tsfile/file/metadata/enums/MetadataIndexNodeType.java index b117a0b63..28c4ed980 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/enums/MetadataIndexNodeType.java +++ b/tsfile/src/main/java/org/apache/tsfile/file/metadata/enums/MetadataIndexNodeType.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.tsfile.file.metadata.enums; +package org.apache.tsfile.file.metadata.enums; import java.io.DataOutputStream; import java.io.IOException; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/enums/TSEncoding.java b/tsfile/src/main/java/org/apache/tsfile/file/metadata/enums/TSEncoding.java similarity index 97% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/enums/TSEncoding.java rename to tsfile/src/main/java/org/apache/tsfile/file/metadata/enums/TSEncoding.java index 56cecda02..43de4b8f7 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/enums/TSEncoding.java +++ b/tsfile/src/main/java/org/apache/tsfile/file/metadata/enums/TSEncoding.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.tsfile.file.metadata.enums; +package org.apache.tsfile.file.metadata.enums; public enum TSEncoding { PLAIN((byte) 0), diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/BinaryStatistics.java b/tsfile/src/main/java/org/apache/tsfile/file/metadata/statistics/BinaryStatistics.java similarity index 91% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/BinaryStatistics.java rename to tsfile/src/main/java/org/apache/tsfile/file/metadata/statistics/BinaryStatistics.java index c359afee9..34db11b93 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/BinaryStatistics.java +++ b/tsfile/src/main/java/org/apache/tsfile/file/metadata/statistics/BinaryStatistics.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.tsfile.file.metadata.statistics; +package org.apache.tsfile.file.metadata.statistics; -import org.apache.iotdb.tsfile.common.conf.TSFileConfig; -import org.apache.iotdb.tsfile.exception.filter.StatisticsClassException; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.utils.Binary; -import org.apache.iotdb.tsfile.utils.RamUsageEstimator; -import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils; +import org.apache.tsfile.common.conf.TSFileConfig; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.exception.filter.StatisticsClassException; +import org.apache.tsfile.utils.Binary; +import org.apache.tsfile.utils.RamUsageEstimator; +import org.apache.tsfile.utils.ReadWriteIOUtils; import java.io.IOException; import java.io.InputStream; @@ -32,7 +32,7 @@ import java.nio.ByteBuffer; import java.util.Objects; -import static org.apache.iotdb.tsfile.utils.RamUsageEstimator.sizeOfCharArray; +import static org.apache.tsfile.utils.RamUsageEstimator.sizeOfCharArray; /** Statistics for string type. */ public class BinaryStatistics extends Statistics { diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/BooleanStatistics.java b/tsfile/src/main/java/org/apache/tsfile/file/metadata/statistics/BooleanStatistics.java similarity index 94% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/BooleanStatistics.java rename to tsfile/src/main/java/org/apache/tsfile/file/metadata/statistics/BooleanStatistics.java index 663fa186c..63e01288f 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/BooleanStatistics.java +++ b/tsfile/src/main/java/org/apache/tsfile/file/metadata/statistics/BooleanStatistics.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.tsfile.file.metadata.statistics; +package org.apache.tsfile.file.metadata.statistics; -import org.apache.iotdb.tsfile.exception.filter.StatisticsClassException; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.utils.RamUsageEstimator; -import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.exception.filter.StatisticsClassException; +import org.apache.tsfile.utils.RamUsageEstimator; +import org.apache.tsfile.utils.ReadWriteIOUtils; import java.io.IOException; import java.io.InputStream; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/DoubleStatistics.java b/tsfile/src/main/java/org/apache/tsfile/file/metadata/statistics/DoubleStatistics.java similarity index 95% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/DoubleStatistics.java rename to tsfile/src/main/java/org/apache/tsfile/file/metadata/statistics/DoubleStatistics.java index 8ebc25100..d79c4c2c3 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/DoubleStatistics.java +++ b/tsfile/src/main/java/org/apache/tsfile/file/metadata/statistics/DoubleStatistics.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.tsfile.file.metadata.statistics; +package org.apache.tsfile.file.metadata.statistics; -import org.apache.iotdb.tsfile.exception.filter.StatisticsClassException; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.utils.RamUsageEstimator; -import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.exception.filter.StatisticsClassException; +import org.apache.tsfile.utils.RamUsageEstimator; +import org.apache.tsfile.utils.ReadWriteIOUtils; import java.io.IOException; import java.io.InputStream; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/FloatStatistics.java b/tsfile/src/main/java/org/apache/tsfile/file/metadata/statistics/FloatStatistics.java similarity index 95% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/FloatStatistics.java rename to tsfile/src/main/java/org/apache/tsfile/file/metadata/statistics/FloatStatistics.java index 31f1c8979..8df520085 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/FloatStatistics.java +++ b/tsfile/src/main/java/org/apache/tsfile/file/metadata/statistics/FloatStatistics.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.file.metadata.statistics; +package org.apache.tsfile.file.metadata.statistics; -import org.apache.iotdb.tsfile.exception.filter.StatisticsClassException; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.utils.RamUsageEstimator; -import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.exception.filter.StatisticsClassException; +import org.apache.tsfile.utils.RamUsageEstimator; +import org.apache.tsfile.utils.ReadWriteIOUtils; import java.io.IOException; import java.io.InputStream; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/IntegerStatistics.java b/tsfile/src/main/java/org/apache/tsfile/file/metadata/statistics/IntegerStatistics.java similarity index 95% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/IntegerStatistics.java rename to tsfile/src/main/java/org/apache/tsfile/file/metadata/statistics/IntegerStatistics.java index b4fd18ba1..45f171661 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/IntegerStatistics.java +++ b/tsfile/src/main/java/org/apache/tsfile/file/metadata/statistics/IntegerStatistics.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.tsfile.file.metadata.statistics; +package org.apache.tsfile.file.metadata.statistics; -import org.apache.iotdb.tsfile.exception.filter.StatisticsClassException; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.utils.RamUsageEstimator; -import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.exception.filter.StatisticsClassException; +import org.apache.tsfile.utils.RamUsageEstimator; +import org.apache.tsfile.utils.ReadWriteIOUtils; import java.io.IOException; import java.io.InputStream; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/LongStatistics.java b/tsfile/src/main/java/org/apache/tsfile/file/metadata/statistics/LongStatistics.java similarity index 95% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/LongStatistics.java rename to tsfile/src/main/java/org/apache/tsfile/file/metadata/statistics/LongStatistics.java index 8798dfdd3..c72668cbe 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/LongStatistics.java +++ b/tsfile/src/main/java/org/apache/tsfile/file/metadata/statistics/LongStatistics.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.tsfile.file.metadata.statistics; +package org.apache.tsfile.file.metadata.statistics; -import org.apache.iotdb.tsfile.exception.filter.StatisticsClassException; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.utils.RamUsageEstimator; -import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.exception.filter.StatisticsClassException; +import org.apache.tsfile.utils.RamUsageEstimator; +import org.apache.tsfile.utils.ReadWriteIOUtils; import java.io.IOException; import java.io.InputStream; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/Statistics.java b/tsfile/src/main/java/org/apache/tsfile/file/metadata/statistics/Statistics.java similarity index 95% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/Statistics.java rename to tsfile/src/main/java/org/apache/tsfile/file/metadata/statistics/Statistics.java index 61224a9df..4f92b4553 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/Statistics.java +++ b/tsfile/src/main/java/org/apache/tsfile/file/metadata/statistics/Statistics.java @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.iotdb.tsfile.file.metadata.statistics; - -import org.apache.iotdb.tsfile.exception.filter.StatisticsClassException; -import org.apache.iotdb.tsfile.exception.write.UnknownColumnTypeException; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.read.filter.basic.Filter; -import org.apache.iotdb.tsfile.utils.Binary; -import org.apache.iotdb.tsfile.utils.ReadWriteForEncodingUtils; -import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils; +package org.apache.tsfile.file.metadata.statistics; + +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.exception.filter.StatisticsClassException; +import org.apache.tsfile.exception.write.UnknownColumnTypeException; +import org.apache.tsfile.read.filter.basic.Filter; +import org.apache.tsfile.utils.Binary; +import org.apache.tsfile.utils.ReadWriteForEncodingUtils; +import org.apache.tsfile.utils.ReadWriteIOUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/TimeStatistics.java b/tsfile/src/main/java/org/apache/tsfile/file/metadata/statistics/TimeStatistics.java similarity index 93% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/TimeStatistics.java rename to tsfile/src/main/java/org/apache/tsfile/file/metadata/statistics/TimeStatistics.java index c6d31bab9..48fcb329c 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/TimeStatistics.java +++ b/tsfile/src/main/java/org/apache/tsfile/file/metadata/statistics/TimeStatistics.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.tsfile.file.metadata.statistics; +package org.apache.tsfile.file.metadata.statistics; -import org.apache.iotdb.tsfile.exception.filter.StatisticsClassException; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.utils.RamUsageEstimator; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.exception.filter.StatisticsClassException; +import org.apache.tsfile.utils.RamUsageEstimator; import java.io.IOException; import java.io.InputStream; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/fileSystem/FSFactoryProducer.java b/tsfile/src/main/java/org/apache/tsfile/fileSystem/FSFactoryProducer.java similarity index 78% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/fileSystem/FSFactoryProducer.java rename to tsfile/src/main/java/org/apache/tsfile/fileSystem/FSFactoryProducer.java index 7694096e9..c2758c5fd 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/fileSystem/FSFactoryProducer.java +++ b/tsfile/src/main/java/org/apache/tsfile/fileSystem/FSFactoryProducer.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.tsfile.fileSystem; - -import org.apache.iotdb.tsfile.fileSystem.fileInputFactory.FileInputFactory; -import org.apache.iotdb.tsfile.fileSystem.fileInputFactory.HybridFileInputFactory; -import org.apache.iotdb.tsfile.fileSystem.fileOutputFactory.FileOutputFactory; -import org.apache.iotdb.tsfile.fileSystem.fileOutputFactory.HybridFileOutputFactory; -import org.apache.iotdb.tsfile.fileSystem.fsFactory.FSFactory; -import org.apache.iotdb.tsfile.fileSystem.fsFactory.HybridFSFactory; +package org.apache.tsfile.fileSystem; + +import org.apache.tsfile.fileSystem.fileInputFactory.FileInputFactory; +import org.apache.tsfile.fileSystem.fileInputFactory.HybridFileInputFactory; +import org.apache.tsfile.fileSystem.fileOutputFactory.FileOutputFactory; +import org.apache.tsfile.fileSystem.fileOutputFactory.HybridFileOutputFactory; +import org.apache.tsfile.fileSystem.fsFactory.FSFactory; +import org.apache.tsfile.fileSystem.fsFactory.HybridFSFactory; public class FSFactoryProducer { private static FSFactory fsFactory = new HybridFSFactory(); diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/fileSystem/FSPath.java b/tsfile/src/main/java/org/apache/tsfile/fileSystem/FSPath.java similarity index 96% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/fileSystem/FSPath.java rename to tsfile/src/main/java/org/apache/tsfile/fileSystem/FSPath.java index cf26786f6..fe78145ae 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/fileSystem/FSPath.java +++ b/tsfile/src/main/java/org/apache/tsfile/fileSystem/FSPath.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.fileSystem; +package org.apache.tsfile.fileSystem; public class FSPath { private final FSType fsType; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/fileSystem/FSType.java b/tsfile/src/main/java/org/apache/tsfile/fileSystem/FSType.java similarity index 95% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/fileSystem/FSType.java rename to tsfile/src/main/java/org/apache/tsfile/fileSystem/FSType.java index 22e275c4c..e55ff98b1 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/fileSystem/FSType.java +++ b/tsfile/src/main/java/org/apache/tsfile/fileSystem/FSType.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.tsfile.fileSystem; +package org.apache.tsfile.fileSystem; public enum FSType { LOCAL, diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/fileSystem/fileInputFactory/FileInputFactory.java b/tsfile/src/main/java/org/apache/tsfile/fileSystem/fileInputFactory/FileInputFactory.java similarity index 89% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/fileSystem/fileInputFactory/FileInputFactory.java rename to tsfile/src/main/java/org/apache/tsfile/fileSystem/fileInputFactory/FileInputFactory.java index d4ae9744e..a499543d2 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/fileSystem/fileInputFactory/FileInputFactory.java +++ b/tsfile/src/main/java/org/apache/tsfile/fileSystem/fileInputFactory/FileInputFactory.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.tsfile.fileSystem.fileInputFactory; +package org.apache.tsfile.fileSystem.fileInputFactory; -import org.apache.iotdb.tsfile.read.reader.TsFileInput; +import org.apache.tsfile.read.reader.TsFileInput; import java.io.IOException; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/fileSystem/fileInputFactory/HDFSInputFactory.java b/tsfile/src/main/java/org/apache/tsfile/fileSystem/fileInputFactory/HDFSInputFactory.java similarity index 92% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/fileSystem/fileInputFactory/HDFSInputFactory.java rename to tsfile/src/main/java/org/apache/tsfile/fileSystem/fileInputFactory/HDFSInputFactory.java index 6735df824..69180617d 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/fileSystem/fileInputFactory/HDFSInputFactory.java +++ b/tsfile/src/main/java/org/apache/tsfile/fileSystem/fileInputFactory/HDFSInputFactory.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.tsfile.fileSystem.fileInputFactory; +package org.apache.tsfile.fileSystem.fileInputFactory; -import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor; -import org.apache.iotdb.tsfile.read.reader.TsFileInput; +import org.apache.tsfile.common.conf.TSFileDescriptor; +import org.apache.tsfile.read.reader.TsFileInput; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/fileSystem/fileInputFactory/HybridFileInputFactory.java b/tsfile/src/main/java/org/apache/tsfile/fileSystem/fileInputFactory/HybridFileInputFactory.java similarity index 88% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/fileSystem/fileInputFactory/HybridFileInputFactory.java rename to tsfile/src/main/java/org/apache/tsfile/fileSystem/fileInputFactory/HybridFileInputFactory.java index 783f9dc01..ea6fb5569 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/fileSystem/fileInputFactory/HybridFileInputFactory.java +++ b/tsfile/src/main/java/org/apache/tsfile/fileSystem/fileInputFactory/HybridFileInputFactory.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.fileSystem.fileInputFactory; +package org.apache.tsfile.fileSystem.fileInputFactory; -import org.apache.iotdb.tsfile.fileSystem.FSPath; -import org.apache.iotdb.tsfile.fileSystem.FSType; -import org.apache.iotdb.tsfile.read.reader.TsFileInput; -import org.apache.iotdb.tsfile.utils.FSUtils; +import org.apache.tsfile.fileSystem.FSPath; +import org.apache.tsfile.fileSystem.FSType; +import org.apache.tsfile.read.reader.TsFileInput; +import org.apache.tsfile.utils.FSUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/fileSystem/fileInputFactory/LocalFSInputFactory.java b/tsfile/src/main/java/org/apache/tsfile/fileSystem/fileInputFactory/LocalFSInputFactory.java similarity index 85% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/fileSystem/fileInputFactory/LocalFSInputFactory.java rename to tsfile/src/main/java/org/apache/tsfile/fileSystem/fileInputFactory/LocalFSInputFactory.java index 55483d1e2..52a1d04c1 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/fileSystem/fileInputFactory/LocalFSInputFactory.java +++ b/tsfile/src/main/java/org/apache/tsfile/fileSystem/fileInputFactory/LocalFSInputFactory.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.tsfile.fileSystem.fileInputFactory; +package org.apache.tsfile.fileSystem.fileInputFactory; -import org.apache.iotdb.tsfile.read.reader.LocalTsFileInput; -import org.apache.iotdb.tsfile.read.reader.TsFileInput; +import org.apache.tsfile.read.reader.LocalTsFileInput; +import org.apache.tsfile.read.reader.TsFileInput; import java.io.IOException; import java.nio.file.Paths; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/fileSystem/fileInputFactory/OSFileInputFactory.java b/tsfile/src/main/java/org/apache/tsfile/fileSystem/fileInputFactory/OSFileInputFactory.java similarity index 92% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/fileSystem/fileInputFactory/OSFileInputFactory.java rename to tsfile/src/main/java/org/apache/tsfile/fileSystem/fileInputFactory/OSFileInputFactory.java index ce397f5ed..7e8fb911b 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/fileSystem/fileInputFactory/OSFileInputFactory.java +++ b/tsfile/src/main/java/org/apache/tsfile/fileSystem/fileInputFactory/OSFileInputFactory.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.fileSystem.fileInputFactory; +package org.apache.tsfile.fileSystem.fileInputFactory; -import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor; -import org.apache.iotdb.tsfile.read.reader.TsFileInput; +import org.apache.tsfile.common.conf.TSFileDescriptor; +import org.apache.tsfile.read.reader.TsFileInput; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/fileSystem/fileOutputFactory/FileOutputFactory.java b/tsfile/src/main/java/org/apache/tsfile/fileSystem/fileOutputFactory/FileOutputFactory.java similarity index 88% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/fileSystem/fileOutputFactory/FileOutputFactory.java rename to tsfile/src/main/java/org/apache/tsfile/fileSystem/fileOutputFactory/FileOutputFactory.java index cbb113aa7..815177101 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/fileSystem/fileOutputFactory/FileOutputFactory.java +++ b/tsfile/src/main/java/org/apache/tsfile/fileSystem/fileOutputFactory/FileOutputFactory.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.tsfile.fileSystem.fileOutputFactory; +package org.apache.tsfile.fileSystem.fileOutputFactory; -import org.apache.iotdb.tsfile.write.writer.TsFileOutput; +import org.apache.tsfile.write.writer.TsFileOutput; public interface FileOutputFactory { diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/fileSystem/fileOutputFactory/HDFSOutputFactory.java b/tsfile/src/main/java/org/apache/tsfile/fileSystem/fileOutputFactory/HDFSOutputFactory.java similarity index 91% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/fileSystem/fileOutputFactory/HDFSOutputFactory.java rename to tsfile/src/main/java/org/apache/tsfile/fileSystem/fileOutputFactory/HDFSOutputFactory.java index 914801d38..0ec90dc69 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/fileSystem/fileOutputFactory/HDFSOutputFactory.java +++ b/tsfile/src/main/java/org/apache/tsfile/fileSystem/fileOutputFactory/HDFSOutputFactory.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.tsfile.fileSystem.fileOutputFactory; +package org.apache.tsfile.fileSystem.fileOutputFactory; -import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor; -import org.apache.iotdb.tsfile.write.writer.TsFileOutput; +import org.apache.tsfile.common.conf.TSFileDescriptor; +import org.apache.tsfile.write.writer.TsFileOutput; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/fileSystem/fileOutputFactory/HybridFileOutputFactory.java b/tsfile/src/main/java/org/apache/tsfile/fileSystem/fileOutputFactory/HybridFileOutputFactory.java similarity index 88% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/fileSystem/fileOutputFactory/HybridFileOutputFactory.java rename to tsfile/src/main/java/org/apache/tsfile/fileSystem/fileOutputFactory/HybridFileOutputFactory.java index de971cf30..94fb51fa3 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/fileSystem/fileOutputFactory/HybridFileOutputFactory.java +++ b/tsfile/src/main/java/org/apache/tsfile/fileSystem/fileOutputFactory/HybridFileOutputFactory.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.fileSystem.fileOutputFactory; +package org.apache.tsfile.fileSystem.fileOutputFactory; -import org.apache.iotdb.tsfile.fileSystem.FSPath; -import org.apache.iotdb.tsfile.fileSystem.FSType; -import org.apache.iotdb.tsfile.utils.FSUtils; -import org.apache.iotdb.tsfile.write.writer.TsFileOutput; +import org.apache.tsfile.fileSystem.FSPath; +import org.apache.tsfile.fileSystem.FSType; +import org.apache.tsfile.utils.FSUtils; +import org.apache.tsfile.write.writer.TsFileOutput; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/fileSystem/fileOutputFactory/LocalFSOutputFactory.java b/tsfile/src/main/java/org/apache/tsfile/fileSystem/fileOutputFactory/LocalFSOutputFactory.java similarity index 89% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/fileSystem/fileOutputFactory/LocalFSOutputFactory.java rename to tsfile/src/main/java/org/apache/tsfile/fileSystem/fileOutputFactory/LocalFSOutputFactory.java index 49e154766..c3b3df3b1 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/fileSystem/fileOutputFactory/LocalFSOutputFactory.java +++ b/tsfile/src/main/java/org/apache/tsfile/fileSystem/fileOutputFactory/LocalFSOutputFactory.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.tsfile.fileSystem.fileOutputFactory; +package org.apache.tsfile.fileSystem.fileOutputFactory; -import org.apache.iotdb.tsfile.write.writer.LocalTsFileOutput; -import org.apache.iotdb.tsfile.write.writer.TsFileOutput; +import org.apache.tsfile.write.writer.LocalTsFileOutput; +import org.apache.tsfile.write.writer.TsFileOutput; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/fileSystem/fileOutputFactory/OSFileOutputFactory.java b/tsfile/src/main/java/org/apache/tsfile/fileSystem/fileOutputFactory/OSFileOutputFactory.java similarity index 91% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/fileSystem/fileOutputFactory/OSFileOutputFactory.java rename to tsfile/src/main/java/org/apache/tsfile/fileSystem/fileOutputFactory/OSFileOutputFactory.java index 9bb723c0b..c064edbe2 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/fileSystem/fileOutputFactory/OSFileOutputFactory.java +++ b/tsfile/src/main/java/org/apache/tsfile/fileSystem/fileOutputFactory/OSFileOutputFactory.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.fileSystem.fileOutputFactory; +package org.apache.tsfile.fileSystem.fileOutputFactory; -import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor; -import org.apache.iotdb.tsfile.write.writer.TsFileOutput; +import org.apache.tsfile.common.conf.TSFileDescriptor; +import org.apache.tsfile.write.writer.TsFileOutput; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/fileSystem/fsFactory/FSFactory.java b/tsfile/src/main/java/org/apache/tsfile/fileSystem/fsFactory/FSFactory.java similarity index 98% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/fileSystem/fsFactory/FSFactory.java rename to tsfile/src/main/java/org/apache/tsfile/fileSystem/fsFactory/FSFactory.java index 0e5369014..0a00ff305 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/fileSystem/fsFactory/FSFactory.java +++ b/tsfile/src/main/java/org/apache/tsfile/fileSystem/fsFactory/FSFactory.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.tsfile.fileSystem.fsFactory; +package org.apache.tsfile.fileSystem.fsFactory; import java.io.BufferedInputStream; import java.io.BufferedOutputStream; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/fileSystem/fsFactory/HDFSFactory.java b/tsfile/src/main/java/org/apache/tsfile/fileSystem/fsFactory/HDFSFactory.java similarity index 97% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/fileSystem/fsFactory/HDFSFactory.java rename to tsfile/src/main/java/org/apache/tsfile/fileSystem/fsFactory/HDFSFactory.java index 26997879f..7c3c88bbd 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/fileSystem/fsFactory/HDFSFactory.java +++ b/tsfile/src/main/java/org/apache/tsfile/fileSystem/fsFactory/HDFSFactory.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.tsfile.fileSystem.fsFactory; +package org.apache.tsfile.fileSystem.fsFactory; -import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor; -import org.apache.iotdb.tsfile.fileSystem.FSType; -import org.apache.iotdb.tsfile.utils.FSUtils; +import org.apache.tsfile.common.conf.TSFileDescriptor; +import org.apache.tsfile.fileSystem.FSType; +import org.apache.tsfile.utils.FSUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/fileSystem/fsFactory/HybridFSFactory.java b/tsfile/src/main/java/org/apache/tsfile/fileSystem/fsFactory/HybridFSFactory.java similarity index 96% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/fileSystem/fsFactory/HybridFSFactory.java rename to tsfile/src/main/java/org/apache/tsfile/fileSystem/fsFactory/HybridFSFactory.java index 1fe30a3c2..395f53064 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/fileSystem/fsFactory/HybridFSFactory.java +++ b/tsfile/src/main/java/org/apache/tsfile/fileSystem/fsFactory/HybridFSFactory.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.fileSystem.fsFactory; +package org.apache.tsfile.fileSystem.fsFactory; -import org.apache.iotdb.tsfile.fileSystem.FSPath; -import org.apache.iotdb.tsfile.fileSystem.FSType; -import org.apache.iotdb.tsfile.utils.FSUtils; +import org.apache.tsfile.fileSystem.FSPath; +import org.apache.tsfile.fileSystem.FSType; +import org.apache.tsfile.utils.FSUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/fileSystem/fsFactory/LocalFSFactory.java b/tsfile/src/main/java/org/apache/tsfile/fileSystem/fsFactory/LocalFSFactory.java similarity index 98% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/fileSystem/fsFactory/LocalFSFactory.java rename to tsfile/src/main/java/org/apache/tsfile/fileSystem/fsFactory/LocalFSFactory.java index d110aa9b1..2ae099d23 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/fileSystem/fsFactory/LocalFSFactory.java +++ b/tsfile/src/main/java/org/apache/tsfile/fileSystem/fsFactory/LocalFSFactory.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.tsfile.fileSystem.fsFactory; +package org.apache.tsfile.fileSystem.fsFactory; import org.apache.commons.io.FileUtils; import org.slf4j.Logger; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/fileSystem/fsFactory/OSFSFactory.java b/tsfile/src/main/java/org/apache/tsfile/fileSystem/fsFactory/OSFSFactory.java similarity index 97% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/fileSystem/fsFactory/OSFSFactory.java rename to tsfile/src/main/java/org/apache/tsfile/fileSystem/fsFactory/OSFSFactory.java index 2d8927cfc..3e90e83ec 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/fileSystem/fsFactory/OSFSFactory.java +++ b/tsfile/src/main/java/org/apache/tsfile/fileSystem/fsFactory/OSFSFactory.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.fileSystem.fsFactory; +package org.apache.tsfile.fileSystem.fsFactory; -import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor; -import org.apache.iotdb.tsfile.fileSystem.FSType; -import org.apache.iotdb.tsfile.utils.FSUtils; +import org.apache.tsfile.common.conf.TSFileDescriptor; +import org.apache.tsfile.fileSystem.FSType; +import org.apache.tsfile.utils.FSUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/TimeValuePair.java b/tsfile/src/main/java/org/apache/tsfile/read/TimeValuePair.java similarity index 94% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/TimeValuePair.java rename to tsfile/src/main/java/org/apache/tsfile/read/TimeValuePair.java index b5c148c92..23b138261 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/TimeValuePair.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/TimeValuePair.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.tsfile.read; +package org.apache.tsfile.read; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.utils.TsPrimitiveType; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.utils.TsPrimitiveType; import java.io.Serializable; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/TsFileAlignedSeriesReaderIterator.java b/tsfile/src/main/java/org/apache/tsfile/read/TsFileAlignedSeriesReaderIterator.java similarity index 90% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/TsFileAlignedSeriesReaderIterator.java rename to tsfile/src/main/java/org/apache/tsfile/read/TsFileAlignedSeriesReaderIterator.java index 4df152c20..417d829f8 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/TsFileAlignedSeriesReaderIterator.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/TsFileAlignedSeriesReaderIterator.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.tsfile.read; - -import org.apache.iotdb.tsfile.file.metadata.AlignedChunkMetadata; -import org.apache.iotdb.tsfile.file.metadata.ChunkMetadata; -import org.apache.iotdb.tsfile.file.metadata.IChunkMetadata; -import org.apache.iotdb.tsfile.read.common.Chunk; -import org.apache.iotdb.tsfile.read.reader.chunk.AlignedChunkReader; -import org.apache.iotdb.tsfile.write.schema.IMeasurementSchema; +package org.apache.tsfile.read; + +import org.apache.tsfile.file.metadata.AlignedChunkMetadata; +import org.apache.tsfile.file.metadata.ChunkMetadata; +import org.apache.tsfile.file.metadata.IChunkMetadata; +import org.apache.tsfile.read.common.Chunk; +import org.apache.tsfile.read.reader.chunk.AlignedChunkReader; +import org.apache.tsfile.write.schema.IMeasurementSchema; import java.io.IOException; import java.util.Arrays; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/TsFileCheckStatus.java b/tsfile/src/main/java/org/apache/tsfile/read/TsFileCheckStatus.java similarity index 96% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/TsFileCheckStatus.java rename to tsfile/src/main/java/org/apache/tsfile/read/TsFileCheckStatus.java index 8f9c693d9..280482ab2 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/TsFileCheckStatus.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/TsFileCheckStatus.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.tsfile.read; +package org.apache.tsfile.read; public class TsFileCheckStatus { public static final long COMPLETE_FILE = 0; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/TsFileDeviceIterator.java b/tsfile/src/main/java/org/apache/tsfile/read/TsFileDeviceIterator.java similarity index 93% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/TsFileDeviceIterator.java rename to tsfile/src/main/java/org/apache/tsfile/read/TsFileDeviceIterator.java index 35d5fde9d..fb53a8f83 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/TsFileDeviceIterator.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/TsFileDeviceIterator.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.tsfile.read; +package org.apache.tsfile.read; -import org.apache.iotdb.tsfile.exception.TsFileRuntimeException; -import org.apache.iotdb.tsfile.file.metadata.MetadataIndexNode; -import org.apache.iotdb.tsfile.utils.Pair; +import org.apache.tsfile.exception.TsFileRuntimeException; +import org.apache.tsfile.file.metadata.MetadataIndexNode; +import org.apache.tsfile.utils.Pair; import java.io.IOException; import java.util.Iterator; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/TsFileReader.java b/tsfile/src/main/java/org/apache/tsfile/read/TsFileReader.java similarity index 79% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/TsFileReader.java rename to tsfile/src/main/java/org/apache/tsfile/read/TsFileReader.java index 18a6476af..7a5e7ea84 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/TsFileReader.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/TsFileReader.java @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.iotdb.tsfile.read; - -import org.apache.iotdb.tsfile.read.controller.CachedChunkLoaderImpl; -import org.apache.iotdb.tsfile.read.controller.IChunkLoader; -import org.apache.iotdb.tsfile.read.controller.IMetadataQuerier; -import org.apache.iotdb.tsfile.read.controller.MetadataQuerierByFileImpl; -import org.apache.iotdb.tsfile.read.expression.QueryExpression; -import org.apache.iotdb.tsfile.read.query.dataset.QueryDataSet; -import org.apache.iotdb.tsfile.read.query.executor.TsFileExecutor; +package org.apache.tsfile.read; + +import org.apache.tsfile.read.controller.CachedChunkLoaderImpl; +import org.apache.tsfile.read.controller.IChunkLoader; +import org.apache.tsfile.read.controller.IMetadataQuerier; +import org.apache.tsfile.read.controller.MetadataQuerierByFileImpl; +import org.apache.tsfile.read.expression.QueryExpression; +import org.apache.tsfile.read.query.dataset.QueryDataSet; +import org.apache.tsfile.read.query.executor.TsFileExecutor; import java.io.IOException; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/TsFileRestorableReader.java b/tsfile/src/main/java/org/apache/tsfile/read/TsFileRestorableReader.java similarity index 91% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/TsFileRestorableReader.java rename to tsfile/src/main/java/org/apache/tsfile/read/TsFileRestorableReader.java index b7f018ad4..147d06e92 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/TsFileRestorableReader.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/TsFileRestorableReader.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.tsfile.read; +package org.apache.tsfile.read; -import org.apache.iotdb.tsfile.fileSystem.FSFactoryProducer; -import org.apache.iotdb.tsfile.write.TsFileWriter; -import org.apache.iotdb.tsfile.write.writer.RestorableTsFileIOWriter; +import org.apache.tsfile.fileSystem.FSFactoryProducer; +import org.apache.tsfile.write.TsFileWriter; +import org.apache.tsfile.write.writer.RestorableTsFileIOWriter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/TsFileSequenceReader.java b/tsfile/src/main/java/org/apache/tsfile/read/TsFileSequenceReader.java similarity index 97% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/TsFileSequenceReader.java rename to tsfile/src/main/java/org/apache/tsfile/read/TsFileSequenceReader.java index dfdbd81c7..6479e2fc0 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/TsFileSequenceReader.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/TsFileSequenceReader.java @@ -17,51 +17,51 @@ * under the License. */ -package org.apache.iotdb.tsfile.read; - -import org.apache.iotdb.tsfile.common.conf.TSFileConfig; -import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor; -import org.apache.iotdb.tsfile.common.constant.TsFileConstant; -import org.apache.iotdb.tsfile.compress.IUnCompressor; -import org.apache.iotdb.tsfile.encoding.decoder.Decoder; -import org.apache.iotdb.tsfile.exception.TsFileRuntimeException; -import org.apache.iotdb.tsfile.exception.TsFileStatisticsMistakesException; -import org.apache.iotdb.tsfile.file.MetaMarker; -import org.apache.iotdb.tsfile.file.header.ChunkGroupHeader; -import org.apache.iotdb.tsfile.file.header.ChunkHeader; -import org.apache.iotdb.tsfile.file.header.PageHeader; -import org.apache.iotdb.tsfile.file.metadata.AlignedChunkMetadata; -import org.apache.iotdb.tsfile.file.metadata.AlignedTimeSeriesMetadata; -import org.apache.iotdb.tsfile.file.metadata.ChunkGroupMetadata; -import org.apache.iotdb.tsfile.file.metadata.ChunkMetadata; -import org.apache.iotdb.tsfile.file.metadata.IChunkMetadata; -import org.apache.iotdb.tsfile.file.metadata.ITimeSeriesMetadata; -import org.apache.iotdb.tsfile.file.metadata.MetadataIndexEntry; -import org.apache.iotdb.tsfile.file.metadata.MetadataIndexNode; -import org.apache.iotdb.tsfile.file.metadata.TimeseriesMetadata; -import org.apache.iotdb.tsfile.file.metadata.TsFileMetadata; -import org.apache.iotdb.tsfile.file.metadata.enums.CompressionType; -import org.apache.iotdb.tsfile.file.metadata.enums.MetadataIndexNodeType; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding; -import org.apache.iotdb.tsfile.file.metadata.statistics.Statistics; -import org.apache.iotdb.tsfile.fileSystem.FSFactoryProducer; -import org.apache.iotdb.tsfile.read.common.BatchData; -import org.apache.iotdb.tsfile.read.common.Chunk; -import org.apache.iotdb.tsfile.read.common.Path; -import org.apache.iotdb.tsfile.read.controller.CachedChunkLoaderImpl; -import org.apache.iotdb.tsfile.read.controller.MetadataQuerierByFileImpl; -import org.apache.iotdb.tsfile.read.reader.TsFileInput; -import org.apache.iotdb.tsfile.read.reader.page.PageReader; -import org.apache.iotdb.tsfile.read.reader.page.TimePageReader; -import org.apache.iotdb.tsfile.read.reader.page.ValuePageReader; -import org.apache.iotdb.tsfile.utils.BloomFilter; -import org.apache.iotdb.tsfile.utils.Pair; -import org.apache.iotdb.tsfile.utils.ReadWriteForEncodingUtils; -import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils; -import org.apache.iotdb.tsfile.utils.TsPrimitiveType; -import org.apache.iotdb.tsfile.write.schema.IMeasurementSchema; -import org.apache.iotdb.tsfile.write.schema.MeasurementSchema; +package org.apache.tsfile.read; + +import org.apache.tsfile.common.conf.TSFileConfig; +import org.apache.tsfile.common.conf.TSFileDescriptor; +import org.apache.tsfile.common.constant.TsFileConstant; +import org.apache.tsfile.compress.IUnCompressor; +import org.apache.tsfile.encoding.decoder.Decoder; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.exception.TsFileRuntimeException; +import org.apache.tsfile.exception.TsFileStatisticsMistakesException; +import org.apache.tsfile.file.MetaMarker; +import org.apache.tsfile.file.header.ChunkGroupHeader; +import org.apache.tsfile.file.header.ChunkHeader; +import org.apache.tsfile.file.header.PageHeader; +import org.apache.tsfile.file.metadata.AlignedChunkMetadata; +import org.apache.tsfile.file.metadata.AlignedTimeSeriesMetadata; +import org.apache.tsfile.file.metadata.ChunkGroupMetadata; +import org.apache.tsfile.file.metadata.ChunkMetadata; +import org.apache.tsfile.file.metadata.IChunkMetadata; +import org.apache.tsfile.file.metadata.ITimeSeriesMetadata; +import org.apache.tsfile.file.metadata.MetadataIndexEntry; +import org.apache.tsfile.file.metadata.MetadataIndexNode; +import org.apache.tsfile.file.metadata.TimeseriesMetadata; +import org.apache.tsfile.file.metadata.TsFileMetadata; +import org.apache.tsfile.file.metadata.enums.CompressionType; +import org.apache.tsfile.file.metadata.enums.MetadataIndexNodeType; +import org.apache.tsfile.file.metadata.enums.TSEncoding; +import org.apache.tsfile.file.metadata.statistics.Statistics; +import org.apache.tsfile.fileSystem.FSFactoryProducer; +import org.apache.tsfile.read.common.BatchData; +import org.apache.tsfile.read.common.Chunk; +import org.apache.tsfile.read.common.Path; +import org.apache.tsfile.read.controller.CachedChunkLoaderImpl; +import org.apache.tsfile.read.controller.MetadataQuerierByFileImpl; +import org.apache.tsfile.read.reader.TsFileInput; +import org.apache.tsfile.read.reader.page.PageReader; +import org.apache.tsfile.read.reader.page.TimePageReader; +import org.apache.tsfile.read.reader.page.ValuePageReader; +import org.apache.tsfile.utils.BloomFilter; +import org.apache.tsfile.utils.Pair; +import org.apache.tsfile.utils.ReadWriteForEncodingUtils; +import org.apache.tsfile.utils.ReadWriteIOUtils; +import org.apache.tsfile.utils.TsPrimitiveType; +import org.apache.tsfile.write.schema.IMeasurementSchema; +import org.apache.tsfile.write.schema.MeasurementSchema; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/TsFileSequenceReaderTimeseriesMetadataIterator.java b/tsfile/src/main/java/org/apache/tsfile/read/TsFileSequenceReaderTimeseriesMetadataIterator.java similarity index 96% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/TsFileSequenceReaderTimeseriesMetadataIterator.java rename to tsfile/src/main/java/org/apache/tsfile/read/TsFileSequenceReaderTimeseriesMetadataIterator.java index dacdbc54f..4f6042628 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/TsFileSequenceReaderTimeseriesMetadataIterator.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/TsFileSequenceReaderTimeseriesMetadataIterator.java @@ -17,13 +17,13 @@ * under the License. */ -package org.apache.iotdb.tsfile.read; +package org.apache.tsfile.read; -import org.apache.iotdb.tsfile.exception.TsFileSequenceReaderTimeseriesMetadataIteratorException; -import org.apache.iotdb.tsfile.file.metadata.MetadataIndexEntry; -import org.apache.iotdb.tsfile.file.metadata.MetadataIndexNode; -import org.apache.iotdb.tsfile.file.metadata.TimeseriesMetadata; -import org.apache.iotdb.tsfile.file.metadata.enums.MetadataIndexNodeType; +import org.apache.tsfile.exception.TsFileSequenceReaderTimeseriesMetadataIteratorException; +import org.apache.tsfile.file.metadata.MetadataIndexEntry; +import org.apache.tsfile.file.metadata.MetadataIndexNode; +import org.apache.tsfile.file.metadata.TimeseriesMetadata; +import org.apache.tsfile.file.metadata.enums.MetadataIndexNodeType; import java.io.IOException; import java.nio.ByteBuffer; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/UnClosedTsFileReader.java b/tsfile/src/main/java/org/apache/tsfile/read/UnClosedTsFileReader.java similarity index 88% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/UnClosedTsFileReader.java rename to tsfile/src/main/java/org/apache/tsfile/read/UnClosedTsFileReader.java index fb0e320fd..4c19dac93 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/UnClosedTsFileReader.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/UnClosedTsFileReader.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.tsfile.read; +package org.apache.tsfile.read; -import org.apache.iotdb.tsfile.exception.NotImplementedException; -import org.apache.iotdb.tsfile.file.metadata.TsFileMetadata; +import org.apache.tsfile.exception.NotImplementedException; +import org.apache.tsfile.file.metadata.TsFileMetadata; import java.io.IOException; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/BatchData.java b/tsfile/src/main/java/org/apache/tsfile/read/common/BatchData.java similarity index 96% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/BatchData.java rename to tsfile/src/main/java/org/apache/tsfile/read/common/BatchData.java index 4d57583d8..bc072b0ec 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/BatchData.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/common/BatchData.java @@ -17,22 +17,22 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.common; - -import org.apache.iotdb.tsfile.common.conf.TSFileConfig; -import org.apache.iotdb.tsfile.exception.write.UnSupportedDataTypeException; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.read.TimeValuePair; -import org.apache.iotdb.tsfile.read.reader.IPointReader; -import org.apache.iotdb.tsfile.utils.Binary; -import org.apache.iotdb.tsfile.utils.TsPrimitiveType; -import org.apache.iotdb.tsfile.utils.TsPrimitiveType.TsBinary; -import org.apache.iotdb.tsfile.utils.TsPrimitiveType.TsBoolean; -import org.apache.iotdb.tsfile.utils.TsPrimitiveType.TsDouble; -import org.apache.iotdb.tsfile.utils.TsPrimitiveType.TsFloat; -import org.apache.iotdb.tsfile.utils.TsPrimitiveType.TsInt; -import org.apache.iotdb.tsfile.utils.TsPrimitiveType.TsLong; -import org.apache.iotdb.tsfile.utils.TsPrimitiveType.TsVector; +package org.apache.tsfile.read.common; + +import org.apache.tsfile.common.conf.TSFileConfig; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.read.TimeValuePair; +import org.apache.tsfile.read.reader.IPointReader; +import org.apache.tsfile.utils.Binary; +import org.apache.tsfile.utils.TsPrimitiveType; +import org.apache.tsfile.utils.TsPrimitiveType.TsBinary; +import org.apache.tsfile.utils.TsPrimitiveType.TsBoolean; +import org.apache.tsfile.utils.TsPrimitiveType.TsDouble; +import org.apache.tsfile.utils.TsPrimitiveType.TsFloat; +import org.apache.tsfile.utils.TsPrimitiveType.TsInt; +import org.apache.tsfile.utils.TsPrimitiveType.TsLong; +import org.apache.tsfile.utils.TsPrimitiveType.TsVector; +import org.apache.tsfile.write.UnSupportedDataTypeException; import java.io.DataOutputStream; import java.io.IOException; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/BatchDataFactory.java b/tsfile/src/main/java/org/apache/tsfile/read/common/BatchDataFactory.java similarity index 92% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/BatchDataFactory.java rename to tsfile/src/main/java/org/apache/tsfile/read/common/BatchDataFactory.java index d72384f35..9cccf4f58 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/BatchDataFactory.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/common/BatchDataFactory.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.common; +package org.apache.tsfile.read.common; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; +import org.apache.tsfile.enums.TSDataType; public class BatchDataFactory { diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/Chunk.java b/tsfile/src/main/java/org/apache/tsfile/read/common/Chunk.java similarity index 93% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/Chunk.java rename to tsfile/src/main/java/org/apache/tsfile/read/common/Chunk.java index 99b9ace3a..5caab7fe2 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/Chunk.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/common/Chunk.java @@ -17,20 +17,20 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.common; +package org.apache.tsfile.read.common; -import org.apache.iotdb.tsfile.file.MetaMarker; -import org.apache.iotdb.tsfile.file.header.ChunkHeader; -import org.apache.iotdb.tsfile.file.metadata.statistics.Statistics; -import org.apache.iotdb.tsfile.utils.PublicBAOS; -import org.apache.iotdb.tsfile.utils.RamUsageEstimator; -import org.apache.iotdb.tsfile.utils.ReadWriteForEncodingUtils; +import org.apache.tsfile.file.MetaMarker; +import org.apache.tsfile.file.header.ChunkHeader; +import org.apache.tsfile.file.metadata.statistics.Statistics; +import org.apache.tsfile.utils.PublicBAOS; +import org.apache.tsfile.utils.RamUsageEstimator; +import org.apache.tsfile.utils.ReadWriteForEncodingUtils; import java.io.IOException; import java.nio.ByteBuffer; import java.util.List; -import static org.apache.iotdb.tsfile.utils.RamUsageEstimator.sizeOfByteArray; +import static org.apache.tsfile.utils.RamUsageEstimator.sizeOfByteArray; /** used in query. */ public class Chunk { diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/DescReadBatchData.java b/tsfile/src/main/java/org/apache/tsfile/read/common/DescReadBatchData.java similarity index 95% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/DescReadBatchData.java rename to tsfile/src/main/java/org/apache/tsfile/read/common/DescReadBatchData.java index 16e359f16..53a42adf3 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/DescReadBatchData.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/common/DescReadBatchData.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.common; +package org.apache.tsfile.read.common; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; +import org.apache.tsfile.enums.TSDataType; /** * This class is just for reading batch data reversely. The data source is from page reader. For diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/DescReadWriteBatchData.java b/tsfile/src/main/java/org/apache/tsfile/read/common/DescReadWriteBatchData.java similarity index 98% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/DescReadWriteBatchData.java rename to tsfile/src/main/java/org/apache/tsfile/read/common/DescReadWriteBatchData.java index 6d9e15c12..9b168f290 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/DescReadWriteBatchData.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/common/DescReadWriteBatchData.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.common; +package org.apache.tsfile.read.common; -import org.apache.iotdb.tsfile.exception.write.UnSupportedDataTypeException; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.utils.Binary; -import org.apache.iotdb.tsfile.utils.TsPrimitiveType; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.utils.Binary; +import org.apache.tsfile.utils.TsPrimitiveType; +import org.apache.tsfile.write.UnSupportedDataTypeException; import java.io.DataOutputStream; import java.io.IOException; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/Field.java b/tsfile/src/main/java/org/apache/tsfile/read/common/Field.java similarity index 94% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/Field.java rename to tsfile/src/main/java/org/apache/tsfile/read/common/Field.java index 82c580d97..32feae4a3 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/Field.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/common/Field.java @@ -17,13 +17,13 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.common; +package org.apache.tsfile.read.common; -import org.apache.iotdb.tsfile.exception.NullFieldException; -import org.apache.iotdb.tsfile.exception.write.UnSupportedDataTypeException; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.utils.Binary; -import org.apache.iotdb.tsfile.utils.TsPrimitiveType; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.exception.NullFieldException; +import org.apache.tsfile.utils.Binary; +import org.apache.tsfile.utils.TsPrimitiveType; +import org.apache.tsfile.write.UnSupportedDataTypeException; /** * Field is component of one {@code RowRecord} which stores a value in specific data type. The value diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/IBatchDataIterator.java b/tsfile/src/main/java/org/apache/tsfile/read/common/IBatchDataIterator.java similarity index 95% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/IBatchDataIterator.java rename to tsfile/src/main/java/org/apache/tsfile/read/common/IBatchDataIterator.java index 0761c1d00..964c95d1f 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/IBatchDataIterator.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/common/IBatchDataIterator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.common; +package org.apache.tsfile.read.common; public interface IBatchDataIterator { diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/Path.java b/tsfile/src/main/java/org/apache/tsfile/read/common/Path.java similarity index 96% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/Path.java rename to tsfile/src/main/java/org/apache/tsfile/read/common/Path.java index 18a093e28..7a27b92be 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/Path.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/common/Path.java @@ -17,13 +17,13 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.common; +package org.apache.tsfile.read.common; -import org.apache.iotdb.tsfile.common.constant.TsFileConstant; -import org.apache.iotdb.tsfile.exception.PathParseException; -import org.apache.iotdb.tsfile.read.common.parser.PathNodesGenerator; -import org.apache.iotdb.tsfile.utils.PublicBAOS; -import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils; +import org.apache.tsfile.common.constant.TsFileConstant; +import org.apache.tsfile.exception.PathParseException; +import org.apache.tsfile.read.common.parser.PathNodesGenerator; +import org.apache.tsfile.utils.PublicBAOS; +import org.apache.tsfile.utils.ReadWriteIOUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.Validate; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/RowRecord.java b/tsfile/src/main/java/org/apache/tsfile/read/common/RowRecord.java similarity index 96% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/RowRecord.java rename to tsfile/src/main/java/org/apache/tsfile/read/common/RowRecord.java index 5fb65793f..4e496bab0 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/RowRecord.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/common/RowRecord.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.common; +package org.apache.tsfile.read.common; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; +import org.apache.tsfile.enums.TSDataType; import java.util.ArrayList; import java.util.List; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/SignalBatchData.java b/tsfile/src/main/java/org/apache/tsfile/read/common/SignalBatchData.java similarity index 96% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/SignalBatchData.java rename to tsfile/src/main/java/org/apache/tsfile/read/common/SignalBatchData.java index fea8f782d..0dbca19d1 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/SignalBatchData.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/common/SignalBatchData.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.common; +package org.apache.tsfile.read.common; /** It is an empty signal to notify the caller that there is no more batch data after it. */ public class SignalBatchData extends BatchData { diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/TimeRange.java b/tsfile/src/main/java/org/apache/tsfile/read/common/TimeRange.java similarity index 97% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/TimeRange.java rename to tsfile/src/main/java/org/apache/tsfile/read/common/TimeRange.java index 5214878f8..619dd0cff 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/TimeRange.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/common/TimeRange.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.common; +package org.apache.tsfile.read.common; -import org.apache.iotdb.tsfile.read.expression.IExpression; -import org.apache.iotdb.tsfile.read.expression.impl.BinaryExpression; -import org.apache.iotdb.tsfile.read.expression.impl.GlobalTimeExpression; -import org.apache.iotdb.tsfile.read.filter.factory.TimeFilterApi; +import org.apache.tsfile.read.expression.IExpression; +import org.apache.tsfile.read.expression.impl.BinaryExpression; +import org.apache.tsfile.read.expression.impl.GlobalTimeExpression; +import org.apache.tsfile.read.filter.factory.TimeFilterApi; import java.util.ArrayList; import java.util.Collections; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/TsBlock.java b/tsfile/src/main/java/org/apache/tsfile/read/common/block/TsBlock.java similarity index 96% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/TsBlock.java rename to tsfile/src/main/java/org/apache/tsfile/read/common/block/TsBlock.java index 668b396c7..1460e4f17 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/TsBlock.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/common/block/TsBlock.java @@ -17,16 +17,16 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.common.block; - -import org.apache.iotdb.tsfile.exception.write.UnSupportedDataTypeException; -import org.apache.iotdb.tsfile.read.TimeValuePair; -import org.apache.iotdb.tsfile.read.common.IBatchDataIterator; -import org.apache.iotdb.tsfile.read.common.block.column.Column; -import org.apache.iotdb.tsfile.read.common.block.column.TimeColumn; -import org.apache.iotdb.tsfile.read.reader.IPointReader; -import org.apache.iotdb.tsfile.utils.RamUsageEstimator; -import org.apache.iotdb.tsfile.utils.TsPrimitiveType; +package org.apache.tsfile.read.common.block; + +import org.apache.tsfile.block.column.Column; +import org.apache.tsfile.read.TimeValuePair; +import org.apache.tsfile.read.common.IBatchDataIterator; +import org.apache.tsfile.read.common.block.column.TimeColumn; +import org.apache.tsfile.read.reader.IPointReader; +import org.apache.tsfile.utils.RamUsageEstimator; +import org.apache.tsfile.utils.TsPrimitiveType; +import org.apache.tsfile.write.UnSupportedDataTypeException; import java.util.Arrays; import java.util.Iterator; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/TsBlockBuilder.java b/tsfile/src/main/java/org/apache/tsfile/read/common/block/TsBlockBuilder.java similarity index 91% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/TsBlockBuilder.java rename to tsfile/src/main/java/org/apache/tsfile/read/common/block/TsBlockBuilder.java index 762fc47f4..b2ba141d7 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/TsBlockBuilder.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/common/block/TsBlockBuilder.java @@ -17,28 +17,29 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.common.block; - -import org.apache.iotdb.tsfile.common.conf.TSFileConfig; -import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.read.common.block.column.BinaryColumnBuilder; -import org.apache.iotdb.tsfile.read.common.block.column.BooleanColumnBuilder; -import org.apache.iotdb.tsfile.read.common.block.column.Column; -import org.apache.iotdb.tsfile.read.common.block.column.ColumnBuilder; -import org.apache.iotdb.tsfile.read.common.block.column.DoubleColumnBuilder; -import org.apache.iotdb.tsfile.read.common.block.column.FloatColumnBuilder; -import org.apache.iotdb.tsfile.read.common.block.column.IntColumnBuilder; -import org.apache.iotdb.tsfile.read.common.block.column.LongColumnBuilder; -import org.apache.iotdb.tsfile.read.common.block.column.TimeColumn; -import org.apache.iotdb.tsfile.read.common.block.column.TimeColumnBuilder; -import org.apache.iotdb.tsfile.utils.Binary; +package org.apache.tsfile.read.common.block; + +import org.apache.tsfile.block.TsBlockBuilderStatus; +import org.apache.tsfile.block.column.Column; +import org.apache.tsfile.block.column.ColumnBuilder; +import org.apache.tsfile.common.conf.TSFileConfig; +import org.apache.tsfile.common.conf.TSFileDescriptor; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.read.common.block.column.BinaryColumnBuilder; +import org.apache.tsfile.read.common.block.column.BooleanColumnBuilder; +import org.apache.tsfile.read.common.block.column.DoubleColumnBuilder; +import org.apache.tsfile.read.common.block.column.FloatColumnBuilder; +import org.apache.tsfile.read.common.block.column.IntColumnBuilder; +import org.apache.tsfile.read.common.block.column.LongColumnBuilder; +import org.apache.tsfile.read.common.block.column.TimeColumn; +import org.apache.tsfile.read.common.block.column.TimeColumnBuilder; +import org.apache.tsfile.utils.Binary; import java.util.List; import static java.lang.String.format; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.tsfile.utils.Preconditions.checkArgument; +import static org.apache.tsfile.utils.Preconditions.checkArgument; public class TsBlockBuilder { diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/TsBlockUtil.java b/tsfile/src/main/java/org/apache/tsfile/read/common/block/TsBlockUtil.java similarity index 92% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/TsBlockUtil.java rename to tsfile/src/main/java/org/apache/tsfile/read/common/block/TsBlockUtil.java index 8e10bcea0..0f05afd5a 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/TsBlockUtil.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/common/block/TsBlockUtil.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.common.block; +package org.apache.tsfile.read.common.block; -import org.apache.iotdb.tsfile.read.common.TimeRange; -import org.apache.iotdb.tsfile.read.common.block.column.TimeColumn; +import org.apache.tsfile.read.common.TimeRange; +import org.apache.tsfile.read.common.block.column.TimeColumn; public class TsBlockUtil { diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/BinaryArrayColumnEncoder.java b/tsfile/src/main/java/org/apache/tsfile/read/common/block/column/BinaryArrayColumnEncoder.java similarity index 94% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/BinaryArrayColumnEncoder.java rename to tsfile/src/main/java/org/apache/tsfile/read/common/block/column/BinaryArrayColumnEncoder.java index af707fb97..c4bb38336 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/BinaryArrayColumnEncoder.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/common/block/column/BinaryArrayColumnEncoder.java @@ -17,10 +17,11 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.common.block.column; +package org.apache.tsfile.read.common.block.column; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.utils.Binary; +import org.apache.tsfile.block.column.Column; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.utils.Binary; import java.io.DataOutputStream; import java.io.IOException; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/BinaryColumn.java b/tsfile/src/main/java/org/apache/tsfile/read/common/block/column/BinaryColumn.java similarity index 88% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/BinaryColumn.java rename to tsfile/src/main/java/org/apache/tsfile/read/common/block/column/BinaryColumn.java index e383342f7..facd74707 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/BinaryColumn.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/common/block/column/BinaryColumn.java @@ -17,19 +17,21 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.common.block.column; +package org.apache.tsfile.read.common.block.column; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.utils.Binary; -import org.apache.iotdb.tsfile.utils.RamUsageEstimator; -import org.apache.iotdb.tsfile.utils.TsPrimitiveType; +import org.apache.tsfile.block.column.Column; +import org.apache.tsfile.block.column.ColumnEncoding; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.utils.Binary; +import org.apache.tsfile.utils.RamUsageEstimator; +import org.apache.tsfile.utils.TsPrimitiveType; import java.util.Arrays; import java.util.Optional; -import static org.apache.iotdb.tsfile.read.common.block.column.ColumnUtil.checkValidRegion; -import static org.apache.iotdb.tsfile.utils.RamUsageEstimator.sizeOfBooleanArray; -import static org.apache.iotdb.tsfile.utils.RamUsageEstimator.sizeOfObjectArray; +import static org.apache.tsfile.read.common.block.column.ColumnUtil.checkValidRegion; +import static org.apache.tsfile.utils.RamUsageEstimator.sizeOfBooleanArray; +import static org.apache.tsfile.utils.RamUsageEstimator.sizeOfObjectArray; public class BinaryColumn implements Column { diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/BinaryColumnBuilder.java b/tsfile/src/main/java/org/apache/tsfile/read/common/block/column/BinaryColumnBuilder.java similarity index 86% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/BinaryColumnBuilder.java rename to tsfile/src/main/java/org/apache/tsfile/read/common/block/column/BinaryColumnBuilder.java index 965a59048..917c6e5f3 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/BinaryColumnBuilder.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/common/block/column/BinaryColumnBuilder.java @@ -17,20 +17,23 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.common.block.column; +package org.apache.tsfile.read.common.block.column; -import org.apache.iotdb.tsfile.exception.write.UnSupportedDataTypeException; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.utils.Binary; -import org.apache.iotdb.tsfile.utils.RamUsageEstimator; -import org.apache.iotdb.tsfile.utils.TsPrimitiveType; +import org.apache.tsfile.block.column.Column; +import org.apache.tsfile.block.column.ColumnBuilder; +import org.apache.tsfile.block.column.ColumnBuilderStatus; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.utils.Binary; +import org.apache.tsfile.utils.RamUsageEstimator; +import org.apache.tsfile.utils.TsPrimitiveType; +import org.apache.tsfile.write.UnSupportedDataTypeException; import java.util.Arrays; import static java.lang.Math.max; -import static org.apache.iotdb.tsfile.read.common.block.column.ColumnUtil.calculateBlockResetSize; -import static org.apache.iotdb.tsfile.utils.RamUsageEstimator.shallowSizeOf; -import static org.apache.iotdb.tsfile.utils.RamUsageEstimator.sizeOf; +import static org.apache.tsfile.read.common.block.column.ColumnUtil.calculateBlockResetSize; +import static org.apache.tsfile.utils.RamUsageEstimator.shallowSizeOf; +import static org.apache.tsfile.utils.RamUsageEstimator.sizeOf; public class BinaryColumnBuilder implements ColumnBuilder { diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/BooleanColumn.java b/tsfile/src/main/java/org/apache/tsfile/read/common/block/column/BooleanColumn.java similarity index 90% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/BooleanColumn.java rename to tsfile/src/main/java/org/apache/tsfile/read/common/block/column/BooleanColumn.java index daed6cf31..d7d7df680 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/BooleanColumn.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/common/block/column/BooleanColumn.java @@ -17,17 +17,19 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.common.block.column; +package org.apache.tsfile.read.common.block.column; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.utils.RamUsageEstimator; -import org.apache.iotdb.tsfile.utils.TsPrimitiveType; +import org.apache.tsfile.block.column.Column; +import org.apache.tsfile.block.column.ColumnEncoding; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.utils.RamUsageEstimator; +import org.apache.tsfile.utils.TsPrimitiveType; import java.util.Arrays; import java.util.Optional; -import static org.apache.iotdb.tsfile.read.common.block.column.ColumnUtil.checkValidRegion; -import static org.apache.iotdb.tsfile.utils.RamUsageEstimator.sizeOfBooleanArray; +import static org.apache.tsfile.read.common.block.column.ColumnUtil.checkValidRegion; +import static org.apache.tsfile.utils.RamUsageEstimator.sizeOfBooleanArray; public class BooleanColumn implements Column { diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/BooleanColumnBuilder.java b/tsfile/src/main/java/org/apache/tsfile/read/common/block/column/BooleanColumnBuilder.java similarity index 88% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/BooleanColumnBuilder.java rename to tsfile/src/main/java/org/apache/tsfile/read/common/block/column/BooleanColumnBuilder.java index e8a883b16..3516b394f 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/BooleanColumnBuilder.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/common/block/column/BooleanColumnBuilder.java @@ -17,18 +17,21 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.common.block.column; +package org.apache.tsfile.read.common.block.column; -import org.apache.iotdb.tsfile.exception.write.UnSupportedDataTypeException; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.utils.RamUsageEstimator; -import org.apache.iotdb.tsfile.utils.TsPrimitiveType; +import org.apache.tsfile.block.column.Column; +import org.apache.tsfile.block.column.ColumnBuilder; +import org.apache.tsfile.block.column.ColumnBuilderStatus; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.utils.RamUsageEstimator; +import org.apache.tsfile.utils.TsPrimitiveType; +import org.apache.tsfile.write.UnSupportedDataTypeException; import java.util.Arrays; import static java.lang.Math.max; -import static org.apache.iotdb.tsfile.read.common.block.column.ColumnUtil.calculateBlockResetSize; -import static org.apache.iotdb.tsfile.utils.RamUsageEstimator.sizeOf; +import static org.apache.tsfile.read.common.block.column.ColumnUtil.calculateBlockResetSize; +import static org.apache.tsfile.utils.RamUsageEstimator.sizeOf; public class BooleanColumnBuilder implements ColumnBuilder { diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/ByteArrayColumnEncoder.java b/tsfile/src/main/java/org/apache/tsfile/read/common/block/column/ByteArrayColumnEncoder.java similarity index 94% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/ByteArrayColumnEncoder.java rename to tsfile/src/main/java/org/apache/tsfile/read/common/block/column/ByteArrayColumnEncoder.java index 7636189a7..0b7c67290 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/ByteArrayColumnEncoder.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/common/block/column/ByteArrayColumnEncoder.java @@ -17,9 +17,10 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.common.block.column; +package org.apache.tsfile.read.common.block.column; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; +import org.apache.tsfile.block.column.Column; +import org.apache.tsfile.enums.TSDataType; import java.io.DataOutputStream; import java.io.IOException; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/ColumnEncoder.java b/tsfile/src/main/java/org/apache/tsfile/read/common/block/column/ColumnEncoder.java similarity index 97% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/ColumnEncoder.java rename to tsfile/src/main/java/org/apache/tsfile/read/common/block/column/ColumnEncoder.java index 7bf79c11e..b65841b85 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/ColumnEncoder.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/common/block/column/ColumnEncoder.java @@ -17,9 +17,10 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.common.block.column; +package org.apache.tsfile.read.common.block.column; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; +import org.apache.tsfile.block.column.Column; +import org.apache.tsfile.enums.TSDataType; import java.io.DataOutputStream; import java.io.IOException; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/ColumnEncoderFactory.java b/tsfile/src/main/java/org/apache/tsfile/read/common/block/column/ColumnEncoderFactory.java similarity index 94% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/ColumnEncoderFactory.java rename to tsfile/src/main/java/org/apache/tsfile/read/common/block/column/ColumnEncoderFactory.java index f6055a8b5..71442e8b6 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/ColumnEncoderFactory.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/common/block/column/ColumnEncoderFactory.java @@ -17,7 +17,9 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.common.block.column; +package org.apache.tsfile.read.common.block.column; + +import org.apache.tsfile.block.column.ColumnEncoding; import java.util.HashMap; import java.util.Map; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/ColumnUtil.java b/tsfile/src/main/java/org/apache/tsfile/read/common/block/column/ColumnUtil.java similarity index 98% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/ColumnUtil.java rename to tsfile/src/main/java/org/apache/tsfile/read/common/block/column/ColumnUtil.java index ddf5db413..1549b0dc1 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/ColumnUtil.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/common/block/column/ColumnUtil.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.common.block.column; +package org.apache.tsfile.read.common.block.column; import static java.lang.Math.ceil; import static java.lang.String.format; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/DoubleColumn.java b/tsfile/src/main/java/org/apache/tsfile/read/common/block/column/DoubleColumn.java similarity index 89% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/DoubleColumn.java rename to tsfile/src/main/java/org/apache/tsfile/read/common/block/column/DoubleColumn.java index 6042b4715..5047028ac 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/DoubleColumn.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/common/block/column/DoubleColumn.java @@ -17,18 +17,20 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.common.block.column; +package org.apache.tsfile.read.common.block.column; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.utils.RamUsageEstimator; -import org.apache.iotdb.tsfile.utils.TsPrimitiveType; +import org.apache.tsfile.block.column.Column; +import org.apache.tsfile.block.column.ColumnEncoding; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.utils.RamUsageEstimator; +import org.apache.tsfile.utils.TsPrimitiveType; import java.util.Arrays; import java.util.Optional; -import static org.apache.iotdb.tsfile.read.common.block.column.ColumnUtil.checkValidRegion; -import static org.apache.iotdb.tsfile.utils.RamUsageEstimator.sizeOfBooleanArray; -import static org.apache.iotdb.tsfile.utils.RamUsageEstimator.sizeOfDoubleArray; +import static org.apache.tsfile.read.common.block.column.ColumnUtil.checkValidRegion; +import static org.apache.tsfile.utils.RamUsageEstimator.sizeOfBooleanArray; +import static org.apache.tsfile.utils.RamUsageEstimator.sizeOfDoubleArray; public class DoubleColumn implements Column { diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/DoubleColumnBuilder.java b/tsfile/src/main/java/org/apache/tsfile/read/common/block/column/DoubleColumnBuilder.java similarity index 88% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/DoubleColumnBuilder.java rename to tsfile/src/main/java/org/apache/tsfile/read/common/block/column/DoubleColumnBuilder.java index 68e47def0..7e02cf01c 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/DoubleColumnBuilder.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/common/block/column/DoubleColumnBuilder.java @@ -17,18 +17,21 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.common.block.column; +package org.apache.tsfile.read.common.block.column; -import org.apache.iotdb.tsfile.exception.write.UnSupportedDataTypeException; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.utils.RamUsageEstimator; -import org.apache.iotdb.tsfile.utils.TsPrimitiveType; +import org.apache.tsfile.block.column.Column; +import org.apache.tsfile.block.column.ColumnBuilder; +import org.apache.tsfile.block.column.ColumnBuilderStatus; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.utils.RamUsageEstimator; +import org.apache.tsfile.utils.TsPrimitiveType; +import org.apache.tsfile.write.UnSupportedDataTypeException; import java.util.Arrays; import static java.lang.Math.max; -import static org.apache.iotdb.tsfile.read.common.block.column.ColumnUtil.calculateBlockResetSize; -import static org.apache.iotdb.tsfile.utils.RamUsageEstimator.sizeOf; +import static org.apache.tsfile.read.common.block.column.ColumnUtil.calculateBlockResetSize; +import static org.apache.tsfile.utils.RamUsageEstimator.sizeOf; public class DoubleColumnBuilder implements ColumnBuilder { diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/FloatColumn.java b/tsfile/src/main/java/org/apache/tsfile/read/common/block/column/FloatColumn.java similarity index 89% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/FloatColumn.java rename to tsfile/src/main/java/org/apache/tsfile/read/common/block/column/FloatColumn.java index 003ad3fce..4050ad177 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/FloatColumn.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/common/block/column/FloatColumn.java @@ -17,18 +17,20 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.common.block.column; +package org.apache.tsfile.read.common.block.column; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.utils.RamUsageEstimator; -import org.apache.iotdb.tsfile.utils.TsPrimitiveType; +import org.apache.tsfile.block.column.Column; +import org.apache.tsfile.block.column.ColumnEncoding; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.utils.RamUsageEstimator; +import org.apache.tsfile.utils.TsPrimitiveType; import java.util.Arrays; import java.util.Optional; -import static org.apache.iotdb.tsfile.read.common.block.column.ColumnUtil.checkValidRegion; -import static org.apache.iotdb.tsfile.utils.RamUsageEstimator.sizeOfBooleanArray; -import static org.apache.iotdb.tsfile.utils.RamUsageEstimator.sizeOfFloatArray; +import static org.apache.tsfile.read.common.block.column.ColumnUtil.checkValidRegion; +import static org.apache.tsfile.utils.RamUsageEstimator.sizeOfBooleanArray; +import static org.apache.tsfile.utils.RamUsageEstimator.sizeOfFloatArray; public class FloatColumn implements Column { diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/FloatColumnBuilder.java b/tsfile/src/main/java/org/apache/tsfile/read/common/block/column/FloatColumnBuilder.java similarity index 88% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/FloatColumnBuilder.java rename to tsfile/src/main/java/org/apache/tsfile/read/common/block/column/FloatColumnBuilder.java index ac64bae26..bdb5e5937 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/FloatColumnBuilder.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/common/block/column/FloatColumnBuilder.java @@ -17,18 +17,21 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.common.block.column; +package org.apache.tsfile.read.common.block.column; -import org.apache.iotdb.tsfile.exception.write.UnSupportedDataTypeException; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.utils.RamUsageEstimator; -import org.apache.iotdb.tsfile.utils.TsPrimitiveType; +import org.apache.tsfile.block.column.Column; +import org.apache.tsfile.block.column.ColumnBuilder; +import org.apache.tsfile.block.column.ColumnBuilderStatus; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.utils.RamUsageEstimator; +import org.apache.tsfile.utils.TsPrimitiveType; +import org.apache.tsfile.write.UnSupportedDataTypeException; import java.util.Arrays; import static java.lang.Math.max; -import static org.apache.iotdb.tsfile.read.common.block.column.ColumnUtil.calculateBlockResetSize; -import static org.apache.iotdb.tsfile.utils.RamUsageEstimator.sizeOf; +import static org.apache.tsfile.read.common.block.column.ColumnUtil.calculateBlockResetSize; +import static org.apache.tsfile.utils.RamUsageEstimator.sizeOf; public class FloatColumnBuilder implements ColumnBuilder { diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/Int32ArrayColumnEncoder.java b/tsfile/src/main/java/org/apache/tsfile/read/common/block/column/Int32ArrayColumnEncoder.java similarity index 96% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/Int32ArrayColumnEncoder.java rename to tsfile/src/main/java/org/apache/tsfile/read/common/block/column/Int32ArrayColumnEncoder.java index 74486e7f9..748a054c3 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/Int32ArrayColumnEncoder.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/common/block/column/Int32ArrayColumnEncoder.java @@ -17,9 +17,10 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.common.block.column; +package org.apache.tsfile.read.common.block.column; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; +import org.apache.tsfile.block.column.Column; +import org.apache.tsfile.enums.TSDataType; import java.io.DataOutputStream; import java.io.IOException; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/Int64ArrayColumnEncoder.java b/tsfile/src/main/java/org/apache/tsfile/read/common/block/column/Int64ArrayColumnEncoder.java similarity index 96% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/Int64ArrayColumnEncoder.java rename to tsfile/src/main/java/org/apache/tsfile/read/common/block/column/Int64ArrayColumnEncoder.java index 7af3790bc..51490f06a 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/Int64ArrayColumnEncoder.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/common/block/column/Int64ArrayColumnEncoder.java @@ -17,9 +17,10 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.common.block.column; +package org.apache.tsfile.read.common.block.column; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; +import org.apache.tsfile.block.column.Column; +import org.apache.tsfile.enums.TSDataType; import java.io.DataOutputStream; import java.io.IOException; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/IntColumn.java b/tsfile/src/main/java/org/apache/tsfile/read/common/block/column/IntColumn.java similarity index 89% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/IntColumn.java rename to tsfile/src/main/java/org/apache/tsfile/read/common/block/column/IntColumn.java index 867cb37ee..8355f28dd 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/IntColumn.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/common/block/column/IntColumn.java @@ -17,18 +17,20 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.common.block.column; +package org.apache.tsfile.read.common.block.column; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.utils.RamUsageEstimator; -import org.apache.iotdb.tsfile.utils.TsPrimitiveType; +import org.apache.tsfile.block.column.Column; +import org.apache.tsfile.block.column.ColumnEncoding; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.utils.RamUsageEstimator; +import org.apache.tsfile.utils.TsPrimitiveType; import java.util.Arrays; import java.util.Optional; -import static org.apache.iotdb.tsfile.read.common.block.column.ColumnUtil.checkValidRegion; -import static org.apache.iotdb.tsfile.utils.RamUsageEstimator.sizeOfBooleanArray; -import static org.apache.iotdb.tsfile.utils.RamUsageEstimator.sizeOfIntArray; +import static org.apache.tsfile.read.common.block.column.ColumnUtil.checkValidRegion; +import static org.apache.tsfile.utils.RamUsageEstimator.sizeOfBooleanArray; +import static org.apache.tsfile.utils.RamUsageEstimator.sizeOfIntArray; public class IntColumn implements Column { diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/IntColumnBuilder.java b/tsfile/src/main/java/org/apache/tsfile/read/common/block/column/IntColumnBuilder.java similarity index 88% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/IntColumnBuilder.java rename to tsfile/src/main/java/org/apache/tsfile/read/common/block/column/IntColumnBuilder.java index a7a4253ae..e78eac1db 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/IntColumnBuilder.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/common/block/column/IntColumnBuilder.java @@ -17,18 +17,21 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.common.block.column; +package org.apache.tsfile.read.common.block.column; -import org.apache.iotdb.tsfile.exception.write.UnSupportedDataTypeException; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.utils.RamUsageEstimator; -import org.apache.iotdb.tsfile.utils.TsPrimitiveType; +import org.apache.tsfile.block.column.Column; +import org.apache.tsfile.block.column.ColumnBuilder; +import org.apache.tsfile.block.column.ColumnBuilderStatus; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.utils.RamUsageEstimator; +import org.apache.tsfile.utils.TsPrimitiveType; +import org.apache.tsfile.write.UnSupportedDataTypeException; import java.util.Arrays; import static java.lang.Math.max; -import static org.apache.iotdb.tsfile.read.common.block.column.ColumnUtil.calculateBlockResetSize; -import static org.apache.iotdb.tsfile.utils.RamUsageEstimator.sizeOf; +import static org.apache.tsfile.read.common.block.column.ColumnUtil.calculateBlockResetSize; +import static org.apache.tsfile.utils.RamUsageEstimator.sizeOf; public class IntColumnBuilder implements ColumnBuilder { diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/LongColumn.java b/tsfile/src/main/java/org/apache/tsfile/read/common/block/column/LongColumn.java similarity index 89% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/LongColumn.java rename to tsfile/src/main/java/org/apache/tsfile/read/common/block/column/LongColumn.java index 0cbacc7bd..59b8e016b 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/LongColumn.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/common/block/column/LongColumn.java @@ -17,18 +17,20 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.common.block.column; +package org.apache.tsfile.read.common.block.column; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.utils.RamUsageEstimator; -import org.apache.iotdb.tsfile.utils.TsPrimitiveType; +import org.apache.tsfile.block.column.Column; +import org.apache.tsfile.block.column.ColumnEncoding; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.utils.RamUsageEstimator; +import org.apache.tsfile.utils.TsPrimitiveType; import java.util.Arrays; import java.util.Optional; -import static org.apache.iotdb.tsfile.read.common.block.column.ColumnUtil.checkValidRegion; -import static org.apache.iotdb.tsfile.utils.RamUsageEstimator.sizeOfBooleanArray; -import static org.apache.iotdb.tsfile.utils.RamUsageEstimator.sizeOfLongArray; +import static org.apache.tsfile.read.common.block.column.ColumnUtil.checkValidRegion; +import static org.apache.tsfile.utils.RamUsageEstimator.sizeOfBooleanArray; +import static org.apache.tsfile.utils.RamUsageEstimator.sizeOfLongArray; public class LongColumn implements Column { diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/LongColumnBuilder.java b/tsfile/src/main/java/org/apache/tsfile/read/common/block/column/LongColumnBuilder.java similarity index 88% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/LongColumnBuilder.java rename to tsfile/src/main/java/org/apache/tsfile/read/common/block/column/LongColumnBuilder.java index b93b70c19..b0f4d952f 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/LongColumnBuilder.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/common/block/column/LongColumnBuilder.java @@ -17,18 +17,21 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.common.block.column; +package org.apache.tsfile.read.common.block.column; -import org.apache.iotdb.tsfile.exception.write.UnSupportedDataTypeException; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.utils.RamUsageEstimator; -import org.apache.iotdb.tsfile.utils.TsPrimitiveType; +import org.apache.tsfile.block.column.Column; +import org.apache.tsfile.block.column.ColumnBuilder; +import org.apache.tsfile.block.column.ColumnBuilderStatus; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.utils.RamUsageEstimator; +import org.apache.tsfile.utils.TsPrimitiveType; +import org.apache.tsfile.write.UnSupportedDataTypeException; import java.util.Arrays; import static java.lang.Math.max; -import static org.apache.iotdb.tsfile.read.common.block.column.ColumnUtil.calculateBlockResetSize; -import static org.apache.iotdb.tsfile.utils.RamUsageEstimator.sizeOf; +import static org.apache.tsfile.read.common.block.column.ColumnUtil.calculateBlockResetSize; +import static org.apache.tsfile.utils.RamUsageEstimator.sizeOf; public class LongColumnBuilder implements ColumnBuilder { diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/NullColumn.java b/tsfile/src/main/java/org/apache/tsfile/read/common/block/column/NullColumn.java similarity index 91% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/NullColumn.java rename to tsfile/src/main/java/org/apache/tsfile/read/common/block/column/NullColumn.java index dff65bc65..be21cfa6e 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/NullColumn.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/common/block/column/NullColumn.java @@ -17,13 +17,15 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.common.block.column; +package org.apache.tsfile.read.common.block.column; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.utils.RamUsageEstimator; +import org.apache.tsfile.block.column.Column; +import org.apache.tsfile.block.column.ColumnEncoding; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.utils.RamUsageEstimator; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.tsfile.read.common.block.column.ColumnUtil.checkValidRegion; +import static org.apache.tsfile.read.common.block.column.ColumnUtil.checkValidRegion; /** * This column is used to represent columns that only contain null values. But its positionCount has diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/RunLengthColumnEncoder.java b/tsfile/src/main/java/org/apache/tsfile/read/common/block/column/RunLengthColumnEncoder.java similarity index 91% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/RunLengthColumnEncoder.java rename to tsfile/src/main/java/org/apache/tsfile/read/common/block/column/RunLengthColumnEncoder.java index 9ee0665e3..f3339d9a9 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/RunLengthColumnEncoder.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/common/block/column/RunLengthColumnEncoder.java @@ -17,9 +17,11 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.common.block.column; +package org.apache.tsfile.read.common.block.column; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; +import org.apache.tsfile.block.column.Column; +import org.apache.tsfile.block.column.ColumnEncoding; +import org.apache.tsfile.enums.TSDataType; import java.io.DataOutputStream; import java.io.IOException; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/RunLengthEncodedColumn.java b/tsfile/src/main/java/org/apache/tsfile/read/common/block/column/RunLengthEncodedColumn.java similarity index 91% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/RunLengthEncodedColumn.java rename to tsfile/src/main/java/org/apache/tsfile/read/common/block/column/RunLengthEncodedColumn.java index 8db220928..dbca629fe 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/RunLengthEncodedColumn.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/common/block/column/RunLengthEncodedColumn.java @@ -17,18 +17,19 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.common.block.column; +package org.apache.tsfile.read.common.block.column; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.utils.Binary; -import org.apache.iotdb.tsfile.utils.RamUsageEstimator; -import org.apache.iotdb.tsfile.utils.TsPrimitiveType; +import org.apache.tsfile.block.column.Column; +import org.apache.tsfile.block.column.ColumnEncoding; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.utils.Binary; +import org.apache.tsfile.utils.RamUsageEstimator; +import org.apache.tsfile.utils.TsPrimitiveType; import java.util.Arrays; -import static java.lang.String.format; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.tsfile.read.common.block.column.ColumnUtil.checkValidRegion; +import static org.apache.tsfile.read.common.block.column.ColumnUtil.checkValidRegion; public class RunLengthEncodedColumn implements Column { @@ -42,7 +43,7 @@ public RunLengthEncodedColumn(Column value, int positionCount) { requireNonNull(value, "value is null"); if (value.getPositionCount() != 1) { throw new IllegalArgumentException( - format( + String.format( "Expected value to contain a single position but has %s positions", value.getPositionCount())); } diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/TimeColumn.java b/tsfile/src/main/java/org/apache/tsfile/read/common/block/column/TimeColumn.java similarity index 89% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/TimeColumn.java rename to tsfile/src/main/java/org/apache/tsfile/read/common/block/column/TimeColumn.java index a18d5fcf3..a37f011b7 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/TimeColumn.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/common/block/column/TimeColumn.java @@ -17,13 +17,14 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.common.block.column; +package org.apache.tsfile.read.common.block.column; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.utils.RamUsageEstimator; +import org.apache.tsfile.block.column.Column; +import org.apache.tsfile.block.column.ColumnEncoding; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.utils.RamUsageEstimator; -import static org.apache.iotdb.tsfile.read.common.block.column.ColumnUtil.checkValidRegion; -import static org.apache.iotdb.tsfile.utils.RamUsageEstimator.sizeOfLongArray; +import static org.apache.tsfile.utils.RamUsageEstimator.sizeOfLongArray; public class TimeColumn implements Column { @@ -111,7 +112,7 @@ public long getRetainedSizeInBytes() { @Override public Column getRegion(int positionOffset, int length) { - checkValidRegion(getPositionCount(), positionOffset, length); + ColumnUtil.checkValidRegion(getPositionCount(), positionOffset, length); return new TimeColumn(positionOffset + arrayOffset, length, values); } diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/TimeColumnBuilder.java b/tsfile/src/main/java/org/apache/tsfile/read/common/block/column/TimeColumnBuilder.java similarity index 88% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/TimeColumnBuilder.java rename to tsfile/src/main/java/org/apache/tsfile/read/common/block/column/TimeColumnBuilder.java index fa1988d29..53d6fdfd0 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/TimeColumnBuilder.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/common/block/column/TimeColumnBuilder.java @@ -17,17 +17,20 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.common.block.column; +package org.apache.tsfile.read.common.block.column; -import org.apache.iotdb.tsfile.exception.write.UnSupportedDataTypeException; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.utils.RamUsageEstimator; +import org.apache.tsfile.block.column.Column; +import org.apache.tsfile.block.column.ColumnBuilder; +import org.apache.tsfile.block.column.ColumnBuilderStatus; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.utils.RamUsageEstimator; +import org.apache.tsfile.write.UnSupportedDataTypeException; import java.util.Arrays; import static java.lang.Math.max; -import static org.apache.iotdb.tsfile.read.common.block.column.ColumnUtil.calculateBlockResetSize; -import static org.apache.iotdb.tsfile.utils.RamUsageEstimator.sizeOf; +import static org.apache.tsfile.read.common.block.column.ColumnUtil.calculateBlockResetSize; +import static org.apache.tsfile.utils.RamUsageEstimator.sizeOf; public class TimeColumnBuilder implements ColumnBuilder { diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/TsBlockSerde.java b/tsfile/src/main/java/org/apache/tsfile/read/common/block/column/TsBlockSerde.java similarity index 94% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/TsBlockSerde.java rename to tsfile/src/main/java/org/apache/tsfile/read/common/block/column/TsBlockSerde.java index 2faf4d0a8..0ef002567 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/TsBlockSerde.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/common/block/column/TsBlockSerde.java @@ -17,10 +17,12 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.common.block.column; +package org.apache.tsfile.read.common.block.column; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.read.common.block.TsBlock; +import org.apache.tsfile.block.column.Column; +import org.apache.tsfile.block.column.ColumnEncoding; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.read.common.block.TsBlock; import java.io.ByteArrayOutputStream; import java.io.DataOutputStream; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/parser/PathNodesGenerator.java b/tsfile/src/main/java/org/apache/tsfile/read/common/parser/PathNodesGenerator.java similarity index 96% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/parser/PathNodesGenerator.java rename to tsfile/src/main/java/org/apache/tsfile/read/common/parser/PathNodesGenerator.java index 7d62a62ea..1d2d14ae5 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/parser/PathNodesGenerator.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/common/parser/PathNodesGenerator.java @@ -17,9 +17,11 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.common.parser; +package org.apache.tsfile.read.common.parser; -import org.apache.iotdb.tsfile.exception.PathParseException; +import org.apache.tsfile.exception.PathParseException; +import org.apache.tsfile.parser.PathLexer; +import org.apache.tsfile.parser.PathParser; import org.antlr.v4.runtime.CharStream; import org.antlr.v4.runtime.CharStreams; @@ -27,8 +29,6 @@ import org.antlr.v4.runtime.atn.PredictionMode; import org.antlr.v4.runtime.misc.ParseCancellationException; import org.antlr.v4.runtime.tree.ParseTree; -import org.apache.tsfile.parser.PathLexer; -import org.apache.tsfile.parser.PathParser; /** convert String path to String[] nodes * */ public class PathNodesGenerator { diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/parser/PathParseError.java b/tsfile/src/main/java/org/apache/tsfile/read/common/parser/PathParseError.java similarity index 97% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/parser/PathParseError.java rename to tsfile/src/main/java/org/apache/tsfile/read/common/parser/PathParseError.java index f99912dde..f214810ae 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/parser/PathParseError.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/common/parser/PathParseError.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.common.parser; +package org.apache.tsfile.read.common.parser; import org.antlr.v4.runtime.BaseErrorListener; import org.antlr.v4.runtime.Parser; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/parser/PathVisitor.java b/tsfile/src/main/java/org/apache/tsfile/read/common/parser/PathVisitor.java similarity index 96% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/parser/PathVisitor.java rename to tsfile/src/main/java/org/apache/tsfile/read/common/parser/PathVisitor.java index 0c36f7a0d..69ca31746 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/parser/PathVisitor.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/common/parser/PathVisitor.java @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.common.parser; +package org.apache.tsfile.read.common.parser; -import org.apache.iotdb.tsfile.common.constant.TsFileConstant; - -import org.apache.commons.lang3.math.NumberUtils; +import org.apache.tsfile.common.constant.TsFileConstant; import org.apache.tsfile.parser.PathParser; import org.apache.tsfile.parser.PathParser.NodeNameContext; import org.apache.tsfile.parser.PathParserBaseVisitor; +import org.apache.commons.lang3.math.NumberUtils; + import java.util.List; public class PathVisitor extends PathParserBaseVisitor { diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/type/BinaryType.java b/tsfile/src/main/java/org/apache/tsfile/read/common/type/BinaryType.java similarity index 82% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/type/BinaryType.java rename to tsfile/src/main/java/org/apache/tsfile/read/common/type/BinaryType.java index d249a94b2..bcbd2a0b9 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/type/BinaryType.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/common/type/BinaryType.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.common.type; +package org.apache.tsfile.read.common.type; -import org.apache.iotdb.tsfile.read.common.block.column.BinaryColumnBuilder; -import org.apache.iotdb.tsfile.read.common.block.column.Column; -import org.apache.iotdb.tsfile.read.common.block.column.ColumnBuilder; -import org.apache.iotdb.tsfile.utils.Binary; +import org.apache.tsfile.block.column.Column; +import org.apache.tsfile.block.column.ColumnBuilder; +import org.apache.tsfile.read.common.block.column.BinaryColumnBuilder; +import org.apache.tsfile.utils.Binary; public class BinaryType implements Type { private static final BinaryType INSTANCE = new BinaryType(); diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/type/BooleanType.java b/tsfile/src/main/java/org/apache/tsfile/read/common/type/BooleanType.java similarity index 84% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/type/BooleanType.java rename to tsfile/src/main/java/org/apache/tsfile/read/common/type/BooleanType.java index 1f48a3fca..67cf86cca 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/type/BooleanType.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/common/type/BooleanType.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.common.type; +package org.apache.tsfile.read.common.type; -import org.apache.iotdb.tsfile.read.common.block.column.BooleanColumnBuilder; -import org.apache.iotdb.tsfile.read.common.block.column.Column; -import org.apache.iotdb.tsfile.read.common.block.column.ColumnBuilder; +import org.apache.tsfile.block.column.Column; +import org.apache.tsfile.block.column.ColumnBuilder; +import org.apache.tsfile.read.common.block.column.BooleanColumnBuilder; public class BooleanType implements Type { diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/type/DoubleType.java b/tsfile/src/main/java/org/apache/tsfile/read/common/type/DoubleType.java similarity index 89% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/type/DoubleType.java rename to tsfile/src/main/java/org/apache/tsfile/read/common/type/DoubleType.java index eca862618..317dfd96a 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/type/DoubleType.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/common/type/DoubleType.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.common.type; +package org.apache.tsfile.read.common.type; -import org.apache.iotdb.tsfile.read.common.block.column.Column; -import org.apache.iotdb.tsfile.read.common.block.column.ColumnBuilder; -import org.apache.iotdb.tsfile.read.common.block.column.DoubleColumnBuilder; +import org.apache.tsfile.block.column.Column; +import org.apache.tsfile.block.column.ColumnBuilder; +import org.apache.tsfile.read.common.block.column.DoubleColumnBuilder; public class DoubleType implements Type { diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/type/FloatType.java b/tsfile/src/main/java/org/apache/tsfile/read/common/type/FloatType.java similarity index 88% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/type/FloatType.java rename to tsfile/src/main/java/org/apache/tsfile/read/common/type/FloatType.java index 5f93fb53e..51e7e5b23 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/type/FloatType.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/common/type/FloatType.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.common.type; +package org.apache.tsfile.read.common.type; -import org.apache.iotdb.tsfile.read.common.block.column.Column; -import org.apache.iotdb.tsfile.read.common.block.column.ColumnBuilder; -import org.apache.iotdb.tsfile.read.common.block.column.FloatColumnBuilder; +import org.apache.tsfile.block.column.Column; +import org.apache.tsfile.block.column.ColumnBuilder; +import org.apache.tsfile.read.common.block.column.FloatColumnBuilder; public class FloatType implements Type { diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/type/IntType.java b/tsfile/src/main/java/org/apache/tsfile/read/common/type/IntType.java similarity index 88% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/type/IntType.java rename to tsfile/src/main/java/org/apache/tsfile/read/common/type/IntType.java index 0b90092ec..1cead88dd 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/type/IntType.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/common/type/IntType.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.common.type; +package org.apache.tsfile.read.common.type; -import org.apache.iotdb.tsfile.read.common.block.column.Column; -import org.apache.iotdb.tsfile.read.common.block.column.ColumnBuilder; -import org.apache.iotdb.tsfile.read.common.block.column.IntColumnBuilder; +import org.apache.tsfile.block.column.Column; +import org.apache.tsfile.block.column.ColumnBuilder; +import org.apache.tsfile.read.common.block.column.IntColumnBuilder; public class IntType implements Type { diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/type/LongType.java b/tsfile/src/main/java/org/apache/tsfile/read/common/type/LongType.java similarity index 88% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/type/LongType.java rename to tsfile/src/main/java/org/apache/tsfile/read/common/type/LongType.java index 451bd0f26..7be7b792c 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/type/LongType.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/common/type/LongType.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.common.type; +package org.apache.tsfile.read.common.type; -import org.apache.iotdb.tsfile.read.common.block.column.Column; -import org.apache.iotdb.tsfile.read.common.block.column.ColumnBuilder; -import org.apache.iotdb.tsfile.read.common.block.column.LongColumnBuilder; +import org.apache.tsfile.block.column.Column; +import org.apache.tsfile.block.column.ColumnBuilder; +import org.apache.tsfile.read.common.block.column.LongColumnBuilder; public class LongType implements Type { diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/type/Type.java b/tsfile/src/main/java/org/apache/tsfile/read/common/type/Type.java similarity index 93% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/type/Type.java rename to tsfile/src/main/java/org/apache/tsfile/read/common/type/Type.java index e2e6a5a0b..5e5ed501a 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/type/Type.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/common/type/Type.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.common.type; +package org.apache.tsfile.read.common.type; -import org.apache.iotdb.tsfile.read.common.block.column.Column; -import org.apache.iotdb.tsfile.read.common.block.column.ColumnBuilder; -import org.apache.iotdb.tsfile.utils.Binary; +import org.apache.tsfile.block.column.Column; +import org.apache.tsfile.block.column.ColumnBuilder; +import org.apache.tsfile.utils.Binary; public interface Type { diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/type/TypeEnum.java b/tsfile/src/main/java/org/apache/tsfile/read/common/type/TypeEnum.java similarity index 94% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/type/TypeEnum.java rename to tsfile/src/main/java/org/apache/tsfile/read/common/type/TypeEnum.java index 83b91495a..5a4489de8 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/type/TypeEnum.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/common/type/TypeEnum.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.common.type; +package org.apache.tsfile.read.common.type; public enum TypeEnum { INT32, diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/type/TypeFactory.java b/tsfile/src/main/java/org/apache/tsfile/read/common/type/TypeFactory.java similarity index 92% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/type/TypeFactory.java rename to tsfile/src/main/java/org/apache/tsfile/read/common/type/TypeFactory.java index ed52a9fef..622822809 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/type/TypeFactory.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/common/type/TypeFactory.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.common.type; +package org.apache.tsfile.read.common.type; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; +import org.apache.tsfile.enums.TSDataType; public class TypeFactory { diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/controller/CachedChunkLoaderImpl.java b/tsfile/src/main/java/org/apache/tsfile/read/controller/CachedChunkLoaderImpl.java similarity index 86% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/controller/CachedChunkLoaderImpl.java rename to tsfile/src/main/java/org/apache/tsfile/read/controller/CachedChunkLoaderImpl.java index 15c5be752..89d66c68e 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/controller/CachedChunkLoaderImpl.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/controller/CachedChunkLoaderImpl.java @@ -17,18 +17,18 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.controller; - -import org.apache.iotdb.tsfile.common.cache.LRUCache; -import org.apache.iotdb.tsfile.file.metadata.ChunkMetadata; -import org.apache.iotdb.tsfile.file.metadata.IChunkMetadata; -import org.apache.iotdb.tsfile.file.metadata.statistics.Statistics; -import org.apache.iotdb.tsfile.read.TsFileSequenceReader; -import org.apache.iotdb.tsfile.read.common.Chunk; -import org.apache.iotdb.tsfile.read.common.TimeRange; -import org.apache.iotdb.tsfile.read.filter.basic.Filter; -import org.apache.iotdb.tsfile.read.reader.IChunkReader; -import org.apache.iotdb.tsfile.read.reader.chunk.ChunkReader; +package org.apache.tsfile.read.controller; + +import org.apache.tsfile.common.cache.LRUCache; +import org.apache.tsfile.file.metadata.ChunkMetadata; +import org.apache.tsfile.file.metadata.IChunkMetadata; +import org.apache.tsfile.file.metadata.statistics.Statistics; +import org.apache.tsfile.read.TsFileSequenceReader; +import org.apache.tsfile.read.common.Chunk; +import org.apache.tsfile.read.common.TimeRange; +import org.apache.tsfile.read.filter.basic.Filter; +import org.apache.tsfile.read.reader.IChunkReader; +import org.apache.tsfile.read.reader.chunk.ChunkReader; import java.io.IOException; import java.io.Serializable; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/controller/IChunkLoader.java b/tsfile/src/main/java/org/apache/tsfile/read/controller/IChunkLoader.java similarity index 77% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/controller/IChunkLoader.java rename to tsfile/src/main/java/org/apache/tsfile/read/controller/IChunkLoader.java index be8da0773..8a9ac6168 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/controller/IChunkLoader.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/controller/IChunkLoader.java @@ -17,13 +17,13 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.controller; +package org.apache.tsfile.read.controller; -import org.apache.iotdb.tsfile.file.metadata.ChunkMetadata; -import org.apache.iotdb.tsfile.file.metadata.IChunkMetadata; -import org.apache.iotdb.tsfile.read.common.Chunk; -import org.apache.iotdb.tsfile.read.filter.basic.Filter; -import org.apache.iotdb.tsfile.read.reader.IChunkReader; +import org.apache.tsfile.file.metadata.ChunkMetadata; +import org.apache.tsfile.file.metadata.IChunkMetadata; +import org.apache.tsfile.read.common.Chunk; +import org.apache.tsfile.read.filter.basic.Filter; +import org.apache.tsfile.read.reader.IChunkReader; import java.io.IOException; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/controller/IChunkMetadataLoader.java b/tsfile/src/main/java/org/apache/tsfile/read/controller/IChunkMetadataLoader.java similarity index 85% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/controller/IChunkMetadataLoader.java rename to tsfile/src/main/java/org/apache/tsfile/read/controller/IChunkMetadataLoader.java index 5a43921b8..4512a6d4d 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/controller/IChunkMetadataLoader.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/controller/IChunkMetadataLoader.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.controller; +package org.apache.tsfile.read.controller; -import org.apache.iotdb.tsfile.file.metadata.IChunkMetadata; -import org.apache.iotdb.tsfile.file.metadata.ITimeSeriesMetadata; +import org.apache.tsfile.file.metadata.IChunkMetadata; +import org.apache.tsfile.file.metadata.ITimeSeriesMetadata; import java.util.List; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/controller/IMetadataQuerier.java b/tsfile/src/main/java/org/apache/tsfile/read/controller/IMetadataQuerier.java similarity index 84% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/controller/IMetadataQuerier.java rename to tsfile/src/main/java/org/apache/tsfile/read/controller/IMetadataQuerier.java index d3f1c9cf6..3aa63a6b5 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/controller/IMetadataQuerier.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/controller/IMetadataQuerier.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.controller; +package org.apache.tsfile.read.controller; -import org.apache.iotdb.tsfile.exception.write.NoMeasurementException; -import org.apache.iotdb.tsfile.file.metadata.IChunkMetadata; -import org.apache.iotdb.tsfile.file.metadata.TsFileMetadata; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.read.common.Path; -import org.apache.iotdb.tsfile.read.common.TimeRange; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.exception.write.NoMeasurementException; +import org.apache.tsfile.file.metadata.IChunkMetadata; +import org.apache.tsfile.file.metadata.TsFileMetadata; +import org.apache.tsfile.read.common.Path; +import org.apache.tsfile.read.common.TimeRange; import java.io.IOException; import java.util.List; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/controller/MetadataQuerierByFileImpl.java b/tsfile/src/main/java/org/apache/tsfile/read/controller/MetadataQuerierByFileImpl.java similarity index 92% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/controller/MetadataQuerierByFileImpl.java rename to tsfile/src/main/java/org/apache/tsfile/read/controller/MetadataQuerierByFileImpl.java index a86364c24..8b04507c9 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/controller/MetadataQuerierByFileImpl.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/controller/MetadataQuerierByFileImpl.java @@ -17,20 +17,20 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.controller; +package org.apache.tsfile.read.controller; -import org.apache.iotdb.tsfile.common.cache.LRUCache; -import org.apache.iotdb.tsfile.file.metadata.AlignedTimeSeriesMetadata; -import org.apache.iotdb.tsfile.file.metadata.ChunkMetadata; -import org.apache.iotdb.tsfile.file.metadata.IChunkMetadata; -import org.apache.iotdb.tsfile.file.metadata.ITimeSeriesMetadata; -import org.apache.iotdb.tsfile.file.metadata.TimeseriesMetadata; -import org.apache.iotdb.tsfile.file.metadata.TsFileMetadata; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.read.TsFileSequenceReader; -import org.apache.iotdb.tsfile.read.TsFileSequenceReader.LocateStatus; -import org.apache.iotdb.tsfile.read.common.Path; -import org.apache.iotdb.tsfile.read.common.TimeRange; +import org.apache.tsfile.common.cache.LRUCache; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.file.metadata.AlignedTimeSeriesMetadata; +import org.apache.tsfile.file.metadata.ChunkMetadata; +import org.apache.tsfile.file.metadata.IChunkMetadata; +import org.apache.tsfile.file.metadata.ITimeSeriesMetadata; +import org.apache.tsfile.file.metadata.TimeseriesMetadata; +import org.apache.tsfile.file.metadata.TsFileMetadata; +import org.apache.tsfile.read.TsFileSequenceReader; +import org.apache.tsfile.read.TsFileSequenceReader.LocateStatus; +import org.apache.tsfile.read.common.Path; +import org.apache.tsfile.read.common.TimeRange; import java.io.IOException; import java.util.ArrayList; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/expression/ExpressionType.java b/tsfile/src/main/java/org/apache/tsfile/read/expression/ExpressionType.java similarity index 96% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/expression/ExpressionType.java rename to tsfile/src/main/java/org/apache/tsfile/read/expression/ExpressionType.java index ad4ef2cda..79e6955e5 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/expression/ExpressionType.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/expression/ExpressionType.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.expression; +package org.apache.tsfile.read.expression; public enum ExpressionType { diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/expression/IBinaryExpression.java b/tsfile/src/main/java/org/apache/tsfile/read/expression/IBinaryExpression.java similarity index 95% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/expression/IBinaryExpression.java rename to tsfile/src/main/java/org/apache/tsfile/read/expression/IBinaryExpression.java index a1198a6bf..c56fa3ade 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/expression/IBinaryExpression.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/expression/IBinaryExpression.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.expression; +package org.apache.tsfile.read.expression; public interface IBinaryExpression extends IExpression { diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/expression/IExpression.java b/tsfile/src/main/java/org/apache/tsfile/read/expression/IExpression.java similarity index 95% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/expression/IExpression.java rename to tsfile/src/main/java/org/apache/tsfile/read/expression/IExpression.java index 6cfd38144..29668331e 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/expression/IExpression.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/expression/IExpression.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.expression; +package org.apache.tsfile.read.expression; import java.io.Serializable; import java.nio.ByteBuffer; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/expression/IUnaryExpression.java b/tsfile/src/main/java/org/apache/tsfile/read/expression/IUnaryExpression.java similarity index 89% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/expression/IUnaryExpression.java rename to tsfile/src/main/java/org/apache/tsfile/read/expression/IUnaryExpression.java index e206e798f..1b6639e9b 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/expression/IUnaryExpression.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/expression/IUnaryExpression.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.expression; +package org.apache.tsfile.read.expression; -import org.apache.iotdb.tsfile.read.filter.basic.Filter; +import org.apache.tsfile.read.filter.basic.Filter; public interface IUnaryExpression extends IExpression { diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/expression/QueryExpression.java b/tsfile/src/main/java/org/apache/tsfile/read/expression/QueryExpression.java similarity index 94% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/expression/QueryExpression.java rename to tsfile/src/main/java/org/apache/tsfile/read/expression/QueryExpression.java index 8f647923c..16091e62a 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/expression/QueryExpression.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/expression/QueryExpression.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.expression; +package org.apache.tsfile.read.expression; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.read.common.Path; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.read.common.Path; import java.io.Serializable; import java.util.ArrayList; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/expression/impl/BinaryExpression.java b/tsfile/src/main/java/org/apache/tsfile/read/expression/impl/BinaryExpression.java similarity index 93% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/expression/impl/BinaryExpression.java rename to tsfile/src/main/java/org/apache/tsfile/read/expression/impl/BinaryExpression.java index d98fcaba3..c6d70355f 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/expression/impl/BinaryExpression.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/expression/impl/BinaryExpression.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.expression.impl; +package org.apache.tsfile.read.expression.impl; -import org.apache.iotdb.tsfile.read.expression.ExpressionType; -import org.apache.iotdb.tsfile.read.expression.IBinaryExpression; -import org.apache.iotdb.tsfile.read.expression.IExpression; -import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils; +import org.apache.tsfile.read.expression.ExpressionType; +import org.apache.tsfile.read.expression.IBinaryExpression; +import org.apache.tsfile.read.expression.IExpression; +import org.apache.tsfile.utils.ReadWriteIOUtils; import java.io.Serializable; import java.nio.ByteBuffer; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/expression/impl/GlobalTimeExpression.java b/tsfile/src/main/java/org/apache/tsfile/read/expression/impl/GlobalTimeExpression.java similarity index 86% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/expression/impl/GlobalTimeExpression.java rename to tsfile/src/main/java/org/apache/tsfile/read/expression/impl/GlobalTimeExpression.java index 63853da9c..2bc8f4e2c 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/expression/impl/GlobalTimeExpression.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/expression/impl/GlobalTimeExpression.java @@ -17,13 +17,13 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.expression.impl; +package org.apache.tsfile.read.expression.impl; -import org.apache.iotdb.tsfile.read.expression.ExpressionType; -import org.apache.iotdb.tsfile.read.expression.IExpression; -import org.apache.iotdb.tsfile.read.expression.IUnaryExpression; -import org.apache.iotdb.tsfile.read.filter.basic.Filter; -import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils; +import org.apache.tsfile.read.expression.ExpressionType; +import org.apache.tsfile.read.expression.IExpression; +import org.apache.tsfile.read.expression.IUnaryExpression; +import org.apache.tsfile.read.filter.basic.Filter; +import org.apache.tsfile.utils.ReadWriteIOUtils; import java.io.IOException; import java.io.Serializable; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/expression/impl/SingleSeriesExpression.java b/tsfile/src/main/java/org/apache/tsfile/read/expression/impl/SingleSeriesExpression.java similarity index 86% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/expression/impl/SingleSeriesExpression.java rename to tsfile/src/main/java/org/apache/tsfile/read/expression/impl/SingleSeriesExpression.java index 2bdb2f9ac..e233a2fc9 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/expression/impl/SingleSeriesExpression.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/expression/impl/SingleSeriesExpression.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.expression.impl; - -import org.apache.iotdb.tsfile.read.common.Path; -import org.apache.iotdb.tsfile.read.expression.ExpressionType; -import org.apache.iotdb.tsfile.read.expression.IExpression; -import org.apache.iotdb.tsfile.read.expression.IUnaryExpression; -import org.apache.iotdb.tsfile.read.filter.basic.Filter; -import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils; +package org.apache.tsfile.read.expression.impl; + +import org.apache.tsfile.read.common.Path; +import org.apache.tsfile.read.expression.ExpressionType; +import org.apache.tsfile.read.expression.IExpression; +import org.apache.tsfile.read.expression.IUnaryExpression; +import org.apache.tsfile.read.filter.basic.Filter; +import org.apache.tsfile.utils.ReadWriteIOUtils; import java.io.IOException; import java.io.Serializable; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/expression/util/ExpressionOptimizer.java b/tsfile/src/main/java/org/apache/tsfile/read/expression/util/ExpressionOptimizer.java similarity index 93% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/expression/util/ExpressionOptimizer.java rename to tsfile/src/main/java/org/apache/tsfile/read/expression/util/ExpressionOptimizer.java index accd871cc..6fa852a79 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/expression/util/ExpressionOptimizer.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/expression/util/ExpressionOptimizer.java @@ -17,19 +17,19 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.expression.util; - -import org.apache.iotdb.tsfile.exception.filter.QueryFilterOptimizationException; -import org.apache.iotdb.tsfile.read.common.Path; -import org.apache.iotdb.tsfile.read.expression.ExpressionType; -import org.apache.iotdb.tsfile.read.expression.IBinaryExpression; -import org.apache.iotdb.tsfile.read.expression.IExpression; -import org.apache.iotdb.tsfile.read.expression.IUnaryExpression; -import org.apache.iotdb.tsfile.read.expression.impl.BinaryExpression; -import org.apache.iotdb.tsfile.read.expression.impl.GlobalTimeExpression; -import org.apache.iotdb.tsfile.read.expression.impl.SingleSeriesExpression; -import org.apache.iotdb.tsfile.read.filter.basic.Filter; -import org.apache.iotdb.tsfile.read.filter.factory.FilterFactory; +package org.apache.tsfile.read.expression.util; + +import org.apache.tsfile.exception.filter.QueryFilterOptimizationException; +import org.apache.tsfile.read.common.Path; +import org.apache.tsfile.read.expression.ExpressionType; +import org.apache.tsfile.read.expression.IBinaryExpression; +import org.apache.tsfile.read.expression.IExpression; +import org.apache.tsfile.read.expression.IUnaryExpression; +import org.apache.tsfile.read.expression.impl.BinaryExpression; +import org.apache.tsfile.read.expression.impl.GlobalTimeExpression; +import org.apache.tsfile.read.expression.impl.SingleSeriesExpression; +import org.apache.tsfile.read.filter.basic.Filter; +import org.apache.tsfile.read.filter.factory.FilterFactory; import java.util.List; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/PredicateRemoveNotRewriter.java b/tsfile/src/main/java/org/apache/tsfile/read/filter/PredicateRemoveNotRewriter.java similarity index 81% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/PredicateRemoveNotRewriter.java rename to tsfile/src/main/java/org/apache/tsfile/read/filter/PredicateRemoveNotRewriter.java index 107f69735..16761b82d 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/PredicateRemoveNotRewriter.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/filter/PredicateRemoveNotRewriter.java @@ -17,13 +17,13 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.filter; +package org.apache.tsfile.read.filter; -import org.apache.iotdb.tsfile.read.filter.basic.Filter; -import org.apache.iotdb.tsfile.read.filter.factory.FilterFactory; -import org.apache.iotdb.tsfile.read.filter.operator.And; -import org.apache.iotdb.tsfile.read.filter.operator.Not; -import org.apache.iotdb.tsfile.read.filter.operator.Or; +import org.apache.tsfile.read.filter.basic.Filter; +import org.apache.tsfile.read.filter.factory.FilterFactory; +import org.apache.tsfile.read.filter.operator.And; +import org.apache.tsfile.read.filter.operator.Not; +import org.apache.tsfile.read.filter.operator.Or; public class PredicateRemoveNotRewriter { diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/basic/BinaryLogicalFilter.java b/tsfile/src/main/java/org/apache/tsfile/read/filter/basic/BinaryLogicalFilter.java similarity index 97% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/basic/BinaryLogicalFilter.java rename to tsfile/src/main/java/org/apache/tsfile/read/filter/basic/BinaryLogicalFilter.java index 8a9474043..1e55e6491 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/basic/BinaryLogicalFilter.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/filter/basic/BinaryLogicalFilter.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.filter.basic; +package org.apache.tsfile.read.filter.basic; import java.io.DataOutputStream; import java.io.IOException; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/basic/DisableStatisticsTimeFilter.java b/tsfile/src/main/java/org/apache/tsfile/read/filter/basic/DisableStatisticsTimeFilter.java similarity index 95% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/basic/DisableStatisticsTimeFilter.java rename to tsfile/src/main/java/org/apache/tsfile/read/filter/basic/DisableStatisticsTimeFilter.java index 78771155f..634956336 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/basic/DisableStatisticsTimeFilter.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/filter/basic/DisableStatisticsTimeFilter.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.filter.basic; +package org.apache.tsfile.read.filter.basic; public abstract class DisableStatisticsTimeFilter extends TimeFilter { diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/basic/DisableStatisticsValueFilter.java b/tsfile/src/main/java/org/apache/tsfile/read/filter/basic/DisableStatisticsValueFilter.java similarity index 91% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/basic/DisableStatisticsValueFilter.java rename to tsfile/src/main/java/org/apache/tsfile/read/filter/basic/DisableStatisticsValueFilter.java index 74e10b0f2..18b209456 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/basic/DisableStatisticsValueFilter.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/filter/basic/DisableStatisticsValueFilter.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.filter.basic; +package org.apache.tsfile.read.filter.basic; -import org.apache.iotdb.tsfile.file.metadata.statistics.Statistics; +import org.apache.tsfile.file.metadata.statistics.Statistics; import java.io.Serializable; import java.nio.ByteBuffer; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/basic/Filter.java b/tsfile/src/main/java/org/apache/tsfile/read/filter/basic/Filter.java similarity index 89% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/basic/Filter.java rename to tsfile/src/main/java/org/apache/tsfile/read/filter/basic/Filter.java index afa7cee63..1e392a6d5 100755 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/basic/Filter.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/filter/basic/Filter.java @@ -17,22 +17,22 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.filter.basic; - -import org.apache.iotdb.tsfile.file.metadata.IMetadata; -import org.apache.iotdb.tsfile.read.common.TimeRange; -import org.apache.iotdb.tsfile.read.common.block.TsBlock; -import org.apache.iotdb.tsfile.read.filter.factory.FilterFactory; -import org.apache.iotdb.tsfile.read.filter.factory.TimeFilterApi; -import org.apache.iotdb.tsfile.read.filter.factory.ValueFilterApi; -import org.apache.iotdb.tsfile.read.filter.operator.And; -import org.apache.iotdb.tsfile.read.filter.operator.GroupByFilter; -import org.apache.iotdb.tsfile.read.filter.operator.GroupByMonthFilter; -import org.apache.iotdb.tsfile.read.filter.operator.Not; -import org.apache.iotdb.tsfile.read.filter.operator.Or; -import org.apache.iotdb.tsfile.read.filter.operator.TimeFilterOperators; -import org.apache.iotdb.tsfile.read.filter.operator.ValueFilterOperators; -import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils; +package org.apache.tsfile.read.filter.basic; + +import org.apache.tsfile.file.metadata.IMetadata; +import org.apache.tsfile.read.common.TimeRange; +import org.apache.tsfile.read.common.block.TsBlock; +import org.apache.tsfile.read.filter.factory.FilterFactory; +import org.apache.tsfile.read.filter.factory.TimeFilterApi; +import org.apache.tsfile.read.filter.factory.ValueFilterApi; +import org.apache.tsfile.read.filter.operator.And; +import org.apache.tsfile.read.filter.operator.GroupByFilter; +import org.apache.tsfile.read.filter.operator.GroupByMonthFilter; +import org.apache.tsfile.read.filter.operator.Not; +import org.apache.tsfile.read.filter.operator.Or; +import org.apache.tsfile.read.filter.operator.TimeFilterOperators; +import org.apache.tsfile.read.filter.operator.ValueFilterOperators; +import org.apache.tsfile.utils.ReadWriteIOUtils; import java.io.ByteArrayOutputStream; import java.io.DataOutputStream; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/basic/OperatorType.java b/tsfile/src/main/java/org/apache/tsfile/read/filter/basic/OperatorType.java similarity index 97% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/basic/OperatorType.java rename to tsfile/src/main/java/org/apache/tsfile/read/filter/basic/OperatorType.java index 1a85faf40..a4689696c 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/basic/OperatorType.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/filter/basic/OperatorType.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.filter.basic; +package org.apache.tsfile.read.filter.basic; public enum OperatorType { // comparison diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/basic/TimeFilter.java b/tsfile/src/main/java/org/apache/tsfile/read/filter/basic/TimeFilter.java similarity index 89% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/basic/TimeFilter.java rename to tsfile/src/main/java/org/apache/tsfile/read/filter/basic/TimeFilter.java index 2ec7a589b..3031f487d 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/basic/TimeFilter.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/filter/basic/TimeFilter.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.filter.basic; +package org.apache.tsfile.read.filter.basic; -import org.apache.iotdb.tsfile.file.metadata.IMetadata; -import org.apache.iotdb.tsfile.file.metadata.statistics.Statistics; -import org.apache.iotdb.tsfile.read.common.block.TsBlock; +import org.apache.tsfile.file.metadata.IMetadata; +import org.apache.tsfile.file.metadata.statistics.Statistics; +import org.apache.tsfile.read.common.block.TsBlock; import java.io.Serializable; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/basic/ValueFilter.java b/tsfile/src/main/java/org/apache/tsfile/read/filter/basic/ValueFilter.java similarity index 90% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/basic/ValueFilter.java rename to tsfile/src/main/java/org/apache/tsfile/read/filter/basic/ValueFilter.java index 5952a9262..2fa8cba54 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/basic/ValueFilter.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/filter/basic/ValueFilter.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.filter.basic; - -import org.apache.iotdb.tsfile.file.metadata.IMetadata; -import org.apache.iotdb.tsfile.file.metadata.statistics.Statistics; -import org.apache.iotdb.tsfile.read.common.TimeRange; -import org.apache.iotdb.tsfile.read.common.block.TsBlock; -import org.apache.iotdb.tsfile.read.common.block.column.Column; -import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils; +package org.apache.tsfile.read.filter.basic; + +import org.apache.tsfile.block.column.Column; +import org.apache.tsfile.file.metadata.IMetadata; +import org.apache.tsfile.file.metadata.statistics.Statistics; +import org.apache.tsfile.read.common.TimeRange; +import org.apache.tsfile.read.common.block.TsBlock; +import org.apache.tsfile.utils.ReadWriteIOUtils; import java.io.DataOutputStream; import java.io.IOException; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/factory/FilterFactory.java b/tsfile/src/main/java/org/apache/tsfile/read/filter/factory/FilterFactory.java similarity index 81% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/factory/FilterFactory.java rename to tsfile/src/main/java/org/apache/tsfile/read/filter/factory/FilterFactory.java index 235467679..1fa9b4e01 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/factory/FilterFactory.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/filter/factory/FilterFactory.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.filter.factory; +package org.apache.tsfile.read.filter.factory; -import org.apache.iotdb.tsfile.read.filter.basic.Filter; -import org.apache.iotdb.tsfile.read.filter.operator.And; -import org.apache.iotdb.tsfile.read.filter.operator.Not; -import org.apache.iotdb.tsfile.read.filter.operator.Or; +import org.apache.tsfile.read.filter.basic.Filter; +import org.apache.tsfile.read.filter.operator.And; +import org.apache.tsfile.read.filter.operator.Not; +import org.apache.tsfile.read.filter.operator.Or; -import static org.apache.iotdb.tsfile.utils.Preconditions.checkArgument; +import static org.apache.tsfile.utils.Preconditions.checkArgument; public class FilterFactory { diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/factory/TimeFilterApi.java b/tsfile/src/main/java/org/apache/tsfile/read/filter/factory/TimeFilterApi.java similarity index 69% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/factory/TimeFilterApi.java rename to tsfile/src/main/java/org/apache/tsfile/read/filter/factory/TimeFilterApi.java index 1ab46a99a..ce9f61290 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/factory/TimeFilterApi.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/filter/factory/TimeFilterApi.java @@ -17,21 +17,21 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.filter.factory; - -import org.apache.iotdb.tsfile.read.filter.operator.GroupByFilter; -import org.apache.iotdb.tsfile.read.filter.operator.GroupByMonthFilter; -import org.apache.iotdb.tsfile.read.filter.operator.TimeFilterOperators.TimeBetweenAnd; -import org.apache.iotdb.tsfile.read.filter.operator.TimeFilterOperators.TimeEq; -import org.apache.iotdb.tsfile.read.filter.operator.TimeFilterOperators.TimeGt; -import org.apache.iotdb.tsfile.read.filter.operator.TimeFilterOperators.TimeGtEq; -import org.apache.iotdb.tsfile.read.filter.operator.TimeFilterOperators.TimeIn; -import org.apache.iotdb.tsfile.read.filter.operator.TimeFilterOperators.TimeLt; -import org.apache.iotdb.tsfile.read.filter.operator.TimeFilterOperators.TimeLtEq; -import org.apache.iotdb.tsfile.read.filter.operator.TimeFilterOperators.TimeNotBetweenAnd; -import org.apache.iotdb.tsfile.read.filter.operator.TimeFilterOperators.TimeNotEq; -import org.apache.iotdb.tsfile.read.filter.operator.TimeFilterOperators.TimeNotIn; -import org.apache.iotdb.tsfile.utils.TimeDuration; +package org.apache.tsfile.read.filter.factory; + +import org.apache.tsfile.read.filter.operator.GroupByFilter; +import org.apache.tsfile.read.filter.operator.GroupByMonthFilter; +import org.apache.tsfile.read.filter.operator.TimeFilterOperators.TimeBetweenAnd; +import org.apache.tsfile.read.filter.operator.TimeFilterOperators.TimeEq; +import org.apache.tsfile.read.filter.operator.TimeFilterOperators.TimeGt; +import org.apache.tsfile.read.filter.operator.TimeFilterOperators.TimeGtEq; +import org.apache.tsfile.read.filter.operator.TimeFilterOperators.TimeIn; +import org.apache.tsfile.read.filter.operator.TimeFilterOperators.TimeLt; +import org.apache.tsfile.read.filter.operator.TimeFilterOperators.TimeLtEq; +import org.apache.tsfile.read.filter.operator.TimeFilterOperators.TimeNotBetweenAnd; +import org.apache.tsfile.read.filter.operator.TimeFilterOperators.TimeNotEq; +import org.apache.tsfile.read.filter.operator.TimeFilterOperators.TimeNotIn; +import org.apache.tsfile.utils.TimeDuration; import java.util.Set; import java.util.TimeZone; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/factory/ValueFilterApi.java b/tsfile/src/main/java/org/apache/tsfile/read/filter/factory/ValueFilterApi.java similarity index 82% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/factory/ValueFilterApi.java rename to tsfile/src/main/java/org/apache/tsfile/read/filter/factory/ValueFilterApi.java index e2e64b0b7..fbed7326f 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/factory/ValueFilterApi.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/filter/factory/ValueFilterApi.java @@ -17,23 +17,23 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.filter.factory; - -import org.apache.iotdb.tsfile.read.filter.operator.ValueFilterOperators.ValueBetweenAnd; -import org.apache.iotdb.tsfile.read.filter.operator.ValueFilterOperators.ValueEq; -import org.apache.iotdb.tsfile.read.filter.operator.ValueFilterOperators.ValueGt; -import org.apache.iotdb.tsfile.read.filter.operator.ValueFilterOperators.ValueGtEq; -import org.apache.iotdb.tsfile.read.filter.operator.ValueFilterOperators.ValueIn; -import org.apache.iotdb.tsfile.read.filter.operator.ValueFilterOperators.ValueIsNotNull; -import org.apache.iotdb.tsfile.read.filter.operator.ValueFilterOperators.ValueIsNull; -import org.apache.iotdb.tsfile.read.filter.operator.ValueFilterOperators.ValueLt; -import org.apache.iotdb.tsfile.read.filter.operator.ValueFilterOperators.ValueLtEq; -import org.apache.iotdb.tsfile.read.filter.operator.ValueFilterOperators.ValueNotBetweenAnd; -import org.apache.iotdb.tsfile.read.filter.operator.ValueFilterOperators.ValueNotEq; -import org.apache.iotdb.tsfile.read.filter.operator.ValueFilterOperators.ValueNotIn; -import org.apache.iotdb.tsfile.read.filter.operator.ValueFilterOperators.ValueNotRegexp; -import org.apache.iotdb.tsfile.read.filter.operator.ValueFilterOperators.ValueRegexp; -import org.apache.iotdb.tsfile.utils.RegexUtils; +package org.apache.tsfile.read.filter.factory; + +import org.apache.tsfile.read.filter.operator.ValueFilterOperators.ValueBetweenAnd; +import org.apache.tsfile.read.filter.operator.ValueFilterOperators.ValueEq; +import org.apache.tsfile.read.filter.operator.ValueFilterOperators.ValueGt; +import org.apache.tsfile.read.filter.operator.ValueFilterOperators.ValueGtEq; +import org.apache.tsfile.read.filter.operator.ValueFilterOperators.ValueIn; +import org.apache.tsfile.read.filter.operator.ValueFilterOperators.ValueIsNotNull; +import org.apache.tsfile.read.filter.operator.ValueFilterOperators.ValueIsNull; +import org.apache.tsfile.read.filter.operator.ValueFilterOperators.ValueLt; +import org.apache.tsfile.read.filter.operator.ValueFilterOperators.ValueLtEq; +import org.apache.tsfile.read.filter.operator.ValueFilterOperators.ValueNotBetweenAnd; +import org.apache.tsfile.read.filter.operator.ValueFilterOperators.ValueNotEq; +import org.apache.tsfile.read.filter.operator.ValueFilterOperators.ValueNotIn; +import org.apache.tsfile.read.filter.operator.ValueFilterOperators.ValueNotRegexp; +import org.apache.tsfile.read.filter.operator.ValueFilterOperators.ValueRegexp; +import org.apache.tsfile.utils.RegexUtils; import java.util.Set; import java.util.regex.Pattern; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/operator/And.java b/tsfile/src/main/java/org/apache/tsfile/read/filter/operator/And.java similarity index 90% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/operator/And.java rename to tsfile/src/main/java/org/apache/tsfile/read/filter/operator/And.java index 64a183199..c946e13b8 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/operator/And.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/filter/operator/And.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.filter.operator; - -import org.apache.iotdb.tsfile.file.metadata.IMetadata; -import org.apache.iotdb.tsfile.read.common.TimeRange; -import org.apache.iotdb.tsfile.read.common.block.TsBlock; -import org.apache.iotdb.tsfile.read.filter.basic.BinaryLogicalFilter; -import org.apache.iotdb.tsfile.read.filter.basic.Filter; -import org.apache.iotdb.tsfile.read.filter.basic.OperatorType; +package org.apache.tsfile.read.filter.operator; + +import org.apache.tsfile.file.metadata.IMetadata; +import org.apache.tsfile.read.common.TimeRange; +import org.apache.tsfile.read.common.block.TsBlock; +import org.apache.tsfile.read.filter.basic.BinaryLogicalFilter; +import org.apache.tsfile.read.filter.basic.Filter; +import org.apache.tsfile.read.filter.basic.OperatorType; import java.nio.ByteBuffer; import java.util.ArrayList; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/operator/GroupByFilter.java b/tsfile/src/main/java/org/apache/tsfile/read/filter/operator/GroupByFilter.java similarity index 92% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/operator/GroupByFilter.java rename to tsfile/src/main/java/org/apache/tsfile/read/filter/operator/GroupByFilter.java index 81bb393f0..21081e0ed 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/operator/GroupByFilter.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/filter/operator/GroupByFilter.java @@ -17,13 +17,13 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.filter.operator; +package org.apache.tsfile.read.filter.operator; -import org.apache.iotdb.tsfile.read.common.TimeRange; -import org.apache.iotdb.tsfile.read.filter.basic.Filter; -import org.apache.iotdb.tsfile.read.filter.basic.OperatorType; -import org.apache.iotdb.tsfile.read.filter.basic.TimeFilter; -import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils; +import org.apache.tsfile.read.common.TimeRange; +import org.apache.tsfile.read.filter.basic.Filter; +import org.apache.tsfile.read.filter.basic.OperatorType; +import org.apache.tsfile.read.filter.basic.TimeFilter; +import org.apache.tsfile.utils.ReadWriteIOUtils; import java.io.DataOutputStream; import java.io.IOException; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/operator/GroupByMonthFilter.java b/tsfile/src/main/java/org/apache/tsfile/read/filter/operator/GroupByMonthFilter.java similarity index 94% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/operator/GroupByMonthFilter.java rename to tsfile/src/main/java/org/apache/tsfile/read/filter/operator/GroupByMonthFilter.java index 58cda9896..3cef1724b 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/operator/GroupByMonthFilter.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/filter/operator/GroupByMonthFilter.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.filter.operator; +package org.apache.tsfile.read.filter.operator; -import org.apache.iotdb.tsfile.read.filter.basic.Filter; -import org.apache.iotdb.tsfile.read.filter.basic.OperatorType; -import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils; -import org.apache.iotdb.tsfile.utils.TimeDuration; +import org.apache.tsfile.read.filter.basic.Filter; +import org.apache.tsfile.read.filter.basic.OperatorType; +import org.apache.tsfile.utils.ReadWriteIOUtils; +import org.apache.tsfile.utils.TimeDuration; import java.io.DataOutputStream; import java.io.IOException; @@ -33,8 +33,8 @@ import java.util.TimeZone; import java.util.concurrent.TimeUnit; -import static org.apache.iotdb.tsfile.utils.TimeDuration.calcPositiveIntervalByMonth; -import static org.apache.iotdb.tsfile.utils.TimeDuration.getConsecutiveTimesIntervalByMonth; +import static org.apache.tsfile.utils.TimeDuration.calcPositiveIntervalByMonth; +import static org.apache.tsfile.utils.TimeDuration.getConsecutiveTimesIntervalByMonth; /** * GroupByMonthFilter is used to handle natural month slidingStep and interval by generating diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/operator/Not.java b/tsfile/src/main/java/org/apache/tsfile/read/filter/operator/Not.java similarity index 92% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/operator/Not.java rename to tsfile/src/main/java/org/apache/tsfile/read/filter/operator/Not.java index 71349bac8..c89aa59c0 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/operator/Not.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/filter/operator/Not.java @@ -17,13 +17,13 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.filter.operator; +package org.apache.tsfile.read.filter.operator; -import org.apache.iotdb.tsfile.file.metadata.IMetadata; -import org.apache.iotdb.tsfile.read.common.TimeRange; -import org.apache.iotdb.tsfile.read.common.block.TsBlock; -import org.apache.iotdb.tsfile.read.filter.basic.Filter; -import org.apache.iotdb.tsfile.read.filter.basic.OperatorType; +import org.apache.tsfile.file.metadata.IMetadata; +import org.apache.tsfile.read.common.TimeRange; +import org.apache.tsfile.read.common.block.TsBlock; +import org.apache.tsfile.read.filter.basic.Filter; +import org.apache.tsfile.read.filter.basic.OperatorType; import java.io.DataOutputStream; import java.io.IOException; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/operator/Or.java b/tsfile/src/main/java/org/apache/tsfile/read/filter/operator/Or.java similarity index 92% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/operator/Or.java rename to tsfile/src/main/java/org/apache/tsfile/read/filter/operator/Or.java index 7bea06bba..fb65175a1 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/operator/Or.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/filter/operator/Or.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.filter.operator; - -import org.apache.iotdb.tsfile.file.metadata.IMetadata; -import org.apache.iotdb.tsfile.read.common.TimeRange; -import org.apache.iotdb.tsfile.read.common.block.TsBlock; -import org.apache.iotdb.tsfile.read.filter.basic.BinaryLogicalFilter; -import org.apache.iotdb.tsfile.read.filter.basic.Filter; -import org.apache.iotdb.tsfile.read.filter.basic.OperatorType; +package org.apache.tsfile.read.filter.operator; + +import org.apache.tsfile.file.metadata.IMetadata; +import org.apache.tsfile.read.common.TimeRange; +import org.apache.tsfile.read.common.block.TsBlock; +import org.apache.tsfile.read.filter.basic.BinaryLogicalFilter; +import org.apache.tsfile.read.filter.basic.Filter; +import org.apache.tsfile.read.filter.basic.OperatorType; import java.nio.ByteBuffer; import java.util.ArrayList; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/operator/TimeFilterOperators.java b/tsfile/src/main/java/org/apache/tsfile/read/filter/operator/TimeFilterOperators.java similarity index 96% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/operator/TimeFilterOperators.java rename to tsfile/src/main/java/org/apache/tsfile/read/filter/operator/TimeFilterOperators.java index 47f853362..2c3214b48 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/operator/TimeFilterOperators.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/filter/operator/TimeFilterOperators.java @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.filter.operator; - -import org.apache.iotdb.tsfile.read.common.TimeRange; -import org.apache.iotdb.tsfile.read.filter.basic.DisableStatisticsTimeFilter; -import org.apache.iotdb.tsfile.read.filter.basic.Filter; -import org.apache.iotdb.tsfile.read.filter.basic.OperatorType; -import org.apache.iotdb.tsfile.read.filter.basic.TimeFilter; -import org.apache.iotdb.tsfile.read.filter.factory.TimeFilterApi; -import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils; +package org.apache.tsfile.read.filter.operator; + +import org.apache.tsfile.read.common.TimeRange; +import org.apache.tsfile.read.filter.basic.DisableStatisticsTimeFilter; +import org.apache.tsfile.read.filter.basic.Filter; +import org.apache.tsfile.read.filter.basic.OperatorType; +import org.apache.tsfile.read.filter.basic.TimeFilter; +import org.apache.tsfile.read.filter.factory.TimeFilterApi; +import org.apache.tsfile.utils.ReadWriteIOUtils; import java.io.DataOutputStream; import java.io.IOException; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/operator/ValueFilterOperators.java b/tsfile/src/main/java/org/apache/tsfile/read/filter/operator/ValueFilterOperators.java similarity index 97% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/operator/ValueFilterOperators.java rename to tsfile/src/main/java/org/apache/tsfile/read/filter/operator/ValueFilterOperators.java index e2d6d40fe..3cc7e8ad9 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/operator/ValueFilterOperators.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/filter/operator/ValueFilterOperators.java @@ -17,19 +17,19 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.filter.operator; - -import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor; -import org.apache.iotdb.tsfile.exception.NotImplementedException; -import org.apache.iotdb.tsfile.file.metadata.IMetadata; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.file.metadata.statistics.Statistics; -import org.apache.iotdb.tsfile.read.filter.basic.DisableStatisticsValueFilter; -import org.apache.iotdb.tsfile.read.filter.basic.Filter; -import org.apache.iotdb.tsfile.read.filter.basic.OperatorType; -import org.apache.iotdb.tsfile.read.filter.basic.ValueFilter; -import org.apache.iotdb.tsfile.read.filter.factory.ValueFilterApi; -import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils; +package org.apache.tsfile.read.filter.operator; + +import org.apache.tsfile.common.conf.TSFileDescriptor; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.exception.NotImplementedException; +import org.apache.tsfile.file.metadata.IMetadata; +import org.apache.tsfile.file.metadata.statistics.Statistics; +import org.apache.tsfile.read.filter.basic.DisableStatisticsValueFilter; +import org.apache.tsfile.read.filter.basic.Filter; +import org.apache.tsfile.read.filter.basic.OperatorType; +import org.apache.tsfile.read.filter.basic.ValueFilter; +import org.apache.tsfile.read.filter.factory.ValueFilterApi; +import org.apache.tsfile.utils.ReadWriteIOUtils; import java.io.DataOutputStream; import java.io.IOException; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/dataset/DataSetWithTimeGenerator.java b/tsfile/src/main/java/org/apache/tsfile/read/query/dataset/DataSetWithTimeGenerator.java similarity index 88% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/dataset/DataSetWithTimeGenerator.java rename to tsfile/src/main/java/org/apache/tsfile/read/query/dataset/DataSetWithTimeGenerator.java index d9addd6af..63999a91a 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/dataset/DataSetWithTimeGenerator.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/query/dataset/DataSetWithTimeGenerator.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.query.dataset; +package org.apache.tsfile.read.query.dataset; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.read.common.Path; -import org.apache.iotdb.tsfile.read.common.RowRecord; -import org.apache.iotdb.tsfile.read.query.timegenerator.TimeGenerator; -import org.apache.iotdb.tsfile.read.reader.series.FileSeriesReaderByTimestamp; -import org.apache.iotdb.tsfile.utils.TsPrimitiveType; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.read.common.Path; +import org.apache.tsfile.read.common.RowRecord; +import org.apache.tsfile.read.query.timegenerator.TimeGenerator; +import org.apache.tsfile.read.reader.series.FileSeriesReaderByTimestamp; +import org.apache.tsfile.utils.TsPrimitiveType; import java.io.IOException; import java.util.List; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/dataset/DataSetWithoutTimeGenerator.java b/tsfile/src/main/java/org/apache/tsfile/read/query/dataset/DataSetWithoutTimeGenerator.java similarity index 91% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/dataset/DataSetWithoutTimeGenerator.java rename to tsfile/src/main/java/org/apache/tsfile/read/query/dataset/DataSetWithoutTimeGenerator.java index 6132d5996..cdd50d9b1 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/dataset/DataSetWithoutTimeGenerator.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/query/dataset/DataSetWithoutTimeGenerator.java @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.query.dataset; - -import org.apache.iotdb.tsfile.exception.write.UnSupportedDataTypeException; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.read.common.BatchData; -import org.apache.iotdb.tsfile.read.common.Field; -import org.apache.iotdb.tsfile.read.common.Path; -import org.apache.iotdb.tsfile.read.common.RowRecord; -import org.apache.iotdb.tsfile.read.reader.series.AbstractFileSeriesReader; +package org.apache.tsfile.read.query.dataset; + +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.read.common.BatchData; +import org.apache.tsfile.read.common.Field; +import org.apache.tsfile.read.common.Path; +import org.apache.tsfile.read.common.RowRecord; +import org.apache.tsfile.read.reader.series.AbstractFileSeriesReader; +import org.apache.tsfile.write.UnSupportedDataTypeException; import java.io.IOException; import java.util.ArrayList; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/dataset/QueryDataSet.java b/tsfile/src/main/java/org/apache/tsfile/read/query/dataset/QueryDataSet.java similarity index 96% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/dataset/QueryDataSet.java rename to tsfile/src/main/java/org/apache/tsfile/read/query/dataset/QueryDataSet.java index e1d836525..0f50d59ec 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/dataset/QueryDataSet.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/query/dataset/QueryDataSet.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.query.dataset; +package org.apache.tsfile.read.query.dataset; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.read.common.Field; -import org.apache.iotdb.tsfile.read.common.Path; -import org.apache.iotdb.tsfile.read.common.RowRecord; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.read.common.Field; +import org.apache.tsfile.read.common.Path; +import org.apache.tsfile.read.common.RowRecord; import java.io.IOException; import java.util.List; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/executor/ExecutorWithTimeGenerator.java b/tsfile/src/main/java/org/apache/tsfile/read/query/executor/ExecutorWithTimeGenerator.java similarity index 82% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/executor/ExecutorWithTimeGenerator.java rename to tsfile/src/main/java/org/apache/tsfile/read/query/executor/ExecutorWithTimeGenerator.java index d0c5b62b8..26528bdd5 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/executor/ExecutorWithTimeGenerator.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/query/executor/ExecutorWithTimeGenerator.java @@ -17,21 +17,21 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.query.executor; - -import org.apache.iotdb.tsfile.file.metadata.IChunkMetadata; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.read.common.Path; -import org.apache.iotdb.tsfile.read.controller.IChunkLoader; -import org.apache.iotdb.tsfile.read.controller.IMetadataQuerier; -import org.apache.iotdb.tsfile.read.expression.IExpression; -import org.apache.iotdb.tsfile.read.expression.QueryExpression; -import org.apache.iotdb.tsfile.read.expression.impl.BinaryExpression; -import org.apache.iotdb.tsfile.read.expression.impl.SingleSeriesExpression; -import org.apache.iotdb.tsfile.read.query.dataset.DataSetWithTimeGenerator; -import org.apache.iotdb.tsfile.read.query.timegenerator.TimeGenerator; -import org.apache.iotdb.tsfile.read.query.timegenerator.TsFileTimeGenerator; -import org.apache.iotdb.tsfile.read.reader.series.FileSeriesReaderByTimestamp; +package org.apache.tsfile.read.query.executor; + +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.file.metadata.IChunkMetadata; +import org.apache.tsfile.read.common.Path; +import org.apache.tsfile.read.controller.IChunkLoader; +import org.apache.tsfile.read.controller.IMetadataQuerier; +import org.apache.tsfile.read.expression.IExpression; +import org.apache.tsfile.read.expression.QueryExpression; +import org.apache.tsfile.read.expression.impl.BinaryExpression; +import org.apache.tsfile.read.expression.impl.SingleSeriesExpression; +import org.apache.tsfile.read.query.dataset.DataSetWithTimeGenerator; +import org.apache.tsfile.read.query.timegenerator.TimeGenerator; +import org.apache.tsfile.read.query.timegenerator.TsFileTimeGenerator; +import org.apache.tsfile.read.reader.series.FileSeriesReaderByTimestamp; import java.io.IOException; import java.util.ArrayList; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/executor/QueryExecutor.java b/tsfile/src/main/java/org/apache/tsfile/read/query/executor/QueryExecutor.java similarity index 84% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/executor/QueryExecutor.java rename to tsfile/src/main/java/org/apache/tsfile/read/query/executor/QueryExecutor.java index 24e07c2cf..8ce0d2bb2 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/executor/QueryExecutor.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/query/executor/QueryExecutor.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.query.executor; +package org.apache.tsfile.read.query.executor; -import org.apache.iotdb.tsfile.read.expression.QueryExpression; -import org.apache.iotdb.tsfile.read.query.dataset.QueryDataSet; +import org.apache.tsfile.read.expression.QueryExpression; +import org.apache.tsfile.read.query.dataset.QueryDataSet; import java.io.IOException; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/executor/TsFileExecutor.java b/tsfile/src/main/java/org/apache/tsfile/read/query/executor/TsFileExecutor.java similarity index 83% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/executor/TsFileExecutor.java rename to tsfile/src/main/java/org/apache/tsfile/read/query/executor/TsFileExecutor.java index 08160ef69..e599e7650 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/executor/TsFileExecutor.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/query/executor/TsFileExecutor.java @@ -17,27 +17,27 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.query.executor; - -import org.apache.iotdb.tsfile.exception.filter.QueryFilterOptimizationException; -import org.apache.iotdb.tsfile.exception.write.NoMeasurementException; -import org.apache.iotdb.tsfile.file.metadata.IChunkMetadata; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.read.common.Path; -import org.apache.iotdb.tsfile.read.common.TimeRange; -import org.apache.iotdb.tsfile.read.controller.IChunkLoader; -import org.apache.iotdb.tsfile.read.controller.IMetadataQuerier; -import org.apache.iotdb.tsfile.read.expression.IExpression; -import org.apache.iotdb.tsfile.read.expression.QueryExpression; -import org.apache.iotdb.tsfile.read.expression.impl.BinaryExpression; -import org.apache.iotdb.tsfile.read.expression.impl.GlobalTimeExpression; -import org.apache.iotdb.tsfile.read.expression.util.ExpressionOptimizer; -import org.apache.iotdb.tsfile.read.query.dataset.DataSetWithoutTimeGenerator; -import org.apache.iotdb.tsfile.read.query.dataset.QueryDataSet; -import org.apache.iotdb.tsfile.read.reader.series.AbstractFileSeriesReader; -import org.apache.iotdb.tsfile.read.reader.series.EmptyFileSeriesReader; -import org.apache.iotdb.tsfile.read.reader.series.FileSeriesReader; -import org.apache.iotdb.tsfile.utils.BloomFilter; +package org.apache.tsfile.read.query.executor; + +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.exception.filter.QueryFilterOptimizationException; +import org.apache.tsfile.exception.write.NoMeasurementException; +import org.apache.tsfile.file.metadata.IChunkMetadata; +import org.apache.tsfile.read.common.Path; +import org.apache.tsfile.read.common.TimeRange; +import org.apache.tsfile.read.controller.IChunkLoader; +import org.apache.tsfile.read.controller.IMetadataQuerier; +import org.apache.tsfile.read.expression.IExpression; +import org.apache.tsfile.read.expression.QueryExpression; +import org.apache.tsfile.read.expression.impl.BinaryExpression; +import org.apache.tsfile.read.expression.impl.GlobalTimeExpression; +import org.apache.tsfile.read.expression.util.ExpressionOptimizer; +import org.apache.tsfile.read.query.dataset.DataSetWithoutTimeGenerator; +import org.apache.tsfile.read.query.dataset.QueryDataSet; +import org.apache.tsfile.read.reader.series.AbstractFileSeriesReader; +import org.apache.tsfile.read.reader.series.EmptyFileSeriesReader; +import org.apache.tsfile.read.reader.series.FileSeriesReader; +import org.apache.tsfile.utils.BloomFilter; import java.io.IOException; import java.util.ArrayList; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/timegenerator/TimeGenerator.java b/tsfile/src/main/java/org/apache/tsfile/read/query/timegenerator/TimeGenerator.java similarity index 84% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/timegenerator/TimeGenerator.java rename to tsfile/src/main/java/org/apache/tsfile/read/query/timegenerator/TimeGenerator.java index 8e50c363e..c74df553f 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/timegenerator/TimeGenerator.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/query/timegenerator/TimeGenerator.java @@ -17,20 +17,20 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.query.timegenerator; - -import org.apache.iotdb.tsfile.exception.write.UnSupportedDataTypeException; -import org.apache.iotdb.tsfile.read.common.Path; -import org.apache.iotdb.tsfile.read.expression.ExpressionType; -import org.apache.iotdb.tsfile.read.expression.IBinaryExpression; -import org.apache.iotdb.tsfile.read.expression.IExpression; -import org.apache.iotdb.tsfile.read.expression.impl.SingleSeriesExpression; -import org.apache.iotdb.tsfile.read.filter.basic.Filter; -import org.apache.iotdb.tsfile.read.query.timegenerator.node.AndNode; -import org.apache.iotdb.tsfile.read.query.timegenerator.node.LeafNode; -import org.apache.iotdb.tsfile.read.query.timegenerator.node.Node; -import org.apache.iotdb.tsfile.read.query.timegenerator.node.OrNode; -import org.apache.iotdb.tsfile.read.reader.IBatchReader; +package org.apache.tsfile.read.query.timegenerator; + +import org.apache.tsfile.read.common.Path; +import org.apache.tsfile.read.expression.ExpressionType; +import org.apache.tsfile.read.expression.IBinaryExpression; +import org.apache.tsfile.read.expression.IExpression; +import org.apache.tsfile.read.expression.impl.SingleSeriesExpression; +import org.apache.tsfile.read.filter.basic.Filter; +import org.apache.tsfile.read.query.timegenerator.node.AndNode; +import org.apache.tsfile.read.query.timegenerator.node.LeafNode; +import org.apache.tsfile.read.query.timegenerator.node.Node; +import org.apache.tsfile.read.query.timegenerator.node.OrNode; +import org.apache.tsfile.read.reader.IBatchReader; +import org.apache.tsfile.write.UnSupportedDataTypeException; import java.io.IOException; import java.util.ArrayList; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/timegenerator/TsFileTimeGenerator.java b/tsfile/src/main/java/org/apache/tsfile/read/query/timegenerator/TsFileTimeGenerator.java similarity index 75% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/timegenerator/TsFileTimeGenerator.java rename to tsfile/src/main/java/org/apache/tsfile/read/query/timegenerator/TsFileTimeGenerator.java index 40229282a..c4e021e96 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/timegenerator/TsFileTimeGenerator.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/query/timegenerator/TsFileTimeGenerator.java @@ -17,16 +17,16 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.query.timegenerator; +package org.apache.tsfile.read.query.timegenerator; -import org.apache.iotdb.tsfile.file.metadata.IChunkMetadata; -import org.apache.iotdb.tsfile.read.controller.IChunkLoader; -import org.apache.iotdb.tsfile.read.controller.IMetadataQuerier; -import org.apache.iotdb.tsfile.read.expression.IExpression; -import org.apache.iotdb.tsfile.read.expression.impl.SingleSeriesExpression; -import org.apache.iotdb.tsfile.read.filter.basic.Filter; -import org.apache.iotdb.tsfile.read.reader.IBatchReader; -import org.apache.iotdb.tsfile.read.reader.series.FileSeriesReader; +import org.apache.tsfile.file.metadata.IChunkMetadata; +import org.apache.tsfile.read.controller.IChunkLoader; +import org.apache.tsfile.read.controller.IMetadataQuerier; +import org.apache.tsfile.read.expression.IExpression; +import org.apache.tsfile.read.expression.impl.SingleSeriesExpression; +import org.apache.tsfile.read.filter.basic.Filter; +import org.apache.tsfile.read.reader.IBatchReader; +import org.apache.tsfile.read.reader.series.FileSeriesReader; import java.io.IOException; import java.util.List; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/timegenerator/node/AndNode.java b/tsfile/src/main/java/org/apache/tsfile/read/query/timegenerator/node/AndNode.java similarity index 97% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/timegenerator/node/AndNode.java rename to tsfile/src/main/java/org/apache/tsfile/read/query/timegenerator/node/AndNode.java index ca1a26dc8..f54262b77 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/timegenerator/node/AndNode.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/query/timegenerator/node/AndNode.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.query.timegenerator.node; +package org.apache.tsfile.read.query.timegenerator.node; import java.io.IOException; import java.util.function.BiPredicate; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/timegenerator/node/LeafNode.java b/tsfile/src/main/java/org/apache/tsfile/read/query/timegenerator/node/LeafNode.java similarity index 93% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/timegenerator/node/LeafNode.java rename to tsfile/src/main/java/org/apache/tsfile/read/query/timegenerator/node/LeafNode.java index 46de8daf7..473aa6be8 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/timegenerator/node/LeafNode.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/query/timegenerator/node/LeafNode.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.query.timegenerator.node; +package org.apache.tsfile.read.query.timegenerator.node; -import org.apache.iotdb.tsfile.read.common.BatchData; -import org.apache.iotdb.tsfile.read.reader.IBatchReader; +import org.apache.tsfile.read.common.BatchData; +import org.apache.tsfile.read.reader.IBatchReader; import java.io.IOException; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/timegenerator/node/Node.java b/tsfile/src/main/java/org/apache/tsfile/read/query/timegenerator/node/Node.java similarity index 93% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/timegenerator/node/Node.java rename to tsfile/src/main/java/org/apache/tsfile/read/query/timegenerator/node/Node.java index ab27ccb82..3ea7b36f2 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/timegenerator/node/Node.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/query/timegenerator/node/Node.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.query.timegenerator.node; +package org.apache.tsfile.read.query.timegenerator.node; import java.io.IOException; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/timegenerator/node/NodeType.java b/tsfile/src/main/java/org/apache/tsfile/read/query/timegenerator/node/NodeType.java similarity index 93% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/timegenerator/node/NodeType.java rename to tsfile/src/main/java/org/apache/tsfile/read/query/timegenerator/node/NodeType.java index d5f9a9056..0c90b64dc 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/timegenerator/node/NodeType.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/query/timegenerator/node/NodeType.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.query.timegenerator.node; +package org.apache.tsfile.read.query.timegenerator.node; /** Type of the node. */ public enum NodeType { diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/timegenerator/node/OrNode.java b/tsfile/src/main/java/org/apache/tsfile/read/query/timegenerator/node/OrNode.java similarity index 98% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/timegenerator/node/OrNode.java rename to tsfile/src/main/java/org/apache/tsfile/read/query/timegenerator/node/OrNode.java index 490768ede..3c4564dd7 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/timegenerator/node/OrNode.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/query/timegenerator/node/OrNode.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.query.timegenerator.node; +package org.apache.tsfile.read.query.timegenerator.node; import java.io.IOException; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/IBatchReader.java b/tsfile/src/main/java/org/apache/tsfile/read/reader/IBatchReader.java similarity index 91% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/IBatchReader.java rename to tsfile/src/main/java/org/apache/tsfile/read/reader/IBatchReader.java index 0af0d4724..b9aa1d398 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/IBatchReader.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/reader/IBatchReader.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.reader; +package org.apache.tsfile.read.reader; -import org.apache.iotdb.tsfile.read.common.BatchData; +import org.apache.tsfile.read.common.BatchData; import java.io.IOException; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/IChunkReader.java b/tsfile/src/main/java/org/apache/tsfile/read/reader/IChunkReader.java similarity index 91% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/IChunkReader.java rename to tsfile/src/main/java/org/apache/tsfile/read/reader/IChunkReader.java index 7c0b14401..acda8af6d 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/IChunkReader.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/reader/IChunkReader.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.reader; +package org.apache.tsfile.read.reader; -import org.apache.iotdb.tsfile.read.common.BatchData; +import org.apache.tsfile.read.common.BatchData; import java.io.IOException; import java.util.List; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/IPageReader.java b/tsfile/src/main/java/org/apache/tsfile/read/reader/IPageReader.java similarity index 76% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/IPageReader.java rename to tsfile/src/main/java/org/apache/tsfile/read/reader/IPageReader.java index 103a66494..9d6980be4 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/IPageReader.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/reader/IPageReader.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.reader; - -import org.apache.iotdb.tsfile.file.metadata.IMetadata; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.read.common.BatchData; -import org.apache.iotdb.tsfile.read.common.block.TsBlock; -import org.apache.iotdb.tsfile.read.filter.basic.Filter; -import org.apache.iotdb.tsfile.read.reader.series.PaginationController; +package org.apache.tsfile.read.reader; + +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.file.metadata.IMetadata; +import org.apache.tsfile.read.common.BatchData; +import org.apache.tsfile.read.common.block.TsBlock; +import org.apache.tsfile.read.filter.basic.Filter; +import org.apache.tsfile.read.reader.series.PaginationController; import java.io.IOException; import java.util.List; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/IPointReader.java b/tsfile/src/main/java/org/apache/tsfile/read/reader/IPointReader.java similarity index 91% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/IPointReader.java rename to tsfile/src/main/java/org/apache/tsfile/read/reader/IPointReader.java index d29d70d06..a01d615f5 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/IPointReader.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/reader/IPointReader.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.reader; +package org.apache.tsfile.read.reader; -import org.apache.iotdb.tsfile.read.TimeValuePair; +import org.apache.tsfile.read.TimeValuePair; import java.io.IOException; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/LocalTsFileInput.java b/tsfile/src/main/java/org/apache/tsfile/read/reader/LocalTsFileInput.java similarity index 98% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/LocalTsFileInput.java rename to tsfile/src/main/java/org/apache/tsfile/read/reader/LocalTsFileInput.java index 168fdd59f..a7769c0d0 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/LocalTsFileInput.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/reader/LocalTsFileInput.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.reader; +package org.apache.tsfile.read.reader; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/TsFileInput.java b/tsfile/src/main/java/org/apache/tsfile/read/reader/TsFileInput.java similarity index 98% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/TsFileInput.java rename to tsfile/src/main/java/org/apache/tsfile/read/reader/TsFileInput.java index 14e3848e6..71d5aabd0 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/TsFileInput.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/reader/TsFileInput.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.reader; +package org.apache.tsfile.read.reader; -import org.apache.iotdb.tsfile.utils.ReadWriteForEncodingUtils; +import org.apache.tsfile.utils.ReadWriteForEncodingUtils; import java.io.IOException; import java.io.InputStream; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/chunk/AbstractChunkReader.java b/tsfile/src/main/java/org/apache/tsfile/read/reader/chunk/AbstractChunkReader.java similarity index 80% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/chunk/AbstractChunkReader.java rename to tsfile/src/main/java/org/apache/tsfile/read/reader/chunk/AbstractChunkReader.java index bb0515072..301134d41 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/chunk/AbstractChunkReader.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/reader/chunk/AbstractChunkReader.java @@ -17,16 +17,16 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.reader.chunk; +package org.apache.tsfile.read.reader.chunk; -import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor; -import org.apache.iotdb.tsfile.encoding.decoder.Decoder; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding; -import org.apache.iotdb.tsfile.read.common.BatchData; -import org.apache.iotdb.tsfile.read.filter.basic.Filter; -import org.apache.iotdb.tsfile.read.reader.IChunkReader; -import org.apache.iotdb.tsfile.read.reader.IPageReader; +import org.apache.tsfile.common.conf.TSFileDescriptor; +import org.apache.tsfile.encoding.decoder.Decoder; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.file.metadata.enums.TSEncoding; +import org.apache.tsfile.read.common.BatchData; +import org.apache.tsfile.read.filter.basic.Filter; +import org.apache.tsfile.read.reader.IChunkReader; +import org.apache.tsfile.read.reader.IPageReader; import java.io.IOException; import java.util.LinkedList; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/chunk/AlignedChunkReader.java b/tsfile/src/main/java/org/apache/tsfile/read/reader/chunk/AlignedChunkReader.java similarity index 93% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/chunk/AlignedChunkReader.java rename to tsfile/src/main/java/org/apache/tsfile/read/reader/chunk/AlignedChunkReader.java index 373187ed6..fe2543df8 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/chunk/AlignedChunkReader.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/reader/chunk/AlignedChunkReader.java @@ -17,18 +17,18 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.reader.chunk; +package org.apache.tsfile.read.reader.chunk; -import org.apache.iotdb.tsfile.encoding.decoder.Decoder; -import org.apache.iotdb.tsfile.file.MetaMarker; -import org.apache.iotdb.tsfile.file.header.ChunkHeader; -import org.apache.iotdb.tsfile.file.header.PageHeader; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.file.metadata.statistics.Statistics; -import org.apache.iotdb.tsfile.read.common.Chunk; -import org.apache.iotdb.tsfile.read.common.TimeRange; -import org.apache.iotdb.tsfile.read.filter.basic.Filter; -import org.apache.iotdb.tsfile.read.reader.page.AlignedPageReader; +import org.apache.tsfile.encoding.decoder.Decoder; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.file.MetaMarker; +import org.apache.tsfile.file.header.ChunkHeader; +import org.apache.tsfile.file.header.PageHeader; +import org.apache.tsfile.file.metadata.statistics.Statistics; +import org.apache.tsfile.read.common.Chunk; +import org.apache.tsfile.read.common.TimeRange; +import org.apache.tsfile.read.filter.basic.Filter; +import org.apache.tsfile.read.reader.page.AlignedPageReader; import java.io.IOException; import java.io.Serializable; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/chunk/ChunkReader.java b/tsfile/src/main/java/org/apache/tsfile/read/reader/chunk/ChunkReader.java similarity index 91% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/chunk/ChunkReader.java rename to tsfile/src/main/java/org/apache/tsfile/read/reader/chunk/ChunkReader.java index dfd1787ec..4f724d219 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/chunk/ChunkReader.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/reader/chunk/ChunkReader.java @@ -17,18 +17,18 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.reader.chunk; - -import org.apache.iotdb.tsfile.compress.IUnCompressor; -import org.apache.iotdb.tsfile.encoding.decoder.Decoder; -import org.apache.iotdb.tsfile.file.MetaMarker; -import org.apache.iotdb.tsfile.file.header.ChunkHeader; -import org.apache.iotdb.tsfile.file.header.PageHeader; -import org.apache.iotdb.tsfile.file.metadata.statistics.Statistics; -import org.apache.iotdb.tsfile.read.common.Chunk; -import org.apache.iotdb.tsfile.read.common.TimeRange; -import org.apache.iotdb.tsfile.read.filter.basic.Filter; -import org.apache.iotdb.tsfile.read.reader.page.PageReader; +package org.apache.tsfile.read.reader.chunk; + +import org.apache.tsfile.compress.IUnCompressor; +import org.apache.tsfile.encoding.decoder.Decoder; +import org.apache.tsfile.file.MetaMarker; +import org.apache.tsfile.file.header.ChunkHeader; +import org.apache.tsfile.file.header.PageHeader; +import org.apache.tsfile.file.metadata.statistics.Statistics; +import org.apache.tsfile.read.common.Chunk; +import org.apache.tsfile.read.common.TimeRange; +import org.apache.tsfile.read.filter.basic.Filter; +import org.apache.tsfile.read.reader.page.PageReader; import java.io.IOException; import java.io.Serializable; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/page/AlignedPageReader.java b/tsfile/src/main/java/org/apache/tsfile/read/reader/page/AlignedPageReader.java similarity index 94% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/page/AlignedPageReader.java rename to tsfile/src/main/java/org/apache/tsfile/read/reader/page/AlignedPageReader.java index 5a4bd43af..421c3b68e 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/page/AlignedPageReader.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/reader/page/AlignedPageReader.java @@ -17,22 +17,22 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.reader.page; - -import org.apache.iotdb.tsfile.encoding.decoder.Decoder; -import org.apache.iotdb.tsfile.file.header.PageHeader; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.file.metadata.statistics.Statistics; -import org.apache.iotdb.tsfile.read.common.BatchData; -import org.apache.iotdb.tsfile.read.common.BatchDataFactory; -import org.apache.iotdb.tsfile.read.common.TimeRange; -import org.apache.iotdb.tsfile.read.common.block.TsBlock; -import org.apache.iotdb.tsfile.read.common.block.TsBlockBuilder; -import org.apache.iotdb.tsfile.read.filter.basic.Filter; -import org.apache.iotdb.tsfile.read.reader.IPageReader; -import org.apache.iotdb.tsfile.read.reader.IPointReader; -import org.apache.iotdb.tsfile.read.reader.series.PaginationController; -import org.apache.iotdb.tsfile.utils.TsPrimitiveType; +package org.apache.tsfile.read.reader.page; + +import org.apache.tsfile.encoding.decoder.Decoder; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.file.header.PageHeader; +import org.apache.tsfile.file.metadata.statistics.Statistics; +import org.apache.tsfile.read.common.BatchData; +import org.apache.tsfile.read.common.BatchDataFactory; +import org.apache.tsfile.read.common.TimeRange; +import org.apache.tsfile.read.common.block.TsBlock; +import org.apache.tsfile.read.common.block.TsBlockBuilder; +import org.apache.tsfile.read.filter.basic.Filter; +import org.apache.tsfile.read.reader.IPageReader; +import org.apache.tsfile.read.reader.IPointReader; +import org.apache.tsfile.read.reader.series.PaginationController; +import org.apache.tsfile.utils.TsPrimitiveType; import java.io.IOException; import java.io.Serializable; @@ -43,7 +43,7 @@ import java.util.Objects; import java.util.Optional; -import static org.apache.iotdb.tsfile.read.reader.series.PaginationController.UNLIMITED_PAGINATION_CONTROLLER; +import static org.apache.tsfile.read.reader.series.PaginationController.UNLIMITED_PAGINATION_CONTROLLER; public class AlignedPageReader implements IPageReader { diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/page/LazyLoadAlignedPagePointReader.java b/tsfile/src/main/java/org/apache/tsfile/read/reader/page/LazyLoadAlignedPagePointReader.java similarity index 93% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/page/LazyLoadAlignedPagePointReader.java rename to tsfile/src/main/java/org/apache/tsfile/read/reader/page/LazyLoadAlignedPagePointReader.java index e967305e5..07cde5f5f 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/page/LazyLoadAlignedPagePointReader.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/reader/page/LazyLoadAlignedPagePointReader.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.reader.page; +package org.apache.tsfile.read.reader.page; -import org.apache.iotdb.tsfile.read.TimeValuePair; -import org.apache.iotdb.tsfile.read.reader.IPointReader; -import org.apache.iotdb.tsfile.utils.TsPrimitiveType; +import org.apache.tsfile.read.TimeValuePair; +import org.apache.tsfile.read.reader.IPointReader; +import org.apache.tsfile.utils.TsPrimitiveType; import java.io.IOException; import java.util.List; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/page/PageReader.java b/tsfile/src/main/java/org/apache/tsfile/read/reader/page/PageReader.java similarity index 90% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/page/PageReader.java rename to tsfile/src/main/java/org/apache/tsfile/read/reader/page/PageReader.java index f190a43c4..646c9f4ec 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/page/PageReader.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/reader/page/PageReader.java @@ -17,26 +17,26 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.reader.page; - -import org.apache.iotdb.tsfile.encoding.decoder.Decoder; -import org.apache.iotdb.tsfile.exception.write.UnSupportedDataTypeException; -import org.apache.iotdb.tsfile.file.header.PageHeader; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.file.metadata.statistics.Statistics; -import org.apache.iotdb.tsfile.read.common.BatchData; -import org.apache.iotdb.tsfile.read.common.BatchDataFactory; -import org.apache.iotdb.tsfile.read.common.TimeRange; -import org.apache.iotdb.tsfile.read.common.block.TsBlock; -import org.apache.iotdb.tsfile.read.common.block.TsBlockBuilder; -import org.apache.iotdb.tsfile.read.common.block.column.ColumnBuilder; -import org.apache.iotdb.tsfile.read.common.block.column.TimeColumnBuilder; -import org.apache.iotdb.tsfile.read.filter.basic.Filter; -import org.apache.iotdb.tsfile.read.filter.factory.FilterFactory; -import org.apache.iotdb.tsfile.read.reader.IPageReader; -import org.apache.iotdb.tsfile.read.reader.series.PaginationController; -import org.apache.iotdb.tsfile.utils.Binary; -import org.apache.iotdb.tsfile.utils.ReadWriteForEncodingUtils; +package org.apache.tsfile.read.reader.page; + +import org.apache.tsfile.block.column.ColumnBuilder; +import org.apache.tsfile.encoding.decoder.Decoder; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.file.header.PageHeader; +import org.apache.tsfile.file.metadata.statistics.Statistics; +import org.apache.tsfile.read.common.BatchData; +import org.apache.tsfile.read.common.BatchDataFactory; +import org.apache.tsfile.read.common.TimeRange; +import org.apache.tsfile.read.common.block.TsBlock; +import org.apache.tsfile.read.common.block.TsBlockBuilder; +import org.apache.tsfile.read.common.block.column.TimeColumnBuilder; +import org.apache.tsfile.read.filter.basic.Filter; +import org.apache.tsfile.read.filter.factory.FilterFactory; +import org.apache.tsfile.read.reader.IPageReader; +import org.apache.tsfile.read.reader.series.PaginationController; +import org.apache.tsfile.utils.Binary; +import org.apache.tsfile.utils.ReadWriteForEncodingUtils; +import org.apache.tsfile.write.UnSupportedDataTypeException; import java.io.IOException; import java.io.Serializable; @@ -45,8 +45,8 @@ import java.util.List; import java.util.Optional; -import static org.apache.iotdb.tsfile.read.reader.series.PaginationController.UNLIMITED_PAGINATION_CONTROLLER; -import static org.apache.iotdb.tsfile.utils.Preconditions.checkArgument; +import static org.apache.tsfile.read.reader.series.PaginationController.UNLIMITED_PAGINATION_CONTROLLER; +import static org.apache.tsfile.utils.Preconditions.checkArgument; public class PageReader implements IPageReader { diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/page/TimePageReader.java b/tsfile/src/main/java/org/apache/tsfile/read/reader/page/TimePageReader.java similarity index 91% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/page/TimePageReader.java rename to tsfile/src/main/java/org/apache/tsfile/read/reader/page/TimePageReader.java index daa7cfad4..a79645585 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/page/TimePageReader.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/reader/page/TimePageReader.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.reader.page; +package org.apache.tsfile.read.reader.page; -import org.apache.iotdb.tsfile.encoding.decoder.Decoder; -import org.apache.iotdb.tsfile.file.header.PageHeader; -import org.apache.iotdb.tsfile.file.metadata.statistics.TimeStatistics; -import org.apache.iotdb.tsfile.read.common.TimeRange; +import org.apache.tsfile.encoding.decoder.Decoder; +import org.apache.tsfile.file.header.PageHeader; +import org.apache.tsfile.file.metadata.statistics.TimeStatistics; +import org.apache.tsfile.read.common.TimeRange; import java.io.IOException; import java.nio.ByteBuffer; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/page/ValuePageReader.java b/tsfile/src/main/java/org/apache/tsfile/read/reader/page/ValuePageReader.java similarity index 95% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/page/ValuePageReader.java rename to tsfile/src/main/java/org/apache/tsfile/read/reader/page/ValuePageReader.java index d18818c54..833df288b 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/page/ValuePageReader.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/reader/page/ValuePageReader.java @@ -17,21 +17,21 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.reader.page; - -import org.apache.iotdb.tsfile.encoding.decoder.Decoder; -import org.apache.iotdb.tsfile.exception.write.UnSupportedDataTypeException; -import org.apache.iotdb.tsfile.file.header.PageHeader; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.file.metadata.statistics.Statistics; -import org.apache.iotdb.tsfile.read.common.BatchData; -import org.apache.iotdb.tsfile.read.common.BatchDataFactory; -import org.apache.iotdb.tsfile.read.common.TimeRange; -import org.apache.iotdb.tsfile.read.common.block.column.ColumnBuilder; -import org.apache.iotdb.tsfile.read.filter.basic.Filter; -import org.apache.iotdb.tsfile.utils.Binary; -import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils; -import org.apache.iotdb.tsfile.utils.TsPrimitiveType; +package org.apache.tsfile.read.reader.page; + +import org.apache.tsfile.block.column.ColumnBuilder; +import org.apache.tsfile.encoding.decoder.Decoder; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.file.header.PageHeader; +import org.apache.tsfile.file.metadata.statistics.Statistics; +import org.apache.tsfile.read.common.BatchData; +import org.apache.tsfile.read.common.BatchDataFactory; +import org.apache.tsfile.read.common.TimeRange; +import org.apache.tsfile.read.filter.basic.Filter; +import org.apache.tsfile.utils.Binary; +import org.apache.tsfile.utils.ReadWriteIOUtils; +import org.apache.tsfile.utils.TsPrimitiveType; +import org.apache.tsfile.write.UnSupportedDataTypeException; import java.io.Serializable; import java.nio.ByteBuffer; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/series/AbstractFileSeriesReader.java b/tsfile/src/main/java/org/apache/tsfile/read/reader/series/AbstractFileSeriesReader.java similarity index 86% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/series/AbstractFileSeriesReader.java rename to tsfile/src/main/java/org/apache/tsfile/read/reader/series/AbstractFileSeriesReader.java index 648e0a6a1..edb8c05e7 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/series/AbstractFileSeriesReader.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/reader/series/AbstractFileSeriesReader.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.reader.series; - -import org.apache.iotdb.tsfile.file.metadata.IChunkMetadata; -import org.apache.iotdb.tsfile.read.common.BatchData; -import org.apache.iotdb.tsfile.read.controller.IChunkLoader; -import org.apache.iotdb.tsfile.read.filter.basic.Filter; -import org.apache.iotdb.tsfile.read.reader.IBatchReader; -import org.apache.iotdb.tsfile.read.reader.IChunkReader; +package org.apache.tsfile.read.reader.series; + +import org.apache.tsfile.file.metadata.IChunkMetadata; +import org.apache.tsfile.read.common.BatchData; +import org.apache.tsfile.read.controller.IChunkLoader; +import org.apache.tsfile.read.filter.basic.Filter; +import org.apache.tsfile.read.reader.IBatchReader; +import org.apache.tsfile.read.reader.IChunkReader; import java.io.IOException; import java.util.List; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/series/EmptyFileSeriesReader.java b/tsfile/src/main/java/org/apache/tsfile/read/reader/series/EmptyFileSeriesReader.java similarity index 89% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/series/EmptyFileSeriesReader.java rename to tsfile/src/main/java/org/apache/tsfile/read/reader/series/EmptyFileSeriesReader.java index ed3bda8cf..8863879b0 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/series/EmptyFileSeriesReader.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/reader/series/EmptyFileSeriesReader.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.reader.series; +package org.apache.tsfile.read.reader.series; -import org.apache.iotdb.tsfile.file.metadata.IChunkMetadata; -import org.apache.iotdb.tsfile.read.common.BatchData; +import org.apache.tsfile.file.metadata.IChunkMetadata; +import org.apache.tsfile.read.common.BatchData; /** this is for those series which has no data points */ public class EmptyFileSeriesReader extends AbstractFileSeriesReader { diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/series/FileSeriesReader.java b/tsfile/src/main/java/org/apache/tsfile/read/reader/series/FileSeriesReader.java similarity index 80% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/series/FileSeriesReader.java rename to tsfile/src/main/java/org/apache/tsfile/read/reader/series/FileSeriesReader.java index 1c2a98a4f..1704d553f 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/series/FileSeriesReader.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/reader/series/FileSeriesReader.java @@ -17,16 +17,16 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.reader.series; +package org.apache.tsfile.read.reader.series; -import org.apache.iotdb.tsfile.file.metadata.AlignedChunkMetadata; -import org.apache.iotdb.tsfile.file.metadata.ChunkMetadata; -import org.apache.iotdb.tsfile.file.metadata.IChunkMetadata; -import org.apache.iotdb.tsfile.read.common.Chunk; -import org.apache.iotdb.tsfile.read.controller.IChunkLoader; -import org.apache.iotdb.tsfile.read.filter.basic.Filter; -import org.apache.iotdb.tsfile.read.reader.chunk.AlignedChunkReader; -import org.apache.iotdb.tsfile.read.reader.chunk.ChunkReader; +import org.apache.tsfile.file.metadata.AlignedChunkMetadata; +import org.apache.tsfile.file.metadata.ChunkMetadata; +import org.apache.tsfile.file.metadata.IChunkMetadata; +import org.apache.tsfile.read.common.Chunk; +import org.apache.tsfile.read.controller.IChunkLoader; +import org.apache.tsfile.read.filter.basic.Filter; +import org.apache.tsfile.read.reader.chunk.AlignedChunkReader; +import org.apache.tsfile.read.reader.chunk.ChunkReader; import java.io.IOException; import java.util.ArrayList; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/series/FileSeriesReaderByTimestamp.java b/tsfile/src/main/java/org/apache/tsfile/read/reader/series/FileSeriesReaderByTimestamp.java similarity index 88% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/series/FileSeriesReaderByTimestamp.java rename to tsfile/src/main/java/org/apache/tsfile/read/reader/series/FileSeriesReaderByTimestamp.java index f236fcf86..ae6c394ca 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/series/FileSeriesReaderByTimestamp.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/reader/series/FileSeriesReaderByTimestamp.java @@ -17,18 +17,18 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.reader.series; - -import org.apache.iotdb.tsfile.file.metadata.AlignedChunkMetadata; -import org.apache.iotdb.tsfile.file.metadata.ChunkMetadata; -import org.apache.iotdb.tsfile.file.metadata.IChunkMetadata; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.read.common.BatchData; -import org.apache.iotdb.tsfile.read.common.Chunk; -import org.apache.iotdb.tsfile.read.controller.IChunkLoader; -import org.apache.iotdb.tsfile.read.reader.IChunkReader; -import org.apache.iotdb.tsfile.read.reader.chunk.AlignedChunkReader; -import org.apache.iotdb.tsfile.read.reader.chunk.ChunkReader; +package org.apache.tsfile.read.reader.series; + +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.file.metadata.AlignedChunkMetadata; +import org.apache.tsfile.file.metadata.ChunkMetadata; +import org.apache.tsfile.file.metadata.IChunkMetadata; +import org.apache.tsfile.read.common.BatchData; +import org.apache.tsfile.read.common.Chunk; +import org.apache.tsfile.read.controller.IChunkLoader; +import org.apache.tsfile.read.reader.IChunkReader; +import org.apache.tsfile.read.reader.chunk.AlignedChunkReader; +import org.apache.tsfile.read.reader.chunk.ChunkReader; import java.io.IOException; import java.util.ArrayList; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/series/PaginationController.java b/tsfile/src/main/java/org/apache/tsfile/read/reader/series/PaginationController.java similarity index 95% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/series/PaginationController.java rename to tsfile/src/main/java/org/apache/tsfile/read/reader/series/PaginationController.java index 8e557bb74..5fe4137e8 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/series/PaginationController.java +++ b/tsfile/src/main/java/org/apache/tsfile/read/reader/series/PaginationController.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.reader.series; +package org.apache.tsfile.read.reader.series; -import org.apache.iotdb.tsfile.read.common.block.TsBlock; +import org.apache.tsfile.read.common.block.TsBlock; public class PaginationController { diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/utils/BitMap.java b/tsfile/src/main/java/org/apache/tsfile/utils/BitMap.java similarity index 99% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/utils/BitMap.java rename to tsfile/src/main/java/org/apache/tsfile/utils/BitMap.java index 5ecae4aa7..ecdeea3a3 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/utils/BitMap.java +++ b/tsfile/src/main/java/org/apache/tsfile/utils/BitMap.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.tsfile.utils; +package org.apache.tsfile.utils; import java.util.Arrays; import java.util.Objects; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/utils/BloomFilter.java b/tsfile/src/main/java/org/apache/tsfile/utils/BloomFilter.java similarity index 96% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/utils/BloomFilter.java rename to tsfile/src/main/java/org/apache/tsfile/utils/BloomFilter.java index 2c0979548..e7bc3a935 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/utils/BloomFilter.java +++ b/tsfile/src/main/java/org/apache/tsfile/utils/BloomFilter.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.utils; +package org.apache.tsfile.utils; -import org.apache.iotdb.tsfile.common.conf.TSFileConfig; +import org.apache.tsfile.common.conf.TSFileConfig; import java.util.BitSet; import java.util.Objects; -import static org.apache.iotdb.tsfile.utils.RamUsageEstimator.sizeOfLongArray; +import static org.apache.tsfile.utils.RamUsageEstimator.sizeOfLongArray; public class BloomFilter { diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/utils/ByteArrayList.java b/tsfile/src/main/java/org/apache/tsfile/utils/ByteArrayList.java similarity index 99% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/utils/ByteArrayList.java rename to tsfile/src/main/java/org/apache/tsfile/utils/ByteArrayList.java index b3ffd4f59..35e39ce24 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/utils/ByteArrayList.java +++ b/tsfile/src/main/java/org/apache/tsfile/utils/ByteArrayList.java @@ -26,7 +26,7 @@ * *

License: https://github.com/eclipse/eclipse-collections/blob/master/LICENSE-EDL-1.0.txt */ -package org.apache.iotdb.tsfile.utils; +package org.apache.tsfile.utils; import java.util.Arrays; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/utils/BytesUtils.java b/tsfile/src/main/java/org/apache/tsfile/utils/BytesUtils.java similarity index 99% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/utils/BytesUtils.java rename to tsfile/src/main/java/org/apache/tsfile/utils/BytesUtils.java index c4383231f..40862a5dc 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/utils/BytesUtils.java +++ b/tsfile/src/main/java/org/apache/tsfile/utils/BytesUtils.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.utils; +package org.apache.tsfile.utils; -import org.apache.iotdb.tsfile.common.conf.TSFileConfig; +import org.apache.tsfile.common.conf.TSFileConfig; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/utils/FSUtils.java b/tsfile/src/main/java/org/apache/tsfile/utils/FSUtils.java similarity index 94% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/utils/FSUtils.java rename to tsfile/src/main/java/org/apache/tsfile/utils/FSUtils.java index bd74dccc1..cab994c83 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/utils/FSUtils.java +++ b/tsfile/src/main/java/org/apache/tsfile/utils/FSUtils.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.utils; +package org.apache.tsfile.utils; -import org.apache.iotdb.tsfile.common.conf.TSFileConfig; -import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor; -import org.apache.iotdb.tsfile.fileSystem.FSPath; -import org.apache.iotdb.tsfile.fileSystem.FSType; +import org.apache.tsfile.common.conf.TSFileConfig; +import org.apache.tsfile.common.conf.TSFileDescriptor; +import org.apache.tsfile.fileSystem.FSPath; +import org.apache.tsfile.fileSystem.FSType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/utils/FilePathUtils.java b/tsfile/src/main/java/org/apache/tsfile/utils/FilePathUtils.java similarity index 95% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/utils/FilePathUtils.java rename to tsfile/src/main/java/org/apache/tsfile/utils/FilePathUtils.java index 3a4904f9e..b8654769b 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/utils/FilePathUtils.java +++ b/tsfile/src/main/java/org/apache/tsfile/utils/FilePathUtils.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.tsfile.utils; +package org.apache.tsfile.utils; -import org.apache.iotdb.tsfile.common.constant.TsFileConstant; +import org.apache.tsfile.common.constant.TsFileConstant; import java.io.File; @@ -65,7 +65,7 @@ public static String[] splitTsFilePath(String tsFileAbsolutePath) { public static boolean isSequence(String tsFileAbsolutePath) { String[] pathSegments = splitTsFilePath(tsFileAbsolutePath); - // If path is not a regular IoTDB TsFile path, then process it as an unsequence file + // If path is not a regular TsFile path, then process it as an unsequence file if (pathSegments.length < 5) { return false; } diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/utils/Loader.java b/tsfile/src/main/java/org/apache/tsfile/utils/Loader.java similarity index 98% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/utils/Loader.java rename to tsfile/src/main/java/org/apache/tsfile/utils/Loader.java index 65824a21b..1f79b8dcf 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/utils/Loader.java +++ b/tsfile/src/main/java/org/apache/tsfile/utils/Loader.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.utils; +package org.apache.tsfile.utils; import java.io.IOException; import java.net.URI; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/utils/MeasurementGroup.java b/tsfile/src/main/java/org/apache/tsfile/utils/MeasurementGroup.java similarity index 95% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/utils/MeasurementGroup.java rename to tsfile/src/main/java/org/apache/tsfile/utils/MeasurementGroup.java index 21cf4c8b8..996e3476d 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/utils/MeasurementGroup.java +++ b/tsfile/src/main/java/org/apache/tsfile/utils/MeasurementGroup.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.utils; +package org.apache.tsfile.utils; -import org.apache.iotdb.tsfile.write.schema.MeasurementSchema; +import org.apache.tsfile.write.schema.MeasurementSchema; import java.io.Serializable; import java.util.HashMap; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/utils/Murmur128Hash.java b/tsfile/src/main/java/org/apache/tsfile/utils/Murmur128Hash.java similarity index 99% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/utils/Murmur128Hash.java rename to tsfile/src/main/java/org/apache/tsfile/utils/Murmur128Hash.java index ee9d38843..dfb4b4305 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/utils/Murmur128Hash.java +++ b/tsfile/src/main/java/org/apache/tsfile/utils/Murmur128Hash.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.utils; +package org.apache.tsfile.utils; public class Murmur128Hash { diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/utils/Pair.java b/tsfile/src/main/java/org/apache/tsfile/utils/Pair.java similarity index 98% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/utils/Pair.java rename to tsfile/src/main/java/org/apache/tsfile/utils/Pair.java index b51a3b407..4ced2a76e 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/utils/Pair.java +++ b/tsfile/src/main/java/org/apache/tsfile/utils/Pair.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.utils; +package org.apache.tsfile.utils; import java.io.Serializable; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/utils/Preconditions.java b/tsfile/src/main/java/org/apache/tsfile/utils/Preconditions.java similarity index 96% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/utils/Preconditions.java rename to tsfile/src/main/java/org/apache/tsfile/utils/Preconditions.java index 90443038b..ae7e8c9ce 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/utils/Preconditions.java +++ b/tsfile/src/main/java/org/apache/tsfile/utils/Preconditions.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.tsfile.utils; +package org.apache.tsfile.utils; public class Preconditions { diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/utils/PublicBAOS.java b/tsfile/src/main/java/org/apache/tsfile/utils/PublicBAOS.java similarity index 98% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/utils/PublicBAOS.java rename to tsfile/src/main/java/org/apache/tsfile/utils/PublicBAOS.java index 18a459a6e..0c0aa6a1a 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/utils/PublicBAOS.java +++ b/tsfile/src/main/java/org/apache/tsfile/utils/PublicBAOS.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.tsfile.utils; +package org.apache.tsfile.utils; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/utils/ReadWriteForEncodingUtils.java b/tsfile/src/main/java/org/apache/tsfile/utils/ReadWriteForEncodingUtils.java similarity index 99% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/utils/ReadWriteForEncodingUtils.java rename to tsfile/src/main/java/org/apache/tsfile/utils/ReadWriteForEncodingUtils.java index b9d562bf1..7d7412231 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/utils/ReadWriteForEncodingUtils.java +++ b/tsfile/src/main/java/org/apache/tsfile/utils/ReadWriteForEncodingUtils.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.utils; +package org.apache.tsfile.utils; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/utils/ReadWriteIOUtils.java b/tsfile/src/main/java/org/apache/tsfile/utils/ReadWriteIOUtils.java similarity index 97% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/utils/ReadWriteIOUtils.java rename to tsfile/src/main/java/org/apache/tsfile/utils/ReadWriteIOUtils.java index 03a97e97c..65b244660 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/utils/ReadWriteIOUtils.java +++ b/tsfile/src/main/java/org/apache/tsfile/utils/ReadWriteIOUtils.java @@ -17,13 +17,13 @@ * under the License. */ -package org.apache.iotdb.tsfile.utils; +package org.apache.tsfile.utils; -import org.apache.iotdb.tsfile.common.conf.TSFileConfig; -import org.apache.iotdb.tsfile.file.metadata.enums.CompressionType; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding; -import org.apache.iotdb.tsfile.read.reader.TsFileInput; +import org.apache.tsfile.common.conf.TSFileConfig; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.file.metadata.enums.CompressionType; +import org.apache.tsfile.file.metadata.enums.TSEncoding; +import org.apache.tsfile.read.reader.TsFileInput; import java.io.DataOutputStream; import java.io.IOException; @@ -42,14 +42,14 @@ import java.util.Map.Entry; import java.util.Set; -import static org.apache.iotdb.tsfile.utils.ReadWriteIOUtils.ClassSerializeId.BINARY; -import static org.apache.iotdb.tsfile.utils.ReadWriteIOUtils.ClassSerializeId.BOOLEAN; -import static org.apache.iotdb.tsfile.utils.ReadWriteIOUtils.ClassSerializeId.DOUBLE; -import static org.apache.iotdb.tsfile.utils.ReadWriteIOUtils.ClassSerializeId.FLOAT; -import static org.apache.iotdb.tsfile.utils.ReadWriteIOUtils.ClassSerializeId.INTEGER; -import static org.apache.iotdb.tsfile.utils.ReadWriteIOUtils.ClassSerializeId.LONG; -import static org.apache.iotdb.tsfile.utils.ReadWriteIOUtils.ClassSerializeId.NULL; -import static org.apache.iotdb.tsfile.utils.ReadWriteIOUtils.ClassSerializeId.STRING; +import static org.apache.tsfile.utils.ReadWriteIOUtils.ClassSerializeId.BINARY; +import static org.apache.tsfile.utils.ReadWriteIOUtils.ClassSerializeId.BOOLEAN; +import static org.apache.tsfile.utils.ReadWriteIOUtils.ClassSerializeId.DOUBLE; +import static org.apache.tsfile.utils.ReadWriteIOUtils.ClassSerializeId.FLOAT; +import static org.apache.tsfile.utils.ReadWriteIOUtils.ClassSerializeId.INTEGER; +import static org.apache.tsfile.utils.ReadWriteIOUtils.ClassSerializeId.LONG; +import static org.apache.tsfile.utils.ReadWriteIOUtils.ClassSerializeId.NULL; +import static org.apache.tsfile.utils.ReadWriteIOUtils.ClassSerializeId.STRING; /** * ConverterUtils is a utility class. It provides conversion between normal datatype and byte array. diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/utils/RegexUtils.java b/tsfile/src/main/java/org/apache/tsfile/utils/RegexUtils.java similarity index 98% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/utils/RegexUtils.java rename to tsfile/src/main/java/org/apache/tsfile/utils/RegexUtils.java index d6000be8e..75c62341f 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/utils/RegexUtils.java +++ b/tsfile/src/main/java/org/apache/tsfile/utils/RegexUtils.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.tsfile.utils; +package org.apache.tsfile.utils; import java.util.regex.Pattern; import java.util.regex.PatternSyntaxException; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/utils/StringContainer.java b/tsfile/src/main/java/org/apache/tsfile/utils/StringContainer.java similarity index 99% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/utils/StringContainer.java rename to tsfile/src/main/java/org/apache/tsfile/utils/StringContainer.java index bf7424521..9b126b48b 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/utils/StringContainer.java +++ b/tsfile/src/main/java/org/apache/tsfile/utils/StringContainer.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.utils; +package org.apache.tsfile.utils; import java.util.ArrayList; import java.util.List; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/utils/TimeDuration.java b/tsfile/src/main/java/org/apache/tsfile/utils/TimeDuration.java similarity index 99% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/utils/TimeDuration.java rename to tsfile/src/main/java/org/apache/tsfile/utils/TimeDuration.java index 8a0045ddf..042c1d07c 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/utils/TimeDuration.java +++ b/tsfile/src/main/java/org/apache/tsfile/utils/TimeDuration.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.utils; +package org.apache.tsfile.utils; import java.io.DataOutputStream; import java.io.IOException; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/utils/TsFileGeneratorUtils.java b/tsfile/src/main/java/org/apache/tsfile/utils/TsFileGeneratorUtils.java similarity index 92% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/utils/TsFileGeneratorUtils.java rename to tsfile/src/main/java/org/apache/tsfile/utils/TsFileGeneratorUtils.java index 462e50704..d029dd63f 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/utils/TsFileGeneratorUtils.java +++ b/tsfile/src/main/java/org/apache/tsfile/utils/TsFileGeneratorUtils.java @@ -16,31 +16,31 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.utils; +package org.apache.tsfile.utils; -import org.apache.iotdb.tsfile.common.conf.TSFileConfig; -import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor; -import org.apache.iotdb.tsfile.exception.write.WriteProcessException; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding; -import org.apache.iotdb.tsfile.fileSystem.FSFactoryProducer; -import org.apache.iotdb.tsfile.fileSystem.fsFactory.FSFactory; -import org.apache.iotdb.tsfile.read.common.Path; -import org.apache.iotdb.tsfile.write.TsFileWriter; -import org.apache.iotdb.tsfile.write.record.TSRecord; -import org.apache.iotdb.tsfile.write.record.Tablet; -import org.apache.iotdb.tsfile.write.record.datapoint.DataPoint; -import org.apache.iotdb.tsfile.write.record.datapoint.LongDataPoint; -import org.apache.iotdb.tsfile.write.record.datapoint.StringDataPoint; -import org.apache.iotdb.tsfile.write.schema.IMeasurementSchema; -import org.apache.iotdb.tsfile.write.schema.MeasurementSchema; +import org.apache.tsfile.common.conf.TSFileConfig; +import org.apache.tsfile.common.conf.TSFileDescriptor; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.exception.write.WriteProcessException; +import org.apache.tsfile.file.metadata.enums.TSEncoding; +import org.apache.tsfile.fileSystem.FSFactoryProducer; +import org.apache.tsfile.fileSystem.fsFactory.FSFactory; +import org.apache.tsfile.read.common.Path; +import org.apache.tsfile.write.TsFileWriter; +import org.apache.tsfile.write.record.TSRecord; +import org.apache.tsfile.write.record.Tablet; +import org.apache.tsfile.write.record.datapoint.DataPoint; +import org.apache.tsfile.write.record.datapoint.LongDataPoint; +import org.apache.tsfile.write.record.datapoint.StringDataPoint; +import org.apache.tsfile.write.schema.IMeasurementSchema; +import org.apache.tsfile.write.schema.MeasurementSchema; import java.io.File; import java.io.IOException; import java.util.ArrayList; import java.util.List; -import static org.apache.iotdb.tsfile.common.constant.TsFileConstant.PATH_SEPARATOR; +import static org.apache.tsfile.common.constant.TsFileConstant.PATH_SEPARATOR; /** This class is only used for generating aligned or nonAligned tsfiles in test. */ public class TsFileGeneratorUtils { diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/utils/TsFileUtils.java b/tsfile/src/main/java/org/apache/tsfile/utils/TsFileUtils.java similarity index 95% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/utils/TsFileUtils.java rename to tsfile/src/main/java/org/apache/tsfile/utils/TsFileUtils.java index 03ba354c8..abceeaffb 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/utils/TsFileUtils.java +++ b/tsfile/src/main/java/org/apache/tsfile/utils/TsFileUtils.java @@ -15,9 +15,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.iotdb.tsfile.utils; +package org.apache.tsfile.utils; -import org.apache.iotdb.tsfile.read.TsFileSequenceReader; +import org.apache.tsfile.read.TsFileSequenceReader; import java.io.File; import java.io.IOException; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/TsFileWriter.java b/tsfile/src/main/java/org/apache/tsfile/write/TsFileWriter.java similarity index 95% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/write/TsFileWriter.java rename to tsfile/src/main/java/org/apache/tsfile/write/TsFileWriter.java index 2ab6780f1..d35c7d331 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/TsFileWriter.java +++ b/tsfile/src/main/java/org/apache/tsfile/write/TsFileWriter.java @@ -16,27 +16,27 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.write; - -import org.apache.iotdb.tsfile.common.conf.TSFileConfig; -import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor; -import org.apache.iotdb.tsfile.exception.write.NoMeasurementException; -import org.apache.iotdb.tsfile.exception.write.WriteProcessException; -import org.apache.iotdb.tsfile.read.common.Path; -import org.apache.iotdb.tsfile.utils.MeasurementGroup; -import org.apache.iotdb.tsfile.write.chunk.AlignedChunkGroupWriterImpl; -import org.apache.iotdb.tsfile.write.chunk.IChunkGroupWriter; -import org.apache.iotdb.tsfile.write.chunk.NonAlignedChunkGroupWriterImpl; -import org.apache.iotdb.tsfile.write.record.TSRecord; -import org.apache.iotdb.tsfile.write.record.Tablet; -import org.apache.iotdb.tsfile.write.record.datapoint.DataPoint; -import org.apache.iotdb.tsfile.write.schema.IMeasurementSchema; -import org.apache.iotdb.tsfile.write.schema.MeasurementSchema; -import org.apache.iotdb.tsfile.write.schema.Schema; -import org.apache.iotdb.tsfile.write.schema.VectorMeasurementSchema; -import org.apache.iotdb.tsfile.write.writer.RestorableTsFileIOWriter; -import org.apache.iotdb.tsfile.write.writer.TsFileIOWriter; -import org.apache.iotdb.tsfile.write.writer.TsFileOutput; +package org.apache.tsfile.write; + +import org.apache.tsfile.common.conf.TSFileConfig; +import org.apache.tsfile.common.conf.TSFileDescriptor; +import org.apache.tsfile.exception.write.NoMeasurementException; +import org.apache.tsfile.exception.write.WriteProcessException; +import org.apache.tsfile.read.common.Path; +import org.apache.tsfile.utils.MeasurementGroup; +import org.apache.tsfile.write.chunk.AlignedChunkGroupWriterImpl; +import org.apache.tsfile.write.chunk.IChunkGroupWriter; +import org.apache.tsfile.write.chunk.NonAlignedChunkGroupWriterImpl; +import org.apache.tsfile.write.record.TSRecord; +import org.apache.tsfile.write.record.Tablet; +import org.apache.tsfile.write.record.datapoint.DataPoint; +import org.apache.tsfile.write.schema.IMeasurementSchema; +import org.apache.tsfile.write.schema.MeasurementSchema; +import org.apache.tsfile.write.schema.Schema; +import org.apache.tsfile.write.schema.VectorMeasurementSchema; +import org.apache.tsfile.write.writer.RestorableTsFileIOWriter; +import org.apache.tsfile.write.writer.TsFileIOWriter; +import org.apache.tsfile.write.writer.TsFileOutput; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/chunk/AlignedChunkGroupWriterImpl.java b/tsfile/src/main/java/org/apache/tsfile/write/chunk/AlignedChunkGroupWriterImpl.java similarity index 92% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/write/chunk/AlignedChunkGroupWriterImpl.java rename to tsfile/src/main/java/org/apache/tsfile/write/chunk/AlignedChunkGroupWriterImpl.java index 9b6135349..8885a96bd 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/chunk/AlignedChunkGroupWriterImpl.java +++ b/tsfile/src/main/java/org/apache/tsfile/write/chunk/AlignedChunkGroupWriterImpl.java @@ -16,22 +16,22 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.write.chunk; +package org.apache.tsfile.write.chunk; -import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor; -import org.apache.iotdb.tsfile.common.constant.TsFileConstant; -import org.apache.iotdb.tsfile.encoding.encoder.Encoder; -import org.apache.iotdb.tsfile.encoding.encoder.TSEncodingBuilder; -import org.apache.iotdb.tsfile.exception.write.UnSupportedDataTypeException; -import org.apache.iotdb.tsfile.exception.write.WriteProcessException; -import org.apache.iotdb.tsfile.file.metadata.enums.CompressionType; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding; -import org.apache.iotdb.tsfile.utils.Binary; -import org.apache.iotdb.tsfile.write.record.Tablet; -import org.apache.iotdb.tsfile.write.record.datapoint.DataPoint; -import org.apache.iotdb.tsfile.write.schema.MeasurementSchema; -import org.apache.iotdb.tsfile.write.writer.TsFileIOWriter; +import org.apache.tsfile.common.conf.TSFileDescriptor; +import org.apache.tsfile.common.constant.TsFileConstant; +import org.apache.tsfile.encoding.encoder.Encoder; +import org.apache.tsfile.encoding.encoder.TSEncodingBuilder; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.exception.write.WriteProcessException; +import org.apache.tsfile.file.metadata.enums.CompressionType; +import org.apache.tsfile.file.metadata.enums.TSEncoding; +import org.apache.tsfile.utils.Binary; +import org.apache.tsfile.write.UnSupportedDataTypeException; +import org.apache.tsfile.write.record.Tablet; +import org.apache.tsfile.write.record.datapoint.DataPoint; +import org.apache.tsfile.write.schema.MeasurementSchema; +import org.apache.tsfile.write.writer.TsFileIOWriter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/chunk/AlignedChunkWriterImpl.java b/tsfile/src/main/java/org/apache/tsfile/write/chunk/AlignedChunkWriterImpl.java similarity index 94% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/write/chunk/AlignedChunkWriterImpl.java rename to tsfile/src/main/java/org/apache/tsfile/write/chunk/AlignedChunkWriterImpl.java index 3ae1ffdcb..656b7852e 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/chunk/AlignedChunkWriterImpl.java +++ b/tsfile/src/main/java/org/apache/tsfile/write/chunk/AlignedChunkWriterImpl.java @@ -16,23 +16,23 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.write.chunk; - -import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor; -import org.apache.iotdb.tsfile.encoding.encoder.Encoder; -import org.apache.iotdb.tsfile.encoding.encoder.TSEncodingBuilder; -import org.apache.iotdb.tsfile.exception.write.PageException; -import org.apache.iotdb.tsfile.file.header.PageHeader; -import org.apache.iotdb.tsfile.file.metadata.enums.CompressionType; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding; -import org.apache.iotdb.tsfile.read.common.block.column.Column; -import org.apache.iotdb.tsfile.read.common.block.column.TimeColumn; -import org.apache.iotdb.tsfile.utils.Binary; -import org.apache.iotdb.tsfile.utils.TsPrimitiveType; -import org.apache.iotdb.tsfile.write.schema.IMeasurementSchema; -import org.apache.iotdb.tsfile.write.schema.VectorMeasurementSchema; -import org.apache.iotdb.tsfile.write.writer.TsFileIOWriter; +package org.apache.tsfile.write.chunk; + +import org.apache.tsfile.block.column.Column; +import org.apache.tsfile.common.conf.TSFileDescriptor; +import org.apache.tsfile.encoding.encoder.Encoder; +import org.apache.tsfile.encoding.encoder.TSEncodingBuilder; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.exception.write.PageException; +import org.apache.tsfile.file.header.PageHeader; +import org.apache.tsfile.file.metadata.enums.CompressionType; +import org.apache.tsfile.file.metadata.enums.TSEncoding; +import org.apache.tsfile.read.common.block.column.TimeColumn; +import org.apache.tsfile.utils.Binary; +import org.apache.tsfile.utils.TsPrimitiveType; +import org.apache.tsfile.write.schema.IMeasurementSchema; +import org.apache.tsfile.write.schema.VectorMeasurementSchema; +import org.apache.tsfile.write.writer.TsFileIOWriter; import java.io.IOException; import java.nio.ByteBuffer; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/chunk/ChunkWriterImpl.java b/tsfile/src/main/java/org/apache/tsfile/write/chunk/ChunkWriterImpl.java similarity index 95% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/write/chunk/ChunkWriterImpl.java rename to tsfile/src/main/java/org/apache/tsfile/write/chunk/ChunkWriterImpl.java index 013ab714c..f6efe2409 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/chunk/ChunkWriterImpl.java +++ b/tsfile/src/main/java/org/apache/tsfile/write/chunk/ChunkWriterImpl.java @@ -16,22 +16,22 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.write.chunk; - -import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor; -import org.apache.iotdb.tsfile.compress.ICompressor; -import org.apache.iotdb.tsfile.encoding.encoder.SDTEncoder; -import org.apache.iotdb.tsfile.exception.write.PageException; -import org.apache.iotdb.tsfile.file.header.ChunkHeader; -import org.apache.iotdb.tsfile.file.header.PageHeader; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.file.metadata.statistics.Statistics; -import org.apache.iotdb.tsfile.utils.Binary; -import org.apache.iotdb.tsfile.utils.PublicBAOS; -import org.apache.iotdb.tsfile.utils.ReadWriteForEncodingUtils; -import org.apache.iotdb.tsfile.write.page.PageWriter; -import org.apache.iotdb.tsfile.write.schema.IMeasurementSchema; -import org.apache.iotdb.tsfile.write.writer.TsFileIOWriter; +package org.apache.tsfile.write.chunk; + +import org.apache.tsfile.common.conf.TSFileDescriptor; +import org.apache.tsfile.compress.ICompressor; +import org.apache.tsfile.encoding.encoder.SDTEncoder; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.exception.write.PageException; +import org.apache.tsfile.file.header.ChunkHeader; +import org.apache.tsfile.file.header.PageHeader; +import org.apache.tsfile.file.metadata.statistics.Statistics; +import org.apache.tsfile.utils.Binary; +import org.apache.tsfile.utils.PublicBAOS; +import org.apache.tsfile.utils.ReadWriteForEncodingUtils; +import org.apache.tsfile.write.page.PageWriter; +import org.apache.tsfile.write.schema.IMeasurementSchema; +import org.apache.tsfile.write.writer.TsFileIOWriter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/chunk/IChunkGroupWriter.java b/tsfile/src/main/java/org/apache/tsfile/write/chunk/IChunkGroupWriter.java similarity index 90% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/write/chunk/IChunkGroupWriter.java rename to tsfile/src/main/java/org/apache/tsfile/write/chunk/IChunkGroupWriter.java index 94bee180b..c9ca7a922 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/chunk/IChunkGroupWriter.java +++ b/tsfile/src/main/java/org/apache/tsfile/write/chunk/IChunkGroupWriter.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.write.chunk; +package org.apache.tsfile.write.chunk; -import org.apache.iotdb.tsfile.exception.write.WriteProcessException; -import org.apache.iotdb.tsfile.write.record.Tablet; -import org.apache.iotdb.tsfile.write.record.datapoint.DataPoint; -import org.apache.iotdb.tsfile.write.schema.MeasurementSchema; -import org.apache.iotdb.tsfile.write.writer.TsFileIOWriter; +import org.apache.tsfile.exception.write.WriteProcessException; +import org.apache.tsfile.write.record.Tablet; +import org.apache.tsfile.write.record.datapoint.DataPoint; +import org.apache.tsfile.write.schema.MeasurementSchema; +import org.apache.tsfile.write.writer.TsFileIOWriter; import java.io.IOException; import java.util.List; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/chunk/IChunkWriter.java b/tsfile/src/main/java/org/apache/tsfile/write/chunk/IChunkWriter.java similarity index 95% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/write/chunk/IChunkWriter.java rename to tsfile/src/main/java/org/apache/tsfile/write/chunk/IChunkWriter.java index 2550172dd..85b9828a7 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/chunk/IChunkWriter.java +++ b/tsfile/src/main/java/org/apache/tsfile/write/chunk/IChunkWriter.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.write.chunk; +package org.apache.tsfile.write.chunk; -import org.apache.iotdb.tsfile.write.writer.TsFileIOWriter; +import org.apache.tsfile.write.writer.TsFileIOWriter; import java.io.IOException; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/chunk/NonAlignedChunkGroupWriterImpl.java b/tsfile/src/main/java/org/apache/tsfile/write/chunk/NonAlignedChunkGroupWriterImpl.java similarity index 90% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/write/chunk/NonAlignedChunkGroupWriterImpl.java rename to tsfile/src/main/java/org/apache/tsfile/write/chunk/NonAlignedChunkGroupWriterImpl.java index 4d207c98f..4bf0617a4 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/chunk/NonAlignedChunkGroupWriterImpl.java +++ b/tsfile/src/main/java/org/apache/tsfile/write/chunk/NonAlignedChunkGroupWriterImpl.java @@ -16,18 +16,18 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.write.chunk; - -import org.apache.iotdb.tsfile.common.constant.TsFileConstant; -import org.apache.iotdb.tsfile.exception.write.UnSupportedDataTypeException; -import org.apache.iotdb.tsfile.exception.write.WriteProcessException; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.utils.Binary; -import org.apache.iotdb.tsfile.write.record.Tablet; -import org.apache.iotdb.tsfile.write.record.datapoint.DataPoint; -import org.apache.iotdb.tsfile.write.schema.IMeasurementSchema; -import org.apache.iotdb.tsfile.write.schema.MeasurementSchema; -import org.apache.iotdb.tsfile.write.writer.TsFileIOWriter; +package org.apache.tsfile.write.chunk; + +import org.apache.tsfile.common.constant.TsFileConstant; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.exception.write.WriteProcessException; +import org.apache.tsfile.utils.Binary; +import org.apache.tsfile.write.UnSupportedDataTypeException; +import org.apache.tsfile.write.record.Tablet; +import org.apache.tsfile.write.record.datapoint.DataPoint; +import org.apache.tsfile.write.schema.IMeasurementSchema; +import org.apache.tsfile.write.schema.MeasurementSchema; +import org.apache.tsfile.write.writer.TsFileIOWriter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/chunk/TimeChunkWriter.java b/tsfile/src/main/java/org/apache/tsfile/write/chunk/TimeChunkWriter.java similarity index 91% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/write/chunk/TimeChunkWriter.java rename to tsfile/src/main/java/org/apache/tsfile/write/chunk/TimeChunkWriter.java index 9acf84ac8..b12e2e53e 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/chunk/TimeChunkWriter.java +++ b/tsfile/src/main/java/org/apache/tsfile/write/chunk/TimeChunkWriter.java @@ -16,24 +16,24 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.write.chunk; - -import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor; -import org.apache.iotdb.tsfile.common.constant.TsFileConstant; -import org.apache.iotdb.tsfile.compress.ICompressor; -import org.apache.iotdb.tsfile.encoding.encoder.Encoder; -import org.apache.iotdb.tsfile.exception.write.PageException; -import org.apache.iotdb.tsfile.file.header.ChunkHeader; -import org.apache.iotdb.tsfile.file.header.PageHeader; -import org.apache.iotdb.tsfile.file.metadata.enums.CompressionType; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding; -import org.apache.iotdb.tsfile.file.metadata.statistics.Statistics; -import org.apache.iotdb.tsfile.file.metadata.statistics.TimeStatistics; -import org.apache.iotdb.tsfile.utils.PublicBAOS; -import org.apache.iotdb.tsfile.utils.ReadWriteForEncodingUtils; -import org.apache.iotdb.tsfile.write.page.TimePageWriter; -import org.apache.iotdb.tsfile.write.writer.TsFileIOWriter; +package org.apache.tsfile.write.chunk; + +import org.apache.tsfile.common.conf.TSFileDescriptor; +import org.apache.tsfile.common.constant.TsFileConstant; +import org.apache.tsfile.compress.ICompressor; +import org.apache.tsfile.encoding.encoder.Encoder; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.exception.write.PageException; +import org.apache.tsfile.file.header.ChunkHeader; +import org.apache.tsfile.file.header.PageHeader; +import org.apache.tsfile.file.metadata.enums.CompressionType; +import org.apache.tsfile.file.metadata.enums.TSEncoding; +import org.apache.tsfile.file.metadata.statistics.Statistics; +import org.apache.tsfile.file.metadata.statistics.TimeStatistics; +import org.apache.tsfile.utils.PublicBAOS; +import org.apache.tsfile.utils.ReadWriteForEncodingUtils; +import org.apache.tsfile.write.page.TimePageWriter; +import org.apache.tsfile.write.writer.TsFileIOWriter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/chunk/ValueChunkWriter.java b/tsfile/src/main/java/org/apache/tsfile/write/chunk/ValueChunkWriter.java similarity index 93% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/write/chunk/ValueChunkWriter.java rename to tsfile/src/main/java/org/apache/tsfile/write/chunk/ValueChunkWriter.java index de289b9bb..788f741fe 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/chunk/ValueChunkWriter.java +++ b/tsfile/src/main/java/org/apache/tsfile/write/chunk/ValueChunkWriter.java @@ -16,24 +16,24 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.write.chunk; - -import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor; -import org.apache.iotdb.tsfile.common.constant.TsFileConstant; -import org.apache.iotdb.tsfile.compress.ICompressor; -import org.apache.iotdb.tsfile.encoding.encoder.Encoder; -import org.apache.iotdb.tsfile.exception.write.PageException; -import org.apache.iotdb.tsfile.file.header.ChunkHeader; -import org.apache.iotdb.tsfile.file.header.PageHeader; -import org.apache.iotdb.tsfile.file.metadata.enums.CompressionType; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding; -import org.apache.iotdb.tsfile.file.metadata.statistics.Statistics; -import org.apache.iotdb.tsfile.utils.Binary; -import org.apache.iotdb.tsfile.utils.PublicBAOS; -import org.apache.iotdb.tsfile.utils.ReadWriteForEncodingUtils; -import org.apache.iotdb.tsfile.write.page.ValuePageWriter; -import org.apache.iotdb.tsfile.write.writer.TsFileIOWriter; +package org.apache.tsfile.write.chunk; + +import org.apache.tsfile.common.conf.TSFileDescriptor; +import org.apache.tsfile.common.constant.TsFileConstant; +import org.apache.tsfile.compress.ICompressor; +import org.apache.tsfile.encoding.encoder.Encoder; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.exception.write.PageException; +import org.apache.tsfile.file.header.ChunkHeader; +import org.apache.tsfile.file.header.PageHeader; +import org.apache.tsfile.file.metadata.enums.CompressionType; +import org.apache.tsfile.file.metadata.enums.TSEncoding; +import org.apache.tsfile.file.metadata.statistics.Statistics; +import org.apache.tsfile.utils.Binary; +import org.apache.tsfile.utils.PublicBAOS; +import org.apache.tsfile.utils.ReadWriteForEncodingUtils; +import org.apache.tsfile.write.page.ValuePageWriter; +import org.apache.tsfile.write.writer.TsFileIOWriter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/page/PageWriter.java b/tsfile/src/main/java/org/apache/tsfile/write/page/PageWriter.java similarity index 94% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/write/page/PageWriter.java rename to tsfile/src/main/java/org/apache/tsfile/write/page/PageWriter.java index 040190847..6d480c003 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/page/PageWriter.java +++ b/tsfile/src/main/java/org/apache/tsfile/write/page/PageWriter.java @@ -16,17 +16,17 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.write.page; - -import org.apache.iotdb.tsfile.compress.ICompressor; -import org.apache.iotdb.tsfile.encoding.encoder.Encoder; -import org.apache.iotdb.tsfile.file.metadata.enums.CompressionType; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.file.metadata.statistics.Statistics; -import org.apache.iotdb.tsfile.utils.Binary; -import org.apache.iotdb.tsfile.utils.PublicBAOS; -import org.apache.iotdb.tsfile.utils.ReadWriteForEncodingUtils; -import org.apache.iotdb.tsfile.write.schema.IMeasurementSchema; +package org.apache.tsfile.write.page; + +import org.apache.tsfile.compress.ICompressor; +import org.apache.tsfile.encoding.encoder.Encoder; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.file.metadata.enums.CompressionType; +import org.apache.tsfile.file.metadata.statistics.Statistics; +import org.apache.tsfile.utils.Binary; +import org.apache.tsfile.utils.PublicBAOS; +import org.apache.tsfile.utils.ReadWriteForEncodingUtils; +import org.apache.tsfile.write.schema.IMeasurementSchema; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/page/TimePageWriter.java b/tsfile/src/main/java/org/apache/tsfile/write/page/TimePageWriter.java similarity index 93% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/write/page/TimePageWriter.java rename to tsfile/src/main/java/org/apache/tsfile/write/page/TimePageWriter.java index ccaaf72c2..31f3d2a01 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/page/TimePageWriter.java +++ b/tsfile/src/main/java/org/apache/tsfile/write/page/TimePageWriter.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.write.page; - -import org.apache.iotdb.tsfile.compress.ICompressor; -import org.apache.iotdb.tsfile.encoding.encoder.Encoder; -import org.apache.iotdb.tsfile.file.metadata.enums.CompressionType; -import org.apache.iotdb.tsfile.file.metadata.statistics.TimeStatistics; -import org.apache.iotdb.tsfile.utils.PublicBAOS; -import org.apache.iotdb.tsfile.utils.ReadWriteForEncodingUtils; +package org.apache.tsfile.write.page; + +import org.apache.tsfile.compress.ICompressor; +import org.apache.tsfile.encoding.encoder.Encoder; +import org.apache.tsfile.file.metadata.enums.CompressionType; +import org.apache.tsfile.file.metadata.statistics.TimeStatistics; +import org.apache.tsfile.utils.PublicBAOS; +import org.apache.tsfile.utils.ReadWriteForEncodingUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/page/ValuePageWriter.java b/tsfile/src/main/java/org/apache/tsfile/write/page/ValuePageWriter.java similarity index 95% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/write/page/ValuePageWriter.java rename to tsfile/src/main/java/org/apache/tsfile/write/page/ValuePageWriter.java index 329a5c74d..70547b43d 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/page/ValuePageWriter.java +++ b/tsfile/src/main/java/org/apache/tsfile/write/page/ValuePageWriter.java @@ -16,16 +16,16 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.write.page; - -import org.apache.iotdb.tsfile.compress.ICompressor; -import org.apache.iotdb.tsfile.encoding.encoder.Encoder; -import org.apache.iotdb.tsfile.file.metadata.enums.CompressionType; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.file.metadata.statistics.Statistics; -import org.apache.iotdb.tsfile.utils.Binary; -import org.apache.iotdb.tsfile.utils.PublicBAOS; -import org.apache.iotdb.tsfile.utils.ReadWriteForEncodingUtils; +package org.apache.tsfile.write.page; + +import org.apache.tsfile.compress.ICompressor; +import org.apache.tsfile.encoding.encoder.Encoder; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.file.metadata.enums.CompressionType; +import org.apache.tsfile.file.metadata.statistics.Statistics; +import org.apache.tsfile.utils.Binary; +import org.apache.tsfile.utils.PublicBAOS; +import org.apache.tsfile.utils.ReadWriteForEncodingUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/record/TSRecord.java b/tsfile/src/main/java/org/apache/tsfile/write/record/TSRecord.java similarity index 93% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/write/record/TSRecord.java rename to tsfile/src/main/java/org/apache/tsfile/write/record/TSRecord.java index e1263ffed..d7dcae15b 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/record/TSRecord.java +++ b/tsfile/src/main/java/org/apache/tsfile/write/record/TSRecord.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.write.record; +package org.apache.tsfile.write.record; -import org.apache.iotdb.tsfile.utils.StringContainer; -import org.apache.iotdb.tsfile.write.record.datapoint.DataPoint; +import org.apache.tsfile.utils.StringContainer; +import org.apache.tsfile.write.record.datapoint.DataPoint; import java.util.ArrayList; import java.util.List; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/record/Tablet.java b/tsfile/src/main/java/org/apache/tsfile/write/record/Tablet.java similarity index 97% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/write/record/Tablet.java rename to tsfile/src/main/java/org/apache/tsfile/write/record/Tablet.java index a1db43b72..c16bfa2eb 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/record/Tablet.java +++ b/tsfile/src/main/java/org/apache/tsfile/write/record/Tablet.java @@ -16,17 +16,17 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.write.record; - -import org.apache.iotdb.tsfile.common.conf.TSFileConfig; -import org.apache.iotdb.tsfile.exception.write.UnSupportedDataTypeException; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.utils.Binary; -import org.apache.iotdb.tsfile.utils.BitMap; -import org.apache.iotdb.tsfile.utils.BytesUtils; -import org.apache.iotdb.tsfile.utils.PublicBAOS; -import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils; -import org.apache.iotdb.tsfile.write.schema.MeasurementSchema; +package org.apache.tsfile.write.record; + +import org.apache.tsfile.common.conf.TSFileConfig; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.utils.Binary; +import org.apache.tsfile.utils.BitMap; +import org.apache.tsfile.utils.BytesUtils; +import org.apache.tsfile.utils.PublicBAOS; +import org.apache.tsfile.utils.ReadWriteIOUtils; +import org.apache.tsfile.write.UnSupportedDataTypeException; +import org.apache.tsfile.write.schema.MeasurementSchema; import java.io.DataOutputStream; import java.io.IOException; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/record/datapoint/BooleanDataPoint.java b/tsfile/src/main/java/org/apache/tsfile/write/record/datapoint/BooleanDataPoint.java similarity index 90% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/write/record/datapoint/BooleanDataPoint.java rename to tsfile/src/main/java/org/apache/tsfile/write/record/datapoint/BooleanDataPoint.java index 62cfdd49a..084a1a78c 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/record/datapoint/BooleanDataPoint.java +++ b/tsfile/src/main/java/org/apache/tsfile/write/record/datapoint/BooleanDataPoint.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.write.record.datapoint; +package org.apache.tsfile.write.record.datapoint; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.write.chunk.ChunkWriterImpl; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.write.chunk.ChunkWriterImpl; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/record/datapoint/DataPoint.java b/tsfile/src/main/java/org/apache/tsfile/write/record/datapoint/DataPoint.java similarity index 91% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/write/record/datapoint/DataPoint.java rename to tsfile/src/main/java/org/apache/tsfile/write/record/datapoint/DataPoint.java index 9c4414cd8..6bfa1b69e 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/record/datapoint/DataPoint.java +++ b/tsfile/src/main/java/org/apache/tsfile/write/record/datapoint/DataPoint.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.tsfile.write.record.datapoint; - -import org.apache.iotdb.tsfile.common.conf.TSFileConfig; -import org.apache.iotdb.tsfile.exception.write.UnSupportedDataTypeException; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.utils.Binary; -import org.apache.iotdb.tsfile.utils.StringContainer; -import org.apache.iotdb.tsfile.write.chunk.ChunkWriterImpl; +package org.apache.tsfile.write.record.datapoint; + +import org.apache.tsfile.common.conf.TSFileConfig; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.utils.Binary; +import org.apache.tsfile.utils.StringContainer; +import org.apache.tsfile.write.UnSupportedDataTypeException; +import org.apache.tsfile.write.chunk.ChunkWriterImpl; import java.io.IOException; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/record/datapoint/DoubleDataPoint.java b/tsfile/src/main/java/org/apache/tsfile/write/record/datapoint/DoubleDataPoint.java similarity index 90% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/write/record/datapoint/DoubleDataPoint.java rename to tsfile/src/main/java/org/apache/tsfile/write/record/datapoint/DoubleDataPoint.java index ed00375dd..7aed78995 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/record/datapoint/DoubleDataPoint.java +++ b/tsfile/src/main/java/org/apache/tsfile/write/record/datapoint/DoubleDataPoint.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.write.record.datapoint; +package org.apache.tsfile.write.record.datapoint; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.write.chunk.ChunkWriterImpl; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.write.chunk.ChunkWriterImpl; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/record/datapoint/FloatDataPoint.java b/tsfile/src/main/java/org/apache/tsfile/write/record/datapoint/FloatDataPoint.java similarity index 90% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/write/record/datapoint/FloatDataPoint.java rename to tsfile/src/main/java/org/apache/tsfile/write/record/datapoint/FloatDataPoint.java index f00bdbe48..af340b2b0 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/record/datapoint/FloatDataPoint.java +++ b/tsfile/src/main/java/org/apache/tsfile/write/record/datapoint/FloatDataPoint.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.write.record.datapoint; +package org.apache.tsfile.write.record.datapoint; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.write.chunk.ChunkWriterImpl; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.write.chunk.ChunkWriterImpl; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/record/datapoint/IntDataPoint.java b/tsfile/src/main/java/org/apache/tsfile/write/record/datapoint/IntDataPoint.java similarity index 90% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/write/record/datapoint/IntDataPoint.java rename to tsfile/src/main/java/org/apache/tsfile/write/record/datapoint/IntDataPoint.java index 14bab4923..f59705afc 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/record/datapoint/IntDataPoint.java +++ b/tsfile/src/main/java/org/apache/tsfile/write/record/datapoint/IntDataPoint.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.write.record.datapoint; +package org.apache.tsfile.write.record.datapoint; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.write.chunk.ChunkWriterImpl; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.write.chunk.ChunkWriterImpl; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/record/datapoint/LongDataPoint.java b/tsfile/src/main/java/org/apache/tsfile/write/record/datapoint/LongDataPoint.java similarity index 90% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/write/record/datapoint/LongDataPoint.java rename to tsfile/src/main/java/org/apache/tsfile/write/record/datapoint/LongDataPoint.java index f2549f561..d7e6a991e 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/record/datapoint/LongDataPoint.java +++ b/tsfile/src/main/java/org/apache/tsfile/write/record/datapoint/LongDataPoint.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.write.record.datapoint; +package org.apache.tsfile.write.record.datapoint; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.write.chunk.ChunkWriterImpl; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.write.chunk.ChunkWriterImpl; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/record/datapoint/StringDataPoint.java b/tsfile/src/main/java/org/apache/tsfile/write/record/datapoint/StringDataPoint.java similarity index 88% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/write/record/datapoint/StringDataPoint.java rename to tsfile/src/main/java/org/apache/tsfile/write/record/datapoint/StringDataPoint.java index 72c019b6f..0fd830f02 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/record/datapoint/StringDataPoint.java +++ b/tsfile/src/main/java/org/apache/tsfile/write/record/datapoint/StringDataPoint.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.write.record.datapoint; +package org.apache.tsfile.write.record.datapoint; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.utils.Binary; -import org.apache.iotdb.tsfile.write.chunk.ChunkWriterImpl; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.utils.Binary; +import org.apache.tsfile.write.chunk.ChunkWriterImpl; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/schema/IMeasurementSchema.java b/tsfile/src/main/java/org/apache/tsfile/write/schema/IMeasurementSchema.java similarity index 89% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/write/schema/IMeasurementSchema.java rename to tsfile/src/main/java/org/apache/tsfile/write/schema/IMeasurementSchema.java index bd506bd13..da474aecf 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/schema/IMeasurementSchema.java +++ b/tsfile/src/main/java/org/apache/tsfile/write/schema/IMeasurementSchema.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.tsfile.write.schema; +package org.apache.tsfile.write.schema; -import org.apache.iotdb.tsfile.encoding.encoder.Encoder; -import org.apache.iotdb.tsfile.file.metadata.enums.CompressionType; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding; +import org.apache.tsfile.encoding.encoder.Encoder; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.file.metadata.enums.CompressionType; +import org.apache.tsfile.file.metadata.enums.TSEncoding; import java.io.IOException; import java.io.OutputStream; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/schema/MeasurementSchema.java b/tsfile/src/main/java/org/apache/tsfile/write/schema/MeasurementSchema.java similarity index 94% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/write/schema/MeasurementSchema.java rename to tsfile/src/main/java/org/apache/tsfile/write/schema/MeasurementSchema.java index fe536d82f..680a43cd3 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/schema/MeasurementSchema.java +++ b/tsfile/src/main/java/org/apache/tsfile/write/schema/MeasurementSchema.java @@ -16,16 +16,16 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.write.schema; +package org.apache.tsfile.write.schema; -import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor; -import org.apache.iotdb.tsfile.encoding.encoder.Encoder; -import org.apache.iotdb.tsfile.encoding.encoder.TSEncodingBuilder; -import org.apache.iotdb.tsfile.file.metadata.enums.CompressionType; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding; -import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils; -import org.apache.iotdb.tsfile.utils.StringContainer; +import org.apache.tsfile.common.conf.TSFileDescriptor; +import org.apache.tsfile.encoding.encoder.Encoder; +import org.apache.tsfile.encoding.encoder.TSEncodingBuilder; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.file.metadata.enums.CompressionType; +import org.apache.tsfile.file.metadata.enums.TSEncoding; +import org.apache.tsfile.utils.ReadWriteIOUtils; +import org.apache.tsfile.utils.StringContainer; import java.io.IOException; import java.io.InputStream; @@ -38,10 +38,10 @@ import java.util.Objects; /** - * This class describes a measurement's information registered in {@linkplain Schema FileSchema}, - * including measurement id, data type, encoding and compressor type. For each TSEncoding, - * MeasurementSchema maintains respective TSEncodingBuilder; For TSDataType, only ENUM has - * TSDataTypeConverter up to now. + * This class describes a measurement's information registered in {@linkplain + * org.apache.tsfile.write.schema.Schema FileSchema}, including measurement id, data type, encoding + * and compressor type. For each TSEncoding, MeasurementSchema maintains respective + * TSEncodingBuilder; For TSDataType, only ENUM has TSDataTypeConverter up to now. */ public class MeasurementSchema implements IMeasurementSchema, Comparable, Serializable { diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/schema/MeasurementSchemaType.java b/tsfile/src/main/java/org/apache/tsfile/write/schema/MeasurementSchemaType.java similarity index 96% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/write/schema/MeasurementSchemaType.java rename to tsfile/src/main/java/org/apache/tsfile/write/schema/MeasurementSchemaType.java index d51ce12cb..7d34e07f6 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/schema/MeasurementSchemaType.java +++ b/tsfile/src/main/java/org/apache/tsfile/write/schema/MeasurementSchemaType.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.write.schema; +package org.apache.tsfile.write.schema; public enum MeasurementSchemaType { MEASUREMENT_SCHEMA((byte) 0), diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/schema/Schema.java b/tsfile/src/main/java/org/apache/tsfile/write/schema/Schema.java similarity index 96% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/write/schema/Schema.java rename to tsfile/src/main/java/org/apache/tsfile/write/schema/Schema.java index d75fa4098..54ab66635 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/schema/Schema.java +++ b/tsfile/src/main/java/org/apache/tsfile/write/schema/Schema.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.write.schema; +package org.apache.tsfile.write.schema; -import org.apache.iotdb.tsfile.read.common.Path; -import org.apache.iotdb.tsfile.utils.MeasurementGroup; +import org.apache.tsfile.read.common.Path; +import org.apache.tsfile.utils.MeasurementGroup; import java.io.Serializable; import java.util.HashMap; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/schema/TimeseriesSchema.java b/tsfile/src/main/java/org/apache/tsfile/write/schema/TimeseriesSchema.java similarity index 93% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/write/schema/TimeseriesSchema.java rename to tsfile/src/main/java/org/apache/tsfile/write/schema/TimeseriesSchema.java index edd759605..0c287e85f 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/schema/TimeseriesSchema.java +++ b/tsfile/src/main/java/org/apache/tsfile/write/schema/TimeseriesSchema.java @@ -17,16 +17,16 @@ * under the License. */ -package org.apache.iotdb.tsfile.write.schema; - -import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor; -import org.apache.iotdb.tsfile.encoding.encoder.Encoder; -import org.apache.iotdb.tsfile.encoding.encoder.TSEncodingBuilder; -import org.apache.iotdb.tsfile.file.metadata.enums.CompressionType; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding; -import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils; -import org.apache.iotdb.tsfile.utils.StringContainer; +package org.apache.tsfile.write.schema; + +import org.apache.tsfile.common.conf.TSFileDescriptor; +import org.apache.tsfile.encoding.encoder.Encoder; +import org.apache.tsfile.encoding.encoder.TSEncodingBuilder; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.file.metadata.enums.CompressionType; +import org.apache.tsfile.file.metadata.enums.TSEncoding; +import org.apache.tsfile.utils.ReadWriteIOUtils; +import org.apache.tsfile.utils.StringContainer; import java.io.IOException; import java.io.OutputStream; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/schema/VectorMeasurementSchema.java b/tsfile/src/main/java/org/apache/tsfile/write/schema/VectorMeasurementSchema.java similarity index 96% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/write/schema/VectorMeasurementSchema.java rename to tsfile/src/main/java/org/apache/tsfile/write/schema/VectorMeasurementSchema.java index 32bc3214f..1a24538ab 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/schema/VectorMeasurementSchema.java +++ b/tsfile/src/main/java/org/apache/tsfile/write/schema/VectorMeasurementSchema.java @@ -17,16 +17,16 @@ * under the License. */ -package org.apache.iotdb.tsfile.write.schema; - -import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor; -import org.apache.iotdb.tsfile.encoding.encoder.Encoder; -import org.apache.iotdb.tsfile.encoding.encoder.TSEncodingBuilder; -import org.apache.iotdb.tsfile.file.metadata.enums.CompressionType; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding; -import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils; -import org.apache.iotdb.tsfile.utils.StringContainer; +package org.apache.tsfile.write.schema; + +import org.apache.tsfile.common.conf.TSFileDescriptor; +import org.apache.tsfile.encoding.encoder.Encoder; +import org.apache.tsfile.encoding.encoder.TSEncodingBuilder; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.file.metadata.enums.CompressionType; +import org.apache.tsfile.file.metadata.enums.TSEncoding; +import org.apache.tsfile.utils.ReadWriteIOUtils; +import org.apache.tsfile.utils.StringContainer; import java.io.IOException; import java.io.InputStream; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/writer/ForceAppendTsFileWriter.java b/tsfile/src/main/java/org/apache/tsfile/write/writer/ForceAppendTsFileWriter.java similarity index 86% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/write/writer/ForceAppendTsFileWriter.java rename to tsfile/src/main/java/org/apache/tsfile/write/writer/ForceAppendTsFileWriter.java index 83ee04eed..7bb5b5062 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/writer/ForceAppendTsFileWriter.java +++ b/tsfile/src/main/java/org/apache/tsfile/write/writer/ForceAppendTsFileWriter.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.write.writer; +package org.apache.tsfile.write.writer; -import org.apache.iotdb.tsfile.exception.write.TsFileNotCompleteException; -import org.apache.iotdb.tsfile.file.metadata.ChunkGroupMetadata; -import org.apache.iotdb.tsfile.file.metadata.ChunkMetadata; -import org.apache.iotdb.tsfile.file.metadata.TsFileMetadata; -import org.apache.iotdb.tsfile.fileSystem.FSFactoryProducer; -import org.apache.iotdb.tsfile.read.TsFileSequenceReader; +import org.apache.tsfile.exception.write.TsFileNotCompleteException; +import org.apache.tsfile.file.metadata.ChunkGroupMetadata; +import org.apache.tsfile.file.metadata.ChunkMetadata; +import org.apache.tsfile.file.metadata.TsFileMetadata; +import org.apache.tsfile.fileSystem.FSFactoryProducer; +import org.apache.tsfile.read.TsFileSequenceReader; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/writer/IDataWriter.java b/tsfile/src/main/java/org/apache/tsfile/write/writer/IDataWriter.java similarity index 94% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/write/writer/IDataWriter.java rename to tsfile/src/main/java/org/apache/tsfile/write/writer/IDataWriter.java index 5a56a9a8d..19449e328 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/writer/IDataWriter.java +++ b/tsfile/src/main/java/org/apache/tsfile/write/writer/IDataWriter.java @@ -16,6 +16,6 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.write.writer; +package org.apache.tsfile.write.writer; public interface IDataWriter {} diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/writer/LocalTsFileOutput.java b/tsfile/src/main/java/org/apache/tsfile/write/writer/LocalTsFileOutput.java similarity index 98% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/write/writer/LocalTsFileOutput.java rename to tsfile/src/main/java/org/apache/tsfile/write/writer/LocalTsFileOutput.java index af0b19bb9..256d7ee81 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/writer/LocalTsFileOutput.java +++ b/tsfile/src/main/java/org/apache/tsfile/write/writer/LocalTsFileOutput.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.write.writer; +package org.apache.tsfile.write.writer; import java.io.BufferedOutputStream; import java.io.FileOutputStream; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/writer/RestorableTsFileIOWriter.java b/tsfile/src/main/java/org/apache/tsfile/write/writer/RestorableTsFileIOWriter.java similarity index 93% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/write/writer/RestorableTsFileIOWriter.java rename to tsfile/src/main/java/org/apache/tsfile/write/writer/RestorableTsFileIOWriter.java index 391426cc3..c66c6c6e8 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/writer/RestorableTsFileIOWriter.java +++ b/tsfile/src/main/java/org/apache/tsfile/write/writer/RestorableTsFileIOWriter.java @@ -17,18 +17,18 @@ * under the License. */ -package org.apache.iotdb.tsfile.write.writer; +package org.apache.tsfile.write.writer; -import org.apache.iotdb.tsfile.exception.NotCompatibleTsFileException; -import org.apache.iotdb.tsfile.file.metadata.ChunkGroupMetadata; -import org.apache.iotdb.tsfile.file.metadata.ChunkMetadata; -import org.apache.iotdb.tsfile.file.metadata.IChunkMetadata; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.fileSystem.FSFactoryProducer; -import org.apache.iotdb.tsfile.read.TsFileCheckStatus; -import org.apache.iotdb.tsfile.read.TsFileSequenceReader; -import org.apache.iotdb.tsfile.read.common.Path; -import org.apache.iotdb.tsfile.write.schema.IMeasurementSchema; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.exception.NotCompatibleTsFileException; +import org.apache.tsfile.file.metadata.ChunkGroupMetadata; +import org.apache.tsfile.file.metadata.ChunkMetadata; +import org.apache.tsfile.file.metadata.IChunkMetadata; +import org.apache.tsfile.fileSystem.FSFactoryProducer; +import org.apache.tsfile.read.TsFileCheckStatus; +import org.apache.tsfile.read.TsFileSequenceReader; +import org.apache.tsfile.read.common.Path; +import org.apache.tsfile.write.schema.IMeasurementSchema; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/writer/TsFileIOWriter.java b/tsfile/src/main/java/org/apache/tsfile/write/writer/TsFileIOWriter.java similarity index 92% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/write/writer/TsFileIOWriter.java rename to tsfile/src/main/java/org/apache/tsfile/write/writer/TsFileIOWriter.java index 12b79a9fc..720b28274 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/writer/TsFileIOWriter.java +++ b/tsfile/src/main/java/org/apache/tsfile/write/writer/TsFileIOWriter.java @@ -16,35 +16,35 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.write.writer; - -import org.apache.iotdb.tsfile.common.conf.TSFileConfig; -import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor; -import org.apache.iotdb.tsfile.common.constant.TsFileConstant; -import org.apache.iotdb.tsfile.file.MetaMarker; -import org.apache.iotdb.tsfile.file.header.ChunkGroupHeader; -import org.apache.iotdb.tsfile.file.header.ChunkHeader; -import org.apache.iotdb.tsfile.file.metadata.ChunkGroupMetadata; -import org.apache.iotdb.tsfile.file.metadata.ChunkMetadata; -import org.apache.iotdb.tsfile.file.metadata.IChunkMetadata; -import org.apache.iotdb.tsfile.file.metadata.MetadataIndexEntry; -import org.apache.iotdb.tsfile.file.metadata.MetadataIndexNode; -import org.apache.iotdb.tsfile.file.metadata.TimeseriesMetadata; -import org.apache.iotdb.tsfile.file.metadata.TsFileMetadata; -import org.apache.iotdb.tsfile.file.metadata.enums.CompressionType; -import org.apache.iotdb.tsfile.file.metadata.enums.MetadataIndexNodeType; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding; -import org.apache.iotdb.tsfile.file.metadata.statistics.Statistics; -import org.apache.iotdb.tsfile.fileSystem.FSFactoryProducer; -import org.apache.iotdb.tsfile.read.common.Chunk; -import org.apache.iotdb.tsfile.read.common.Path; -import org.apache.iotdb.tsfile.utils.BloomFilter; -import org.apache.iotdb.tsfile.utils.BytesUtils; -import org.apache.iotdb.tsfile.utils.Pair; -import org.apache.iotdb.tsfile.utils.PublicBAOS; -import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils; -import org.apache.iotdb.tsfile.write.writer.tsmiterator.TSMIterator; +package org.apache.tsfile.write.writer; + +import org.apache.tsfile.common.conf.TSFileConfig; +import org.apache.tsfile.common.conf.TSFileDescriptor; +import org.apache.tsfile.common.constant.TsFileConstant; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.file.MetaMarker; +import org.apache.tsfile.file.header.ChunkGroupHeader; +import org.apache.tsfile.file.header.ChunkHeader; +import org.apache.tsfile.file.metadata.ChunkGroupMetadata; +import org.apache.tsfile.file.metadata.ChunkMetadata; +import org.apache.tsfile.file.metadata.IChunkMetadata; +import org.apache.tsfile.file.metadata.MetadataIndexEntry; +import org.apache.tsfile.file.metadata.MetadataIndexNode; +import org.apache.tsfile.file.metadata.TimeseriesMetadata; +import org.apache.tsfile.file.metadata.TsFileMetadata; +import org.apache.tsfile.file.metadata.enums.CompressionType; +import org.apache.tsfile.file.metadata.enums.MetadataIndexNodeType; +import org.apache.tsfile.file.metadata.enums.TSEncoding; +import org.apache.tsfile.file.metadata.statistics.Statistics; +import org.apache.tsfile.fileSystem.FSFactoryProducer; +import org.apache.tsfile.read.common.Chunk; +import org.apache.tsfile.read.common.Path; +import org.apache.tsfile.utils.BloomFilter; +import org.apache.tsfile.utils.BytesUtils; +import org.apache.tsfile.utils.Pair; +import org.apache.tsfile.utils.PublicBAOS; +import org.apache.tsfile.utils.ReadWriteIOUtils; +import org.apache.tsfile.write.writer.tsmiterator.TSMIterator; import org.apache.commons.io.FileUtils; import org.slf4j.Logger; @@ -64,9 +64,9 @@ import java.util.Queue; import java.util.TreeMap; -import static org.apache.iotdb.tsfile.file.metadata.MetadataIndexConstructor.addCurrentIndexNodeToQueue; -import static org.apache.iotdb.tsfile.file.metadata.MetadataIndexConstructor.checkAndBuildLevelIndex; -import static org.apache.iotdb.tsfile.file.metadata.MetadataIndexConstructor.generateRootNode; +import static org.apache.tsfile.file.metadata.MetadataIndexConstructor.addCurrentIndexNodeToQueue; +import static org.apache.tsfile.file.metadata.MetadataIndexConstructor.checkAndBuildLevelIndex; +import static org.apache.tsfile.file.metadata.MetadataIndexConstructor.generateRootNode; /** * TsFileIOWriter is used to construct metadata and write data stored in memory to output stream. diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/writer/TsFileIOWriterEndFileTest.java b/tsfile/src/main/java/org/apache/tsfile/write/writer/TsFileIOWriterEndFileTest.java similarity index 82% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/write/writer/TsFileIOWriterEndFileTest.java rename to tsfile/src/main/java/org/apache/tsfile/write/writer/TsFileIOWriterEndFileTest.java index 95eb6290b..2b3e82cd3 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/writer/TsFileIOWriterEndFileTest.java +++ b/tsfile/src/main/java/org/apache/tsfile/write/writer/TsFileIOWriterEndFileTest.java @@ -17,13 +17,13 @@ * under the License. */ -package org.apache.iotdb.tsfile.write.writer; +package org.apache.tsfile.write.writer; -import org.apache.iotdb.tsfile.file.metadata.enums.CompressionType; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding; -import org.apache.iotdb.tsfile.write.chunk.ChunkWriterImpl; -import org.apache.iotdb.tsfile.write.schema.MeasurementSchema; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.file.metadata.enums.CompressionType; +import org.apache.tsfile.file.metadata.enums.TSEncoding; +import org.apache.tsfile.write.chunk.ChunkWriterImpl; +import org.apache.tsfile.write.schema.MeasurementSchema; import java.io.File; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/writer/TsFileOutput.java b/tsfile/src/main/java/org/apache/tsfile/write/writer/TsFileOutput.java similarity index 98% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/write/writer/TsFileOutput.java rename to tsfile/src/main/java/org/apache/tsfile/write/writer/TsFileOutput.java index 5088e0c53..ce03d532c 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/writer/TsFileOutput.java +++ b/tsfile/src/main/java/org/apache/tsfile/write/writer/TsFileOutput.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.write.writer; +package org.apache.tsfile.write.writer; import java.io.IOException; import java.io.OutputStream; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/writer/tsmiterator/DiskTSMIterator.java b/tsfile/src/main/java/org/apache/tsfile/write/writer/tsmiterator/DiskTSMIterator.java similarity index 88% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/write/writer/tsmiterator/DiskTSMIterator.java rename to tsfile/src/main/java/org/apache/tsfile/write/writer/tsmiterator/DiskTSMIterator.java index b6f6df855..32a32340c 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/writer/tsmiterator/DiskTSMIterator.java +++ b/tsfile/src/main/java/org/apache/tsfile/write/writer/tsmiterator/DiskTSMIterator.java @@ -17,17 +17,17 @@ * under the License. */ -package org.apache.iotdb.tsfile.write.writer.tsmiterator; +package org.apache.tsfile.write.writer.tsmiterator; -import org.apache.iotdb.tsfile.file.metadata.ChunkGroupMetadata; -import org.apache.iotdb.tsfile.file.metadata.ChunkMetadata; -import org.apache.iotdb.tsfile.file.metadata.IChunkMetadata; -import org.apache.iotdb.tsfile.file.metadata.TimeseriesMetadata; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.read.common.Path; -import org.apache.iotdb.tsfile.read.reader.LocalTsFileInput; -import org.apache.iotdb.tsfile.utils.Pair; -import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.file.metadata.ChunkGroupMetadata; +import org.apache.tsfile.file.metadata.ChunkMetadata; +import org.apache.tsfile.file.metadata.IChunkMetadata; +import org.apache.tsfile.file.metadata.TimeseriesMetadata; +import org.apache.tsfile.read.common.Path; +import org.apache.tsfile.read.reader.LocalTsFileInput; +import org.apache.tsfile.utils.Pair; +import org.apache.tsfile.utils.ReadWriteIOUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/writer/tsmiterator/TSMIterator.java b/tsfile/src/main/java/org/apache/tsfile/write/writer/tsmiterator/TSMIterator.java similarity index 90% rename from tsfile/src/main/java/org/apache/iotdb/tsfile/write/writer/tsmiterator/TSMIterator.java rename to tsfile/src/main/java/org/apache/tsfile/write/writer/tsmiterator/TSMIterator.java index 5d17e0ab7..8346e4c6a 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/writer/tsmiterator/TSMIterator.java +++ b/tsfile/src/main/java/org/apache/tsfile/write/writer/tsmiterator/TSMIterator.java @@ -16,17 +16,17 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.write.writer.tsmiterator; +package org.apache.tsfile.write.writer.tsmiterator; -import org.apache.iotdb.tsfile.file.metadata.ChunkGroupMetadata; -import org.apache.iotdb.tsfile.file.metadata.ChunkMetadata; -import org.apache.iotdb.tsfile.file.metadata.IChunkMetadata; -import org.apache.iotdb.tsfile.file.metadata.TimeseriesMetadata; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.file.metadata.statistics.Statistics; -import org.apache.iotdb.tsfile.read.common.Path; -import org.apache.iotdb.tsfile.utils.Pair; -import org.apache.iotdb.tsfile.utils.PublicBAOS; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.file.metadata.ChunkGroupMetadata; +import org.apache.tsfile.file.metadata.ChunkMetadata; +import org.apache.tsfile.file.metadata.IChunkMetadata; +import org.apache.tsfile.file.metadata.TimeseriesMetadata; +import org.apache.tsfile.file.metadata.statistics.Statistics; +import org.apache.tsfile.read.common.Path; +import org.apache.tsfile.utils.Pair; +import org.apache.tsfile.utils.PublicBAOS; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/common/LRUCacheTest.java b/tsfile/src/test/java/org/apache/tsfile/common/LRUCacheTest.java similarity index 94% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/common/LRUCacheTest.java rename to tsfile/src/test/java/org/apache/tsfile/common/LRUCacheTest.java index debcbad00..416e5f730 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/common/LRUCacheTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/common/LRUCacheTest.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.common; +package org.apache.tsfile.common; -import org.apache.iotdb.tsfile.common.cache.LRUCache; +import org.apache.tsfile.common.cache.LRUCache; import org.junit.Assert; import org.junit.Test; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/common/block/BinaryArrayColumnEncoderTest.java b/tsfile/src/test/java/org/apache/tsfile/common/block/BinaryArrayColumnEncoderTest.java similarity index 85% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/common/block/BinaryArrayColumnEncoderTest.java rename to tsfile/src/test/java/org/apache/tsfile/common/block/BinaryArrayColumnEncoderTest.java index c3d08d02e..dfbda8e63 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/common/block/BinaryArrayColumnEncoderTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/common/block/BinaryArrayColumnEncoderTest.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.tsfile.common.block; +package org.apache.tsfile.common.block; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.read.common.block.column.BinaryColumn; -import org.apache.iotdb.tsfile.read.common.block.column.ColumnEncoder; -import org.apache.iotdb.tsfile.read.common.block.column.ColumnEncoderFactory; -import org.apache.iotdb.tsfile.read.common.block.column.ColumnEncoding; -import org.apache.iotdb.tsfile.utils.Binary; +import org.apache.tsfile.block.column.ColumnEncoding; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.read.common.block.column.BinaryColumn; +import org.apache.tsfile.read.common.block.column.ColumnEncoder; +import org.apache.tsfile.read.common.block.column.ColumnEncoderFactory; +import org.apache.tsfile.utils.Binary; import org.junit.Assert; import org.junit.Test; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/common/block/ByteArrayColumnEncoderTest.java b/tsfile/src/test/java/org/apache/tsfile/common/block/ByteArrayColumnEncoderTest.java similarity index 86% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/common/block/ByteArrayColumnEncoderTest.java rename to tsfile/src/test/java/org/apache/tsfile/common/block/ByteArrayColumnEncoderTest.java index 28bde621e..0951f09b1 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/common/block/ByteArrayColumnEncoderTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/common/block/ByteArrayColumnEncoderTest.java @@ -17,13 +17,13 @@ * under the License. */ -package org.apache.iotdb.tsfile.common.block; +package org.apache.tsfile.common.block; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.read.common.block.column.BooleanColumn; -import org.apache.iotdb.tsfile.read.common.block.column.ColumnEncoder; -import org.apache.iotdb.tsfile.read.common.block.column.ColumnEncoderFactory; -import org.apache.iotdb.tsfile.read.common.block.column.ColumnEncoding; +import org.apache.tsfile.block.column.ColumnEncoding; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.read.common.block.column.BooleanColumn; +import org.apache.tsfile.read.common.block.column.ColumnEncoder; +import org.apache.tsfile.read.common.block.column.ColumnEncoderFactory; import org.junit.Assert; import org.junit.Test; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/common/block/ColumnEncoderTest.java b/tsfile/src/test/java/org/apache/tsfile/common/block/ColumnEncoderTest.java similarity index 96% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/common/block/ColumnEncoderTest.java rename to tsfile/src/test/java/org/apache/tsfile/common/block/ColumnEncoderTest.java index 242031f91..5b3d11ef9 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/common/block/ColumnEncoderTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/common/block/ColumnEncoderTest.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.tsfile.common.block; +package org.apache.tsfile.common.block; -import org.apache.iotdb.tsfile.read.common.block.column.Column; -import org.apache.iotdb.tsfile.read.common.block.column.ColumnEncoder; +import org.apache.tsfile.block.column.Column; +import org.apache.tsfile.read.common.block.column.ColumnEncoder; import org.junit.Assert; import org.junit.Test; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/common/block/Int32ArrayColumnEncoderTest.java b/tsfile/src/test/java/org/apache/tsfile/common/block/Int32ArrayColumnEncoderTest.java similarity index 89% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/common/block/Int32ArrayColumnEncoderTest.java rename to tsfile/src/test/java/org/apache/tsfile/common/block/Int32ArrayColumnEncoderTest.java index 09d9ab197..8c82a11dc 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/common/block/Int32ArrayColumnEncoderTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/common/block/Int32ArrayColumnEncoderTest.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.tsfile.common.block; +package org.apache.tsfile.common.block; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.read.common.block.column.ColumnEncoder; -import org.apache.iotdb.tsfile.read.common.block.column.ColumnEncoderFactory; -import org.apache.iotdb.tsfile.read.common.block.column.ColumnEncoding; -import org.apache.iotdb.tsfile.read.common.block.column.FloatColumn; -import org.apache.iotdb.tsfile.read.common.block.column.IntColumn; +import org.apache.tsfile.block.column.ColumnEncoding; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.read.common.block.column.ColumnEncoder; +import org.apache.tsfile.read.common.block.column.ColumnEncoderFactory; +import org.apache.tsfile.read.common.block.column.FloatColumn; +import org.apache.tsfile.read.common.block.column.IntColumn; import org.junit.Assert; import org.junit.Test; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/common/block/Int64ArrayColumnEncoderTest.java b/tsfile/src/test/java/org/apache/tsfile/common/block/Int64ArrayColumnEncoderTest.java similarity index 89% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/common/block/Int64ArrayColumnEncoderTest.java rename to tsfile/src/test/java/org/apache/tsfile/common/block/Int64ArrayColumnEncoderTest.java index 31e140535..d9eac8415 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/common/block/Int64ArrayColumnEncoderTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/common/block/Int64ArrayColumnEncoderTest.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.tsfile.common.block; - -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.read.common.block.column.ColumnEncoder; -import org.apache.iotdb.tsfile.read.common.block.column.ColumnEncoderFactory; -import org.apache.iotdb.tsfile.read.common.block.column.ColumnEncoding; -import org.apache.iotdb.tsfile.read.common.block.column.DoubleColumn; -import org.apache.iotdb.tsfile.read.common.block.column.LongColumn; +package org.apache.tsfile.common.block; + +import org.apache.tsfile.block.column.ColumnEncoding; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.read.common.block.column.ColumnEncoder; +import org.apache.tsfile.read.common.block.column.ColumnEncoderFactory; +import org.apache.tsfile.read.common.block.column.DoubleColumn; +import org.apache.tsfile.read.common.block.column.LongColumn; import org.junit.Assert; import org.junit.Test; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/common/block/NullColumnUnitTest.java b/tsfile/src/test/java/org/apache/tsfile/common/block/NullColumnUnitTest.java similarity index 93% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/common/block/NullColumnUnitTest.java rename to tsfile/src/test/java/org/apache/tsfile/common/block/NullColumnUnitTest.java index ffbcfb6c2..1c0fa5b2b 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/common/block/NullColumnUnitTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/common/block/NullColumnUnitTest.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.tsfile.common.block; +package org.apache.tsfile.common.block; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.read.common.block.column.Column; -import org.apache.iotdb.tsfile.read.common.block.column.NullColumn; +import org.apache.tsfile.block.column.Column; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.read.common.block.column.NullColumn; import org.junit.Assert; import org.junit.Test; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/common/block/RunLengthColumnEncoderTest.java b/tsfile/src/test/java/org/apache/tsfile/common/block/RunLengthColumnEncoderTest.java similarity index 75% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/common/block/RunLengthColumnEncoderTest.java rename to tsfile/src/test/java/org/apache/tsfile/common/block/RunLengthColumnEncoderTest.java index 75f5f06e7..f02d32c08 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/common/block/RunLengthColumnEncoderTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/common/block/RunLengthColumnEncoderTest.java @@ -17,21 +17,21 @@ * under the License. */ -package org.apache.iotdb.tsfile.common.block; +package org.apache.tsfile.common.block; -import org.apache.iotdb.tsfile.common.conf.TSFileConfig; -import org.apache.iotdb.tsfile.read.common.block.column.BinaryColumn; -import org.apache.iotdb.tsfile.read.common.block.column.BooleanColumn; -import org.apache.iotdb.tsfile.read.common.block.column.Column; -import org.apache.iotdb.tsfile.read.common.block.column.ColumnEncoder; -import org.apache.iotdb.tsfile.read.common.block.column.ColumnEncoderFactory; -import org.apache.iotdb.tsfile.read.common.block.column.ColumnEncoding; -import org.apache.iotdb.tsfile.read.common.block.column.DoubleColumn; -import org.apache.iotdb.tsfile.read.common.block.column.FloatColumn; -import org.apache.iotdb.tsfile.read.common.block.column.IntColumn; -import org.apache.iotdb.tsfile.read.common.block.column.LongColumn; -import org.apache.iotdb.tsfile.read.common.block.column.RunLengthEncodedColumn; -import org.apache.iotdb.tsfile.utils.Binary; +import org.apache.tsfile.block.column.Column; +import org.apache.tsfile.block.column.ColumnEncoding; +import org.apache.tsfile.common.conf.TSFileConfig; +import org.apache.tsfile.read.common.block.column.BinaryColumn; +import org.apache.tsfile.read.common.block.column.BooleanColumn; +import org.apache.tsfile.read.common.block.column.ColumnEncoder; +import org.apache.tsfile.read.common.block.column.ColumnEncoderFactory; +import org.apache.tsfile.read.common.block.column.DoubleColumn; +import org.apache.tsfile.read.common.block.column.FloatColumn; +import org.apache.tsfile.read.common.block.column.IntColumn; +import org.apache.tsfile.read.common.block.column.LongColumn; +import org.apache.tsfile.read.common.block.column.RunLengthEncodedColumn; +import org.apache.tsfile.utils.Binary; import org.junit.Assert; import org.junit.Test; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/common/block/TsBlockSerdeTest.java b/tsfile/src/test/java/org/apache/tsfile/common/block/TsBlockSerdeTest.java similarity index 90% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/common/block/TsBlockSerdeTest.java rename to tsfile/src/test/java/org/apache/tsfile/common/block/TsBlockSerdeTest.java index 895af7659..640259509 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/common/block/TsBlockSerdeTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/common/block/TsBlockSerdeTest.java @@ -17,19 +17,19 @@ * under the License. */ -package org.apache.iotdb.tsfile.common.block; - -import org.apache.iotdb.tsfile.common.conf.TSFileConfig; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.read.common.block.TsBlock; -import org.apache.iotdb.tsfile.read.common.block.TsBlockBuilder; -import org.apache.iotdb.tsfile.read.common.block.column.BinaryColumn; -import org.apache.iotdb.tsfile.read.common.block.column.ColumnBuilder; -import org.apache.iotdb.tsfile.read.common.block.column.ColumnEncoding; -import org.apache.iotdb.tsfile.read.common.block.column.TimeColumn; -import org.apache.iotdb.tsfile.read.common.block.column.TsBlockSerde; -import org.apache.iotdb.tsfile.utils.Binary; -import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils; +package org.apache.tsfile.common.block; + +import org.apache.tsfile.block.column.ColumnBuilder; +import org.apache.tsfile.block.column.ColumnEncoding; +import org.apache.tsfile.common.conf.TSFileConfig; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.read.common.block.TsBlock; +import org.apache.tsfile.read.common.block.TsBlockBuilder; +import org.apache.tsfile.read.common.block.column.BinaryColumn; +import org.apache.tsfile.read.common.block.column.TimeColumn; +import org.apache.tsfile.read.common.block.column.TsBlockSerde; +import org.apache.tsfile.utils.Binary; +import org.apache.tsfile.utils.ReadWriteIOUtils; import org.junit.Test; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/common/block/TsBlockTest.java b/tsfile/src/test/java/org/apache/tsfile/common/block/TsBlockTest.java similarity index 94% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/common/block/TsBlockTest.java rename to tsfile/src/test/java/org/apache/tsfile/common/block/TsBlockTest.java index d7fc5a992..257553909 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/common/block/TsBlockTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/common/block/TsBlockTest.java @@ -16,22 +16,22 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.common.block; +package org.apache.tsfile.common.block; -import org.apache.iotdb.tsfile.common.conf.TSFileConfig; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.read.common.block.TsBlock; -import org.apache.iotdb.tsfile.read.common.block.TsBlock.TsBlockSingleColumnIterator; -import org.apache.iotdb.tsfile.read.common.block.TsBlockBuilder; -import org.apache.iotdb.tsfile.read.common.block.column.BinaryColumn; -import org.apache.iotdb.tsfile.read.common.block.column.BooleanColumn; -import org.apache.iotdb.tsfile.read.common.block.column.Column; -import org.apache.iotdb.tsfile.read.common.block.column.DoubleColumn; -import org.apache.iotdb.tsfile.read.common.block.column.FloatColumn; -import org.apache.iotdb.tsfile.read.common.block.column.IntColumn; -import org.apache.iotdb.tsfile.read.common.block.column.LongColumn; -import org.apache.iotdb.tsfile.read.common.block.column.RunLengthEncodedColumn; -import org.apache.iotdb.tsfile.utils.Binary; +import org.apache.tsfile.block.column.Column; +import org.apache.tsfile.common.conf.TSFileConfig; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.read.common.block.TsBlock; +import org.apache.tsfile.read.common.block.TsBlock.TsBlockSingleColumnIterator; +import org.apache.tsfile.read.common.block.TsBlockBuilder; +import org.apache.tsfile.read.common.block.column.BinaryColumn; +import org.apache.tsfile.read.common.block.column.BooleanColumn; +import org.apache.tsfile.read.common.block.column.DoubleColumn; +import org.apache.tsfile.read.common.block.column.FloatColumn; +import org.apache.tsfile.read.common.block.column.IntColumn; +import org.apache.tsfile.read.common.block.column.LongColumn; +import org.apache.tsfile.read.common.block.column.RunLengthEncodedColumn; +import org.apache.tsfile.utils.Binary; import org.junit.Assert; import org.junit.Test; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/common/conf/TSFileDescriptorTest.java b/tsfile/src/test/java/org/apache/tsfile/common/conf/TSFileDescriptorTest.java similarity index 96% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/common/conf/TSFileDescriptorTest.java rename to tsfile/src/test/java/org/apache/tsfile/common/conf/TSFileDescriptorTest.java index a236d19bc..1dc6214d7 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/common/conf/TSFileDescriptorTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/common/conf/TSFileDescriptorTest.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.common.conf; +package org.apache.tsfile.common.conf; -import org.apache.iotdb.tsfile.common.constant.TsFileConstant; +import org.apache.tsfile.common.constant.TsFileConstant; import org.junit.Assert; import org.junit.Before; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/compress/CompressTest.java b/tsfile/src/test/java/org/apache/tsfile/compress/CompressTest.java similarity index 95% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/compress/CompressTest.java rename to tsfile/src/test/java/org/apache/tsfile/compress/CompressTest.java index c1339bc38..8b454d6a7 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/compress/CompressTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/compress/CompressTest.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.compress; +package org.apache.tsfile.compress; -import org.apache.iotdb.tsfile.utils.PublicBAOS; -import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils; +import org.apache.tsfile.utils.PublicBAOS; +import org.apache.tsfile.utils.ReadWriteIOUtils; import org.junit.After; import org.junit.Before; @@ -84,7 +84,7 @@ public void snappyTest() throws IOException { public void lz4CompressorTest1() throws IOException { PublicBAOS out = new PublicBAOS(); out.write(inputString.getBytes(StandardCharsets.UTF_8)); - ICompressor compressor = new ICompressor.IOTDBLZ4Compressor(); + ICompressor compressor = new ICompressor.LZ4Compressor(); IUnCompressor unCompressor = new IUnCompressor.LZ4UnCompressor(); byte[] compressed = compressor.compress(out.getBuf()); byte[] uncompressed = unCompressor.uncompress(compressed); @@ -96,7 +96,7 @@ public void lz4CompressorTest1() throws IOException { public void lz4CompressorTest2() throws IOException { PublicBAOS out = new PublicBAOS(); out.write(inputString.getBytes(StandardCharsets.UTF_8)); - ICompressor compressor = new ICompressor.IOTDBLZ4Compressor(); + ICompressor compressor = new ICompressor.LZ4Compressor(); IUnCompressor unCompressor = new IUnCompressor.LZ4UnCompressor(); byte[] compressed = new byte[compressor.getMaxBytesForCompression(out.size())]; int size = compressor.compress(out.getBuf(), 0, out.size(), compressed); diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/compress/GZIPTest.java b/tsfile/src/test/java/org/apache/tsfile/compress/GZIPTest.java similarity index 97% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/compress/GZIPTest.java rename to tsfile/src/test/java/org/apache/tsfile/compress/GZIPTest.java index 04d14b64a..3d9bb4977 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/compress/GZIPTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/compress/GZIPTest.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.compress; +package org.apache.tsfile.compress; -import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils; +import org.apache.tsfile.utils.ReadWriteIOUtils; import org.junit.After; import org.junit.Assert; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/compress/LZ4Test.java b/tsfile/src/test/java/org/apache/tsfile/compress/LZ4Test.java similarity index 89% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/compress/LZ4Test.java rename to tsfile/src/test/java/org/apache/tsfile/compress/LZ4Test.java index 8e3aea195..2b62f87fc 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/compress/LZ4Test.java +++ b/tsfile/src/test/java/org/apache/tsfile/compress/LZ4Test.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.compress; +package org.apache.tsfile.compress; -import org.apache.iotdb.tsfile.compress.ICompressor.IOTDBLZ4Compressor; -import org.apache.iotdb.tsfile.compress.IUnCompressor.LZ4UnCompressor; +import org.apache.tsfile.compress.ICompressor.LZ4Compressor; +import org.apache.tsfile.compress.IUnCompressor.LZ4UnCompressor; import org.junit.After; import org.junit.Assert; @@ -51,7 +51,7 @@ public void testBytes1() throws IOException { String input = randomString(2000000); byte[] uncom = input.getBytes(StandardCharsets.UTF_8); long time = System.currentTimeMillis(); - ICompressor compressor = new IOTDBLZ4Compressor(); + ICompressor compressor = new LZ4Compressor(); byte[] compressed = compressor.compress(uncom); System.out.println("compression time cost:" + (System.currentTimeMillis() - time)); @@ -68,7 +68,7 @@ public void testBytes1() throws IOException { @Test public void testBytes2() throws IOException { - ICompressor.IOTDBLZ4Compressor compressor = new ICompressor.IOTDBLZ4Compressor(); + LZ4Compressor compressor = new LZ4Compressor(); IUnCompressor.LZ4UnCompressor unCompressor = new IUnCompressor.LZ4UnCompressor(); int n = 500000; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/compress/LZMA2Test.java b/tsfile/src/test/java/org/apache/tsfile/compress/LZMA2Test.java similarity index 97% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/compress/LZMA2Test.java rename to tsfile/src/test/java/org/apache/tsfile/compress/LZMA2Test.java index 4c78d904e..36aaf367d 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/compress/LZMA2Test.java +++ b/tsfile/src/test/java/org/apache/tsfile/compress/LZMA2Test.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.tsfile.compress; +package org.apache.tsfile.compress; -import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils; +import org.apache.tsfile.utils.ReadWriteIOUtils; import org.junit.After; import org.junit.Assert; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/compress/SnappyTest.java b/tsfile/src/test/java/org/apache/tsfile/compress/SnappyTest.java similarity index 97% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/compress/SnappyTest.java rename to tsfile/src/test/java/org/apache/tsfile/compress/SnappyTest.java index 3bd26b622..ac654ef06 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/compress/SnappyTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/compress/SnappyTest.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.compress; +package org.apache.tsfile.compress; -import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils; +import org.apache.tsfile.utils.ReadWriteIOUtils; import org.junit.After; import org.junit.Assert; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/compress/ZstdTest.java b/tsfile/src/test/java/org/apache/tsfile/compress/ZstdTest.java similarity index 96% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/compress/ZstdTest.java rename to tsfile/src/test/java/org/apache/tsfile/compress/ZstdTest.java index 348d1bd66..5c5c7050a 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/compress/ZstdTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/compress/ZstdTest.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.tsfile.compress; +package org.apache.tsfile.compress; -import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils; +import org.apache.tsfile.utils.ReadWriteIOUtils; import org.junit.After; import org.junit.Assert; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/constant/TestConstant.java b/tsfile/src/test/java/org/apache/tsfile/constant/TestConstant.java similarity index 97% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/constant/TestConstant.java rename to tsfile/src/test/java/org/apache/tsfile/constant/TestConstant.java index 76e44c6d6..05cedf881 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/constant/TestConstant.java +++ b/tsfile/src/test/java/org/apache/tsfile/constant/TestConstant.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.tsfile.constant; +package org.apache.tsfile.constant; import java.io.File; import java.util.Random; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/encoding/SDTEncoderTest.java b/tsfile/src/test/java/org/apache/tsfile/encoding/SDTEncoderTest.java similarity index 97% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/encoding/SDTEncoderTest.java rename to tsfile/src/test/java/org/apache/tsfile/encoding/SDTEncoderTest.java index 901bc6066..8087f8556 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/encoding/SDTEncoderTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/encoding/SDTEncoderTest.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.tsfile.encoding; +package org.apache.tsfile.encoding; -import org.apache.iotdb.tsfile.encoding.encoder.SDTEncoder; +import org.apache.tsfile.encoding.encoder.SDTEncoder; import org.junit.Test; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/encoding/bitpacking/IntPackerTest.java b/tsfile/src/test/java/org/apache/tsfile/encoding/bitpacking/IntPackerTest.java similarity index 97% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/encoding/bitpacking/IntPackerTest.java rename to tsfile/src/test/java/org/apache/tsfile/encoding/bitpacking/IntPackerTest.java index 745766c72..e4cf5c57b 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/encoding/bitpacking/IntPackerTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/encoding/bitpacking/IntPackerTest.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.tsfile.encoding.bitpacking; +package org.apache.tsfile.encoding.bitpacking; import org.junit.Test; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/encoding/bitpacking/LongPackerTest.java b/tsfile/src/test/java/org/apache/tsfile/encoding/bitpacking/LongPackerTest.java similarity index 97% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/encoding/bitpacking/LongPackerTest.java rename to tsfile/src/test/java/org/apache/tsfile/encoding/bitpacking/LongPackerTest.java index 0615865b9..e7d97b474 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/encoding/bitpacking/LongPackerTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/encoding/bitpacking/LongPackerTest.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.tsfile.encoding.bitpacking; +package org.apache.tsfile.encoding.bitpacking; -import org.apache.iotdb.tsfile.utils.ReadWriteForEncodingUtils; +import org.apache.tsfile.utils.ReadWriteForEncodingUtils; import org.junit.Test; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/encoding/decoder/BitmapDecoderTest.java b/tsfile/src/test/java/org/apache/tsfile/encoding/decoder/BitmapDecoderTest.java similarity index 94% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/encoding/decoder/BitmapDecoderTest.java rename to tsfile/src/test/java/org/apache/tsfile/encoding/decoder/BitmapDecoderTest.java index d9a9a4da0..52adc33e3 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/encoding/decoder/BitmapDecoderTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/encoding/decoder/BitmapDecoderTest.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.tsfile.encoding.decoder; +package org.apache.tsfile.encoding.decoder; -import org.apache.iotdb.tsfile.encoding.encoder.BitmapEncoder; -import org.apache.iotdb.tsfile.encoding.encoder.Encoder; +import org.apache.tsfile.encoding.encoder.BitmapEncoder; +import org.apache.tsfile.encoding.encoder.Encoder; import org.junit.After; import org.junit.Before; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/encoding/decoder/ChimpDecoderTest.java b/tsfile/src/test/java/org/apache/tsfile/encoding/decoder/ChimpDecoderTest.java similarity index 97% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/encoding/decoder/ChimpDecoderTest.java rename to tsfile/src/test/java/org/apache/tsfile/encoding/decoder/ChimpDecoderTest.java index 5912e2893..79dc784a1 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/encoding/decoder/ChimpDecoderTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/encoding/decoder/ChimpDecoderTest.java @@ -17,13 +17,13 @@ * under the License. */ -package org.apache.iotdb.tsfile.encoding.decoder; +package org.apache.tsfile.encoding.decoder; -import org.apache.iotdb.tsfile.encoding.encoder.DoublePrecisionChimpEncoder; -import org.apache.iotdb.tsfile.encoding.encoder.Encoder; -import org.apache.iotdb.tsfile.encoding.encoder.IntChimpEncoder; -import org.apache.iotdb.tsfile.encoding.encoder.LongChimpEncoder; -import org.apache.iotdb.tsfile.encoding.encoder.SinglePrecisionChimpEncoder; +import org.apache.tsfile.encoding.encoder.DoublePrecisionChimpEncoder; +import org.apache.tsfile.encoding.encoder.Encoder; +import org.apache.tsfile.encoding.encoder.IntChimpEncoder; +import org.apache.tsfile.encoding.encoder.LongChimpEncoder; +import org.apache.tsfile.encoding.encoder.SinglePrecisionChimpEncoder; import org.junit.BeforeClass; import org.junit.Test; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/encoding/decoder/DictionaryDecoderTest.java b/tsfile/src/test/java/org/apache/tsfile/encoding/decoder/DictionaryDecoderTest.java similarity index 91% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/encoding/decoder/DictionaryDecoderTest.java rename to tsfile/src/test/java/org/apache/tsfile/encoding/decoder/DictionaryDecoderTest.java index fb2bead3f..0cdb86d2b 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/encoding/decoder/DictionaryDecoderTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/encoding/decoder/DictionaryDecoderTest.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.tsfile.encoding.decoder; +package org.apache.tsfile.encoding.decoder; -import org.apache.iotdb.tsfile.common.conf.TSFileConfig; -import org.apache.iotdb.tsfile.encoding.encoder.DictionaryEncoder; -import org.apache.iotdb.tsfile.utils.Binary; +import org.apache.tsfile.common.conf.TSFileConfig; +import org.apache.tsfile.encoding.encoder.DictionaryEncoder; +import org.apache.tsfile.utils.Binary; import org.junit.Test; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/encoding/decoder/FloatDecoderTest.java b/tsfile/src/test/java/org/apache/tsfile/encoding/decoder/FloatDecoderTest.java similarity index 96% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/encoding/decoder/FloatDecoderTest.java rename to tsfile/src/test/java/org/apache/tsfile/encoding/decoder/FloatDecoderTest.java index cbbdc8e6e..bdc1db9ff 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/encoding/decoder/FloatDecoderTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/encoding/decoder/FloatDecoderTest.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.encoding.decoder; +package org.apache.tsfile.encoding.decoder; -import org.apache.iotdb.tsfile.encoding.encoder.Encoder; -import org.apache.iotdb.tsfile.encoding.encoder.FloatEncoder; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding; +import org.apache.tsfile.encoding.encoder.Encoder; +import org.apache.tsfile.encoding.encoder.FloatEncoder; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.file.metadata.enums.TSEncoding; import org.junit.After; import org.junit.Before; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/encoding/decoder/GorillaDecoderV1Test.java b/tsfile/src/test/java/org/apache/tsfile/encoding/decoder/GorillaDecoderV1Test.java similarity index 96% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/encoding/decoder/GorillaDecoderV1Test.java rename to tsfile/src/test/java/org/apache/tsfile/encoding/decoder/GorillaDecoderV1Test.java index 6d8318367..ca8da3a31 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/encoding/decoder/GorillaDecoderV1Test.java +++ b/tsfile/src/test/java/org/apache/tsfile/encoding/decoder/GorillaDecoderV1Test.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.encoding.decoder; +package org.apache.tsfile.encoding.decoder; -import org.apache.iotdb.tsfile.encoding.encoder.DoublePrecisionEncoderV1; -import org.apache.iotdb.tsfile.encoding.encoder.Encoder; -import org.apache.iotdb.tsfile.encoding.encoder.SinglePrecisionEncoderV1; +import org.apache.tsfile.encoding.encoder.DoublePrecisionEncoderV1; +import org.apache.tsfile.encoding.encoder.Encoder; +import org.apache.tsfile.encoding.encoder.SinglePrecisionEncoderV1; import org.junit.After; import org.junit.Before; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/encoding/decoder/GorillaDecoderV2Test.java b/tsfile/src/test/java/org/apache/tsfile/encoding/decoder/GorillaDecoderV2Test.java similarity index 97% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/encoding/decoder/GorillaDecoderV2Test.java rename to tsfile/src/test/java/org/apache/tsfile/encoding/decoder/GorillaDecoderV2Test.java index a0c8dfc96..6daebc0d0 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/encoding/decoder/GorillaDecoderV2Test.java +++ b/tsfile/src/test/java/org/apache/tsfile/encoding/decoder/GorillaDecoderV2Test.java @@ -17,13 +17,13 @@ * under the License. */ -package org.apache.iotdb.tsfile.encoding.decoder; +package org.apache.tsfile.encoding.decoder; -import org.apache.iotdb.tsfile.encoding.encoder.DoublePrecisionEncoderV2; -import org.apache.iotdb.tsfile.encoding.encoder.Encoder; -import org.apache.iotdb.tsfile.encoding.encoder.IntGorillaEncoder; -import org.apache.iotdb.tsfile.encoding.encoder.LongGorillaEncoder; -import org.apache.iotdb.tsfile.encoding.encoder.SinglePrecisionEncoderV2; +import org.apache.tsfile.encoding.encoder.DoublePrecisionEncoderV2; +import org.apache.tsfile.encoding.encoder.Encoder; +import org.apache.tsfile.encoding.encoder.IntGorillaEncoder; +import org.apache.tsfile.encoding.encoder.LongGorillaEncoder; +import org.apache.tsfile.encoding.encoder.SinglePrecisionEncoderV2; import org.junit.BeforeClass; import org.junit.Test; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/encoding/decoder/IntRleDecoderTest.java b/tsfile/src/test/java/org/apache/tsfile/encoding/decoder/IntRleDecoderTest.java similarity index 96% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/encoding/decoder/IntRleDecoderTest.java rename to tsfile/src/test/java/org/apache/tsfile/encoding/decoder/IntRleDecoderTest.java index d33a5d67a..59f072b81 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/encoding/decoder/IntRleDecoderTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/encoding/decoder/IntRleDecoderTest.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.encoding.decoder; +package org.apache.tsfile.encoding.decoder; -import org.apache.iotdb.tsfile.encoding.encoder.IntRleEncoder; -import org.apache.iotdb.tsfile.encoding.encoder.RleEncoder; -import org.apache.iotdb.tsfile.utils.ReadWriteForEncodingUtils; +import org.apache.tsfile.encoding.encoder.IntRleEncoder; +import org.apache.tsfile.encoding.encoder.RleEncoder; +import org.apache.tsfile.utils.ReadWriteForEncodingUtils; import org.junit.After; import org.junit.Before; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/encoding/decoder/IntZigzagDecoderTest.java b/tsfile/src/test/java/org/apache/tsfile/encoding/decoder/IntZigzagDecoderTest.java similarity index 94% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/encoding/decoder/IntZigzagDecoderTest.java rename to tsfile/src/test/java/org/apache/tsfile/encoding/decoder/IntZigzagDecoderTest.java index 5dd3882a5..1c977ad99 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/encoding/decoder/IntZigzagDecoderTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/encoding/decoder/IntZigzagDecoderTest.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.tsfile.encoding.decoder; +package org.apache.tsfile.encoding.decoder; -import org.apache.iotdb.tsfile.encoding.encoder.Encoder; -import org.apache.iotdb.tsfile.encoding.encoder.IntZigzagEncoder; +import org.apache.tsfile.encoding.encoder.Encoder; +import org.apache.tsfile.encoding.encoder.IntZigzagEncoder; import org.junit.After; import org.junit.Before; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/encoding/decoder/LongRleDecoderTest.java b/tsfile/src/test/java/org/apache/tsfile/encoding/decoder/LongRleDecoderTest.java similarity index 96% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/encoding/decoder/LongRleDecoderTest.java rename to tsfile/src/test/java/org/apache/tsfile/encoding/decoder/LongRleDecoderTest.java index 072d2356d..f44733fb5 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/encoding/decoder/LongRleDecoderTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/encoding/decoder/LongRleDecoderTest.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.encoding.decoder; +package org.apache.tsfile.encoding.decoder; -import org.apache.iotdb.tsfile.encoding.encoder.LongRleEncoder; -import org.apache.iotdb.tsfile.encoding.encoder.RleEncoder; -import org.apache.iotdb.tsfile.utils.ReadWriteForEncodingUtils; +import org.apache.tsfile.encoding.encoder.LongRleEncoder; +import org.apache.tsfile.encoding.encoder.RleEncoder; +import org.apache.tsfile.utils.ReadWriteForEncodingUtils; import org.junit.After; import org.junit.Before; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/encoding/decoder/LongZigzagDecoderTest.java b/tsfile/src/test/java/org/apache/tsfile/encoding/decoder/LongZigzagDecoderTest.java similarity index 93% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/encoding/decoder/LongZigzagDecoderTest.java rename to tsfile/src/test/java/org/apache/tsfile/encoding/decoder/LongZigzagDecoderTest.java index 9dac687d1..36613fc86 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/encoding/decoder/LongZigzagDecoderTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/encoding/decoder/LongZigzagDecoderTest.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.tsfile.encoding.decoder; +package org.apache.tsfile.encoding.decoder; -import org.apache.iotdb.tsfile.encoding.encoder.Encoder; -import org.apache.iotdb.tsfile.encoding.encoder.LongZigzagEncoder; +import org.apache.tsfile.encoding.encoder.Encoder; +import org.apache.tsfile.encoding.encoder.LongZigzagEncoder; import org.junit.After; import org.junit.Before; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/encoding/decoder/RLBEDecoderTest.java b/tsfile/src/test/java/org/apache/tsfile/encoding/decoder/RLBEDecoderTest.java similarity index 96% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/encoding/decoder/RLBEDecoderTest.java rename to tsfile/src/test/java/org/apache/tsfile/encoding/decoder/RLBEDecoderTest.java index c18f33438..cc5e1fee6 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/encoding/decoder/RLBEDecoderTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/encoding/decoder/RLBEDecoderTest.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.encoding.decoder; +package org.apache.tsfile.encoding.decoder; -import org.apache.iotdb.tsfile.encoding.encoder.DoublePrecisionEncoderV1; -import org.apache.iotdb.tsfile.encoding.encoder.DoubleRLBE; -import org.apache.iotdb.tsfile.encoding.encoder.Encoder; -import org.apache.iotdb.tsfile.encoding.encoder.FloatRLBE; +import org.apache.tsfile.encoding.encoder.DoublePrecisionEncoderV1; +import org.apache.tsfile.encoding.encoder.DoubleRLBE; +import org.apache.tsfile.encoding.encoder.Encoder; +import org.apache.tsfile.encoding.encoder.FloatRLBE; import org.junit.After; import org.junit.Before; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/encoding/decoder/SprintzDecoderTest.java b/tsfile/src/test/java/org/apache/tsfile/encoding/decoder/SprintzDecoderTest.java similarity index 97% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/encoding/decoder/SprintzDecoderTest.java rename to tsfile/src/test/java/org/apache/tsfile/encoding/decoder/SprintzDecoderTest.java index 0166c88ff..34f2b9b79 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/encoding/decoder/SprintzDecoderTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/encoding/decoder/SprintzDecoderTest.java @@ -17,13 +17,13 @@ * under the License. */ -package org.apache.iotdb.tsfile.encoding.decoder; +package org.apache.tsfile.encoding.decoder; -import org.apache.iotdb.tsfile.encoding.encoder.DoubleSprintzEncoder; -import org.apache.iotdb.tsfile.encoding.encoder.Encoder; -import org.apache.iotdb.tsfile.encoding.encoder.FloatSprintzEncoder; -import org.apache.iotdb.tsfile.encoding.encoder.IntSprintzEncoder; -import org.apache.iotdb.tsfile.encoding.encoder.LongSprintzEncoder; +import org.apache.tsfile.encoding.encoder.DoubleSprintzEncoder; +import org.apache.tsfile.encoding.encoder.Encoder; +import org.apache.tsfile.encoding.encoder.FloatSprintzEncoder; +import org.apache.tsfile.encoding.encoder.IntSprintzEncoder; +import org.apache.tsfile.encoding.encoder.LongSprintzEncoder; import org.junit.BeforeClass; import org.junit.Test; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/encoding/decoder/delta/DeltaBinaryEncoderIntegerTest.java b/tsfile/src/test/java/org/apache/tsfile/encoding/decoder/delta/DeltaBinaryEncoderIntegerTest.java similarity index 94% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/encoding/decoder/delta/DeltaBinaryEncoderIntegerTest.java rename to tsfile/src/test/java/org/apache/tsfile/encoding/decoder/delta/DeltaBinaryEncoderIntegerTest.java index 5043a23a3..1d81cfa40 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/encoding/decoder/delta/DeltaBinaryEncoderIntegerTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/encoding/decoder/delta/DeltaBinaryEncoderIntegerTest.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.encoding.decoder.delta; +package org.apache.tsfile.encoding.decoder.delta; -import org.apache.iotdb.tsfile.encoding.decoder.DeltaBinaryDecoder; -import org.apache.iotdb.tsfile.encoding.encoder.DeltaBinaryEncoder; +import org.apache.tsfile.encoding.decoder.DeltaBinaryDecoder; +import org.apache.tsfile.encoding.encoder.DeltaBinaryEncoder; import org.junit.Before; import org.junit.Test; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/encoding/decoder/delta/DeltaBinaryEncoderLongTest.java b/tsfile/src/test/java/org/apache/tsfile/encoding/decoder/delta/DeltaBinaryEncoderLongTest.java similarity index 96% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/encoding/decoder/delta/DeltaBinaryEncoderLongTest.java rename to tsfile/src/test/java/org/apache/tsfile/encoding/decoder/delta/DeltaBinaryEncoderLongTest.java index fdc5a5b27..db3741f9f 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/encoding/decoder/delta/DeltaBinaryEncoderLongTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/encoding/decoder/delta/DeltaBinaryEncoderLongTest.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.encoding.decoder.delta; +package org.apache.tsfile.encoding.decoder.delta; -import org.apache.iotdb.tsfile.encoding.decoder.DeltaBinaryDecoder; -import org.apache.iotdb.tsfile.encoding.encoder.DeltaBinaryEncoder; +import org.apache.tsfile.encoding.decoder.DeltaBinaryDecoder; +import org.apache.tsfile.encoding.encoder.DeltaBinaryEncoder; import org.junit.Before; import org.junit.Test; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/encoding/decoder/regular/RegularDataEncoderIntegerTest.java b/tsfile/src/test/java/org/apache/tsfile/encoding/decoder/regular/RegularDataEncoderIntegerTest.java similarity index 95% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/encoding/decoder/regular/RegularDataEncoderIntegerTest.java rename to tsfile/src/test/java/org/apache/tsfile/encoding/decoder/regular/RegularDataEncoderIntegerTest.java index 388b70566..8eb0352c6 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/encoding/decoder/regular/RegularDataEncoderIntegerTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/encoding/decoder/regular/RegularDataEncoderIntegerTest.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.encoding.decoder.regular; +package org.apache.tsfile.encoding.decoder.regular; -import org.apache.iotdb.tsfile.encoding.decoder.RegularDataDecoder; -import org.apache.iotdb.tsfile.encoding.encoder.RegularDataEncoder; +import org.apache.tsfile.encoding.decoder.RegularDataDecoder; +import org.apache.tsfile.encoding.encoder.RegularDataEncoder; import org.junit.Before; import org.junit.Test; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/encoding/decoder/regular/RegularDataEncoderLongTest.java b/tsfile/src/test/java/org/apache/tsfile/encoding/decoder/regular/RegularDataEncoderLongTest.java similarity index 97% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/encoding/decoder/regular/RegularDataEncoderLongTest.java rename to tsfile/src/test/java/org/apache/tsfile/encoding/decoder/regular/RegularDataEncoderLongTest.java index ebe776ed6..3566b5b28 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/encoding/decoder/regular/RegularDataEncoderLongTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/encoding/decoder/regular/RegularDataEncoderLongTest.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.encoding.decoder.regular; +package org.apache.tsfile.encoding.decoder.regular; -import org.apache.iotdb.tsfile.encoding.decoder.RegularDataDecoder; -import org.apache.iotdb.tsfile.encoding.encoder.RegularDataEncoder; +import org.apache.tsfile.encoding.decoder.RegularDataDecoder; +import org.apache.tsfile.encoding.encoder.RegularDataEncoder; import org.junit.Before; import org.junit.Test; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/exception/TsFileExceptionTest.java b/tsfile/src/test/java/org/apache/tsfile/exception/TsFileExceptionTest.java similarity index 82% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/exception/TsFileExceptionTest.java rename to tsfile/src/test/java/org/apache/tsfile/exception/TsFileExceptionTest.java index eec888358..2132d999b 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/exception/TsFileExceptionTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/exception/TsFileExceptionTest.java @@ -17,22 +17,22 @@ * under the License. */ -package org.apache.iotdb.tsfile.exception; - -import org.apache.iotdb.tsfile.exception.cache.CacheException; -import org.apache.iotdb.tsfile.exception.compress.CompressionTypeNotSupportedException; -import org.apache.iotdb.tsfile.exception.compress.GZIPCompressOverflowException; -import org.apache.iotdb.tsfile.exception.encoding.TsFileDecodingException; -import org.apache.iotdb.tsfile.exception.encoding.TsFileEncodingException; -import org.apache.iotdb.tsfile.exception.filter.QueryFilterOptimizationException; -import org.apache.iotdb.tsfile.exception.filter.StatisticsClassException; -import org.apache.iotdb.tsfile.exception.filter.UnSupportFilterDataTypeException; -import org.apache.iotdb.tsfile.exception.write.NoMeasurementException; -import org.apache.iotdb.tsfile.exception.write.PageException; -import org.apache.iotdb.tsfile.exception.write.TsFileNotCompleteException; -import org.apache.iotdb.tsfile.exception.write.UnSupportedDataTypeException; -import org.apache.iotdb.tsfile.exception.write.UnknownColumnTypeException; -import org.apache.iotdb.tsfile.exception.write.WriteProcessException; +package org.apache.tsfile.exception; + +import org.apache.tsfile.exception.cache.CacheException; +import org.apache.tsfile.exception.compress.CompressionTypeNotSupportedException; +import org.apache.tsfile.exception.compress.GZIPCompressOverflowException; +import org.apache.tsfile.exception.encoding.TsFileDecodingException; +import org.apache.tsfile.exception.encoding.TsFileEncodingException; +import org.apache.tsfile.exception.filter.QueryFilterOptimizationException; +import org.apache.tsfile.exception.filter.StatisticsClassException; +import org.apache.tsfile.exception.filter.UnSupportFilterDataTypeException; +import org.apache.tsfile.exception.write.NoMeasurementException; +import org.apache.tsfile.exception.write.PageException; +import org.apache.tsfile.exception.write.TsFileNotCompleteException; +import org.apache.tsfile.exception.write.UnknownColumnTypeException; +import org.apache.tsfile.exception.write.WriteProcessException; +import org.apache.tsfile.write.UnSupportedDataTypeException; import org.junit.Test; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/file/header/PageHeaderTest.java b/tsfile/src/test/java/org/apache/tsfile/file/header/PageHeaderTest.java similarity index 91% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/file/header/PageHeaderTest.java rename to tsfile/src/test/java/org/apache/tsfile/file/header/PageHeaderTest.java index 20ee9b7ea..674995311 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/file/header/PageHeaderTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/file/header/PageHeaderTest.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.tsfile.file.header; +package org.apache.tsfile.file.header; -import org.apache.iotdb.tsfile.constant.TestConstant; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.file.metadata.utils.TestHelper; -import org.apache.iotdb.tsfile.file.metadata.utils.Utils; +import org.apache.tsfile.constant.TestConstant; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.file.metadata.utils.TestHelper; +import org.apache.tsfile.file.metadata.utils.Utils; import org.junit.After; import org.junit.Assert; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/ChunkMetadataTest.java b/tsfile/src/test/java/org/apache/tsfile/file/metadata/ChunkMetadataTest.java similarity index 96% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/ChunkMetadataTest.java rename to tsfile/src/test/java/org/apache/tsfile/file/metadata/ChunkMetadataTest.java index 75129d95a..b449190ee 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/ChunkMetadataTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/file/metadata/ChunkMetadataTest.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.file.metadata; +package org.apache.tsfile.file.metadata; -import org.apache.iotdb.tsfile.read.common.TimeRange; +import org.apache.tsfile.read.common.TimeRange; import org.junit.Assert; import org.junit.Test; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/MetadataIndexNodeTest.java b/tsfile/src/test/java/org/apache/tsfile/file/metadata/MetadataIndexNodeTest.java similarity index 94% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/MetadataIndexNodeTest.java rename to tsfile/src/test/java/org/apache/tsfile/file/metadata/MetadataIndexNodeTest.java index 78302d8e6..f35217290 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/MetadataIndexNodeTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/file/metadata/MetadataIndexNodeTest.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.tsfile.file.metadata; +package org.apache.tsfile.file.metadata; -import org.apache.iotdb.tsfile.file.metadata.enums.MetadataIndexNodeType; +import org.apache.tsfile.file.metadata.enums.MetadataIndexNodeType; import org.junit.Assert; import org.junit.Test; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/TimeseriesMetadataTest.java b/tsfile/src/test/java/org/apache/tsfile/file/metadata/TimeseriesMetadataTest.java similarity index 92% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/TimeseriesMetadataTest.java rename to tsfile/src/test/java/org/apache/tsfile/file/metadata/TimeseriesMetadataTest.java index d153a9ee3..3ac296afe 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/TimeseriesMetadataTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/file/metadata/TimeseriesMetadataTest.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.file.metadata; +package org.apache.tsfile.file.metadata; -import org.apache.iotdb.tsfile.constant.TestConstant; -import org.apache.iotdb.tsfile.file.metadata.utils.TestHelper; -import org.apache.iotdb.tsfile.read.reader.LocalTsFileInput; -import org.apache.iotdb.tsfile.read.reader.TsFileInput; -import org.apache.iotdb.tsfile.utils.PublicBAOS; +import org.apache.tsfile.constant.TestConstant; +import org.apache.tsfile.file.metadata.utils.TestHelper; +import org.apache.tsfile.read.reader.LocalTsFileInput; +import org.apache.tsfile.read.reader.TsFileInput; +import org.apache.tsfile.utils.PublicBAOS; import org.junit.After; import org.junit.Assert; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/TsFileMetadataTest.java b/tsfile/src/test/java/org/apache/tsfile/file/metadata/TsFileMetadataTest.java similarity index 92% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/TsFileMetadataTest.java rename to tsfile/src/test/java/org/apache/tsfile/file/metadata/TsFileMetadataTest.java index 6b8fc2d3b..b10712fe5 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/TsFileMetadataTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/file/metadata/TsFileMetadataTest.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.file.metadata; +package org.apache.tsfile.file.metadata; -import org.apache.iotdb.tsfile.constant.TestConstant; -import org.apache.iotdb.tsfile.file.metadata.utils.TestHelper; -import org.apache.iotdb.tsfile.file.metadata.utils.Utils; +import org.apache.tsfile.constant.TestConstant; +import org.apache.tsfile.file.metadata.utils.TestHelper; +import org.apache.tsfile.file.metadata.utils.Utils; import org.junit.After; import org.junit.Assert; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/statistics/BooleanStatisticsTest.java b/tsfile/src/test/java/org/apache/tsfile/file/metadata/statistics/BooleanStatisticsTest.java similarity index 98% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/statistics/BooleanStatisticsTest.java rename to tsfile/src/test/java/org/apache/tsfile/file/metadata/statistics/BooleanStatisticsTest.java index 726e10de1..60d5cd152 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/statistics/BooleanStatisticsTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/file/metadata/statistics/BooleanStatisticsTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.file.metadata.statistics; +package org.apache.tsfile.file.metadata.statistics; import org.junit.Test; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/statistics/DoubleStatisticsTest.java b/tsfile/src/test/java/org/apache/tsfile/file/metadata/statistics/DoubleStatisticsTest.java similarity index 98% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/statistics/DoubleStatisticsTest.java rename to tsfile/src/test/java/org/apache/tsfile/file/metadata/statistics/DoubleStatisticsTest.java index f3c06821c..48f0ebabb 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/statistics/DoubleStatisticsTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/file/metadata/statistics/DoubleStatisticsTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.file.metadata.statistics; +package org.apache.tsfile.file.metadata.statistics; import org.junit.Test; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/statistics/FloatStatisticsTest.java b/tsfile/src/test/java/org/apache/tsfile/file/metadata/statistics/FloatStatisticsTest.java similarity index 98% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/statistics/FloatStatisticsTest.java rename to tsfile/src/test/java/org/apache/tsfile/file/metadata/statistics/FloatStatisticsTest.java index affc5dbcd..bc194fb0a 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/statistics/FloatStatisticsTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/file/metadata/statistics/FloatStatisticsTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.file.metadata.statistics; +package org.apache.tsfile.file.metadata.statistics; import org.junit.Test; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/statistics/IntegerStatisticsTest.java b/tsfile/src/test/java/org/apache/tsfile/file/metadata/statistics/IntegerStatisticsTest.java similarity index 98% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/statistics/IntegerStatisticsTest.java rename to tsfile/src/test/java/org/apache/tsfile/file/metadata/statistics/IntegerStatisticsTest.java index e3949e856..57078a3ff 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/statistics/IntegerStatisticsTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/file/metadata/statistics/IntegerStatisticsTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.file.metadata.statistics; +package org.apache.tsfile.file.metadata.statistics; import org.junit.Test; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/statistics/LongStatisticsTest.java b/tsfile/src/test/java/org/apache/tsfile/file/metadata/statistics/LongStatisticsTest.java similarity index 97% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/statistics/LongStatisticsTest.java rename to tsfile/src/test/java/org/apache/tsfile/file/metadata/statistics/LongStatisticsTest.java index a67cf147b..47a346997 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/statistics/LongStatisticsTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/file/metadata/statistics/LongStatisticsTest.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.file.metadata.statistics; +package org.apache.tsfile.file.metadata.statistics; -import org.apache.iotdb.tsfile.exception.filter.StatisticsClassException; +import org.apache.tsfile.exception.filter.StatisticsClassException; import org.junit.Test; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/statistics/StringStatisticsTest.java b/tsfile/src/test/java/org/apache/tsfile/file/metadata/statistics/StringStatisticsTest.java similarity index 95% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/statistics/StringStatisticsTest.java rename to tsfile/src/test/java/org/apache/tsfile/file/metadata/statistics/StringStatisticsTest.java index 68a3e0530..6183d0ba2 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/statistics/StringStatisticsTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/file/metadata/statistics/StringStatisticsTest.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.file.metadata.statistics; +package org.apache.tsfile.file.metadata.statistics; -import org.apache.iotdb.tsfile.common.conf.TSFileConfig; -import org.apache.iotdb.tsfile.utils.Binary; +import org.apache.tsfile.common.conf.TSFileConfig; +import org.apache.tsfile.utils.Binary; import org.junit.Test; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/utils/TestHelper.java b/tsfile/src/test/java/org/apache/tsfile/file/metadata/utils/TestHelper.java similarity index 76% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/utils/TestHelper.java rename to tsfile/src/test/java/org/apache/tsfile/file/metadata/utils/TestHelper.java index bae17cdc0..cbb2fca91 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/utils/TestHelper.java +++ b/tsfile/src/test/java/org/apache/tsfile/file/metadata/utils/TestHelper.java @@ -16,20 +16,20 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.file.metadata.utils; +package org.apache.tsfile.file.metadata.utils; -import org.apache.iotdb.tsfile.file.header.PageHeader; -import org.apache.iotdb.tsfile.file.header.PageHeaderTest; -import org.apache.iotdb.tsfile.file.metadata.MetadataIndexEntry; -import org.apache.iotdb.tsfile.file.metadata.MetadataIndexNode; -import org.apache.iotdb.tsfile.file.metadata.TimeseriesMetadata; -import org.apache.iotdb.tsfile.file.metadata.TsFileMetadata; -import org.apache.iotdb.tsfile.file.metadata.enums.MetadataIndexNodeType; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding; -import org.apache.iotdb.tsfile.file.metadata.statistics.Statistics; -import org.apache.iotdb.tsfile.utils.PublicBAOS; -import org.apache.iotdb.tsfile.write.schema.MeasurementSchema; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.file.header.PageHeader; +import org.apache.tsfile.file.header.PageHeaderTest; +import org.apache.tsfile.file.metadata.MetadataIndexEntry; +import org.apache.tsfile.file.metadata.MetadataIndexNode; +import org.apache.tsfile.file.metadata.TimeseriesMetadata; +import org.apache.tsfile.file.metadata.TsFileMetadata; +import org.apache.tsfile.file.metadata.enums.MetadataIndexNodeType; +import org.apache.tsfile.file.metadata.enums.TSEncoding; +import org.apache.tsfile.file.metadata.statistics.Statistics; +import org.apache.tsfile.utils.PublicBAOS; +import org.apache.tsfile.write.schema.MeasurementSchema; import java.io.Serializable; import java.util.ArrayList; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/utils/Utils.java b/tsfile/src/test/java/org/apache/tsfile/file/metadata/utils/Utils.java similarity index 89% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/utils/Utils.java rename to tsfile/src/test/java/org/apache/tsfile/file/metadata/utils/Utils.java index dbd1fa2c5..103a84c8c 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/utils/Utils.java +++ b/tsfile/src/test/java/org/apache/tsfile/file/metadata/utils/Utils.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.file.metadata.utils; +package org.apache.tsfile.file.metadata.utils; -import org.apache.iotdb.tsfile.file.header.PageHeader; -import org.apache.iotdb.tsfile.file.metadata.MetadataIndexNode; -import org.apache.iotdb.tsfile.file.metadata.TsFileMetadata; -import org.apache.iotdb.tsfile.file.metadata.statistics.BooleanStatistics; -import org.apache.iotdb.tsfile.file.metadata.statistics.IntegerStatistics; -import org.apache.iotdb.tsfile.file.metadata.statistics.Statistics; +import org.apache.tsfile.file.header.PageHeader; +import org.apache.tsfile.file.metadata.MetadataIndexNode; +import org.apache.tsfile.file.metadata.TsFileMetadata; +import org.apache.tsfile.file.metadata.statistics.BooleanStatistics; +import org.apache.tsfile.file.metadata.statistics.IntegerStatistics; +import org.apache.tsfile.file.metadata.statistics.Statistics; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/ExpressionTest.java b/tsfile/src/test/java/org/apache/tsfile/read/ExpressionTest.java similarity index 91% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/read/ExpressionTest.java rename to tsfile/src/test/java/org/apache/tsfile/read/ExpressionTest.java index c2e8227e3..04f7c13b7 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/ExpressionTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/read/ExpressionTest.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.read; +package org.apache.tsfile.read; -import org.apache.iotdb.tsfile.read.expression.impl.BinaryExpression; -import org.apache.iotdb.tsfile.read.expression.impl.GlobalTimeExpression; -import org.apache.iotdb.tsfile.read.filter.factory.TimeFilterApi; +import org.apache.tsfile.read.expression.impl.BinaryExpression; +import org.apache.tsfile.read.expression.impl.GlobalTimeExpression; +import org.apache.tsfile.read.filter.factory.TimeFilterApi; import org.junit.Assert; import org.junit.Test; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/GetAllDevicesTest.java b/tsfile/src/test/java/org/apache/tsfile/read/GetAllDevicesTest.java similarity index 91% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/read/GetAllDevicesTest.java rename to tsfile/src/test/java/org/apache/tsfile/read/GetAllDevicesTest.java index a7a3cea31..b390ab860 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/GetAllDevicesTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/read/GetAllDevicesTest.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.tsfile.read; +package org.apache.tsfile.read; -import org.apache.iotdb.tsfile.common.conf.TSFileConfig; -import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor; -import org.apache.iotdb.tsfile.utils.FileGenerator; +import org.apache.tsfile.common.conf.TSFileConfig; +import org.apache.tsfile.common.conf.TSFileDescriptor; +import org.apache.tsfile.utils.FileGenerator; import org.junit.After; import org.junit.Assert; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/MeasurementChunkMetadataListMapIteratorTest.java b/tsfile/src/test/java/org/apache/tsfile/read/MeasurementChunkMetadataListMapIteratorTest.java similarity index 94% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/read/MeasurementChunkMetadataListMapIteratorTest.java rename to tsfile/src/test/java/org/apache/tsfile/read/MeasurementChunkMetadataListMapIteratorTest.java index 92505a964..883c070ab 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/MeasurementChunkMetadataListMapIteratorTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/read/MeasurementChunkMetadataListMapIteratorTest.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.tsfile.read; - -import org.apache.iotdb.tsfile.common.conf.TSFileConfig; -import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor; -import org.apache.iotdb.tsfile.file.metadata.ChunkMetadata; -import org.apache.iotdb.tsfile.file.metadata.IChunkMetadata; -import org.apache.iotdb.tsfile.read.common.Path; -import org.apache.iotdb.tsfile.utils.FileGenerator; +package org.apache.tsfile.read; + +import org.apache.tsfile.common.conf.TSFileConfig; +import org.apache.tsfile.common.conf.TSFileDescriptor; +import org.apache.tsfile.file.metadata.ChunkMetadata; +import org.apache.tsfile.file.metadata.IChunkMetadata; +import org.apache.tsfile.read.common.Path; +import org.apache.tsfile.utils.FileGenerator; import org.junit.After; import org.junit.Assert; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/ReadInPartitionTest.java b/tsfile/src/test/java/org/apache/tsfile/read/ReadInPartitionTest.java similarity index 88% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/read/ReadInPartitionTest.java rename to tsfile/src/test/java/org/apache/tsfile/read/ReadInPartitionTest.java index b5e8be23c..bf304a0d7 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/ReadInPartitionTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/read/ReadInPartitionTest.java @@ -16,25 +16,25 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.read; - -import org.apache.iotdb.tsfile.exception.filter.QueryFilterOptimizationException; -import org.apache.iotdb.tsfile.file.metadata.ChunkMetadata; -import org.apache.iotdb.tsfile.read.common.Path; -import org.apache.iotdb.tsfile.read.common.RowRecord; -import org.apache.iotdb.tsfile.read.common.TimeRange; -import org.apache.iotdb.tsfile.read.expression.ExpressionType; -import org.apache.iotdb.tsfile.read.expression.IExpression; -import org.apache.iotdb.tsfile.read.expression.QueryExpression; -import org.apache.iotdb.tsfile.read.expression.impl.BinaryExpression; -import org.apache.iotdb.tsfile.read.expression.impl.GlobalTimeExpression; -import org.apache.iotdb.tsfile.read.expression.impl.SingleSeriesExpression; -import org.apache.iotdb.tsfile.read.expression.util.ExpressionOptimizer; -import org.apache.iotdb.tsfile.read.filter.basic.Filter; -import org.apache.iotdb.tsfile.read.filter.factory.TimeFilterApi; -import org.apache.iotdb.tsfile.read.filter.factory.ValueFilterApi; -import org.apache.iotdb.tsfile.read.query.dataset.QueryDataSet; -import org.apache.iotdb.tsfile.utils.TsFileGeneratorForTest; +package org.apache.tsfile.read; + +import org.apache.tsfile.exception.filter.QueryFilterOptimizationException; +import org.apache.tsfile.file.metadata.ChunkMetadata; +import org.apache.tsfile.read.common.Path; +import org.apache.tsfile.read.common.RowRecord; +import org.apache.tsfile.read.common.TimeRange; +import org.apache.tsfile.read.expression.ExpressionType; +import org.apache.tsfile.read.expression.IExpression; +import org.apache.tsfile.read.expression.QueryExpression; +import org.apache.tsfile.read.expression.impl.BinaryExpression; +import org.apache.tsfile.read.expression.impl.GlobalTimeExpression; +import org.apache.tsfile.read.expression.impl.SingleSeriesExpression; +import org.apache.tsfile.read.expression.util.ExpressionOptimizer; +import org.apache.tsfile.read.filter.basic.Filter; +import org.apache.tsfile.read.filter.factory.TimeFilterApi; +import org.apache.tsfile.read.filter.factory.ValueFilterApi; +import org.apache.tsfile.read.query.dataset.QueryDataSet; +import org.apache.tsfile.utils.TsFileGeneratorForTest; import org.junit.After; import org.junit.Assert; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/ReadTest.java b/tsfile/src/test/java/org/apache/tsfile/read/ReadTest.java similarity index 94% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/read/ReadTest.java rename to tsfile/src/test/java/org/apache/tsfile/read/ReadTest.java index e9efd9d32..ce92e14e2 100755 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/ReadTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/read/ReadTest.java @@ -16,21 +16,21 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.read; - -import org.apache.iotdb.tsfile.common.conf.TSFileConfig; -import org.apache.iotdb.tsfile.read.common.Field; -import org.apache.iotdb.tsfile.read.common.Path; -import org.apache.iotdb.tsfile.read.common.RowRecord; -import org.apache.iotdb.tsfile.read.expression.IExpression; -import org.apache.iotdb.tsfile.read.expression.QueryExpression; -import org.apache.iotdb.tsfile.read.expression.impl.BinaryExpression; -import org.apache.iotdb.tsfile.read.expression.impl.GlobalTimeExpression; -import org.apache.iotdb.tsfile.read.expression.impl.SingleSeriesExpression; -import org.apache.iotdb.tsfile.read.filter.factory.TimeFilterApi; -import org.apache.iotdb.tsfile.read.filter.factory.ValueFilterApi; -import org.apache.iotdb.tsfile.read.query.dataset.QueryDataSet; -import org.apache.iotdb.tsfile.utils.FileGenerator; +package org.apache.tsfile.read; + +import org.apache.tsfile.common.conf.TSFileConfig; +import org.apache.tsfile.read.common.Field; +import org.apache.tsfile.read.common.Path; +import org.apache.tsfile.read.common.RowRecord; +import org.apache.tsfile.read.expression.IExpression; +import org.apache.tsfile.read.expression.QueryExpression; +import org.apache.tsfile.read.expression.impl.BinaryExpression; +import org.apache.tsfile.read.expression.impl.GlobalTimeExpression; +import org.apache.tsfile.read.expression.impl.SingleSeriesExpression; +import org.apache.tsfile.read.filter.factory.TimeFilterApi; +import org.apache.tsfile.read.filter.factory.ValueFilterApi; +import org.apache.tsfile.read.query.dataset.QueryDataSet; +import org.apache.tsfile.utils.FileGenerator; import org.junit.After; import org.junit.Assert; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/TimePlainEncodeReadTest.java b/tsfile/src/test/java/org/apache/tsfile/read/TimePlainEncodeReadTest.java similarity index 93% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/read/TimePlainEncodeReadTest.java rename to tsfile/src/test/java/org/apache/tsfile/read/TimePlainEncodeReadTest.java index 9f879ffe0..402ddf3ba 100755 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/TimePlainEncodeReadTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/read/TimePlainEncodeReadTest.java @@ -16,23 +16,23 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.read; +package org.apache.tsfile.read; -import org.apache.iotdb.tsfile.common.conf.TSFileConfig; -import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor; -import org.apache.iotdb.tsfile.read.common.Field; -import org.apache.iotdb.tsfile.read.common.Path; -import org.apache.iotdb.tsfile.read.common.RowRecord; -import org.apache.iotdb.tsfile.read.expression.IExpression; -import org.apache.iotdb.tsfile.read.expression.QueryExpression; -import org.apache.iotdb.tsfile.read.expression.impl.BinaryExpression; -import org.apache.iotdb.tsfile.read.expression.impl.GlobalTimeExpression; -import org.apache.iotdb.tsfile.read.expression.impl.SingleSeriesExpression; -import org.apache.iotdb.tsfile.read.filter.factory.TimeFilterApi; -import org.apache.iotdb.tsfile.read.filter.factory.ValueFilterApi; -import org.apache.iotdb.tsfile.read.query.dataset.QueryDataSet; -import org.apache.iotdb.tsfile.utils.Binary; -import org.apache.iotdb.tsfile.utils.FileGenerator; +import org.apache.tsfile.common.conf.TSFileConfig; +import org.apache.tsfile.common.conf.TSFileDescriptor; +import org.apache.tsfile.read.common.Field; +import org.apache.tsfile.read.common.Path; +import org.apache.tsfile.read.common.RowRecord; +import org.apache.tsfile.read.expression.IExpression; +import org.apache.tsfile.read.expression.QueryExpression; +import org.apache.tsfile.read.expression.impl.BinaryExpression; +import org.apache.tsfile.read.expression.impl.GlobalTimeExpression; +import org.apache.tsfile.read.expression.impl.SingleSeriesExpression; +import org.apache.tsfile.read.filter.factory.TimeFilterApi; +import org.apache.tsfile.read.filter.factory.ValueFilterApi; +import org.apache.tsfile.read.query.dataset.QueryDataSet; +import org.apache.tsfile.utils.Binary; +import org.apache.tsfile.utils.FileGenerator; import org.junit.After; import org.junit.Assert; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/TimeSeriesMetadataReadTest.java b/tsfile/src/test/java/org/apache/tsfile/read/TimeSeriesMetadataReadTest.java similarity index 89% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/read/TimeSeriesMetadataReadTest.java rename to tsfile/src/test/java/org/apache/tsfile/read/TimeSeriesMetadataReadTest.java index a2b971d74..fd37dc086 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/TimeSeriesMetadataReadTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/read/TimeSeriesMetadataReadTest.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.read; +package org.apache.tsfile.read; -import org.apache.iotdb.tsfile.common.conf.TSFileConfig; -import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor; -import org.apache.iotdb.tsfile.constant.TestConstant; -import org.apache.iotdb.tsfile.file.metadata.TimeseriesMetadata; -import org.apache.iotdb.tsfile.read.common.Path; -import org.apache.iotdb.tsfile.utils.FileGenerator; +import org.apache.tsfile.common.conf.TSFileConfig; +import org.apache.tsfile.common.conf.TSFileDescriptor; +import org.apache.tsfile.constant.TestConstant; +import org.apache.tsfile.file.metadata.TimeseriesMetadata; +import org.apache.tsfile.read.common.Path; +import org.apache.tsfile.utils.FileGenerator; import org.junit.After; import org.junit.Assert; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/TsFileReaderTest.java b/tsfile/src/test/java/org/apache/tsfile/read/TsFileReaderTest.java similarity index 92% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/read/TsFileReaderTest.java rename to tsfile/src/test/java/org/apache/tsfile/read/TsFileReaderTest.java index cc97488ba..d5e404d90 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/TsFileReaderTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/read/TsFileReaderTest.java @@ -16,35 +16,35 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.read; - -import org.apache.iotdb.tsfile.common.conf.TSFileConfig; -import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor; -import org.apache.iotdb.tsfile.exception.write.WriteProcessException; -import org.apache.iotdb.tsfile.file.metadata.AlignedChunkMetadata; -import org.apache.iotdb.tsfile.file.metadata.IChunkMetadata; -import org.apache.iotdb.tsfile.file.metadata.enums.CompressionType; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding; -import org.apache.iotdb.tsfile.read.common.Path; -import org.apache.iotdb.tsfile.read.common.RowRecord; -import org.apache.iotdb.tsfile.read.expression.IExpression; -import org.apache.iotdb.tsfile.read.expression.QueryExpression; -import org.apache.iotdb.tsfile.read.expression.impl.BinaryExpression; -import org.apache.iotdb.tsfile.read.expression.impl.GlobalTimeExpression; -import org.apache.iotdb.tsfile.read.expression.impl.SingleSeriesExpression; -import org.apache.iotdb.tsfile.read.filter.basic.Filter; -import org.apache.iotdb.tsfile.read.filter.factory.FilterFactory; -import org.apache.iotdb.tsfile.read.filter.factory.TimeFilterApi; -import org.apache.iotdb.tsfile.read.filter.factory.ValueFilterApi; -import org.apache.iotdb.tsfile.read.query.dataset.QueryDataSet; -import org.apache.iotdb.tsfile.utils.Binary; -import org.apache.iotdb.tsfile.utils.TsFileGeneratorForTest; -import org.apache.iotdb.tsfile.write.TsFileWriter; -import org.apache.iotdb.tsfile.write.record.TSRecord; -import org.apache.iotdb.tsfile.write.record.datapoint.IntDataPoint; -import org.apache.iotdb.tsfile.write.schema.MeasurementSchema; -import org.apache.iotdb.tsfile.write.schema.Schema; +package org.apache.tsfile.read; + +import org.apache.tsfile.common.conf.TSFileConfig; +import org.apache.tsfile.common.conf.TSFileDescriptor; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.exception.write.WriteProcessException; +import org.apache.tsfile.file.metadata.AlignedChunkMetadata; +import org.apache.tsfile.file.metadata.IChunkMetadata; +import org.apache.tsfile.file.metadata.enums.CompressionType; +import org.apache.tsfile.file.metadata.enums.TSEncoding; +import org.apache.tsfile.read.common.Path; +import org.apache.tsfile.read.common.RowRecord; +import org.apache.tsfile.read.expression.IExpression; +import org.apache.tsfile.read.expression.QueryExpression; +import org.apache.tsfile.read.expression.impl.BinaryExpression; +import org.apache.tsfile.read.expression.impl.GlobalTimeExpression; +import org.apache.tsfile.read.expression.impl.SingleSeriesExpression; +import org.apache.tsfile.read.filter.basic.Filter; +import org.apache.tsfile.read.filter.factory.FilterFactory; +import org.apache.tsfile.read.filter.factory.TimeFilterApi; +import org.apache.tsfile.read.filter.factory.ValueFilterApi; +import org.apache.tsfile.read.query.dataset.QueryDataSet; +import org.apache.tsfile.utils.Binary; +import org.apache.tsfile.utils.TsFileGeneratorForTest; +import org.apache.tsfile.write.TsFileWriter; +import org.apache.tsfile.write.record.TSRecord; +import org.apache.tsfile.write.record.datapoint.IntDataPoint; +import org.apache.tsfile.write.schema.MeasurementSchema; +import org.apache.tsfile.write.schema.Schema; import org.junit.Assert; import org.junit.Test; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/TsFileRestorableReaderTest.java b/tsfile/src/test/java/org/apache/tsfile/read/TsFileRestorableReaderTest.java similarity index 88% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/read/TsFileRestorableReaderTest.java rename to tsfile/src/test/java/org/apache/tsfile/read/TsFileRestorableReaderTest.java index 2b006a88c..e459bd587 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/TsFileRestorableReaderTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/read/TsFileRestorableReaderTest.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.tsfile.read; +package org.apache.tsfile.read; -import org.apache.iotdb.tsfile.common.conf.TSFileConfig; -import org.apache.iotdb.tsfile.fileSystem.FSFactoryProducer; -import org.apache.iotdb.tsfile.fileSystem.fsFactory.FSFactory; -import org.apache.iotdb.tsfile.utils.TsFileGeneratorForTest; +import org.apache.tsfile.common.conf.TSFileConfig; +import org.apache.tsfile.fileSystem.FSFactoryProducer; +import org.apache.tsfile.fileSystem.fsFactory.FSFactory; +import org.apache.tsfile.utils.TsFileGeneratorForTest; import org.junit.Test; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/TsFileSequenceReaderTest.java b/tsfile/src/test/java/org/apache/tsfile/read/TsFileSequenceReaderTest.java similarity index 86% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/read/TsFileSequenceReaderTest.java rename to tsfile/src/test/java/org/apache/tsfile/read/TsFileSequenceReaderTest.java index a94b08054..d834b5413 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/TsFileSequenceReaderTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/read/TsFileSequenceReaderTest.java @@ -17,24 +17,24 @@ * under the License. */ -package org.apache.iotdb.tsfile.read; - -import org.apache.iotdb.tsfile.common.conf.TSFileConfig; -import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor; -import org.apache.iotdb.tsfile.exception.write.WriteProcessException; -import org.apache.iotdb.tsfile.file.MetaMarker; -import org.apache.iotdb.tsfile.file.header.ChunkGroupHeader; -import org.apache.iotdb.tsfile.file.header.ChunkHeader; -import org.apache.iotdb.tsfile.file.header.PageHeader; -import org.apache.iotdb.tsfile.file.metadata.ChunkMetadata; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding; -import org.apache.iotdb.tsfile.read.common.Path; -import org.apache.iotdb.tsfile.utils.FileGenerator; -import org.apache.iotdb.tsfile.utils.Pair; -import org.apache.iotdb.tsfile.utils.TsFileGeneratorUtils; -import org.apache.iotdb.tsfile.write.TsFileWriter; -import org.apache.iotdb.tsfile.write.schema.MeasurementSchema; +package org.apache.tsfile.read; + +import org.apache.tsfile.common.conf.TSFileConfig; +import org.apache.tsfile.common.conf.TSFileDescriptor; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.exception.write.WriteProcessException; +import org.apache.tsfile.file.MetaMarker; +import org.apache.tsfile.file.header.ChunkGroupHeader; +import org.apache.tsfile.file.header.ChunkHeader; +import org.apache.tsfile.file.header.PageHeader; +import org.apache.tsfile.file.metadata.ChunkMetadata; +import org.apache.tsfile.file.metadata.enums.TSEncoding; +import org.apache.tsfile.read.common.Path; +import org.apache.tsfile.utils.FileGenerator; +import org.apache.tsfile.utils.Pair; +import org.apache.tsfile.utils.TsFileGeneratorUtils; +import org.apache.tsfile.write.TsFileWriter; +import org.apache.tsfile.write.schema.MeasurementSchema; import org.junit.After; import org.junit.Assert; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/TsFileSequenceReaderTimeseriesMetadataIteratorTest.java b/tsfile/src/test/java/org/apache/tsfile/read/TsFileSequenceReaderTimeseriesMetadataIteratorTest.java similarity index 95% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/read/TsFileSequenceReaderTimeseriesMetadataIteratorTest.java rename to tsfile/src/test/java/org/apache/tsfile/read/TsFileSequenceReaderTimeseriesMetadataIteratorTest.java index 564847366..bc85ecf08 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/TsFileSequenceReaderTimeseriesMetadataIteratorTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/read/TsFileSequenceReaderTimeseriesMetadataIteratorTest.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.tsfile.read; +package org.apache.tsfile.read; -import org.apache.iotdb.tsfile.utils.FileGenerator; +import org.apache.tsfile.utils.FileGenerator; import org.junit.After; import org.junit.Assert; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/common/BatchDataTest.java b/tsfile/src/test/java/org/apache/tsfile/read/common/BatchDataTest.java similarity index 91% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/read/common/BatchDataTest.java rename to tsfile/src/test/java/org/apache/tsfile/read/common/BatchDataTest.java index 04d9470ab..e388fa51e 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/common/BatchDataTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/read/common/BatchDataTest.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.common; +package org.apache.tsfile.read.common; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.read.TimeValuePair; -import org.apache.iotdb.tsfile.read.reader.IPointReader; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.read.TimeValuePair; +import org.apache.tsfile.read.reader.IPointReader; import org.junit.Test; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/common/ColumnTest.java b/tsfile/src/test/java/org/apache/tsfile/read/common/ColumnTest.java similarity index 84% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/read/common/ColumnTest.java rename to tsfile/src/test/java/org/apache/tsfile/read/common/ColumnTest.java index d8f9b7078..d7b61556d 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/common/ColumnTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/read/common/ColumnTest.java @@ -17,26 +17,26 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.common; - -import org.apache.iotdb.tsfile.read.common.block.column.BinaryColumn; -import org.apache.iotdb.tsfile.read.common.block.column.BinaryColumnBuilder; -import org.apache.iotdb.tsfile.read.common.block.column.BooleanColumn; -import org.apache.iotdb.tsfile.read.common.block.column.BooleanColumnBuilder; -import org.apache.iotdb.tsfile.read.common.block.column.Column; -import org.apache.iotdb.tsfile.read.common.block.column.DoubleColumn; -import org.apache.iotdb.tsfile.read.common.block.column.DoubleColumnBuilder; -import org.apache.iotdb.tsfile.read.common.block.column.FloatColumn; -import org.apache.iotdb.tsfile.read.common.block.column.FloatColumnBuilder; -import org.apache.iotdb.tsfile.read.common.block.column.IntColumn; -import org.apache.iotdb.tsfile.read.common.block.column.IntColumnBuilder; -import org.apache.iotdb.tsfile.read.common.block.column.LongColumn; -import org.apache.iotdb.tsfile.read.common.block.column.LongColumnBuilder; -import org.apache.iotdb.tsfile.read.common.block.column.NullColumn; -import org.apache.iotdb.tsfile.read.common.block.column.RunLengthEncodedColumn; -import org.apache.iotdb.tsfile.read.common.block.column.TimeColumn; -import org.apache.iotdb.tsfile.read.common.block.column.TimeColumnBuilder; -import org.apache.iotdb.tsfile.utils.BytesUtils; +package org.apache.tsfile.read.common; + +import org.apache.tsfile.block.column.Column; +import org.apache.tsfile.read.common.block.column.BinaryColumn; +import org.apache.tsfile.read.common.block.column.BinaryColumnBuilder; +import org.apache.tsfile.read.common.block.column.BooleanColumn; +import org.apache.tsfile.read.common.block.column.BooleanColumnBuilder; +import org.apache.tsfile.read.common.block.column.DoubleColumn; +import org.apache.tsfile.read.common.block.column.DoubleColumnBuilder; +import org.apache.tsfile.read.common.block.column.FloatColumn; +import org.apache.tsfile.read.common.block.column.FloatColumnBuilder; +import org.apache.tsfile.read.common.block.column.IntColumn; +import org.apache.tsfile.read.common.block.column.IntColumnBuilder; +import org.apache.tsfile.read.common.block.column.LongColumn; +import org.apache.tsfile.read.common.block.column.LongColumnBuilder; +import org.apache.tsfile.read.common.block.column.NullColumn; +import org.apache.tsfile.read.common.block.column.RunLengthEncodedColumn; +import org.apache.tsfile.read.common.block.column.TimeColumn; +import org.apache.tsfile.read.common.block.column.TimeColumnBuilder; +import org.apache.tsfile.utils.BytesUtils; import org.junit.Assert; import org.junit.Test; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/common/FieldTest.java b/tsfile/src/test/java/org/apache/tsfile/read/common/FieldTest.java similarity index 90% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/read/common/FieldTest.java rename to tsfile/src/test/java/org/apache/tsfile/read/common/FieldTest.java index dfe48b494..1be38da0e 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/common/FieldTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/read/common/FieldTest.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.read.common; +package org.apache.tsfile.read.common; -import org.apache.iotdb.tsfile.exception.NullFieldException; +import org.apache.tsfile.exception.NullFieldException; import org.junit.Test; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/common/PathTest.java b/tsfile/src/test/java/org/apache/tsfile/read/common/PathTest.java similarity index 97% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/read/common/PathTest.java rename to tsfile/src/test/java/org/apache/tsfile/read/common/PathTest.java index 99a4e1b7e..8df524160 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/common/PathTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/read/common/PathTest.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.read.common; +package org.apache.tsfile.read.common; -import org.apache.iotdb.tsfile.exception.PathParseException; -import org.apache.iotdb.tsfile.read.common.parser.PathVisitor; +import org.apache.tsfile.exception.PathParseException; +import org.apache.tsfile.read.common.parser.PathVisitor; import org.junit.Assert; import org.junit.Test; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/common/TimeRangeTest.java b/tsfile/src/test/java/org/apache/tsfile/read/common/TimeRangeTest.java similarity index 99% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/read/common/TimeRangeTest.java rename to tsfile/src/test/java/org/apache/tsfile/read/common/TimeRangeTest.java index cd929d244..be4824ea1 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/common/TimeRangeTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/read/common/TimeRangeTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.read.common; +package org.apache.tsfile.read.common; import org.junit.Assert; import org.junit.Test; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/controller/ChunkLoaderTest.java b/tsfile/src/test/java/org/apache/tsfile/read/controller/ChunkLoaderTest.java similarity index 82% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/read/controller/ChunkLoaderTest.java rename to tsfile/src/test/java/org/apache/tsfile/read/controller/ChunkLoaderTest.java index 6a45815f8..83de12d60 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/controller/ChunkLoaderTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/read/controller/ChunkLoaderTest.java @@ -16,15 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.read.controller; +package org.apache.tsfile.read.controller; -import org.apache.iotdb.tsfile.file.header.ChunkHeader; -import org.apache.iotdb.tsfile.file.metadata.ChunkMetadata; -import org.apache.iotdb.tsfile.file.metadata.IChunkMetadata; -import org.apache.iotdb.tsfile.read.TsFileSequenceReader; -import org.apache.iotdb.tsfile.read.common.Chunk; -import org.apache.iotdb.tsfile.read.common.Path; -import org.apache.iotdb.tsfile.utils.TsFileGeneratorForTest; +import org.apache.tsfile.file.header.ChunkHeader; +import org.apache.tsfile.file.metadata.ChunkMetadata; +import org.apache.tsfile.file.metadata.IChunkMetadata; +import org.apache.tsfile.read.TsFileSequenceReader; +import org.apache.tsfile.read.common.Chunk; +import org.apache.tsfile.read.common.Path; +import org.apache.tsfile.utils.TsFileGeneratorForTest; import org.junit.After; import org.junit.Assert; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/controller/IMetadataQuerierByFileImplTest.java b/tsfile/src/test/java/org/apache/tsfile/read/controller/IMetadataQuerierByFileImplTest.java similarity index 94% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/read/controller/IMetadataQuerierByFileImplTest.java rename to tsfile/src/test/java/org/apache/tsfile/read/controller/IMetadataQuerierByFileImplTest.java index 52fc8c7b3..d604eb7f3 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/controller/IMetadataQuerierByFileImplTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/read/controller/IMetadataQuerierByFileImplTest.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.read.controller; +package org.apache.tsfile.read.controller; -import org.apache.iotdb.tsfile.file.metadata.ChunkMetadata; -import org.apache.iotdb.tsfile.read.TsFileSequenceReader; -import org.apache.iotdb.tsfile.read.common.Path; -import org.apache.iotdb.tsfile.read.common.TimeRange; -import org.apache.iotdb.tsfile.utils.TsFileGeneratorForTest; +import org.apache.tsfile.file.metadata.ChunkMetadata; +import org.apache.tsfile.read.TsFileSequenceReader; +import org.apache.tsfile.read.common.Path; +import org.apache.tsfile.read.common.TimeRange; +import org.apache.tsfile.utils.TsFileGeneratorForTest; import org.junit.After; import org.junit.Assert; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/filter/FilterSerializeTest.java b/tsfile/src/test/java/org/apache/tsfile/read/filter/FilterSerializeTest.java similarity index 92% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/read/filter/FilterSerializeTest.java rename to tsfile/src/test/java/org/apache/tsfile/read/filter/FilterSerializeTest.java index 3044a2d7a..1d0fd3ff6 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/filter/FilterSerializeTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/read/filter/FilterSerializeTest.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.read.filter; +package org.apache.tsfile.read.filter; -import org.apache.iotdb.tsfile.read.filter.basic.Filter; -import org.apache.iotdb.tsfile.read.filter.factory.FilterFactory; -import org.apache.iotdb.tsfile.read.filter.factory.TimeFilterApi; -import org.apache.iotdb.tsfile.read.filter.factory.ValueFilterApi; -import org.apache.iotdb.tsfile.utils.TimeDuration; +import org.apache.tsfile.read.filter.basic.Filter; +import org.apache.tsfile.read.filter.factory.FilterFactory; +import org.apache.tsfile.read.filter.factory.TimeFilterApi; +import org.apache.tsfile.read.filter.factory.ValueFilterApi; +import org.apache.tsfile.utils.TimeDuration; import org.junit.Test; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/filter/FilterTestUtil.java b/tsfile/src/test/java/org/apache/tsfile/read/filter/FilterTestUtil.java similarity index 92% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/read/filter/FilterTestUtil.java rename to tsfile/src/test/java/org/apache/tsfile/read/filter/FilterTestUtil.java index 07f7e9fb0..e069b6958 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/filter/FilterTestUtil.java +++ b/tsfile/src/test/java/org/apache/tsfile/read/filter/FilterTestUtil.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.filter; +package org.apache.tsfile.read.filter; -import org.apache.iotdb.tsfile.file.metadata.IMetadata; -import org.apache.iotdb.tsfile.file.metadata.statistics.Statistics; -import org.apache.iotdb.tsfile.file.metadata.statistics.TimeStatistics; +import org.apache.tsfile.file.metadata.IMetadata; +import org.apache.tsfile.file.metadata.statistics.Statistics; +import org.apache.tsfile.file.metadata.statistics.TimeStatistics; import java.io.Serializable; import java.util.Collections; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/filter/GroupByFilterTest.java b/tsfile/src/test/java/org/apache/tsfile/read/filter/GroupByFilterTest.java similarity index 90% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/read/filter/GroupByFilterTest.java rename to tsfile/src/test/java/org/apache/tsfile/read/filter/GroupByFilterTest.java index a0d6341c3..501ac8d34 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/filter/GroupByFilterTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/read/filter/GroupByFilterTest.java @@ -16,17 +16,17 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.read.filter; +package org.apache.tsfile.read.filter; -import org.apache.iotdb.tsfile.file.metadata.IMetadata; -import org.apache.iotdb.tsfile.file.metadata.statistics.LongStatistics; -import org.apache.iotdb.tsfile.read.filter.factory.TimeFilterApi; -import org.apache.iotdb.tsfile.read.filter.operator.GroupByFilter; +import org.apache.tsfile.file.metadata.IMetadata; +import org.apache.tsfile.file.metadata.statistics.LongStatistics; +import org.apache.tsfile.read.filter.factory.TimeFilterApi; +import org.apache.tsfile.read.filter.operator.GroupByFilter; import org.junit.Before; import org.junit.Test; -import static org.apache.iotdb.tsfile.read.filter.FilterTestUtil.newMetadata; +import static org.apache.tsfile.read.filter.FilterTestUtil.newMetadata; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/filter/GroupByMonthFilterTest.java b/tsfile/src/test/java/org/apache/tsfile/read/filter/GroupByMonthFilterTest.java similarity index 95% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/read/filter/GroupByMonthFilterTest.java rename to tsfile/src/test/java/org/apache/tsfile/read/filter/GroupByMonthFilterTest.java index 84300c4cd..341287fdd 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/filter/GroupByMonthFilterTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/read/filter/GroupByMonthFilterTest.java @@ -16,20 +16,20 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.read.filter; +package org.apache.tsfile.read.filter; -import org.apache.iotdb.tsfile.file.metadata.IMetadata; -import org.apache.iotdb.tsfile.file.metadata.statistics.LongStatistics; -import org.apache.iotdb.tsfile.read.filter.factory.TimeFilterApi; -import org.apache.iotdb.tsfile.read.filter.operator.GroupByMonthFilter; -import org.apache.iotdb.tsfile.utils.TimeDuration; +import org.apache.tsfile.file.metadata.IMetadata; +import org.apache.tsfile.file.metadata.statistics.LongStatistics; +import org.apache.tsfile.read.filter.factory.TimeFilterApi; +import org.apache.tsfile.read.filter.operator.GroupByMonthFilter; +import org.apache.tsfile.utils.TimeDuration; import org.junit.Test; import java.util.TimeZone; import java.util.concurrent.TimeUnit; -import static org.apache.iotdb.tsfile.read.filter.FilterTestUtil.newMetadata; +import static org.apache.tsfile.read.filter.FilterTestUtil.newMetadata; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/filter/IExpressionOptimizerTest.java b/tsfile/src/test/java/org/apache/tsfile/read/filter/IExpressionOptimizerTest.java similarity index 93% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/read/filter/IExpressionOptimizerTest.java rename to tsfile/src/test/java/org/apache/tsfile/read/filter/IExpressionOptimizerTest.java index e38818447..cadc7c6cd 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/filter/IExpressionOptimizerTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/read/filter/IExpressionOptimizerTest.java @@ -16,19 +16,19 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.read.filter; - -import org.apache.iotdb.tsfile.exception.filter.QueryFilterOptimizationException; -import org.apache.iotdb.tsfile.read.common.Path; -import org.apache.iotdb.tsfile.read.expression.IExpression; -import org.apache.iotdb.tsfile.read.expression.impl.BinaryExpression; -import org.apache.iotdb.tsfile.read.expression.impl.GlobalTimeExpression; -import org.apache.iotdb.tsfile.read.expression.impl.SingleSeriesExpression; -import org.apache.iotdb.tsfile.read.expression.util.ExpressionOptimizer; -import org.apache.iotdb.tsfile.read.filter.basic.Filter; -import org.apache.iotdb.tsfile.read.filter.factory.FilterFactory; -import org.apache.iotdb.tsfile.read.filter.factory.TimeFilterApi; -import org.apache.iotdb.tsfile.read.filter.factory.ValueFilterApi; +package org.apache.tsfile.read.filter; + +import org.apache.tsfile.exception.filter.QueryFilterOptimizationException; +import org.apache.tsfile.read.common.Path; +import org.apache.tsfile.read.expression.IExpression; +import org.apache.tsfile.read.expression.impl.BinaryExpression; +import org.apache.tsfile.read.expression.impl.GlobalTimeExpression; +import org.apache.tsfile.read.expression.impl.SingleSeriesExpression; +import org.apache.tsfile.read.expression.util.ExpressionOptimizer; +import org.apache.tsfile.read.filter.basic.Filter; +import org.apache.tsfile.read.filter.factory.FilterFactory; +import org.apache.tsfile.read.filter.factory.TimeFilterApi; +import org.apache.tsfile.read.filter.factory.ValueFilterApi; import org.junit.After; import org.junit.Assert; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/filter/MinTimeMaxTimeFilterTest.java b/tsfile/src/test/java/org/apache/tsfile/read/filter/MinTimeMaxTimeFilterTest.java similarity index 95% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/read/filter/MinTimeMaxTimeFilterTest.java rename to tsfile/src/test/java/org/apache/tsfile/read/filter/MinTimeMaxTimeFilterTest.java index c0cd9dda0..3b8d5f245 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/filter/MinTimeMaxTimeFilterTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/read/filter/MinTimeMaxTimeFilterTest.java @@ -16,17 +16,17 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.read.filter; +package org.apache.tsfile.read.filter; -import org.apache.iotdb.tsfile.read.filter.basic.Filter; -import org.apache.iotdb.tsfile.read.filter.factory.FilterFactory; -import org.apache.iotdb.tsfile.read.filter.factory.TimeFilterApi; -import org.apache.iotdb.tsfile.read.filter.factory.ValueFilterApi; +import org.apache.tsfile.read.filter.basic.Filter; +import org.apache.tsfile.read.filter.factory.FilterFactory; +import org.apache.tsfile.read.filter.factory.TimeFilterApi; +import org.apache.tsfile.read.filter.factory.ValueFilterApi; import org.junit.Assert; import org.junit.Test; -import static org.apache.iotdb.tsfile.read.filter.operator.Not.CONTAIN_NOT_ERR_MSG; +import static org.apache.tsfile.read.filter.operator.Not.CONTAIN_NOT_ERR_MSG; import static org.junit.Assert.fail; public class MinTimeMaxTimeFilterTest { diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/filter/OperatorTest.java b/tsfile/src/test/java/org/apache/tsfile/read/filter/OperatorTest.java similarity index 92% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/read/filter/OperatorTest.java rename to tsfile/src/test/java/org/apache/tsfile/read/filter/OperatorTest.java index cdffbb82e..a72341900 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/filter/OperatorTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/read/filter/OperatorTest.java @@ -16,19 +16,19 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.read.filter; +package org.apache.tsfile.read.filter; -import org.apache.iotdb.tsfile.common.conf.TSFileConfig; -import org.apache.iotdb.tsfile.read.filter.basic.Filter; -import org.apache.iotdb.tsfile.read.filter.factory.FilterFactory; -import org.apache.iotdb.tsfile.read.filter.factory.TimeFilterApi; -import org.apache.iotdb.tsfile.read.filter.factory.ValueFilterApi; -import org.apache.iotdb.tsfile.utils.Binary; +import org.apache.tsfile.common.conf.TSFileConfig; +import org.apache.tsfile.read.filter.basic.Filter; +import org.apache.tsfile.read.filter.factory.FilterFactory; +import org.apache.tsfile.read.filter.factory.TimeFilterApi; +import org.apache.tsfile.read.filter.factory.ValueFilterApi; +import org.apache.tsfile.utils.Binary; import org.junit.Assert; import org.junit.Test; -import static org.apache.iotdb.tsfile.read.filter.operator.ValueFilterOperators.CANNOT_PUSH_DOWN_MSG; +import static org.apache.tsfile.read.filter.operator.ValueFilterOperators.CANNOT_PUSH_DOWN_MSG; public class OperatorTest { diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/filter/PredicateRemoveNotRewriterTest.java b/tsfile/src/test/java/org/apache/tsfile/read/filter/PredicateRemoveNotRewriterTest.java similarity index 93% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/read/filter/PredicateRemoveNotRewriterTest.java rename to tsfile/src/test/java/org/apache/tsfile/read/filter/PredicateRemoveNotRewriterTest.java index b08acfa4a..e45cda40e 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/filter/PredicateRemoveNotRewriterTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/read/filter/PredicateRemoveNotRewriterTest.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.filter; +package org.apache.tsfile.read.filter; -import org.apache.iotdb.tsfile.read.filter.factory.FilterFactory; -import org.apache.iotdb.tsfile.read.filter.factory.TimeFilterApi; -import org.apache.iotdb.tsfile.read.filter.factory.ValueFilterApi; +import org.apache.tsfile.read.filter.factory.FilterFactory; +import org.apache.tsfile.read.filter.factory.TimeFilterApi; +import org.apache.tsfile.read.filter.factory.ValueFilterApi; import org.junit.Assert; import org.junit.Test; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/filter/StatisticsFilterTest.java b/tsfile/src/test/java/org/apache/tsfile/read/filter/StatisticsFilterTest.java similarity index 92% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/read/filter/StatisticsFilterTest.java rename to tsfile/src/test/java/org/apache/tsfile/read/filter/StatisticsFilterTest.java index 06051ad2e..2acf3e351 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/filter/StatisticsFilterTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/read/filter/StatisticsFilterTest.java @@ -16,24 +16,24 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.read.filter; +package org.apache.tsfile.read.filter; -import org.apache.iotdb.tsfile.file.metadata.IMetadata; -import org.apache.iotdb.tsfile.file.metadata.statistics.LongStatistics; -import org.apache.iotdb.tsfile.file.metadata.statistics.TimeStatistics; -import org.apache.iotdb.tsfile.read.filter.basic.Filter; -import org.apache.iotdb.tsfile.read.filter.factory.FilterFactory; -import org.apache.iotdb.tsfile.read.filter.factory.TimeFilterApi; -import org.apache.iotdb.tsfile.read.filter.factory.ValueFilterApi; +import org.apache.tsfile.file.metadata.IMetadata; +import org.apache.tsfile.file.metadata.statistics.LongStatistics; +import org.apache.tsfile.file.metadata.statistics.TimeStatistics; +import org.apache.tsfile.read.filter.basic.Filter; +import org.apache.tsfile.read.filter.factory.FilterFactory; +import org.apache.tsfile.read.filter.factory.TimeFilterApi; +import org.apache.tsfile.read.filter.factory.ValueFilterApi; import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import static org.apache.iotdb.tsfile.read.filter.FilterTestUtil.newAlignedMetadata; -import static org.apache.iotdb.tsfile.read.filter.FilterTestUtil.newMetadata; -import static org.apache.iotdb.tsfile.read.filter.operator.Not.CONTAIN_NOT_ERR_MSG; -import static org.apache.iotdb.tsfile.read.filter.operator.ValueFilterOperators.CANNOT_PUSH_DOWN_MSG; +import static org.apache.tsfile.read.filter.FilterTestUtil.newAlignedMetadata; +import static org.apache.tsfile.read.filter.FilterTestUtil.newMetadata; +import static org.apache.tsfile.read.filter.operator.Not.CONTAIN_NOT_ERR_MSG; +import static org.apache.tsfile.read.filter.operator.ValueFilterOperators.CANNOT_PUSH_DOWN_MSG; import static org.junit.Assert.fail; public class StatisticsFilterTest { diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/query/executor/QueryExecutorTest.java b/tsfile/src/test/java/org/apache/tsfile/read/query/executor/QueryExecutorTest.java similarity index 80% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/read/query/executor/QueryExecutorTest.java rename to tsfile/src/test/java/org/apache/tsfile/read/query/executor/QueryExecutorTest.java index 3f3805268..dbfbabc8e 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/query/executor/QueryExecutorTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/read/query/executor/QueryExecutorTest.java @@ -16,28 +16,28 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.read.query.executor; - -import org.apache.iotdb.tsfile.common.conf.TSFileConfig; -import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor; -import org.apache.iotdb.tsfile.read.TsFileSequenceReader; -import org.apache.iotdb.tsfile.read.common.Path; -import org.apache.iotdb.tsfile.read.common.RowRecord; -import org.apache.iotdb.tsfile.read.controller.CachedChunkLoaderImpl; -import org.apache.iotdb.tsfile.read.controller.IChunkLoader; -import org.apache.iotdb.tsfile.read.controller.MetadataQuerierByFileImpl; -import org.apache.iotdb.tsfile.read.expression.IExpression; -import org.apache.iotdb.tsfile.read.expression.QueryExpression; -import org.apache.iotdb.tsfile.read.expression.impl.BinaryExpression; -import org.apache.iotdb.tsfile.read.expression.impl.GlobalTimeExpression; -import org.apache.iotdb.tsfile.read.expression.impl.SingleSeriesExpression; -import org.apache.iotdb.tsfile.read.filter.basic.Filter; -import org.apache.iotdb.tsfile.read.filter.factory.FilterFactory; -import org.apache.iotdb.tsfile.read.filter.factory.TimeFilterApi; -import org.apache.iotdb.tsfile.read.filter.factory.ValueFilterApi; -import org.apache.iotdb.tsfile.read.query.dataset.QueryDataSet; -import org.apache.iotdb.tsfile.utils.Binary; -import org.apache.iotdb.tsfile.utils.TsFileGeneratorForTest; +package org.apache.tsfile.read.query.executor; + +import org.apache.tsfile.common.conf.TSFileConfig; +import org.apache.tsfile.common.conf.TSFileDescriptor; +import org.apache.tsfile.read.TsFileSequenceReader; +import org.apache.tsfile.read.common.Path; +import org.apache.tsfile.read.common.RowRecord; +import org.apache.tsfile.read.controller.CachedChunkLoaderImpl; +import org.apache.tsfile.read.controller.IChunkLoader; +import org.apache.tsfile.read.controller.MetadataQuerierByFileImpl; +import org.apache.tsfile.read.expression.IExpression; +import org.apache.tsfile.read.expression.QueryExpression; +import org.apache.tsfile.read.expression.impl.BinaryExpression; +import org.apache.tsfile.read.expression.impl.GlobalTimeExpression; +import org.apache.tsfile.read.expression.impl.SingleSeriesExpression; +import org.apache.tsfile.read.filter.basic.Filter; +import org.apache.tsfile.read.filter.factory.FilterFactory; +import org.apache.tsfile.read.filter.factory.TimeFilterApi; +import org.apache.tsfile.read.filter.factory.ValueFilterApi; +import org.apache.tsfile.read.query.dataset.QueryDataSet; +import org.apache.tsfile.utils.Binary; +import org.apache.tsfile.utils.TsFileGeneratorForTest; import org.junit.After; import org.junit.Assert; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/query/timegenerator/NodeTest.java b/tsfile/src/test/java/org/apache/tsfile/read/query/timegenerator/NodeTest.java similarity index 86% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/read/query/timegenerator/NodeTest.java rename to tsfile/src/test/java/org/apache/tsfile/read/query/timegenerator/NodeTest.java index 20b3a9387..bd64e1480 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/query/timegenerator/NodeTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/read/query/timegenerator/NodeTest.java @@ -16,15 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.read.query.timegenerator; +package org.apache.tsfile.read.query.timegenerator; -import org.apache.iotdb.tsfile.read.query.timegenerator.node.AndNode; -import org.apache.iotdb.tsfile.read.query.timegenerator.node.LeafNode; -import org.apache.iotdb.tsfile.read.query.timegenerator.node.Node; -import org.apache.iotdb.tsfile.read.query.timegenerator.node.NodeType; -import org.apache.iotdb.tsfile.read.query.timegenerator.node.OrNode; -import org.apache.iotdb.tsfile.read.reader.FakedBatchReader; -import org.apache.iotdb.tsfile.read.reader.IBatchReader; +import org.apache.tsfile.read.query.timegenerator.node.AndNode; +import org.apache.tsfile.read.query.timegenerator.node.LeafNode; +import org.apache.tsfile.read.query.timegenerator.node.Node; +import org.apache.tsfile.read.query.timegenerator.node.NodeType; +import org.apache.tsfile.read.query.timegenerator.node.OrNode; +import org.apache.tsfile.read.reader.FakedBatchReader; +import org.apache.tsfile.read.reader.IBatchReader; import org.junit.Assert; import org.junit.Test; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/query/timegenerator/ReadWriteTest.java b/tsfile/src/test/java/org/apache/tsfile/read/query/timegenerator/ReadWriteTest.java similarity index 77% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/read/query/timegenerator/ReadWriteTest.java rename to tsfile/src/test/java/org/apache/tsfile/read/query/timegenerator/ReadWriteTest.java index efc487b0d..d6de50966 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/query/timegenerator/ReadWriteTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/read/query/timegenerator/ReadWriteTest.java @@ -16,32 +16,32 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.read.query.timegenerator; - -import org.apache.iotdb.tsfile.exception.write.WriteProcessException; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding; -import org.apache.iotdb.tsfile.read.TsFileReader; -import org.apache.iotdb.tsfile.read.TsFileSequenceReader; -import org.apache.iotdb.tsfile.read.common.Path; -import org.apache.iotdb.tsfile.read.expression.IExpression; -import org.apache.iotdb.tsfile.read.expression.QueryExpression; -import org.apache.iotdb.tsfile.read.expression.impl.BinaryExpression; -import org.apache.iotdb.tsfile.read.expression.impl.GlobalTimeExpression; -import org.apache.iotdb.tsfile.read.expression.impl.SingleSeriesExpression; -import org.apache.iotdb.tsfile.read.filter.basic.Filter; -import org.apache.iotdb.tsfile.read.filter.factory.FilterFactory; -import org.apache.iotdb.tsfile.read.filter.factory.TimeFilterApi; -import org.apache.iotdb.tsfile.read.filter.factory.ValueFilterApi; -import org.apache.iotdb.tsfile.read.query.dataset.QueryDataSet; -import org.apache.iotdb.tsfile.utils.TsFileGeneratorForTest; -import org.apache.iotdb.tsfile.write.TsFileWriter; -import org.apache.iotdb.tsfile.write.record.TSRecord; -import org.apache.iotdb.tsfile.write.record.datapoint.DataPoint; -import org.apache.iotdb.tsfile.write.record.datapoint.FloatDataPoint; -import org.apache.iotdb.tsfile.write.record.datapoint.IntDataPoint; -import org.apache.iotdb.tsfile.write.schema.MeasurementSchema; -import org.apache.iotdb.tsfile.write.schema.Schema; +package org.apache.tsfile.read.query.timegenerator; + +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.exception.write.WriteProcessException; +import org.apache.tsfile.file.metadata.enums.TSEncoding; +import org.apache.tsfile.read.TsFileReader; +import org.apache.tsfile.read.TsFileSequenceReader; +import org.apache.tsfile.read.common.Path; +import org.apache.tsfile.read.expression.IExpression; +import org.apache.tsfile.read.expression.QueryExpression; +import org.apache.tsfile.read.expression.impl.BinaryExpression; +import org.apache.tsfile.read.expression.impl.GlobalTimeExpression; +import org.apache.tsfile.read.expression.impl.SingleSeriesExpression; +import org.apache.tsfile.read.filter.basic.Filter; +import org.apache.tsfile.read.filter.factory.FilterFactory; +import org.apache.tsfile.read.filter.factory.TimeFilterApi; +import org.apache.tsfile.read.filter.factory.ValueFilterApi; +import org.apache.tsfile.read.query.dataset.QueryDataSet; +import org.apache.tsfile.utils.TsFileGeneratorForTest; +import org.apache.tsfile.write.TsFileWriter; +import org.apache.tsfile.write.record.TSRecord; +import org.apache.tsfile.write.record.datapoint.DataPoint; +import org.apache.tsfile.write.record.datapoint.FloatDataPoint; +import org.apache.tsfile.write.record.datapoint.IntDataPoint; +import org.apache.tsfile.write.schema.MeasurementSchema; +import org.apache.tsfile.write.schema.Schema; import org.junit.After; import org.junit.Assert; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/query/timegenerator/ReaderByTimestampTest.java b/tsfile/src/test/java/org/apache/tsfile/read/query/timegenerator/ReaderByTimestampTest.java similarity index 82% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/read/query/timegenerator/ReaderByTimestampTest.java rename to tsfile/src/test/java/org/apache/tsfile/read/query/timegenerator/ReaderByTimestampTest.java index b302d0b10..3e8ed776b 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/query/timegenerator/ReaderByTimestampTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/read/query/timegenerator/ReaderByTimestampTest.java @@ -16,18 +16,18 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.read.query.timegenerator; +package org.apache.tsfile.read.query.timegenerator; -import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor; -import org.apache.iotdb.tsfile.file.metadata.IChunkMetadata; -import org.apache.iotdb.tsfile.read.TsFileSequenceReader; -import org.apache.iotdb.tsfile.read.common.BatchData; -import org.apache.iotdb.tsfile.read.common.Path; -import org.apache.iotdb.tsfile.read.controller.CachedChunkLoaderImpl; -import org.apache.iotdb.tsfile.read.controller.MetadataQuerierByFileImpl; -import org.apache.iotdb.tsfile.read.reader.series.AbstractFileSeriesReader; -import org.apache.iotdb.tsfile.read.reader.series.FileSeriesReader; -import org.apache.iotdb.tsfile.read.reader.series.FileSeriesReaderByTimestamp; +import org.apache.tsfile.common.conf.TSFileDescriptor; +import org.apache.tsfile.file.metadata.IChunkMetadata; +import org.apache.tsfile.read.TsFileSequenceReader; +import org.apache.tsfile.read.common.BatchData; +import org.apache.tsfile.read.common.Path; +import org.apache.tsfile.read.controller.CachedChunkLoaderImpl; +import org.apache.tsfile.read.controller.MetadataQuerierByFileImpl; +import org.apache.tsfile.read.reader.series.AbstractFileSeriesReader; +import org.apache.tsfile.read.reader.series.FileSeriesReader; +import org.apache.tsfile.read.reader.series.FileSeriesReaderByTimestamp; import org.junit.After; import org.junit.Assert; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/query/timegenerator/TimeGeneratorReadEmptyTest.java b/tsfile/src/test/java/org/apache/tsfile/read/query/timegenerator/TimeGeneratorReadEmptyTest.java similarity index 71% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/read/query/timegenerator/TimeGeneratorReadEmptyTest.java rename to tsfile/src/test/java/org/apache/tsfile/read/query/timegenerator/TimeGeneratorReadEmptyTest.java index d98a570e1..3811238d5 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/query/timegenerator/TimeGeneratorReadEmptyTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/read/query/timegenerator/TimeGeneratorReadEmptyTest.java @@ -17,32 +17,32 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.query.timegenerator; - -import org.apache.iotdb.tsfile.exception.write.WriteProcessException; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding; -import org.apache.iotdb.tsfile.read.TsFileReader; -import org.apache.iotdb.tsfile.read.TsFileSequenceReader; -import org.apache.iotdb.tsfile.read.common.Path; -import org.apache.iotdb.tsfile.read.expression.IExpression; -import org.apache.iotdb.tsfile.read.expression.QueryExpression; -import org.apache.iotdb.tsfile.read.expression.impl.BinaryExpression; -import org.apache.iotdb.tsfile.read.expression.impl.GlobalTimeExpression; -import org.apache.iotdb.tsfile.read.expression.impl.SingleSeriesExpression; -import org.apache.iotdb.tsfile.read.filter.basic.Filter; -import org.apache.iotdb.tsfile.read.filter.factory.FilterFactory; -import org.apache.iotdb.tsfile.read.filter.factory.TimeFilterApi; -import org.apache.iotdb.tsfile.read.filter.factory.ValueFilterApi; -import org.apache.iotdb.tsfile.read.query.dataset.QueryDataSet; -import org.apache.iotdb.tsfile.utils.TsFileGeneratorForTest; -import org.apache.iotdb.tsfile.write.TsFileWriter; -import org.apache.iotdb.tsfile.write.record.TSRecord; -import org.apache.iotdb.tsfile.write.record.datapoint.DataPoint; -import org.apache.iotdb.tsfile.write.record.datapoint.FloatDataPoint; -import org.apache.iotdb.tsfile.write.record.datapoint.IntDataPoint; -import org.apache.iotdb.tsfile.write.schema.MeasurementSchema; -import org.apache.iotdb.tsfile.write.schema.Schema; +package org.apache.tsfile.read.query.timegenerator; + +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.exception.write.WriteProcessException; +import org.apache.tsfile.file.metadata.enums.TSEncoding; +import org.apache.tsfile.read.TsFileReader; +import org.apache.tsfile.read.TsFileSequenceReader; +import org.apache.tsfile.read.common.Path; +import org.apache.tsfile.read.expression.IExpression; +import org.apache.tsfile.read.expression.QueryExpression; +import org.apache.tsfile.read.expression.impl.BinaryExpression; +import org.apache.tsfile.read.expression.impl.GlobalTimeExpression; +import org.apache.tsfile.read.expression.impl.SingleSeriesExpression; +import org.apache.tsfile.read.filter.basic.Filter; +import org.apache.tsfile.read.filter.factory.FilterFactory; +import org.apache.tsfile.read.filter.factory.TimeFilterApi; +import org.apache.tsfile.read.filter.factory.ValueFilterApi; +import org.apache.tsfile.read.query.dataset.QueryDataSet; +import org.apache.tsfile.utils.TsFileGeneratorForTest; +import org.apache.tsfile.write.TsFileWriter; +import org.apache.tsfile.write.record.TSRecord; +import org.apache.tsfile.write.record.datapoint.DataPoint; +import org.apache.tsfile.write.record.datapoint.FloatDataPoint; +import org.apache.tsfile.write.record.datapoint.IntDataPoint; +import org.apache.tsfile.write.schema.MeasurementSchema; +import org.apache.tsfile.write.schema.Schema; import org.junit.After; import org.junit.Assert; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/query/timegenerator/TimeGeneratorReadWriteTest.java b/tsfile/src/test/java/org/apache/tsfile/read/query/timegenerator/TimeGeneratorReadWriteTest.java similarity index 76% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/read/query/timegenerator/TimeGeneratorReadWriteTest.java rename to tsfile/src/test/java/org/apache/tsfile/read/query/timegenerator/TimeGeneratorReadWriteTest.java index 368d0b63c..b4739d6fe 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/query/timegenerator/TimeGeneratorReadWriteTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/read/query/timegenerator/TimeGeneratorReadWriteTest.java @@ -17,32 +17,32 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.query.timegenerator; - -import org.apache.iotdb.tsfile.exception.write.WriteProcessException; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding; -import org.apache.iotdb.tsfile.read.TsFileReader; -import org.apache.iotdb.tsfile.read.TsFileSequenceReader; -import org.apache.iotdb.tsfile.read.common.Path; -import org.apache.iotdb.tsfile.read.expression.IExpression; -import org.apache.iotdb.tsfile.read.expression.QueryExpression; -import org.apache.iotdb.tsfile.read.expression.impl.BinaryExpression; -import org.apache.iotdb.tsfile.read.expression.impl.GlobalTimeExpression; -import org.apache.iotdb.tsfile.read.expression.impl.SingleSeriesExpression; -import org.apache.iotdb.tsfile.read.filter.basic.Filter; -import org.apache.iotdb.tsfile.read.filter.factory.FilterFactory; -import org.apache.iotdb.tsfile.read.filter.factory.TimeFilterApi; -import org.apache.iotdb.tsfile.read.filter.factory.ValueFilterApi; -import org.apache.iotdb.tsfile.read.query.dataset.QueryDataSet; -import org.apache.iotdb.tsfile.utils.TsFileGeneratorForTest; -import org.apache.iotdb.tsfile.write.TsFileWriter; -import org.apache.iotdb.tsfile.write.record.TSRecord; -import org.apache.iotdb.tsfile.write.record.datapoint.DataPoint; -import org.apache.iotdb.tsfile.write.record.datapoint.FloatDataPoint; -import org.apache.iotdb.tsfile.write.record.datapoint.IntDataPoint; -import org.apache.iotdb.tsfile.write.schema.MeasurementSchema; -import org.apache.iotdb.tsfile.write.schema.Schema; +package org.apache.tsfile.read.query.timegenerator; + +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.exception.write.WriteProcessException; +import org.apache.tsfile.file.metadata.enums.TSEncoding; +import org.apache.tsfile.read.TsFileReader; +import org.apache.tsfile.read.TsFileSequenceReader; +import org.apache.tsfile.read.common.Path; +import org.apache.tsfile.read.expression.IExpression; +import org.apache.tsfile.read.expression.QueryExpression; +import org.apache.tsfile.read.expression.impl.BinaryExpression; +import org.apache.tsfile.read.expression.impl.GlobalTimeExpression; +import org.apache.tsfile.read.expression.impl.SingleSeriesExpression; +import org.apache.tsfile.read.filter.basic.Filter; +import org.apache.tsfile.read.filter.factory.FilterFactory; +import org.apache.tsfile.read.filter.factory.TimeFilterApi; +import org.apache.tsfile.read.filter.factory.ValueFilterApi; +import org.apache.tsfile.read.query.dataset.QueryDataSet; +import org.apache.tsfile.utils.TsFileGeneratorForTest; +import org.apache.tsfile.write.TsFileWriter; +import org.apache.tsfile.write.record.TSRecord; +import org.apache.tsfile.write.record.datapoint.DataPoint; +import org.apache.tsfile.write.record.datapoint.FloatDataPoint; +import org.apache.tsfile.write.record.datapoint.IntDataPoint; +import org.apache.tsfile.write.schema.MeasurementSchema; +import org.apache.tsfile.write.schema.Schema; import org.junit.After; import org.junit.Assert; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/query/timegenerator/TimeGeneratorTest.java b/tsfile/src/test/java/org/apache/tsfile/read/query/timegenerator/TimeGeneratorTest.java similarity index 72% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/read/query/timegenerator/TimeGeneratorTest.java rename to tsfile/src/test/java/org/apache/tsfile/read/query/timegenerator/TimeGeneratorTest.java index 8251827ad..3056835f8 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/query/timegenerator/TimeGeneratorTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/read/query/timegenerator/TimeGeneratorTest.java @@ -16,24 +16,24 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.read.query.timegenerator; +package org.apache.tsfile.read.query.timegenerator; -import org.apache.iotdb.tsfile.common.conf.TSFileConfig; -import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor; -import org.apache.iotdb.tsfile.read.TsFileSequenceReader; -import org.apache.iotdb.tsfile.read.common.Path; -import org.apache.iotdb.tsfile.read.controller.CachedChunkLoaderImpl; -import org.apache.iotdb.tsfile.read.controller.IChunkLoader; -import org.apache.iotdb.tsfile.read.controller.MetadataQuerierByFileImpl; -import org.apache.iotdb.tsfile.read.expression.IExpression; -import org.apache.iotdb.tsfile.read.expression.impl.BinaryExpression; -import org.apache.iotdb.tsfile.read.expression.impl.SingleSeriesExpression; -import org.apache.iotdb.tsfile.read.filter.basic.Filter; -import org.apache.iotdb.tsfile.read.filter.factory.FilterFactory; -import org.apache.iotdb.tsfile.read.filter.factory.TimeFilterApi; -import org.apache.iotdb.tsfile.read.filter.factory.ValueFilterApi; -import org.apache.iotdb.tsfile.utils.Binary; -import org.apache.iotdb.tsfile.utils.TsFileGeneratorForTest; +import org.apache.tsfile.common.conf.TSFileConfig; +import org.apache.tsfile.common.conf.TSFileDescriptor; +import org.apache.tsfile.read.TsFileSequenceReader; +import org.apache.tsfile.read.common.Path; +import org.apache.tsfile.read.controller.CachedChunkLoaderImpl; +import org.apache.tsfile.read.controller.IChunkLoader; +import org.apache.tsfile.read.controller.MetadataQuerierByFileImpl; +import org.apache.tsfile.read.expression.IExpression; +import org.apache.tsfile.read.expression.impl.BinaryExpression; +import org.apache.tsfile.read.expression.impl.SingleSeriesExpression; +import org.apache.tsfile.read.filter.basic.Filter; +import org.apache.tsfile.read.filter.factory.FilterFactory; +import org.apache.tsfile.read.filter.factory.TimeFilterApi; +import org.apache.tsfile.read.filter.factory.ValueFilterApi; +import org.apache.tsfile.utils.Binary; +import org.apache.tsfile.utils.TsFileGeneratorForTest; import org.junit.After; import org.junit.Assert; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/query/timegenerator/TsFileGeneratorForSeriesReaderByTimestamp.java b/tsfile/src/test/java/org/apache/tsfile/read/query/timegenerator/TsFileGeneratorForSeriesReaderByTimestamp.java similarity index 90% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/read/query/timegenerator/TsFileGeneratorForSeriesReaderByTimestamp.java rename to tsfile/src/test/java/org/apache/tsfile/read/query/timegenerator/TsFileGeneratorForSeriesReaderByTimestamp.java index 230cf0f1b..27a188edf 100755 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/query/timegenerator/TsFileGeneratorForSeriesReaderByTimestamp.java +++ b/tsfile/src/test/java/org/apache/tsfile/read/query/timegenerator/TsFileGeneratorForSeriesReaderByTimestamp.java @@ -16,23 +16,23 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.read.query.timegenerator; +package org.apache.tsfile.read.query.timegenerator; -import org.apache.iotdb.tsfile.common.conf.TSFileConfig; -import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor; -import org.apache.iotdb.tsfile.exception.write.WriteProcessException; -import org.apache.iotdb.tsfile.file.metadata.enums.CompressionType; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding; -import org.apache.iotdb.tsfile.read.common.Path; -import org.apache.iotdb.tsfile.utils.FileUtils; -import org.apache.iotdb.tsfile.utils.FileUtils.Unit; -import org.apache.iotdb.tsfile.utils.RecordUtils; -import org.apache.iotdb.tsfile.utils.TsFileGeneratorForTest; -import org.apache.iotdb.tsfile.write.TsFileWriter; -import org.apache.iotdb.tsfile.write.record.TSRecord; -import org.apache.iotdb.tsfile.write.schema.MeasurementSchema; -import org.apache.iotdb.tsfile.write.schema.Schema; +import org.apache.tsfile.common.conf.TSFileConfig; +import org.apache.tsfile.common.conf.TSFileDescriptor; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.exception.write.WriteProcessException; +import org.apache.tsfile.file.metadata.enums.CompressionType; +import org.apache.tsfile.file.metadata.enums.TSEncoding; +import org.apache.tsfile.read.common.Path; +import org.apache.tsfile.utils.FileUtils; +import org.apache.tsfile.utils.FileUtils.Unit; +import org.apache.tsfile.utils.RecordUtils; +import org.apache.tsfile.utils.TsFileGeneratorForTest; +import org.apache.tsfile.write.TsFileWriter; +import org.apache.tsfile.write.record.TSRecord; +import org.apache.tsfile.write.schema.MeasurementSchema; +import org.apache.tsfile.write.schema.Schema; import org.junit.Assert; import org.junit.Ignore; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/reader/AlignedPageReaderPushDownTest.java b/tsfile/src/test/java/org/apache/tsfile/read/reader/AlignedPageReaderPushDownTest.java similarity index 92% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/read/reader/AlignedPageReaderPushDownTest.java rename to tsfile/src/test/java/org/apache/tsfile/read/reader/AlignedPageReaderPushDownTest.java index 6df11f08b..b28a03d6f 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/reader/AlignedPageReaderPushDownTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/read/reader/AlignedPageReaderPushDownTest.java @@ -17,26 +17,26 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.reader; - -import org.apache.iotdb.tsfile.compress.ICompressor; -import org.apache.iotdb.tsfile.encoding.decoder.Decoder; -import org.apache.iotdb.tsfile.encoding.decoder.DeltaBinaryDecoder; -import org.apache.iotdb.tsfile.encoding.decoder.IntRleDecoder; -import org.apache.iotdb.tsfile.encoding.encoder.DeltaBinaryEncoder; -import org.apache.iotdb.tsfile.encoding.encoder.IntRleEncoder; -import org.apache.iotdb.tsfile.file.header.PageHeader; -import org.apache.iotdb.tsfile.file.metadata.enums.CompressionType; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.read.common.TimeRange; -import org.apache.iotdb.tsfile.read.common.block.TsBlock; -import org.apache.iotdb.tsfile.read.filter.basic.Filter; -import org.apache.iotdb.tsfile.read.filter.factory.TimeFilterApi; -import org.apache.iotdb.tsfile.read.filter.factory.ValueFilterApi; -import org.apache.iotdb.tsfile.read.reader.page.AlignedPageReader; -import org.apache.iotdb.tsfile.read.reader.series.PaginationController; -import org.apache.iotdb.tsfile.write.page.TimePageWriter; -import org.apache.iotdb.tsfile.write.page.ValuePageWriter; +package org.apache.tsfile.read.reader; + +import org.apache.tsfile.compress.ICompressor; +import org.apache.tsfile.encoding.decoder.Decoder; +import org.apache.tsfile.encoding.decoder.DeltaBinaryDecoder; +import org.apache.tsfile.encoding.decoder.IntRleDecoder; +import org.apache.tsfile.encoding.encoder.DeltaBinaryEncoder; +import org.apache.tsfile.encoding.encoder.IntRleEncoder; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.file.header.PageHeader; +import org.apache.tsfile.file.metadata.enums.CompressionType; +import org.apache.tsfile.read.common.TimeRange; +import org.apache.tsfile.read.common.block.TsBlock; +import org.apache.tsfile.read.filter.basic.Filter; +import org.apache.tsfile.read.filter.factory.TimeFilterApi; +import org.apache.tsfile.read.filter.factory.ValueFilterApi; +import org.apache.tsfile.read.reader.page.AlignedPageReader; +import org.apache.tsfile.read.reader.series.PaginationController; +import org.apache.tsfile.write.page.TimePageWriter; +import org.apache.tsfile.write.page.ValuePageWriter; import org.junit.Assert; import org.junit.Test; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/reader/ChunkReaderTest.java b/tsfile/src/test/java/org/apache/tsfile/read/reader/ChunkReaderTest.java similarity index 83% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/read/reader/ChunkReaderTest.java rename to tsfile/src/test/java/org/apache/tsfile/read/reader/ChunkReaderTest.java index 4d870987b..a42a4aecf 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/reader/ChunkReaderTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/read/reader/ChunkReaderTest.java @@ -16,18 +16,18 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.read.reader; +package org.apache.tsfile.read.reader; -import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor; -import org.apache.iotdb.tsfile.constant.TestConstant; -import org.apache.iotdb.tsfile.exception.write.WriteProcessException; -import org.apache.iotdb.tsfile.file.metadata.ChunkMetadata; -import org.apache.iotdb.tsfile.read.TsFileSequenceReader; -import org.apache.iotdb.tsfile.read.common.Chunk; -import org.apache.iotdb.tsfile.read.common.Path; -import org.apache.iotdb.tsfile.read.reader.chunk.ChunkReader; -import org.apache.iotdb.tsfile.utils.FilePathUtils; -import org.apache.iotdb.tsfile.utils.TsFileGeneratorUtils; +import org.apache.tsfile.common.conf.TSFileDescriptor; +import org.apache.tsfile.constant.TestConstant; +import org.apache.tsfile.exception.write.WriteProcessException; +import org.apache.tsfile.file.metadata.ChunkMetadata; +import org.apache.tsfile.read.TsFileSequenceReader; +import org.apache.tsfile.read.common.Chunk; +import org.apache.tsfile.read.common.Path; +import org.apache.tsfile.read.reader.chunk.ChunkReader; +import org.apache.tsfile.utils.FilePathUtils; +import org.apache.tsfile.utils.TsFileGeneratorUtils; import org.junit.After; import org.junit.Assert; @@ -38,7 +38,7 @@ import java.io.IOException; import java.util.List; -import static org.apache.iotdb.tsfile.common.constant.TsFileConstant.PATH_SEPARATOR; +import static org.apache.tsfile.common.constant.TsFileConstant.PATH_SEPARATOR; public class ChunkReaderTest { private final String testStorageGroup = TsFileGeneratorUtils.testStorageGroup; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/reader/FakedBatchReader.java b/tsfile/src/test/java/org/apache/tsfile/read/reader/FakedBatchReader.java similarity index 90% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/read/reader/FakedBatchReader.java rename to tsfile/src/test/java/org/apache/tsfile/read/reader/FakedBatchReader.java index 4d5febd13..e80f8b20d 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/reader/FakedBatchReader.java +++ b/tsfile/src/test/java/org/apache/tsfile/read/reader/FakedBatchReader.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.read.reader; +package org.apache.tsfile.read.reader; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.read.common.BatchData; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.read.common.BatchData; import java.io.IOException; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/reader/FakedMultiBatchReader.java b/tsfile/src/test/java/org/apache/tsfile/read/reader/FakedMultiBatchReader.java similarity index 87% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/read/reader/FakedMultiBatchReader.java rename to tsfile/src/test/java/org/apache/tsfile/read/reader/FakedMultiBatchReader.java index f580fd1a0..7eb16bc3a 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/reader/FakedMultiBatchReader.java +++ b/tsfile/src/test/java/org/apache/tsfile/read/reader/FakedMultiBatchReader.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.read.reader; +package org.apache.tsfile.read.reader; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.read.common.BatchData; -import org.apache.iotdb.tsfile.read.filter.basic.Filter; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.read.common.BatchData; +import org.apache.tsfile.read.filter.basic.Filter; public class FakedMultiBatchReader implements IBatchReader { diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/reader/LazyLoadAlignedPagePointReaderTest.java b/tsfile/src/test/java/org/apache/tsfile/read/reader/LazyLoadAlignedPagePointReaderTest.java similarity index 62% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/read/reader/LazyLoadAlignedPagePointReaderTest.java rename to tsfile/src/test/java/org/apache/tsfile/read/reader/LazyLoadAlignedPagePointReaderTest.java index e9609c446..0d7d9b596 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/reader/LazyLoadAlignedPagePointReaderTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/read/reader/LazyLoadAlignedPagePointReaderTest.java @@ -17,18 +17,17 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.reader; +package org.apache.tsfile.read.reader; -import org.apache.iotdb.tsfile.read.TimeValuePair; -import org.apache.iotdb.tsfile.read.reader.page.LazyLoadAlignedPagePointReader; -import org.apache.iotdb.tsfile.read.reader.page.TimePageReader; -import org.apache.iotdb.tsfile.read.reader.page.ValuePageReader; -import org.apache.iotdb.tsfile.utils.TsPrimitiveType; +import org.apache.tsfile.read.TimeValuePair; +import org.apache.tsfile.read.reader.page.LazyLoadAlignedPagePointReader; +import org.apache.tsfile.read.reader.page.TimePageReader; +import org.apache.tsfile.read.reader.page.ValuePageReader; +import org.apache.tsfile.utils.TsPrimitiveType; import org.junit.Assert; import org.junit.Test; import org.mockito.Mockito; -import org.powermock.api.mockito.PowerMockito; import java.io.IOException; import java.util.LinkedList; @@ -39,16 +38,16 @@ public class LazyLoadAlignedPagePointReaderTest { @Test public void testTimeNoData() throws IOException { int columnCount = 2; - TimePageReader timePageReader = PowerMockito.mock(TimePageReader.class); + TimePageReader timePageReader = Mockito.mock(TimePageReader.class); List valuePageReaders = new LinkedList<>(); for (int i = 0; i < columnCount; i++) { - valuePageReaders.add(PowerMockito.mock(ValuePageReader.class)); + valuePageReaders.add(Mockito.mock(ValuePageReader.class)); } - PowerMockito.when(timePageReader.hasNextTime()).thenReturn(false); - PowerMockito.when(valuePageReaders.get(0).nextValue(Mockito.anyLong(), Mockito.anyInt())) + Mockito.when(timePageReader.hasNextTime()).thenReturn(false); + Mockito.when(valuePageReaders.get(0).nextValue(Mockito.anyLong(), Mockito.anyInt())) .thenReturn(null); - PowerMockito.when(valuePageReaders.get(1).nextValue(Mockito.anyLong(), Mockito.anyInt())) + Mockito.when(valuePageReaders.get(1).nextValue(Mockito.anyLong(), Mockito.anyInt())) .thenReturn(null); LazyLoadAlignedPagePointReader reader = @@ -60,16 +59,16 @@ public void testTimeNoData() throws IOException { @Test public void testValueNoData() throws IOException { int columnCount = 2; - TimePageReader timePageReader = PowerMockito.mock(TimePageReader.class); + TimePageReader timePageReader = Mockito.mock(TimePageReader.class); List valuePageReaders = new LinkedList<>(); for (int i = 0; i < columnCount; i++) { - valuePageReaders.add(PowerMockito.mock(ValuePageReader.class)); + valuePageReaders.add(Mockito.mock(ValuePageReader.class)); } - PowerMockito.when(timePageReader.hasNextTime()).thenReturn(true).thenReturn(false); - PowerMockito.when(valuePageReaders.get(0).nextValue(Mockito.anyLong(), Mockito.anyInt())) + Mockito.when(timePageReader.hasNextTime()).thenReturn(true).thenReturn(false); + Mockito.when(valuePageReaders.get(0).nextValue(Mockito.anyLong(), Mockito.anyInt())) .thenReturn(null); - PowerMockito.when(valuePageReaders.get(1).nextValue(Mockito.anyLong(), Mockito.anyInt())) + Mockito.when(valuePageReaders.get(1).nextValue(Mockito.anyLong(), Mockito.anyInt())) .thenReturn(null); LazyLoadAlignedPagePointReader reader = @@ -81,17 +80,17 @@ public void testValueNoData() throws IOException { @Test public void testOneRow() throws IOException { int columnCount = 2; - TimePageReader timePageReader = PowerMockito.mock(TimePageReader.class); + TimePageReader timePageReader = Mockito.mock(TimePageReader.class); List valuePageReaders = new LinkedList<>(); for (int i = 0; i < columnCount; i++) { - valuePageReaders.add(PowerMockito.mock(ValuePageReader.class)); + valuePageReaders.add(Mockito.mock(ValuePageReader.class)); } - PowerMockito.when(timePageReader.hasNextTime()).thenReturn(true).thenReturn(false); - PowerMockito.when(timePageReader.nextTime()).thenReturn(1L); - PowerMockito.when(valuePageReaders.get(0).nextValue(Mockito.anyLong(), Mockito.anyInt())) + Mockito.when(timePageReader.hasNextTime()).thenReturn(true).thenReturn(false); + Mockito.when(timePageReader.nextTime()).thenReturn(1L); + Mockito.when(valuePageReaders.get(0).nextValue(Mockito.anyLong(), Mockito.anyInt())) .thenReturn(new TsPrimitiveType.TsInt(1)); - PowerMockito.when(valuePageReaders.get(1).nextValue(Mockito.anyLong(), Mockito.anyInt())) + Mockito.when(valuePageReaders.get(1).nextValue(Mockito.anyLong(), Mockito.anyInt())) .thenReturn(new TsPrimitiveType.TsInt(2)); LazyLoadAlignedPagePointReader reader = @@ -112,21 +111,18 @@ public void testOneRow() throws IOException { @Test public void testSomeColumnNull() throws IOException { int columnCount = 2; - TimePageReader timePageReader = PowerMockito.mock(TimePageReader.class); + TimePageReader timePageReader = Mockito.mock(TimePageReader.class); List valuePageReaders = new LinkedList<>(); for (int i = 0; i < columnCount; i++) { - valuePageReaders.add(PowerMockito.mock(ValuePageReader.class)); + valuePageReaders.add(Mockito.mock(ValuePageReader.class)); } - PowerMockito.when(timePageReader.hasNextTime()) - .thenReturn(true) - .thenReturn(true) - .thenReturn(false); - PowerMockito.when(timePageReader.nextTime()).thenReturn(1L).thenReturn(2L); - PowerMockito.when(valuePageReaders.get(0).nextValue(Mockito.anyLong(), Mockito.anyInt())) + Mockito.when(timePageReader.hasNextTime()).thenReturn(true).thenReturn(true).thenReturn(false); + Mockito.when(timePageReader.nextTime()).thenReturn(1L).thenReturn(2L); + Mockito.when(valuePageReaders.get(0).nextValue(Mockito.anyLong(), Mockito.anyInt())) .thenReturn(new TsPrimitiveType.TsInt(1)) .thenReturn(null); - PowerMockito.when(valuePageReaders.get(1).nextValue(Mockito.anyLong(), Mockito.anyInt())) + Mockito.when(valuePageReaders.get(1).nextValue(Mockito.anyLong(), Mockito.anyInt())) .thenReturn(null) .thenReturn(null); @@ -143,21 +139,18 @@ public void testSomeColumnNull() throws IOException { @Test public void testMultiRow() throws IOException { int columnCount = 2; - TimePageReader timePageReader = PowerMockito.mock(TimePageReader.class); + TimePageReader timePageReader = Mockito.mock(TimePageReader.class); List valuePageReaders = new LinkedList<>(); for (int i = 0; i < columnCount; i++) { - valuePageReaders.add(PowerMockito.mock(ValuePageReader.class)); + valuePageReaders.add(Mockito.mock(ValuePageReader.class)); } - PowerMockito.when(timePageReader.hasNextTime()) - .thenReturn(true) - .thenReturn(true) - .thenReturn(false); - PowerMockito.when(timePageReader.nextTime()).thenReturn(1L).thenReturn(2L); - PowerMockito.when(valuePageReaders.get(0).nextValue(Mockito.anyLong(), Mockito.anyInt())) + Mockito.when(timePageReader.hasNextTime()).thenReturn(true).thenReturn(true).thenReturn(false); + Mockito.when(timePageReader.nextTime()).thenReturn(1L).thenReturn(2L); + Mockito.when(valuePageReaders.get(0).nextValue(Mockito.anyLong(), Mockito.anyInt())) .thenReturn(new TsPrimitiveType.TsInt(1)) .thenReturn(new TsPrimitiveType.TsInt(1)); - PowerMockito.when(valuePageReaders.get(1).nextValue(Mockito.anyLong(), Mockito.anyInt())) + Mockito.when(valuePageReaders.get(1).nextValue(Mockito.anyLong(), Mockito.anyInt())) .thenReturn(null) .thenReturn(new TsPrimitiveType.TsInt(2)); diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/reader/PageReaderPushDownTest.java b/tsfile/src/test/java/org/apache/tsfile/read/reader/PageReaderPushDownTest.java similarity index 84% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/read/reader/PageReaderPushDownTest.java rename to tsfile/src/test/java/org/apache/tsfile/read/reader/PageReaderPushDownTest.java index 6cdd76443..6610c4083 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/reader/PageReaderPushDownTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/read/reader/PageReaderPushDownTest.java @@ -17,20 +17,20 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.reader; - -import org.apache.iotdb.tsfile.encoding.decoder.DeltaBinaryDecoder; -import org.apache.iotdb.tsfile.encoding.decoder.IntRleDecoder; -import org.apache.iotdb.tsfile.encoding.encoder.DeltaBinaryEncoder; -import org.apache.iotdb.tsfile.encoding.encoder.IntRleEncoder; -import org.apache.iotdb.tsfile.file.header.PageHeader; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.read.common.block.TsBlock; -import org.apache.iotdb.tsfile.read.filter.factory.TimeFilterApi; -import org.apache.iotdb.tsfile.read.filter.factory.ValueFilterApi; -import org.apache.iotdb.tsfile.read.reader.page.PageReader; -import org.apache.iotdb.tsfile.read.reader.series.PaginationController; -import org.apache.iotdb.tsfile.write.page.PageWriter; +package org.apache.tsfile.read.reader; + +import org.apache.tsfile.encoding.decoder.DeltaBinaryDecoder; +import org.apache.tsfile.encoding.decoder.IntRleDecoder; +import org.apache.tsfile.encoding.encoder.DeltaBinaryEncoder; +import org.apache.tsfile.encoding.encoder.IntRleEncoder; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.file.header.PageHeader; +import org.apache.tsfile.read.common.block.TsBlock; +import org.apache.tsfile.read.filter.factory.TimeFilterApi; +import org.apache.tsfile.read.filter.factory.ValueFilterApi; +import org.apache.tsfile.read.reader.page.PageReader; +import org.apache.tsfile.read.reader.series.PaginationController; +import org.apache.tsfile.write.page.PageWriter; import org.junit.Assert; import org.junit.Test; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/reader/PageReaderTest.java b/tsfile/src/test/java/org/apache/tsfile/read/reader/PageReaderTest.java similarity index 86% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/read/reader/PageReaderTest.java rename to tsfile/src/test/java/org/apache/tsfile/read/reader/PageReaderTest.java index 200aeb2f5..7b0258f2d 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/reader/PageReaderTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/read/reader/PageReaderTest.java @@ -16,29 +16,29 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.read.reader; +package org.apache.tsfile.read.reader; -import org.apache.iotdb.tsfile.common.conf.TSFileConfig; -import org.apache.iotdb.tsfile.encoding.decoder.Decoder; -import org.apache.iotdb.tsfile.encoding.decoder.DeltaBinaryDecoder; -import org.apache.iotdb.tsfile.encoding.decoder.DoublePrecisionDecoderV1; -import org.apache.iotdb.tsfile.encoding.decoder.IntRleDecoder; -import org.apache.iotdb.tsfile.encoding.decoder.LongRleDecoder; -import org.apache.iotdb.tsfile.encoding.decoder.PlainDecoder; -import org.apache.iotdb.tsfile.encoding.decoder.SinglePrecisionDecoderV1; -import org.apache.iotdb.tsfile.encoding.encoder.DeltaBinaryEncoder; -import org.apache.iotdb.tsfile.encoding.encoder.DoublePrecisionEncoderV1; -import org.apache.iotdb.tsfile.encoding.encoder.Encoder; -import org.apache.iotdb.tsfile.encoding.encoder.IntRleEncoder; -import org.apache.iotdb.tsfile.encoding.encoder.LongRleEncoder; -import org.apache.iotdb.tsfile.encoding.encoder.PlainEncoder; -import org.apache.iotdb.tsfile.encoding.encoder.SinglePrecisionEncoderV1; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.read.common.BatchData; -import org.apache.iotdb.tsfile.read.common.TimeRange; -import org.apache.iotdb.tsfile.read.reader.page.PageReader; -import org.apache.iotdb.tsfile.utils.Binary; -import org.apache.iotdb.tsfile.write.page.PageWriter; +import org.apache.tsfile.common.conf.TSFileConfig; +import org.apache.tsfile.encoding.decoder.Decoder; +import org.apache.tsfile.encoding.decoder.DeltaBinaryDecoder; +import org.apache.tsfile.encoding.decoder.DoublePrecisionDecoderV1; +import org.apache.tsfile.encoding.decoder.IntRleDecoder; +import org.apache.tsfile.encoding.decoder.LongRleDecoder; +import org.apache.tsfile.encoding.decoder.PlainDecoder; +import org.apache.tsfile.encoding.decoder.SinglePrecisionDecoderV1; +import org.apache.tsfile.encoding.encoder.DeltaBinaryEncoder; +import org.apache.tsfile.encoding.encoder.DoublePrecisionEncoderV1; +import org.apache.tsfile.encoding.encoder.Encoder; +import org.apache.tsfile.encoding.encoder.IntRleEncoder; +import org.apache.tsfile.encoding.encoder.LongRleEncoder; +import org.apache.tsfile.encoding.encoder.PlainEncoder; +import org.apache.tsfile.encoding.encoder.SinglePrecisionEncoderV1; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.read.common.BatchData; +import org.apache.tsfile.read.common.TimeRange; +import org.apache.tsfile.read.reader.page.PageReader; +import org.apache.tsfile.utils.Binary; +import org.apache.tsfile.write.page.PageWriter; import org.junit.Assert; import org.junit.Test; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/reader/ReaderTest.java b/tsfile/src/test/java/org/apache/tsfile/read/reader/ReaderTest.java similarity index 80% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/read/reader/ReaderTest.java rename to tsfile/src/test/java/org/apache/tsfile/read/reader/ReaderTest.java index 484b61300..2751f8833 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/reader/ReaderTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/read/reader/ReaderTest.java @@ -16,23 +16,23 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.read.reader; - -import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor; -import org.apache.iotdb.tsfile.file.metadata.IChunkMetadata; -import org.apache.iotdb.tsfile.read.TsFileSequenceReader; -import org.apache.iotdb.tsfile.read.common.BatchData; -import org.apache.iotdb.tsfile.read.common.Path; -import org.apache.iotdb.tsfile.read.controller.CachedChunkLoaderImpl; -import org.apache.iotdb.tsfile.read.controller.MetadataQuerierByFileImpl; -import org.apache.iotdb.tsfile.read.expression.impl.SingleSeriesExpression; -import org.apache.iotdb.tsfile.read.filter.basic.Filter; -import org.apache.iotdb.tsfile.read.filter.factory.FilterFactory; -import org.apache.iotdb.tsfile.read.filter.factory.TimeFilterApi; -import org.apache.iotdb.tsfile.read.filter.factory.ValueFilterApi; -import org.apache.iotdb.tsfile.read.reader.series.AbstractFileSeriesReader; -import org.apache.iotdb.tsfile.read.reader.series.FileSeriesReader; -import org.apache.iotdb.tsfile.utils.TsFileGeneratorForTest; +package org.apache.tsfile.read.reader; + +import org.apache.tsfile.common.conf.TSFileDescriptor; +import org.apache.tsfile.file.metadata.IChunkMetadata; +import org.apache.tsfile.read.TsFileSequenceReader; +import org.apache.tsfile.read.common.BatchData; +import org.apache.tsfile.read.common.Path; +import org.apache.tsfile.read.controller.CachedChunkLoaderImpl; +import org.apache.tsfile.read.controller.MetadataQuerierByFileImpl; +import org.apache.tsfile.read.expression.impl.SingleSeriesExpression; +import org.apache.tsfile.read.filter.basic.Filter; +import org.apache.tsfile.read.filter.factory.FilterFactory; +import org.apache.tsfile.read.filter.factory.TimeFilterApi; +import org.apache.tsfile.read.filter.factory.ValueFilterApi; +import org.apache.tsfile.read.reader.series.AbstractFileSeriesReader; +import org.apache.tsfile.read.reader.series.FileSeriesReader; +import org.apache.tsfile.utils.TsFileGeneratorForTest; import org.junit.After; import org.junit.Assert; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/BitMapTest.java b/tsfile/src/test/java/org/apache/tsfile/utils/BitMapTest.java similarity index 98% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/utils/BitMapTest.java rename to tsfile/src/test/java/org/apache/tsfile/utils/BitMapTest.java index ef63b8a51..d441e6b1a 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/BitMapTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/utils/BitMapTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.utils; +package org.apache.tsfile.utils; import org.junit.Test; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/BloomFilterTest.java b/tsfile/src/test/java/org/apache/tsfile/utils/BloomFilterTest.java similarity index 98% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/utils/BloomFilterTest.java rename to tsfile/src/test/java/org/apache/tsfile/utils/BloomFilterTest.java index 1d0a10799..ec46d67de 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/BloomFilterTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/utils/BloomFilterTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.utils; +package org.apache.tsfile.utils; import org.junit.Test; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/BytesUtilsTest.java b/tsfile/src/test/java/org/apache/tsfile/utils/BytesUtilsTest.java similarity index 99% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/utils/BytesUtilsTest.java rename to tsfile/src/test/java/org/apache/tsfile/utils/BytesUtilsTest.java index f05ee18c1..76c01bee9 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/BytesUtilsTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/utils/BytesUtilsTest.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.utils; +package org.apache.tsfile.utils; -import org.apache.iotdb.tsfile.constant.TestConstant; +import org.apache.tsfile.constant.TestConstant; import org.junit.Assert; import org.junit.Test; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/FileGenerator.java b/tsfile/src/test/java/org/apache/tsfile/utils/FileGenerator.java similarity index 94% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/utils/FileGenerator.java rename to tsfile/src/test/java/org/apache/tsfile/utils/FileGenerator.java index 41384bd31..37a9a37c2 100755 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/FileGenerator.java +++ b/tsfile/src/test/java/org/apache/tsfile/utils/FileGenerator.java @@ -16,18 +16,18 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.utils; +package org.apache.tsfile.utils; -import org.apache.iotdb.tsfile.common.conf.TSFileConfig; -import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor; -import org.apache.iotdb.tsfile.exception.write.WriteProcessException; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding; -import org.apache.iotdb.tsfile.read.common.Path; -import org.apache.iotdb.tsfile.write.TsFileWriter; -import org.apache.iotdb.tsfile.write.record.TSRecord; -import org.apache.iotdb.tsfile.write.schema.MeasurementSchema; -import org.apache.iotdb.tsfile.write.schema.Schema; +import org.apache.tsfile.common.conf.TSFileConfig; +import org.apache.tsfile.common.conf.TSFileDescriptor; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.exception.write.WriteProcessException; +import org.apache.tsfile.file.metadata.enums.TSEncoding; +import org.apache.tsfile.read.common.Path; +import org.apache.tsfile.write.TsFileWriter; +import org.apache.tsfile.write.record.TSRecord; +import org.apache.tsfile.write.schema.MeasurementSchema; +import org.apache.tsfile.write.schema.Schema; import org.junit.Assert; import org.slf4j.Logger; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/FilePathUtilsTest.java b/tsfile/src/test/java/org/apache/tsfile/utils/FilePathUtilsTest.java similarity index 98% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/utils/FilePathUtilsTest.java rename to tsfile/src/test/java/org/apache/tsfile/utils/FilePathUtilsTest.java index c32baca72..e3dadf3b9 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/FilePathUtilsTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/utils/FilePathUtilsTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.utils; +package org.apache.tsfile.utils; import org.apache.commons.io.FileUtils; import org.junit.After; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/FileUtils.java b/tsfile/src/test/java/org/apache/tsfile/utils/FileUtils.java similarity index 96% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/utils/FileUtils.java rename to tsfile/src/test/java/org/apache/tsfile/utils/FileUtils.java index 5f30803af..d6b70742b 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/FileUtils.java +++ b/tsfile/src/test/java/org/apache/tsfile/utils/FileUtils.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.utils; +package org.apache.tsfile.utils; -import org.apache.iotdb.tsfile.fileSystem.FSFactoryProducer; +import org.apache.tsfile.fileSystem.FSFactoryProducer; import java.io.File; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/FileUtilsTest.java b/tsfile/src/test/java/org/apache/tsfile/utils/FileUtilsTest.java similarity index 95% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/utils/FileUtilsTest.java rename to tsfile/src/test/java/org/apache/tsfile/utils/FileUtilsTest.java index 73debe531..ec8955254 100755 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/FileUtilsTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/utils/FileUtilsTest.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.utils; +package org.apache.tsfile.utils; -import org.apache.iotdb.tsfile.constant.TestConstant; +import org.apache.tsfile.constant.TestConstant; import org.junit.Assert; import org.junit.Test; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/PairTest.java b/tsfile/src/test/java/org/apache/tsfile/utils/PairTest.java similarity index 98% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/utils/PairTest.java rename to tsfile/src/test/java/org/apache/tsfile/utils/PairTest.java index fb969bef2..84d6f0cf2 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/PairTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/utils/PairTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.utils; +package org.apache.tsfile.utils; import org.junit.Test; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/ReadWriteForEncodingUtilsTest.java b/tsfile/src/test/java/org/apache/tsfile/utils/ReadWriteForEncodingUtilsTest.java similarity index 98% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/utils/ReadWriteForEncodingUtilsTest.java rename to tsfile/src/test/java/org/apache/tsfile/utils/ReadWriteForEncodingUtilsTest.java index bdea668d6..5dbff6556 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/ReadWriteForEncodingUtilsTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/utils/ReadWriteForEncodingUtilsTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.utils; +package org.apache.tsfile.utils; import org.junit.Test; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/ReadWriteIOUtilsTest.java b/tsfile/src/test/java/org/apache/tsfile/utils/ReadWriteIOUtilsTest.java similarity index 99% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/utils/ReadWriteIOUtilsTest.java rename to tsfile/src/test/java/org/apache/tsfile/utils/ReadWriteIOUtilsTest.java index 14f22f752..17400fe1a 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/ReadWriteIOUtilsTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/utils/ReadWriteIOUtilsTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.utils; +package org.apache.tsfile.utils; import org.junit.Assert; import org.junit.Test; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/ReadWriteStreamUtilsTest.java b/tsfile/src/test/java/org/apache/tsfile/utils/ReadWriteStreamUtilsTest.java similarity index 99% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/utils/ReadWriteStreamUtilsTest.java rename to tsfile/src/test/java/org/apache/tsfile/utils/ReadWriteStreamUtilsTest.java index 018e7cfe6..2185018e0 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/ReadWriteStreamUtilsTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/utils/ReadWriteStreamUtilsTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.utils; +package org.apache.tsfile.utils; import org.junit.After; import org.junit.Before; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/ReadWriteToBytesUtilsTest.java b/tsfile/src/test/java/org/apache/tsfile/utils/ReadWriteToBytesUtilsTest.java similarity index 98% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/utils/ReadWriteToBytesUtilsTest.java rename to tsfile/src/test/java/org/apache/tsfile/utils/ReadWriteToBytesUtilsTest.java index 3958b1d37..3c83814fd 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/ReadWriteToBytesUtilsTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/utils/ReadWriteToBytesUtilsTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.utils; +package org.apache.tsfile.utils; import org.junit.Test; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/RecordUtils.java b/tsfile/src/test/java/org/apache/tsfile/utils/RecordUtils.java similarity index 82% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/utils/RecordUtils.java rename to tsfile/src/test/java/org/apache/tsfile/utils/RecordUtils.java index 319a665b0..53fc4ffe7 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/RecordUtils.java +++ b/tsfile/src/test/java/org/apache/tsfile/utils/RecordUtils.java @@ -16,20 +16,20 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.utils; +package org.apache.tsfile.utils; -import org.apache.iotdb.tsfile.common.constant.JsonFormatConstant; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.read.common.Path; -import org.apache.iotdb.tsfile.write.record.TSRecord; -import org.apache.iotdb.tsfile.write.record.datapoint.BooleanDataPoint; -import org.apache.iotdb.tsfile.write.record.datapoint.DoubleDataPoint; -import org.apache.iotdb.tsfile.write.record.datapoint.FloatDataPoint; -import org.apache.iotdb.tsfile.write.record.datapoint.IntDataPoint; -import org.apache.iotdb.tsfile.write.record.datapoint.LongDataPoint; -import org.apache.iotdb.tsfile.write.record.datapoint.StringDataPoint; -import org.apache.iotdb.tsfile.write.schema.IMeasurementSchema; -import org.apache.iotdb.tsfile.write.schema.Schema; +import org.apache.tsfile.common.constant.JsonFormatConstant; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.read.common.Path; +import org.apache.tsfile.write.record.TSRecord; +import org.apache.tsfile.write.record.datapoint.BooleanDataPoint; +import org.apache.tsfile.write.record.datapoint.DoubleDataPoint; +import org.apache.tsfile.write.record.datapoint.FloatDataPoint; +import org.apache.tsfile.write.record.datapoint.IntDataPoint; +import org.apache.tsfile.write.record.datapoint.LongDataPoint; +import org.apache.tsfile.write.record.datapoint.StringDataPoint; +import org.apache.tsfile.write.schema.IMeasurementSchema; +import org.apache.tsfile.write.schema.Schema; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/RecordUtilsTest.java b/tsfile/src/test/java/org/apache/tsfile/utils/RecordUtilsTest.java similarity index 92% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/utils/RecordUtilsTest.java rename to tsfile/src/test/java/org/apache/tsfile/utils/RecordUtilsTest.java index 6818cf3e9..1b8ed2d1c 100755 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/RecordUtilsTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/utils/RecordUtilsTest.java @@ -16,17 +16,17 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.utils; - -import org.apache.iotdb.tsfile.common.conf.TSFileConfig; -import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding; -import org.apache.iotdb.tsfile.read.common.Path; -import org.apache.iotdb.tsfile.write.record.TSRecord; -import org.apache.iotdb.tsfile.write.record.datapoint.DataPoint; -import org.apache.iotdb.tsfile.write.schema.MeasurementSchema; -import org.apache.iotdb.tsfile.write.schema.Schema; +package org.apache.tsfile.utils; + +import org.apache.tsfile.common.conf.TSFileConfig; +import org.apache.tsfile.common.conf.TSFileDescriptor; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.file.metadata.enums.TSEncoding; +import org.apache.tsfile.read.common.Path; +import org.apache.tsfile.write.record.TSRecord; +import org.apache.tsfile.write.record.datapoint.DataPoint; +import org.apache.tsfile.write.schema.MeasurementSchema; +import org.apache.tsfile.write.schema.Schema; import org.junit.Before; import org.junit.Test; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/StringContainerTest.java b/tsfile/src/test/java/org/apache/tsfile/utils/StringContainerTest.java similarity index 98% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/utils/StringContainerTest.java rename to tsfile/src/test/java/org/apache/tsfile/utils/StringContainerTest.java index cdb4646f0..d04465b84 100755 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/StringContainerTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/utils/StringContainerTest.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.utils; +package org.apache.tsfile.utils; -import org.apache.iotdb.tsfile.common.constant.TsFileConstant; +import org.apache.tsfile.common.constant.TsFileConstant; import org.junit.Test; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/TimeDurationTest.java b/tsfile/src/test/java/org/apache/tsfile/utils/TimeDurationTest.java similarity index 95% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/utils/TimeDurationTest.java rename to tsfile/src/test/java/org/apache/tsfile/utils/TimeDurationTest.java index ce8d7c9ac..ae926eb64 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/TimeDurationTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/utils/TimeDurationTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.utils; +package org.apache.tsfile.utils; import org.junit.Assert; import org.junit.Test; @@ -25,7 +25,7 @@ import java.util.TimeZone; import java.util.concurrent.TimeUnit; -import static org.apache.iotdb.tsfile.utils.TimeDuration.calcPositiveIntervalByMonth; +import static org.apache.tsfile.utils.TimeDuration.calcPositiveIntervalByMonth; public class TimeDurationTest { @Test diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/TsFileGeneratorForTest.java b/tsfile/src/test/java/org/apache/tsfile/utils/TsFileGeneratorForTest.java similarity index 93% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/utils/TsFileGeneratorForTest.java rename to tsfile/src/test/java/org/apache/tsfile/utils/TsFileGeneratorForTest.java index 93301028f..cba459909 100755 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/TsFileGeneratorForTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/utils/TsFileGeneratorForTest.java @@ -16,23 +16,23 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.utils; +package org.apache.tsfile.utils; -import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor; -import org.apache.iotdb.tsfile.constant.TestConstant; -import org.apache.iotdb.tsfile.encoding.encoder.Encoder; -import org.apache.iotdb.tsfile.exception.write.WriteProcessException; -import org.apache.iotdb.tsfile.file.header.ChunkHeader; -import org.apache.iotdb.tsfile.file.metadata.enums.CompressionType; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding; -import org.apache.iotdb.tsfile.fileSystem.FSFactoryProducer; -import org.apache.iotdb.tsfile.fileSystem.fsFactory.FSFactory; -import org.apache.iotdb.tsfile.read.common.Path; -import org.apache.iotdb.tsfile.write.TsFileWriter; -import org.apache.iotdb.tsfile.write.record.TSRecord; -import org.apache.iotdb.tsfile.write.schema.MeasurementSchema; -import org.apache.iotdb.tsfile.write.schema.Schema; +import org.apache.tsfile.common.conf.TSFileDescriptor; +import org.apache.tsfile.constant.TestConstant; +import org.apache.tsfile.encoding.encoder.Encoder; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.exception.write.WriteProcessException; +import org.apache.tsfile.file.header.ChunkHeader; +import org.apache.tsfile.file.metadata.enums.CompressionType; +import org.apache.tsfile.file.metadata.enums.TSEncoding; +import org.apache.tsfile.fileSystem.FSFactoryProducer; +import org.apache.tsfile.fileSystem.fsFactory.FSFactory; +import org.apache.tsfile.read.common.Path; +import org.apache.tsfile.write.TsFileWriter; +import org.apache.tsfile.write.record.TSRecord; +import org.apache.tsfile.write.schema.MeasurementSchema; +import org.apache.tsfile.write.schema.Schema; import org.junit.Assert; import org.junit.Ignore; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/TsFileUtilsTest.java b/tsfile/src/test/java/org/apache/tsfile/utils/TsFileUtilsTest.java similarity index 89% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/utils/TsFileUtilsTest.java rename to tsfile/src/test/java/org/apache/tsfile/utils/TsFileUtilsTest.java index 557b9a71b..caf5401a9 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/TsFileUtilsTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/utils/TsFileUtilsTest.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.utils; +package org.apache.tsfile.utils; -import org.apache.iotdb.tsfile.common.conf.TSFileConfig; -import org.apache.iotdb.tsfile.constant.TestConstant; -import org.apache.iotdb.tsfile.write.writer.LocalTsFileOutput; -import org.apache.iotdb.tsfile.write.writer.TsFileIOWriter; +import org.apache.tsfile.common.conf.TSFileConfig; +import org.apache.tsfile.constant.TestConstant; +import org.apache.tsfile.write.writer.LocalTsFileOutput; +import org.apache.tsfile.write.writer.TsFileIOWriter; import org.junit.After; import org.junit.Assert; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/TsPrimitiveTypeTest.java b/tsfile/src/test/java/org/apache/tsfile/utils/TsPrimitiveTypeTest.java similarity index 80% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/utils/TsPrimitiveTypeTest.java rename to tsfile/src/test/java/org/apache/tsfile/utils/TsPrimitiveTypeTest.java index 0828cbfda..f554271b9 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/TsPrimitiveTypeTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/utils/TsPrimitiveTypeTest.java @@ -16,16 +16,16 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.utils; - -import org.apache.iotdb.tsfile.common.conf.TSFileConfig; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.utils.TsPrimitiveType.TsBinary; -import org.apache.iotdb.tsfile.utils.TsPrimitiveType.TsBoolean; -import org.apache.iotdb.tsfile.utils.TsPrimitiveType.TsDouble; -import org.apache.iotdb.tsfile.utils.TsPrimitiveType.TsFloat; -import org.apache.iotdb.tsfile.utils.TsPrimitiveType.TsInt; -import org.apache.iotdb.tsfile.utils.TsPrimitiveType.TsLong; +package org.apache.tsfile.utils; + +import org.apache.tsfile.common.conf.TSFileConfig; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.utils.TsPrimitiveType.TsBinary; +import org.apache.tsfile.utils.TsPrimitiveType.TsBoolean; +import org.apache.tsfile.utils.TsPrimitiveType.TsDouble; +import org.apache.tsfile.utils.TsPrimitiveType.TsFloat; +import org.apache.tsfile.utils.TsPrimitiveType.TsInt; +import org.apache.tsfile.utils.TsPrimitiveType.TsLong; import org.junit.Assert; import org.junit.Test; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/DefaultSchemaTemplateTest.java b/tsfile/src/test/java/org/apache/tsfile/write/DefaultSchemaTemplateTest.java similarity index 82% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/write/DefaultSchemaTemplateTest.java rename to tsfile/src/test/java/org/apache/tsfile/write/DefaultSchemaTemplateTest.java index 8d92b61d9..6fa667cc3 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/DefaultSchemaTemplateTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/write/DefaultSchemaTemplateTest.java @@ -16,19 +16,19 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.write; - -import org.apache.iotdb.tsfile.exception.write.WriteProcessException; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding; -import org.apache.iotdb.tsfile.read.TsFileReader; -import org.apache.iotdb.tsfile.read.TsFileSequenceReader; -import org.apache.iotdb.tsfile.read.common.Path; -import org.apache.iotdb.tsfile.read.expression.QueryExpression; -import org.apache.iotdb.tsfile.read.query.dataset.QueryDataSet; -import org.apache.iotdb.tsfile.utils.TsFileGeneratorForTest; -import org.apache.iotdb.tsfile.write.record.Tablet; -import org.apache.iotdb.tsfile.write.schema.MeasurementSchema; +package org.apache.tsfile.write; + +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.exception.write.WriteProcessException; +import org.apache.tsfile.file.metadata.enums.TSEncoding; +import org.apache.tsfile.read.TsFileReader; +import org.apache.tsfile.read.TsFileSequenceReader; +import org.apache.tsfile.read.common.Path; +import org.apache.tsfile.read.expression.QueryExpression; +import org.apache.tsfile.read.query.dataset.QueryDataSet; +import org.apache.tsfile.utils.TsFileGeneratorForTest; +import org.apache.tsfile.write.record.Tablet; +import org.apache.tsfile.write.schema.MeasurementSchema; import org.junit.Assert; import org.junit.Test; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/MetadataIndexConstructorTest.java b/tsfile/src/test/java/org/apache/tsfile/write/MetadataIndexConstructorTest.java similarity index 92% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/write/MetadataIndexConstructorTest.java rename to tsfile/src/test/java/org/apache/tsfile/write/MetadataIndexConstructorTest.java index f24eb7afe..317daacbc 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/MetadataIndexConstructorTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/write/MetadataIndexConstructorTest.java @@ -16,30 +16,30 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.write; +package org.apache.tsfile.write; -import org.apache.iotdb.tsfile.common.conf.TSFileConfig; -import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor; -import org.apache.iotdb.tsfile.common.constant.TsFileConstant; -import org.apache.iotdb.tsfile.constant.TestConstant; -import org.apache.iotdb.tsfile.file.metadata.MetadataIndexEntry; -import org.apache.iotdb.tsfile.file.metadata.MetadataIndexNode; -import org.apache.iotdb.tsfile.file.metadata.TimeseriesMetadata; -import org.apache.iotdb.tsfile.file.metadata.TsFileMetadata; -import org.apache.iotdb.tsfile.file.metadata.enums.MetadataIndexNodeType; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding; -import org.apache.iotdb.tsfile.fileSystem.FSFactoryProducer; -import org.apache.iotdb.tsfile.read.TsFileSequenceReader; -import org.apache.iotdb.tsfile.read.common.Path; -import org.apache.iotdb.tsfile.utils.MeasurementGroup; -import org.apache.iotdb.tsfile.utils.Pair; -import org.apache.iotdb.tsfile.write.record.TSRecord; -import org.apache.iotdb.tsfile.write.record.Tablet; -import org.apache.iotdb.tsfile.write.record.datapoint.DataPoint; -import org.apache.iotdb.tsfile.write.record.datapoint.LongDataPoint; -import org.apache.iotdb.tsfile.write.schema.MeasurementSchema; -import org.apache.iotdb.tsfile.write.schema.Schema; +import org.apache.tsfile.common.conf.TSFileConfig; +import org.apache.tsfile.common.conf.TSFileDescriptor; +import org.apache.tsfile.common.constant.TsFileConstant; +import org.apache.tsfile.constant.TestConstant; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.file.metadata.MetadataIndexEntry; +import org.apache.tsfile.file.metadata.MetadataIndexNode; +import org.apache.tsfile.file.metadata.TimeseriesMetadata; +import org.apache.tsfile.file.metadata.TsFileMetadata; +import org.apache.tsfile.file.metadata.enums.MetadataIndexNodeType; +import org.apache.tsfile.file.metadata.enums.TSEncoding; +import org.apache.tsfile.fileSystem.FSFactoryProducer; +import org.apache.tsfile.read.TsFileSequenceReader; +import org.apache.tsfile.read.common.Path; +import org.apache.tsfile.utils.MeasurementGroup; +import org.apache.tsfile.utils.Pair; +import org.apache.tsfile.write.record.TSRecord; +import org.apache.tsfile.write.record.Tablet; +import org.apache.tsfile.write.record.datapoint.DataPoint; +import org.apache.tsfile.write.record.datapoint.LongDataPoint; +import org.apache.tsfile.write.schema.MeasurementSchema; +import org.apache.tsfile.write.schema.Schema; import org.junit.After; import org.junit.Before; @@ -56,7 +56,7 @@ import java.util.List; import java.util.Map; -import static org.apache.iotdb.tsfile.utils.FileGenerator.generateIndexString; +import static org.apache.tsfile.utils.FileGenerator.generateIndexString; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/PerfTest.java b/tsfile/src/test/java/org/apache/tsfile/write/PerfTest.java similarity index 91% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/write/PerfTest.java rename to tsfile/src/test/java/org/apache/tsfile/write/PerfTest.java index 65fa8d6e3..0a6fb6e92 100755 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/PerfTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/write/PerfTest.java @@ -16,20 +16,20 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.write; - -import org.apache.iotdb.tsfile.common.conf.TSFileConfig; -import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor; -import org.apache.iotdb.tsfile.common.constant.JsonFormatConstant; -import org.apache.iotdb.tsfile.constant.TestConstant; -import org.apache.iotdb.tsfile.exception.write.WriteProcessException; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding; -import org.apache.iotdb.tsfile.read.common.Path; -import org.apache.iotdb.tsfile.utils.RecordUtils; -import org.apache.iotdb.tsfile.write.record.TSRecord; -import org.apache.iotdb.tsfile.write.schema.MeasurementSchema; -import org.apache.iotdb.tsfile.write.schema.Schema; +package org.apache.tsfile.write; + +import org.apache.tsfile.common.conf.TSFileConfig; +import org.apache.tsfile.common.conf.TSFileDescriptor; +import org.apache.tsfile.common.constant.JsonFormatConstant; +import org.apache.tsfile.constant.TestConstant; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.exception.write.WriteProcessException; +import org.apache.tsfile.file.metadata.enums.TSEncoding; +import org.apache.tsfile.read.common.Path; +import org.apache.tsfile.utils.RecordUtils; +import org.apache.tsfile.write.record.TSRecord; +import org.apache.tsfile.write.schema.MeasurementSchema; +import org.apache.tsfile.write.schema.Schema; import ch.qos.logback.classic.Level; import ch.qos.logback.classic.LoggerContext; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/ReadPageInMemTest.java b/tsfile/src/test/java/org/apache/tsfile/write/ReadPageInMemTest.java similarity index 89% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/write/ReadPageInMemTest.java rename to tsfile/src/test/java/org/apache/tsfile/write/ReadPageInMemTest.java index 15b72273e..6ddd2af38 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/ReadPageInMemTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/write/ReadPageInMemTest.java @@ -16,19 +16,19 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.write; - -import org.apache.iotdb.tsfile.common.conf.TSFileConfig; -import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor; -import org.apache.iotdb.tsfile.constant.TestConstant; -import org.apache.iotdb.tsfile.exception.write.WriteProcessException; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding; -import org.apache.iotdb.tsfile.read.common.Path; -import org.apache.iotdb.tsfile.utils.RecordUtils; -import org.apache.iotdb.tsfile.write.record.TSRecord; -import org.apache.iotdb.tsfile.write.schema.MeasurementSchema; -import org.apache.iotdb.tsfile.write.schema.Schema; +package org.apache.tsfile.write; + +import org.apache.tsfile.common.conf.TSFileConfig; +import org.apache.tsfile.common.conf.TSFileDescriptor; +import org.apache.tsfile.constant.TestConstant; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.exception.write.WriteProcessException; +import org.apache.tsfile.file.metadata.enums.TSEncoding; +import org.apache.tsfile.read.common.Path; +import org.apache.tsfile.utils.RecordUtils; +import org.apache.tsfile.write.record.TSRecord; +import org.apache.tsfile.write.schema.MeasurementSchema; +import org.apache.tsfile.write.schema.Schema; import org.junit.After; import org.junit.Before; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/SameMeasurementsWithDifferentDataTypesTest.java b/tsfile/src/test/java/org/apache/tsfile/write/SameMeasurementsWithDifferentDataTypesTest.java similarity index 85% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/write/SameMeasurementsWithDifferentDataTypesTest.java rename to tsfile/src/test/java/org/apache/tsfile/write/SameMeasurementsWithDifferentDataTypesTest.java index 50c39e930..ed857a619 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/SameMeasurementsWithDifferentDataTypesTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/write/SameMeasurementsWithDifferentDataTypesTest.java @@ -16,25 +16,25 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.write; - -import org.apache.iotdb.tsfile.exception.write.WriteProcessException; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding; -import org.apache.iotdb.tsfile.read.TsFileReader; -import org.apache.iotdb.tsfile.read.TsFileSequenceReader; -import org.apache.iotdb.tsfile.read.common.Path; -import org.apache.iotdb.tsfile.read.common.RowRecord; -import org.apache.iotdb.tsfile.read.expression.QueryExpression; -import org.apache.iotdb.tsfile.read.query.dataset.QueryDataSet; -import org.apache.iotdb.tsfile.utils.TsFileGeneratorForTest; -import org.apache.iotdb.tsfile.write.record.TSRecord; -import org.apache.iotdb.tsfile.write.record.datapoint.DataPoint; -import org.apache.iotdb.tsfile.write.record.datapoint.FloatDataPoint; -import org.apache.iotdb.tsfile.write.record.datapoint.IntDataPoint; -import org.apache.iotdb.tsfile.write.record.datapoint.LongDataPoint; -import org.apache.iotdb.tsfile.write.schema.MeasurementSchema; -import org.apache.iotdb.tsfile.write.schema.Schema; +package org.apache.tsfile.write; + +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.exception.write.WriteProcessException; +import org.apache.tsfile.file.metadata.enums.TSEncoding; +import org.apache.tsfile.read.TsFileReader; +import org.apache.tsfile.read.TsFileSequenceReader; +import org.apache.tsfile.read.common.Path; +import org.apache.tsfile.read.common.RowRecord; +import org.apache.tsfile.read.expression.QueryExpression; +import org.apache.tsfile.read.query.dataset.QueryDataSet; +import org.apache.tsfile.utils.TsFileGeneratorForTest; +import org.apache.tsfile.write.record.TSRecord; +import org.apache.tsfile.write.record.datapoint.DataPoint; +import org.apache.tsfile.write.record.datapoint.FloatDataPoint; +import org.apache.tsfile.write.record.datapoint.IntDataPoint; +import org.apache.tsfile.write.record.datapoint.LongDataPoint; +import org.apache.tsfile.write.schema.MeasurementSchema; +import org.apache.tsfile.write.schema.Schema; import org.junit.After; import org.junit.Assert; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/TsFileIOWriterTest.java b/tsfile/src/test/java/org/apache/tsfile/write/TsFileIOWriterTest.java similarity index 87% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/write/TsFileIOWriterTest.java rename to tsfile/src/test/java/org/apache/tsfile/write/TsFileIOWriterTest.java index ba955912f..5c39fbab6 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/TsFileIOWriterTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/write/TsFileIOWriterTest.java @@ -16,27 +16,27 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.write; - -import org.apache.iotdb.tsfile.common.conf.TSFileConfig; -import org.apache.iotdb.tsfile.common.constant.TsFileConstant; -import org.apache.iotdb.tsfile.constant.TestConstant; -import org.apache.iotdb.tsfile.file.MetaMarker; -import org.apache.iotdb.tsfile.file.header.ChunkGroupHeader; -import org.apache.iotdb.tsfile.file.header.ChunkHeader; -import org.apache.iotdb.tsfile.file.metadata.TimeseriesMetadata; -import org.apache.iotdb.tsfile.file.metadata.TsFileMetadata; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding; -import org.apache.iotdb.tsfile.file.metadata.statistics.Statistics; -import org.apache.iotdb.tsfile.file.metadata.utils.TestHelper; -import org.apache.iotdb.tsfile.read.TsFileSequenceReader; -import org.apache.iotdb.tsfile.read.common.Path; -import org.apache.iotdb.tsfile.utils.MeasurementGroup; -import org.apache.iotdb.tsfile.write.schema.MeasurementSchema; -import org.apache.iotdb.tsfile.write.schema.Schema; -import org.apache.iotdb.tsfile.write.schema.VectorMeasurementSchema; -import org.apache.iotdb.tsfile.write.writer.TsFileIOWriter; +package org.apache.tsfile.write; + +import org.apache.tsfile.common.conf.TSFileConfig; +import org.apache.tsfile.common.constant.TsFileConstant; +import org.apache.tsfile.constant.TestConstant; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.file.MetaMarker; +import org.apache.tsfile.file.header.ChunkGroupHeader; +import org.apache.tsfile.file.header.ChunkHeader; +import org.apache.tsfile.file.metadata.TimeseriesMetadata; +import org.apache.tsfile.file.metadata.TsFileMetadata; +import org.apache.tsfile.file.metadata.enums.TSEncoding; +import org.apache.tsfile.file.metadata.statistics.Statistics; +import org.apache.tsfile.file.metadata.utils.TestHelper; +import org.apache.tsfile.read.TsFileSequenceReader; +import org.apache.tsfile.read.common.Path; +import org.apache.tsfile.utils.MeasurementGroup; +import org.apache.tsfile.write.schema.MeasurementSchema; +import org.apache.tsfile.write.schema.Schema; +import org.apache.tsfile.write.schema.VectorMeasurementSchema; +import org.apache.tsfile.write.writer.TsFileIOWriter; import org.junit.After; import org.junit.Assert; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/TsFileIntegrityCheckingTool.java b/tsfile/src/test/java/org/apache/tsfile/write/TsFileIntegrityCheckingTool.java similarity index 87% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/write/TsFileIntegrityCheckingTool.java rename to tsfile/src/test/java/org/apache/tsfile/write/TsFileIntegrityCheckingTool.java index 5f6d96ae6..1e0dc98c7 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/TsFileIntegrityCheckingTool.java +++ b/tsfile/src/test/java/org/apache/tsfile/write/TsFileIntegrityCheckingTool.java @@ -17,35 +17,35 @@ * under the License. */ -package org.apache.iotdb.tsfile.write; +package org.apache.tsfile.write; -import org.apache.iotdb.tsfile.common.conf.TSFileConfig; -import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor; -import org.apache.iotdb.tsfile.common.constant.TsFileConstant; -import org.apache.iotdb.tsfile.encoding.decoder.Decoder; -import org.apache.iotdb.tsfile.file.MetaMarker; -import org.apache.iotdb.tsfile.file.header.ChunkGroupHeader; -import org.apache.iotdb.tsfile.file.header.ChunkHeader; -import org.apache.iotdb.tsfile.file.header.PageHeader; -import org.apache.iotdb.tsfile.file.metadata.ChunkMetadata; -import org.apache.iotdb.tsfile.file.metadata.IChunkMetadata; -import org.apache.iotdb.tsfile.file.metadata.TimeseriesMetadata; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding; -import org.apache.iotdb.tsfile.read.TimeValuePair; -import org.apache.iotdb.tsfile.read.TsFileSequenceReader; -import org.apache.iotdb.tsfile.read.common.BatchData; -import org.apache.iotdb.tsfile.read.common.Chunk; -import org.apache.iotdb.tsfile.read.common.IBatchDataIterator; -import org.apache.iotdb.tsfile.read.reader.IChunkReader; -import org.apache.iotdb.tsfile.read.reader.IPointReader; -import org.apache.iotdb.tsfile.read.reader.chunk.AlignedChunkReader; -import org.apache.iotdb.tsfile.read.reader.chunk.ChunkReader; -import org.apache.iotdb.tsfile.read.reader.page.PageReader; -import org.apache.iotdb.tsfile.read.reader.page.TimePageReader; -import org.apache.iotdb.tsfile.read.reader.page.ValuePageReader; -import org.apache.iotdb.tsfile.utils.Pair; -import org.apache.iotdb.tsfile.utils.TsPrimitiveType; +import org.apache.tsfile.common.conf.TSFileConfig; +import org.apache.tsfile.common.conf.TSFileDescriptor; +import org.apache.tsfile.common.constant.TsFileConstant; +import org.apache.tsfile.encoding.decoder.Decoder; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.file.MetaMarker; +import org.apache.tsfile.file.header.ChunkGroupHeader; +import org.apache.tsfile.file.header.ChunkHeader; +import org.apache.tsfile.file.header.PageHeader; +import org.apache.tsfile.file.metadata.ChunkMetadata; +import org.apache.tsfile.file.metadata.IChunkMetadata; +import org.apache.tsfile.file.metadata.TimeseriesMetadata; +import org.apache.tsfile.file.metadata.enums.TSEncoding; +import org.apache.tsfile.read.TimeValuePair; +import org.apache.tsfile.read.TsFileSequenceReader; +import org.apache.tsfile.read.common.BatchData; +import org.apache.tsfile.read.common.Chunk; +import org.apache.tsfile.read.common.IBatchDataIterator; +import org.apache.tsfile.read.reader.IChunkReader; +import org.apache.tsfile.read.reader.IPointReader; +import org.apache.tsfile.read.reader.chunk.AlignedChunkReader; +import org.apache.tsfile.read.reader.chunk.ChunkReader; +import org.apache.tsfile.read.reader.page.PageReader; +import org.apache.tsfile.read.reader.page.TimePageReader; +import org.apache.tsfile.read.reader.page.ValuePageReader; +import org.apache.tsfile.utils.Pair; +import org.apache.tsfile.utils.TsPrimitiveType; import org.junit.Assert; import org.slf4j.Logger; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/TsFileReadWriteTest.java b/tsfile/src/test/java/org/apache/tsfile/write/TsFileReadWriteTest.java similarity index 86% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/write/TsFileReadWriteTest.java rename to tsfile/src/test/java/org/apache/tsfile/write/TsFileReadWriteTest.java index 04a6c67e3..9ddb5d2f9 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/TsFileReadWriteTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/write/TsFileReadWriteTest.java @@ -16,27 +16,27 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.write; - -import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor; -import org.apache.iotdb.tsfile.exception.write.WriteProcessException; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding; -import org.apache.iotdb.tsfile.read.TsFileReader; -import org.apache.iotdb.tsfile.read.TsFileSequenceReader; -import org.apache.iotdb.tsfile.read.common.Field; -import org.apache.iotdb.tsfile.read.common.Path; -import org.apache.iotdb.tsfile.read.common.RowRecord; -import org.apache.iotdb.tsfile.read.expression.QueryExpression; -import org.apache.iotdb.tsfile.read.query.dataset.QueryDataSet; -import org.apache.iotdb.tsfile.utils.TsFileGeneratorForTest; -import org.apache.iotdb.tsfile.write.record.TSRecord; -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.FloatDataPoint; -import org.apache.iotdb.tsfile.write.record.datapoint.IntDataPoint; -import org.apache.iotdb.tsfile.write.record.datapoint.LongDataPoint; -import org.apache.iotdb.tsfile.write.schema.MeasurementSchema; +package org.apache.tsfile.write; + +import org.apache.tsfile.common.conf.TSFileDescriptor; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.exception.write.WriteProcessException; +import org.apache.tsfile.file.metadata.enums.TSEncoding; +import org.apache.tsfile.read.TsFileReader; +import org.apache.tsfile.read.TsFileSequenceReader; +import org.apache.tsfile.read.common.Field; +import org.apache.tsfile.read.common.Path; +import org.apache.tsfile.read.common.RowRecord; +import org.apache.tsfile.read.expression.QueryExpression; +import org.apache.tsfile.read.query.dataset.QueryDataSet; +import org.apache.tsfile.utils.TsFileGeneratorForTest; +import org.apache.tsfile.write.record.TSRecord; +import org.apache.tsfile.write.record.datapoint.DataPoint; +import org.apache.tsfile.write.record.datapoint.DoubleDataPoint; +import org.apache.tsfile.write.record.datapoint.FloatDataPoint; +import org.apache.tsfile.write.record.datapoint.IntDataPoint; +import org.apache.tsfile.write.record.datapoint.LongDataPoint; +import org.apache.tsfile.write.schema.MeasurementSchema; import org.junit.After; import org.junit.Before; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/TsFileWriteApiTest.java b/tsfile/src/test/java/org/apache/tsfile/write/TsFileWriteApiTest.java similarity index 94% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/write/TsFileWriteApiTest.java rename to tsfile/src/test/java/org/apache/tsfile/write/TsFileWriteApiTest.java index 1d7ffc197..866efbd88 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/TsFileWriteApiTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/write/TsFileWriteApiTest.java @@ -16,32 +16,32 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.write; - -import org.apache.iotdb.tsfile.common.conf.TSFileConfig; -import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor; -import org.apache.iotdb.tsfile.exception.write.WriteProcessException; -import org.apache.iotdb.tsfile.file.MetaMarker; -import org.apache.iotdb.tsfile.file.header.ChunkHeader; -import org.apache.iotdb.tsfile.file.header.PageHeader; -import org.apache.iotdb.tsfile.file.metadata.ChunkMetadata; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding; -import org.apache.iotdb.tsfile.fileSystem.FSFactoryProducer; -import org.apache.iotdb.tsfile.read.TsFileReader; -import org.apache.iotdb.tsfile.read.TsFileSequenceReader; -import org.apache.iotdb.tsfile.read.common.Chunk; -import org.apache.iotdb.tsfile.read.common.Path; -import org.apache.iotdb.tsfile.read.expression.QueryExpression; -import org.apache.iotdb.tsfile.read.query.dataset.QueryDataSet; -import org.apache.iotdb.tsfile.utils.Binary; -import org.apache.iotdb.tsfile.utils.TsFileGeneratorUtils; -import org.apache.iotdb.tsfile.write.chunk.AlignedChunkWriterImpl; -import org.apache.iotdb.tsfile.write.chunk.ChunkWriterImpl; -import org.apache.iotdb.tsfile.write.record.Tablet; -import org.apache.iotdb.tsfile.write.schema.IMeasurementSchema; -import org.apache.iotdb.tsfile.write.schema.MeasurementSchema; -import org.apache.iotdb.tsfile.write.writer.TsFileIOWriter; +package org.apache.tsfile.write; + +import org.apache.tsfile.common.conf.TSFileConfig; +import org.apache.tsfile.common.conf.TSFileDescriptor; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.exception.write.WriteProcessException; +import org.apache.tsfile.file.MetaMarker; +import org.apache.tsfile.file.header.ChunkHeader; +import org.apache.tsfile.file.header.PageHeader; +import org.apache.tsfile.file.metadata.ChunkMetadata; +import org.apache.tsfile.file.metadata.enums.TSEncoding; +import org.apache.tsfile.fileSystem.FSFactoryProducer; +import org.apache.tsfile.read.TsFileReader; +import org.apache.tsfile.read.TsFileSequenceReader; +import org.apache.tsfile.read.common.Chunk; +import org.apache.tsfile.read.common.Path; +import org.apache.tsfile.read.expression.QueryExpression; +import org.apache.tsfile.read.query.dataset.QueryDataSet; +import org.apache.tsfile.utils.Binary; +import org.apache.tsfile.utils.TsFileGeneratorUtils; +import org.apache.tsfile.write.chunk.AlignedChunkWriterImpl; +import org.apache.tsfile.write.chunk.ChunkWriterImpl; +import org.apache.tsfile.write.record.Tablet; +import org.apache.tsfile.write.schema.IMeasurementSchema; +import org.apache.tsfile.write.schema.MeasurementSchema; +import org.apache.tsfile.write.writer.TsFileIOWriter; import org.junit.After; import org.junit.Assert; @@ -60,8 +60,9 @@ public class TsFileWriteApiTest { private final String deviceId = "root.sg.d1"; private final List alignedMeasurementSchemas = new ArrayList<>(); private final List measurementSchemas = new ArrayList<>(); - private int oldChunkGroupSize = TSFileDescriptor.getInstance().getConfig().getGroupSizeInByte(); - private int oldMaxNumOfPointsInPage = + private final int oldChunkGroupSize = + TSFileDescriptor.getInstance().getConfig().getGroupSizeInByte(); + private final int oldMaxNumOfPointsInPage = TSFileDescriptor.getInstance().getConfig().getMaxNumberOfPointsInPage(); @Before diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/TsFileWriterTest.java b/tsfile/src/test/java/org/apache/tsfile/write/TsFileWriterTest.java similarity index 90% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/write/TsFileWriterTest.java rename to tsfile/src/test/java/org/apache/tsfile/write/TsFileWriterTest.java index 562d5a0e1..49bba8d77 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/TsFileWriterTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/write/TsFileWriterTest.java @@ -17,26 +17,26 @@ * under the License. */ -package org.apache.iotdb.tsfile.write; +package org.apache.tsfile.write; -import org.apache.iotdb.tsfile.exception.encoding.TsFileEncodingException; -import org.apache.iotdb.tsfile.exception.write.NoMeasurementException; -import org.apache.iotdb.tsfile.exception.write.WriteProcessException; -import org.apache.iotdb.tsfile.file.metadata.enums.CompressionType; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding; -import org.apache.iotdb.tsfile.read.TsFileReader; -import org.apache.iotdb.tsfile.read.TsFileSequenceReader; -import org.apache.iotdb.tsfile.read.common.Path; -import org.apache.iotdb.tsfile.read.common.RowRecord; -import org.apache.iotdb.tsfile.read.expression.QueryExpression; -import org.apache.iotdb.tsfile.read.query.dataset.QueryDataSet; -import org.apache.iotdb.tsfile.utils.TsFileGeneratorForTest; -import org.apache.iotdb.tsfile.write.record.TSRecord; -import org.apache.iotdb.tsfile.write.record.Tablet; -import org.apache.iotdb.tsfile.write.record.datapoint.FloatDataPoint; -import org.apache.iotdb.tsfile.write.record.datapoint.IntDataPoint; -import org.apache.iotdb.tsfile.write.schema.MeasurementSchema; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.exception.encoding.TsFileEncodingException; +import org.apache.tsfile.exception.write.NoMeasurementException; +import org.apache.tsfile.exception.write.WriteProcessException; +import org.apache.tsfile.file.metadata.enums.CompressionType; +import org.apache.tsfile.file.metadata.enums.TSEncoding; +import org.apache.tsfile.read.TsFileReader; +import org.apache.tsfile.read.TsFileSequenceReader; +import org.apache.tsfile.read.common.Path; +import org.apache.tsfile.read.common.RowRecord; +import org.apache.tsfile.read.expression.QueryExpression; +import org.apache.tsfile.read.query.dataset.QueryDataSet; +import org.apache.tsfile.utils.TsFileGeneratorForTest; +import org.apache.tsfile.write.record.TSRecord; +import org.apache.tsfile.write.record.Tablet; +import org.apache.tsfile.write.record.datapoint.FloatDataPoint; +import org.apache.tsfile.write.record.datapoint.IntDataPoint; +import org.apache.tsfile.write.schema.MeasurementSchema; import org.junit.After; import org.junit.Assert; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/WriteTest.java b/tsfile/src/test/java/org/apache/tsfile/write/WriteTest.java similarity index 90% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/write/WriteTest.java rename to tsfile/src/test/java/org/apache/tsfile/write/WriteTest.java index 57f18a67e..38c843098 100755 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/WriteTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/write/WriteTest.java @@ -16,23 +16,23 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.write; +package org.apache.tsfile.write; -import org.apache.iotdb.tsfile.common.conf.TSFileConfig; -import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor; -import org.apache.iotdb.tsfile.common.constant.JsonFormatConstant; -import org.apache.iotdb.tsfile.constant.TestConstant; -import org.apache.iotdb.tsfile.exception.write.WriteProcessException; -import org.apache.iotdb.tsfile.file.metadata.TsFileMetadata; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding; -import org.apache.iotdb.tsfile.read.TsFileSequenceReader; -import org.apache.iotdb.tsfile.read.common.Path; -import org.apache.iotdb.tsfile.utils.RecordUtils; -import org.apache.iotdb.tsfile.utils.StringContainer; -import org.apache.iotdb.tsfile.write.record.TSRecord; -import org.apache.iotdb.tsfile.write.schema.MeasurementSchema; -import org.apache.iotdb.tsfile.write.schema.Schema; +import org.apache.tsfile.common.conf.TSFileConfig; +import org.apache.tsfile.common.conf.TSFileDescriptor; +import org.apache.tsfile.common.constant.JsonFormatConstant; +import org.apache.tsfile.constant.TestConstant; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.exception.write.WriteProcessException; +import org.apache.tsfile.file.metadata.TsFileMetadata; +import org.apache.tsfile.file.metadata.enums.TSEncoding; +import org.apache.tsfile.read.TsFileSequenceReader; +import org.apache.tsfile.read.common.Path; +import org.apache.tsfile.utils.RecordUtils; +import org.apache.tsfile.utils.StringContainer; +import org.apache.tsfile.write.record.TSRecord; +import org.apache.tsfile.write.schema.MeasurementSchema; +import org.apache.tsfile.write.schema.Schema; import org.junit.After; import org.junit.Before; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/record/TabletTest.java b/tsfile/src/test/java/org/apache/tsfile/write/record/TabletTest.java similarity index 93% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/write/record/TabletTest.java rename to tsfile/src/test/java/org/apache/tsfile/write/record/TabletTest.java index f91172501..66cc37e91 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/record/TabletTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/write/record/TabletTest.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.tsfile.write.record; +package org.apache.tsfile.write.record; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding; -import org.apache.iotdb.tsfile.utils.BitMap; -import org.apache.iotdb.tsfile.write.schema.MeasurementSchema; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.file.metadata.enums.TSEncoding; +import org.apache.tsfile.utils.BitMap; +import org.apache.tsfile.write.schema.MeasurementSchema; import org.junit.Test; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/schema/converter/SchemaBuilderTest.java b/tsfile/src/test/java/org/apache/tsfile/write/schema/converter/SchemaBuilderTest.java similarity index 88% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/write/schema/converter/SchemaBuilderTest.java rename to tsfile/src/test/java/org/apache/tsfile/write/schema/converter/SchemaBuilderTest.java index 28d283ef7..cdab89fb3 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/schema/converter/SchemaBuilderTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/write/schema/converter/SchemaBuilderTest.java @@ -16,17 +16,17 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.write.schema.converter; - -import org.apache.iotdb.tsfile.common.constant.JsonFormatConstant; -import org.apache.iotdb.tsfile.file.metadata.enums.CompressionType; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding; -import org.apache.iotdb.tsfile.read.common.Path; -import org.apache.iotdb.tsfile.utils.MeasurementGroup; -import org.apache.iotdb.tsfile.write.schema.IMeasurementSchema; -import org.apache.iotdb.tsfile.write.schema.MeasurementSchema; -import org.apache.iotdb.tsfile.write.schema.Schema; +package org.apache.tsfile.write.schema.converter; + +import org.apache.tsfile.common.constant.JsonFormatConstant; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.file.metadata.enums.CompressionType; +import org.apache.tsfile.file.metadata.enums.TSEncoding; +import org.apache.tsfile.read.common.Path; +import org.apache.tsfile.utils.MeasurementGroup; +import org.apache.tsfile.write.schema.IMeasurementSchema; +import org.apache.tsfile.write.schema.MeasurementSchema; +import org.apache.tsfile.write.schema.Schema; import org.junit.Test; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/writer/AlignedChunkWriterImplTest.java b/tsfile/src/test/java/org/apache/tsfile/write/writer/AlignedChunkWriterImplTest.java similarity index 94% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/write/writer/AlignedChunkWriterImplTest.java rename to tsfile/src/test/java/org/apache/tsfile/write/writer/AlignedChunkWriterImplTest.java index 456f9f27c..749141235 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/writer/AlignedChunkWriterImplTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/write/writer/AlignedChunkWriterImplTest.java @@ -16,16 +16,16 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.write.writer; - -import org.apache.iotdb.tsfile.file.MetaMarker; -import org.apache.iotdb.tsfile.file.metadata.enums.CompressionType; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding; -import org.apache.iotdb.tsfile.utils.PublicBAOS; -import org.apache.iotdb.tsfile.utils.ReadWriteForEncodingUtils; -import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils; -import org.apache.iotdb.tsfile.write.chunk.AlignedChunkWriterImpl; +package org.apache.tsfile.write.writer; + +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.file.MetaMarker; +import org.apache.tsfile.file.metadata.enums.CompressionType; +import org.apache.tsfile.file.metadata.enums.TSEncoding; +import org.apache.tsfile.utils.PublicBAOS; +import org.apache.tsfile.utils.ReadWriteForEncodingUtils; +import org.apache.tsfile.utils.ReadWriteIOUtils; +import org.apache.tsfile.write.chunk.AlignedChunkWriterImpl; import org.junit.Test; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/writer/ForceAppendTsFileWriterTest.java b/tsfile/src/test/java/org/apache/tsfile/write/writer/ForceAppendTsFileWriterTest.java similarity index 82% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/write/writer/ForceAppendTsFileWriterTest.java rename to tsfile/src/test/java/org/apache/tsfile/write/writer/ForceAppendTsFileWriterTest.java index d53365531..6ad246d55 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/writer/ForceAppendTsFileWriterTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/write/writer/ForceAppendTsFileWriterTest.java @@ -16,23 +16,23 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.write.writer; +package org.apache.tsfile.write.writer; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding; -import org.apache.iotdb.tsfile.fileSystem.FSFactoryProducer; -import org.apache.iotdb.tsfile.fileSystem.fsFactory.FSFactory; -import org.apache.iotdb.tsfile.read.TsFileReader; -import org.apache.iotdb.tsfile.read.TsFileSequenceReader; -import org.apache.iotdb.tsfile.read.common.Path; -import org.apache.iotdb.tsfile.read.common.RowRecord; -import org.apache.iotdb.tsfile.read.expression.QueryExpression; -import org.apache.iotdb.tsfile.read.query.dataset.QueryDataSet; -import org.apache.iotdb.tsfile.utils.TsFileGeneratorForTest; -import org.apache.iotdb.tsfile.write.TsFileWriter; -import org.apache.iotdb.tsfile.write.record.TSRecord; -import org.apache.iotdb.tsfile.write.record.datapoint.FloatDataPoint; -import org.apache.iotdb.tsfile.write.schema.MeasurementSchema; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.file.metadata.enums.TSEncoding; +import org.apache.tsfile.fileSystem.FSFactoryProducer; +import org.apache.tsfile.fileSystem.fsFactory.FSFactory; +import org.apache.tsfile.read.TsFileReader; +import org.apache.tsfile.read.TsFileSequenceReader; +import org.apache.tsfile.read.common.Path; +import org.apache.tsfile.read.common.RowRecord; +import org.apache.tsfile.read.expression.QueryExpression; +import org.apache.tsfile.read.query.dataset.QueryDataSet; +import org.apache.tsfile.utils.TsFileGeneratorForTest; +import org.apache.tsfile.write.TsFileWriter; +import org.apache.tsfile.write.record.TSRecord; +import org.apache.tsfile.write.record.datapoint.FloatDataPoint; +import org.apache.tsfile.write.schema.MeasurementSchema; import org.junit.Assert; import org.junit.Test; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/writer/MeasurementSchemaSerializeTest.java b/tsfile/src/test/java/org/apache/tsfile/write/writer/MeasurementSchemaSerializeTest.java similarity index 89% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/write/writer/MeasurementSchemaSerializeTest.java rename to tsfile/src/test/java/org/apache/tsfile/write/writer/MeasurementSchemaSerializeTest.java index 61b99e191..e031b0d49 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/writer/MeasurementSchemaSerializeTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/write/writer/MeasurementSchemaSerializeTest.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.write.writer; +package org.apache.tsfile.write.writer; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding; -import org.apache.iotdb.tsfile.write.schema.MeasurementSchema; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.file.metadata.enums.TSEncoding; +import org.apache.tsfile.write.schema.MeasurementSchema; import org.junit.Test; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/writer/PageWriterTest.java b/tsfile/src/test/java/org/apache/tsfile/write/writer/PageWriterTest.java similarity index 92% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/write/writer/PageWriterTest.java rename to tsfile/src/test/java/org/apache/tsfile/write/writer/PageWriterTest.java index 8134a1a78..9de6e6a1f 100755 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/writer/PageWriterTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/write/writer/PageWriterTest.java @@ -16,18 +16,18 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.write.writer; +package org.apache.tsfile.write.writer; -import org.apache.iotdb.tsfile.common.conf.TSFileConfig; -import org.apache.iotdb.tsfile.constant.TestConstant; -import org.apache.iotdb.tsfile.encoding.decoder.PlainDecoder; -import org.apache.iotdb.tsfile.encoding.encoder.PlainEncoder; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding; -import org.apache.iotdb.tsfile.utils.Binary; -import org.apache.iotdb.tsfile.utils.ReadWriteForEncodingUtils; -import org.apache.iotdb.tsfile.write.page.PageWriter; -import org.apache.iotdb.tsfile.write.schema.MeasurementSchema; +import org.apache.tsfile.common.conf.TSFileConfig; +import org.apache.tsfile.constant.TestConstant; +import org.apache.tsfile.encoding.decoder.PlainDecoder; +import org.apache.tsfile.encoding.encoder.PlainEncoder; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.file.metadata.enums.TSEncoding; +import org.apache.tsfile.utils.Binary; +import org.apache.tsfile.utils.ReadWriteForEncodingUtils; +import org.apache.tsfile.write.page.PageWriter; +import org.apache.tsfile.write.schema.MeasurementSchema; import org.junit.Test; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/writer/RestorableTsFileIOWriterTest.java b/tsfile/src/test/java/org/apache/tsfile/write/writer/RestorableTsFileIOWriterTest.java similarity index 93% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/write/writer/RestorableTsFileIOWriterTest.java rename to tsfile/src/test/java/org/apache/tsfile/write/writer/RestorableTsFileIOWriterTest.java index 6033f17fe..6922b8793 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/writer/RestorableTsFileIOWriterTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/write/writer/RestorableTsFileIOWriterTest.java @@ -17,30 +17,30 @@ * under the License. */ -package org.apache.iotdb.tsfile.write.writer; - -import org.apache.iotdb.tsfile.common.conf.TSFileConfig; -import org.apache.iotdb.tsfile.exception.NotCompatibleTsFileException; -import org.apache.iotdb.tsfile.file.MetaMarker; -import org.apache.iotdb.tsfile.file.metadata.ChunkMetadata; -import org.apache.iotdb.tsfile.file.metadata.enums.CompressionType; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding; -import org.apache.iotdb.tsfile.file.metadata.statistics.FloatStatistics; -import org.apache.iotdb.tsfile.fileSystem.FSFactoryProducer; -import org.apache.iotdb.tsfile.fileSystem.fsFactory.FSFactory; -import org.apache.iotdb.tsfile.read.TsFileCheckStatus; -import org.apache.iotdb.tsfile.read.TsFileReader; -import org.apache.iotdb.tsfile.read.TsFileSequenceReader; -import org.apache.iotdb.tsfile.read.common.Path; -import org.apache.iotdb.tsfile.read.common.RowRecord; -import org.apache.iotdb.tsfile.read.expression.QueryExpression; -import org.apache.iotdb.tsfile.read.query.dataset.QueryDataSet; -import org.apache.iotdb.tsfile.utils.TsFileGeneratorForTest; -import org.apache.iotdb.tsfile.write.TsFileWriter; -import org.apache.iotdb.tsfile.write.record.TSRecord; -import org.apache.iotdb.tsfile.write.record.datapoint.FloatDataPoint; -import org.apache.iotdb.tsfile.write.schema.MeasurementSchema; +package org.apache.tsfile.write.writer; + +import org.apache.tsfile.common.conf.TSFileConfig; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.exception.NotCompatibleTsFileException; +import org.apache.tsfile.file.MetaMarker; +import org.apache.tsfile.file.metadata.ChunkMetadata; +import org.apache.tsfile.file.metadata.enums.CompressionType; +import org.apache.tsfile.file.metadata.enums.TSEncoding; +import org.apache.tsfile.file.metadata.statistics.FloatStatistics; +import org.apache.tsfile.fileSystem.FSFactoryProducer; +import org.apache.tsfile.fileSystem.fsFactory.FSFactory; +import org.apache.tsfile.read.TsFileCheckStatus; +import org.apache.tsfile.read.TsFileReader; +import org.apache.tsfile.read.TsFileSequenceReader; +import org.apache.tsfile.read.common.Path; +import org.apache.tsfile.read.common.RowRecord; +import org.apache.tsfile.read.expression.QueryExpression; +import org.apache.tsfile.read.query.dataset.QueryDataSet; +import org.apache.tsfile.utils.TsFileGeneratorForTest; +import org.apache.tsfile.write.TsFileWriter; +import org.apache.tsfile.write.record.TSRecord; +import org.apache.tsfile.write.record.datapoint.FloatDataPoint; +import org.apache.tsfile.write.schema.MeasurementSchema; import org.junit.After; import org.junit.Assert; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/writer/TestTsFileOutput.java b/tsfile/src/test/java/org/apache/tsfile/write/writer/TestTsFileOutput.java similarity index 94% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/write/writer/TestTsFileOutput.java rename to tsfile/src/test/java/org/apache/tsfile/write/writer/TestTsFileOutput.java index 0b342206c..c518ee891 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/writer/TestTsFileOutput.java +++ b/tsfile/src/test/java/org/apache/tsfile/write/writer/TestTsFileOutput.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.write.writer; +package org.apache.tsfile.write.writer; -import org.apache.iotdb.tsfile.utils.PublicBAOS; +import org.apache.tsfile.utils.PublicBAOS; import java.io.IOException; import java.io.OutputStream; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/writer/TimeChunkWriterTest.java b/tsfile/src/test/java/org/apache/tsfile/write/writer/TimeChunkWriterTest.java similarity index 91% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/write/writer/TimeChunkWriterTest.java rename to tsfile/src/test/java/org/apache/tsfile/write/writer/TimeChunkWriterTest.java index e2457b446..ee5d61c40 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/writer/TimeChunkWriterTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/write/writer/TimeChunkWriterTest.java @@ -16,18 +16,18 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.write.writer; +package org.apache.tsfile.write.writer; -import org.apache.iotdb.tsfile.encoding.encoder.Encoder; -import org.apache.iotdb.tsfile.encoding.encoder.PlainEncoder; -import org.apache.iotdb.tsfile.file.MetaMarker; -import org.apache.iotdb.tsfile.file.metadata.enums.CompressionType; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding; -import org.apache.iotdb.tsfile.utils.PublicBAOS; -import org.apache.iotdb.tsfile.utils.ReadWriteForEncodingUtils; -import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils; -import org.apache.iotdb.tsfile.write.chunk.TimeChunkWriter; +import org.apache.tsfile.encoding.encoder.Encoder; +import org.apache.tsfile.encoding.encoder.PlainEncoder; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.file.MetaMarker; +import org.apache.tsfile.file.metadata.enums.CompressionType; +import org.apache.tsfile.file.metadata.enums.TSEncoding; +import org.apache.tsfile.utils.PublicBAOS; +import org.apache.tsfile.utils.ReadWriteForEncodingUtils; +import org.apache.tsfile.utils.ReadWriteIOUtils; +import org.apache.tsfile.write.chunk.TimeChunkWriter; import org.junit.Test; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/writer/TimePageWriterTest.java b/tsfile/src/test/java/org/apache/tsfile/write/writer/TimePageWriterTest.java similarity index 89% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/write/writer/TimePageWriterTest.java rename to tsfile/src/test/java/org/apache/tsfile/write/writer/TimePageWriterTest.java index cab975c9a..878b9d7a7 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/writer/TimePageWriterTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/write/writer/TimePageWriterTest.java @@ -16,20 +16,20 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.write.writer; +package org.apache.tsfile.write.writer; -import org.apache.iotdb.tsfile.compress.ICompressor; -import org.apache.iotdb.tsfile.compress.IUnCompressor; -import org.apache.iotdb.tsfile.encoding.decoder.PlainDecoder; -import org.apache.iotdb.tsfile.encoding.encoder.Encoder; -import org.apache.iotdb.tsfile.encoding.encoder.PlainEncoder; -import org.apache.iotdb.tsfile.file.metadata.enums.CompressionType; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.file.metadata.statistics.TimeStatistics; -import org.apache.iotdb.tsfile.utils.PublicBAOS; -import org.apache.iotdb.tsfile.utils.ReadWriteForEncodingUtils; -import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils; -import org.apache.iotdb.tsfile.write.page.TimePageWriter; +import org.apache.tsfile.compress.ICompressor; +import org.apache.tsfile.compress.IUnCompressor; +import org.apache.tsfile.encoding.decoder.PlainDecoder; +import org.apache.tsfile.encoding.encoder.Encoder; +import org.apache.tsfile.encoding.encoder.PlainEncoder; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.file.metadata.enums.CompressionType; +import org.apache.tsfile.file.metadata.statistics.TimeStatistics; +import org.apache.tsfile.utils.PublicBAOS; +import org.apache.tsfile.utils.ReadWriteForEncodingUtils; +import org.apache.tsfile.utils.ReadWriteIOUtils; +import org.apache.tsfile.write.page.TimePageWriter; import org.junit.Test; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/writer/TsFileIOWriterMemoryControlTest.java b/tsfile/src/test/java/org/apache/tsfile/write/writer/TsFileIOWriterMemoryControlTest.java similarity index 97% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/write/writer/TsFileIOWriterMemoryControlTest.java rename to tsfile/src/test/java/org/apache/tsfile/write/writer/TsFileIOWriterMemoryControlTest.java index b130c7a0c..52b2add20 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/writer/TsFileIOWriterMemoryControlTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/write/writer/TsFileIOWriterMemoryControlTest.java @@ -17,30 +17,30 @@ * under the License. */ -package org.apache.iotdb.tsfile.write.writer; +package org.apache.tsfile.write.writer; -import org.apache.iotdb.tsfile.common.conf.TSFileConfig; -import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor; -import org.apache.iotdb.tsfile.encoding.encoder.Encoder; -import org.apache.iotdb.tsfile.encoding.encoder.TSEncodingBuilder; -import org.apache.iotdb.tsfile.file.metadata.ChunkMetadata; -import org.apache.iotdb.tsfile.file.metadata.IChunkMetadata; -import org.apache.iotdb.tsfile.file.metadata.TimeseriesMetadata; -import org.apache.iotdb.tsfile.file.metadata.enums.CompressionType; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding; -import org.apache.iotdb.tsfile.read.common.Path; -import org.apache.iotdb.tsfile.utils.Binary; -import org.apache.iotdb.tsfile.utils.Pair; -import org.apache.iotdb.tsfile.utils.TsPrimitiveType; -import org.apache.iotdb.tsfile.write.TsFileIntegrityCheckingTool; -import org.apache.iotdb.tsfile.write.chunk.AlignedChunkWriterImpl; -import org.apache.iotdb.tsfile.write.chunk.ChunkWriterImpl; -import org.apache.iotdb.tsfile.write.chunk.TimeChunkWriter; -import org.apache.iotdb.tsfile.write.chunk.ValueChunkWriter; -import org.apache.iotdb.tsfile.write.schema.IMeasurementSchema; -import org.apache.iotdb.tsfile.write.schema.MeasurementSchema; -import org.apache.iotdb.tsfile.write.writer.tsmiterator.TSMIterator; +import org.apache.tsfile.common.conf.TSFileConfig; +import org.apache.tsfile.common.conf.TSFileDescriptor; +import org.apache.tsfile.encoding.encoder.Encoder; +import org.apache.tsfile.encoding.encoder.TSEncodingBuilder; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.file.metadata.ChunkMetadata; +import org.apache.tsfile.file.metadata.IChunkMetadata; +import org.apache.tsfile.file.metadata.TimeseriesMetadata; +import org.apache.tsfile.file.metadata.enums.CompressionType; +import org.apache.tsfile.file.metadata.enums.TSEncoding; +import org.apache.tsfile.read.common.Path; +import org.apache.tsfile.utils.Binary; +import org.apache.tsfile.utils.Pair; +import org.apache.tsfile.utils.TsPrimitiveType; +import org.apache.tsfile.write.TsFileIntegrityCheckingTool; +import org.apache.tsfile.write.chunk.AlignedChunkWriterImpl; +import org.apache.tsfile.write.chunk.ChunkWriterImpl; +import org.apache.tsfile.write.chunk.TimeChunkWriter; +import org.apache.tsfile.write.chunk.ValueChunkWriter; +import org.apache.tsfile.write.schema.IMeasurementSchema; +import org.apache.tsfile.write.schema.MeasurementSchema; +import org.apache.tsfile.write.writer.tsmiterator.TSMIterator; import org.apache.commons.io.FileUtils; import org.junit.After; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/writer/ValueChunkWriterTest.java b/tsfile/src/test/java/org/apache/tsfile/write/writer/ValueChunkWriterTest.java similarity index 86% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/write/writer/ValueChunkWriterTest.java rename to tsfile/src/test/java/org/apache/tsfile/write/writer/ValueChunkWriterTest.java index 27cbec907..7c5b8efed 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/writer/ValueChunkWriterTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/write/writer/ValueChunkWriterTest.java @@ -16,18 +16,18 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.write.writer; +package org.apache.tsfile.write.writer; -import org.apache.iotdb.tsfile.encoding.encoder.Encoder; -import org.apache.iotdb.tsfile.encoding.encoder.PlainEncoder; -import org.apache.iotdb.tsfile.file.MetaMarker; -import org.apache.iotdb.tsfile.file.metadata.enums.CompressionType; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding; -import org.apache.iotdb.tsfile.utils.PublicBAOS; -import org.apache.iotdb.tsfile.utils.ReadWriteForEncodingUtils; -import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils; -import org.apache.iotdb.tsfile.write.chunk.ValueChunkWriter; +import org.apache.tsfile.encoding.encoder.Encoder; +import org.apache.tsfile.encoding.encoder.PlainEncoder; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.file.MetaMarker; +import org.apache.tsfile.file.metadata.enums.CompressionType; +import org.apache.tsfile.file.metadata.enums.TSEncoding; +import org.apache.tsfile.utils.PublicBAOS; +import org.apache.tsfile.utils.ReadWriteForEncodingUtils; +import org.apache.tsfile.utils.ReadWriteIOUtils; +import org.apache.tsfile.write.chunk.ValueChunkWriter; import org.junit.Test; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/writer/ValuePageWriterTest.java b/tsfile/src/test/java/org/apache/tsfile/write/writer/ValuePageWriterTest.java similarity index 93% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/write/writer/ValuePageWriterTest.java rename to tsfile/src/test/java/org/apache/tsfile/write/writer/ValuePageWriterTest.java index a43159fba..7d314648e 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/writer/ValuePageWriterTest.java +++ b/tsfile/src/test/java/org/apache/tsfile/write/writer/ValuePageWriterTest.java @@ -16,21 +16,21 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.write.writer; +package org.apache.tsfile.write.writer; -import org.apache.iotdb.tsfile.compress.ICompressor; -import org.apache.iotdb.tsfile.compress.IUnCompressor; -import org.apache.iotdb.tsfile.encoding.decoder.PlainDecoder; -import org.apache.iotdb.tsfile.encoding.encoder.Encoder; -import org.apache.iotdb.tsfile.encoding.encoder.PlainEncoder; -import org.apache.iotdb.tsfile.file.metadata.enums.CompressionType; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.file.metadata.statistics.FloatStatistics; -import org.apache.iotdb.tsfile.file.metadata.statistics.Statistics; -import org.apache.iotdb.tsfile.utils.PublicBAOS; -import org.apache.iotdb.tsfile.utils.ReadWriteForEncodingUtils; -import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils; -import org.apache.iotdb.tsfile.write.page.ValuePageWriter; +import org.apache.tsfile.compress.ICompressor; +import org.apache.tsfile.compress.IUnCompressor; +import org.apache.tsfile.encoding.decoder.PlainDecoder; +import org.apache.tsfile.encoding.encoder.Encoder; +import org.apache.tsfile.encoding.encoder.PlainEncoder; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.file.metadata.enums.CompressionType; +import org.apache.tsfile.file.metadata.statistics.FloatStatistics; +import org.apache.tsfile.file.metadata.statistics.Statistics; +import org.apache.tsfile.utils.PublicBAOS; +import org.apache.tsfile.utils.ReadWriteForEncodingUtils; +import org.apache.tsfile.utils.ReadWriteIOUtils; +import org.apache.tsfile.write.page.ValuePageWriter; import org.junit.Test; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/writer/VectorMeasurementSchemaStub.java b/tsfile/src/test/java/org/apache/tsfile/write/writer/VectorMeasurementSchemaStub.java similarity index 87% rename from tsfile/src/test/java/org/apache/iotdb/tsfile/write/writer/VectorMeasurementSchemaStub.java rename to tsfile/src/test/java/org/apache/tsfile/write/writer/VectorMeasurementSchemaStub.java index 8faef39e0..e4986e2be 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/writer/VectorMeasurementSchemaStub.java +++ b/tsfile/src/test/java/org/apache/tsfile/write/writer/VectorMeasurementSchemaStub.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.tsfile.write.writer; - -import org.apache.iotdb.tsfile.encoding.encoder.Encoder; -import org.apache.iotdb.tsfile.encoding.encoder.PlainEncoder; -import org.apache.iotdb.tsfile.file.metadata.enums.CompressionType; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding; -import org.apache.iotdb.tsfile.write.schema.VectorMeasurementSchema; +package org.apache.tsfile.write.writer; + +import org.apache.tsfile.encoding.encoder.Encoder; +import org.apache.tsfile.encoding.encoder.PlainEncoder; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.file.metadata.enums.CompressionType; +import org.apache.tsfile.file.metadata.enums.TSEncoding; +import org.apache.tsfile.write.schema.VectorMeasurementSchema; import java.io.OutputStream; import java.nio.ByteBuffer; diff --git a/tsfile/src/test/resources/logback.xml b/tsfile/src/test/resources/logback.xml index 61cafeca6..9e36631e4 100644 --- a/tsfile/src/test/resources/logback.xml +++ b/tsfile/src/test/resources/logback.xml @@ -117,7 +117,7 @@ ERROR - +