Skip to content

Commit 47008c0

Browse files
authored
MINOR: [Release] Update versions for 19.0.0 (#371)
I ran `./dev/release/01-bump-versions.sh 18.1.0 19.0.0` Also fixed: - Update CMakeLists.txt to use standard CMake target name (see https://github.com/google/googletest/blob/main/googletest/README.md). I think this change is better. - Updated Flight cookbook for Parquet changes in Arrow 19.0.0, apache/arrow#44784
1 parent 92e5aac commit 47008c0

File tree

7 files changed

+295
-293
lines changed

7 files changed

+295
-293
lines changed

cpp/code/CMakeLists.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ endif()
4040
# Create test targets
4141
enable_testing()
4242

43+
find_package(GTest REQUIRED)
4344
include(GoogleTest)
4445

4546
function(RECIPE TARGET)
@@ -53,13 +54,13 @@ function(RECIPE TARGET)
5354
target_link_libraries(
5455
${TARGET}
5556
ArrowDataset::arrow_dataset_shared
56-
ArrowFlight::arrow_flight_shared gtest
57+
ArrowFlight::arrow_flight_shared GTest::gtest
5758
)
5859
else()
5960
target_link_libraries(parquet_shared INTERFACE arrow_shared)
6061
target_link_libraries(arrow_dataset_shared INTERFACE parquet_shared)
6162
target_link_libraries(arrow_flight_shared INTERFACE arrow_shared)
62-
target_link_libraries(${TARGET} arrow_dataset_shared arrow_flight_shared gtest)
63+
target_link_libraries(${TARGET} arrow_dataset_shared arrow_flight_shared GTest::gtest)
6364
endif()
6465
if (MSVC)
6566
target_compile_options(${TARGET} PRIVATE /W4 /WX)

cpp/code/flight.cc

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,9 @@ class ParquetStorageService : public arrow::flight::FlightServerBase {
9292
const arrow::flight::Ticket& request,
9393
std::unique_ptr<arrow::flight::FlightDataStream>* stream) override {
9494
ARROW_ASSIGN_OR_RAISE(auto input, root_->OpenInputFile(request.ticket));
95-
std::unique_ptr<parquet::arrow::FileReader> reader;
96-
ARROW_RETURN_NOT_OK(parquet::arrow::OpenFile(std::move(input),
97-
arrow::default_memory_pool(), &reader));
95+
ARROW_ASSIGN_OR_RAISE(
96+
auto reader,
97+
parquet::arrow::OpenFile(std::move(input), arrow::default_memory_pool()));
9898

9999
std::shared_ptr<arrow::Table> table;
100100
ARROW_RETURN_NOT_OK(reader->ReadTable(&table));
@@ -135,9 +135,9 @@ class ParquetStorageService : public arrow::flight::FlightServerBase {
135135
arrow::Result<arrow::flight::FlightInfo> MakeFlightInfo(
136136
const arrow::fs::FileInfo& file_info) {
137137
ARROW_ASSIGN_OR_RAISE(auto input, root_->OpenInputFile(file_info));
138-
std::unique_ptr<parquet::arrow::FileReader> reader;
139-
ARROW_RETURN_NOT_OK(parquet::arrow::OpenFile(std::move(input),
140-
arrow::default_memory_pool(), &reader));
138+
ARROW_ASSIGN_OR_RAISE(
139+
auto reader,
140+
parquet::arrow::OpenFile(std::move(input), arrow::default_memory_pool()));
141141

142142
std::shared_ptr<arrow::Schema> schema;
143143
ARROW_RETURN_NOT_OK(reader->GetSchema(&schema));
@@ -222,9 +222,8 @@ arrow::Status TestPutGetDelete() {
222222
FindTestDataFile("airquality.parquet"));
223223
ARROW_ASSIGN_OR_RAISE(std::shared_ptr<arrow::io::RandomAccessFile> input,
224224
fs->OpenInputFile(airquality_path));
225-
std::unique_ptr<parquet::arrow::FileReader> reader;
226-
ARROW_RETURN_NOT_OK(
227-
parquet::arrow::OpenFile(std::move(input), arrow::default_memory_pool(), &reader));
225+
ARROW_ASSIGN_OR_RAISE(auto reader, parquet::arrow::OpenFile(
226+
std::move(input), arrow::default_memory_pool()));
228227

229228
auto descriptor = arrow::flight::FlightDescriptor::Path({"airquality.parquet"});
230229
std::shared_ptr<arrow::Schema> schema;

cpp/conda-linux-64.lock

Lines changed: 90 additions & 90 deletions
Large diffs are not rendered by default.

cpp/conda-linux-aarch64.lock

Lines changed: 90 additions & 90 deletions
Large diffs are not rendered by default.

cpp/conda-osx-arm64.lock

Lines changed: 100 additions & 98 deletions
Large diffs are not rendered by default.

cpp/environment.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ channels:
2020
dependencies:
2121
- python=3.9
2222
- compilers
23-
- libarrow==18.1.0
24-
- libarrow-flight==18.1.0
23+
- libarrow==19.0.0
24+
- libarrow-flight==19.0.0
2525
- sphinx
2626
- gtest
2727
- gmock
28-
- pyarrow==18.1.0
28+
- pyarrow==19.0.0
2929
- clang-tools
3030
- zlib

python/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Sphinx>=4.0.2
2-
pyarrow==18.1.0
2+
pyarrow==19.0.0
33
pandas>=1.2.5
44
opentelemetry-api>=1.0.0
55
opentelemetry-sdk>=1.0.0

0 commit comments

Comments
 (0)