This is an automated email from the ASF dual-hosted git repository. jackietien pushed a commit to branch ty/removeTsFileModule in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 87bba5bd4de4e81b04101d7d4956ae668fca7a10 Author: JackieTien97 <[email protected]> AuthorDate: Wed Apr 3 08:57:10 2024 +0800 Fix compile error --- .../org/apache/iotdb/hadoop/tsfile/TSMRWriteExample.java | 4 ++-- integration-test/import-control.xml | 2 +- integration-test/src/test/resources/logback-test.xml | 2 +- .../cli/src/main/java/org/apache/iotdb/tool/ImportData.java | 12 ++++++------ iotdb-client/cli/src/test/resources/logback.xml | 2 +- .../scala/org/apache/iotdb/spark/tsfile/DefaultSource.scala | 4 ++-- .../org/apache/iotdb/spark/tsfile/NarrowConverter.scala | 3 ++- .../scala/org/apache/iotdb/spark/tsfile/WideConverter.scala | 9 +++++---- .../dataregion/compaction/settle/SettleTask.java | 2 +- .../dataregion/compaction/cross/MergeUpgradeTest.java | 3 +-- pom.xml | 2 +- 11 files changed, 23 insertions(+), 22 deletions(-) diff --git a/example/hadoop/src/main/java/org/apache/iotdb/hadoop/tsfile/TSMRWriteExample.java b/example/hadoop/src/main/java/org/apache/iotdb/hadoop/tsfile/TSMRWriteExample.java index b946acaa0a9..61e33578738 100644 --- a/example/hadoop/src/main/java/org/apache/iotdb/hadoop/tsfile/TSMRWriteExample.java +++ b/example/hadoop/src/main/java/org/apache/iotdb/hadoop/tsfile/TSMRWriteExample.java @@ -64,14 +64,14 @@ public class TSMRWriteExample { // add measurements into file schema (all with INT64 data type) for (int i = 0; i < 2; i++) { schema.registerTimeseries( - new org.apache.iotdb.tsfile.read.common.Path(Constant.DEVICE_1), + new org.apache.tsfile.read.common.Path(Constant.DEVICE_1), new MeasurementSchema( Constant.SENSOR_PREFIX + (i + 1), TSDataType.INT64, TSEncoding.TS_2DIFF)); } for (int i = 2; i < sensorNum; i++) { schema.registerTimeseries( - new org.apache.iotdb.tsfile.read.common.Path(Constant.DEVICE_1), + new org.apache.tsfile.read.common.Path(Constant.DEVICE_1), new MeasurementSchema( Constant.SENSOR_PREFIX + (i + 1), TSDataType.DOUBLE, TSEncoding.TS_2DIFF)); } diff --git a/integration-test/import-control.xml b/integration-test/import-control.xml index 4a375023e89..587c4c2b850 100644 --- a/integration-test/import-control.xml +++ b/integration-test/import-control.xml @@ -88,7 +88,7 @@ <allow class="org.apache.iotdb.db.protocol.thrift.OperationType"/> <allow class="org.apache.iotdb.db.it.utils.AlignedWriteUtil"/> <allow class="org.apache.iotdb.commons.cluster.NodeStatus"/> - <allow class="org.apache.iotdb.tsfile.common.constant.TsFileConstant"/> + <allow class="org.apache.tsfile.common.constant.TsFileConstant"/> <allow class="org.apache.iotdb.service.rpc.thrift.TSConnectionInfoResp"/> <allow class="org.apache.iotdb.service.rpc.thrift.TSConnectionType"/> <allow class="org.apache.iotdb.common.rpc.thrift.TAggregationType"/> diff --git a/integration-test/src/test/resources/logback-test.xml b/integration-test/src/test/resources/logback-test.xml index 281d6668f5b..95a4d1c5c9c 100644 --- a/integration-test/src/test/resources/logback-test.xml +++ b/integration-test/src/test/resources/logback-test.xml @@ -52,7 +52,7 @@ <logger name="org.apache.iotdb.db.service.RPCService" level="INFO"/> <logger name="org.apache.iotdb.db.service.MQTTService" level="INFO"/> <logger name="org.apache.iotdb.db.conf.IoTDBDescriptor" level="WARN"/> - <logger name="org.apache.iotdb.tsfile.common.conf.TSFileDescriptor" level="WARN"/> + <logger name="org.apache.tsfile.common.conf.TSFileDescriptor" level="WARN"/> <logger name="DETAILED_FAILURE_QUERY_TRACE" level="ERROR"/> <root level="INFO"> <appender-ref ref="stdout"/> diff --git a/iotdb-client/cli/src/main/java/org/apache/iotdb/tool/ImportData.java b/iotdb-client/cli/src/main/java/org/apache/iotdb/tool/ImportData.java index 44bd9a7eebb..8d1b3536395 100644 --- a/iotdb-client/cli/src/main/java/org/apache/iotdb/tool/ImportData.java +++ b/iotdb-client/cli/src/main/java/org/apache/iotdb/tool/ImportData.java @@ -74,12 +74,12 @@ import java.util.stream.Collectors; import java.util.stream.Stream; import static org.apache.iotdb.jdbc.Config.IOTDB_ERROR_PREFIX; -import static org.apache.tsfile.file.metadata.enums.TSDataType.BOOLEAN; -import static org.apache.tsfile.file.metadata.enums.TSDataType.DOUBLE; -import static org.apache.tsfile.file.metadata.enums.TSDataType.FLOAT; -import static org.apache.tsfile.file.metadata.enums.TSDataType.INT32; -import static org.apache.tsfile.file.metadata.enums.TSDataType.INT64; -import static org.apache.tsfile.file.metadata.enums.TSDataType.TEXT; +import static org.apache.tsfile.enums.TSDataType.BOOLEAN; +import static org.apache.tsfile.enums.TSDataType.DOUBLE; +import static org.apache.tsfile.enums.TSDataType.FLOAT; +import static org.apache.tsfile.enums.TSDataType.INT32; +import static org.apache.tsfile.enums.TSDataType.INT64; +import static org.apache.tsfile.enums.TSDataType.TEXT; public class ImportData extends AbstractDataTool { diff --git a/iotdb-client/cli/src/test/resources/logback.xml b/iotdb-client/cli/src/test/resources/logback.xml index df71a2090e9..3c1e4f682a8 100644 --- a/iotdb-client/cli/src/test/resources/logback.xml +++ b/iotdb-client/cli/src/test/resources/logback.xml @@ -115,7 +115,7 @@ <level>DEBUG</level> </filter> </appender> - <!--<logger name="org.apache.iotdb.tsfile.write.chunk.ChunkWriterImpl level="debug" />--> + <!--<logger name="org.apache.tsfile.write.chunk.ChunkWriterImpl level="debug" />--> <root level="ERROR"> <appender-ref ref="FILEERROR"/> </root> diff --git a/iotdb-connector/spark-tsfile/src/main/scala/org/apache/iotdb/spark/tsfile/DefaultSource.scala b/iotdb-connector/spark-tsfile/src/main/scala/org/apache/iotdb/spark/tsfile/DefaultSource.scala index d92e663bf63..bc87fb0b93d 100755 --- a/iotdb-connector/spark-tsfile/src/main/scala/org/apache/iotdb/spark/tsfile/DefaultSource.scala +++ b/iotdb-connector/spark-tsfile/src/main/scala/org/apache/iotdb/spark/tsfile/DefaultSource.scala @@ -187,7 +187,7 @@ private[tsfile] class DefaultSource extends FileFormat with DataSourceRegister { rowBuffer(index) = deviceName } else { - val pos = paths.indexOf(new org.apache.iotdb.tsfile.read.common.Path(deviceName, + val pos = paths.indexOf(new org.apache.tsfile.read.common.Path(deviceName, field.name, true)) var curField: Field = null if (pos != -1) { @@ -239,7 +239,7 @@ private[tsfile] class DefaultSource extends FileFormat with DataSourceRegister { if (field.name == QueryConstant.RESERVED_TIME) { rowBuffer(index) = curRecord.getTimestamp } else { - val pos = paths.indexOf(new org.apache.iotdb.tsfile.read.common.Path(field.name, true)) + val pos = paths.indexOf(new org.apache.tsfile.read.common.Path(field.name, true)) var curField: Field = null if (pos != -1) { curField = fields.get(pos) diff --git a/iotdb-connector/spark-tsfile/src/main/scala/org/apache/iotdb/spark/tsfile/NarrowConverter.scala b/iotdb-connector/spark-tsfile/src/main/scala/org/apache/iotdb/spark/tsfile/NarrowConverter.scala index 7e9b7f21a95..262557a4fb2 100644 --- a/iotdb-connector/spark-tsfile/src/main/scala/org/apache/iotdb/spark/tsfile/NarrowConverter.scala +++ b/iotdb-connector/spark-tsfile/src/main/scala/org/apache/iotdb/spark/tsfile/NarrowConverter.scala @@ -26,7 +26,8 @@ import org.apache.iotdb.spark.tsfile.qp.QueryProcessor import org.apache.iotdb.spark.tsfile.qp.common.{BasicOperator, FilterOperator, SQLConstant, TSQueryPlan} import org.apache.tsfile.common.constant.QueryConstant import org.apache.tsfile.file.metadata.TsFileMetadata -import org.apache.tsfile.file.metadata.enums.{TSDataType, TSEncoding} +import org.apache.tsfile.enums.TSDataType +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.read.expression.impl.{BinaryExpression, GlobalTimeExpression, SingleSeriesExpression} diff --git a/iotdb-connector/spark-tsfile/src/main/scala/org/apache/iotdb/spark/tsfile/WideConverter.scala b/iotdb-connector/spark-tsfile/src/main/scala/org/apache/iotdb/spark/tsfile/WideConverter.scala index 156f7aeec5b..712a65e2a7a 100755 --- a/iotdb-connector/spark-tsfile/src/main/scala/org/apache/iotdb/spark/tsfile/WideConverter.scala +++ b/iotdb-connector/spark-tsfile/src/main/scala/org/apache/iotdb/spark/tsfile/WideConverter.scala @@ -26,7 +26,8 @@ import org.apache.hadoop.fs.FileStatus import org.apache.iotdb.hadoop.fileSystem.HDFSInput import org.apache.tsfile.common.constant.QueryConstant import org.apache.tsfile.file.metadata.TsFileMetadata -import org.apache.tsfile.file.metadata.enums.{TSDataType, TSEncoding} +import org.apache.tsfile.enums.TSDataType +import org.apache.tsfile.file.metadata.enums.TSEncoding import org.apache.tsfile.common.conf.TSFileConfig import org.apache.tsfile.read.TsFileSequenceReader import org.apache.tsfile.read.common.Path @@ -138,7 +139,7 @@ object WideConverter extends Converter { val measurementIds = reader.getAllMeasurements.keySet() requiredSchema.foreach(f => { if (!QueryConstant.RESERVED_TIME.equals(f.name)) { - val path = new org.apache.iotdb.tsfile.read.common.Path(f.name, true) + val path = new org.apache.tsfile.read.common.Path(f.name, true) if (devices.contains(path.getDevice) && measurementIds.contains(path.getMeasurement)) { queriedSchema = queriedSchema.add(f) } @@ -160,10 +161,10 @@ object WideConverter extends Converter { */ def toQueryExpression(schema: StructType, filters: Seq[Filter]): QueryExpression = { //get paths from schema - val paths = new util.ArrayList[org.apache.iotdb.tsfile.read.common.Path] + val paths = new util.ArrayList[org.apache.tsfile.read.common.Path] schema.foreach(f => { if (!QueryConstant.RESERVED_TIME.equals(f.name)) { // the time field is excluded - paths.add(new org.apache.iotdb.tsfile.read.common.Path(f.name, true)) + paths.add(new org.apache.tsfile.read.common.Path(f.name, true)) } }) diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/settle/SettleTask.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/settle/SettleTask.java index 278cb8159c9..1ece7508991 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/settle/SettleTask.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/settle/SettleTask.java @@ -80,7 +80,7 @@ public class SettleTask extends WrappedRunnable { } } catch (IllegalPathException | IOException - | org.apache.iotdb.tsfile.exception.write.WriteProcessException e) { + | org.apache.tsfile.exception.write.WriteProcessException e) { resourceToBeSettled.readUnlock(); throw new WriteProcessException( String.format( diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/cross/MergeUpgradeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/cross/MergeUpgradeTest.java index 04dd752142d..d62e70140b8 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/cross/MergeUpgradeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/cross/MergeUpgradeTest.java @@ -178,8 +178,7 @@ public class MergeUpgradeTest { long ptNum, long valueOffset) throws WriteProcessException, IOException { - for (org.apache.iotdb.tsfile.write.schema.MeasurementSchema MeasurementSchema : - measurementSchemas) { + for (org.apache.tsfile.write.schema.MeasurementSchema MeasurementSchema : measurementSchemas) { fileWriter.registerTimeseries(new Path(deviceName), MeasurementSchema); } for (long i = timeOffset; i < timeOffset + ptNum; i++) { diff --git a/pom.xml b/pom.xml index ab677ade0b8..99c78eaf586 100644 --- a/pom.xml +++ b/pom.xml @@ -187,7 +187,7 @@ <xz.version>1.9</xz.version> <zeppelin.version>0.10.1</zeppelin.version> <zstd-jni.version>1.5.5-5</zstd-jni.version> - <tsfile.version>1.1.0-54eabc5-SNAPSHOT</tsfile.version> + <tsfile.version>1.0.1-SNAPSHOT</tsfile.version> </properties> <!-- if we claim dependencies in dependencyManagement, then we do not claim
