[CONJ-1111] ensure using same ip in place of DNS when creating a connection to kill running query

Author: rusher

src/main/java/org/mariadb/jdbc/internal/protocol/AbstractConnectProtocol.java

@@ -1433,9 +1433,18 @@ public HostAddress getHostAddress() {
  return currentHost;
  }
 
+ public String getSocketIp() {
+ return this.socket.getInetAddress() == null
+ ? null
+ : this.socket.getInetAddress().getHostAddress();
+ }
+
  public void setHostAddress(HostAddress host) {
  this.currentHost = host;
- this.readOnly = ParameterConstant.TYPE_REPLICA.equals(this.currentHost.type);
+ this.readOnly =
+ this.currentHost == null
+ ? false
+ : ParameterConstant.TYPE_REPLICA.equals(this.currentHost.type);
  }
 
  public String getHost() {

src/main/java/org/mariadb/jdbc/internal/protocol/AbstractQueryProtocol.java

@@ -69,10 +69,7 @@
 import java.util.concurrent.locks.ReentrantLock;
 import java.util.regex.Pattern;
 import javax.sql.rowset.serial.SerialException;
-import org.mariadb.jdbc.LocalInfileInterceptor;
-import org.mariadb.jdbc.MariaDbConnection;
-import org.mariadb.jdbc.MariaDbStatement;
-import org.mariadb.jdbc.UrlParser;
+import org.mariadb.jdbc.*;
 import org.mariadb.jdbc.internal.ColumnType;
 import org.mariadb.jdbc.internal.MariaDbServerCapabilities;
 import org.mariadb.jdbc.internal.com.read.Buffer;
@@ -1362,7 +1359,13 @@ public void resetDatabase() throws SQLException {
  public void cancelCurrentQuery() throws SQLException {
  try (MasterProtocol copiedProtocol =
  new MasterProtocol(urlParser, new GlobalStateInfo(), new ReentrantLock(), traceCache)) {
- copiedProtocol.setHostAddress(getHostAddress());
+ HostAddress currentHost = getHostAddress();
+ String currentIp = getSocketIp();
+ HostAddress hostAddress =
+ currentIp == null
+ ? currentHost
+ : new HostAddress(currentIp, currentHost.port, currentHost.type);
+ copiedProtocol.setHostAddress(hostAddress);
  copiedProtocol.connect();
  // no lock, because there is already a query running that possessed the lock.
  copiedProtocol.executeQuery("KILL QUERY " + serverThreadId);

src/test/java/org/mariadb/jdbc/BaseTest.java

@@ -92,6 +92,7 @@ public class BaseTest {
  protected static String database;
  protected static String username;
  protected static String password;
+ protected static String defaultOther;
  protected static Options options;
  protected static String parameters;
  protected static boolean testSingleHost;
@@ -106,7 +107,7 @@ public class BaseTest {
  BaseTest.class.getClassLoader().getResourceAsStream("conf.properties")) {
  Properties prop = new Properties();
  prop.load(inputStream);
- String defaultOther;
+
  String val = System.getenv("TEST_REQUIRE_TLS");
  defaultOther = get("DB_OTHER", prop);
  if ("1".equals(val)) {

src/test/java/org/mariadb/jdbc/DriverTest.java

@@ -1439,6 +1439,65 @@ public void namedPipe() {
  }
  }
 
+ @Test
+ public void namedPipeCancel() {
+ try (ResultSet rs =
+ sharedConnection
+ .createStatement()
+ .executeQuery("select @@named_pipe,@@socket,@@named_pipe_full_access_group")) {
+ assertTrue(rs.next());
+ if (rs.getBoolean(1)) {
+ String namedPipeName = rs.getString(2);
+ // skip test if no namedPipeName was obtained because then we do not use a socket connection
+ Assume.assumeTrue(namedPipeName != null);
+
+ if (!isMariadbServer() && minVersion(8, 0, 14)) {
+ String namedPipeFullAccess = rs.getString(3);
+ System.out.println("namedPipeFullAccess:" + namedPipeFullAccess);
+ Assume.assumeTrue(namedPipeFullAccess != null && !namedPipeFullAccess.isEmpty());
+ }
+ String connUrl =
+ String.format(
+ "jdbc:mariadb:///%s?user=%s&password=%s&%s",
+ database, username, password, defaultOther);
+
+ try (Connection connection =
+ DriverManager.getConnection(connUrl + "&pipe=" + namedPipeName)) {
+ long start;
+ long normalExecutionTime;
+
+ try (PreparedStatement stmt =
+ connection.prepareStatement(
+ "select * from information_schema.columns as c1, information_schema.tables, mysql.user LIMIT 50000")) {
+ start = System.currentTimeMillis();
+ stmt.executeQuery();
+ normalExecutionTime = System.currentTimeMillis() - start;
+
+ start = System.currentTimeMillis();
+ stmt.setFetchSize(1);
+ stmt.executeQuery();
+ stmt.cancel();
+ }
+
+ long interruptedExecutionTime = System.currentTimeMillis() - start;
+
+ System.out.println(normalExecutionTime);
+ System.out.println(interruptedExecutionTime);
+ // normalExecutionTime = 1500
+ // interruptedExecutionTime = 77
+ assertTrue(
+ "interruptedExecutionTime:"
+ + interruptedExecutionTime
+ + " normalExecutionTime:"
+ + normalExecutionTime,
+ interruptedExecutionTime < normalExecutionTime);
+ }
+ }
+ } catch (SQLException e) {
+ // not on windows
+ }
+ }
+
  /**
  * CONJ-435 : "All pipe instances are busy" exception on multiple connections to the same named
  * pipe.