Fix missing client_execution_handle on CommandStatementQuery (apache#86)

rafael-telles · Aug 27, 2021 · de5deae · de5deae
1 parent 1a17470
commit de5deae
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/format/FlightSql.proto b/format/FlightSql.proto
@@ -384,6 +384,9 @@ message CommandStatementQuery {
 
  // The SQL syntax.
  string query = 1;
+
+ // Unique identifier for the instance of the statement to execute.
+ bytes client_execution_handle = 2;
 }
 
 /*

diff --git a/java/flight/flight-sql/src/main/java/org/apache/arrow/flight/sql/FlightSqlClient.java b/java/flight/flight-sql/src/main/java/org/apache/arrow/flight/sql/FlightSqlClient.java
@@ -361,7 +361,6 @@ public PreparedStatement prepare(final String query, final CallOption... options
  public static class PreparedStatement implements AutoCloseable {
  private final FlightClient client;
  private final ActionCreatePreparedStatementResult preparedStatementResult;
- private final AtomicLong invocationCount;
  private VectorSchemaRoot parameterBindingRoot;
  private boolean isClosed;
  private Schema resultSetSchema;
@@ -389,7 +388,6 @@ public PreparedStatement(final FlightClient client, final String sql, final Call
  preparedStatementResults.next().getBody(),
  ActionCreatePreparedStatementResult.class);
 
- invocationCount = new AtomicLong(0);
  isClosed = false;
  }
 
@@ -464,8 +462,6 @@ public FlightInfo execute(final CallOption... options) throws SQLException {
 
  final FlightDescriptor descriptor = FlightDescriptor
  .command(Any.pack(CommandPreparedStatementQuery.newBuilder()
- .setClientExecutionHandle(
- ByteString.copyFrom(ByteBuffer.allocate(Long.BYTES).putLong(invocationCount.getAndIncrement())))
  .setPreparedStatementHandle(preparedStatementResult.getPreparedStatementHandle())
  .build())
  .toByteArray());
@@ -502,8 +498,6 @@ public long executeUpdate(final CallOption... options) {
  checkOpen();
  final FlightDescriptor descriptor = FlightDescriptor
  .command(Any.pack(FlightSql.CommandPreparedStatementUpdate.newBuilder()
- .setClientExecutionHandle(
- ByteString.copyFrom(ByteBuffer.allocate(Long.BYTES).putLong(invocationCount.getAndIncrement())))
  .setPreparedStatementHandle(preparedStatementResult.getPreparedStatementHandle())
  .build())
  .toByteArray());