This is an automated email from the ASF dual-hosted git repository. chaow pushed a commit to branch fix_ci_bug_0621 in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit bcce4151e9586ad1935d70df3348b740dfdc72f5 Author: chaow <[email protected]> AuthorDate: Mon Jun 21 19:58:52 2021 +0800 avoiding compaction to fix ci bug --- client-cpp/pom.xml | 4 ++-- .../iotdb/cluster/log/snapshot/FileSnapshotTest.java | 20 ++++++++++++++++++++ compile-tools/pom.xml | 6 +++--- distribution/pom.xml | 2 +- example/client-cpp-example/pom.xml | 2 +- example/udf/pom.xml | 2 +- grafana/pom.xml | 2 +- jdbc/pom.xml | 2 +- pom.xml | 8 ++++---- 9 files changed, 34 insertions(+), 14 deletions(-) diff --git a/client-cpp/pom.xml b/client-cpp/pom.xml index 3963771..b8d9216 100644 --- a/client-cpp/pom.xml +++ b/client-cpp/pom.xml @@ -98,8 +98,8 @@ <cmake.root.dir>${project.parent.basedir}/compile-tools/thrift/target/cmake-${cmake-version}-win64-x64/</cmake.root.dir> <thrift.exec.absolute.path>${project.parent.basedir}/compile-tools/thrift/target/build/compiler/cpp/bin/${cmake.build.type}/thrift.exe</thrift.exec.absolute.path> <iotdb.server.script>start-server.bat</iotdb.server.script> - <boost.include.dir /> - <boost.library.dir /> + <boost.include.dir/> + <boost.library.dir/> </properties> </profile> <profile> diff --git a/cluster/src/test/java/org/apache/iotdb/cluster/log/snapshot/FileSnapshotTest.java b/cluster/src/test/java/org/apache/iotdb/cluster/log/snapshot/FileSnapshotTest.java index dc42183..6f5df74 100644 --- a/cluster/src/test/java/org/apache/iotdb/cluster/log/snapshot/FileSnapshotTest.java +++ b/cluster/src/test/java/org/apache/iotdb/cluster/log/snapshot/FileSnapshotTest.java @@ -24,14 +24,18 @@ import org.apache.iotdb.cluster.common.TestUtils; import org.apache.iotdb.cluster.config.ClusterDescriptor; import org.apache.iotdb.cluster.exception.SnapshotInstallationException; import org.apache.iotdb.cluster.partition.slot.SlotManager.SlotStatus; +import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.engine.StorageEngine; +import org.apache.iotdb.db.engine.compaction.CompactionStrategy; import org.apache.iotdb.db.engine.modification.Deletion; import org.apache.iotdb.db.engine.modification.ModificationFile; import org.apache.iotdb.db.engine.storagegroup.StorageGroupProcessor; import org.apache.iotdb.db.engine.storagegroup.TsFileResource; import org.apache.iotdb.db.exception.LoadFileException; +import org.apache.iotdb.db.exception.StartupException; import org.apache.iotdb.db.exception.StorageEngineException; import org.apache.iotdb.db.exception.metadata.IllegalPathException; +import org.apache.iotdb.db.exception.metadata.MetadataException; import org.apache.iotdb.db.metadata.PartialPath; import org.apache.iotdb.db.service.IoTDB; import org.apache.iotdb.tsfile.exception.write.WriteProcessException; @@ -52,6 +56,22 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; public class FileSnapshotTest extends DataSnapshotTest { + CompactionStrategy compactionStrategy; + + @Override + public void setUp() throws MetadataException, StartupException { + super.setUp(); + compactionStrategy = IoTDBDescriptor.getInstance().getConfig().getCompactionStrategy(); + IoTDBDescriptor.getInstance() + .getConfig() + .setCompactionStrategy(CompactionStrategy.NO_COMPACTION); + } + + @Override + public void tearDown() throws Exception { + super.tearDown(); + IoTDBDescriptor.getInstance().getConfig().setCompactionStrategy(compactionStrategy); + } @Test public void testSerialize() throws IOException, WriteProcessException { diff --git a/compile-tools/pom.xml b/compile-tools/pom.xml index 11cf1eb..37326da 100644 --- a/compile-tools/pom.xml +++ b/compile-tools/pom.xml @@ -35,7 +35,7 @@ <cmake-version>3.17.3</cmake-version> <openssl.include.dir>-Dtrue1=true1</openssl.include.dir> <bison.executable.dir>-Dtrue1=true1</bison.executable.dir> - <cmake.build.type /> + <cmake.build.type/> </properties> <modules> <module>thrift</module> @@ -114,8 +114,8 @@ <thrift.make.executable>make</thrift.make.executable> <thrift.compiler.executable>thrift.exe</thrift.compiler.executable> <gradlew.executable>gradlew.bat</gradlew.executable> - <boost.include.dir /> - <boost.library.dir /> + <boost.include.dir/> + <boost.library.dir/> </properties> </profile> </profiles> diff --git a/distribution/pom.xml b/distribution/pom.xml index 3d0ae46..00c7f80 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -29,7 +29,7 @@ </parent> <artifactId>iotdb-distribution</artifactId> <name>IoTDB Distribution</name> - <modules /> + <modules/> <build> <plugins> <plugin> diff --git a/example/client-cpp-example/pom.xml b/example/client-cpp-example/pom.xml index 703609f..5d971dd 100644 --- a/example/client-cpp-example/pom.xml +++ b/example/client-cpp-example/pom.xml @@ -69,7 +69,7 @@ <properties> <cmake.generator>Visual Studio 16 2019</cmake.generator> <cmake.root.dir>${project.parent.basedir}/../compile-tools/thrift/target/cmake-${cmake-version}-win64-x64/</cmake.root.dir> - <boost.include.dir /> + <boost.include.dir/> </properties> </profile> <profile> diff --git a/example/udf/pom.xml b/example/udf/pom.xml index 20473e4..5d7e5bd 100644 --- a/example/udf/pom.xml +++ b/example/udf/pom.xml @@ -77,7 +77,7 @@ <importOrder> <order>org.apache.iotdb,,javax,java,\#</order> </importOrder> - <removeUnusedImports /> + <removeUnusedImports/> </java> </configuration> <executions> diff --git a/grafana/pom.xml b/grafana/pom.xml index 5fe1de2..e42020a 100644 --- a/grafana/pom.xml +++ b/grafana/pom.xml @@ -170,7 +170,7 @@ <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer"> <resource>META-INF/spring.schemas</resource> </transformer> - <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" /> + <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/> <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer"> <mainClass>${start-class}</mainClass> </transformer> diff --git a/jdbc/pom.xml b/jdbc/pom.xml index 360c659..d8c68ad 100644 --- a/jdbc/pom.xml +++ b/jdbc/pom.xml @@ -198,7 +198,7 @@ </goals> </pluginExecutionFilter> <action> - <ignore /> + <ignore/> </action> </pluginExecution> </pluginExecutions> diff --git a/pom.xml b/pom.xml index 0f6234c..859301d 100644 --- a/pom.xml +++ b/pom.xml @@ -151,7 +151,7 @@ <sonar.junit.reportPaths>target/surefire-reports,target/failsafe-reports</sonar.junit.reportPaths> <!-- By default, the argLine is empty--> <gson.version>2.8.6</gson.version> - <argLine /> + <argLine/> <!-- whether enable compiling the cpp client--> <client-cpp>false</client-cpp> <!-- disable enforcer by default--> @@ -630,7 +630,7 @@ <importOrder> <order>org.apache.iotdb,,javax,java,\#</order> </importOrder> - <removeUnusedImports /> + <removeUnusedImports/> </java> </configuration> <executions> @@ -701,7 +701,7 @@ <phase>validate</phase> <configuration> <rules> - <dependencyConvergence /> + <dependencyConvergence/> </rules> </configuration> <goals> @@ -747,7 +747,7 @@ </requireJavaVersion> <!-- Disabled for now as it breaks the ability to build single modules --> <!--reactorModuleConvergence/--> - <banVulnerable implementation="org.sonatype.ossindex.maven.enforcer.BanVulnerableDependencies" /> + <banVulnerable implementation="org.sonatype.ossindex.maven.enforcer.BanVulnerableDependencies"/> </rules> </configuration> </execution>
