Skip to content

clickhouse: add v21.10.4.26 for Linux and illumos#564

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
jclulow wants to merge 1 commit into from
Closed

clickhouse: add v21.10.4.26 for Linux and illumos #564

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/rust.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -108,7 +108,7 @@ jobs:
# actions/cache@v2.1.4
uses: actions/cache@26968a09c0ea4f3e233fdddbafd1166051a095f6
with:
key: ${{ runner.os }}-clickhouse-binary-${{ hashFiles('tools/clickhouse_checksums') }}
key: ${{ runner.os }}-clickhouse-binary-${{ hashFiles('tools/clickhouse_versions') }}
path: "clickhouse"
- name: Download ClickHouse
if: steps.cache-clickhouse.outputs.cache-hit != 'true'
Expand Down
106 changes: 74 additions & 32 deletions tools/ci_download_clickhouse
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,14 +13,30 @@ set -o errexit
SOURCE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
ARG0="$(basename ${BASH_SOURCE[0]})"

# If you change this, you must also update the md5sums below
CIDL_VERSION="v21.7"
source "$SOURCE_DIR/clickhouse_checksums"
CIDL_VERSION_FILE="$SOURCE_DIR/clickhouse_versions"
source "$CIDL_VERSION_FILE"
CIDL_ASSEMBLE_DIR="./clickhouse"

# Download from manually-populated S3 bucket for now
CIDL_URL_BASE="https://oxide-clickhouse-build.s3.us-west-2.amazonaws.com"

function per_platform
{
#
# We should use "${1^^}" here instead of tr(1), except that Apple, in a
# thoroughly characteristic fit of user hostility, ship a flagrantly
# obsolete version of bash that has no features.
#
local pp_key="$(tr '[:lower:]' '[:upper:]' <<< "$1")"
local pp_platform="$(tr '[:lower:]' '[:upper:]' <<< "$2")"
local pp_varname="CIDL_${pp_key}_${pp_platform}"
local pp_val="${!pp_varname}"
if [[ -z "$pp_val" ]]; then
fail "missing \"$pp_varname\" in \"$CIDL_VERSION_FILE\""
fi
printf '%s' "$pp_val"
}

function main
{
#
Expand All@@ -44,18 +60,42 @@ function main
configure_os "$CIDL_OS"
CIDL_URL="$CIDL_URL_BASE/$CIDL_FILE"

# Download the file.
echo "URL: $CIDL_URL"
echo "Local file: $CIDL_FILE"
do_download_curl "$CIDL_URL" "$CIDL_FILE" || \
fail "failed to download file"

# Verify the md5sum.
calculated_md5="$($CIDL_MD5FUNC "$CIDL_FILE")" || \
fail "failed to calculate md5sum"
if [[ "$calculated_md5" != "$CIDL_MD5" ]]; then
fail "md5sum mismatch \
(expected $CIDL_MD5, found $calculated_md5)"

#
# If the file exists already, check to see if the hash matches so that
# we can avoid a second download.
#
if [[ -f "$CIDL_FILE" ]]; then
calculated_md5="$($CIDL_MD5FUNC "$CIDL_FILE")" || \
fail "failed to calculate md5sum"
if [[ "$calculated_md5" == "$CIDL_MD5" ]]; then
download=no
else
rm -f "$CIDL_FILE"
download=yes
fi
else
download=yes
fi

if [[ "$download" == yes ]]; then
#
# Download the file.
#
do_download_curl "$CIDL_URL" "$CIDL_FILE" || \
fail "failed to download file"

#
# Verify the md5sum.
#
calculated_md5="$($CIDL_MD5FUNC "$CIDL_FILE")" || \
fail "failed to calculate md5sum"
if [[ "$calculated_md5" != "$CIDL_MD5" ]]; then
fail "md5sum mismatch \
(expected $CIDL_MD5, found $calculated_md5)"
fi
fi

# Unpack the tarball into a local directory
Expand All@@ -76,27 +116,29 @@ function configure_os
echo "current directory: $PWD"
echo "configuring based on OS: \"$1\""
case "$1" in
darwin*)
CIDL_PLATFORM="macos"
CIDL_MD5="$CIDL_MD5_DARWIN"
CIDL_MD5FUNC="do_md5"
;;
linux-gnu*)
CIDL_PLATFORM="linux"
CIDL_MD5="$CIDL_MD5_LINUX"
CIDL_MD5FUNC="do_md5sum"
;;
solaris*)
CIDL_PLATFORM="illumos"
CIDL_MD5="$CIDL_MD5_ILLUMOS"
CIDL_MD5FUNC="do_md5sum"
;;
*)
fail "unsupported OS: $1"
;;
darwin*)
CIDL_PLATFORM="macos"
CIDL_MD5FUNC="do_md5"
;;
linux-gnu*)
CIDL_PLATFORM="linux"
CIDL_MD5FUNC="do_md5sum"
;;
solaris*)
CIDL_PLATFORM="illumos"
CIDL_MD5FUNC="do_md5sum"
;;
*)
fail "unsupported OS: $1"
;;
esac

CIDL_DIR="clickhouse-$CIDL_VERSION"
if ! CIDL_VERSION=$(per_platform version "$CIDL_PLATFORM") ||
! CIDL_MD5=$(per_platform md5 "$CIDL_PLATFORM"); then
fail "could not configure platform $CIDL_PLATFORM"
fi

CIDL_DIR="clickhouse-v$CIDL_VERSION"
CIDL_FILE="$CIDL_DIR.$CIDL_PLATFORM.tar.gz"
}

Expand Down
3 changes: 0 additions & 3 deletions tools/clickhouse_checksums
View file
Open in desktop

This file was deleted.

8 changes: 8 additions & 0 deletions tools/clickhouse_versions
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
CIDL_VERSION_ILLUMOS="21.10.4.26"
CIDL_MD5_ILLUMOS="d2ff9c8d15d017a76a605a33618b9da4"

CIDL_VERSION_LINUX="21.10.4.26"
CIDL_MD5_LINUX="7aa1e2eb55d7540ab71fde2e4abb4c81"

CIDL_VERSION_MACOS="21.7"
CIDL_MD5_MACOS="7e22bd0b0108dee55605dd563a5698df"
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
clickhouse: add v21.10.4.26 for Linux and illumos by jclulow · Pull Request #564 · oxidecomputer/omicron · GitHub
Skip to content
clickhouse: add v21.10.4.26 for Linux and illumos#564

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

jclulow
wants to merge
1
commit into

from

 Closed


