diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..335ec95
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+*.tar.gz
diff --git a/clickhouse/.gitignore b/clickhouse/.gitignore
new file mode 100644
index 0000000..035a2ff
--- /dev/null
+++ b/clickhouse/.gitignore
@@ -0,0 +1 @@
+clickhouse*
diff --git a/clickhouse/README.md b/clickhouse/README.md
new file mode 100644
index 0000000..94debc1
--- /dev/null
+++ b/clickhouse/README.md
@@ -0,0 +1,41 @@
+# clickhouse
+
+Patches and notes for building ClickHouse on illumos.
+
+## Building
+
+```bash
+$ ./build.sh
+```
+
+## Patches
+
+Most patches have been upstreamed into their various homes. The remaining are
+mostly related to some C++ standard library wierdness. The files in
+`patches/direct` are applied to the source (after cloning submodules), and
+those in `patches/cmake` are applied after running `cmake` as they apply to
+some of the generated build files.
+
+## Upstreaming
+
+In general, ClickHouse was very responsive to PRs, so additional work to
+upstream things should be straightforward. The only bit to record is how to
+handle updates to any of the repos cloned as submodules.
+
+After things have been upstreamed, say to `contrib/project-a`, run
+
+```bash
+$ git submodule update --checkout --remote contrib/project-a
+```
+
+This records the latest commit of the remote submodule into the superproject.
+Once all submodules have been updated like this, make a commit and put up
+a PR against ClickHouse as usual.
+
+## Errors
+
+If you see errors complaining about a submodule not having a particular
+commit or branch, you may need to specify the `branch` in the `.gitmodules`
+file. It should be whatever the remote uses as the default branch. Git
+defaults to using `master`, but many remotes don't use that name, hence
+the errors.
diff --git a/clickhouse/build.sh b/clickhouse/build.sh
new file mode 100755
index 0000000..1fc5a78
--- /dev/null
+++ b/clickhouse/build.sh
@@ -0,0 +1,162 @@
+#!/bin/bash
+
+set -o errexit
+set -o pipefail
+
+function info {
+	printf 'INFO: %s\n' "$*"
+}
+
+function header {
+	printf -- '\n'
+	printf -- '----------------------------------------------------------\n'
+	printf -- 'INFO: %s\n' "$*"
+	printf -- '----------------------------------------------------------\n'
+	printf -- '\n'
+}
+
+function fatal {
+	printf 'ERROR: %s\n' "$*" >&2
+	exit 1
+}
+
+ROOT=$(cd "$(dirname "$0")" && pwd)
+ARTEFACT="$ROOT/clickhouse"
+WORK="$ARTEFACT/build"
+VER="21.7"
+BRANCH="master"
+REPO="https://github.com/oxidecomputer/clickhouse"
+
+# Get platform specific options/tools/paths
+if [ $# -eq 0 ]; then
+    PLATFORM="$OSTYPE"
+else
+    PLATFORM="$1"
+fi
+case $PLATFORM in
+    linux*)
+        PLATFORM="linux"
+        BUILD_COMMAND="make"
+        CC=gcc-10
+        CXX=g++-10
+        STRIP_ARGS="--strip-debug"
+        NPROC="$(nproc)"
+        ;;
+    darwin*)
+        PLATFORM="macos"
+        BUILD_COMMAND="make"
+        CC=clang
+        CXX=clang
+        STRIP_ARGS="-S"
+        NPROC="$(sysctl -n hw.ncpu)"
+        ;;
+    solaris*|illumos*)
+        PLATFORM="illumos"
+        BUILD_COMMAND="ninja"
+        CC=gcc-10
+        CXX=g++-10
+        STRIP_ARGS="-x"
+        NPROC="$(nproc)"
+        ;;
+    *)
+        failed "Unsupported platform $PLATFORM"
+        exit 1
+        ;;
+esac
+COMMON_PATCH_DIR="$ROOT/common/patches"
+PATCH_DIR="$ROOT/$PLATFORM/patches"
+FILES_DIR="$ROOT/$PLATFORM/files"
+EXTRA_FILES=""
+if [ -d "$FILES_DIR" ]; then
+    EXTRA_FILES="$(ls "$FILES_DIR")"
+fi
+header "Building clickhouse for $PLATFORM"
+
+#
+# Download ClickHouse sources
+#
+if [ -d "$ARTEFACT" ]; then
+    info "ClickHouse repo exists, resetting to HEAD"
+    cd "$ARTEFACT"
+    git fetch origin
+    git switch "$BRANCH"
+    git reset --hard "origin/$BRANCH"
+    git submodule update --checkout --recursive --force
+else
+    info "Cloning ClickHouse sources"
+    git clone "$REPO"
+    cd "$ARTEFACT"
+    git switch "$BRANCH"
+    git submodule update --init --recursive
+fi
+
+# Apply common patches, independent of platform
+header "Applying shared ClickHouse patches"
+git apply --verbose $COMMON_PATCH_DIR/*
+
+# Patches to the actual sources. Below we apply those to CMake-generated files.
+if [ -d "$PATCH_DIR/direct" ]; then
+    header "Applying $PLATFORM-specific patches"
+    git apply --verbose $PATCH_DIR/direct/*
+fi
+
+header "Building ClickHouse"
+mkdir -p "$WORK" && cd "$WORK"
+FLAGS="-D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -D__EXTENSIONS__ -m64 -I$ARTEFACT/contrib/hyperscan-cmake/x86_64/"
+CC=$CC CXX=$CXX CFLAGS="$FLAGS" CXXFLAGS="$FLAGS" \
+cmake \
+    -DABSL_CXX_STANDARD="17" \
+    -DENABLE_LDAP=off \
+    -DUSE_INTERNAL_LDAP_LIBRARY=off \
+    -DENABLE_HDFS=off \
+    -DUSE_INTERNAL_HDFS3_LIBRARY=off \
+    -DENABLE_AMQPCPP=off \
+    -DENABLE_AVRO=off \
+    -DUSE_INTERNAL_AVRO_LIBRARY=off \
+    -DENABLE_CAPNP=off \
+    -DUSE_INTERNAL_CAPNP_LIBRARY=off \
+    -DENABLE_MSGPACK=off \
+    -DUSE_INTERNAL_MSGPACK_LIBRARY=off \
+    -DENABLE_MYSQL=off \
+    -DENABLE_S3=off \
+    -DUSE_INTERNAL_AWS_S3_LIBRARY=off \
+    -DENABLE_PARQUET=off \
+    -DUSE_INTERNAL_PARQUET_LIBRARY=off \
+    -DENABLE_ORC=off \
+    -DUSE_INTERNAL_ORC_LIBRARY=off \
+    -DUSE_SENTRY=off \
+    -DENABLE_CLICKHOUSE_ODBC_BRIDGE=off \
+    -DENABLE_CLICKHOUSE_BENCHMARK=off \
+    -DENABLE_TESTS=off \
+    "$ARTEFACT"
+
+header "Patching CMake-generated files"
+cd "$ARTEFACT"
+if [ -d "$PATCH_DIR/cmake" ]; then
+    git apply --verbose $PATCH_DIR/cmake/*
+fi
+cd "$WORK"
+
+# The build is massive. Try to parallelize until we error out, usually due to space constraints while
+# linking. At that point, continue serially
+$BUILD_COMMAND -j "$NPROC" || (header "Parallel build failed, continuing serially" && $BUILD_COMMAND -j 1)
+
+# Strip the resulting binary. This part is crucial. ClickHouse's binary is 3+GiB unstripped.
+strip $STRIP_ARGS "$WORK/programs/clickhouse"
+CONFIG_FILE_DIR="$ARTEFACT/programs/server"
+CONFIG_FILE_NAME="config.xml"
+if [ -z "$EXTRA_FILES" ]; then
+    /usr/bin/tar cvfz \
+        $ROOT/clickhouse-v$VER.$PLATFORM.tar.gz \
+        -C "$WORK/programs" clickhouse \
+        -C "$CONFIG_FILE_DIR" "$CONFIG_FILE_NAME"
+else
+    /usr/bin/tar cvfz \
+        $ROOT/clickhouse-v$VER.$PLATFORM.tar.gz \
+        -C "$WORK/programs" clickhouse \
+        -C "$CONFIG_FILE_DIR" "$CONFIG_FILE_NAME" \
+        -C "$FILES_DIR" "$EXTRA_FILES"
+fi
+
+header "Build output:"
+find "$WORK" -type f -ls
diff --git a/clickhouse/common/patches/config.patch b/clickhouse/common/patches/config.patch
new file mode 100644
index 0000000..0f5ef62
--- /dev/null
+++ b/clickhouse/common/patches/config.patch
@@ -0,0 +1,64 @@
+diff --git a/programs/server/config.xml b/programs/server/config.xml
+index df8a5266c3..e58318e970 100644
+--- a/programs/server/config.xml
++++ b/programs/server/config.xml
+@@ -22,8 +22,8 @@
+             [1]: https://github.com/pocoproject/poco/blob/poco-1.9.4-release/Foundation/include/Poco/Logger.h#L105-L114
+         -->
+         <level>trace</level>
+-        <log>/var/log/clickhouse-server/clickhouse-server.log</log>
+-        <errorlog>/var/log/clickhouse-server/clickhouse-server.err.log</errorlog>
++        <log>/tmp/clickhouse/21.7/clickhouse-server.log</log>
++        <errorlog>/tmp/clickhouse/21.7/clickhouse-server.err.log</errorlog>
+         <!-- Rotation policy
+              See https://github.com/pocoproject/poco/blob/poco-1.9.4-release/Foundation/include/Poco/FileChannel.h#L54-L85
+           -->
+@@ -333,10 +333,10 @@
+     <compiled_expression_cache_size>1073741824</compiled_expression_cache_size>
+ 
+     <!-- Path to data directory, with trailing slash. -->
+-    <path>/var/lib/clickhouse/</path>
++    <path>/tmp/clickhouse/21.7/</path>
+ 
+     <!-- Path to temporary data for processing hard queries. -->
+-    <tmp_path>/var/lib/clickhouse/tmp/</tmp_path>
++    <tmp_path>/tmp/clickhouse/21.7/tmp/</tmp_path>
+ 
+     <!-- Policy from the <storage_configuration> for the temporary files.
+          If not set <tmp_path> is used, otherwise <tmp_path> is ignored.
+@@ -350,7 +350,7 @@
+     <!-- <tmp_policy>tmp</tmp_policy> -->
+ 
+     <!-- Directory with user provided files that are accessible by 'file' table function. -->
+-    <user_files_path>/var/lib/clickhouse/user_files/</user_files_path>
++    <user_files_path>/tmp/clickhouse/21.7/user_files/</user_files_path>
+ 
+     <!-- LDAP server definitions. -->
+     <ldap_servers>
+@@ -425,7 +425,7 @@
+         </users_xml>
+         <local_directory>
+             <!-- Path to folder where users created by SQL commands are stored. -->
+-            <path>/var/lib/clickhouse/access/</path>
++            <path>/tmp/clickhouse/21.7/access/</path>
+         </local_directory>
+ 
+         <!-- To add an LDAP server as a remote user directory of users that are not defined locally, define a single 'ldap' section
+@@ -927,7 +927,7 @@
+     <!-- <path_to_regions_names_files>/opt/geo/</path_to_regions_names_files> -->
+ 
+ 
+-    <!-- <top_level_domains_path>/var/lib/clickhouse/top_level_domains/</top_level_domains_path> -->
++    <!-- <top_level_domains_path>/tmp/clickhouse/21.7/top_level_domains/</top_level_domains_path> -->
+     <!-- Custom TLD lists.
+          Format: <name>/path/to/file</name>
+ 
+@@ -1040,7 +1040,7 @@
+     <!-- Directory in <clickhouse-path> containing schema files for various input formats.
+          The directory will be created if it doesn't exist.
+       -->
+-    <format_schema_path>/var/lib/clickhouse/format_schemas/</format_schema_path>
++    <format_schema_path>/tmp/clickhouse/21.7/format_schemas/</format_schema_path>
+ 
+     <!-- Default query masking rules, matching lines would be replaced with something else in the logs
+         (both text logs and system.query_log).
diff --git a/clickhouse/common/patches/embedded.patch b/clickhouse/common/patches/embedded.patch
new file mode 100644
index 0000000..fb3826a
--- /dev/null
+++ b/clickhouse/common/patches/embedded.patch
@@ -0,0 +1,13 @@
+diff --git a/programs/server/embedded.xml b/programs/server/embedded.xml
+index a66f57d1eb..bfb374091c 100644
+--- a/programs/server/embedded.xml
++++ b/programs/server/embedded.xml
+@@ -10,7 +10,7 @@
+     <tcp_port>9000</tcp_port>
+     <mysql_port>9004</mysql_port>
+ 
+-    <path>./</path>
++    <path>/tmp</path>
+ 
+     <uncompressed_cache_size>8589934592</uncompressed_cache_size>
+     <mark_cache_size>5368709120</mark_cache_size>
diff --git a/clickhouse/illumos/files/manifest.xml b/clickhouse/illumos/files/manifest.xml
new file mode 100644
index 0000000..bc2eb48
--- /dev/null
+++ b/clickhouse/illumos/files/manifest.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0"?>
+<!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
+
+<service_bundle type='manifest' name='clickhouse'>
+
+<service name='system/illumos/clickhouse' type='service' version='1'>
+  <create_default_instance enabled='false' />
+  <single_instance />
+
+  <exec_method type='method' name='start'
+    exec='ctrun -l child -o noorphan,regent /opt/clickhouse/21.7/clickhouse server --config-file %{config/config_file} &amp;'
+    timeout_seconds='0' />
+  <exec_method type='method' name='stop' exec=':kill' timeout_seconds='0' />
+
+  <property_group name='config' type='application'>
+    <propval name='config_file' type='astring' value='/opt/clickhouse/21.7/config.xml' />
+  </property_group>
+
+  <property_group name='startd' type='framework'>
+    <propval name='duration' type='astring' value='contract' />
+  </property_group>
+
+  <stability value='Unstable' />
+
+  <template>
+    <common_name>
+      <loctext xml:lang='C'>ClickHouse</loctext>
+    </common_name>
+    <description>
+      <loctext xml:lang='C'>Oxide metric database</loctext>
+    </description>
+  </template>
+</service>
+
+</service_bundle>
diff --git a/clickhouse/illumos/patches/cmake/boringssl-cmake.patch b/clickhouse/illumos/patches/cmake/boringssl-cmake.patch
new file mode 100644
index 0000000..0673711
--- /dev/null
+++ b/clickhouse/illumos/patches/cmake/boringssl-cmake.patch
@@ -0,0 +1,18 @@
+diff --git a/contrib/boringssl-cmake/CMakeLists.txt b/contrib/boringssl-cmake/CMakeLists.txt
+index 017a8a6..7e68e7c 100644
+--- a/contrib/boringssl-cmake/CMakeLists.txt
++++ b/contrib/boringssl-cmake/CMakeLists.txt
+@@ -78,7 +78,11 @@ elseif(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "AMD64")
+ elseif(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86")
+   set(ARCH "x86")
+ elseif(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "i386")
+-  set(ARCH "x86")
++  if(${CMAKE_SYSTEM_NAME} STREQUAL "SunOS")
++    set(ARCH "x86_64")
++  else()
++    set(ARCH "x86")
++  endif()
+ elseif(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "i686")
+   set(ARCH "x86")
+ elseif(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "aarch64")
+Submodule contrib/cppkafka contains modified content
diff --git a/clickhouse/illumos/patches/cmake/poco-cmake.patch b/clickhouse/illumos/patches/cmake/poco-cmake.patch
new file mode 100644
index 0000000..d82b5df
--- /dev/null
+++ b/clickhouse/illumos/patches/cmake/poco-cmake.patch
@@ -0,0 +1,16 @@
+diff --git a/contrib/poco-cmake/Net/CMakeLists.txt b/contrib/poco-cmake/Net/CMakeLists.txt
+index 9bc06e5..dd6894f 100644
+--- a/contrib/poco-cmake/Net/CMakeLists.txt
++++ b/contrib/poco-cmake/Net/CMakeLists.txt
+@@ -127,6 +127,10 @@ if (USE_INTERNAL_POCO_LIBRARY)
+     )
+     target_include_directories (_poco_net SYSTEM PUBLIC "${LIBRARY_DIR}/Net/include")
+     target_link_libraries (_poco_net PUBLIC Poco::Foundation)
++
++    if (OS_SUNOS)
++		target_link_libraries (_poco_net PUBLIC socket nsl)
++    endif()
+ else ()
+     add_library (Poco::Net UNKNOWN IMPORTED GLOBAL)
+ 
+Submodule contrib/rocksdb contains modified content
diff --git a/clickhouse/illumos/patches/direct/AbseilConfigureCopts.patch b/clickhouse/illumos/patches/direct/AbseilConfigureCopts.patch
new file mode 100644
index 0000000..8ec937c
--- /dev/null
+++ b/clickhouse/illumos/patches/direct/AbseilConfigureCopts.patch
@@ -0,0 +1,10 @@
+diff --git a/contrib/abseil-cpp/absl/copts/AbseilConfigureCopts.cmake b/contrib/abseil-cpp/absl/copts/AbseilConfigureCopts.cmake
+index 77d4ace..30891a4 100644
+--- a/contrib/abseil-cpp/absl/copts/AbseilConfigureCopts.cmake
++++ b/contrib/abseil-cpp/absl/copts/AbseilConfigureCopts.cmake
+@@ -72,3 +72,5 @@ elseif(NOT "${CMAKE_CXX_STANDARD}")
+ else()
+   set(ABSL_CXX_STANDARD "${CMAKE_CXX_STANDARD}")
+ endif()
++# Absl cannot work with C++20, which removed some typedefs for std::allocator
++set(ABSL_CXX_STANDARD 17)
diff --git a/clickhouse/illumos/patches/direct/PerformanceAdaptors.patch b/clickhouse/illumos/patches/direct/PerformanceAdaptors.patch
new file mode 100644
index 0000000..3f4d412
--- /dev/null
+++ b/clickhouse/illumos/patches/direct/PerformanceAdaptors.patch
@@ -0,0 +1,13 @@
+diff --git a/src/Functions/PerformanceAdaptors.h b/src/Functions/PerformanceAdaptors.h
+index 5d4d013..716bb65 100644
+--- a/src/Functions/PerformanceAdaptors.h
++++ b/src/Functions/PerformanceAdaptors.h
+@@ -99,7 +99,7 @@ namespace detail
+             ///  when there is no statistical significant difference between them.
+             double sigma() const
+             {
+-                return mean() / sqrt(adjustedCount());
++                return mean() / sqrt(static_cast<double>(adjustedCount()));
+             }
+ 
+             void run()
diff --git a/clickhouse/illumos/patches/direct/QuantileExact.patch b/clickhouse/illumos/patches/direct/QuantileExact.patch
new file mode 100644
index 0000000..3a7fa1d
--- /dev/null
+++ b/clickhouse/illumos/patches/direct/QuantileExact.patch
@@ -0,0 +1,50 @@
+diff --git a/src/AggregateFunctions/QuantileExact.h b/src/AggregateFunctions/QuantileExact.h
+index cca16aac61..607650700b 100644
+--- a/src/AggregateFunctions/QuantileExact.h
++++ b/src/AggregateFunctions/QuantileExact.h
+@@ -271,11 +271,11 @@ struct QuantileExactLow : public QuantileExactBase<Value, QuantileExactLow<Value
+                 auto s = array.size();
+                 if (s % 2 == 1)
+                 {
+-                    return array[static_cast<size_t>(floor(s / 2))];
++                    return array[static_cast<size_t>(static_cast<double>(floor(static_cast<double>(s / 2))))];
+                 }
+                 else
+                 {
+-                    return array[static_cast<size_t>((floor(s / 2)) - 1)];
++                    return array[static_cast<size_t>((static_cast<double>(floor(static_cast<double>(s / 2)))) - 1)];
+                 }
+             }
+             else
+@@ -307,11 +307,11 @@ struct QuantileExactLow : public QuantileExactBase<Value, QuantileExactLow<Value
+                     auto s = array.size();
+                     if (s % 2 == 1)
+                     {
+-                        result[indices[i]] = array[static_cast<size_t>(floor(s / 2))];
++                        result[indices[i]] = array[static_cast<size_t>(static_cast<double>(floor(static_cast<double>(s / 2))))];
+                     }
+                     else
+                     {
+-                        result[indices[i]] = array[static_cast<size_t>(floor((s / 2) - 1))];
++                        result[indices[i]] = array[static_cast<size_t>(static_cast<double>(floor(static_cast<double>(s / 2) - 1)))];
+                     }
+                 }
+                 else
+@@ -351,7 +351,7 @@ struct QuantileExactHigh : public QuantileExactBase<Value, QuantileExactHigh<Val
+             if (level == 0.5)
+             {
+                 auto s = array.size();
+-                return array[static_cast<size_t>(floor(s / 2))];
++                return array[static_cast<size_t>(static_cast<double>(floor(static_cast<double>(s / 2))))];
+             }
+             else
+             {
+@@ -379,7 +379,7 @@ struct QuantileExactHigh : public QuantileExactBase<Value, QuantileExactHigh<Val
+                 if (level == 0.5)
+                 {
+                     auto s = array.size();
+-                    result[indices[i]] = array[static_cast<size_t>(floor(s / 2))];
++                    result[indices[i]] = array[static_cast<size_t>(static_cast<double>(floor(static_cast<double>(s / 2))))];
+                 }
+                 else
+                 {
diff --git a/clickhouse/illumos/patches/direct/SimpleMergeSelector.patch b/clickhouse/illumos/patches/direct/SimpleMergeSelector.patch
new file mode 100644
index 0000000..c2b6601
--- /dev/null
+++ b/clickhouse/illumos/patches/direct/SimpleMergeSelector.patch
@@ -0,0 +1,15 @@
+diff --git a/src/Storages/MergeTree/SimpleMergeSelector.cpp b/src/Storages/MergeTree/SimpleMergeSelector.cpp
+index 972c6ea..b39a6ec 100644
+--- a/src/Storages/MergeTree/SimpleMergeSelector.cpp
++++ b/src/Storages/MergeTree/SimpleMergeSelector.cpp
+@@ -205,8 +205,8 @@ SimpleMergeSelector::PartsRange SimpleMergeSelector::select(
+     Estimator estimator;
+ 
+     /// Precompute logarithm of settings boundaries, because log function is quite expensive in terms of performance
+-    const double min_size_to_lower_base_log = log(1 + settings.min_size_to_lower_base);
+-    const double max_size_to_lower_base_log = log(1 + settings.max_size_to_lower_base);
++    const double min_size_to_lower_base_log = log(static_cast<double>(1 + settings.min_size_to_lower_base));
++    const double max_size_to_lower_base_log = log(static_cast<double>(1 + settings.max_size_to_lower_base));
+ 
+     for (const auto & part_range : parts_ranges)
+         selectWithinPartition(part_range, max_total_size_to_merge, estimator, settings, min_size_to_lower_base_log, max_size_to_lower_base_log);
diff --git a/clickhouse/illumos/patches/direct/VerticalRowOutputFormat.patch b/clickhouse/illumos/patches/direct/VerticalRowOutputFormat.patch
new file mode 100644
index 0000000..5bc0a32
--- /dev/null
+++ b/clickhouse/illumos/patches/direct/VerticalRowOutputFormat.patch
@@ -0,0 +1,20 @@
+diff --git a/src/Processors/Formats/Impl/VerticalRowOutputFormat.cpp b/src/Processors/Formats/Impl/VerticalRowOutputFormat.cpp
+index c6f37d2..8d292b2 100644
+--- a/src/Processors/Formats/Impl/VerticalRowOutputFormat.cpp
++++ b/src/Processors/Formats/Impl/VerticalRowOutputFormat.cpp
+@@ -80,7 +80,14 @@ void VerticalRowOutputFormat::writeRowStartDelimiter()
+     writeIntText(row_number, out);
+     writeCString(":\n", out);
+ 
+-    size_t width = log10(row_number + 1) + 1 + strlen("Row :");
++    size_t width = (
++#if defined(OS_SUNOS)
++        static_cast<size_t>(std::log10(static_cast<double>(row_number + 1)))
++#else
++        log10(row_number + 1)
++#endif
++	+ 1 + strlen("Row :")
++    );
+     for (size_t i = 0; i < width; ++i)
+         writeCString("─", out);
+     writeChar('\n', out);
diff --git a/clickhouse/illumos/patches/direct/datasketches-cpp.patch b/clickhouse/illumos/patches/direct/datasketches-cpp.patch
new file mode 100644
index 0000000..95b57e2
--- /dev/null
+++ b/clickhouse/illumos/patches/direct/datasketches-cpp.patch
@@ -0,0 +1,85 @@
+diff --git a/contrib/datasketches-cpp/theta/include/theta_union_base_impl.hpp b/contrib/datasketches-cpp/theta/include/theta_union_base_impl.hpp
+index ec8ce56..ad8075f 100644
+--- a/contrib/datasketches-cpp/theta/include/theta_union_base_impl.hpp
++++ b/contrib/datasketches-cpp/theta/include/theta_union_base_impl.hpp
+@@ -26,17 +26,17 @@
+ 
+ namespace datasketches {
+ 
+-template<typename EN, typename EK, typename P, typename S, typename CS, typename A>
+-theta_union_base<EN, EK, P, S, CS, A>::theta_union_base(uint8_t lg_cur_size, uint8_t lg_nom_size, resize_factor rf,
++template<typename EN, typename EK, typename P, typename S, typename CompactSketch, typename A>
++theta_union_base<EN, EK, P, S, CompactSketch, A>::theta_union_base(uint8_t lg_cur_size, uint8_t lg_nom_size, resize_factor rf,
+     uint64_t theta, uint64_t seed, const P& policy, const A& allocator):
+ policy_(policy),
+ table_(lg_cur_size, lg_nom_size, rf, theta, seed, allocator),
+ union_theta_(table_.theta_)
+ {}
+ 
+-template<typename EN, typename EK, typename P, typename S, typename CS, typename A>
+-template<typename SS>
+-void theta_union_base<EN, EK, P, S, CS, A>::update(SS&& sketch) {
++template<typename EN, typename EK, typename P, typename S, typename CompactSketch, typename A>
++template<typename SSketch>
++void theta_union_base<EN, EK, P, S, CompactSketch, A>::update(SSketch&& sketch) {
+   if (sketch.is_empty()) return;
+   if (sketch.get_seed_hash() != compute_seed_hash(table_.seed_)) throw std::invalid_argument("seed hash mismatch");
+   table_.is_empty_ = false;
+@@ -46,9 +46,9 @@ void theta_union_base<EN, EK, P, S, CS, A>::update(SS&& sketch) {
+     if (hash < union_theta_) {
+       auto result = table_.find(hash);
+       if (!result.second) {
+-        table_.insert(result.first, conditional_forward<SS>(entry));
++        table_.insert(result.first, conditional_forward<SSketch>(entry));
+       } else {
+-        policy_(*result.first, conditional_forward<SS>(entry));
++        policy_(*result.first, conditional_forward<SSketch>(entry));
+       }
+     } else {
+       if (sketch.is_ordered()) break; // early stop
+@@ -57,10 +57,10 @@ void theta_union_base<EN, EK, P, S, CS, A>::update(SS&& sketch) {
+   if (table_.theta_ < union_theta_) union_theta_ = table_.theta_;
+ }
+ 
+-template<typename EN, typename EK, typename P, typename S, typename CS, typename A>
+-CS theta_union_base<EN, EK, P, S, CS, A>::get_result(bool ordered) const {
++template<typename EN, typename EK, typename P, typename S, typename CompactSketch, typename A>
++CompactSketch theta_union_base<EN, EK, P, S, CompactSketch, A>::get_result(bool ordered) const {
+   std::vector<EN, A> entries(table_.allocator_);
+-  if (table_.is_empty_) return CS(true, true, compute_seed_hash(table_.seed_), union_theta_, std::move(entries));
++  if (table_.is_empty_) return CompactSketch(true, true, compute_seed_hash(table_.seed_), union_theta_, std::move(entries));
+   entries.reserve(table_.num_entries_);
+   uint64_t theta = std::min(union_theta_, table_.theta_);
+   const uint32_t nominal_num = 1 << table_.lg_nom_size_;
+@@ -76,11 +76,11 @@ CS theta_union_base<EN, EK, P, S, CS, A>::get_result(bool ordered) const {
+     }
+   }
+   if (ordered) std::sort(entries.begin(), entries.end(), comparator());
+-  return CS(table_.is_empty_, ordered, compute_seed_hash(table_.seed_), theta, std::move(entries));
++  return CompactSketch(table_.is_empty_, ordered, compute_seed_hash(table_.seed_), theta, std::move(entries));
+ }
+ 
+-template<typename EN, typename EK, typename P, typename S, typename CS, typename A>
+-const P& theta_union_base<EN, EK, P, S, CS, A>::get_policy() const {
++template<typename EN, typename EK, typename P, typename S, typename CompactSketch, typename A>
++const P& theta_union_base<EN, EK, P, S, CompactSketch, A>::get_policy() const {
+   return policy_;
+ }
+ 
+diff --git a/contrib/datasketches-cpp/theta/include/theta_union_impl.hpp b/contrib/datasketches-cpp/theta/include/theta_union_impl.hpp
+index 4708d70..918f884 100644
+--- a/contrib/datasketches-cpp/theta/include/theta_union_impl.hpp
++++ b/contrib/datasketches-cpp/theta/include/theta_union_impl.hpp
+@@ -28,9 +28,9 @@ state_(lg_cur_size, lg_nom_size, rf, theta, seed, pass_through_policy(), allocat
+ {}
+ 
+ template<typename A>
+-template<typename SS>
+-void theta_union_alloc<A>::update(SS&& sketch) {
+-  state_.update(std::forward<SS>(sketch));
++template<typename SSketch>
++void theta_union_alloc<A>::update(SSketch&& sketch) {
++  state_.update(std::forward<SSketch>(sketch));
+ }
+ 
+ template<typename A>
diff --git a/clickhouse/illumos/patches/direct/divide-cmake.patch b/clickhouse/illumos/patches/direct/divide-cmake.patch
new file mode 100644
index 0000000..b6c6a21
--- /dev/null
+++ b/clickhouse/illumos/patches/direct/divide-cmake.patch
@@ -0,0 +1,12 @@
+diff --git a/src/Functions/divide/CMakeLists.txt b/src/Functions/divide/CMakeLists.txt
+index e5a10f0817..8866ffaa24 100644
+--- a/src/Functions/divide/CMakeLists.txt
++++ b/src/Functions/divide/CMakeLists.txt
+@@ -1,6 +1,6 @@
+ # A library for integer division by constant with CPU dispatching.
+ 
+-if (ARCH_AMD64)
++if (ARCH_AMD64 OR OS_SUNOS)
+     add_library(divide_impl_sse2 divideImpl.cpp)
+     target_compile_options(divide_impl_sse2 PRIVATE -msse2 -DNAMESPACE=SSE2)
+     target_link_libraries(divide_impl_sse2 libdivide)
diff --git a/clickhouse/illumos/patches/direct/filesystemHelpers.patch b/clickhouse/illumos/patches/direct/filesystemHelpers.patch
new file mode 100644
index 0000000..0e999bd
--- /dev/null
+++ b/clickhouse/illumos/patches/direct/filesystemHelpers.patch
@@ -0,0 +1,12 @@
+diff --git a/src/Common/filesystemHelpers.h b/src/Common/filesystemHelpers.h
+index b7525a64fa..67f3b7938a 100644
+--- a/src/Common/filesystemHelpers.h
++++ b/src/Common/filesystemHelpers.h
+@@ -37,6 +37,7 @@ bool pathStartsWith(const String & path, const String & prefix_path);
+ 
+ }
+ 
++#undef FS
+ namespace FS
+ {
+ bool createFile(const std::string & path);
diff --git a/clickhouse/illumos/patches/direct/floyd_rivest_select.patch b/clickhouse/illumos/patches/direct/floyd_rivest_select.patch
new file mode 100644
index 0000000..57d87f5
--- /dev/null
+++ b/clickhouse/illumos/patches/direct/floyd_rivest_select.patch
@@ -0,0 +1,14 @@
+diff --git a/contrib/miniselect/include/miniselect/floyd_rivest_select.h b/contrib/miniselect/include/miniselect/floyd_rivest_select.h
+index e7d5f80..fb643d6 100644
+--- a/contrib/miniselect/include/miniselect/floyd_rivest_select.h
++++ b/contrib/miniselect/include/miniselect/floyd_rivest_select.h
+@@ -31,7 +31,7 @@ inline void floyd_rivest_select_loop(Iter begin, Diff left, Diff right, Diff k,
+     if (size > 600) {
+       Diff n = right - left + 1;
+       Diff i = k - left + 1;
+-      double z = log(n);
++      double z = log(static_cast<double>(n));
+       double s = 0.5 * exp(2 * z / 3);
+       double sd = 0.5 * sqrt(z * s * (n - s) / n);
+       if (i < n / 2) {
+Submodule contrib/poco contains modified content
diff --git a/clickhouse/illumos/patches/direct/ibridge.patch b/clickhouse/illumos/patches/direct/ibridge.patch
new file mode 100644
index 0000000..d3ba91a
--- /dev/null
+++ b/clickhouse/illumos/patches/direct/ibridge.patch
@@ -0,0 +1,20 @@
+diff --git a/base/bridge/IBridge.cpp b/base/bridge/IBridge.cpp
+index 35a9b95c97..ecdfbeaf65 100644
+--- a/base/bridge/IBridge.cpp
++++ b/base/bridge/IBridge.cpp
+@@ -171,6 +171,7 @@ void IBridge::initialize(Application & self)
+     max_server_connections = config().getUInt("max-server-connections", 1024);
+     keep_alive_timeout = config().getUInt64("keep-alive-timeout", 10);
+ 
++#if !defined(OS_SUNOS)
+     struct rlimit limit;
+     const UInt64 gb = 1024 * 1024 * 1024;
+ 
+@@ -182,6 +183,7 @@ void IBridge::initialize(Application & self)
+ 
+     if (!getrlimit(RLIMIT_RSS, &limit))
+         LOG_INFO(log, "RSS limit: cur={}, max={}", limit.rlim_cur, limit.rlim_max);
++#endif
+ 
+     try
+     {
diff --git a/clickhouse/illumos/patches/direct/yaml-traits.patch b/clickhouse/illumos/patches/direct/yaml-traits.patch
new file mode 100644
index 0000000..70ce86e
--- /dev/null
+++ b/clickhouse/illumos/patches/direct/yaml-traits.patch
@@ -0,0 +1,16 @@
+diff --git a/contrib/yaml-cpp/include/yaml-cpp/traits.h b/contrib/yaml-cpp/include/yaml-cpp/traits.h
+index 9a62db2..6a7121e 100644
+--- a/contrib/yaml-cpp/include/yaml-cpp/traits.h
++++ b/contrib/yaml-cpp/include/yaml-cpp/traits.h
+@@ -107,9 +107,9 @@ struct disable_if : public disable_if_c<Cond::value, T> {};
+ 
+ template <typename S, typename T>
+ struct is_streamable {
+-  template <typename SS, typename TT>
++  template <typename SStream, typename TT>
+   static auto test(int)
+-      -> decltype(std::declval<SS&>() << std::declval<TT>(), std::true_type());
++      -> decltype(std::declval<SStream&>() << std::declval<TT>(), std::true_type());
+ 
+   template <typename, typename>
+   static auto test(...) -> std::false_type;