apacheGH-1090 Preserve Flight info statement API

Author: xborder

flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/ArrowFlightInfoStatement.java

@@ -0,0 +1,36 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.arrow.driver.jdbc;
+
+import java.sql.SQLException;
+import java.sql.Statement;
+import org.apache.arrow.flight.FlightInfo;
+
+/** A {@link Statement} that deals with {@link FlightInfo}. */
+public interface ArrowFlightInfoStatement extends Statement {
+
+  @Override
+  ArrowFlightConnection getConnection() throws SQLException;
+
+  /**
+   * Executes the query this {@link Statement} is holding.
+   *
+   * @return the {@link FlightInfo} for the results.
+   * @throws SQLException on error.
+   */
+  FlightInfo executeFlightInfoQuery() throws SQLException;
+}

flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/ArrowFlightMetaStatement.java

@@ -27,11 +27,12 @@
 import org.apache.calcite.avatica.remote.TypedValue;
 
 /** Statement capabilities used by {@link ArrowFlightMetaImpl}. */
-interface ArrowFlightMetaStatement extends Statement {
+interface ArrowFlightMetaStatement extends ArrowFlightInfoStatement {
 
   @Override
   ArrowFlightConnection getConnection() throws SQLException;
 
+  @Override
   FlightInfo executeFlightInfoQuery() throws SQLException;
 
   /**

flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/ArrowFlightPreparedStatementTest.java

@@ -81,6 +81,17 @@ public void before() {
     PRODUCER.clearActionTypeCounter();
   }
 
+  @Test
+  public void testPreparedStatementKeepsFlightInfoStatementApi() throws SQLException {
+    try (final PreparedStatement preparedStatement =
+        connection.prepareStatement(CoreMockedSqlProducers.LEGACY_REGULAR_SQL_CMD)) {
+      final ArrowFlightInfoStatement flightInfoStatement =
+          (ArrowFlightInfoStatement) preparedStatement;
+
+      assertSame(preparedStatement, flightInfoStatement);
+    }
+  }
+
   @Test
   public void testSimpleQueryNoParameterBinding() throws SQLException {
     final String query = CoreMockedSqlProducers.LEGACY_REGULAR_SQL_CMD;

flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/ArrowFlightStatementExecuteTest.java

@@ -145,6 +145,13 @@ public static void tearDownAfterClass() throws Exception {
     AutoCloseables.close(PRODUCER);
   }
 
+  @Test
+  public void testStatementKeepsFlightInfoStatementApi() {
+    final ArrowFlightInfoStatement flightInfoStatement = (ArrowFlightInfoStatement) statement;
+
+    assertSame(statement, flightInfoStatement);
+  }
+
   @Test
   public void testExecuteShouldRunSelectQuery() throws SQLException {
     assertThat(statement.execute(SAMPLE_QUERY_CMD), is(true)); // Means this is a SELECT query.