This is an automated email from the ASF dual-hosted git repository. jackietien pushed a commit to branch LastBug in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 9e73dfe87762660e8a5cd13dcb5d66555fca4e07 Author: JackieTien97 <[email protected]> AuthorDate: Tue Nov 23 11:33:37 2021 +0800 format code --- .../iotdb/db/query/executor/LastQueryExecutor.java | 22 ++++++++------- .../IoTDBLastQueryWithTimeFilterIT.java | 31 ++++++++++------------ 2 files changed, 26 insertions(+), 27 deletions(-) diff --git a/server/src/main/java/org/apache/iotdb/db/query/executor/LastQueryExecutor.java b/server/src/main/java/org/apache/iotdb/db/query/executor/LastQueryExecutor.java index 8d9e4fd..a5745b3 100644 --- a/server/src/main/java/org/apache/iotdb/db/query/executor/LastQueryExecutor.java +++ b/server/src/main/java/org/apache/iotdb/db/query/executor/LastQueryExecutor.java @@ -19,16 +19,6 @@ package org.apache.iotdb.db.query.executor; -import static org.apache.iotdb.db.conf.IoTDBConstant.COLUMN_TIMESERIES; -import static org.apache.iotdb.db.conf.IoTDBConstant.COLUMN_TIMESERIES_DATATYPE; -import static org.apache.iotdb.db.conf.IoTDBConstant.COLUMN_VALUE; - -import java.io.IOException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Map; -import java.util.Set; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.engine.StorageEngine; import org.apache.iotdb.db.engine.querycontext.QueryDataSource; @@ -55,9 +45,21 @@ import org.apache.iotdb.tsfile.read.filter.basic.Filter; import org.apache.iotdb.tsfile.read.query.dataset.QueryDataSet; import org.apache.iotdb.tsfile.utils.Binary; import org.apache.iotdb.tsfile.utils.Pair; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import static org.apache.iotdb.db.conf.IoTDBConstant.COLUMN_TIMESERIES; +import static org.apache.iotdb.db.conf.IoTDBConstant.COLUMN_TIMESERIES_DATATYPE; +import static org.apache.iotdb.db.conf.IoTDBConstant.COLUMN_VALUE; + public class LastQueryExecutor { private List<PartialPath> selectedSeries; diff --git a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBLastQueryWithTimeFilterIT.java b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBLastQueryWithTimeFilterIT.java index 6808933..f748f89 100644 --- a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBLastQueryWithTimeFilterIT.java +++ b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBLastQueryWithTimeFilterIT.java @@ -18,34 +18,31 @@ */ package org.apache.iotdb.db.integration; -import static org.junit.Assert.fail; - -import java.sql.Connection; -import java.sql.DriverManager; -import java.sql.ResultSet; -import java.sql.Statement; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.utils.EnvironmentUtils; import org.apache.iotdb.jdbc.Config; + import org.junit.AfterClass; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; +import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.ResultSet; +import java.sql.Statement; + +import static org.junit.Assert.fail; + public class IoTDBLastQueryWithTimeFilterIT { private static final String[] dataSet1 = - new String[] { - "INSERT INTO root.sg1.d1(timestamp,s1) " - + "values(1, 1)", - "flush" - }; + new String[] {"INSERT INTO root.sg1.d1(timestamp,s1) " + "values(1, 1)", "flush"}; private static final String TIMESEIRES_STR = "timeseries"; private static final String VALUE_STR = "value"; private static boolean enableLastCache; - @BeforeClass public static void setUp() throws Exception { EnvironmentUtils.closeStatMonitor(); @@ -66,7 +63,7 @@ public class IoTDBLastQueryWithTimeFilterIT { public void lastWithTimeFilterTest() throws Exception { try (Connection connection = - DriverManager.getConnection("jdbc:iotdb://127.0.0.1:6667/", "root", "root"); + DriverManager.getConnection("jdbc:iotdb://127.0.0.1:6667/", "root", "root"); Statement statement = connection.createStatement()) { statement.execute("select last s1 from root.sg1.d1 where time > 1"); @@ -85,10 +82,10 @@ public class IoTDBLastQueryWithTimeFilterIT { String[] retArray = new String[] { - "root.sg1.d1.s1,1.0", + "root.sg1.d1.s1,1.0", }; try (Connection connection = - DriverManager.getConnection("jdbc:iotdb://127.0.0.1:6667/", "root", "root"); + DriverManager.getConnection("jdbc:iotdb://127.0.0.1:6667/", "root", "root"); Statement statement = connection.createStatement()) { statement.execute("select last s1 from root.sg1.d1"); @@ -106,8 +103,8 @@ public class IoTDBLastQueryWithTimeFilterIT { private static void prepareData() { try (Connection connection = - DriverManager.getConnection( - Config.IOTDB_URL_PREFIX + "127.0.0.1:6667/", "root", "root"); + DriverManager.getConnection( + Config.IOTDB_URL_PREFIX + "127.0.0.1:6667/", "root", "root"); Statement statement = connection.createStatement()) { for (String sql : dataSet1) {
