apache · kszucs · Jan 21, 2022 · Jan 25, 2022 · Jan 25, 2022 · Jan 25, 2022
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/c_glib/meson.build b/c_glib/meson.build
@@ -23,7 +23,7 @@ project('arrow-glib', 'c', 'cpp',
           'cpp_std=c++11',
         ])
 
-version = '7.0.0-SNAPSHOT'
+version = '7.0.0'
 if version.endswith('-SNAPSHOT')
   version_numbers = version.split('-')[0].split('.')
   version_tag = version.split('-')[1]

diff --git a/ci/scripts/PKGBUILD b/ci/scripts/PKGBUILD
@@ -18,7 +18,7 @@
 _realname=arrow
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=6.0.1.9000
+pkgver=7.0.0
 pkgrel=8000
 pkgdesc="Apache Arrow is a cross-language development platform for in-memory data (mingw-w64)"
 arch=("any")

diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
@@ -47,7 +47,7 @@ if(POLICY CMP0074)
   cmake_policy(SET CMP0074 NEW)
 endif()
 
-set(ARROW_VERSION "7.0.0-SNAPSHOT")
+set(ARROW_VERSION "7.0.0")
 
 string(REGEX MATCH "^[0-9]+\\.[0-9]+\\.[0-9]+" ARROW_BASE_VERSION "${ARROW_VERSION}")
 

diff --git a/cpp/src/arrow/buffer_test.cc b/cpp/src/arrow/buffer_test.cc
@@ -99,7 +99,7 @@ class MyMemoryManager : public MemoryManager {
     return Status::NotImplemented("");
   }
 
