Update C++ dependencies, roughly matching ones used in python. (#5472)

* Update C++ dependencies, roughly matching ones used in python.

* Update protoc-base.

* Recover comment lost by mistake.

* Updated protoc version.

* Update protobuf.

* getting closer...

* Update protoc base image.

* Update Classpaths.groovy.

* One more place.

* One more more place.

* Update C++ protos.

* Update cpp-clients-multi base image.

* Update build-dependencies.sh.

* Move R client to new flight API.

R/rdeephaven/src/client.cpp

@@ -540,10 +540,9 @@ class TableHandleWrapper {
 
         std::shared_ptr<arrow::flight::FlightStreamReader> fsr = internal_tbl_hdl.GetFlightStreamReader();
 
-        std::vector<std::shared_ptr<arrow::RecordBatch>> empty_record_batches;
-        deephaven::client::utility::OkOrThrow(DEEPHAVEN_LOCATION_EXPR(fsr->ReadAll(&empty_record_batches)));
+        arrow::Result<arrow::RecordBatchVector> record_batches = fsr->ToRecordBatches();
 
-        std::shared_ptr<arrow::RecordBatchReader> record_batch_reader = arrow::RecordBatchReader::Make(empty_record_batches).ValueOrDie();
+        std::shared_ptr<arrow::RecordBatchReader> record_batch_reader = arrow::RecordBatchReader::Make(std::move(*record_batches)).ValueOrDie();
         ArrowArrayStream* stream_ptr = new ArrowArrayStream();
         deephaven::client::utility::OkOrThrow(DEEPHAVEN_LOCATION_EXPR(arrow::ExportRecordBatchReader(record_batch_reader, stream_ptr)));
 
@@ -705,23 +704,21 @@ class ClientWrapper {
         auto schema = record_batch_reader.get()->schema();
 
         // write RecordBatchReader data to table on server with DoPut
-        std::unique_ptr<arrow::flight::FlightStreamWriter> fsw;
-        std::unique_ptr<arrow::flight::FlightMetadataReader> fmr;
 
         auto ticket = internal_tbl_hdl_mngr.NewTicket();
         auto fd = deephaven::client::utility::ArrowUtil::ConvertTicketToFlightDescriptor(ticket);
+        arrow::Result<arrow::flight::FlightClient::DoPutResult> r = wrapper.FlightClient()->DoPut(options, fd, schema);
 
-        deephaven::client::utility::OkOrThrow(DEEPHAVEN_LOCATION_EXPR(wrapper.FlightClient()->DoPut(options, fd, schema, &fsw, &fmr)));
         while(true) {
             std::shared_ptr<arrow::RecordBatch> this_batch;
             deephaven::client::utility::OkOrThrow(DEEPHAVEN_LOCATION_EXPR(record_batch_reader->ReadNext(&this_batch)));
             if (this_batch == nullptr) {
                 break;
             }
-            deephaven::client::utility::OkOrThrow(DEEPHAVEN_LOCATION_EXPR(fsw->WriteRecordBatch(*this_batch)));
+            deephaven::client::utility::OkOrThrow(DEEPHAVEN_LOCATION_EXPR(r->writer->WriteRecordBatch(*this_batch)));
         }
-        deephaven::client::utility::OkOrThrow(DEEPHAVEN_LOCATION_EXPR(fsw->DoneWriting()));
-        deephaven::client::utility::OkOrThrow(DEEPHAVEN_LOCATION_EXPR(fsw->Close()));
+        deephaven::client::utility::OkOrThrow(DEEPHAVEN_LOCATION_EXPR(r->writer->DoneWriting()));
+        deephaven::client::utility::OkOrThrow(DEEPHAVEN_LOCATION_EXPR(r->writer->Close()));
 
         auto new_tbl_hdl = internal_tbl_hdl_mngr.MakeTableHandleFromTicket(ticket);
         return new TableHandleWrapper(new_tbl_hdl);

buildSrc/src/main/groovy/Classpaths.groovy

@@ -100,7 +100,7 @@ class Classpaths {
     // TODO(deephaven-core#1685): Create strategy around updating and maintaining protoc version
     static final String PROTOBUF_GROUP = 'com.google.protobuf'
     static final String PROTOBUF_NAME = 'protobuf-java'
-    static final String PROTOBUF_VERSION = '3.23.0'
+    static final String PROTOBUF_VERSION = '3.25.3'
 
     // See dependency matrix for particular gRPC versions at https://github.com/grpc/grpc-java/blob/master/SECURITY.md#netty
     static final String BORINGSSL_GROUP = 'io.netty'

cpp-client/build-dependencies.sh

@@ -490,8 +490,8 @@ if [ "$CLONE_ABSEIL" = "yes" ]; then
   echo
   echo "*** Clone abseil"
   cd $SRC
-  # Previously used version: 20210324.2
-  git clone $GIT_FLAGS -b 20211102.0 --depth 1 "${GITHUB_BASE_URL}/abseil/abseil-cpp.git"
+  # Previously used version: 20211102.0
+  git clone $GIT_FLAGS -b 20240116.0 --depth 1 "${GITHUB_BASE_URL}/abseil/abseil-cpp.git"
   echo "*** Cloning abseil DONE"
   if [ "$fedora38" = "yes" ]; then
   echo "*** Patching abseil for Fedora 38"
@@ -513,6 +513,7 @@ if [ "$BUILD_ABSEIL" = "yes" ]; then
   cd $SRC/abseil-cpp
   mkdir -p "cmake/$BUILD_DIR" && cd "cmake/$BUILD_DIR"
   cmake -DCMAKE_CXX_STANDARD=17 \
+	-DABSL_PROPAGATE_CXX_STD=ON \
         ${cmake_common_args} \
         -DCMAKE_INSTALL_PREFIX=$(prefix abseil) \
         ../..
@@ -530,8 +531,8 @@ if [ "$CLONE_ZLIB" = "yes" ]; then
   echo
   echo "*** Clone zlib"
   cd $SRC
-  # Previously used version: v1.2.11
-  git clone $GIT_FLAGS -b v1.2.13 --depth 1 "${GITHUB_BASE_URL}/madler/zlib"
+  # Previously used version: v1.2.13
+  git clone $GIT_FLAGS -b v1.3 --depth 1 "${GITHUB_BASE_URL}/madler/zlib"
   echo "*** Cloning zlib DONE"
 fi
 if [ "$BUILD_ZLIB" = "yes" ]; then
@@ -561,24 +562,25 @@ if [ "$CLONE_PROTOBUF" = "yes" ]; then
   echo
   echo "*** Cloning protobuf"
   cd $SRC
-  # Previously used version: v3.21.12
-  git clone $GIT_FLAGS -b v3.21.2 --depth 1 "${GITHUB_BASE_URL}/protocolbuffers/protobuf.git"
+  # Previously used version: v3.21.2
+  git clone $GIT_FLAGS -b v25.3 --depth 1 "${GITHUB_BASE_URL}/protocolbuffers/protobuf.git"
   echo "*** Cloning protobuf DONE"
 fi
 if [ "$BUILD_PROTOBUF" = "yes" ]; then
   echo
   echo "*** Building protobuf"
   cd $SRC/protobuf
   # Note in the previously used version we built inside cmake/build; not anymore.
-  mkdir -p "cmake/$BUILD_DIR" && cd "cmake/$BUILD_DIR"
+  mkdir -p "$BUILD_DIR" && cd "$BUILD_DIR"
   cmake -Dprotobuf_BUILD_TESTS=OFF \
         ${cmake_common_args} \
         -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
+        -Dprotobuf_ABSL_PROVIDER=package \
         -DCMAKE_INSTALL_PREFIX=$(prefix protobuf) \
         ..
   make -j$NCPUS
   make install
-  cd ../.. && rm -fr "cmake/$BUILD_DIR"
+  cd .. && rm -fr "$BUILD_DIR"
   if [ "$clean" = "yes" ]; then
     rm -fr "$SRC/protobuf"
   fi
@@ -689,7 +691,7 @@ if [ "$CLONE_CARES" = "yes" ]; then
   echo "*** Clone ares"
   cd $SRC
   # Previously used version: cares-1_18_1
-  git clone $GIT_FLAGS -b cares-1_18_1 --depth 1 "${GITHUB_BASE_URL}/c-ares/c-ares.git"
+  git clone $GIT_FLAGS -b cares-1_28_1 --depth 1 "${GITHUB_BASE_URL}/c-ares/c-ares.git"
   echo "*** Cloning ares DONE"
 fi
 if [ "$BUILD_CARES" = "yes" ]; then
@@ -721,8 +723,8 @@ if [ "$CLONE_GRPC" = "yes" ]; then
   echo
   echo "*** Clone grpc"
   cd $SRC
-  # Previously used version: v1.45.2
-  git clone $GIT_FLAGS -b v1.46.7 --depth 1 "${GITHUB_BASE_URL}/grpc/grpc"
+  # Previously used version: v1.46.7
+  git clone $GIT_FLAGS -b v1.63.0 --depth 1 "${GITHUB_BASE_URL}/grpc/grpc"
   echo "*** Cloning grpc DONE"
 fi
 if [ "$BUILD_GRPC" = "yes" ]; then
@@ -756,8 +758,8 @@ if [ "$CLONE_ARROW" = "yes" ]; then
   echo
   echo "*** Cloning arrow"
   cd $SRC
-  # Previously used version: apache-arrow-7.0.0
-  git clone $GIT_FLAGS -b apache-arrow-13.0.0 --depth 1 "${GITHUB_BASE_URL}/apache/arrow"
+  # Previously used version: apache-arrow-13.0.0
+  git clone $GIT_FLAGS -b apache-arrow-16.0.0 --depth 1 "${GITHUB_BASE_URL}/apache/arrow"
   echo "*** Cloning arrow DONE"
 fi
 if [ "$BUILD_ARROW" = "yes" ]; then