From e7b5db6109366577c468ce8841d7b6232a55746a Mon Sep 17 00:00:00 2001
From: Andy Fiddaman <illumos@fiddaman.net>
Date: Fri, 1 Dec 2023 20:04:44 +0000
Subject: [PATCH] Upgrade to clickhouse v23.8.7.24

---
 oximeter/db/src/client.rs              | 4 +++-
 tools/ci_download_clickhouse           | 5 ++---
 tools/clickhouse_checksums             | 6 +++---
 tools/clickhouse_version               | 2 +-
 tools/install_builder_prerequisites.sh | 6 +++++-
 5 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/oximeter/db/src/client.rs b/oximeter/db/src/client.rs
index ca996dc8947..3906c73e1c9 100644
--- a/oximeter/db/src/client.rs
+++ b/oximeter/db/src/client.rs
@@ -857,9 +857,11 @@ impl Client {
             Err(Error::Database(err))
                 // Case 1: The database has not been created.
                 if err.contains("Database oximeter doesn't exist") ||
+                    err.contains("Database oximeter does not exist") ||
                 // Case 2: The database has been created, but it's old (exists
                 // prior to the version table).
-                    err.contains("Table oximeter.version doesn't exist") =>
+                    err.contains("Table oximeter.version doesn't exist") ||
+                    err.contains("Table oximeter.version does not exist") =>
             {
                 warn!(self.log, "oximeter database does not exist, or is out-of-date");
                 0
diff --git a/tools/ci_download_clickhouse b/tools/ci_download_clickhouse
index 675566fad7a..a63fa23c0d4 100755
--- a/tools/ci_download_clickhouse
+++ b/tools/ci_download_clickhouse
@@ -19,9 +19,9 @@ DOWNLOAD_DIR="$TARGET_DIR/downloads"
 # Location where the final clickhouse directory should end up.
 DEST_DIR="./$TARGET_DIR/clickhouse"
 
-# If you change this, you must also update the md5sums below
+# If you change the version in clickhouse_version, you must also update the
+# md5sums in clickhouse_checksums
 CIDL_VERSION="$(cat "$SOURCE_DIR/clickhouse_version")"
-source "$SOURCE_DIR/clickhouse_checksums"
 
 # Download from manually-populated S3 bucket for now
 CIDL_URL_BASE="https://oxide-clickhouse-build.s3.us-west-2.amazonaws.com"
@@ -113,7 +113,6 @@ function configure_os
 			CIDL_PLATFORM="illumos"
 			CIDL_MD5="$CIDL_MD5_ILLUMOS"
 			CIDL_MD5FUNC="do_md5sum"
-			CIDL_DASHREV=-1
 			;;
 		*)
 			fail "unsupported OS: $1"
diff --git a/tools/clickhouse_checksums b/tools/clickhouse_checksums
index 92a52373013..afddb15cab8 100644
--- a/tools/clickhouse_checksums
+++ b/tools/clickhouse_checksums
@@ -1,3 +1,3 @@
-CIDL_MD5_DARWIN="20603974a929926591fca70ff1df0e45"
-CIDL_MD5_LINUX="ea909519bd9d989fd5d090fd9bdd42f1"
-CIDL_MD5_ILLUMOS="7702939ce5b4b51846a1ba39f1392306"
+CIDL_MD5_DARWIN="3e20c3284b7e6b0cfcfedf622ecf547a"
+CIDL_MD5_LINUX="f6c30a25a86deac3bad6c50dcf758fd5"
+CIDL_MD5_ILLUMOS="409222de8ecb59e5dd97dcc942ccdffe"
diff --git a/tools/clickhouse_version b/tools/clickhouse_version
index 93b98bf7380..0a988071cd4 100644
--- a/tools/clickhouse_version
+++ b/tools/clickhouse_version
@@ -1 +1 @@
-v22.8.9.24
\ No newline at end of file
+v23.8.7.24
diff --git a/tools/install_builder_prerequisites.sh b/tools/install_builder_prerequisites.sh
index 04276299608..5fa8ec11ba1 100755
--- a/tools/install_builder_prerequisites.sh
+++ b/tools/install_builder_prerequisites.sh
@@ -128,6 +128,7 @@ function install_packages {
     fi
   elif [[ "${HOST_OS}" == "SunOS" ]]; then
     CLANGVER=15
+    RTVER=13
     PGVER=13
     packages=(
       "pkg:/package/pkg"
@@ -135,6 +136,8 @@ function install_packages {
       "library/postgresql-$PGVER"
       "pkg-config"
       "library/libxmlsec1"
+      "system/library/gcc-runtime@$RTVER"
+      "system/library/g++-runtime@$RTVER"
       # "bindgen leverages libclang to preprocess, parse, and type check C and C++ header files."
       "pkg:/ooce/developer/clang-$CLANGVER"
       "system/library/gcc-runtime"
@@ -159,7 +162,8 @@ function install_packages {
     }
 
     pkg mediator -a
-    pkg list -v "${packages[@]}"
+    pkg publisher
+    pkg list -afv "${packages[@]}"
   elif [[ "${HOST_OS}" == "Darwin" ]]; then
     packages=(
       'coreutils'