From 092a2e43303ac3e8e0394ede171614ba9bac8cb3 Mon Sep 17 00:00:00 2001 From: zyyang Date: Mon, 19 Jul 2021 15:36:58 +0800 Subject: [PATCH 1/4] [TD-5388]: fix isUpdateQuery for 'reset query cache' statement --- src/client/src/tscUtil.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/client/src/tscUtil.c b/src/client/src/tscUtil.c index 6cb8e9a0de..8ac8227fd7 100644 --- a/src/client/src/tscUtil.c +++ b/src/client/src/tscUtil.c @@ -3889,7 +3889,7 @@ bool tscIsUpdateQuery(SSqlObj* pSql) { } SSqlCmd* pCmd = &pSql->cmd; - return ((pCmd->command >= TSDB_SQL_INSERT && pCmd->command <= TSDB_SQL_DROP_DNODE) || TSDB_SQL_USE_DB == pCmd->command); + return ((pCmd->command >= TSDB_SQL_INSERT && pCmd->command <= TSDB_SQL_DROP_DNODE) || TSDB_SQL_RESET_CACHE == pCmd->command || TSDB_SQL_USE_DB == pCmd->command); } char* tscGetSqlStr(SSqlObj* pSql) { From 20bb141347cd0444d75efdc5c1da92cbb6b76a3d Mon Sep 17 00:00:00 2001 From: zhaoyanggh Date: Mon, 19 Jul 2021 15:40:29 +0800 Subject: [PATCH 2/4] add test case for reset query cache using jdbc --- .../jdbc/cases/ResetQueryCacheTest.java | 53 +++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/ResetQueryCacheTest.java diff --git a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/ResetQueryCacheTest.java b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/ResetQueryCacheTest.java new file mode 100644 index 0000000000..52db8052e3 --- /dev/null +++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/ResetQueryCacheTest.java @@ -0,0 +1,53 @@ +package com.taosdata.jdbc.cases; + +import com.taosdata.jdbc.TSDBDriver; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +import java.sql.*; +import java.util.Properties; + +import static org.junit.Assert.assertEquals; + +public class ResetQueryCacheTest { + + static Connection connection; + static Statement statement; + static String host = "127.0.0.1"; + + @Before + public void init() { + try { + 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"); + connection = DriverManager.getConnection("jdbc:TAOS://" + host + ":0/", properties); + statement = connection.createStatement(); + } catch (SQLException e) { + return; + } + } + + @Test + public void testResetQueryCache() throws SQLException { + String resetSql = "reset query cache"; + statement.execute(resetSql); + // ResultSet rs = statement.executeQuery(resetSql); + // rs.close(); + } + + @After + public void close() { + try { + if (statement != null) + statement.close(); + if (connection != null) + connection.close(); + } catch (SQLException e) { + e.printStackTrace(); + } + } + +} \ No newline at end of file From d26a7ca3ba2d2782bfb041f585194f1af933ee50 Mon Sep 17 00:00:00 2001 From: zhaoyanggh Date: Mon, 19 Jul 2021 15:43:41 +0800 Subject: [PATCH 3/4] fix test case --- .../java/com/taosdata/jdbc/cases/ResetQueryCacheTest.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/ResetQueryCacheTest.java b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/ResetQueryCacheTest.java index 52db8052e3..82500f177c 100644 --- a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/ResetQueryCacheTest.java +++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/ResetQueryCacheTest.java @@ -33,9 +33,8 @@ public class ResetQueryCacheTest { @Test public void testResetQueryCache() throws SQLException { String resetSql = "reset query cache"; - statement.execute(resetSql); - // ResultSet rs = statement.executeQuery(resetSql); - // rs.close(); + ResultSet rs = statement.executeQuery(resetSql); + rs.close(); } @After From 88ee9daee3ad3cd564eedd60105775f0dc6ae75f Mon Sep 17 00:00:00 2001 From: zyyang Date: Tue, 20 Jul 2021 15:53:03 +0800 Subject: [PATCH 4/4] [TD-5388]: modified test case, use execute for reset query cache statement --- .../test/java/com/taosdata/jdbc/cases/ResetQueryCacheTest.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/ResetQueryCacheTest.java b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/ResetQueryCacheTest.java index 82500f177c..4eebbd08e8 100644 --- a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/ResetQueryCacheTest.java +++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/ResetQueryCacheTest.java @@ -33,8 +33,7 @@ public class ResetQueryCacheTest { @Test public void testResetQueryCache() throws SQLException { String resetSql = "reset query cache"; - ResultSet rs = statement.executeQuery(resetSql); - rs.close(); + statement.execute(resetSql); } @After