thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-12-12 17:32:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ClickHouse:master' into master

Browse Source
This commit is contained in:
andrc1901 2021-10-25 18:19:22 +03:00 committed by GitHub
commit 246d22dc47
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/grpc vendored

@ -1 +1 @@
Subproject commit 7eac189a6badddac593580ec2ad1478bd2656fc7
Subproject commit 60c986e15cae70aade721d26badabab1f822fdd6

2
contrib/msgpack-c vendored

@ -1 +1 @@
Subproject commit 46684265d50b5d1b062d4c5c428ba08462844b1d
Subproject commit 7d5324f2945aa2b9186cddda5a28c903272b205e

12
website/benchmark/benchmark.js
View File

@ -40,7 +40,7 @@ function update_hash() {
function generate_selectors(elem) {
var html = '<div id="systems_selector"><h3>Compare</h3>';
var html = '<div id="systems_selector" class="mb-3"><h2 class="h4">Compare</h2>';
var available_results = results;
@ -63,7 +63,7 @@ function generate_selectors(elem) {
button_class = 'btn-outline-secondary';
};
html += '<button type="button" class="btn btn-sm mr-2 mb-2 ' + button_class +
html += '<button type="button" class="btn btn-sm mr-1 mb-1 ' + button_class +
(selected && available ? ' active' : '') +
(available ? '' : ' disabled') + '"';
if (systems_full[i]) {
@ -73,17 +73,17 @@ function generate_selectors(elem) {
}
if (current_data_size) {
html += '</div><div id="data_size_selector"><h3>Dataset&nbsp;size</h3>';
html += '</div><div id="data_size_selector"><h2 class="h4">Dataset&nbsp;size</h2>';
for (var i = 0; i < data_sizes.length; i++) {
html += '<button type="button" class="btn btn-sm btn-outline-dark mr-2 mb-2' + (data_sizes[i].id == current_data_size ? ' active' : '') + '" data-size-id="' + data_sizes[i].id + '">' + data_sizes[i].name + '</button>';
html += '<button type="button" class="btn btn-sm btn-outline-dark mr-1 mb-1' + (data_sizes[i].id == current_data_size ? ' active' : '') + '" data-size-id="' + data_sizes[i].id + '">' + data_sizes[i].name + '</button>';
}
}
html += '</div><div id="runs_selector"><h3>Run</h3>';
html += '</div><div id="runs_selector"><h2 class="h4">Run</h2>';
for (var i = 0; i < runs.length; i++) {
html += '<button type="button" class="btn btn-sm btn-outline-dark mr-2 mb-2' + (current_runs.indexOf(String(i)) != -1 ? ' active' : '') + '" data-run-id="' + i + '">' + runs[i] + '</button>';
html += '<button type="button" class="btn btn-sm btn-outline-dark mr-1 mb-1' + (current_runs.indexOf(String(i)) != -1 ? ' active' : '') + '" data-run-id="' + i + '">' + runs[i] + '</button>';
}
html += '</div>';

10
website/benchmark/hardware/index.html
View File

@ -13,11 +13,11 @@
<div class="container-fluid py-3">
<div class="row mb-3">
<div class="col">
<div class="col d-flex align-items-center">
<a href="/" title="Main page" class="float-left mr-3">
<img src="/images/logo.svg" alt="ClickHouse" />
</a>
<h1>{{ title }}</h1>
<h1 class="h2 mb-0">{{ title }}</h1>
</div>
</div>
@ -27,21 +27,21 @@
<div class="row mb-3">
<div class="col">
<h3 class="my-3">Relative query processing time <span class="text-muted">(lower is better)</span></h3>
<h2 class="h4 my-3">Relative query processing time <span class="text-muted">(lower is better)</span></h2>
<div id="diagram"></div>
</div>
</div>
<div class="row mb-3">
<div class="col">
<h3 class="my-3">Full results</h3>
<h2 class="h4 my-3">Full results</h2>
<div id="comparison_table"></div>
</div>
</div>
<div class="row">
<div class="col">
<h3 class="my-3">Comments</h3>
<h2 class="h4 my-3">Comments</h2>
<p>Submit your own results: <a href="https://clickhouse.com/docs/en/operations/performance-test/">https://clickhouse.com/docs/en/operations/performance-test/</a></p>
<p>
Results for Lenovo B580 Laptop are from <b>Ragıp Ünal</b>. 16GB RAM 1600 GHz, 240GB SSD, Intel(R) Core(TM) i5-3210M CPU @ 2.50GHz (2 Core / 4 HT)<br/>

2
website/css/bootstrap.css vendored
View File

File diff suppressed because one or more lines are too long

2
website/css/main.css
View File

File diff suppressed because one or more lines are too long

10
website/src/scss/_variables.scss
View File

@ -165,7 +165,7 @@ $border-color: $gray-500;
$border-radius: 8px;
$border-radius-lg: 8px;
$border-radius-sm: 8px;
$border-radius-sm: 4px;
$box-shadow-sm: 0 2px 14px rgba($gray-700, .2);
$box-shadow: 0 8px 20px rgba($gray-700, .2);
@ -238,10 +238,10 @@ $btn-font-size: 14px;
$btn-line-height: 20px;
$btn-white-space: null; // Set to `nowrap` to prevent text wrapping
$btn-padding-y-sm: 12px;
$btn-padding-x-sm: 32px;
$btn-font-size-sm: 14px;
$btn-line-height-sm: 20px;
$btn-padding-y-sm: 6px;
$btn-padding-x-sm: 12px;
$btn-font-size-sm: 12px;
$btn-line-height-sm: 16px;
$btn-padding-y-lg: 16px;
$btn-padding-x-lg: 32px;

3
website/src/scss/components/_comparison-table.scss Normal file
View File

@ -0,0 +1,3 @@
#comparison_table {
overflow: auto;
}