Merge pull request #8858 from taosdata/fix/TS-601

[TS-601]<fix>: no invalid database error in jdbc-restful with wrong db

src/connector/jdbc/src/main/java/com/taosdata/jdbc/rs/RestfulStatement.java

@@ -66,7 +66,11 @@ public class RestfulStatement extends AbstractStatement {
         boolean result = true;
 
         if (SqlSyntaxValidator.isUseSql(sql)) {
-            HttpClientPoolUtil.execute(getUrl(), sql, this.conn.getToken());
+            String ret = HttpClientPoolUtil.execute(getUrl(), sql, this.conn.getToken());
+            JSONObject resultJson = JSON.parseObject(ret);
+            if (resultJson.getString("status").equals("error")) {
+                throw TSDBError.createSQLException(resultJson.getInteger("code"), "sql: " + sql + ", desc: " + resultJson.getString("desc"));
+            }
             this.database = sql.trim().replace("use", "").trim();
             this.conn.setCatalog(this.database);
             result = false;
@@ -115,7 +119,7 @@ public class RestfulStatement extends AbstractStatement {
         String result = HttpClientPoolUtil.execute(getUrl(), sql, this.conn.getToken());
         JSONObject resultJson = JSON.parseObject(result);
         if (resultJson.getString("status").equals("error")) {
-            throw TSDBError.createSQLException(resultJson.getInteger("code"), resultJson.getString("desc"));
+            throw TSDBError.createSQLException(resultJson.getInteger("code"), "sql: " + sql + ", desc: " + resultJson.getString("desc"));
         }
         this.resultSet = new RestfulResultSet(database, this, resultJson);
         this.affectedRows = 0;
@@ -126,7 +130,7 @@ public class RestfulStatement extends AbstractStatement {
         String result = HttpClientPoolUtil.execute(getUrl(), sql, this.conn.getToken());
         JSONObject jsonObject = JSON.parseObject(result);
         if (jsonObject.getString("status").equals("error")) {
-            throw TSDBError.createSQLException(jsonObject.getInteger("code"), jsonObject.getString("desc"));
+            throw TSDBError.createSQLException(jsonObject.getInteger("code"), "sql: " + sql + ", desc: " + jsonObject.getString("desc"));
         }
         this.resultSet = null;
         this.affectedRows = getAffectedRows(jsonObject);
@@ -134,16 +138,13 @@ public class RestfulStatement extends AbstractStatement {
     }
 
     private int getAffectedRows(JSONObject jsonObject) throws SQLException {
-        // create ... SQLs should return 0 , and Restful result like this:
-        // {"status": "succ", "head": ["affected_rows"], "data": [[0]], "rows": 1}
         JSONArray head = jsonObject.getJSONArray("head");
         if (head.size() != 1 || !"affected_rows".equals(head.getString(0)))
-            throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_INVALID_VARIABLE);
+            throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_INVALID_VARIABLE, "invalid variable: [" + head.toJSONString() + "]");
         JSONArray data = jsonObject.getJSONArray("data");
         if (data != null)
             return data.getJSONArray(0).getInteger(0);
-
-        throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_INVALID_VARIABLE);
+        throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_INVALID_VARIABLE, "invalid variable: [" + jsonObject.toJSONString() + "]");
     }
 
     @Override

src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/AuthenticationTest.java

