This is an automated email from the ASF dual-hosted git repository. ericpai pushed a commit to branch bugfix/iotdb-3377 in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit dec63e978e378bc28576343c717b51bc2452bf6f Author: ericpai <[email protected]> AuthorDate: Thu Jun 2 13:09:26 2022 +0800 [IOTDB-3377] Enhance IT files code style checking --- integration-test/checkstyle.xml | 12 ++++- integration-test/import-control.xml | 9 ++-- .../org/apache/iotdb/db/it/IoTDBExampleIT.java | 14 +++--- .../iotdb/db/it/IoTDBExampleParallel1IT.java | 28 +++++------ .../iotdb/db/it/IoTDBExampleParallel2IT.java | 42 ++++++++-------- .../iotdb/db/it/IoTDBExampleParallel3IT.java | 56 +++++++++++----------- integration/checkstyle.xml | 37 +++++++++----- integration/import-control.xml | 9 ++-- .../db/engine/trigger/example/Accumulator.java | 0 .../iotdb/db/engine/trigger/example/Counter.java | 0 10 files changed, 115 insertions(+), 92 deletions(-) diff --git a/integration-test/checkstyle.xml b/integration-test/checkstyle.xml index b053b39f02..7627230356 100644 --- a/integration-test/checkstyle.xml +++ b/integration-test/checkstyle.xml @@ -1,4 +1,5 @@ -<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE module PUBLIC "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN" "https://checkstyle.org/dtds/configuration_1_3.dtd";> +<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE module PUBLIC "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN" + "https://checkstyle.org/dtds/configuration_1_3.dtd";> <!-- Licensed to the Apache Software Foundation (ASF) under one @@ -25,7 +26,8 @@ <property name="severity" value="error"/> <property name="fileExtensions" value="java"/> <module name="BeforeExecutionExclusionFileFilter"> - <property name="fileNamePattern" value="^.*([\\/]src[\\/]main|[\\/]src[\\/]test[\\/]java[\\/]org[\\/]apache[\\/]iotdb[\\/]session)[\\/].*$"/> + <property name="fileNamePattern" + value="^.*([\\/]src[\\/]main|[\\/]src[\\/]test[\\/]java[\\/]org[\\/]apache[\\/]iotdb[\\/]db[\\/]it[\\/]env)[\\/].*$"/> </module> <module name="TreeWalker"> <module name="ImportControl"> @@ -33,5 +35,11 @@ <property name="path" value="^.*IT\.java$"/> <message key="import.control.disallowed" value="{0} is not allowed to use in integration test."/> </module> + <module name="RegexpSinglelineJava"> + <property name="format" value="getResultSet\(\)"/> + <property name="ignoreComments" value="true"/> + <property name="message" + value="Statement::getResultSet is not allowed to use in integration test, please use the return value of Statement::executeQuery instead."/> + </module> </module> </module> diff --git a/integration-test/import-control.xml b/integration-test/import-control.xml index 2bf2b78799..6fd1451885 100644 --- a/integration-test/import-control.xml +++ b/integration-test/import-control.xml @@ -1,4 +1,5 @@ -<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE import-control PUBLIC "-//Checkstyle//DTD ImportControl Configuration 1.4//EN" "https://checkstyle.org/dtds/import_control_1_4.dtd";> +<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE import-control PUBLIC + "-//Checkstyle//DTD ImportControl Configuration 1.4//EN" "https://checkstyle.org/dtds/import_control_1_4.dtd";> <!-- Licensed to the Apache Software Foundation (ASF) under one @@ -17,13 +18,13 @@ under the License. --> <import-control pkg="org.apache.iotdb.db.it"> + <disallow class="java.sql.DriverManager"/> + <disallow class="javax.sql.DataSource"/> + <disallow pkg="org.apache.iotdb.jdbc.*"/> <allow pkg="java.util"/> <allow pkg="java.sql"/> <allow pkg="java.io"/> <allow pkg="org\.junit.*" regex="true"/> <allow pkg="org\.apache\.iotdb\.itbase" regex="true"/> <allow pkg="org\.apache\.iotdb\.it.*" regex="true"/> - <disallow class="java.sql.DriverManager"/> - <disallow class="javax.sql.DataSource"/> - <disallow pkg="org.apache.iotdb.jdbc.*"/> </import-control> diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBExampleIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBExampleIT.java index 8e51167e4a..cc05d5f929 100644 --- a/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBExampleIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBExampleIT.java @@ -52,13 +52,13 @@ public class IoTDBExampleIT { Statement statement = connection.createStatement()) { statement.execute("set storage group to root.sg"); - statement.executeQuery("show storage group"); - ResultSet resultSet = statement.getResultSet(); - if (resultSet.next()) { - String storageGroupPath = resultSet.getString("storage group"); - Assert.assertEquals("root.sg", storageGroupPath); - } else { - Assert.fail("This ResultSet is empty."); + try (ResultSet resultSet = statement.executeQuery("show storage group")) { + if (resultSet.next()) { + String storageGroupPath = resultSet.getString("storage group"); + Assert.assertEquals("root.sg", storageGroupPath); + } else { + Assert.fail("This ResultSet is empty."); + } } } } diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBExampleParallel1IT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBExampleParallel1IT.java index 46b691a47c..ad5249b781 100644 --- a/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBExampleParallel1IT.java +++ b/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBExampleParallel1IT.java @@ -52,13 +52,13 @@ public class IoTDBExampleParallel1IT { Statement statement = connection.createStatement()) { statement.execute("set storage group to root.sg"); - statement.executeQuery("show storage group"); - ResultSet resultSet = statement.getResultSet(); - if (resultSet.next()) { - String storageGroupPath = resultSet.getString("storage group"); - Assert.assertEquals("root.sg", storageGroupPath); - } else { - Assert.fail("This ResultSet is empty."); + try (ResultSet resultSet = statement.executeQuery("show storage group")) { + if (resultSet.next()) { + String storageGroupPath = resultSet.getString("storage group"); + Assert.assertEquals("root.sg", storageGroupPath); + } else { + Assert.fail("This ResultSet is empty."); + } } } } @@ -69,13 +69,13 @@ public class IoTDBExampleParallel1IT { Statement statement = connection.createStatement()) { statement.execute("set storage group to root.sg"); - statement.executeQuery("show storage group"); - ResultSet resultSet = statement.getResultSet(); - if (resultSet.next()) { - String storageGroupPath = resultSet.getString("storage group"); - Assert.assertEquals("root.sg", storageGroupPath); - } else { - Assert.fail("This ResultSet is empty."); + try (ResultSet resultSet = statement.executeQuery("show storage group")) { + if (resultSet.next()) { + String storageGroupPath = resultSet.getString("storage group"); + Assert.assertEquals("root.sg", storageGroupPath); + } else { + Assert.fail("This ResultSet is empty."); + } } } } diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBExampleParallel2IT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBExampleParallel2IT.java index 6a7fe8acf7..1b0b417ab2 100644 --- a/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBExampleParallel2IT.java +++ b/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBExampleParallel2IT.java @@ -52,13 +52,13 @@ public class IoTDBExampleParallel2IT { Statement statement = connection.createStatement()) { statement.execute("set storage group to root.sg"); - statement.executeQuery("show storage group"); - ResultSet resultSet = statement.getResultSet(); - if (resultSet.next()) { - String storageGroupPath = resultSet.getString("storage group"); - Assert.assertEquals("root.sg", storageGroupPath); - } else { - Assert.fail("This ResultSet is empty."); + try (ResultSet resultSet = statement.executeQuery("show storage group")) { + if (resultSet.next()) { + String storageGroupPath = resultSet.getString("storage group"); + Assert.assertEquals("root.sg", storageGroupPath); + } else { + Assert.fail("This ResultSet is empty."); + } } } } @@ -69,13 +69,13 @@ public class IoTDBExampleParallel2IT { Statement statement = connection.createStatement()) { statement.execute("set storage group to root.sg"); - statement.executeQuery("show storage group"); - ResultSet resultSet = statement.getResultSet(); - if (resultSet.next()) { - String storageGroupPath = resultSet.getString("storage group"); - Assert.assertEquals("root.sg", storageGroupPath); - } else { - Assert.fail("This ResultSet is empty."); + try (ResultSet resultSet = statement.executeQuery("show storage group")) { + if (resultSet.next()) { + String storageGroupPath = resultSet.getString("storage group"); + Assert.assertEquals("root.sg", storageGroupPath); + } else { + Assert.fail("This ResultSet is empty."); + } } } } @@ -86,13 +86,13 @@ public class IoTDBExampleParallel2IT { Statement statement = connection.createStatement()) { statement.execute("set storage group to root.sg"); - statement.executeQuery("show storage group"); - ResultSet resultSet = statement.getResultSet(); - if (resultSet.next()) { - String storageGroupPath = resultSet.getString("storage group"); - Assert.assertEquals("root.sg", storageGroupPath); - } else { - Assert.fail("This ResultSet is empty."); + try (ResultSet resultSet = statement.executeQuery("show storage group")) { + if (resultSet.next()) { + String storageGroupPath = resultSet.getString("storage group"); + Assert.assertEquals("root.sg", storageGroupPath); + } else { + Assert.fail("This ResultSet is empty."); + } } } } diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBExampleParallel3IT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBExampleParallel3IT.java index 6086b68d0f..3327be70c8 100644 --- a/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBExampleParallel3IT.java +++ b/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBExampleParallel3IT.java @@ -52,13 +52,13 @@ public class IoTDBExampleParallel3IT { Statement statement = connection.createStatement()) { statement.execute("set storage group to root.sg"); - statement.executeQuery("show storage group"); - ResultSet resultSet = statement.getResultSet(); - if (resultSet.next()) { - String storageGroupPath = resultSet.getString("storage group"); - Assert.assertEquals("root.sg", storageGroupPath); - } else { - Assert.fail("This ResultSet is empty."); + try (ResultSet resultSet = statement.executeQuery("show storage group")) { + if (resultSet.next()) { + String storageGroupPath = resultSet.getString("storage group"); + Assert.assertEquals("root.sg", storageGroupPath); + } else { + Assert.fail("This ResultSet is empty."); + } } } } @@ -69,13 +69,13 @@ public class IoTDBExampleParallel3IT { Statement statement = connection.createStatement()) { statement.execute("set storage group to root.sg"); - statement.executeQuery("show storage group"); - ResultSet resultSet = statement.getResultSet(); - if (resultSet.next()) { - String storageGroupPath = resultSet.getString("storage group"); - Assert.assertEquals("root.sg", storageGroupPath); - } else { - Assert.fail("This ResultSet is empty."); + try (ResultSet resultSet = statement.executeQuery("show storage group")) { + if (resultSet.next()) { + String storageGroupPath = resultSet.getString("storage group"); + Assert.assertEquals("root.sg", storageGroupPath); + } else { + Assert.fail("This ResultSet is empty."); + } } } } @@ -86,13 +86,13 @@ public class IoTDBExampleParallel3IT { Statement statement = connection.createStatement()) { statement.execute("set storage group to root.sg"); - statement.executeQuery("show storage group"); - ResultSet resultSet = statement.getResultSet(); - if (resultSet.next()) { - String storageGroupPath = resultSet.getString("storage group"); - Assert.assertEquals("root.sg", storageGroupPath); - } else { - Assert.fail("This ResultSet is empty."); + try (ResultSet resultSet = statement.executeQuery("show storage group")) { + if (resultSet.next()) { + String storageGroupPath = resultSet.getString("storage group"); + Assert.assertEquals("root.sg", storageGroupPath); + } else { + Assert.fail("This ResultSet is empty."); + } } } } @@ -103,13 +103,13 @@ public class IoTDBExampleParallel3IT { Statement statement = connection.createStatement()) { statement.execute("set storage group to root.sg"); - statement.executeQuery("show storage group"); - ResultSet resultSet = statement.getResultSet(); - if (resultSet.next()) { - String storageGroupPath = resultSet.getString("storage group"); - Assert.assertEquals("root.sg", storageGroupPath); - } else { - Assert.fail("This ResultSet is empty."); + try (ResultSet resultSet = statement.executeQuery("show storage group")) { + if (resultSet.next()) { + String storageGroupPath = resultSet.getString("storage group"); + Assert.assertEquals("root.sg", storageGroupPath); + } else { + Assert.fail("This ResultSet is empty."); + } } } } diff --git a/integration/checkstyle.xml b/integration/checkstyle.xml index 992df2197e..c6b4edda5f 100644 --- a/integration/checkstyle.xml +++ b/integration/checkstyle.xml @@ -1,4 +1,5 @@ -<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE module PUBLIC "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN" "https://checkstyle.org/dtds/configuration_1_3.dtd";> +<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE module PUBLIC "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN" + "https://checkstyle.org/dtds/configuration_1_3.dtd";> <!-- Licensed to the Apache Software Foundation (ASF) under one @@ -26,16 +27,7 @@ <property name="fileExtensions" value="java"/> <module name="BeforeExecutionExclusionFileFilter"> <property name="fileNamePattern" - value="^.*([\\/]src[\\/]main|[\\/]src[\\/]test[\\/]java[\\/]org[\\/]apache[\\/]iotdb[\\/]session)[\\/].*$"/> - </module> - <!-- <module name="RegexpOnFilename">--> - <!-- <property name="fileNamePattern" value="^.*IT\.java$"/>--> - <!-- <property name="match" value="false"/>--> - <!-- </module>--> - <module name="TreeWalker"> - <module name="ImportControl"> - <property name="file" value="integration/import-control.xml"/> - <property name="path" value="!( + value="(^.*([\\/]src[\\/]main|[\\/]src[\\/]test[\\/]java[\\/]org[\\/]apache[\\/]iotdb[\\/]session)[\\/].*$)| |^.*IoTDBSchemaTemplateIT\.java$| |^.*IoTDBSeriesReaderIT\.java$| |^.*IoTDBCompactionIT\.java$| @@ -195,6 +187,10 @@ |^.*IoTDBSyncReceiverLoaderIT\.java$| |^.*IoTDBSyncSenderIT\.java$| |^.*IoTDBSyncReceiverIT\.java$| + |^.*IoTDBSnapshotIT\.java$| + |^.*IoTDBTriggerForwardIT\.java$| + |^.*TransportHandlerMock\.java$| + |^.*IoTDBSyntaxConventionStringLiteralIT\.java| |^.*IoTDBSyncReceiverCollectorIT\.java$| |^.*SyncTestUtil\.java$| |^.*IoTDBUDTFBuiltinFunctionIT\.java$| @@ -211,11 +207,28 @@ |^.*IoTDBAlignedTimeSeriesCompactionIT\.java$| |^.*IoTDBRestartIT\.java$| |^.*IoTDBSyntaxConventionIT\.java$| + |^.*IoTDBSyntaxConventionIdentifierIT\.java$| + |^.*IoTDBInsertNullIT\.java$| |^.*IoTDBUDTFNonAlignQueryIT\.java$| |^.*IoTDBSetSystemReadOnlyWritableIT\.java$| |^.*IoTDBContinuousQueryIT\.java$| - |^.*IoTDBSizeTieredCompactionIT\.java$|)"/> + |^.*IoTDBSizeTieredCompactionIT\.java$"/> + </module> + <!-- <module name="RegexpOnFilename">--> + <!-- <property name="fileNamePattern" value="^.*IT\.java$"/>--> + <!-- <property name="match" value="false"/>--> + <!-- </module>--> + <module name="TreeWalker"> + <module name="ImportControl"> + <property name="file" value="integration/import-control.xml"/> + <property name="path" value="^.*\.java$"/> <message key="import.control.disallowed" value="{0} is not allowed to use in integration test."/> </module> + <module name="RegexpSinglelineJava"> + <property name="format" value="getResultSet\(\)"/> + <property name="ignoreComments" value="true"/> + <property name="message" + value="Statement::getResultSet is not allowed to use in integration test, please use the return value of Statement::executeQuery instead."/> + </module> </module> </module> diff --git a/integration/import-control.xml b/integration/import-control.xml index ba858ade6c..ec6c8cca3d 100644 --- a/integration/import-control.xml +++ b/integration/import-control.xml @@ -1,4 +1,5 @@ -<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE import-control PUBLIC "-//Checkstyle//DTD ImportControl Configuration 1.4//EN" "https://checkstyle.org/dtds/import_control_1_4.dtd";> +<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE import-control PUBLIC + "-//Checkstyle//DTD ImportControl Configuration 1.4//EN" "https://checkstyle.org/dtds/import_control_1_4.dtd";> <!-- Licensed to the Apache Software Foundation (ASF) under one @@ -17,13 +18,13 @@ under the License. --> <import-control pkg="org.apache.iotdb.db.integration"> + <disallow class="java.sql.DriverManager"/> + <disallow class="javax.sql.DataSource"/> + <disallow pkg="org.apache.iotdb.jdbc.*"/> <allow pkg="java.util"/> <allow pkg="java.sql"/> <allow pkg="java.io"/> <allow pkg="org\.junit.*" regex="true"/> <allow pkg="org\.apache\.iotdb\.itbase" regex="true"/> <allow pkg="org\.apache\.iotdb\.integration\.*" regex="true"/> - <disallow class="java.sql.DriverManager"/> - <disallow class="javax.sql.DataSource"/> - <disallow pkg="org.apache.iotdb.jdbc.*"/> </import-control> diff --git a/integration/src/test/java/org/apache/iotdb/db/engine/trigger/example/Accumulator.java b/integration/src/main/java/org/apache/iotdb/db/engine/trigger/example/Accumulator.java similarity index 100% rename from integration/src/test/java/org/apache/iotdb/db/engine/trigger/example/Accumulator.java rename to integration/src/main/java/org/apache/iotdb/db/engine/trigger/example/Accumulator.java diff --git a/integration/src/test/java/org/apache/iotdb/db/engine/trigger/example/Counter.java b/integration/src/main/java/org/apache/iotdb/db/engine/trigger/example/Counter.java similarity index 100% rename from integration/src/test/java/org/apache/iotdb/db/engine/trigger/example/Counter.java rename to integration/src/main/java/org/apache/iotdb/db/engine/trigger/example/Counter.java
