You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tsfile.apache.org by ji...@apache.org on 2026/01/28 04:06:32 UTC
(tsfile) branch sevo_support created (now c9d3f7ca)
This is an automated email from the ASF dual-hosted git repository.
jiangtian pushed a change to branch sevo_support
in repository https://gitbox.apache.org/repos/asf/tsfile.git
at c9d3f7ca bump version
This branch includes the following new commits:
new 24205774 add void writeToFileWriter(TsFileIOWriter tsfileWriter, Function<String, String> measurementNameRemapper) throws IOException;
new d71552b9 spotless
new f54b426d fix test
new 2d081240 bump version
new a206cf82 add gettet and setter
new 6f2ed716 Add support for schema evolution
new 5f190ead Merge branch 'develop' into sevo_support_internal
new 5689b666 Merge branch 'develop' into sevo_support
new c9d3f7ca bump version
The 9 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
(tsfile) 05/09: add gettet and setter
Posted by ji...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jiangtian pushed a commit to branch sevo_support
in repository https://gitbox.apache.org/repos/asf/tsfile.git
commit a206cf8209eec37b7b722164c99b1b7eab346f11
Author: Tian Jiang <jt...@163.com>
AuthorDate: Wed Jan 7 19:10:48 2026 +0800
add gettet and setter
---
.../main/java/org/apache/tsfile/file/metadata/TableSchema.java | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/java/tsfile/src/main/java/org/apache/tsfile/file/metadata/TableSchema.java b/java/tsfile/src/main/java/org/apache/tsfile/file/metadata/TableSchema.java
index 6d630c38..9d1f7f2a 100644
--- a/java/tsfile/src/main/java/org/apache/tsfile/file/metadata/TableSchema.java
+++ b/java/tsfile/src/main/java/org/apache/tsfile/file/metadata/TableSchema.java
@@ -356,4 +356,12 @@ public class TableSchema {
tagColumnCnt = (int) columnCategories.stream().filter(c -> c == ColumnCategory.TAG).count();
return tagColumnCnt;
}
+
+ public boolean isUpdatable() {
+ return updatable;
+ }
+
+ public void setUpdatable(boolean updatable) {
+ this.updatable = updatable;
+ }
}
(tsfile) 03/09: fix test
Posted by ji...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jiangtian pushed a commit to branch sevo_support
in repository https://gitbox.apache.org/repos/asf/tsfile.git
commit f54b426de709b4311be6c9a3e0a47caeb5f4470c
Author: Tian Jiang <jt...@163.com>
AuthorDate: Sun Jan 4 16:10:37 2026 +0800
fix test
---
.../src/main/java/org/apache/tsfile/write/chunk/ValueChunkWriter.java | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/java/tsfile/src/main/java/org/apache/tsfile/write/chunk/ValueChunkWriter.java b/java/tsfile/src/main/java/org/apache/tsfile/write/chunk/ValueChunkWriter.java
index 31ab3f6c..a1c03ee5 100644
--- a/java/tsfile/src/main/java/org/apache/tsfile/write/chunk/ValueChunkWriter.java
+++ b/java/tsfile/src/main/java/org/apache/tsfile/write/chunk/ValueChunkWriter.java
@@ -386,6 +386,10 @@ public class ValueChunkWriter {
return dataType;
}
+ public void writeAllPagesOfChunkToTsFile(TsFileIOWriter writer) throws IOException {
+ writeAllPagesOfChunkToTsFile(writer, null);
+ }
+
/**
* write the page to specified IOWriter.
*
(tsfile) 01/09: add void writeToFileWriter(TsFileIOWriter tsfileWriter, Function measurementNameRemapper) throws IOException;
Posted by ji...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jiangtian pushed a commit to branch sevo_support
in repository https://gitbox.apache.org/repos/asf/tsfile.git
commit 24205774c45917a6ac7d64fb3faf96b0ba405156
Author: Tian Jiang <jt...@163.com>
AuthorDate: Sun Jan 4 16:04:41 2026 +0800
add void writeToFileWriter(TsFileIOWriter tsfileWriter, Function<String, String> measurementNameRemapper) throws IOException;
---
.../tsfile/write/chunk/AlignedChunkWriterImpl.java | 10 ++++++++++
.../apache/tsfile/write/chunk/ChunkWriterImpl.java | 19 ++++++++++++++-----
.../org/apache/tsfile/write/chunk/IChunkWriter.java | 6 ++++++
.../apache/tsfile/write/chunk/ValueChunkWriter.java | 16 ++++++++++++----
4 files changed, 42 insertions(+), 9 deletions(-)
diff --git a/java/tsfile/src/main/java/org/apache/tsfile/write/chunk/AlignedChunkWriterImpl.java b/java/tsfile/src/main/java/org/apache/tsfile/write/chunk/AlignedChunkWriterImpl.java
index 27761e67..08ae5753 100644
--- a/java/tsfile/src/main/java/org/apache/tsfile/write/chunk/AlignedChunkWriterImpl.java
+++ b/java/tsfile/src/main/java/org/apache/tsfile/write/chunk/AlignedChunkWriterImpl.java
@@ -18,6 +18,7 @@
*/
package org.apache.tsfile.write.chunk;
+import java.util.function.Function;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.common.conf.TSFileDescriptor;
import org.apache.tsfile.encoding.encoder.Encoder;
@@ -477,6 +478,15 @@ public class AlignedChunkWriterImpl implements IChunkWriter {
}
}
+ @Override
+ public void writeToFileWriter(TsFileIOWriter tsfileWriter,
+ Function<String, String> measurementNameRemapper) throws IOException {
+ timeChunkWriter.writeToFileWriter(tsfileWriter);
+ for (ValueChunkWriter valueChunkWriter : valueChunkWriterList) {
+ valueChunkWriter.writeToFileWriter(tsfileWriter, measurementNameRemapper);
+ }
+ }
+
@Override
public long estimateMaxSeriesMemSize() {
long estimateMaxSeriesMemSize = timeChunkWriter.estimateMaxSeriesMemSize();
diff --git a/java/tsfile/src/main/java/org/apache/tsfile/write/chunk/ChunkWriterImpl.java b/java/tsfile/src/main/java/org/apache/tsfile/write/chunk/ChunkWriterImpl.java
index 25e0410b..d450b373 100644
--- a/java/tsfile/src/main/java/org/apache/tsfile/write/chunk/ChunkWriterImpl.java
+++ b/java/tsfile/src/main/java/org/apache/tsfile/write/chunk/ChunkWriterImpl.java
@@ -18,6 +18,7 @@
*/
package org.apache.tsfile.write.chunk;
+import java.util.function.Function;
import org.apache.tsfile.common.conf.TSFileDescriptor;
import org.apache.tsfile.compress.ICompressor;
import org.apache.tsfile.encoding.encoder.SDTEncoder;
@@ -346,8 +347,14 @@ public class ChunkWriterImpl implements IChunkWriter {
@Override
public void writeToFileWriter(TsFileIOWriter tsfileWriter) throws IOException {
+ writeToFileWriter(tsfileWriter, null);
+ }
+
+ @Override
+ public void writeToFileWriter(TsFileIOWriter tsfileWriter,
+ Function<String, String> measurementNameRemapper) throws IOException {
sealCurrentPage();
- writeAllPagesOfChunkToTsFile(tsfileWriter, statistics);
+ writeAllPagesOfChunkToTsFile(tsfileWriter, statistics, measurementNameRemapper);
// reinit this chunk writer
pageBuffer.reset();
@@ -472,19 +479,21 @@ public class ChunkWriterImpl implements IChunkWriter {
/**
* write the page to specified IOWriter.
*
- * @param writer the specified IOWriter
- * @param statistics the chunk statistics
+ * @param writer the specified IOWriter
+ * @param statistics the chunk statistics
+ * @param measurementNameRemapper
* @throws IOException exception in IO
*/
private void writeAllPagesOfChunkToTsFile(
- TsFileIOWriter writer, Statistics<? extends Serializable> statistics) throws IOException {
+ TsFileIOWriter writer, Statistics<? extends Serializable> statistics,
+ Function<String, String> measurementNameRemapper) throws IOException {
if (statistics.getCount() == 0) {
return;
}
// start to write this column chunk
writer.startFlushChunk(
- measurementSchema.getMeasurementName(),
+ measurementNameRemapper == null ? measurementSchema.getMeasurementName() : measurementNameRemapper.apply(measurementSchema.getMeasurementName()),
compressor.getType(),
measurementSchema.getType(),
measurementSchema.getEncodingType(),
diff --git a/java/tsfile/src/main/java/org/apache/tsfile/write/chunk/IChunkWriter.java b/java/tsfile/src/main/java/org/apache/tsfile/write/chunk/IChunkWriter.java
index 85b9828a..11304073 100644
--- a/java/tsfile/src/main/java/org/apache/tsfile/write/chunk/IChunkWriter.java
+++ b/java/tsfile/src/main/java/org/apache/tsfile/write/chunk/IChunkWriter.java
@@ -18,6 +18,7 @@
*/
package org.apache.tsfile.write.chunk;
+import java.util.function.Function;
import org.apache.tsfile.write.writer.TsFileIOWriter;
import java.io.IOException;
@@ -28,6 +29,11 @@ public interface IChunkWriter {
/** flush data to TsFileIOWriter. */
void writeToFileWriter(TsFileIOWriter tsfileWriter) throws IOException;
+ /**
+ * flush data to TsFileIOWriter, may rename the measurement in the file according to the remapper.
+ */
+ void writeToFileWriter(TsFileIOWriter tsfileWriter, Function<String, String> measurementNameRemapper) throws IOException;
+
/** estimate memory usage of this series. */
long estimateMaxSeriesMemSize();
diff --git a/java/tsfile/src/main/java/org/apache/tsfile/write/chunk/ValueChunkWriter.java b/java/tsfile/src/main/java/org/apache/tsfile/write/chunk/ValueChunkWriter.java
index d011e125..a778f741 100644
--- a/java/tsfile/src/main/java/org/apache/tsfile/write/chunk/ValueChunkWriter.java
+++ b/java/tsfile/src/main/java/org/apache/tsfile/write/chunk/ValueChunkWriter.java
@@ -18,6 +18,7 @@
*/
package org.apache.tsfile.write.chunk;
+import java.util.function.Function;
import org.apache.tsfile.common.conf.TSFileDescriptor;
import org.apache.tsfile.common.constant.TsFileConstant;
import org.apache.tsfile.compress.ICompressor;
@@ -295,8 +296,13 @@ public class ValueChunkWriter {
}
public void writeToFileWriter(TsFileIOWriter tsfileWriter) throws IOException {
+ writeToFileWriter(tsfileWriter, null);
+ }
+
+ public void writeToFileWriter(TsFileIOWriter tsfileWriter,
+ Function<String, String> measurementNameRemapper) throws IOException {
sealCurrentPage();
- writeAllPagesOfChunkToTsFile(tsfileWriter);
+ writeAllPagesOfChunkToTsFile(tsfileWriter, measurementNameRemapper);
// reinit this chunk writer
pageBuffer.reset();
@@ -385,7 +391,9 @@ public class ValueChunkWriter {
* @param writer the specified IOWriter
* @throws IOException exception in IO
*/
- public void writeAllPagesOfChunkToTsFile(TsFileIOWriter writer) throws IOException {
+ public void writeAllPagesOfChunkToTsFile(TsFileIOWriter writer,
+ Function<String, String> measurementNameRemapper) throws IOException {
+ String finalMeasurementId = measurementNameRemapper == null ? measurementId : measurementNameRemapper.apply(measurementId);
if (statistics.getCount() == 0) {
if (pageBuffer.size() == 0) {
return;
@@ -395,7 +403,7 @@ public class ValueChunkWriter {
// chunkGroup during compaction. To save the disk space, we only serialize chunkHeader for the
// empty valueChunk, whose dataSize is 0.
writer.startFlushChunk(
- measurementId,
+ finalMeasurementId,
compressionType,
dataType,
encodingType,
@@ -409,7 +417,7 @@ public class ValueChunkWriter {
// start to write this column chunk
writer.startFlushChunk(
- measurementId,
+ finalMeasurementId,
compressionType,
dataType,
encodingType,
(tsfile) 09/09: bump version
Posted by ji...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jiangtian pushed a commit to branch sevo_support
in repository https://gitbox.apache.org/repos/asf/tsfile.git
commit c9d3f7ca7a87946885bed005102244a2afa3f366
Author: Tian Jiang <jt...@163.com>
AuthorDate: Wed Jan 28 12:06:14 2026 +0800
bump version
---
cpp/pom.xml | 2 +-
java/common/pom.xml | 2 +-
java/examples/pom.xml | 4 ++--
java/pom.xml | 4 ++--
java/tools/pom.xml | 6 +++---
java/tsfile/pom.xml | 4 ++--
pom.xml | 2 +-
python/pom.xml | 2 +-
8 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/cpp/pom.xml b/cpp/pom.xml
index 25c8a10a..b7fc299c 100644
--- a/cpp/pom.xml
+++ b/cpp/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.tsfile</groupId>
<artifactId>tsfile-parent</artifactId>
- <version>2.2.1-sevo-SNAPSHOT</version>
+ <version>2.2.1-sevo2-SNAPSHOT</version>
</parent>
<artifactId>tsfile-cpp</artifactId>
<packaging>pom</packaging>
diff --git a/java/common/pom.xml b/java/common/pom.xml
index 4a4c9b1c..9734047f 100644
--- a/java/common/pom.xml
+++ b/java/common/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.tsfile</groupId>
<artifactId>tsfile-java</artifactId>
- <version>2.2.1-sevo-SNAPSHOT</version>
+ <version>2.2.1-sevo2-SNAPSHOT</version>
</parent>
<artifactId>common</artifactId>
<name>TsFile: Java: Common</name>
diff --git a/java/examples/pom.xml b/java/examples/pom.xml
index 1842cef3..ae7a7da9 100644
--- a/java/examples/pom.xml
+++ b/java/examples/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.tsfile</groupId>
<artifactId>tsfile-java</artifactId>
- <version>2.2.1-sevo-SNAPSHOT</version>
+ <version>2.2.1-sevo2-SNAPSHOT</version>
</parent>
<artifactId>examples</artifactId>
<name>TsFile: Java: Examples</name>
@@ -36,7 +36,7 @@
<dependency>
<groupId>org.apache.tsfile</groupId>
<artifactId>tsfile</artifactId>
- <version>2.2.1-sevo-SNAPSHOT</version>
+ <version>2.2.1-sevo2-SNAPSHOT</version>
</dependency>
</dependencies>
<build>
diff --git a/java/pom.xml b/java/pom.xml
index b747f7ce..99bd0cd7 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -24,10 +24,10 @@
<parent>
<groupId>org.apache.tsfile</groupId>
<artifactId>tsfile-parent</artifactId>
- <version>2.2.1-sevo-SNAPSHOT</version>
+ <version>2.2.1-sevo2-SNAPSHOT</version>
</parent>
<artifactId>tsfile-java</artifactId>
- <version>2.2.1-sevo-SNAPSHOT</version>
+ <version>2.2.1-sevo2-SNAPSHOT</version>
<packaging>pom</packaging>
<name>TsFile: Java</name>
<modules>
diff --git a/java/tools/pom.xml b/java/tools/pom.xml
index 9918632b..576a9489 100644
--- a/java/tools/pom.xml
+++ b/java/tools/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.tsfile</groupId>
<artifactId>tsfile-java</artifactId>
- <version>2.2.1-sevo-SNAPSHOT</version>
+ <version>2.2.1-sevo2-SNAPSHOT</version>
</parent>
<artifactId>tools</artifactId>
<name>TsFile: Java: Tools</name>
@@ -32,7 +32,7 @@
<dependency>
<groupId>org.apache.tsfile</groupId>
<artifactId>common</artifactId>
- <version>2.2.1-sevo-SNAPSHOT</version>
+ <version>2.2.1-sevo2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>commons-cli</groupId>
@@ -42,7 +42,7 @@
<dependency>
<groupId>org.apache.tsfile</groupId>
<artifactId>tsfile</artifactId>
- <version>2.2.1-sevo-SNAPSHOT</version>
+ <version>2.2.1-sevo2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
diff --git a/java/tsfile/pom.xml b/java/tsfile/pom.xml
index 07a609d3..a7fd4163 100644
--- a/java/tsfile/pom.xml
+++ b/java/tsfile/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.tsfile</groupId>
<artifactId>tsfile-java</artifactId>
- <version>2.2.1-sevo-SNAPSHOT</version>
+ <version>2.2.1-sevo2-SNAPSHOT</version>
</parent>
<artifactId>tsfile</artifactId>
<name>TsFile: Java: TsFile</name>
@@ -38,7 +38,7 @@
<dependency>
<groupId>org.apache.tsfile</groupId>
<artifactId>common</artifactId>
- <version>2.2.1-sevo-SNAPSHOT</version>
+ <version>2.2.1-sevo2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.github.luben</groupId>
diff --git a/pom.xml b/pom.xml
index 2083802f..cd63f020 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
</parent>
<groupId>org.apache.tsfile</groupId>
<artifactId>tsfile-parent</artifactId>
- <version>2.2.1-sevo-SNAPSHOT</version>
+ <version>2.2.1-sevo2-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache TsFile Project Parent POM</name>
<properties>
diff --git a/python/pom.xml b/python/pom.xml
index fe3e4471..44a680f4 100644
--- a/python/pom.xml
+++ b/python/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.tsfile</groupId>
<artifactId>tsfile-parent</artifactId>
- <version>2.2.1-sevo-SNAPSHOT</version>
+ <version>2.2.1-sevo2-SNAPSHOT</version>
</parent>
<artifactId>tsfile-python</artifactId>
<packaging>pom</packaging>
(tsfile) 04/09: bump version
Posted by ji...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jiangtian pushed a commit to branch sevo_support
in repository https://gitbox.apache.org/repos/asf/tsfile.git
commit 2d081240887b974d4a5e8fcc377bf75dc24b5f55
Author: Tian Jiang <jt...@163.com>
AuthorDate: Sun Jan 4 16:07:02 2026 +0800
bump version
---
cpp/pom.xml | 2 +-
cpp/third_party/zlib-1.3.1/treebuild.xml | 188 ++++++++++-----------
.../zlib-1.3.1/zlib-1.3.1/treebuild.xml | 188 ++++++++++-----------
java/common/pom.xml | 2 +-
java/examples/pom.xml | 4 +-
java/pom.xml | 4 +-
java/tools/pom.xml | 6 +-
java/tsfile/pom.xml | 4 +-
pom.xml | 2 +-
python/pom.xml | 2 +-
10 files changed, 197 insertions(+), 205 deletions(-)
diff --git a/cpp/pom.xml b/cpp/pom.xml
index b31b2dc1..25c8a10a 100644
--- a/cpp/pom.xml
+++ b/cpp/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.tsfile</groupId>
<artifactId>tsfile-parent</artifactId>
- <version>2.2.1-SNAPSHOT</version>
+ <version>2.2.1-sevo-SNAPSHOT</version>
</parent>
<artifactId>tsfile-cpp</artifactId>
<packaging>pom</packaging>
diff --git a/cpp/third_party/zlib-1.3.1/treebuild.xml b/cpp/third_party/zlib-1.3.1/treebuild.xml
index 930b00be..8e030572 100644
--- a/cpp/third_party/zlib-1.3.1/treebuild.xml
+++ b/cpp/third_party/zlib-1.3.1/treebuild.xml
@@ -1,103 +1,99 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="UTF-8"?>
<package name="zlib" version="1.3.1">
<library name="zlib" dlversion="1.3.1" dlname="z">
- <property name="description"> zip compression library </property>
- <property name="include-target-dir" value="$(@PACKAGE/install-includedir)" />
-
- <!-- fixme: not implemented yet -->
- <property name="compiler/c/inline" value="yes" />
-
- <include-file name="zlib.h" scope="public" mode="644" />
- <include-file name="zconf.h" scope="public" mode="644" />
-
- <source name="adler32.c">
- <depend name="zlib.h" />
- <depend name="zconf.h" />
- </source>
- <source name="compress.c">
- <depend name="zlib.h" />
- <depend name="zconf.h" />
- </source>
- <source name="crc32.c">
- <depend name="zlib.h" />
- <depend name="zconf.h" />
- <depend name="crc32.h" />
- </source>
- <source name="gzclose.c">
- <depend name="zlib.h" />
- <depend name="zconf.h" />
- <depend name="gzguts.h" />
- </source>
- <source name="gzlib.c">
- <depend name="zlib.h" />
- <depend name="zconf.h" />
- <depend name="gzguts.h" />
- </source>
- <source name="gzread.c">
- <depend name="zlib.h" />
- <depend name="zconf.h" />
- <depend name="gzguts.h" />
- </source>
- <source name="gzwrite.c">
- <depend name="zlib.h" />
- <depend name="zconf.h" />
- <depend name="gzguts.h" />
- </source>
- <source name="uncompr.c">
- <depend name="zlib.h" />
- <depend name="zconf.h" />
- </source>
- <source name="deflate.c">
- <depend name="zlib.h" />
- <depend name="zconf.h" />
- <depend name="zutil.h" />
- <depend name="deflate.h" />
- </source>
- <source name="trees.c">
- <depend name="zlib.h" />
- <depend name="zconf.h" />
- <depend name="zutil.h" />
- <depend name="deflate.h" />
- <depend name="trees.h" />
- </source>
- <source name="zutil.c">
- <depend name="zlib.h" />
- <depend name="zconf.h" />
- <depend name="zutil.h" />
- </source>
- <source name="inflate.c">
- <depend name="zlib.h" />
- <depend name="zconf.h" />
- <depend name="zutil.h" />
- <depend name="inftrees.h" />
- <depend name="inflate.h" />
- <depend name="inffast.h" />
- </source>
- <source name="infback.c">
- <depend name="zlib.h" />
- <depend name="zconf.h" />
- <depend name="zutil.h" />
- <depend name="inftrees.h" />
- <depend name="inflate.h" />
- <depend name="inffast.h" />
- </source>
- <source name="inftrees.c">
- <depend name="zlib.h" />
- <depend name="zconf.h" />
- <depend name="zutil.h" />
- <depend name="inftrees.h" />
- </source>
- <source name="inffast.c">
- <depend name="zlib.h" />
- <depend name="zconf.h" />
- <depend name="zutil.h" />
- <depend name="inftrees.h" />
- <depend name="inflate.h" />
- <depend name="inffast.h" />
- </source>
+ <property name="description">zip compression library</property>
+ <property name="include-target-dir" value="$(@PACKAGE/install-includedir)"/>
+ <!-- fixme: not implemented yet -->
+ <property name="compiler/c/inline" value="yes"/>
+ <include-file name="zlib.h" scope="public" mode="644"/>
+ <include-file name="zconf.h" scope="public" mode="644"/>
+ <source name="adler32.c">
+ <depend name="zlib.h"/>
+ <depend name="zconf.h"/>
+ </source>
+ <source name="compress.c">
+ <depend name="zlib.h"/>
+ <depend name="zconf.h"/>
+ </source>
+ <source name="crc32.c">
+ <depend name="zlib.h"/>
+ <depend name="zconf.h"/>
+ <depend name="crc32.h"/>
+ </source>
+ <source name="gzclose.c">
+ <depend name="zlib.h"/>
+ <depend name="zconf.h"/>
+ <depend name="gzguts.h"/>
+ </source>
+ <source name="gzlib.c">
+ <depend name="zlib.h"/>
+ <depend name="zconf.h"/>
+ <depend name="gzguts.h"/>
+ </source>
+ <source name="gzread.c">
+ <depend name="zlib.h"/>
+ <depend name="zconf.h"/>
+ <depend name="gzguts.h"/>
+ </source>
+ <source name="gzwrite.c">
+ <depend name="zlib.h"/>
+ <depend name="zconf.h"/>
+ <depend name="gzguts.h"/>
+ </source>
+ <source name="uncompr.c">
+ <depend name="zlib.h"/>
+ <depend name="zconf.h"/>
+ </source>
+ <source name="deflate.c">
+ <depend name="zlib.h"/>
+ <depend name="zconf.h"/>
+ <depend name="zutil.h"/>
+ <depend name="deflate.h"/>
+ </source>
+ <source name="trees.c">
+ <depend name="zlib.h"/>
+ <depend name="zconf.h"/>
+ <depend name="zutil.h"/>
+ <depend name="deflate.h"/>
+ <depend name="trees.h"/>
+ </source>
+ <source name="zutil.c">
+ <depend name="zlib.h"/>
+ <depend name="zconf.h"/>
+ <depend name="zutil.h"/>
+ </source>
+ <source name="inflate.c">
+ <depend name="zlib.h"/>
+ <depend name="zconf.h"/>
+ <depend name="zutil.h"/>
+ <depend name="inftrees.h"/>
+ <depend name="inflate.h"/>
+ <depend name="inffast.h"/>
+ </source>
+ <source name="infback.c">
+ <depend name="zlib.h"/>
+ <depend name="zconf.h"/>
+ <depend name="zutil.h"/>
+ <depend name="inftrees.h"/>
+ <depend name="inflate.h"/>
+ <depend name="inffast.h"/>
+ </source>
+ <source name="inftrees.c">
+ <depend name="zlib.h"/>
+ <depend name="zconf.h"/>
+ <depend name="zutil.h"/>
+ <depend name="inftrees.h"/>
+ </source>
+ <source name="inffast.c">
+ <depend name="zlib.h"/>
+ <depend name="zconf.h"/>
+ <depend name="zutil.h"/>
+ <depend name="inftrees.h"/>
+ <depend name="inflate.h"/>
+ <depend name="inffast.h"/>
+ </source>
</library>
</package>
-
<!--
CFLAGS=-O
#CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7
diff --git a/cpp/third_party/zlib-1.3.1/zlib-1.3.1/treebuild.xml b/cpp/third_party/zlib-1.3.1/zlib-1.3.1/treebuild.xml
index 930b00be..8e030572 100644
--- a/cpp/third_party/zlib-1.3.1/zlib-1.3.1/treebuild.xml
+++ b/cpp/third_party/zlib-1.3.1/zlib-1.3.1/treebuild.xml
@@ -1,103 +1,99 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="UTF-8"?>
<package name="zlib" version="1.3.1">
<library name="zlib" dlversion="1.3.1" dlname="z">
- <property name="description"> zip compression library </property>
- <property name="include-target-dir" value="$(@PACKAGE/install-includedir)" />
-
- <!-- fixme: not implemented yet -->
- <property name="compiler/c/inline" value="yes" />
-
- <include-file name="zlib.h" scope="public" mode="644" />
- <include-file name="zconf.h" scope="public" mode="644" />
-
- <source name="adler32.c">
- <depend name="zlib.h" />
- <depend name="zconf.h" />
- </source>
- <source name="compress.c">
- <depend name="zlib.h" />
- <depend name="zconf.h" />
- </source>
- <source name="crc32.c">
- <depend name="zlib.h" />
- <depend name="zconf.h" />
- <depend name="crc32.h" />
- </source>
- <source name="gzclose.c">
- <depend name="zlib.h" />
- <depend name="zconf.h" />
- <depend name="gzguts.h" />
- </source>
- <source name="gzlib.c">
- <depend name="zlib.h" />
- <depend name="zconf.h" />
- <depend name="gzguts.h" />
- </source>
- <source name="gzread.c">
- <depend name="zlib.h" />
- <depend name="zconf.h" />
- <depend name="gzguts.h" />
- </source>
- <source name="gzwrite.c">
- <depend name="zlib.h" />
- <depend name="zconf.h" />
- <depend name="gzguts.h" />
- </source>
- <source name="uncompr.c">
- <depend name="zlib.h" />
- <depend name="zconf.h" />
- </source>
- <source name="deflate.c">
- <depend name="zlib.h" />
- <depend name="zconf.h" />
- <depend name="zutil.h" />
- <depend name="deflate.h" />
- </source>
- <source name="trees.c">
- <depend name="zlib.h" />
- <depend name="zconf.h" />
- <depend name="zutil.h" />
- <depend name="deflate.h" />
- <depend name="trees.h" />
- </source>
- <source name="zutil.c">
- <depend name="zlib.h" />
- <depend name="zconf.h" />
- <depend name="zutil.h" />
- </source>
- <source name="inflate.c">
- <depend name="zlib.h" />
- <depend name="zconf.h" />
- <depend name="zutil.h" />
- <depend name="inftrees.h" />
- <depend name="inflate.h" />
- <depend name="inffast.h" />
- </source>
- <source name="infback.c">
- <depend name="zlib.h" />
- <depend name="zconf.h" />
- <depend name="zutil.h" />
- <depend name="inftrees.h" />
- <depend name="inflate.h" />
- <depend name="inffast.h" />
- </source>
- <source name="inftrees.c">
- <depend name="zlib.h" />
- <depend name="zconf.h" />
- <depend name="zutil.h" />
- <depend name="inftrees.h" />
- </source>
- <source name="inffast.c">
- <depend name="zlib.h" />
- <depend name="zconf.h" />
- <depend name="zutil.h" />
- <depend name="inftrees.h" />
- <depend name="inflate.h" />
- <depend name="inffast.h" />
- </source>
+ <property name="description">zip compression library</property>
+ <property name="include-target-dir" value="$(@PACKAGE/install-includedir)"/>
+ <!-- fixme: not implemented yet -->
+ <property name="compiler/c/inline" value="yes"/>
+ <include-file name="zlib.h" scope="public" mode="644"/>
+ <include-file name="zconf.h" scope="public" mode="644"/>
+ <source name="adler32.c">
+ <depend name="zlib.h"/>
+ <depend name="zconf.h"/>
+ </source>
+ <source name="compress.c">
+ <depend name="zlib.h"/>
+ <depend name="zconf.h"/>
+ </source>
+ <source name="crc32.c">
+ <depend name="zlib.h"/>
+ <depend name="zconf.h"/>
+ <depend name="crc32.h"/>
+ </source>
+ <source name="gzclose.c">
+ <depend name="zlib.h"/>
+ <depend name="zconf.h"/>
+ <depend name="gzguts.h"/>
+ </source>
+ <source name="gzlib.c">
+ <depend name="zlib.h"/>
+ <depend name="zconf.h"/>
+ <depend name="gzguts.h"/>
+ </source>
+ <source name="gzread.c">
+ <depend name="zlib.h"/>
+ <depend name="zconf.h"/>
+ <depend name="gzguts.h"/>
+ </source>
+ <source name="gzwrite.c">
+ <depend name="zlib.h"/>
+ <depend name="zconf.h"/>
+ <depend name="gzguts.h"/>
+ </source>
+ <source name="uncompr.c">
+ <depend name="zlib.h"/>
+ <depend name="zconf.h"/>
+ </source>
+ <source name="deflate.c">
+ <depend name="zlib.h"/>
+ <depend name="zconf.h"/>
+ <depend name="zutil.h"/>
+ <depend name="deflate.h"/>
+ </source>
+ <source name="trees.c">
+ <depend name="zlib.h"/>
+ <depend name="zconf.h"/>
+ <depend name="zutil.h"/>
+ <depend name="deflate.h"/>
+ <depend name="trees.h"/>
+ </source>
+ <source name="zutil.c">
+ <depend name="zlib.h"/>
+ <depend name="zconf.h"/>
+ <depend name="zutil.h"/>
+ </source>
+ <source name="inflate.c">
+ <depend name="zlib.h"/>
+ <depend name="zconf.h"/>
+ <depend name="zutil.h"/>
+ <depend name="inftrees.h"/>
+ <depend name="inflate.h"/>
+ <depend name="inffast.h"/>
+ </source>
+ <source name="infback.c">
+ <depend name="zlib.h"/>
+ <depend name="zconf.h"/>
+ <depend name="zutil.h"/>
+ <depend name="inftrees.h"/>
+ <depend name="inflate.h"/>
+ <depend name="inffast.h"/>
+ </source>
+ <source name="inftrees.c">
+ <depend name="zlib.h"/>
+ <depend name="zconf.h"/>
+ <depend name="zutil.h"/>
+ <depend name="inftrees.h"/>
+ </source>
+ <source name="inffast.c">
+ <depend name="zlib.h"/>
+ <depend name="zconf.h"/>
+ <depend name="zutil.h"/>
+ <depend name="inftrees.h"/>
+ <depend name="inflate.h"/>
+ <depend name="inffast.h"/>
+ </source>
</library>
</package>
-
<!--
CFLAGS=-O
#CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7
diff --git a/java/common/pom.xml b/java/common/pom.xml
index 264bdd08..4a4c9b1c 100644
--- a/java/common/pom.xml
+++ b/java/common/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.tsfile</groupId>
<artifactId>tsfile-java</artifactId>
- <version>2.2.1-SNAPSHOT</version>
+ <version>2.2.1-sevo-SNAPSHOT</version>
</parent>
<artifactId>common</artifactId>
<name>TsFile: Java: Common</name>
diff --git a/java/examples/pom.xml b/java/examples/pom.xml
index 264b46f0..1842cef3 100644
--- a/java/examples/pom.xml
+++ b/java/examples/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.tsfile</groupId>
<artifactId>tsfile-java</artifactId>
- <version>2.2.1-SNAPSHOT</version>
+ <version>2.2.1-sevo-SNAPSHOT</version>
</parent>
<artifactId>examples</artifactId>
<name>TsFile: Java: Examples</name>
@@ -36,7 +36,7 @@
<dependency>
<groupId>org.apache.tsfile</groupId>
<artifactId>tsfile</artifactId>
- <version>2.2.1-SNAPSHOT</version>
+ <version>2.2.1-sevo-SNAPSHOT</version>
</dependency>
</dependencies>
<build>
diff --git a/java/pom.xml b/java/pom.xml
index 7587a67e..b747f7ce 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -24,10 +24,10 @@
<parent>
<groupId>org.apache.tsfile</groupId>
<artifactId>tsfile-parent</artifactId>
- <version>2.2.1-SNAPSHOT</version>
+ <version>2.2.1-sevo-SNAPSHOT</version>
</parent>
<artifactId>tsfile-java</artifactId>
- <version>2.2.1-SNAPSHOT</version>
+ <version>2.2.1-sevo-SNAPSHOT</version>
<packaging>pom</packaging>
<name>TsFile: Java</name>
<modules>
diff --git a/java/tools/pom.xml b/java/tools/pom.xml
index 42ba58b0..9918632b 100644
--- a/java/tools/pom.xml
+++ b/java/tools/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.tsfile</groupId>
<artifactId>tsfile-java</artifactId>
- <version>2.2.1-SNAPSHOT</version>
+ <version>2.2.1-sevo-SNAPSHOT</version>
</parent>
<artifactId>tools</artifactId>
<name>TsFile: Java: Tools</name>
@@ -32,7 +32,7 @@
<dependency>
<groupId>org.apache.tsfile</groupId>
<artifactId>common</artifactId>
- <version>2.2.1-SNAPSHOT</version>
+ <version>2.2.1-sevo-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>commons-cli</groupId>
@@ -42,7 +42,7 @@
<dependency>
<groupId>org.apache.tsfile</groupId>
<artifactId>tsfile</artifactId>
- <version>2.2.1-SNAPSHOT</version>
+ <version>2.2.1-sevo-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
diff --git a/java/tsfile/pom.xml b/java/tsfile/pom.xml
index a3d919f2..07a609d3 100644
--- a/java/tsfile/pom.xml
+++ b/java/tsfile/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.tsfile</groupId>
<artifactId>tsfile-java</artifactId>
- <version>2.2.1-SNAPSHOT</version>
+ <version>2.2.1-sevo-SNAPSHOT</version>
</parent>
<artifactId>tsfile</artifactId>
<name>TsFile: Java: TsFile</name>
@@ -38,7 +38,7 @@
<dependency>
<groupId>org.apache.tsfile</groupId>
<artifactId>common</artifactId>
- <version>2.2.1-SNAPSHOT</version>
+ <version>2.2.1-sevo-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.github.luben</groupId>
diff --git a/pom.xml b/pom.xml
index cb06548b..2083802f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
</parent>
<groupId>org.apache.tsfile</groupId>
<artifactId>tsfile-parent</artifactId>
- <version>2.2.1-SNAPSHOT</version>
+ <version>2.2.1-sevo-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache TsFile Project Parent POM</name>
<properties>
diff --git a/python/pom.xml b/python/pom.xml
index 7a39fc7a..fe3e4471 100644
--- a/python/pom.xml
+++ b/python/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.tsfile</groupId>
<artifactId>tsfile-parent</artifactId>
- <version>2.2.1-SNAPSHOT</version>
+ <version>2.2.1-sevo-SNAPSHOT</version>
</parent>
<artifactId>tsfile-python</artifactId>
<packaging>pom</packaging>
(tsfile) 06/09: Add support for schema evolution
Posted by ji...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jiangtian pushed a commit to branch sevo_support
in repository https://gitbox.apache.org/repos/asf/tsfile.git
commit 6f2ed71616d5253c4be22db54f44a9134380877c
Author: Tian Jiang <jt...@163.com>
AuthorDate: Tue Jan 13 14:49:04 2026 +0800
Add support for schema evolution
---
.../apache/tsfile/file/metadata/AbstractAlignedChunkMetadata.java | 5 +++++
.../src/main/java/org/apache/tsfile/file/metadata/ChunkMetadata.java | 5 +++++
.../main/java/org/apache/tsfile/file/metadata/IChunkMetadata.java | 2 ++
3 files changed, 12 insertions(+)
diff --git a/java/tsfile/src/main/java/org/apache/tsfile/file/metadata/AbstractAlignedChunkMetadata.java b/java/tsfile/src/main/java/org/apache/tsfile/file/metadata/AbstractAlignedChunkMetadata.java
index e195b114..52a1913c 100644
--- a/java/tsfile/src/main/java/org/apache/tsfile/file/metadata/AbstractAlignedChunkMetadata.java
+++ b/java/tsfile/src/main/java/org/apache/tsfile/file/metadata/AbstractAlignedChunkMetadata.java
@@ -177,6 +177,11 @@ public abstract class AbstractAlignedChunkMetadata implements IChunkMetadata {
return timeChunkMetadata.getMeasurementUid();
}
+ @Override
+ public void setMeasurementUid(String measurementUid) {
+ throw new UnsupportedOperationException();
+ }
+
@Override
public void insertIntoSortedDeletions(TimeRange timeRange) {
throw new UnsupportedOperationException();
diff --git a/java/tsfile/src/main/java/org/apache/tsfile/file/metadata/ChunkMetadata.java b/java/tsfile/src/main/java/org/apache/tsfile/file/metadata/ChunkMetadata.java
index 653a8991..a76ef65c 100644
--- a/java/tsfile/src/main/java/org/apache/tsfile/file/metadata/ChunkMetadata.java
+++ b/java/tsfile/src/main/java/org/apache/tsfile/file/metadata/ChunkMetadata.java
@@ -153,6 +153,11 @@ public class ChunkMetadata implements IChunkMetadata {
return measurementUid;
}
+ @Override
+ public void setMeasurementUid(String measurementUid) {
+ this.measurementUid = measurementUid;
+ }
+
@Override
public Statistics<? extends Serializable> getStatistics() {
return statistics;
diff --git a/java/tsfile/src/main/java/org/apache/tsfile/file/metadata/IChunkMetadata.java b/java/tsfile/src/main/java/org/apache/tsfile/file/metadata/IChunkMetadata.java
index e29e7147..f391ed7f 100644
--- a/java/tsfile/src/main/java/org/apache/tsfile/file/metadata/IChunkMetadata.java
+++ b/java/tsfile/src/main/java/org/apache/tsfile/file/metadata/IChunkMetadata.java
@@ -63,6 +63,8 @@ public interface IChunkMetadata extends IMetadata {
String getMeasurementUid();
+ void setMeasurementUid(String measurementUid);
+
void insertIntoSortedDeletions(TimeRange timeRange);
List<TimeRange> getDeleteIntervalList();
(tsfile) 02/09: spotless
Posted by ji...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jiangtian pushed a commit to branch sevo_support
in repository https://gitbox.apache.org/repos/asf/tsfile.git
commit d71552b94a0fb7794541ca2af04ec56cbe05a4d3
Author: Tian Jiang <jt...@163.com>
AuthorDate: Sun Jan 4 16:07:41 2026 +0800
spotless
---
.../tsfile/write/chunk/AlignedChunkWriterImpl.java | 7 ++++---
.../apache/tsfile/write/chunk/ChunkWriterImpl.java | 21 +++++++++++++--------
.../org/apache/tsfile/write/chunk/IChunkWriter.java | 6 ++++--
.../apache/tsfile/write/chunk/ValueChunkWriter.java | 16 ++++++++++------
4 files changed, 31 insertions(+), 19 deletions(-)
diff --git a/java/tsfile/src/main/java/org/apache/tsfile/write/chunk/AlignedChunkWriterImpl.java b/java/tsfile/src/main/java/org/apache/tsfile/write/chunk/AlignedChunkWriterImpl.java
index 08ae5753..fa3cb348 100644
--- a/java/tsfile/src/main/java/org/apache/tsfile/write/chunk/AlignedChunkWriterImpl.java
+++ b/java/tsfile/src/main/java/org/apache/tsfile/write/chunk/AlignedChunkWriterImpl.java
@@ -18,7 +18,6 @@
*/
package org.apache.tsfile.write.chunk;
-import java.util.function.Function;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.common.conf.TSFileDescriptor;
import org.apache.tsfile.encoding.encoder.Encoder;
@@ -42,6 +41,7 @@ import java.nio.ByteBuffer;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.List;
+import java.util.function.Function;
public class AlignedChunkWriterImpl implements IChunkWriter {
@@ -479,8 +479,9 @@ public class AlignedChunkWriterImpl implements IChunkWriter {
}
@Override
- public void writeToFileWriter(TsFileIOWriter tsfileWriter,
- Function<String, String> measurementNameRemapper) throws IOException {
+ public void writeToFileWriter(
+ TsFileIOWriter tsfileWriter, Function<String, String> measurementNameRemapper)
+ throws IOException {
timeChunkWriter.writeToFileWriter(tsfileWriter);
for (ValueChunkWriter valueChunkWriter : valueChunkWriterList) {
valueChunkWriter.writeToFileWriter(tsfileWriter, measurementNameRemapper);
diff --git a/java/tsfile/src/main/java/org/apache/tsfile/write/chunk/ChunkWriterImpl.java b/java/tsfile/src/main/java/org/apache/tsfile/write/chunk/ChunkWriterImpl.java
index d450b373..74205436 100644
--- a/java/tsfile/src/main/java/org/apache/tsfile/write/chunk/ChunkWriterImpl.java
+++ b/java/tsfile/src/main/java/org/apache/tsfile/write/chunk/ChunkWriterImpl.java
@@ -18,7 +18,6 @@
*/
package org.apache.tsfile.write.chunk;
-import java.util.function.Function;
import org.apache.tsfile.common.conf.TSFileDescriptor;
import org.apache.tsfile.compress.ICompressor;
import org.apache.tsfile.encoding.encoder.SDTEncoder;
@@ -44,6 +43,7 @@ import java.io.Serializable;
import java.nio.ByteBuffer;
import java.nio.channels.Channels;
import java.nio.channels.WritableByteChannel;
+import java.util.function.Function;
public class ChunkWriterImpl implements IChunkWriter {
@@ -351,8 +351,9 @@ public class ChunkWriterImpl implements IChunkWriter {
}
@Override
- public void writeToFileWriter(TsFileIOWriter tsfileWriter,
- Function<String, String> measurementNameRemapper) throws IOException {
+ public void writeToFileWriter(
+ TsFileIOWriter tsfileWriter, Function<String, String> measurementNameRemapper)
+ throws IOException {
sealCurrentPage();
writeAllPagesOfChunkToTsFile(tsfileWriter, statistics, measurementNameRemapper);
@@ -479,21 +480,25 @@ public class ChunkWriterImpl implements IChunkWriter {
/**
* write the page to specified IOWriter.
*
- * @param writer the specified IOWriter
- * @param statistics the chunk statistics
+ * @param writer the specified IOWriter
+ * @param statistics the chunk statistics
* @param measurementNameRemapper
* @throws IOException exception in IO
*/
private void writeAllPagesOfChunkToTsFile(
- TsFileIOWriter writer, Statistics<? extends Serializable> statistics,
- Function<String, String> measurementNameRemapper) throws IOException {
+ TsFileIOWriter writer,
+ Statistics<? extends Serializable> statistics,
+ Function<String, String> measurementNameRemapper)
+ throws IOException {
if (statistics.getCount() == 0) {
return;
}
// start to write this column chunk
writer.startFlushChunk(
- measurementNameRemapper == null ? measurementSchema.getMeasurementName() : measurementNameRemapper.apply(measurementSchema.getMeasurementName()),
+ measurementNameRemapper == null
+ ? measurementSchema.getMeasurementName()
+ : measurementNameRemapper.apply(measurementSchema.getMeasurementName()),
compressor.getType(),
measurementSchema.getType(),
measurementSchema.getEncodingType(),
diff --git a/java/tsfile/src/main/java/org/apache/tsfile/write/chunk/IChunkWriter.java b/java/tsfile/src/main/java/org/apache/tsfile/write/chunk/IChunkWriter.java
index 11304073..4a198841 100644
--- a/java/tsfile/src/main/java/org/apache/tsfile/write/chunk/IChunkWriter.java
+++ b/java/tsfile/src/main/java/org/apache/tsfile/write/chunk/IChunkWriter.java
@@ -18,10 +18,10 @@
*/
package org.apache.tsfile.write.chunk;
-import java.util.function.Function;
import org.apache.tsfile.write.writer.TsFileIOWriter;
import java.io.IOException;
+import java.util.function.Function;
/** IChunkWriter provides a list of writing methods for different value types. */
public interface IChunkWriter {
@@ -32,7 +32,9 @@ public interface IChunkWriter {
/**
* flush data to TsFileIOWriter, may rename the measurement in the file according to the remapper.
*/
- void writeToFileWriter(TsFileIOWriter tsfileWriter, Function<String, String> measurementNameRemapper) throws IOException;
+ void writeToFileWriter(
+ TsFileIOWriter tsfileWriter, Function<String, String> measurementNameRemapper)
+ throws IOException;
/** estimate memory usage of this series. */
long estimateMaxSeriesMemSize();
diff --git a/java/tsfile/src/main/java/org/apache/tsfile/write/chunk/ValueChunkWriter.java b/java/tsfile/src/main/java/org/apache/tsfile/write/chunk/ValueChunkWriter.java
index a778f741..31ab3f6c 100644
--- a/java/tsfile/src/main/java/org/apache/tsfile/write/chunk/ValueChunkWriter.java
+++ b/java/tsfile/src/main/java/org/apache/tsfile/write/chunk/ValueChunkWriter.java
@@ -18,7 +18,6 @@
*/
package org.apache.tsfile.write.chunk;
-import java.util.function.Function;
import org.apache.tsfile.common.conf.TSFileDescriptor;
import org.apache.tsfile.common.constant.TsFileConstant;
import org.apache.tsfile.compress.ICompressor;
@@ -46,6 +45,7 @@ import java.io.Serializable;
import java.nio.ByteBuffer;
import java.nio.channels.Channels;
import java.nio.channels.WritableByteChannel;
+import java.util.function.Function;
public class ValueChunkWriter {
@@ -299,8 +299,9 @@ public class ValueChunkWriter {
writeToFileWriter(tsfileWriter, null);
}
- public void writeToFileWriter(TsFileIOWriter tsfileWriter,
- Function<String, String> measurementNameRemapper) throws IOException {
+ public void writeToFileWriter(
+ TsFileIOWriter tsfileWriter, Function<String, String> measurementNameRemapper)
+ throws IOException {
sealCurrentPage();
writeAllPagesOfChunkToTsFile(tsfileWriter, measurementNameRemapper);
@@ -391,9 +392,12 @@ public class ValueChunkWriter {
* @param writer the specified IOWriter
* @throws IOException exception in IO
*/
- public void writeAllPagesOfChunkToTsFile(TsFileIOWriter writer,
- Function<String, String> measurementNameRemapper) throws IOException {
- String finalMeasurementId = measurementNameRemapper == null ? measurementId : measurementNameRemapper.apply(measurementId);
+ public void writeAllPagesOfChunkToTsFile(
+ TsFileIOWriter writer, Function<String, String> measurementNameRemapper) throws IOException {
+ String finalMeasurementId =
+ measurementNameRemapper == null
+ ? measurementId
+ : measurementNameRemapper.apply(measurementId);
if (statistics.getCount() == 0) {
if (pageBuffer.size() == 0) {
return;
(tsfile) 08/09: Merge branch 'develop' into sevo_support
Posted by ji...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jiangtian pushed a commit to branch sevo_support
in repository https://gitbox.apache.org/repos/asf/tsfile.git
commit 5689b6662d03436498ef3910c44dd5cdbedf32d9
Merge: 5f190ead 58c9262a
Author: Tian Jiang <jt...@163.com>
AuthorDate: Wed Jan 28 12:04:10 2026 +0800
Merge branch 'develop' into sevo_support
.../org/apache/tsfile/enums/ColumnCategory.java | 3 +-
.../java/org/apache/tsfile/enums/TSDataType.java | 4 ++
.../tsfile/file/metadata/TimeseriesMetadata.java | 2 +-
.../read/common/block/column/IntColumnBuilder.java | 4 ++
.../read/common/block/column/TsBlockSerde.java | 6 +++
.../org/apache/tsfile/write/record/Tablet.java | 9 ++--
.../org/apache/tsfile/write/record/TabletTest.java | 51 ++++++++++++++++++++++
python/requirements.txt | 2 +-
8 files changed, 75 insertions(+), 6 deletions(-)
(tsfile) 07/09: Merge branch 'develop' into sevo_support_internal
Posted by ji...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jiangtian pushed a commit to branch sevo_support
in repository https://gitbox.apache.org/repos/asf/tsfile.git
commit 5f190eadd04b59d8056719750c6ccf27e7281ff3
Merge: 6f2ed716 b584a335
Author: Tian Jiang <jt...@163.com>
AuthorDate: Tue Jan 13 17:20:28 2026 +0800
Merge branch 'develop' into sevo_support_internal
.../tsfile/read/common/block/column/IntColumn.java | 4 +
.../apache/tsfile/write/writer/TsFileIOWriter.java | 2 +
.../write/writer/tsmiterator/DiskTSMIterator.java | 5 +-
.../TsFileIOWriterFlushTempChunkMetadataTest.java | 154 +++++++++++++++++++++
4 files changed, 164 insertions(+), 1 deletion(-)