clickhouse: add v21.10.4.26 for Linux and illumos
#564
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
.github/workflows/rust.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -108,7 +108,7 @@ jobs:
 # actions/cache@v2.1.4
 uses: actions/cache@26968a09c0ea4f3e233fdddbafd1166051a095f6
 with:
 key: ${{ runner.os }}-clickhouse-binary-${{ hashFiles('tools/clickhouse_checksums') }}
 key: ${{ runner.os }}-clickhouse-binary-${{ hashFiles('tools/clickhouse_versions') }}
 path: "clickhouse"
 - name: Download ClickHouse
 if: steps.cache-clickhouse.outputs.cache-hit != 'true'
Expand Down

106 changes: 74 additions & 32 deletions
tools/ci_download_clickhouse

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,14 +13,30 @@ set -o errexit
SOURCE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
ARG0="$(basename ${BASH_SOURCE[0]})"

# If you change this, you must also update the md5sums below
CIDL_VERSION="v21.7"
source "$SOURCE_DIR/clickhouse_checksums"
CIDL_VERSION_FILE="$SOURCE_DIR/clickhouse_versions"
source "$CIDL_VERSION_FILE"
CIDL_ASSEMBLE_DIR="./clickhouse"

# Download from manually-populated S3 bucket for now
CIDL_URL_BASE="https://oxide-clickhouse-build.s3.us-west-2.amazonaws.com"

function per_platform
{
	#
	# We should use "${1^^}" here instead of tr(1), except that Apple, in a
	# thoroughly characteristic fit of user hostility, ship a flagrantly
	# obsolete version of bash that has no features.
	#
	local pp_key="$(tr '[:lower:]' '[:upper:]' <<< "$1")"
	local pp_platform="$(tr '[:lower:]' '[:upper:]' <<< "$2")"
	local pp_varname="CIDL_${pp_key}_${pp_platform}"
	local pp_val="${!pp_varname}"
	if [[ -z "$pp_val" ]]; then
 fail "missing \"$pp_varname\" in \"$CIDL_VERSION_FILE\""
	fi
	printf '%s' "$pp_val"
}

function main
{
	#
Expand All@@ -44,18 +60,42 @@ function main
	configure_os "$CIDL_OS"
	CIDL_URL="$CIDL_URL_BASE/$CIDL_FILE"

	# Download the file.
	echo "URL: $CIDL_URL"
	echo "Local file: $CIDL_FILE"
	do_download_curl "$CIDL_URL" "$CIDL_FILE" || \
 fail "failed to download file"

	# Verify the md5sum.
	calculated_md5="$($CIDL_MD5FUNC "$CIDL_FILE")" || \
 fail "failed to calculate md5sum"
	if [[ "$calculated_md5" != "$CIDL_MD5" ]]; then
 fail "md5sum mismatch \
 (expected $CIDL_MD5, found $calculated_md5)"

	#
	# If the file exists already, check to see if the hash matches so that
	# we can avoid a second download.
	#
	if [[ -f "$CIDL_FILE" ]]; then
 calculated_md5="$($CIDL_MD5FUNC "$CIDL_FILE")" || \
 fail "failed to calculate md5sum"
 if [[ "$calculated_md5" == "$CIDL_MD5" ]]; then
 download=no
 else
 rm -f "$CIDL_FILE"
 download=yes
 fi
	else
 download=yes
	fi

	if [[ "$download" == yes ]]; then
 #
 # Download the file.
 #
 do_download_curl "$CIDL_URL" "$CIDL_FILE" || \
 fail "failed to download file"

 #
 # Verify the md5sum.
 #
 calculated_md5="$($CIDL_MD5FUNC "$CIDL_FILE")" || \
 fail "failed to calculate md5sum"
 if [[ "$calculated_md5" != "$CIDL_MD5" ]]; then
 fail "md5sum mismatch \
 (expected $CIDL_MD5, found $calculated_md5)"
 fi
	fi

	# Unpack the tarball into a local directory
Expand All@@ -76,27 +116,29 @@ function configure_os
	echo "current directory: $PWD"
	echo "configuring based on OS: \"$1\""
	case "$1" in
 darwin*)
 CIDL_PLATFORM="macos"
 CIDL_MD5="$CIDL_MD5_DARWIN"
 CIDL_MD5FUNC="do_md5"
 ;;
 linux-gnu*) 
 CIDL_PLATFORM="linux"
 CIDL_MD5="$CIDL_MD5_LINUX"
 CIDL_MD5FUNC="do_md5sum"
 ;;
 solaris*)
 CIDL_PLATFORM="illumos"
 CIDL_MD5="$CIDL_MD5_ILLUMOS"
 CIDL_MD5FUNC="do_md5sum"
 ;;
 *)
 fail "unsupported OS: $1"
 ;;
	darwin*)
 CIDL_PLATFORM="macos"
 CIDL_MD5FUNC="do_md5"
 ;;
	linux-gnu*)
 CIDL_PLATFORM="linux"
 CIDL_MD5FUNC="do_md5sum"
 ;;
	solaris*)
 CIDL_PLATFORM="illumos"
 CIDL_MD5FUNC="do_md5sum"
 ;;
	*)
 fail "unsupported OS: $1"
 ;;
	esac

	CIDL_DIR="clickhouse-$CIDL_VERSION"
	if ! CIDL_VERSION=$(per_platform version "$CIDL_PLATFORM") ||
 ! CIDL_MD5=$(per_platform md5 "$CIDL_PLATFORM"); then
 fail "could not configure platform $CIDL_PLATFORM"
	fi

	CIDL_DIR="clickhouse-v$CIDL_VERSION"
	CIDL_FILE="$CIDL_DIR.$CIDL_PLATFORM.tar.gz"
}

Expand Down

3 changes: 0 additions & 3 deletions
tools/clickhouse_checksums

View file


Open in desktop


This file was deleted.


8 changes: 8 additions & 0 deletions
tools/clickhouse_versions

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
CIDL_VERSION_ILLUMOS="21.10.4.26"
CIDL_MD5_ILLUMOS="d2ff9c8d15d017a76a605a33618b9da4"

CIDL_VERSION_LINUX="21.10.4.26"
CIDL_MD5_LINUX="7aa1e2eb55d7540ab71fde2e4abb4c81"

CIDL_VERSION_MACOS="21.7"
CIDL_MD5_MACOS="7e22bd0b0108dee55605dd563a5698df"

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
clickhouse: add v21.10.4.26 for Linux and illumos by jclulow · Pull Request #564 · oxidecomputer/omicron · GitHub
Skip to content
clickhouse: add v21.10.4.26 for Linux and illumos#564

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

jclulow
wants to merge
1
commit into

from

 Closed


