ARROW-6633: [C++] Vendor double-conversion library

pitrou · fsaintjacques · commit 4bec5347d72e · 2019-11-15T11:43:42.000-05:00
Since this is both a mandatory dependency and a small-ish library, vendor it to make the build chain simplier. Also, make its use private, because of Windows DLL exports. This incurs a small (~8-10%) performance hit on specific workloads. Closes apache#5832 from pitrou/ARROW-6633-vendor-double-conversion and squashes the following commits: b1e12c7bc <Antoine Pitrou> Remove unneeded code 85877648e <Antoine Pitrou> Add license 3b89b191e <Antoine Pitrou> Make use of double-conversion private. 9e1da51d1 <Antoine Pitrou> ARROW-6633: Vendor double-conversion library Authored-by: Antoine Pitrou <antoine@python.org> Signed-off-by: François Saint-Jacques <fsaintjacques@gmail.com>
diff --git a/LICENSE.txt b/LICENSE.txt
@@ -741,6 +741,38 @@ You can contact the author at :
 
 --------------------------------------------------------------------------------
 
+The files in cpp/src/arrow/vendored/double-conversion/ have the following license
+(BSD 3-Clause License)
+
+Copyright 2006-2011, the V8 project authors. All rights reserved.
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+    * Neither the name of Google Inc. nor the names of its
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+--------------------------------------------------------------------------------
+
 The files under dev/tasks/conda-recipes have the following license
 
 BSD 3-clause license
@@ -1326,39 +1358,6 @@ Other dependencies and licenses:
 
 --------------------------------------------------------------------------------
 
-3rdparty dependency double-conversion is statically linked in certain binary
-distributions, like the python wheels. double-conversion has the following
-license:
-
-Copyright 2006-2011, the V8 project authors. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-    * Neither the name of Google Inc. nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
---------------------------------------------------------------------------------
-
 3rdparty dependency snappy is statically linked in certain binary
 distributions, like the python wheels. snappy has the following license:
 
diff --git a/dev/tasks/conda-recipes/arrow-cpp/meta.yaml b/dev/tasks/conda-recipes/arrow-cpp/meta.yaml
@@ -24,7 +24,6 @@ requirements:
     - boost-cpp
     - brotli
     - c-ares
-    - double-conversion
     - gflags
     - glog
     - grpc-cpp
@@ -49,7 +48,6 @@ requirements:
     - boost-cpp
     - brotli
     - c-ares
-    - double-conversion
     - gflags
     - glog
     - grpc-cpp
diff --git a/dev/tasks/homebrew-formulae/apache-arrow.rb b/dev/tasks/homebrew-formulae/apache-arrow.rb
@@ -9,7 +9,6 @@ class ApacheArrow < Formula
   depends_on "aws-sdk-cpp"
   depends_on "boost"
   depends_on "brotli"
-  depends_on "double-conversion"
   depends_on "flatbuffers"
   depends_on "glog"
   depends_on "grpc"
diff --git a/dev/tasks/homebrew-formulae/autobrew/apache-arrow.rb b/dev/tasks/homebrew-formulae/autobrew/apache-arrow.rb
@@ -33,7 +33,6 @@ class ApacheArrow < Formula
   depends_on "cmake" => :build
   depends_on "flatbuffers" => :build
   depends_on "boost"
-  depends_on "double-conversion"
   depends_on "lz4"
   depends_on "snappy"
   depends_on "thrift"
@@ -74,7 +73,7 @@ def install
         return 0;
       }
     EOS
-    system ENV.cxx, "test.cpp", "-std=c++11", "-I#{include}", "-L#{lib}", "-larrow", "-lparquet", "-lthrift", "-llz4", "-lboost_system", "-lboost_regex", "-ldouble-conversion", "-lsnappy", "-o", "test"
+    system ENV.cxx, "test.cpp", "-std=c++11", "-I#{include}", "-L#{lib}", "-larrow", "-lparquet", "-lthrift", "-llz4", "-lboost_system", "-lboost_regex", "-lsnappy", "-o", "test"
     system "./test"
   end
 end
diff --git a/dev/tasks/linux-packages/apache-arrow/apt/debian-buster/Dockerfile b/dev/tasks/linux-packages/apache-arrow/apt/debian-buster/Dockerfile
@@ -47,7 +47,6 @@ RUN \
     libbrotli-dev \
     libbz2-dev \
     libc-ares-dev \
-    libdouble-conversion-dev \
     libgirepository1.0-dev \
     libglib2.0-doc \
     libgmock-dev \
diff --git a/dev/tasks/linux-packages/apache-arrow/apt/debian-stretch/Dockerfile b/dev/tasks/linux-packages/apache-arrow/apt/debian-stretch/Dockerfile
@@ -56,7 +56,6 @@ RUN \
     libbrotli-dev \
     libbz2-dev \
     libc-ares-dev \
-    libdouble-conversion-dev \
     libgirepository1.0-dev \
     libglib2.0-doc \
     libgoogle-glog-dev \