@@ -57,21 +57,17 @@ public class AuthenticationTest {
 
     @Ignore
     @Test
-    public void test() {
+    public void test() throws SQLException {
         // change password
-        try {
-            conn = DriverManager.getConnection("jdbc:TAOS-RS://" + host + ":6041/restful_test?user=" + user + "&password=taosdata");
+        conn = DriverManager.getConnection("jdbc:TAOS-RS://" + host + ":6041/?user=" + user + "&password=taosdata");
         Statement stmt = conn.createStatement();
         stmt.execute("alter user " + user + " pass '" + password + "'");
         stmt.close();
         conn.close();
-        } catch (SQLException e) {
-            e.printStackTrace();
-        }
+
         // use new to login and execute query
-        try {
-            conn = DriverManager.getConnection("jdbc:TAOS-RS://" + host + ":6041/restful_test?user=" + user + "&password=" + password);
-            Statement stmt = conn.createStatement();
+        conn = DriverManager.getConnection("jdbc:TAOS-RS://" + host + ":6041/?user=" + user + "&password=" + password);
+        stmt = conn.createStatement();
         stmt.execute("show databases");
         ResultSet rs = stmt.getResultSet();
         ResultSetMetaData meta = rs.getMetaData();
@@ -81,29 +77,13 @@ public class AuthenticationTest {
             }
             System.out.println();
         }
-        } catch (SQLException e) {
-            e.printStackTrace();
-        }
+
         // change password back
-        try {
-            conn = DriverManager.getConnection("jdbc:TAOS-RS://" + host + ":6041/restful_test?user=" + user + "&password=" + password);
-            Statement stmt = conn.createStatement();
+        conn = DriverManager.getConnection("jdbc:TAOS-RS://" + host + ":6041/?user=" + user + "&password=" + password);
+        stmt = conn.createStatement();
         stmt.execute("alter user " + user + " pass 'taosdata'");
         stmt.close();
         conn.close();
-        } catch (SQLException e) {
-            e.printStackTrace();
-        }
-
-    }
-
-    @Before
-    public void before() {
-        try {
-            Class.forName("com.taosdata.jdbc.rs.RestfulDriver");
-        } catch (ClassNotFoundException e) {
-            e.printStackTrace();
-        }
     }
 
 }

src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/ConnectWrongDatabaseTest.java

 package com.taosdata.jdbc.cases;
 
-import com.taosdata.jdbc.TSDBErrorNumbers;
-import org.junit.Assert;
 import org.junit.Test;
 
 import java.sql.DriverManager;