clickhouse: add v21.10.4.26 for Linux and illumos
#564
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
.github/workflows/rust.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -108,7 +108,7 @@ jobs:
 # actions/cache@v2.1.4
 uses: actions/cache@26968a09c0ea4f3e233fdddbafd1166051a095f6
 with:
 key: ${{ runner.os }}-clickhouse-binary-${{ hashFiles('tools/clickhouse_checksums') }}
 key: ${{ runner.os }}-clickhouse-binary-${{ hashFiles('tools/clickhouse_versions') }}
 path: "clickhouse"
 - name: Download ClickHouse
 if: steps.cache-clickhouse.outputs.cache-hit != 'true'
Expand Down

106 changes: 74 additions & 32 deletions
tools/ci_download_clickhouse

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,14 +13,30 @@ set -o errexit
SOURCE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
ARG0="$(basename ${BASH_SOURCE[0]})"

# If you change this, you must also update the md5sums below
CIDL_VERSION="v21.7"
source "$SOURCE_DIR/clickhouse_checksums"
CIDL_VERSION_FILE="$SOURCE_DIR/clickhouse_versions"
source "$CIDL_VERSION_FILE"
CIDL_ASSEMBLE_DIR="./clickhouse"

# Download from manually-populated S3 bucket for now
CIDL_URL_BASE="https://oxide-clickhouse-build.s3.us-west-2.amazonaws.com"

function per_platform
{
	#
	# We should use "${1^^}" here instead of tr(1), except that Apple, in a
	# thoroughly characteristic fit of user hostility, ship a flagrantly
	# obsolete version of bash that has no features.
	#
	local pp_key="$(tr '[:lower:]' '[:upper:]' <<< "$1")"
	local pp_platform="$(tr '[:lower:]' '[:upper:]' <<< "$2")"
	local pp_varname="CIDL_${pp_key}_${pp_platform}"
	local pp_val="${!pp_varname}"
	if [[ -z "$pp_val" ]]; then
 fail "missing \"$pp_varname\" in \"$CIDL_VERSION_FILE\""
	fi
	printf '%s' "$pp_val"
}

function main
{
	#
Expand All@@ -44,18 +60,42 @@ function main
	configure_os "$CIDL_OS"
	CIDL_URL="$CIDL_URL_BASE/$CIDL_FILE"

	# Download the file.
	echo "URL: $CIDL_URL"
	echo "Local file: $CIDL_FILE"
	do_download_curl "$CIDL_URL" "$CIDL_FILE" || \
 fail "failed to download file"

	# Verify the md5sum.
	calculated_md5="$($CIDL_MD5FUNC "$CIDL_FILE")" || \
 fail "failed to calculate md5sum"
	if [[ "$calculated_md5" != "$CIDL_MD5" ]]; then
 fail "md5sum mismatch \
 (expected $CIDL_MD5, found $calculated_md5)"

	#
	# If the file exists already, check to see if the hash matches so that
	# we can avoid a second download.
	#
	if [[ -f "$CIDL_FILE" ]]; then
 calculated_md5="$($CIDL_MD5FUNC "$CIDL_FILE")" || \
 fail "failed to calculate md5sum"
 if [[ "$calculated_md5" == "$CIDL_MD5" ]]; then
 download=no
 else
 rm -f "$CIDL_FILE"
 download=yes
 fi
	else
 download=yes
	fi

	if [[ "$download" == yes ]]; then
 #
 # Download the file.
 #
 do_download_curl "$CIDL_URL" "$CIDL_FILE" || \
 fail "failed to download file"

 #
 # Verify the md5sum.
 #
 calculated_md5="$($CIDL_MD5FUNC "$CIDL_FILE")" || \
 fail "failed to calculate md5sum"
 if [[ "$calculated_md5" != "$CIDL_MD5" ]]; then
 fail "md5sum mismatch \
 (expected $CIDL_MD5, found $calculated_md5)"
 fi
	fi

	# Unpack the tarball into a local directory
Expand All@@ -76,27 +116,29 @@ function configure_os
	echo "current directory: $PWD"
	echo "configuring based on OS: \"$1\""
	case "$1" in
 darwin*)
 CIDL_PLATFORM="macos"
 CIDL_MD5="$CIDL_MD5_DARWIN"
 CIDL_MD5FUNC="do_md5"
 ;;
 linux-gnu*) 
 CIDL_PLATFORM="linux"
 CIDL_MD5="$CIDL_MD5_LINUX"
 CIDL_MD5FUNC="do_md5sum"
 ;;
 solaris*)
 CIDL_PLATFORM="illumos"
 CIDL_MD5="$CIDL_MD5_ILLUMOS"
 CIDL_MD5FUNC="do_md5sum"
 ;;
 *)
 fail "unsupported OS: $1"
 ;;
	darwin*)
 CIDL_PLATFORM="macos"
 CIDL_MD5FUNC="do_md5"
 ;;
	linux-gnu*)
 CIDL_PLATFORM="linux"
 CIDL_MD5FUNC="do_md5sum"
 ;;
	solaris*)
 CIDL_PLATFORM="illumos"
 CIDL_MD5FUNC="do_md5sum"
 ;;
	*)
 fail "unsupported OS: $1"
 ;;
	esac

	CIDL_DIR="clickhouse-$CIDL_VERSION"
	if ! CIDL_VERSION=$(per_platform version "$CIDL_PLATFORM") ||
 ! CIDL_MD5=$(per_platform md5 "$CIDL_PLATFORM"); then
 fail "could not configure platform $CIDL_PLATFORM"
	fi

	CIDL_DIR="clickhouse-v$CIDL_VERSION"
	CIDL_FILE="$CIDL_DIR.$CIDL_PLATFORM.tar.gz"
}

Expand Down

3 changes: 0 additions & 3 deletions
tools/clickhouse_checksums

View file


Open in desktop


This file was deleted.


8 changes: 8 additions & 0 deletions
tools/clickhouse_versions

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
CIDL_VERSION_ILLUMOS="21.10.4.26"
CIDL_MD5_ILLUMOS="d2ff9c8d15d017a76a605a33618b9da4"

CIDL_VERSION_LINUX="21.10.4.26"
CIDL_MD5_LINUX="7aa1e2eb55d7540ab71fde2e4abb4c81"

CIDL_VERSION_MACOS="21.7"
CIDL_MD5_MACOS="7e22bd0b0108dee55605dd563a5698df"

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
clickhouse: add v21.10.4.26 for Linux and illumos by jclulow · Pull Request #564 · oxidecomputer/omicron · GitHub
Skip to content
clickhouse: add v21.10.4.26 for Linux and illumos#564

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

jclulow
wants to merge
1
commit into

from

 Closed


