From ee2ec2f1c29144053dd8a4543a885f929aec6dc5 Mon Sep 17 00:00:00 2001 From: Robert Schulze Date: Tue, 2 Apr 2024 13:39:58 +0000 Subject: [PATCH 1/4] Remove double-conversion submodule --- .gitmodules | 3 --- contrib/double-conversion | 1 - 2 files changed, 4 deletions(-) delete mode 160000 contrib/double-conversion diff --git a/.gitmodules b/.gitmodules index a618104f364..b6a5c5824b8 100644 --- a/.gitmodules +++ b/.gitmodules @@ -22,9 +22,6 @@ [submodule "contrib/capnproto"] path = contrib/capnproto url = https://github.com/ClickHouse/capnproto -[submodule "contrib/double-conversion"] - path = contrib/double-conversion - url = https://github.com/google/double-conversion [submodule "contrib/re2"] path = contrib/re2 url = https://github.com/google/re2 diff --git a/contrib/double-conversion b/contrib/double-conversion deleted file mode 160000 index cf2f0f3d547..00000000000 --- a/contrib/double-conversion +++ /dev/null @@ -1 +0,0 @@ -Subproject commit cf2f0f3d547dc73b4612028a155b80536902ba02 From 732c215a27c02d66bea48c27c8bab6ebfbf4b5a4 Mon Sep 17 00:00:00 2001 From: Robert Schulze Date: Tue, 2 Apr 2024 13:40:40 +0000 Subject: [PATCH 2/4] Add ClickHouse double-conversion submodule --- .gitmodules | 3 +++ contrib/double-conversion | 1 + 2 files changed, 4 insertions(+) create mode 160000 contrib/double-conversion diff --git a/.gitmodules b/.gitmodules index b6a5c5824b8..6c8de2fce64 100644 --- a/.gitmodules +++ b/.gitmodules @@ -366,3 +366,6 @@ [submodule "contrib/idna"] path = contrib/idna url = https://github.com/ada-url/idna.git +[submodule "contrib/double-conversion"] + path = contrib/double-conversion + url = https://github.com/ClickHouse/double-conversion.git diff --git a/contrib/double-conversion b/contrib/double-conversion new file mode 160000 index 00000000000..cf2f0f3d547 --- /dev/null +++ b/contrib/double-conversion @@ -0,0 +1 @@ +Subproject commit cf2f0f3d547dc73b4612028a155b80536902ba02 From 7d87adc91ac3941deb0fa94dbe6d8237c35434ad Mon Sep 17 00:00:00 2001 From: Robert Schulze Date: Tue, 2 Apr 2024 13:51:36 +0000 Subject: [PATCH 3/4] Upgrade double-conversion to 3.3.0 --- contrib/double-conversion-cmake/CMakeLists.txt | 17 +++++++++-------- src/IO/ReadHelpers.h | 1 - src/IO/readFloatText.h | 1 - 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/contrib/double-conversion-cmake/CMakeLists.txt b/contrib/double-conversion-cmake/CMakeLists.txt index dc5b1719abf..4bea86985a1 100644 --- a/contrib/double-conversion-cmake/CMakeLists.txt +++ b/contrib/double-conversion-cmake/CMakeLists.txt @@ -1,14 +1,15 @@ SET(LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/double-conversion") add_library(_double-conversion -"${LIBRARY_DIR}/double-conversion/bignum.cc" -"${LIBRARY_DIR}/double-conversion/bignum-dtoa.cc" -"${LIBRARY_DIR}/double-conversion/cached-powers.cc" -"${LIBRARY_DIR}/double-conversion/diy-fp.cc" -"${LIBRARY_DIR}/double-conversion/double-conversion.cc" -"${LIBRARY_DIR}/double-conversion/fast-dtoa.cc" -"${LIBRARY_DIR}/double-conversion/fixed-dtoa.cc" -"${LIBRARY_DIR}/double-conversion/strtod.cc") + "${LIBRARY_DIR}/double-conversion/bignum-dtoa.cc" + "${LIBRARY_DIR}/double-conversion/bignum.cc" + "${LIBRARY_DIR}/double-conversion/cached-powers.cc" + "${LIBRARY_DIR}/double-conversion/double-to-string.cc" + "${LIBRARY_DIR}/double-conversion/fast-dtoa.cc" + "${LIBRARY_DIR}/double-conversion/fixed-dtoa.cc" + "${LIBRARY_DIR}/double-conversion/string-to-double.cc" + "${LIBRARY_DIR}/double-conversion/strtod.cc" +) target_include_directories(_double-conversion SYSTEM BEFORE PUBLIC "${LIBRARY_DIR}") diff --git a/src/IO/ReadHelpers.h b/src/IO/ReadHelpers.h index ca568c469b4..36831fd1171 100644 --- a/src/IO/ReadHelpers.h +++ b/src/IO/ReadHelpers.h @@ -41,7 +41,6 @@ #include #include -#include static constexpr auto DEFAULT_MAX_STRING_SIZE = 1_GiB; diff --git a/src/IO/readFloatText.h b/src/IO/readFloatText.h index 597f0a06fb9..d1652784cc2 100644 --- a/src/IO/readFloatText.h +++ b/src/IO/readFloatText.h @@ -4,7 +4,6 @@ #include #include #include -#include #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wunneeded-internal-declaration" From 427ad784e8a07c204492006e47446d0c3deff76d Mon Sep 17 00:00:00 2001 From: Robert Schulze Date: Tue, 2 Apr 2024 16:04:24 +0000 Subject: [PATCH 4/4] Actually bump the submodule --- contrib/double-conversion | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/double-conversion b/contrib/double-conversion index cf2f0f3d547..4f7a25d8ced 160000 --- a/contrib/double-conversion +++ b/contrib/double-conversion @@ -1 +1 @@ -Subproject commit cf2f0f3d547dc73b4612028a155b80536902ba02 +Subproject commit 4f7a25d8ced8c7cf6eee6fd09d6788eaa23c9afe