diff --git a/dev/tasks/linux-packages/apache-arrow/apt/ubuntu-bionic/Dockerfile b/dev/tasks/linux-packages/apache-arrow/apt/ubuntu-bionic/Dockerfile
@@ -43,7 +43,6 @@ RUN \
     libboost-system-dev \
     libbrotli-dev \
     libbz2-dev \
-    libdouble-conversion-dev \
     libgirepository1.0-dev \
     libglib2.0-doc \
     libgoogle-glog-dev \
diff --git a/dev/tasks/linux-packages/apache-arrow/apt/ubuntu-disco/Dockerfile b/dev/tasks/linux-packages/apache-arrow/apt/ubuntu-disco/Dockerfile
@@ -44,7 +44,6 @@ RUN \
     libboost-system-dev \
     libbrotli-dev \
     libbz2-dev \
-    libdouble-conversion-dev \
     libgirepository1.0-dev \
     libglib2.0-doc \
     libgmock-dev \
diff --git a/dev/tasks/linux-packages/apache-arrow/apt/ubuntu-eoan/Dockerfile b/dev/tasks/linux-packages/apache-arrow/apt/ubuntu-eoan/Dockerfile
@@ -44,7 +44,6 @@ RUN \
     libboost-system-dev \
     libbrotli-dev \
     libbz2-dev \
-    libdouble-conversion-dev \
     libgirepository1.0-dev \
     libglib2.0-doc \
     libgmock-dev \
diff --git a/dev/tasks/linux-packages/apache-arrow/apt/ubuntu-xenial/Dockerfile b/dev/tasks/linux-packages/apache-arrow/apt/ubuntu-xenial/Dockerfile
@@ -52,7 +52,6 @@ RUN \
     libboost-system-dev \
     libbrotli-dev \
     libbz2-dev \
-    libdouble-conversion-dev \
     libgirepository1.0-dev \
     libglib2.0-doc \
     libgoogle-glog-dev \
diff --git a/dev/tasks/linux-packages/apache-arrow/debian.ubuntu-xenial/control b/dev/tasks/linux-packages/apache-arrow/debian.ubuntu-xenial/control
@@ -17,7 +17,6 @@ Build-Depends:
   libboost-regex-dev,
   libboost-system-dev,
   libbrotli-dev,
-  libdouble-conversion-dev,
   libgirepository1.0-dev,
   libgoogle-glog-dev,
   liblz4-dev,
diff --git a/dev/tasks/linux-packages/apache-arrow/debian/control b/dev/tasks/linux-packages/apache-arrow/debian/control
@@ -16,7 +16,6 @@ Build-Depends:
   libboost-system-dev,
   libbrotli-dev,
   libbz2-dev,
-  libdouble-conversion-dev,
   libgirepository1.0-dev,
   libgoogle-glog-dev,
   libgtest-dev,
diff --git a/dev/tasks/linux-packages/apache-arrow/yum/arrow.spec.in b/dev/tasks/linux-packages/apache-arrow/yum/arrow.spec.in
@@ -43,7 +43,6 @@
 %define use_glib (%{_centos_ver} >= 7)
 %define use_meson (%{_centos_ver} >= 8)
 
-%define have_double_conversion (%{_centos_ver} >= 7)
 %define have_rapidjson (%{_centos_ver} == 7)
 %define have_thrift (%{_centos_ver} == 7)
 
@@ -63,9 +62,6 @@ BuildRequires:	brotli-devel
 %endif
 BuildRequires:	bzip2-devel
 BuildRequires:	cmake%{cmake_version}
-%if %{have_double_conversion}
-BuildRequires:	double-conversion-devel
-%endif
 BuildRequires:	gcc-c++
 BuildRequires:	gflags-devel
 BuildRequires:	git
@@ -201,9 +197,6 @@ Requires:	boost%{boost_version}-filesystem
 Requires:	boost%{boost_version}-regex
 Requires:	brotli
 %endif
-%if %{have_double_conversion}
-Requires:	double-conversion
-%endif
 Requires:	gflags
 %if %{_centos_ver} >= 7
 Requires:	glog
diff --git a/dev/tasks/linux-packages/apache-arrow/yum/centos-7/Dockerfile b/dev/tasks/linux-packages/apache-arrow/yum/centos-7/Dockerfile
@@ -34,7 +34,6 @@ RUN \
     brotli-devel \
     bzip2-devel \
     cmake3 \
-    double-conversion-devel \
     flex \
     gflags-devel \
     git \
diff --git a/dev/tasks/linux-packages/apache-arrow/yum/centos-8/Dockerfile b/dev/tasks/linux-packages/apache-arrow/yum/centos-8/Dockerfile
@@ -32,7 +32,6 @@ RUN \
     bzip2-devel \
     clang \
     cmake \
-    double-conversion-devel \
     flex \
     gcc-c++ \
     gflags-devel \
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -398,7 +398,6 @@ services:
     environment:
       # Vendor boost to avoid dealing with stale FindBoost.
       ARROW_BOOST_SOURCE: "BUNDLED"
-      double-conversion_SOURCE: "BUNDLED"
       ARROW_ORC: "OFF"
       ARROW_GANDIVA: "OFF"
       # uriparser requires cmake 3.3
