Skip to content

Commit 2ae9c9a

Browse files
alexey-milovidovalexey-milovidov
committed
Revert "Merge pull request #63279 from allmazz/mongodb_refactoring"
This reverts commit 14cb02a, reversing changes made to a940a9e.
1 parent ea71d7f commit 2ae9c9a

File tree

103 files changed

+1504
-6101
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

103 files changed

+1504
-6101
lines changed

‎.gitmodules‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -363,12 +363,6 @@
363363
[submodule "contrib/double-conversion"]
364364
path = contrib/double-conversion
365365
url = https://github.com/ClickHouse/double-conversion.git
366-
[submodule "contrib/mongo-cxx-driver"]
367-
path = contrib/mongo-cxx-driver
368-
url = https://github.com/ClickHouse/mongo-cxx-driver.git
369-
[submodule "contrib/mongo-c-driver"]
370-
path = contrib/mongo-c-driver
371-
url = https://github.com/ClickHouse/mongo-c-driver.git
372366
[submodule "contrib/numactl"]
373367
path = contrib/numactl
374368
url = https://github.com/ClickHouse/numactl.git

‎base/poco/CMakeLists.txt‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,7 @@ add_subdirectory (Data)
33
add_subdirectory (Data/ODBC)
44
add_subdirectory (Foundation)
55
add_subdirectory (JSON)
6-
7-
if (USE_MONGODB)
8-
add_subdirectory(MongoDB)
9-
endif()
10-
6+
add_subdirectory (MongoDB)
117
add_subdirectory (Net)
128
add_subdirectory (NetSSL_OpenSSL)
139
add_subdirectory (Redis)

‎cmake/linux/toolchain-x86_64-musl.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --gcc-toolchain=${TOOLCHAIN_PATH}")
1818
set (CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} --gcc-toolchain=${TOOLCHAIN_PATH}")
1919

2020
set (USE_MUSL 1)
21-
add_definitions(-DUSE_MUSL=1 -D__MUSL__=1)
21+
add_definitions(-DUSE_MUSL=1)

‎contrib/CMakeLists.txt‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -160,12 +160,6 @@ add_contrib (datasketches-cpp-cmake datasketches-cpp)
160160
add_contrib (incbin-cmake incbin)
161161
add_contrib (sqids-cpp-cmake sqids-cpp)
162162

163-
option(USE_MONGODB "Enable MongoDB support" ${ENABLE_LIBRARIES})
164-
if (USE_MONGODB)
165-
add_contrib (mongo-c-driver-cmake mongo-c-driver) # requires: zlib
166-
add_contrib (mongo-cxx-driver-cmake mongo-cxx-driver) # requires: libmongoc, libbson
167-
endif()
168-
169163
option(ENABLE_NLP "Enable NLP functions support" ${ENABLE_LIBRARIES})
170164
if (ENABLE_NLP)
171165
add_contrib (libstemmer-c-cmake libstemmer_c)

‎contrib/mongo-c-driver‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎contrib/mongo-c-driver-cmake/CMakeLists.txt‎

Lines changed: 0 additions & 152 deletions
This file was deleted.

‎contrib/mongo-cxx-driver‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎contrib/mongo-cxx-driver-cmake/CMakeLists.txt‎

Lines changed: 0 additions & 189 deletions
This file was deleted.

‎contrib/sysroot‎

0 commit comments

Comments
 (0)