You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tsfile.apache.org by ha...@apache.org on 2024/07/08 07:04:20 UTC
(tsfile) branch iotdb updated (e625bbbd -> be3489ce)
This is an automated email from the ASF dual-hosted git repository.
haonan pushed a change to branch iotdb
in repository https://gitbox.apache.org/repos/asf/tsfile.git
from e625bbbd upgrade version to 9c68a35
new 9e5574b3 Bump org.slf4j:slf4j-api from 2.0.9 to 2.0.13 (#156)
new 1f8da863 Fix encoder and decoder construction of RLBE (#162)
new be3489ce upgrade version to 1f8da86
The 3 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.
Summary of changes:
cpp/pom.xml | 2 +-
java/common/pom.xml | 2 +-
java/examples/pom.xml | 4 ++--
java/pom.xml | 6 +++---
java/tsfile/pom.xml | 4 ++--
.../java/org/apache/tsfile/encoding/decoder/Decoder.java | 3 ++-
.../apache/tsfile/encoding/encoder/TSEncodingBuilder.java | 5 ++---
.../apache/tsfile/encoding/decoder/RLBEDecoderTest.java | 14 +++++++++-----
pom.xml | 12 ++++++------
python/pom.xml | 2 +-
10 files changed, 29 insertions(+), 25 deletions(-)
(tsfile) 02/03: Fix encoder and decoder construction of RLBE (#162)
Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
haonan pushed a commit to branch iotdb
in repository https://gitbox.apache.org/repos/asf/tsfile.git
commit 1f8da86332f45c901db4f2d6730d4a792bf789cd
Author: Jiang Tian <jt...@163.com>
AuthorDate: Mon Jul 8 12:24:30 2024 +0800
Fix encoder and decoder construction of RLBE (#162)
---
.../java/org/apache/tsfile/encoding/decoder/Decoder.java | 3 ++-
.../apache/tsfile/encoding/encoder/TSEncodingBuilder.java | 5 ++---
.../apache/tsfile/encoding/decoder/RLBEDecoderTest.java | 14 +++++++++-----
pom.xml | 10 +++++-----
4 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/java/tsfile/src/main/java/org/apache/tsfile/encoding/decoder/Decoder.java b/java/tsfile/src/main/java/org/apache/tsfile/encoding/decoder/Decoder.java
index be83a285..36c3d826 100644
--- a/java/tsfile/src/main/java/org/apache/tsfile/encoding/decoder/Decoder.java
+++ b/java/tsfile/src/main/java/org/apache/tsfile/encoding/decoder/Decoder.java
@@ -171,8 +171,9 @@ public abstract class Decoder {
case TIMESTAMP:
return new LongRLBEDecoder();
case FLOAT:
+ return new FloatRLBEDecoder();
case DOUBLE:
- return new FloatDecoder(TSEncoding.valueOf(encoding.toString()), dataType);
+ return new DoubleRLBEDecoder();
default:
throw new TsFileDecodingException(String.format(ERROR_MSG, encoding, dataType));
}
diff --git a/java/tsfile/src/main/java/org/apache/tsfile/encoding/encoder/TSEncodingBuilder.java b/java/tsfile/src/main/java/org/apache/tsfile/encoding/encoder/TSEncodingBuilder.java
index 18889438..01b1daa8 100644
--- a/java/tsfile/src/main/java/org/apache/tsfile/encoding/encoder/TSEncodingBuilder.java
+++ b/java/tsfile/src/main/java/org/apache/tsfile/encoding/encoder/TSEncodingBuilder.java
@@ -342,8 +342,6 @@ public abstract class TSEncodingBuilder {
public static class RLBE extends TSEncodingBuilder {
- private int maxPointNumber = 0;
-
@Override
public Encoder getEncoder(TSDataType type) {
switch (type) {
@@ -354,8 +352,9 @@ public abstract class TSEncodingBuilder {
case TIMESTAMP:
return new LongRLBE();
case FLOAT:
+ return new FloatRLBE();
case DOUBLE:
- return new FloatEncoder(TSEncoding.RLBE, type, maxPointNumber);
+ return new DoubleRLBE();
default:
throw new UnSupportedDataTypeException("RLBE doesn't support data type: " + type);
}
diff --git a/java/tsfile/src/test/java/org/apache/tsfile/encoding/decoder/RLBEDecoderTest.java b/java/tsfile/src/test/java/org/apache/tsfile/encoding/decoder/RLBEDecoderTest.java
index cc5e1fee..c212f2a2 100644
--- a/java/tsfile/src/test/java/org/apache/tsfile/encoding/decoder/RLBEDecoderTest.java
+++ b/java/tsfile/src/test/java/org/apache/tsfile/encoding/decoder/RLBEDecoderTest.java
@@ -18,10 +18,12 @@
*/
package org.apache.tsfile.encoding.decoder;
-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.apache.tsfile.encoding.encoder.TSEncodingBuilder;
+import org.apache.tsfile.enums.TSDataType;
+import org.apache.tsfile.file.metadata.enums.TSEncoding;
import org.junit.After;
import org.junit.Before;
@@ -179,7 +181,8 @@ public class RLBEDecoderTest {
@Test
public void testDouble() throws IOException {
- Encoder encoder = new DoublePrecisionEncoderV1();
+ Encoder encoder =
+ TSEncodingBuilder.RLBE.getEncodingBuilder(TSEncoding.RLBE).getEncoder(TSDataType.DOUBLE);
ByteArrayOutputStream baos = new ByteArrayOutputStream();
double value = 7.101f;
int num = 1000;
@@ -188,7 +191,7 @@ public class RLBEDecoderTest {
}
encoder.flush(baos);
ByteBuffer buffer = ByteBuffer.wrap(baos.toByteArray());
- Decoder decoder = new DoublePrecisionDecoderV1();
+ Decoder decoder = Decoder.getDecoderByType(TSEncoding.RLBE, TSDataType.DOUBLE);
for (int i = 0; i < num; i++) {
if (decoder.hasNext(buffer)) {
assertEquals(value + 2 * i, decoder.readDouble(buffer), delta);
@@ -228,7 +231,8 @@ public class RLBEDecoderTest {
private void testDoubleLength(List<Double> valueList, boolean isDebug, int repeatCount)
throws Exception {
- Encoder encoder = new DoublePrecisionEncoderV1();
+ Encoder encoder =
+ TSEncodingBuilder.RLBE.getEncodingBuilder(TSEncoding.RLBE).getEncoder(TSDataType.DOUBLE);
ByteArrayOutputStream baos = new ByteArrayOutputStream();
for (int i = 0; i < repeatCount; i++) {
for (double value : valueList) {
@@ -240,7 +244,7 @@ public class RLBEDecoderTest {
ByteBuffer buffer = ByteBuffer.wrap(baos.toByteArray());
for (int i = 0; i < repeatCount; i++) {
- Decoder decoder = new DoublePrecisionDecoderV1();
+ Decoder decoder = Decoder.getDecoderByType(TSEncoding.RLBE, TSDataType.DOUBLE);
for (double value : valueList) {
if (decoder.hasNext(buffer)) {
double value_ = decoder.readDouble(buffer);
diff --git a/pom.xml b/pom.xml
index 7cfd21ff..f50d00be 100644
--- a/pom.xml
+++ b/pom.xml
@@ -668,7 +668,7 @@
<cmake.generator>Unix Makefiles</cmake.generator>
<python.venv.bin>venv/bin/</python.venv.bin>
<python.exe.bin>python3</python.exe.bin>
- <python.compiler.argument></python.compiler.argument>
+ <python.compiler.argument/>
</properties>
</profile>
<!-- Profile for linux amd64 (mainly AMD Processors) (Self-Enabling) -->
@@ -687,7 +687,7 @@
<cmake.generator>Unix Makefiles</cmake.generator>
<python.venv.bin>venv/bin/</python.venv.bin>
<python.exe.bin>python3</python.exe.bin>
- <python.compiler.argument></python.compiler.argument>
+ <python.compiler.argument/>
</properties>
</profile>
<!-- Profile for linux aarch64 (mainly newer Mac or Raspberry PI Processors) (Self-Enabling) -->
@@ -706,7 +706,7 @@
<cmake.generator>Unix Makefiles</cmake.generator>
<python.venv.bin>venv/bin/</python.venv.bin>
<python.exe.bin>python3</python.exe.bin>
- <python.compiler.argument></python.compiler.argument>
+ <python.compiler.argument/>
</properties>
</profile>
<!-- Profile for mac x86_64 (mainly Intel Processors) (Self-Enabling) -->
@@ -724,7 +724,7 @@
<cmake.generator>Unix Makefiles</cmake.generator>
<python.venv.bin>venv/bin/</python.venv.bin>
<python.exe.bin>python3</python.exe.bin>
- <python.compiler.argument></python.compiler.argument>
+ <python.compiler.argument/>
</properties>
</profile>
<!-- Profile for mac aarch64 (mainly AMD Processors) (Self-Enabling) -->
@@ -742,7 +742,7 @@
<cmake.generator>Unix Makefiles</cmake.generator>
<python.venv.bin>venv/bin/</python.venv.bin>
<python.exe.bin>python3</python.exe.bin>
- <python.compiler.argument></python.compiler.argument>
+ <python.compiler.argument/>
</properties>
</profile>
<!-- profile for windows x86_64 (mainly Intel Processors) (Self-Enabling) -->
(tsfile) 01/03: Bump org.slf4j:slf4j-api from 2.0.9 to 2.0.13 (#156)
Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
haonan pushed a commit to branch iotdb
in repository https://gitbox.apache.org/repos/asf/tsfile.git
commit 9e5574b38c568b0820fc7a6c9b1456b0e340b456
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Mon Jul 8 09:15:01 2024 +0800
Bump org.slf4j:slf4j-api from 2.0.9 to 2.0.13 (#156)
Bumps org.slf4j:slf4j-api from 2.0.9 to 2.0.13.
---
updated-dependencies:
- dependency-name: org.slf4j:slf4j-api
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <su...@github.com>
Co-authored-by: dependabot[bot] <49...@users.noreply.github.com>
---
java/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/pom.xml b/java/pom.xml
index bdfd55c2..033dc0b6 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -70,7 +70,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>2.0.9</version>
+ <version>2.0.13</version>
</dependency>
<dependency>
<groupId>org.antlr</groupId>
(tsfile) 03/03: upgrade version to 1f8da86
Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
haonan pushed a commit to branch iotdb
in repository https://gitbox.apache.org/repos/asf/tsfile.git
commit be3489cee9e45a120c8da9e8f6cd564a08beb6a3
Author: HTHou <hh...@outlook.com>
AuthorDate: Mon Jul 8 15:04:03 2024 +0800
upgrade version to 1f8da86
---
cpp/pom.xml | 2 +-
java/common/pom.xml | 2 +-
java/examples/pom.xml | 4 ++--
java/pom.xml | 4 ++--
java/tsfile/pom.xml | 4 ++--
pom.xml | 2 +-
python/pom.xml | 2 +-
7 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/cpp/pom.xml b/cpp/pom.xml
index 6eee4a80..bb4fa6a6 100644
--- a/cpp/pom.xml
+++ b/cpp/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.tsfile</groupId>
<artifactId>tsfile-parent</artifactId>
- <version>1.0.1-9c68a35-SNAPSHOT</version>
+ <version>1.0.1-1f8da86-SNAPSHOT</version>
</parent>
<artifactId>tsfile-cpp</artifactId>
<packaging>pom</packaging>
diff --git a/java/common/pom.xml b/java/common/pom.xml
index 2a757e55..528168fe 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>1.0.1-9c68a35-SNAPSHOT</version>
+ <version>1.0.1-1f8da86-SNAPSHOT</version>
</parent>
<artifactId>common</artifactId>
<name>TsFile: Java: Common</name>
diff --git a/java/examples/pom.xml b/java/examples/pom.xml
index 713b8cdb..62f82074 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>1.0.1-9c68a35-SNAPSHOT</version>
+ <version>1.0.1-1f8da86-SNAPSHOT</version>
</parent>
<artifactId>examples</artifactId>
<packaging>pom</packaging>
@@ -38,7 +38,7 @@
<dependency>
<groupId>org.apache.tsfile</groupId>
<artifactId>tsfile</artifactId>
- <version>1.0.1-9c68a35-SNAPSHOT</version>
+ <version>1.0.1-1f8da86-SNAPSHOT</version>
</dependency>
</dependencies>
<build>
diff --git a/java/pom.xml b/java/pom.xml
index 033dc0b6..bd3e7559 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -24,10 +24,10 @@
<parent>
<groupId>org.apache.tsfile</groupId>
<artifactId>tsfile-parent</artifactId>
- <version>1.0.1-9c68a35-SNAPSHOT</version>
+ <version>1.0.1-1f8da86-SNAPSHOT</version>
</parent>
<artifactId>tsfile-java</artifactId>
- <version>1.0.1-9c68a35-SNAPSHOT</version>
+ <version>1.0.1-1f8da86-SNAPSHOT</version>
<packaging>pom</packaging>
<name>TsFile: Java</name>
<modules>
diff --git a/java/tsfile/pom.xml b/java/tsfile/pom.xml
index c78c6791..24b607c3 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>1.0.1-9c68a35-SNAPSHOT</version>
+ <version>1.0.1-1f8da86-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>1.0.1-9c68a35-SNAPSHOT</version>
+ <version>1.0.1-1f8da86-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.github.luben</groupId>
diff --git a/pom.xml b/pom.xml
index f50d00be..e04db303 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
</parent>
<groupId>org.apache.tsfile</groupId>
<artifactId>tsfile-parent</artifactId>
- <version>1.0.1-9c68a35-SNAPSHOT</version>
+ <version>1.0.1-1f8da86-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache TsFile Project Parent POM</name>
<properties>
diff --git a/python/pom.xml b/python/pom.xml
index ae0c897c..cf1de142 100644
--- a/python/pom.xml
+++ b/python/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.tsfile</groupId>
<artifactId>tsfile-parent</artifactId>
- <version>1.0.1-9c68a35-SNAPSHOT</version>
+ <version>1.0.1-1f8da86-SNAPSHOT</version>
</parent>
<artifactId>tsfile-python</artifactId>
<packaging>pom</packaging>