Removed ryu

This commit is contained in:
Maksim Kita 2020-12-06 15:39:39 +03:00
parent 074d0ee6ae
commit 977da3d052
9 changed files with 4 additions and 27 deletions

5
.gitmodules vendored
View File

@ -142,9 +142,6 @@
[submodule "contrib/replxx"] [submodule "contrib/replxx"]
path = contrib/replxx path = contrib/replxx
url = https://github.com/ClickHouse-Extras/replxx.git url = https://github.com/ClickHouse-Extras/replxx.git
[submodule "contrib/ryu"]
path = contrib/ryu
url = https://github.com/ClickHouse-Extras/ryu.git
[submodule "contrib/avro"] [submodule "contrib/avro"]
path = contrib/avro path = contrib/avro
url = https://github.com/ClickHouse-Extras/avro.git url = https://github.com/ClickHouse-Extras/avro.git
@ -211,4 +208,4 @@
branch = lts_2020_02_25 branch = lts_2020_02_25
[submodule "contrib/dragonbox"] [submodule "contrib/dragonbox"]
path = contrib/dragonbox path = contrib/dragonbox
url = https://github.com/kitaisreal/dragonbox.git url = https://github.com/ClickHouse-Extras/dragonbox.git

View File

@ -35,7 +35,6 @@ add_subdirectory (libmetrohash)
add_subdirectory (lz4-cmake) add_subdirectory (lz4-cmake)
add_subdirectory (murmurhash) add_subdirectory (murmurhash)
add_subdirectory (replxx-cmake) add_subdirectory (replxx-cmake)
add_subdirectory (ryu-cmake)
add_subdirectory (unixodbc-cmake) add_subdirectory (unixodbc-cmake)
add_subdirectory (xz) add_subdirectory (xz)

2
contrib/dragonbox vendored

@ -1 +1 @@
Subproject commit e8e3cb714256dd99600021005c8ff2b78aadfa90 Subproject commit b2751c65c0592c0239aec3becd53d0ea2fde9329

1
contrib/ryu vendored

@ -1 +0,0 @@
Subproject commit 5b4a853534b47438b4d97935370f6b2397137c2b

View File

@ -1,10 +0,0 @@
SET(LIBRARY_DIR ${ClickHouse_SOURCE_DIR}/contrib/ryu)
add_library(ryu
${LIBRARY_DIR}/ryu/d2fixed.c
${LIBRARY_DIR}/ryu/d2s.c
${LIBRARY_DIR}/ryu/f2s.c
${LIBRARY_DIR}/ryu/generic_128.c
)
target_include_directories(ryu SYSTEM BEFORE PUBLIC "${LIBRARY_DIR}")

View File

@ -137,7 +137,6 @@ function clone_submodules
contrib/libxml2 contrib/libxml2
contrib/poco contrib/poco
contrib/libunwind contrib/libunwind
contrib/ryu
contrib/fmtlib contrib/fmtlib
contrib/base64 contrib/base64
contrib/cctz contrib/cctz

View File

@ -242,7 +242,6 @@ target_link_libraries (clickhouse_common_io
PUBLIC PUBLIC
common common
${DOUBLE_CONVERSION_LIBRARIES} ${DOUBLE_CONVERSION_LIBRARIES}
ryu
dragonbox_to_chars dragonbox_to_chars
) )

View File

@ -80,9 +80,8 @@ target_link_libraries (parse_date_time_best_effort PRIVATE clickhouse_common_io)
add_executable (zlib_ng_bug zlib_ng_bug.cpp) add_executable (zlib_ng_bug zlib_ng_bug.cpp)
target_link_libraries (zlib_ng_bug PRIVATE ${ZLIB_LIBRARIES}) target_link_libraries (zlib_ng_bug PRIVATE ${ZLIB_LIBRARIES})
add_executable (ryu_test ryu_test.cpp) add_executable (dragonbox_test dragonbox_test.cpp)
target_link_libraries (ryu_test PRIVATE ryu) target_link_libraries (dragonbox_test PRIVATE dragonbox_to_chars)
target_link_libraries (ryu_test PRIVATE dragonbox_to_chars)
add_executable (zstd_buffers zstd_buffers.cpp) add_executable (zstd_buffers zstd_buffers.cpp)
target_link_libraries (zstd_buffers PRIVATE clickhouse_common_io) target_link_libraries (zstd_buffers PRIVATE clickhouse_common_io)

View File

@ -1,7 +1,6 @@
#include <string> #include <string>
#include <iostream> #include <iostream>
#include <cstring> #include <cstring>
#include <ryu/ryu.h>
#include <dragonbox/dragonbox_to_chars.h> #include <dragonbox/dragonbox_to_chars.h>
struct DecomposedFloat64 struct DecomposedFloat64
@ -84,10 +83,6 @@ int main(int argc, char ** argv)
double x = argc > 1 ? std::stod(argv[1]) : 0; double x = argc > 1 ? std::stod(argv[1]) : 0;
char buf[32]; char buf[32];
std::cout << "ryu output" << std::endl;
d2s_buffered(x, buf);
std::cout << buf << "\n";
std::cout << "dragonbox output" << std::endl; std::cout << "dragonbox output" << std::endl;
jkj::dragonbox::to_chars(x, buf); jkj::dragonbox::to_chars(x, buf);
std::cout << buf << "\n"; std::cout << buf << "\n";