clickhouse: add v21.10.4.26 for Linux and illumos
#564
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
.github/workflows/rust.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -108,7 +108,7 @@ jobs:
 # actions/cache@v2.1.4
 uses: actions/cache@26968a09c0ea4f3e233fdddbafd1166051a095f6
 with:
 key: ${{ runner.os }}-clickhouse-binary-${{ hashFiles('tools/clickhouse_checksums') }}
 key: ${{ runner.os }}-clickhouse-binary-${{ hashFiles('tools/clickhouse_versions') }}
 path: "clickhouse"
 - name: Download ClickHouse
 if: steps.cache-clickhouse.outputs.cache-hit != 'true'
Expand Down

106 changes: 74 additions & 32 deletions
tools/ci_download_clickhouse

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,14 +13,30 @@ set -o errexit
SOURCE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
ARG0="$(basename ${BASH_SOURCE[0]})"

# If you change this, you must also update the md5sums below
CIDL_VERSION="v21.7"
source "$SOURCE_DIR/clickhouse_checksums"
CIDL_VERSION_FILE="$SOURCE_DIR/clickhouse_versions"
source "$CIDL_VERSION_FILE"
CIDL_ASSEMBLE_DIR="./clickhouse"

# Download from manually-populated S3 bucket for now
CIDL_URL_BASE="https://oxide-clickhouse-build.s3.us-west-2.amazonaws.com"

function per_platform
{
	#
	# We should use "${1^^}" here instead of tr(1), except that Apple, in a
	# thoroughly characteristic fit of user hostility, ship a flagrantly
	# obsolete version of bash that has no features.
	#
	local pp_key="$(tr '[:lower:]' '[:upper:]' <<< "$1")"
	local pp_platform="$(tr '[:lower:]' '[:upper:]' <<< "$2")"
	local pp_varname="CIDL_${pp_key}_${pp_platform}"
	local pp_val="${!pp_varname}"
	if [[ -z "$pp_val" ]]; then
 fail "missing \"$pp_varname\" in \"$CIDL_VERSION_FILE\""
	fi
	printf '%s' "$pp_val"
}

function main
{
	#
Expand All@@ -44,18 +60,42 @@ function main
	configure_os "$CIDL_OS"
	CIDL_URL="$CIDL_URL_BASE/$CIDL_FILE"

	# Download the file.
	echo "URL: $CIDL_URL"
	echo "Local file: $CIDL_FILE"
	do_download_curl "$CIDL_URL" "$CIDL_FILE" || \
 fail "failed to download file"

	# Verify the md5sum.
	calculated_md5="$($CIDL_MD5FUNC "$CIDL_FILE")" || \
 fail "failed to calculate md5sum"
	if [[ "$calculated_md5" != "$CIDL_MD5" ]]; then
 fail "md5sum mismatch \
 (expected $CIDL_MD5, found $calculated_md5)"

	#
	# If the file exists already, check to see if the hash matches so that
	# we can avoid a second download.
	#
	if [[ -f "$CIDL_FILE" ]]; then
 calculated_md5="$($CIDL_MD5FUNC "$CIDL_FILE")" || \
 fail "failed to calculate md5sum"
 if [[ "$calculated_md5" == "$CIDL_MD5" ]]; then
 download=no
 else
 rm -f "$CIDL_FILE"
 download=yes
 fi
	else
 download=yes
	fi

	if [[ "$download" == yes ]]; then
 #
 # Download the file.
 #
 do_download_curl "$CIDL_URL" "$CIDL_FILE" || \
 fail "failed to download file"

 #
 # Verify the md5sum.
 #
 calculated_md5="$($CIDL_MD5FUNC "$CIDL_FILE")" || \
 fail "failed to calculate md5sum"
 if [[ "$calculated_md5" != "$CIDL_MD5" ]]; then
 fail "md5sum mismatch \
 (expected $CIDL_MD5, found $calculated_md5)"
 fi
	fi

	# Unpack the tarball into a local directory
Expand All@@ -76,27 +116,29 @@ function configure_os
	echo "current directory: $PWD"
	echo "configuring based on OS: \"$1\""
	case "$1" in
 darwin*)
 CIDL_PLATFORM="macos"
 CIDL_MD5="$CIDL_MD5_DARWIN"
 CIDL_MD5FUNC="do_md5"
 ;;
 linux-gnu*) 
 CIDL_PLATFORM="linux"
 CIDL_MD5="$CIDL_MD5_LINUX"
 CIDL_MD5FUNC="do_md5sum"
 ;;
 solaris*)
 CIDL_PLATFORM="illumos"
 CIDL_MD5="$CIDL_MD5_ILLUMOS"
 CIDL_MD5FUNC="do_md5sum"
 ;;
 *)
 fail "unsupported OS: $1"
 ;;
	darwin*)
 CIDL_PLATFORM="macos"
 CIDL_MD5FUNC="do_md5"
 ;;
	linux-gnu*)
 CIDL_PLATFORM="linux"
 CIDL_MD5FUNC="do_md5sum"
 ;;
	solaris*)
 CIDL_PLATFORM="illumos"
 CIDL_MD5FUNC="do_md5sum"
 ;;
	*)
 fail "unsupported OS: $1"
 ;;
	esac

	CIDL_DIR="clickhouse-$CIDL_VERSION"
	if ! CIDL_VERSION=$(per_platform version "$CIDL_PLATFORM") ||
 ! CIDL_MD5=$(per_platform md5 "$CIDL_PLATFORM"); then
 fail "could not configure platform $CIDL_PLATFORM"
	fi

	CIDL_DIR="clickhouse-v$CIDL_VERSION"
	CIDL_FILE="$CIDL_DIR.$CIDL_PLATFORM.tar.gz"
}

Expand Down

3 changes: 0 additions & 3 deletions
tools/clickhouse_checksums

View file


Open in desktop


This file was deleted.


8 changes: 8 additions & 0 deletions
tools/clickhouse_versions

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
CIDL_VERSION_ILLUMOS="21.10.4.26"
CIDL_MD5_ILLUMOS="d2ff9c8d15d017a76a605a33618b9da4"

CIDL_VERSION_LINUX="21.10.4.26"
CIDL_MD5_LINUX="7aa1e2eb55d7540ab71fde2e4abb4c81"

CIDL_VERSION_MACOS="21.7"
CIDL_MD5_MACOS="7e22bd0b0108dee55605dd563a5698df"

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
clickhouse: add v21.10.4.26 for Linux and illumos by jclulow · Pull Request #564 · oxidecomputer/omicron · GitHub
Skip to content
clickhouse: add v21.10.4.26 for Linux and illumos#564

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

