From 026b7363ecf54a1182a43c00697db7e45fc67045 Mon Sep 17 00:00:00 2001 From: AbhishekPathania Date: Wed, 18 Nov 2026 19:41:08 +0530 Subject: [PATCH] GH-66: [JDBC] Add test for closing a connection with a catalog twice --- .../arrow/driver/jdbc/ConnectionTest.java | 22 +++++++++++++++++++ .../jdbc/utils/MockFlightSqlProducer.java | 19 ++++++++++++++++ 2 files changed, 41 insertions(+) diff --git a/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/ConnectionTest.java b/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/ConnectionTest.java index 1fb0eba655..ca9ae1adf3 100644 --- a/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/ConnectionTest.java +++ b/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/ConnectionTest.java @@ -683,6 +683,28 @@ public String visit(String value) { } } + @Test + public void testCloseTwiceWithCatalogClosesSessionOnce() throws Exception { + final Properties properties = new Properties(); + properties.put(ArrowFlightConnectionProperty.USER.camelName(), userTest); + properties.put(ArrowFlightConnectionProperty.PASSWORD.camelName(), passTest); + properties.put(ArrowFlightConnectionProperty.CATALOG.camelName(), "test_catalog"); + properties.put("useEncryption", false); + final int closeSessionCountBefore = PRODUCER.getCloseSessionCount(); + + final Connection connection = + DriverManager.getConnection( + "jdbc:arrow-flight-sql://" + + FLIGHT_SERVER_TEST_EXTENSION.getHost() + + ":" + + FLIGHT_SERVER_TEST_EXTENSION.getPort(), + properties); + connection.close(); + connection.close(); + + assertEquals(closeSessionCountBefore + 1, PRODUCER.getCloseSessionCount()); + } + @Test public void testStatementsClosedOnConnectionClose() throws Exception { // create a connection diff --git a/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/utils/MockFlightSqlProducer.java b/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/utils/MockFlightSqlProducer.java index 36c07ce5dd..c764a1c015 100644 --- a/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/utils/MockFlightSqlProducer.java +++ b/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/utils/MockFlightSqlProducer.java @@ -40,11 +40,14 @@ import java.util.Objects; import java.util.UUID; import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.atomic.AtomicInteger; import java.util.function.BiConsumer; import java.util.function.Consumer; import java.util.stream.IntStream; import org.apache.arrow.flight.Action; import org.apache.arrow.flight.CallStatus; +import org.apache.arrow.flight.CloseSessionRequest; +import org.apache.arrow.flight.CloseSessionResult; import org.apache.arrow.flight.Criteria; import org.apache.arrow.flight.FlightDescriptor; import org.apache.arrow.flight.FlightEndpoint; @@ -758,6 +761,22 @@ public Map getSessionOptions() { return sessionOptions; } + private final AtomicInteger closeSessionCount = new AtomicInteger(); + + @Override + public void closeSession( + final CloseSessionRequest request, + final CallContext context, + final StreamListener listener) { + closeSessionCount.incrementAndGet(); + listener.onNext(new CloseSessionResult(CloseSessionResult.Status.CLOSED)); + listener.onCompleted(); + } + + public int getCloseSessionCount() { + return closeSessionCount.get(); + } + private static final class TicketConversionUtils { private TicketConversionUtils() { // Prevent instantiation.