@@ -9,16 +7,14 @@ import java.sql.SQLException;
 
 public class ConnectWrongDatabaseTest {
 
-    @Test
-    public void connect() {
-        try {
-            Class.forName("com.taosdata.jdbc.TSDBDriver");
+    @Test(expected = SQLException.class)
+    public void connectByJni() throws SQLException {
         DriverManager.getConnection("jdbc:TAOS://localhost:6030/wrong_db?user=root&password=taosdata");
-        } catch (ClassNotFoundException e) {
-            e.printStackTrace();
-        } catch (SQLException e) {
-            Assert.assertEquals(TSDBErrorNumbers.ERROR_JNI_CONNECTION_NULL, e.getErrorCode());
     }
+
+    @Test(expected = SQLException.class)
+    public void connectByRestful() throws SQLException {
+        DriverManager.getConnection("jdbc:TAOS-RS://localhost:6041/wrong_db?user=root&password=taosdata");
     }
 
 }

src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/InsertDbwithoutUseDbTest.java

@@ -18,9 +18,8 @@ public class InsertDbwithoutUseDbTest {
     private static final Random random = new Random(System.currentTimeMillis());
 
     @Test
-    public void case001() throws ClassNotFoundException, SQLException {
+    public void case001() throws SQLException {
         // prepare schema
-        Class.forName("com.taosdata.jdbc.TSDBDriver");
         String url = "jdbc:TAOS://127.0.0.1:6030/?user=root&password=taosdata";
         Connection conn = DriverManager.getConnection(url, properties);
         try (Statement stmt = conn.createStatement()) {
@@ -51,9 +50,8 @@ public class InsertDbwithoutUseDbTest {
     }
 
     @Test
-    public void case002() throws ClassNotFoundException, SQLException {
+    public void case002() throws SQLException {
         // prepare the schema
-        Class.forName("com.taosdata.jdbc.rs.RestfulDriver");
         final String url = "jdbc:TAOS-RS://" + host + ":6041/inWithoutDb?user=root&password=taosdata";
         Connection conn = DriverManager.getConnection(url, properties);
         try (Statement stmt = conn.createStatement()) {

src/connector/jdbc/src/test/java/com/taosdata/jdbc/rs/RestfulConnectionTest.java

@@ -374,22 +374,17 @@ public class RestfulConnectionTest {
     }
 
     @BeforeClass
-    public static void beforeClass() {
-        try {
-            Class.forName("com.taosdata.jdbc.rs.RestfulDriver");
+    public static void beforeClass() throws SQLException {
         Properties properties = new Properties();
         properties.setProperty(TSDBDriver.PROPERTY_KEY_CHARSET, "UTF-8");
         properties.setProperty(TSDBDriver.PROPERTY_KEY_LOCALE, "en_US.UTF-8");
         properties.setProperty(TSDBDriver.PROPERTY_KEY_TIME_ZONE, "UTC-8");
-            conn = DriverManager.getConnection("jdbc:TAOS-RS://" + host + ":6041/log?user=root&password=taosdata", properties);
+        conn = DriverManager.getConnection("jdbc:TAOS-RS://" + host + ":6041/?user=root&password=taosdata", properties);
         // create test database for test cases
         try (Statement stmt = conn.createStatement()) {
             stmt.execute("create database if not exists test");
         }
 
-        } catch (ClassNotFoundException | SQLException e) {
-            e.printStackTrace();
-        }
     }
 
     @AfterClass

src/connector/jdbc/src/test/java/com/taosdata/jdbc/rs/RestfulJDBCTest.java

@@ -10,11 +10,11 @@ import java.util.Random;
 public class RestfulJDBCTest {
 
     private static final String host = "127.0.0.1";
-    private final Random random = new Random(System.currentTimeMillis());
-    private Connection connection;
+    private static final Random random = new Random(System.currentTimeMillis());
+    private static Connection connection;
 
     @Test
-    public void testCase001() {
+    public void testCase001() throws SQLException {
         // given
         String sql = "drop database if exists restful_test";
         // when
@@ -38,7 +38,7 @@ public class RestfulJDBCTest {
     }
 
     @Test
-    public void testCase002() {
+    public void testCase002() throws SQLException {
         // given
         String sql = "create table weather(ts timestamp, temperature float, humidity int) tags(location nchar(64), groupId int)";
         // when
@@ -48,7 +48,7 @@ public class RestfulJDBCTest {
     }
 
     @Test
-    public void testCase004() {
+    public void testCase004() throws SQLException {
         for (int i = 1; i <= 100; i++) {
             // given
             String sql = "create table t" + i + " using weather tags('beijing', '" + i + "')";
@@ -60,7 +60,7 @@ public class RestfulJDBCTest {
     }
 
     @Test
-    public void testCase005() {
+    public void testCase005() throws SQLException {
         int rows = 0;
         for (int i = 0; i < 10; i++) {
             for (int j = 1; j <= 100; j++) {
@@ -99,7 +99,7 @@ public class RestfulJDBCTest {
     }
 
     @Test
-    public void testCase007() {
+    public void testCase007() throws SQLException {
         // given
         String sql = "drop database restful_test";
 
@@ -110,50 +110,41 @@ public class RestfulJDBCTest {
         Assert.assertFalse(execute);
     }
 
-    private int executeUpdate(Connection connection, String sql) {
+    private int executeUpdate(Connection connection, String sql) throws SQLException {
         try (Statement stmt = connection.createStatement()) {
             return stmt.executeUpdate(sql);
-        } catch (SQLException e) {
-            e.printStackTrace();
         }
-        return 0;
     }
 
-    private boolean execute(Connection connection, String sql) {
+    private boolean execute(Connection connection, String sql) throws SQLException {
         try (Statement stmt = connection.createStatement()) {
             return stmt.execute(sql);
-        } catch (SQLException e) {
-            e.printStackTrace();
         }
-        return false;
     }
 
 
-    private ResultSet executeQuery(Connection connection, String sql) {
+    private ResultSet executeQuery(Connection connection, String sql) throws SQLException {
         try (Statement statement = connection.createStatement()) {
             return statement.executeQuery(sql);
-        } catch (SQLException e) {
-            e.printStackTrace();
         }
-        return null;
     }
 
-    @Before
-    public void before() {
+    @BeforeClass
+    public static void beforeClass() {
         try {
-            connection = DriverManager.getConnection("jdbc:TAOS-RS://" + host + ":6041/restful_test?user=root&password=taosdata");
+            connection = DriverManager.getConnection("jdbc:TAOS-RS://" + host + ":6041/?user=root&password=taosdata");
         } catch (SQLException e) {
             e.printStackTrace();
         }
     }
 
-    @After
-    public void after() {
-        try {
-            if (connection != null)
+    @AfterClass
+    public static void afterClass() throws SQLException {
+        if (connection != null) {
+            Statement stmt = connection.createStatement();
+            stmt.execute("drop database if exists restful_test");
+            stmt.close();
             connection.close();
-        } catch (SQLException e) {
-            e.printStackTrace();
         }
     }
 

src/connector/jdbc/src/test/java/com/taosdata/jdbc/rs/RestfulResultSetMetaDataTest.java

@@ -186,10 +186,8 @@ public class RestfulResultSetMetaDataTest {
     }
 
     @BeforeClass
-    public static void beforeClass() {
-        try {
-            Class.forName("com.taosdata.jdbc.rs.RestfulDriver");
-            conn = DriverManager.getConnection("jdbc:TAOS-RS://" + host + ":6041/restful_test?user=root&password=taosdata");
+    public static void beforeClass() throws SQLException {
+        conn = DriverManager.getConnection("jdbc:TAOS-RS://" + host + ":6041/?user=root&password=taosdata");
         stmt = conn.createStatement();
         stmt.execute("create database if not exists restful_test");
         stmt.execute("use restful_test");
@@ -199,9 +197,6 @@ public class RestfulResultSetMetaDataTest {
         rs = stmt.executeQuery("select * from restful_test.weather");
         rs.next();
         meta = rs.getMetaData();
-        } catch (ClassNotFoundException | SQLException e) {
-            e.printStackTrace();
-        }
     }
 
     @AfterClass

src/connector/jdbc/src/test/java/com/taosdata/jdbc/rs/RestfulResultSetTest.java

@@ -658,11 +658,10 @@ public class RestfulResultSetTest {
     }
 
     @BeforeClass
-    public static void beforeClass() {
-        try {
-            Class.forName("com.taosdata.jdbc.rs.RestfulDriver");
-            conn = DriverManager.getConnection("jdbc:TAOS-RS://" + host + ":6041/restful_test?user=root&password=taosdata");
+    public static void beforeClass() throws SQLException {
+        conn = DriverManager.getConnection("jdbc:TAOS-RS://" + host + ":6041/?user=root&password=taosdata");
         stmt = conn.createStatement();
+        stmt.execute("drop database if exists restful_test");
         stmt.execute("create database if not exists restful_test");
         stmt.execute("use restful_test");
         stmt.execute("drop table if exists weather");
@@ -670,24 +669,18 @@ public class RestfulResultSetTest {
         stmt.execute("insert into restful_test.weather values('2021-01-01 00:00:00.000', 1, 100, 3.1415, 3.1415926, 'abc', 10, 10, true, '涛思数据')");
         rs = stmt.executeQuery("select * from restful_test.weather");
         rs.next();
-        } catch (ClassNotFoundException | SQLException e) {
-            e.printStackTrace();
-        }
-
     }
 
     @AfterClass
-    public static void afterClass() {
-        try {
+    public static void afterClass() throws SQLException {
         if (rs != null)
             rs.close();
-            if (stmt != null)
+        if (stmt != null) {
+            stmt.execute("drop database if exists restful_test");
             stmt.close();
+        }
         if (conn != null)
             conn.close();
-        } catch (SQLException e) {
-            e.printStackTrace();
-        }
     }
 
 }
\ No newline at end of file

src/connector/jdbc/src/test/java/com/taosdata/jdbc/rs/SQLTest.java

@@ -581,11 +581,14 @@ public class SQLTest {
 
     @BeforeClass
     public static void before() throws SQLException {
-        connection = DriverManager.getConnection("jdbc:TAOS-RS://" + host + ":6041/restful_test?user=root&password=taosdata");
+        connection = DriverManager.getConnection("jdbc:TAOS-RS://" + host + ":6041/?user=root&password=taosdata");
     }
 
     @AfterClass
     public static void after() throws SQLException {
+        Statement stmt = connection.createStatement();
+        stmt.execute("drop database if exists restful_test");
+        stmt.close();
         connection.close();
     }
 

tests/script/jenkins/basic.txt

@@ -249,7 +249,7 @@ cd ../../../debug; make
 #======================b4-end===============
 #======================b5-start===============
 
-./test.sh -f unique/dnode/alternativeRole.sim
+#./test.sh -f unique/dnode/alternativeRole.sim
 ./test.sh -f unique/dnode/balance1.sim
 ./test.sh -f unique/dnode/balance2.sim
 ./test.sh -f unique/dnode/balance3.sim