jclulow
wants to merge
1
commit into

from

 Closed


clickhouse: add v21.10.4.26 for Linux and illumos
#564
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
.github/workflows/rust.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -108,7 +108,7 @@ jobs:
 # actions/cache@v2.1.4
 uses: actions/cache@26968a09c0ea4f3e233fdddbafd1166051a095f6
 with:
 key: ${{ runner.os }}-clickhouse-binary-${{ hashFiles('tools/clickhouse_checksums') }}
 key: ${{ runner.os }}-clickhouse-binary-${{ hashFiles('tools/clickhouse_versions') }}
 path: "clickhouse"
 - name: Download ClickHouse
 if: steps.cache-clickhouse.outputs.cache-hit != 'true'
Expand Down

106 changes: 74 additions & 32 deletions
tools/ci_download_clickhouse

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,14 +13,30 @@ set -o errexit
SOURCE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
ARG0="$(basename ${BASH_SOURCE[0]})"

# If you change this, you must also update the md5sums below
CIDL_VERSION="v21.7"
source "$SOURCE_DIR/clickhouse_checksums"
CIDL_VERSION_FILE="$SOURCE_DIR/clickhouse_versions"
source "$CIDL_VERSION_FILE"
CIDL_ASSEMBLE_DIR="./clickhouse"

# Download from manually-populated S3 bucket for now
CIDL_URL_BASE="https://oxide-clickhouse-build.s3.us-west-2.amazonaws.com"

function per_platform
{
	#
	# We should use "${1^^}" here instead of tr(1), except that Apple, in a
	# thoroughly characteristic fit of user hostility, ship a flagrantly
	# obsolete version of bash that has no features.
	#
	local pp_key="$(tr '[:lower:]' '[:upper:]' <<< "$1")"
	local pp_platform="$(tr '[:lower:]' '[:upper:]' <<< "$2")"
	local pp_varname="CIDL_${pp_key}_${pp_platform}"
	local pp_val="${!pp_varname}"
	if [[ -z "$pp_val" ]]; then
 fail "missing \"$pp_varname\" in \"$CIDL_VERSION_FILE\""
	fi
	printf '%s' "$pp_val"
}

function main
{
	#
Expand All@@ -44,18 +60,42 @@ function main
	configure_os "$CIDL_OS"
	CIDL_URL="$CIDL_URL_BASE/$CIDL_FILE"

	# Download the file.
	echo "URL: $CIDL_URL"
	echo "Local file: $CIDL_FILE"
	do_download_curl "$CIDL_URL" "$CIDL_FILE" || \
 fail "failed to download file"

	# Verify the md5sum.
	calculated_md5="$($CIDL_MD5FUNC "$CIDL_FILE")" || \
 fail "failed to calculate md5sum"
	if [[ "$calculated_md5" != "$CIDL_MD5" ]]; then
 fail "md5sum mismatch \
 (expected $CIDL_MD5, found $calculated_md5)"

	#
	# If the file exists already, check to see if the hash matches so that
	# we can avoid a second download.
	#
	if [[ -f "$CIDL_FILE" ]]; then
 calculated_md5="$($CIDL_MD5FUNC "$CIDL_FILE")" || \
 fail "failed to calculate md5sum"
 if [[ "$calculated_md5" == "$CIDL_MD5" ]]; then
 download=no
 else
 rm -f "$CIDL_FILE"
 download=yes
 fi
	else
 download=yes
	fi

	if [[ "$download" == yes ]]; then
 #
 # Download the file.
 #
 do_download_curl "$CIDL_URL" "$CIDL_FILE" || \
 fail "failed to download file"

 #
 # Verify the md5sum.
 #
 calculated_md5="$($CIDL_MD5FUNC "$CIDL_FILE")" || \
 fail "failed to calculate md5sum"
 if [[ "$calculated_md5" != "$CIDL_MD5" ]]; then
 fail "md5sum mismatch \
 (expected $CIDL_MD5, found $calculated_md5)"
 fi
	fi

	# Unpack the tarball into a local directory
Expand All@@ -76,27 +116,29 @@ function configure_os
	echo "current directory: $PWD"
	echo "configuring based on OS: \"$1\""
	case "$1" in
 darwin*)
 CIDL_PLATFORM="macos"
 CIDL_MD5="$CIDL_MD5_DARWIN"
 CIDL_MD5FUNC="do_md5"
 ;;
 linux-gnu*) 
 CIDL_PLATFORM="linux"
 CIDL_MD5="$CIDL_MD5_LINUX"
 CIDL_MD5FUNC="do_md5sum"
 ;;
 solaris*)
 CIDL_PLATFORM="illumos"
 CIDL_MD5="$CIDL_MD5_ILLUMOS"
 CIDL_MD5FUNC="do_md5sum"
 ;;
 *)
 fail "unsupported OS: $1"
 ;;
	darwin*)
 CIDL_PLATFORM="macos"
 CIDL_MD5FUNC="do_md5"
 ;;
	linux-gnu*)
 CIDL_PLATFORM="linux"
 CIDL_MD5FUNC="do_md5sum"
 ;;
	solaris*)
 CIDL_PLATFORM="illumos"
 CIDL_MD5FUNC="do_md5sum"
 ;;
	*)
 fail "unsupported OS: $1"
 ;;
	esac

	CIDL_DIR="clickhouse-$CIDL_VERSION"
	if ! CIDL_VERSION=$(per_platform version "$CIDL_PLATFORM") ||
 ! CIDL_MD5=$(per_platform md5 "$CIDL_PLATFORM"); then
 fail "could not configure platform $CIDL_PLATFORM"
	fi

	CIDL_DIR="clickhouse-v$CIDL_VERSION"
	CIDL_FILE="$CIDL_DIR.$CIDL_PLATFORM.tar.gz"
}

Expand Down

3 changes: 0 additions & 3 deletions
tools/clickhouse_checksums

View file


Open in desktop


This file was deleted.


8 changes: 8 additions & 0 deletions
tools/clickhouse_versions

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
CIDL_VERSION_ILLUMOS="21.10.4.26"
CIDL_MD5_ILLUMOS="d2ff9c8d15d017a76a605a33618b9da4"

CIDL_VERSION_LINUX="21.10.4.26"
CIDL_MD5_LINUX="7aa1e2eb55d7540ab71fde2e4abb4c81"

CIDL_VERSION_MACOS="21.7"
CIDL_MD5_MACOS="7e22bd0b0108dee55605dd563a5698df"

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
clickhouse: add v21.10.4.26 for Linux and illumos by jclulow · Pull Request #564 · oxidecomputer/omicron · GitHub
Skip to content
clickhouse: add v21.10.4.26 for Linux and illumos#564

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

