Address more feedback

Author: justing-bq

cpp/src/arrow/flight/sql/odbc/odbc_impl/flight_sql_stream_chunk_buffer.cc

@@ -49,7 +49,8 @@ FlightStreamChunkBuffer::FlightStreamChunkBuffer(
       std::unique_ptr<FlightClient> temp_flight_client;
       util::ThrowIfNotOK(FlightClient::Connect(endpoint_locations[0], client_options)
                              .Value(&temp_flight_client));
-      temp_flight_sql_client.reset(new FlightSqlClient(std::move(temp_flight_client)));
+      temp_flight_sql_client =
+          std::make_shared<FlightSqlClient>(std::move(temp_flight_client));
 
       result = temp_flight_sql_client->DoGet(call_options, ticket);
     }
@@ -67,6 +68,8 @@ FlightStreamChunkBuffer::FlightStreamChunkBuffer(
       // call. temp_flight_sql_client is intentionally null if the list of endpoint
       // Locations is empty.
       // After all data is fetched from reader, the temp client is closed.
+
+      // gh-48084 Replace boost::optional with std::optional
       return boost::make_optional(
           is_not_ok || is_not_empty,
           std::make_pair(std::move(result), temp_flight_sql_client));

cpp/src/arrow/flight/sql/odbc/odbc_impl/flight_sql_stream_chunk_buffer_test.cc

@@ -24,6 +24,7 @@
 #include "arrow/flight/test_flight_server.h"
 #include "arrow/flight/test_util.h"
 
+#include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
 namespace arrow::flight::sql::odbc {
@@ -92,17 +93,6 @@ FlightInfo MultipleEndpointsFlightInfo(Location location1, Location location2) {
                                        100000, false, "");
 }
 
-void VerifyArraysContainIntsOnly(std::shared_ptr<Array> intArray) {
-  for (int64_t i = 0; i < intArray->length(); ++i) {
-    // null values are accepted
-    if (!intArray->IsNull(i)) {
-      auto scalar_data = intArray->GetScalar(i).ValueOrDie();
-      std::string scalar_str = ConvertToJson(*scalar_data);
-      ASSERT_TRUE(std::all_of(scalar_str.begin(), scalar_str.end(), ::isdigit));
-    }
-  }
-}
-
 TEST_F(FlightStreamChunkBufferTest, TestMultipleEndpointsInt) {
   FlightClientOptions client_options = FlightClientOptions::Defaults();
   FlightCallOptions options;
@@ -127,7 +117,10 @@ TEST_F(FlightStreamChunkBufferTest, TestMultipleEndpointsInt) {
       // Each array has random length
       ASSERT_GT(array->length(), 0);
 
-      VerifyArraysContainIntsOnly(array);
+      std::vector<int> int_types = {
+          Type::type::INT8,  Type::type::UINT8,  Type::type::INT16, Type::type::UINT16,
+          Type::type::INT32, Type::type::UINT32, Type::type::INT64, Type::type::UINT64};
+      ASSERT_THAT(int_types, testing::Contains(array->type_id()));
     }
   }