final fix

cmake/find/s2geometry.cmake

@@ -7,9 +7,13 @@ if (ENABLE_S2_GEOMETRY)
         set (ENABLE_S2_GEOMETRY 0)
         set (USE_S2_GEOMETRY 0)
     else()
+        if (OPENSSL_FOUND)
             set (S2_GEOMETRY_LIBRARY s2)
             set (S2_GEOMETRY_INCLUDE_DIR ${ClickHouse_SOURCE_DIR}/contrib/s2geometry/src/s2)
             set (USE_S2_GEOMETRY 1)
+        else()
+            message (WARNING "S2 uses OpenSSL, but the latter is absent.")
+        endif()
     endif()
 
     if (NOT USE_S2_GEOMETRY)

contrib/s2geometry-cmake/CMakeLists.txt

@@ -90,6 +90,8 @@ set(S2_SRCS
     "${S2_SOURCE_DIR}/s2/s2wedge_relations.cc"
     "${S2_SOURCE_DIR}/s2/strings/ostringstream.cc"
     "${S2_SOURCE_DIR}/s2/strings/serialize.cc"
+    # ClickHouse doesn't use strings from abseil.
+    # So, there is no duplicate symbols.
     "${S2_SOURCE_DIR}/s2/third_party/absl/base/dynamic_annotations.cc"
     "${S2_SOURCE_DIR}/s2/third_party/absl/base/internal/raw_logging.cc"
     "${S2_SOURCE_DIR}/s2/third_party/absl/base/internal/throw_delegate.cc"

docs/en/development/contrib.md

@@ -79,6 +79,7 @@ SELECT library_name, license_type, license_path FROM system.licenses ORDER BY li
 | re2 | BSD 3-clause | /contrib/re2/LICENSE |
 | replxx | BSD 3-clause | /contrib/replxx/LICENSE.md |
 | rocksdb | BSD 3-clause | /contrib/rocksdb/LICENSE.leveldb |
+| s2geometry | Apache | /contrib/s2geometry/LICENSE |
 | sentry-native | MIT | /contrib/sentry-native/LICENSE |
 | simdjson | Apache | /contrib/simdjson/LICENSE |
 | snappy | Public Domain | /contrib/snappy/COPYING |

src/Functions/geoToS2.cpp

@@ -21,7 +21,6 @@ namespace DB
 namespace ErrorCodes
 {
     extern const int ILLEGAL_TYPE_OF_ARGUMENT;
-    extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
 }
 
 namespace