jclulow
wants to merge
1
commit into

from

 Closed


clickhouse: add v21.10.4.26 for Linux and illumos
#564
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
.github/workflows/rust.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -108,7 +108,7 @@ jobs:
 # actions/cache@v2.1.4
 uses: actions/cache@26968a09c0ea4f3e233fdddbafd1166051a095f6
 with:
 key: ${{ runner.os }}-clickhouse-binary-${{ hashFiles('tools/clickhouse_checksums') }}
 key: ${{ runner.os }}-clickhouse-binary-${{ hashFiles('tools/clickhouse_versions') }}
 path: "clickhouse"
 - name: Download ClickHouse
 if: steps.cache-clickhouse.outputs.cache-hit != 'true'
Expand Down

106 changes: 74 additions & 32 deletions
tools/ci_download_clickhouse

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,14 +13,30 @@ set -o errexit
SOURCE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
ARG0="$(basename ${BASH_SOURCE[0]})"

# If you change this, you must also update the md5sums below
CIDL_VERSION="v21.7"
source "$SOURCE_DIR/clickhouse_checksums"
CIDL_VERSION_FILE="$SOURCE_DIR/clickhouse_versions"
source "$CIDL_VERSION_FILE"
CIDL_ASSEMBLE_DIR="./clickhouse"

# Download from manually-populated S3 bucket for now
CIDL_URL_BASE="https://oxide-clickhouse-build.s3.us-west-2.amazonaws.com"

function per_platform
{
	#
	# We should use "${1^^}" here instead of tr(1), except that Apple, in a
	# thoroughly characteristic fit of user hostility, ship a flagrantly
	# obsolete version of bash that has no features.
	#
	local pp_key="$(tr '[:lower:]' '[:upper:]' <<< "$1")"
	local pp_platform="$(tr '[:lower:]' '[:upper:]' <<< "$2")"
	local pp_varname="CIDL_${pp_key}_${pp_platform}"
	local pp_val="${!pp_varname}"
	if [[ -z "$pp_val" ]]; then
 fail "missing \"$pp_varname\" in \"$CIDL_VERSION_FILE\""
	fi
	printf '%s' "$pp_val"
}

function main
{
	#
Expand All@@ -44,18 +60,42 @@ function main
	configure_os "$CIDL_OS"
	CIDL_URL="$CIDL_URL_BASE/$CIDL_FILE"

	# Download the file.
	echo "URL: $CIDL_URL"
	echo "Local file: $CIDL_FILE"
	do_download_curl "$CIDL_URL" "$CIDL_FILE" || \
 fail "failed to download file"

	# Verify the md5sum.
	calculated_md5="$($CIDL_MD5FUNC "$CIDL_FILE")" || \
 fail "failed to calculate md5sum"
	if [[ "$calculated_md5" != "$CIDL_MD5" ]]; then
 fail "md5sum mismatch \
 (expected $CIDL_MD5, found $calculated_md5)"

	#
	# If the file exists already, check to see if the hash matches so that
	# we can avoid a second download.
	#
	if [[ -f "$CIDL_FILE" ]]; then
 calculated_md5="$($CIDL_MD5FUNC "$CIDL_FILE")" || \
 fail "failed to calculate md5sum"
 if [[ "$calculated_md5" == "$CIDL_MD5" ]]; then
 download=no
 else
 rm -f "$CIDL_FILE"
 download=yes
 fi
	else
 download=yes
	fi

	if [[ "$download" == yes ]]; then
 #
 # Download the file.
 #
 do_download_curl "$CIDL_URL" "$CIDL_FILE" || \
 fail "failed to download file"

 #
 # Verify the md5sum.
 #
 calculated_md5="$($CIDL_MD5FUNC "$CIDL_FILE")" || \
 fail "failed to calculate md5sum"
 if [[ "$calculated_md5" != "$CIDL_MD5" ]]; then
 fail "md5sum mismatch \
 (expected $CIDL_MD5, found $calculated_md5)"
 fi
	fi

	# Unpack the tarball into a local directory
Expand All@@ -76,27 +116,29 @@ function configure_os
	echo "current directory: $PWD"
	echo "configuring based on OS: \"$1\""
	case "$1" in
 darwin*)
 CIDL_PLATFORM="macos"
 CIDL_MD5="$CIDL_MD5_DARWIN"
 CIDL_MD5FUNC="do_md5"
 ;;
 linux-gnu*) 
 CIDL_PLATFORM="linux"
 CIDL_MD5="$CIDL_MD5_LINUX"
 CIDL_MD5FUNC="do_md5sum"
 ;;
 solaris*)
 CIDL_PLATFORM="illumos"
 CIDL_MD5="$CIDL_MD5_ILLUMOS"
 CIDL_MD5FUNC="do_md5sum"
 ;;
 *)
 fail "unsupported OS: $1"
 ;;
	darwin*)
 CIDL_PLATFORM="macos"
 CIDL_MD5FUNC="do_md5"
 ;;
	linux-gnu*)
 CIDL_PLATFORM="linux"
 CIDL_MD5FUNC="do_md5sum"
 ;;
	solaris*)
 CIDL_PLATFORM="illumos"
 CIDL_MD5FUNC="do_md5sum"
 ;;
	*)
 fail "unsupported OS: $1"
 ;;
	esac

	CIDL_DIR="clickhouse-$CIDL_VERSION"
	if ! CIDL_VERSION=$(per_platform version "$CIDL_PLATFORM") ||
 ! CIDL_MD5=$(per_platform md5 "$CIDL_PLATFORM"); then
 fail "could not configure platform $CIDL_PLATFORM"
	fi

	CIDL_DIR="clickhouse-v$CIDL_VERSION"
	CIDL_FILE="$CIDL_DIR.$CIDL_PLATFORM.tar.gz"
}

Expand Down

3 changes: 0 additions & 3 deletions
tools/clickhouse_checksums

View file


Open in desktop


This file was deleted.


8 changes: 8 additions & 0 deletions
tools/clickhouse_versions

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
CIDL_VERSION_ILLUMOS="21.10.4.26"
CIDL_MD5_ILLUMOS="d2ff9c8d15d017a76a605a33618b9da4"

CIDL_VERSION_LINUX="21.10.4.26"
CIDL_MD5_LINUX="7aa1e2eb55d7540ab71fde2e4abb4c81"

CIDL_VERSION_MACOS="21.7"
CIDL_MD5_MACOS="7e22bd0b0108dee55605dd563a5698df"

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
clickhouse: add v21.10.4.26 for Linux and illumos by jclulow · Pull Request #564 · oxidecomputer/omicron · GitHub
Skip to content
clickhouse: add v21.10.4.26 for Linux and illumos#564

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

