File tree Expand file tree Collapse file tree
cpp/src/arrow/flight/sql/odbc/odbc_impl Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -59,7 +59,9 @@ FlightStreamChunkBuffer::FlightStreamChunkBuffer(
5959 std::shared_ptr<FlightStreamReader> stream_reader_ptr (std::move (result.ValueOrDie ()));
6060
6161 BlockingQueue<std::pair<Result<FlightStreamChunk>,
62- std::shared_ptr<FlightSqlClient>>>::Supplier supplier = [=] {
62+ std::shared_ptr<FlightSqlClient>>>::Supplier supplier = [=]()
63+ -> std::optional<
64+ std::pair<Result<FlightStreamChunk>, std::shared_ptr<FlightSqlClient>>> {
6365 auto result = stream_reader_ptr->Next ();
6466 bool is_not_ok = !result.ok ();
6567 bool is_not_empty = result.ok () && (result.ValueOrDie ().data != nullptr );
@@ -72,8 +74,7 @@ FlightStreamChunkBuffer::FlightStreamChunkBuffer(
7274 return std::make_optional (
7375 std::make_pair (std::move (result), temp_flight_sql_client));
7476 } else {
75- return std::optional<std::pair<arrow::Result<FlightStreamChunk>,
76- std::shared_ptr<FlightSqlClient>>>{};
77+ return std::nullopt ;
7778 }
7879 };
7980 queue_.AddProducer (std::move (supplier));
Original file line number Diff line number Diff line change @@ -172,7 +172,7 @@ enum RowStatus : uint16_t {
172172};
173173
174174struct MetadataSettings {
175- std::optional<int32_t > string_column_length{std:: nullopt } ;
175+ std::optional<int32_t > string_column_length;
176176 size_t chunk_buffer_capacity;
177177 bool use_wide_char;
178178};
You can’t perform that action at this time.
0 commit comments