From 0651c778100a19e679a9cd56c4763ca19630e7ad Mon Sep 17 00:00:00 2001 From: Ping Xiao Date: Wed, 24 Jun 2020 13:01:16 +0800 Subject: [PATCH] TD-754: automatically build taosd before running jdbc tests --- src/connector/jdbc/buildTDengine.sh | 44 +++++++++++++++++++ .../com/taosdata/jdbc/AsyncSubscribeTest.java | 2 +- .../test/java/com/taosdata/jdbc/BaseTest.java | 27 ++++++++++++ .../com/taosdata/jdbc/ConnectionTest.java | 2 +- .../taosdata/jdbc/DatabaseMetaDataTest.java | 2 +- .../java/com/taosdata/jdbc/ImportTest.java | 2 +- .../taosdata/jdbc/PreparedStatementTest.java | 2 +- .../java/com/taosdata/jdbc/ResultSetTest.java | 2 +- .../java/com/taosdata/jdbc/SelectTest.java | 2 +- .../java/com/taosdata/jdbc/StableTest.java | 2 +- .../java/com/taosdata/jdbc/StatementTest.java | 2 +- .../java/com/taosdata/jdbc/SubscribeTest.java | 2 +- 12 files changed, 81 insertions(+), 10 deletions(-) create mode 100755 src/connector/jdbc/buildTDengine.sh create mode 100644 src/connector/jdbc/src/test/java/com/taosdata/jdbc/BaseTest.java diff --git a/src/connector/jdbc/buildTDengine.sh b/src/connector/jdbc/buildTDengine.sh new file mode 100755 index 0000000000..cf98215c85 --- /dev/null +++ b/src/connector/jdbc/buildTDengine.sh @@ -0,0 +1,44 @@ +#!/bin/bash +ulimit -c unlimited + +function buildTDengine { + cd /root/TDengine + + git remote update + REMOTE_COMMIT=`git rev-parse --short remotes/origin/develop` + LOCAL_COMMIT=`git rev-parse --short @` + + echo " LOCAL: $LOCAL_COMMIT" + echo "REMOTE: $REMOTE_COMMIT" + if [ "$LOCAL_COMMIT" == "$REMOTE_COMMIT" ]; then + echo "repo up-to-date" + else + echo "repo need to pull" + git pull + + LOCAL_COMMIT=`git rev-parse --short @` + cd /root/TDengine/debug + rm -rf /root/TDengine/debug/* + cmake .. + make > /dev/null + make install + fi +} + +function restartTaosd { + systemctl stop taosd + pkill -KILL -x taosd + sleep 10 + + logDir=`grep 'logDir' /etc/taos/taos.cfg|awk 'END{print $2}'` + dataDir=`grep 'dataDir' /etc/taos/taos.cfg|awk '{print $2}'` + + rm -rf $logDir/* + rm -rf $dataDir/* + + taosd 2>&1 > /dev/null & + sleep 10 +} + +buildTDengine +restartTaosd diff --git a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/AsyncSubscribeTest.java b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/AsyncSubscribeTest.java index 98b0d38b8d..7f2314d295 100644 --- a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/AsyncSubscribeTest.java +++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/AsyncSubscribeTest.java @@ -12,7 +12,7 @@ import java.util.Properties; import static org.junit.Assert.assertTrue; -public class AsyncSubscribeTest { +public class AsyncSubscribeTest extends BaseTest { Connection connection = null; Statement statement = null; String dbName = "test"; diff --git a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/BaseTest.java b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/BaseTest.java new file mode 100644 index 0000000000..fd9ab49c49 --- /dev/null +++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/BaseTest.java @@ -0,0 +1,27 @@ +package com.taosdata.jdbc; + +import java.io.BufferedReader; +import java.io.InputStreamReader; + +import org.junit.BeforeClass; + +public class BaseTest { + + @BeforeClass + public static void setupEnv() { + try{ + String path = System.getProperty("user.dir"); + String bashPath = path + "/buildTDengine.sh"; + + Process ps = Runtime.getRuntime().exec(bashPath); + ps.waitFor(); + + BufferedReader br = new BufferedReader(new InputStreamReader(ps.getInputStream())); + while(br.readLine() != null) { + System.out.println(br.readLine()); + } + } catch (Exception e) { + e.printStackTrace(); + } + } +} \ No newline at end of file diff --git a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/ConnectionTest.java b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/ConnectionTest.java index 5e5dabfe81..3fc8913ca3 100644 --- a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/ConnectionTest.java +++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/ConnectionTest.java @@ -10,7 +10,7 @@ import java.util.Properties; import static org.junit.Assert.assertTrue; -public class ConnectionTest { +public class ConnectionTest extends BaseTest { static Connection connection = null; static Statement statement = null; static String dbName = "test"; diff --git a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/DatabaseMetaDataTest.java b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/DatabaseMetaDataTest.java index 20ebc093ec..4c4d56020d 100644 --- a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/DatabaseMetaDataTest.java +++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/DatabaseMetaDataTest.java @@ -7,7 +7,7 @@ import org.junit.Test; import java.sql.*; import java.util.Properties; -public class DatabaseMetaDataTest { +public class DatabaseMetaDataTest extends BaseTest { static Connection connection = null; static PreparedStatement statement = null; static String dbName = "test"; diff --git a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/ImportTest.java b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/ImportTest.java index b42d46aefe..016eff1a35 100644 --- a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/ImportTest.java +++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/ImportTest.java @@ -9,7 +9,7 @@ import java.util.Properties; import static org.junit.Assert.assertEquals; -public class ImportTest { +public class ImportTest extends BaseTest { Connection connection = null; Statement statement = null; String dbName = "test"; diff --git a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/PreparedStatementTest.java b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/PreparedStatementTest.java index 4c49727a7f..d391771269 100644 --- a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/PreparedStatementTest.java +++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/PreparedStatementTest.java @@ -13,7 +13,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @FixMethodOrder(MethodSorters.DEFAULT) -public class PreparedStatementTest { +public class PreparedStatementTest extends BaseTest { static Connection connection = null; static PreparedStatement statement = null; static String dbName = "test"; diff --git a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/ResultSetTest.java b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/ResultSetTest.java index 2b74a98db2..5d86840ec3 100644 --- a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/ResultSetTest.java +++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/ResultSetTest.java @@ -13,7 +13,7 @@ import java.util.Properties; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -public class ResultSetTest { +public class ResultSetTest extends BaseTest { static Connection connection = null; static Statement statement = null; static String dbName = "test"; diff --git a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/SelectTest.java b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/SelectTest.java index 282ca6c1a7..de21cc6195 100644 --- a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/SelectTest.java +++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/SelectTest.java @@ -9,7 +9,7 @@ import java.util.Properties; import static org.junit.Assert.assertEquals; -public class SelectTest { +public class SelectTest extends BaseTest { Connection connection = null; Statement statement = null; String dbName = "test"; diff --git a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/StableTest.java b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/StableTest.java index b275112e18..c1321d08fc 100644 --- a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/StableTest.java +++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/StableTest.java @@ -12,7 +12,7 @@ import java.util.Properties; import static org.junit.Assert.assertEquals; @FixMethodOrder(MethodSorters.NAME_ASCENDING) -public class StableTest { +public class StableTest extends BaseTest { static Connection connection = null; static Statement statement = null; static String dbName = "test"; diff --git a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/StatementTest.java b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/StatementTest.java index 4be68519c5..4fe5c39486 100644 --- a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/StatementTest.java +++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/StatementTest.java @@ -10,7 +10,7 @@ import java.util.Properties; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -public class StatementTest { +public class StatementTest extends BaseTest { static Connection connection = null; static Statement statement = null; static String dbName = "test"; diff --git a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/SubscribeTest.java b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/SubscribeTest.java index 25f7f7a285..58e93fbc7f 100644 --- a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/SubscribeTest.java +++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/SubscribeTest.java @@ -12,7 +12,7 @@ import java.util.Properties; import static org.junit.Assert.assertTrue; -public class SubscribeTest { +public class SubscribeTest extends BaseTest { Connection connection = null; Statement statement = null; String dbName = "test";