-  Result<std::unique_ptr<Buffer>> AllocateBuffer(int64_t size) override {
+  Result<std::shared_ptr<Buffer>> AllocateBuffer(int64_t size) override {
     return Status::NotImplemented("");
   }
 

diff --git a/cpp/src/arrow/device.cc b/cpp/src/arrow/device.cc
@@ -135,7 +135,7 @@ Result<std::shared_ptr<io::OutputStream>> CPUMemoryManager::GetBufferWriter(
   return std::make_shared<io::FixedSizeBufferWriter>(std::move(buf));
 }
 
-Result<std::unique_ptr<Buffer>> CPUMemoryManager::AllocateBuffer(int64_t size) {
+Result<std::shared_ptr<Buffer>> CPUMemoryManager::AllocateBuffer(int64_t size) {
   return ::arrow::AllocateBuffer(size, pool_);
 }
 

diff --git a/cpp/src/arrow/device.h b/cpp/src/arrow/device.h
@@ -117,7 +117,7 @@ class ARROW_EXPORT MemoryManager : public std::enable_shared_from_this<MemoryMan
   /// \brief Allocate a (mutable) Buffer
   ///
   /// The buffer will be allocated in the device's memory.
-  virtual Result<std::unique_ptr<Buffer>> AllocateBuffer(int64_t size) = 0;
+  virtual Result<std::shared_ptr<Buffer>> AllocateBuffer(int64_t size) = 0;
 
   // XXX Should this take a `const Buffer&` instead
   /// \brief Copy a Buffer to a destination MemoryManager
@@ -184,7 +184,7 @@ class ARROW_EXPORT CPUMemoryManager : public MemoryManager {
   Result<std::shared_ptr<io::OutputStream>> GetBufferWriter(
       std::shared_ptr<Buffer> buf) override;
 
-  Result<std::unique_ptr<Buffer>> AllocateBuffer(int64_t size) override;
+  Result<std::shared_ptr<Buffer>> AllocateBuffer(int64_t size) override;
 
   /// \brief Return the MemoryPool associated with this MemoryManager.
   MemoryPool* pool() const { return pool_; }

diff --git a/cpp/src/arrow/gpu/CMakeLists.txt b/cpp/src/arrow/gpu/CMakeLists.txt
@@ -29,21 +29,13 @@ if(DEFINED ENV{CUDA_HOME})
   set(CUDA_TOOLKIT_ROOT_DIR "$ENV{CUDA_HOME}")
 endif()
 
-if(CMAKE_VERSION VERSION_LESS 3.17)
-  find_package(CUDA REQUIRED)
-  set(ARROW_CUDA_SHARED_LINK_LIBS ${CUDA_CUDA_LIBRARY})
-  include_directories(SYSTEM ${CUDA_INCLUDE_DIRS})
-else()
-  # find_package(CUDA) is deprecated, and for newer CUDA, it doesn't
-  # recognize that the CUDA driver library is in the "stubs" dir, but
-  # CUDAToolkit is only available in CMake >= 3.17
-  find_package(CUDAToolkit REQUIRED)
-  set(ARROW_CUDA_SHARED_LINK_LIBS CUDA::cuda_driver)
-  include_directories(SYSTEM ${CUDAToolkit_INCLUDE_DIRS})
-endif()
+find_package(CUDA REQUIRED)
+include_directories(SYSTEM ${CUDA_INCLUDE_DIRS})
 
 set(ARROW_CUDA_SRCS cuda_arrow_ipc.cc cuda_context.cc cuda_internal.cc cuda_memory.cc)
 
+set(ARROW_CUDA_SHARED_LINK_LIBS ${CUDA_CUDA_LIBRARY})
+
 add_arrow_lib(arrow_cuda
               CMAKE_PACKAGE_NAME
               ArrowCUDA
@@ -89,9 +81,8 @@ if(ARROW_BUILD_TESTS)
 endif()
 
 if(ARROW_BUILD_BENCHMARKS)
-  add_arrow_benchmark(cuda_benchmark PREFIX "arrow-gpu")
-  target_link_libraries(arrow-gpu-cuda-benchmark
-                        PUBLIC ${ARROW_CUDA_LIBRARY} GTest::gtest
-                               ${ARROW_BENCHMARK_LINK_LIBS})
-  add_dependencies(arrow_cuda-benchmarks arrow-gpu-cuda-benchmark)
+  cuda_add_executable(arrow-cuda-benchmark cuda_benchmark.cc)
+  target_link_libraries(arrow-cuda-benchmark ${ARROW_CUDA_LIBRARY} GTest::gtest
+                        ${ARROW_BENCHMARK_LINK_LIBS})
+  add_dependencies(arrow_cuda-benchmarks arrow-cuda-benchmark)
 endif()
diff --git a/cpp/src/arrow/gpu/cuda_context.cc b/cpp/src/arrow/gpu/cuda_context.cc
@@ -31,7 +31,6 @@
 #include "arrow/gpu/cuda_internal.h"
 #include "arrow/gpu/cuda_memory.h"
 #include "arrow/util/checked_cast.h"
-#include "arrow/util/make_unique.h"
 
 namespace arrow {
 
@@ -320,8 +319,9 @@ Result<std::shared_ptr<io::OutputStream>> CudaMemoryManager::GetBufferWriter(
   return writer;
 }
 
-Result<std::unique_ptr<Buffer>> CudaMemoryManager::AllocateBuffer(int64_t size) {
+Result<std::shared_ptr<Buffer>> CudaMemoryManager::AllocateBuffer(int64_t size) {
   ARROW_ASSIGN_OR_RAISE(auto context, cuda_device()->GetContext());
+  std::shared_ptr<CudaBuffer> dest;
   return context->Allocate(size);
 }
 
@@ -531,11 +531,10 @@ CudaContext::CudaContext() { impl_.reset(new Impl()); }
 
 CudaContext::~CudaContext() {}
 
-Result<std::unique_ptr<CudaBuffer>> CudaContext::Allocate(int64_t nbytes) {
+Result<std::shared_ptr<CudaBuffer>> CudaContext::Allocate(int64_t nbytes) {
   uint8_t* data = nullptr;
   RETURN_NOT_OK(impl_->Allocate(nbytes, &data));
-  return arrow::internal::make_unique<CudaBuffer>(data, nbytes, this->shared_from_this(),
-                                                  true);
+  return std::make_shared<CudaBuffer>(data, nbytes, this->shared_from_this(), true);
 }
 
 Result<std::shared_ptr<CudaBuffer>> CudaContext::View(uint8_t* data, int64_t nbytes) {

diff --git a/cpp/src/arrow/gpu/cuda_context.h b/cpp/src/arrow/gpu/cuda_context.h
@@ -167,7 +167,7 @@ class ARROW_EXPORT CudaMemoryManager : public MemoryManager {
   Result<std::shared_ptr<io::OutputStream>> GetBufferWriter(
       std::shared_ptr<Buffer> buf) override;
 
-  Result<std::unique_ptr<Buffer>> AllocateBuffer(int64_t size) override;
+  Result<std::shared_ptr<Buffer>> AllocateBuffer(int64_t size) override;
 
   /// \brief The CudaDevice instance tied to this MemoryManager
   ///
@@ -217,7 +217,7 @@ class ARROW_EXPORT CudaContext : public std::enable_shared_from_this<CudaContext
   /// \brief Allocate CUDA memory on GPU device for this context
   /// \param[in] nbytes number of bytes
   /// \return the allocated buffer
-  Result<std::unique_ptr<CudaBuffer>> Allocate(int64_t nbytes);
+  Result<std::shared_ptr<CudaBuffer>> Allocate(int64_t nbytes);
 
   /// \brief Release CUDA memory on GPU device for this context
   /// \param[in] device_ptr the buffer address

diff --git a/cpp/src/arrow/gpu/cuda_test.cc b/cpp/src/arrow/gpu/cuda_test.cc
@@ -176,8 +176,7 @@ TEST_F(TestCudaDevice, Copy) {
 
   // device (other context) -> device
   ASSERT_OK_AND_ASSIGN(auto other_context, NonPrimaryContext());
-  ASSERT_OK_AND_ASSIGN(std::shared_ptr<CudaBuffer> cuda_buffer,
-                       other_context->Allocate(9));
+  ASSERT_OK_AND_ASSIGN(auto cuda_buffer, other_context->Allocate(9));
   ASSERT_OK(cuda_buffer->CopyFromHost(0, "some data", 9));
   ASSERT_OK_AND_ASSIGN(other_buffer, Buffer::Copy(cuda_buffer, mm_));
   ASSERT_EQ(other_buffer->device(), device_);

diff --git a/cpp/src/arrow/ipc/writer.cc b/cpp/src/arrow/ipc/writer.cc
@@ -1398,7 +1398,7 @@ Result<std::shared_ptr<Buffer>> SerializeRecordBatch(const RecordBatch& batch,
   auto options = IpcWriteOptions::Defaults();
   int64_t size = 0;
   RETURN_NOT_OK(GetRecordBatchSize(batch, options, &size));
-  ARROW_ASSIGN_OR_RAISE(std::shared_ptr<Buffer> buffer, mm->AllocateBuffer(size));
+  ARROW_ASSIGN_OR_RAISE(auto buffer, mm->AllocateBuffer(size));
   ARROW_ASSIGN_OR_RAISE(auto writer, Buffer::GetWriter(buffer));
 
   // XXX Should we have a helper function for getting a MemoryPool

diff --git a/cpp/vcpkg.json b/cpp/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "arrow",
-  "version-string": "7.0.0-SNAPSHOT",
+  "version-string": "7.0.0",
   "dependencies": [
     "abseil",
     {

diff --git a/csharp/Directory.Build.props b/csharp/Directory.Build.props
@@ -29,7 +29,7 @@
     <Product>Apache Arrow library</Product>
     <Copyright>Copyright 2016-2019 The Apache Software Foundation</Copyright>
     <Company>The Apache Software Foundation</Company>
-    <Version>7.0.0-SNAPSHOT</Version>
+    <Version>7.0.0</Version>
   </PropertyGroup>
 
   <PropertyGroup>

diff --git a/dev/tasks/homebrew-formulae/apache-arrow-glib.rb b/dev/tasks/homebrew-formulae/apache-arrow-glib.rb
@@ -29,7 +29,7 @@
 class ApacheArrowGlib < Formula
   desc "GLib bindings for Apache Arrow"
   homepage "https://arrow.apache.org/"
-  url "https://www.apache.org/dyn/closer.lua?path=arrow/arrow-7.0.0-SNAPSHOT/apache-arrow-7.0.0-SNAPSHOT.tar.gz"
+  url "https://www.apache.org/dyn/closer.lua?path=arrow/arrow-7.0.0/apache-arrow-7.0.0.tar.gz"
   sha256 "9948ddb6d4798b51552d0dca3252dd6e3a7d0f9702714fc6f5a1b59397ce1d28"
   license "Apache-2.0"
   head "https://github.com/apache/arrow.git"

diff --git a/dev/tasks/homebrew-formulae/apache-arrow.rb b/dev/tasks/homebrew-formulae/apache-arrow.rb
@@ -29,7 +29,7 @@
 class ApacheArrow < Formula
   desc "Columnar in-memory analytics layer designed to accelerate big data"
   homepage "https://arrow.apache.org/"
-  url "https://www.apache.org/dyn/closer.lua?path=arrow/arrow-7.0.0-SNAPSHOT/apache-arrow-7.0.0-SNAPSHOT.tar.gz"
+  url "https://www.apache.org/dyn/closer.lua?path=arrow/arrow-7.0.0/apache-arrow-7.0.0.tar.gz"
   sha256 "9948ddb6d4798b51552d0dca3252dd6e3a7d0f9702714fc6f5a1b59397ce1d28"
   license "Apache-2.0"
   head "https://github.com/apache/arrow.git"

diff --git a/dev/tasks/homebrew-formulae/autobrew/apache-arrow.rb b/dev/tasks/homebrew-formulae/autobrew/apache-arrow.rb
@@ -19,7 +19,7 @@
 class ApacheArrow < Formula
   desc "Columnar in-memory analytics layer designed to accelerate big data"
   homepage "https://arrow.apache.org/"
-  url "https://www.apache.org/dyn/closer.lua?path=arrow/arrow-6.0.1.9000/apache-arrow-6.0.1.9000.tar.gz"
+  url "https://www.apache.org/dyn/closer.lua?path=arrow/arrow-7.0.0/apache-arrow-7.0.0.tar.gz"
   sha256 "9948ddb6d4798b51552d0dca3252dd6e3a7d0f9702714fc6f5a1b59397ce1d28"
   head "https://github.com/apache/arrow.git"
 

diff --git a/dev/tasks/linux-packages/apache-arrow-apt-source/debian/changelog b/dev/tasks/linux-packages/apache-arrow-apt-source/debian/changelog
@@ -1,3 +1,9 @@
+apache-arrow-apt-source (7.0.0-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Krisztián Szűcs <[email protected]>  Tue, 25 Jan 2022 22:36:13 -0000
+
 apache-arrow-apt-source (6.0.0-1) unstable; urgency=low
 
   * New upstream release.

diff --git a/dev/tasks/linux-packages/apache-arrow-release/yum/apache-arrow-release.spec.in b/dev/tasks/linux-packages/apache-arrow-release/yum/apache-arrow-release.spec.in
@@ -93,6 +93,9 @@ else
 fi
 
 %changelog
+* Tue Jan 25 2022 Krisztián Szűcs <[email protected]> - 7.0.0-1
+- New upstream release.
+
 * Mon Jan 18 2021 Krisztián Szűcs <[email protected]> - 3.0.0-1
 - New upstream release.
 

diff --git a/dev/tasks/linux-packages/apache-arrow/debian/changelog b/dev/tasks/linux-packages/apache-arrow/debian/changelog
@@ -1,3 +1,9 @@
+apache-arrow (7.0.0-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Krisztián Szűcs <[email protected]>  Tue, 25 Jan 2022 22:36:13 -0000
+
 apache-arrow (3.0.0-1) unstable; urgency=low
 
   * New upstream release.

diff --git a/dev/tasks/linux-packages/apache-arrow/yum/arrow.spec.in b/dev/tasks/linux-packages/apache-arrow/yum/arrow.spec.in
@@ -834,6 +834,9 @@ Documentation for Apache Parquet GLib.
 %{_datadir}/gtk-doc/html/parquet-glib/
 
 %changelog
+* Tue Jan 25 2022 Krisztián Szűcs <[email protected]> - 7.0.0-1
+- New upstream release.
+
 * Mon Jan 18 2021 Krisztián Szűcs <[email protected]> - 3.0.0-1
 - New upstream release.
 

diff --git a/dev/tasks/tasks.yml b/dev/tasks/tasks.yml
@@ -955,12 +955,16 @@ tasks:
     ci: github
     template: verify-rc/github.win.yml
     params:
+      env:
+        PYARROW_TEST_GDB: "OFF"
       script: "verify-release-candidate.bat"
 
   verify-rc-wheels-windows:
     ci: github
     template: verify-rc/github.win.yml
     params:
+      env:
+        PYARROW_TEST_GDB: "OFF"
       script: "verify-release-candidate-wheels.bat"
 
 {############################## Docker tests #################################}

diff --git a/java/adapter/avro/pom.xml b/java/adapter/avro/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.apache.arrow</groupId>
     <artifactId>arrow-java-root</artifactId>
-    <version>7.0.0-SNAPSHOT</version>
+    <version>7.0.0</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 

diff --git a/java/adapter/jdbc/pom.xml b/java/adapter/jdbc/pom.xml
@@ -16,7 +16,7 @@
     <parent>
         <groupId>org.apache.arrow</groupId>
         <artifactId>arrow-java-root</artifactId>
-        <version>7.0.0-SNAPSHOT</version>
+        <version>7.0.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/java/adapter/orc/pom.xml b/java/adapter/orc/pom.xml
@@ -87,7 +87,7 @@
     <parent>
         <groupId>org.apache.arrow</groupId>
         <artifactId>arrow-java-root</artifactId>
-        <version>7.0.0-SNAPSHOT</version>
+        <version>7.0.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/java/algorithm/pom.xml b/java/algorithm/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <groupId>org.apache.arrow</groupId>
     <artifactId>arrow-java-root</artifactId>
-    <version>7.0.0-SNAPSHOT</version>
+    <version>7.0.0</version>
   </parent>
   <artifactId>arrow-algorithm</artifactId>
   <name>Arrow Algorithms</name>

diff --git a/java/c/pom.xml b/java/c/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <artifactId>arrow-java-root</artifactId>
         <groupId>org.apache.arrow</groupId>
-        <version>7.0.0-SNAPSHOT</version>
+        <version>7.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/java/compression/pom.xml b/java/compression/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <groupId>org.apache.arrow</groupId>
     <artifactId>arrow-java-root</artifactId>
-    <version>7.0.0-SNAPSHOT</version>
+    <version>7.0.0</version>
   </parent>
   <artifactId>arrow-compression</artifactId>
   <name>Arrow Compression</name>

diff --git a/java/dataset/pom.xml b/java/dataset/pom.xml
@@ -15,7 +15,7 @@
     <parent>
         <artifactId>arrow-java-root</artifactId>
         <groupId>org.apache.arrow</groupId>
-        <version>7.0.0-SNAPSHOT</version>
+        <version>7.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/java/flight/flight-core/pom.xml b/java/flight/flight-core/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>arrow-flight</artifactId>
     <groupId>org.apache.arrow</groupId>
-    <version>7.0.0-SNAPSHOT</version>
+    <version>7.0.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/java/flight/flight-grpc/pom.xml b/java/flight/flight-grpc/pom.xml
@@ -13,7 +13,7 @@
   <parent>
     <artifactId>arrow-flight</artifactId>
     <groupId>org.apache.arrow</groupId>
-    <version>7.0.0-SNAPSHOT</version>
+    <version>7.0.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>

diff --git a/java/flight/flight-integration-tests/pom.xml b/java/flight/flight-integration-tests/pom.xml
@@ -15,7 +15,7 @@
     <parent>
         <artifactId>arrow-flight</artifactId>
         <groupId>org.apache.arrow</groupId>
-        <version>7.0.0-SNAPSHOT</version>
+        <version>7.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/java/flight/flight-sql/pom.xml b/java/flight/flight-sql/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>arrow-flight</artifactId>
     <groupId>org.apache.arrow</groupId>
-    <version>7.0.0-SNAPSHOT</version>
+    <version>7.0.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/java/flight/pom.xml b/java/flight/pom.xml
@@ -15,7 +15,7 @@
     <parent>
         <artifactId>arrow-java-root</artifactId>
         <groupId>org.apache.arrow</groupId>
-        <version>7.0.0-SNAPSHOT</version>
+        <version>7.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/java/format/pom.xml b/java/format/pom.xml
@@ -15,7 +15,7 @@
 <parent>
   <artifactId>arrow-java-root</artifactId>
   <groupId>org.apache.arrow</groupId>
-  <version>7.0.0-SNAPSHOT</version>
+  <version>7.0.0</version>
 </parent>
 
 <artifactId>arrow-format</artifactId>

diff --git a/java/gandiva/pom.xml b/java/gandiva/pom.xml
@@ -14,7 +14,7 @@
     <parent>
       <groupId>org.apache.arrow</groupId>
       <artifactId>arrow-java-root</artifactId>
-      <version>7.0.0-SNAPSHOT</version>
+      <version>7.0.0</version>
     </parent>
 
     <groupId>org.apache.arrow.gandiva</groupId>