Refactor/change package name (#11)

apache · Jan 5, 2024 · 244cd0d · 244cd0d
1 parent 587b5d3
commit 244cd0d
Show file tree

Hide file tree

Showing 483 changed files with 3,000 additions and 2,997 deletions.
diff --git 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
@@ -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
@@ -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
@@ -1,15 +1,13 @@
-Apache IoTDB
+Apache TsFile
 Copyright 2018-2024 The Apache Software Foundation.
 
 This product includes software developed at
 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/...ad/common/block/TsBlockBuilderStatus.java → ...he/tsfile/block/TsBlockBuilderStatus.java b/...ad/common/block/TsBlockBuilderStatus.java → ...he/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/...file/read/common/block/column/Column.java → ...rg/apache/tsfile/block/column/Column.java b/...file/read/common/block/column/Column.java → ...rg/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/...ad/common/block/column/ColumnBuilder.java → ...he/tsfile/block/column/ColumnBuilder.java b/...ad/common/block/column/ColumnBuilder.java → ...he/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/...mon/block/column/ColumnBuilderStatus.java → ...ile/block/column/ColumnBuilderStatus.java b/...mon/block/column/ColumnBuilderStatus.java → ...ile/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/...d/common/block/column/ColumnEncoding.java → ...e/tsfile/block/column/ColumnEncoding.java b/...d/common/block/column/ColumnEncoding.java → ...e/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/...sfile/file/metadata/enums/TSDataType.java → ...a/org/apache/tsfile/enums/TSDataType.java b/...sfile/file/metadata/enums/TSDataType.java → ...a/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/...org/apache/iotdb/tsfile/utils/Binary.java → .../java/org/apache/tsfile/utils/Binary.java b/...org/apache/iotdb/tsfile/utils/Binary.java → .../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/.../apache/iotdb/tsfile/utils/Constants.java → ...va/org/apache/tsfile/utils/Constants.java b/.../apache/iotdb/tsfile/utils/Constants.java → ...va/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/...iotdb/tsfile/utils/RamUsageEstimator.java → ...pache/tsfile/utils/RamUsageEstimator.java b/...iotdb/tsfile/utils/RamUsageEstimator.java → ...pache/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/...e/iotdb/tsfile/utils/TsPrimitiveType.java → .../apache/tsfile/utils/TsPrimitiveType.java b/...e/iotdb/tsfile/utils/TsPrimitiveType.java → .../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/...n/write/UnSupportedDataTypeException.java → ...e/write/UnSupportedDataTypeException.java b/...n/write/UnSupportedDataTypeException.java → ...e/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
@@ -39,6 +39,7 @@
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
         <argLine/>
+        <spotless.skip>false</spotless.skip>
     </properties>
     <dependencyManagement>
         <dependencies>
@@ -55,7 +56,7 @@
             <dependency>
                 <groupId>commons-io</groupId>
                 <artifactId>commons-io</artifactId>
-                <version>2.13.0</version>
+                <version>2.15.1</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.commons</groupId>
@@ -91,13 +92,8 @@
             <dependency>
                 <groupId>org.mockito</groupId>
                 <artifactId>mockito-core</artifactId>
-                <!-- It seems that powermock is having issues with the newest mockito versions -->
-                <version>2.23.4</version>
-            </dependency>
-            <dependency>
-                <groupId>org.powermock</groupId>
-                <artifactId>powermock-api-mockito2</artifactId>
-                <version>2.0.9</version>
+                <!-- Starting with version 5, mockito requires Java 11 -->
+                <version>4.11.0</version>
             </dependency>
             <dependency>
                 <groupId>ch.qos.logback</groupId>
@@ -202,7 +198,7 @@
                                 <style>GOOGLE</style>
                             </googleJavaFormat>
                             <importOrder>
-                                <order>org.apache.iotdb,,javax,java,\#</order>
+                                <order>org.apache.tsfile,,javax,java,\#</order>
                             </importOrder>
                             <removeUnusedImports/>
                         </java>
@@ -268,47 +264,6 @@
                     <skip>${spotless.skip}</skip>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.eluder.coveralls</groupId>
-                <artifactId>coveralls-maven-plugin</artifactId>
-                <configuration>
-                    <jacocoReports>
-                        <jacocoReport>code-coverage/target/jacoco-merged-reports/jacoco.xml</jacocoReport>
-                    </jacocoReports>
-                    <sourceEncoding>UTF-8</sourceEncoding>
-                    <sourceDirectories>
-                        <!-- put all source folders not in src/main/java here-->
-                        <sourceDirectory>iotdb-core/antlr/target/generated-sources/antlr4</sourceDirectory>
-                        <sourceDirectory>iotdb-protocol/thrift-datanode/target/generated-sources/thrift</sourceDirectory>
-                        <sourceDirectory>iotdb-protocol/thrift-commons/target/generated-sources/thrift</sourceDirectory>
-                        <sourceDirectory>iotdb-protocol/thrift-confignode/target/generated-sources/thrift</sourceDirectory>
-                        <sourceDirectory>iotdb-protocol/thrift-consensus/target/generated-sources/thrift</sourceDirectory>
-                        <sourceDirectory>iotdb-protocol/openapi/target/generated-sources/java/src/gen/java</sourceDirectory>
-                        <sourceDirectory>iotdb-protocol/openapi/target/generated-sources/java/src/main/java</sourceDirectory>
-                        <sourceDirectory>iotdb-core/datanode/target/generated-sources/freemarker/</sourceDirectory>
-                        <sourceDirectory>iotdb-connector/spark-iotdb-connector/src/main/scala</sourceDirectory>
-                        <sourceDirectory>iotdb-connector/spark-tsfile/src/main/scala</sourceDirectory>
-                    </sourceDirectories>
-                </configuration>
-                <!-- JDK11 removes the following libs. We have to add them-->
-                <dependencies>
-                    <dependency>
-                        <groupId>javax.xml.bind</groupId>
-                        <artifactId>jaxb-api</artifactId>
-                        <version>2.4.0-b180830.0359</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>com.sun.xml.bind</groupId>
-                        <artifactId>jaxb-core</artifactId>
-                        <version>2.3.0</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>com.sun.xml.bind</groupId>
-                        <artifactId>jaxb-impl</artifactId>
-                        <version>2.3.6</version>
-                    </dependency>
-                </dependencies>
-            </plugin>
             <!--
                 Strange things usually happen if you run with a too low Java version.
                 This plugin not only checks the minimum java version of 1.8, but also
@@ -371,6 +326,20 @@
                             <fail>true</fail>
                         </configuration>
                     </execution>
+                    <!-- Ensure dependencies are compatible with Java 8 -->
+                    <execution>
+                        <id>enforce-java8-compatability</id>
+                        <goals>
+                            <goal>enforce</goal>
+                        </goals>
+                        <configuration>
+                            <rules>
+                                <enforceBytecodeVersion>
+                                    <maxJdkVersion>1.8</maxJdkVersion>
+                                </enforceBytecodeVersion>
+                            </rules>
+                        </configuration>
+                    </execution>
                     <!-- Make sure no dependencies are used for which known vulnerabilities exist. -->
                     <execution>
                         <id>vulnerability-checks</id>
@@ -643,11 +612,10 @@
         <developerConnection>scm:git:ssh://git@github.com/apache/tsfile.git</developerConnection>
         <url>ssh://git@github.com:apache/tsfile.git</url>
     </scm>
-    <!-- TODO: Needs discussing -->
-    <!--issueManagement>
-        <system>Jira</system>
-        <url>https://issues.apache.org/jira/browse/iotdb</url>
-    </issueManagement-->
+    <issueManagement>
+        <system>GitHub Issues</system>
+        <url>https://github.com/apache/tsfile/issues</url>
+    </issueManagement>
     <!-- Only configure the site distribution as the rest is handled by the apache parent -->
     <!-- TODO: Needs discussing -->
     <!--distributionManagement>
@@ -751,7 +719,7 @@
                                   See  https://issues.apache.org/jira/browse/MNG-5454  sigh.
                                 -->
                                 <configuration combine.self="append">
-                                    <finalName>apache-iotdb-${project.version}</finalName>
+                                    <finalName>apache-tsfile-${project.version}</finalName>
                                     <archive>
                                         <manifest>
                                             <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
@@ -803,7 +771,7 @@
                                         <fileSet>
                                             <directory>${project.build.directory}</directory>
                                             <includes>
-                                                <include>apache-iotdb-${project.version}-source-release.zip</include>
+                                                <include>apache-tsfile-${project.version}-source-release.zip</include>
                                             </includes>
                                         </fileSet>
                                     </fileSets>

diff --git a/tsfile/pom.xml b/tsfile/pom.xml
@@ -82,11 +82,6 @@
             <artifactId>mockito-core</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.powermock</groupId>
-            <artifactId>powermock-api-mockito2</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>