jclulow
wants to merge
1
commit into

from

 Closed


clickhouse: add v21.10.4.26 for Linux and illumos
#564
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
.github/workflows/rust.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -108,7 +108,7 @@ jobs:
 # actions/cache@v2.1.4
 uses: actions/cache@26968a09c0ea4f3e233fdddbafd1166051a095f6
 with:
 key: ${{ runner.os }}-clickhouse-binary-${{ hashFiles('tools/clickhouse_checksums') }}
 key: ${{ runner.os }}-clickhouse-binary-${{ hashFiles('tools/clickhouse_versions') }}
 path: "clickhouse"
 - name: Download ClickHouse
 if: steps.cache-clickhouse.outputs.cache-hit != 'true'
Expand Down

106 changes: 74 additions & 32 deletions
tools/ci_download_clickhouse

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,14 +13,30 @@ set -o errexit
SOURCE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
ARG0="$(basename ${BASH_SOURCE[0]})"

# If you change this, you must also update the md5sums below
CIDL_VERSION="v21.7"
source "$SOURCE_DIR/clickhouse_checksums"
CIDL_VERSION_FILE="$SOURCE_DIR/clickhouse_versions"
source "$CIDL_VERSION_FILE"
CIDL_ASSEMBLE_DIR="./clickhouse"

# Download from manually-populated S3 bucket for now
CIDL_URL_BASE="https://oxide-clickhouse-build.s3.us-west-2.amazonaws.com"

function per_platform
{
	#
	# We should use "${1^^}" here instead of tr(1), except that Apple, in a
	# thoroughly characteristic fit of user hostility, ship a flagrantly
	# obsolete version of bash that has no features.
	#
	local pp_key="$(tr '[:lower:]' '[:upper:]' <<< "$1")"
	local pp_platform="$(tr '[:lower:]' '[:upper:]' <<< "$2")"
	local pp_varname="CIDL_${pp_key}_${pp_platform}"
	local pp_val="${!pp_varname}"
	if [[ -z "$pp_val" ]]; then
 fail "missing \"$pp_varname\" in \"$CIDL_VERSION_FILE\""
	fi
	printf '%s' "$pp_val"
}

function main
{
	#
Expand All@@ -44,18 +60,42 @@ function main
	configure_os "$CIDL_OS"
	CIDL_URL="$CIDL_URL_BASE/$CIDL_FILE"

	# Download the file.
	echo "URL: $CIDL_URL"
	echo "Local file: $CIDL_FILE"
	do_download_curl "$CIDL_URL" "$CIDL_FILE" || \
 fail "failed to download file"

	# Verify the md5sum.
	calculated_md5="$($CIDL_MD5FUNC "$CIDL_FILE")" || \
 fail "failed to calculate md5sum"
	if [[ "$calculated_md5" != "$CIDL_MD5" ]]; then
 fail "md5sum mismatch \
 (expected $CIDL_MD5, found $calculated_md5)"

	#
	# If the file exists already, check to see if the hash matches so that
	# we can avoid a second download.
	#
	if [[ -f "$CIDL_FILE" ]]; then
 calculated_md5="$($CIDL_MD5FUNC "$CIDL_FILE")" || \
 fail "failed to calculate md5sum"
 if [[ "$calculated_md5" == "$CIDL_MD5" ]]; then
 download=no
 else
 rm -f "$CIDL_FILE"
 download=yes
 fi
	else
 download=yes
	fi

	if [[ "$download" == yes ]]; then
 #
 # Download the file.
 #
 do_download_curl "$CIDL_URL" "$CIDL_FILE" || \
 fail "failed to download file"

 #
 # Verify the md5sum.
 #
 calculated_md5="$($CIDL_MD5FUNC "$CIDL_FILE")" || \
 fail "failed to calculate md5sum"
 if [[ "$calculated_md5" != "$CIDL_MD5" ]]; then
 fail "md5sum mismatch \
 (expected $CIDL_MD5, found $calculated_md5)"
 fi
	fi

	# Unpack the tarball into a local directory
Expand All@@ -76,27 +116,29 @@ function configure_os
	echo "current directory: $PWD"
	echo "configuring based on OS: \"$1\""
	case "$1" in
 darwin*)
 CIDL_PLATFORM="macos"
 CIDL_MD5="$CIDL_MD5_DARWIN"
 CIDL_MD5FUNC="do_md5"
 ;;
 linux-gnu*) 
 CIDL_PLATFORM="linux"
 CIDL_MD5="$CIDL_MD5_LINUX"
 CIDL_MD5FUNC="do_md5sum"
 ;;
 solaris*)
 CIDL_PLATFORM="illumos"
 CIDL_MD5="$CIDL_MD5_ILLUMOS"
 CIDL_MD5FUNC="do_md5sum"
 ;;
 *)
 fail "unsupported OS: $1"
 ;;
	darwin*)
 CIDL_PLATFORM="macos"
 CIDL_MD5FUNC="do_md5"
 ;;
	linux-gnu*)
 CIDL_PLATFORM="linux"
 CIDL_MD5FUNC="do_md5sum"
 ;;
	solaris*)
 CIDL_PLATFORM="illumos"
 CIDL_MD5FUNC="do_md5sum"
 ;;
	*)
 fail "unsupported OS: $1"
 ;;
	esac

	CIDL_DIR="clickhouse-$CIDL_VERSION"
	if ! CIDL_VERSION=$(per_platform version "$CIDL_PLATFORM") ||
 ! CIDL_MD5=$(per_platform md5 "$CIDL_PLATFORM"); then
 fail "could not configure platform $CIDL_PLATFORM"
	fi

	CIDL_DIR="clickhouse-v$CIDL_VERSION"
	CIDL_FILE="$CIDL_DIR.$CIDL_PLATFORM.tar.gz"
}

Expand Down

3 changes: 0 additions & 3 deletions
tools/clickhouse_checksums

View file


Open in desktop


This file was deleted.


8 changes: 8 additions & 0 deletions
tools/clickhouse_versions

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
CIDL_VERSION_ILLUMOS="21.10.4.26"
CIDL_MD5_ILLUMOS="d2ff9c8d15d017a76a605a33618b9da4"

CIDL_VERSION_LINUX="21.10.4.26"
CIDL_MD5_LINUX="7aa1e2eb55d7540ab71fde2e4abb4c81"

CIDL_VERSION_MACOS="21.7"
CIDL_MD5_MACOS="7e22bd0b0108dee55605dd563a5698df"

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
clickhouse: add v21.10.4.26 for Linux and illumos by jclulow · Pull Request #564 · oxidecomputer/omicron · GitHub
Skip to content
clickhouse: add v21.10.4.26 for Linux and illumos#564

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

