You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by qi...@apache.org on 2020/06/17 03:02:01 UTC
[incubator-iotdb] branch master updated: [IOTDB-769]Fix precision
lost when using PLAIN for FLOAT/DOUBLE (#1370)
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
The following commit(s) were added to refs/heads/master by this push:
new c95584c [IOTDB-769]Fix precision lost when using PLAIN for FLOAT/DOUBLE (#1370)
c95584c is described below
commit c95584c3c16a99f08787ce83544229fde4a29b33
Author: Sail <37...@users.noreply.github.com>
AuthorDate: Wed Jun 17 11:01:52 2020 +0800
[IOTDB-769]Fix precision lost when using PLAIN for FLOAT/DOUBLE (#1370)
* fix precision lost using PLAIN for FLOAT and DOUBLE
---
.../iotdb/db/utils/datastructure/DoubleTVList.java | 2 +-
.../iotdb/db/utils/datastructure/FloatTVList.java | 2 +-
.../db/utils/datastructure/PrecisionTest.java | 125 +++++++++++++++++++++
3 files changed, 127 insertions(+), 2 deletions(-)
diff --git a/server/src/main/java/org/apache/iotdb/db/utils/datastructure/DoubleTVList.java b/server/src/main/java/org/apache/iotdb/db/utils/datastructure/DoubleTVList.java
index 94f8503..e141b75 100644
--- a/server/src/main/java/org/apache/iotdb/db/utils/datastructure/DoubleTVList.java
+++ b/server/src/main/java/org/apache/iotdb/db/utils/datastructure/DoubleTVList.java
@@ -183,7 +183,7 @@ public class DoubleTVList extends TVList {
protected TimeValuePair getTimeValuePair(int index, long time, Integer floatPrecision,
TSEncoding encoding) {
double value = getDouble(index);
- if (floatPrecision != null && !encoding.equals(TSEncoding.GORILLA)) {
+ if (encoding == TSEncoding.RLE || encoding == TSEncoding.TS_2DIFF) {
value = MathUtils.roundWithGivenPrecision(value, floatPrecision);
}
return new TimeValuePair(time, TsPrimitiveType.getByType(TSDataType.DOUBLE, value));
diff --git a/server/src/main/java/org/apache/iotdb/db/utils/datastructure/FloatTVList.java b/server/src/main/java/org/apache/iotdb/db/utils/datastructure/FloatTVList.java
index 4518227..178a4f7 100644
--- a/server/src/main/java/org/apache/iotdb/db/utils/datastructure/FloatTVList.java
+++ b/server/src/main/java/org/apache/iotdb/db/utils/datastructure/FloatTVList.java
@@ -183,7 +183,7 @@ public class FloatTVList extends TVList {
protected TimeValuePair getTimeValuePair(int index, long time, Integer floatPrecision,
TSEncoding encoding) {
float value = getFloat(index);
- if (floatPrecision != null && !encoding.equals(TSEncoding.GORILLA)) {
+ if (encoding == TSEncoding.RLE || encoding == TSEncoding.TS_2DIFF) {
value = MathUtils.roundWithGivenPrecision(value, floatPrecision);
}
return new TimeValuePair(time, TsPrimitiveType.getByType(TSDataType.FLOAT, value));
diff --git a/server/src/test/java/org/apache/iotdb/db/utils/datastructure/PrecisionTest.java b/server/src/test/java/org/apache/iotdb/db/utils/datastructure/PrecisionTest.java
new file mode 100644
index 0000000..7f0049c
--- /dev/null
+++ b/server/src/test/java/org/apache/iotdb/db/utils/datastructure/PrecisionTest.java
@@ -0,0 +1,125 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.iotdb.db.utils.datastructure;
+
+import static org.junit.Assert.assertEquals;
+
+import java.io.IOException;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import org.apache.iotdb.jdbc.Config;
+import org.junit.Test;
+
+public class PrecisionTest {
+ @Test
+ public void testDoublePrecision1() throws IOException, ClassNotFoundException {
+ Class.forName(Config.JDBC_DRIVER_NAME);
+ try(Connection connection = DriverManager
+ .getConnection(Config.IOTDB_URL_PREFIX + "127.0.0.1:6667/",
+ "root", "root");
+ Statement statement = connection.createStatement()){
+ statement.execute("SET STORAGE GROUP TO root.turbine1");
+ statement.execute("create timeseries root.turbine1.d1.s1 with datatype=DOUBLE, encoding=PLAIN, compression=SNAPPY");
+
+ statement.execute("insert into root.turbine1.d1(timestamp,s1) values(1,1.2345678);");
+
+ ResultSet resultSet = statement.executeQuery("select * from root.turbine1");
+
+ String str = "1.2345678";
+ while(resultSet.next()) {
+ assertEquals(str, resultSet.getString("root.turbine1.d1.s1"));
+ }
+ } catch (SQLException e) {
+ e.printStackTrace();
+ }
+ }
+
+ @Test
+ public void testDoublePrecision2() throws IOException, ClassNotFoundException {
+ Class.forName(Config.JDBC_DRIVER_NAME);
+ try(Connection connection = DriverManager
+ .getConnection(Config.IOTDB_URL_PREFIX + "127.0.0.1:6667/",
+ "root", "root");
+ Statement statement = connection.createStatement()){
+ statement.execute("SET STORAGE GROUP TO root.turbine1");
+ statement.execute("create timeseries root.turbine1.d1.s1 with datatype=DOUBLE, encoding=RLE, compression=SNAPPY");
+
+ statement.execute("insert into root.turbine1.d1(timestamp,s1) values(1,1.2345678);");
+
+ ResultSet resultSet = statement.executeQuery("select * from root.turbine1");
+
+ String str = "1.23";
+ while(resultSet.next()) {
+ assertEquals(str, resultSet.getDouble("root.turbine1.d1.s1"));
+ }
+ } catch (SQLException e) {
+ e.printStackTrace();
+ }
+ }
+
+ @Test
+ public void testFloatPrecision1() throws IOException, ClassNotFoundException {
+ Class.forName(Config.JDBC_DRIVER_NAME);
+ try(Connection connection = DriverManager
+ .getConnection(Config.IOTDB_URL_PREFIX + "127.0.0.1:6667/",
+ "root", "root");
+ Statement statement = connection.createStatement()){
+ statement.execute("SET STORAGE GROUP TO root.turbine1");
+ statement.execute("create timeseries root.turbine1.d1.s1 with datatype=FLOAT, encoding=PLAIN, compression=SNAPPY");
+
+ statement.execute("insert into root.turbine1.d1(timestamp,s1) values(1,1.2345678);");
+
+ ResultSet resultSet = statement.executeQuery("select * from root.turbine1");
+
+ String str = "1.2345678";
+ while(resultSet.next()) {
+ assertEquals(str, resultSet.getString("root.turbine1.d1.s1"));
+ }
+ } catch (SQLException e) {
+ e.printStackTrace();
+ }
+ }
+
+ @Test
+ public void testFloatPrecision2() throws IOException, ClassNotFoundException {
+ Class.forName(Config.JDBC_DRIVER_NAME);
+ try(Connection connection = DriverManager
+ .getConnection(Config.IOTDB_URL_PREFIX + "127.0.0.1:6667/",
+ "root", "root");
+ Statement statement = connection.createStatement()){
+ statement.execute("SET STORAGE GROUP TO root.turbine1");
+ statement.execute("create timeseries root.turbine1.d1.s1 with datatype=FLOAT, encoding=RLE, compression=SNAPPY");
+
+ statement.execute("insert into root.turbine1.d1(timestamp,s1) values(1,1.2345678);");
+
+ ResultSet resultSet = statement.executeQuery("select * from root.turbine1");
+
+ String str = "1.23";
+ while(resultSet.next()) {
+ assertEquals(str, resultSet.getString("root.turbine1.d1.s1"));
+ }
+ } catch (SQLException e) {
+ e.printStackTrace();
+ }
+ }
+
+}