jclulow
wants to merge
1
commit into

from

 Closed


clickhouse: add v21.10.4.26 for Linux and illumos
#564
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
.github/workflows/rust.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -108,7 +108,7 @@ jobs:
 # actions/cache@v2.1.4
 uses: actions/cache@26968a09c0ea4f3e233fdddbafd1166051a095f6
 with:
 key: ${{ runner.os }}-clickhouse-binary-${{ hashFiles('tools/clickhouse_checksums') }}
 key: ${{ runner.os }}-clickhouse-binary-${{ hashFiles('tools/clickhouse_versions') }}
 path: "clickhouse"
 - name: Download ClickHouse
 if: steps.cache-clickhouse.outputs.cache-hit != 'true'
Expand Down

106 changes: 74 additions & 32 deletions
tools/ci_download_clickhouse

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,14 +13,30 @@ set -o errexit
SOURCE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
ARG0="$(basename ${BASH_SOURCE[0]})"

# If you change this, you must also update the md5sums below
CIDL_VERSION="v21.7"
source "$SOURCE_DIR/clickhouse_checksums"
CIDL_VERSION_FILE="$SOURCE_DIR/clickhouse_versions"
source "$CIDL_VERSION_FILE"
CIDL_ASSEMBLE_DIR="./clickhouse"

# Download from manually-populated S3 bucket for now
CIDL_URL_BASE="https://oxide-clickhouse-build.s3.us-west-2.amazonaws.com"

function per_platform
{
	#
	# We should use "${1^^}" here instead of tr(1), except that Apple, in a
	# thoroughly characteristic fit of user hostility, ship a flagrantly
	# obsolete version of bash that has no features.
	#
	local pp_key="$(tr '[:lower:]' '[:upper:]' <<< "$1")"
	local pp_platform="$(tr '[:lower:]' '[:upper:]' <<< "$2")"
	local pp_varname="CIDL_${pp_key}_${pp_platform}"
	local pp_val="${!pp_varname}"
	if [[ -z "$pp_val" ]]; then
 fail "missing \"$pp_varname\" in \"$CIDL_VERSION_FILE\""
	fi
	printf '%s' "$pp_val"
}

function main
{
	#
Expand All@@ -44,18 +60,42 @@ function main
	configure_os "$CIDL_OS"
	CIDL_URL="$CIDL_URL_BASE/$CIDL_FILE"

	# Download the file.
	echo "URL: $CIDL_URL"
	echo "Local file: $CIDL_FILE"
	do_download_curl "$CIDL_URL" "$CIDL_FILE" || \
 fail "failed to download file"

	# Verify the md5sum.
	calculated_md5="$($CIDL_MD5FUNC "$CIDL_FILE")" || \
 fail "failed to calculate md5sum"
	if [[ "$calculated_md5" != "$CIDL_MD5" ]]; then
 fail "md5sum mismatch \
 (expected $CIDL_MD5, found $calculated_md5)"

	#
	# If the file exists already, check to see if the hash matches so that
	# we can avoid a second download.
	#
	if [[ -f "$CIDL_FILE" ]]; then
 calculated_md5="$($CIDL_MD5FUNC "$CIDL_FILE")" || \
 fail "failed to calculate md5sum"
 if [[ "$calculated_md5" == "$CIDL_MD5" ]]; then
 download=no
 else
 rm -f "$CIDL_FILE"
 download=yes
 fi
	else
 download=yes
	fi

	if [[ "$download" == yes ]]; then
 #
 # Download the file.
 #
 do_download_curl "$CIDL_URL" "$CIDL_FILE" || \
 fail "failed to download file"

 #
 # Verify the md5sum.
 #
 calculated_md5="$($CIDL_MD5FUNC "$CIDL_FILE")" || \
 fail "failed to calculate md5sum"
 if [[ "$calculated_md5" != "$CIDL_MD5" ]]; then
 fail "md5sum mismatch \
 (expected $CIDL_MD5, found $calculated_md5)"
 fi
	fi

	# Unpack the tarball into a local directory
Expand All@@ -76,27 +116,29 @@ function configure_os
	echo "current directory: $PWD"
	echo "configuring based on OS: \"$1\""
	case "$1" in
 darwin*)
 CIDL_PLATFORM="macos"
 CIDL_MD5="$CIDL_MD5_DARWIN"
 CIDL_MD5FUNC="do_md5"
 ;;
 linux-gnu*) 
 CIDL_PLATFORM="linux"
 CIDL_MD5="$CIDL_MD5_LINUX"
 CIDL_MD5FUNC="do_md5sum"
 ;;
 solaris*)
 CIDL_PLATFORM="illumos"
 CIDL_MD5="$CIDL_MD5_ILLUMOS"
 CIDL_MD5FUNC="do_md5sum"
 ;;
 *)
 fail "unsupported OS: $1"
 ;;
	darwin*)
 CIDL_PLATFORM="macos"
 CIDL_MD5FUNC="do_md5"
 ;;
	linux-gnu*)
 CIDL_PLATFORM="linux"
 CIDL_MD5FUNC="do_md5sum"
 ;;
	solaris*)
 CIDL_PLATFORM="illumos"
 CIDL_MD5FUNC="do_md5sum"
 ;;
	*)
 fail "unsupported OS: $1"
 ;;
	esac

	CIDL_DIR="clickhouse-$CIDL_VERSION"
	if ! CIDL_VERSION=$(per_platform version "$CIDL_PLATFORM") ||
 ! CIDL_MD5=$(per_platform md5 "$CIDL_PLATFORM"); then
 fail "could not configure platform $CIDL_PLATFORM"
	fi

	CIDL_DIR="clickhouse-v$CIDL_VERSION"
	CIDL_FILE="$CIDL_DIR.$CIDL_PLATFORM.tar.gz"
}

Expand Down

3 changes: 0 additions & 3 deletions
tools/clickhouse_checksums

View file


Open in desktop


This file was deleted.


8 changes: 8 additions & 0 deletions
tools/clickhouse_versions

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
CIDL_VERSION_ILLUMOS="21.10.4.26"
CIDL_MD5_ILLUMOS="d2ff9c8d15d017a76a605a33618b9da4"

CIDL_VERSION_LINUX="21.10.4.26"
CIDL_MD5_LINUX="7aa1e2eb55d7540ab71fde2e4abb4c81"

CIDL_VERSION_MACOS="21.7"
CIDL_MD5_MACOS="7e22bd0b0108dee55605dd563a5698df"