-
Notifications
You must be signed in to change notification settings - Fork 248
Add pg_clickhouse #729
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.
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
base: main
Are you sure you want to change the base?
Add pg_clickhouse #729
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| pg_clickhouse ClickBench | ||
| ======================== | ||
|
|
||
| This ClickBench configuration benchmarks [pg_clickhouse] running inside | ||
| PostgreSQL and pushing queries down to a ClickHouse database. Files: | ||
|
|
||
| * `benchmark.sh`: Runs the benchmark | ||
| * `clickhouse.sh`: Installs ClickHouse and loads it with data; based on the | ||
| [ClickHouse benchmark script](../clickhouse/benchmark.sh) | ||
| * `create-postgres.sql`: Loads pg_clickhouse into Postgres and creates the | ||
| foreign table | ||
| * `create-tuned-memory.sql`, `create-tuned.sql`, and `create.sql`: Scripts | ||
| that create the ClickHouse table, copied from the [ClickHouse | ||
| Config](../clickhouse/) | ||
| * `postgres.sh`: Installs, configures, and starts PostgreSQL; based on the | ||
| [PostgreSQL benchmark script](../postgresql/benchmark.sh) | ||
| * `queries.sql`: The benchmark queries, identical to the [PostgreSQL | ||
| queries](../postgresql/queries.sql) | ||
| * `README.md`: This file | ||
| * `run.sh`: Runs the benchmark; identical too the [PostgreSQL run | ||
| script](../postgresql/run.sh) | ||
| * `template.json`: Describes this benchmark configuration |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| #!/bin/bash | ||
|
|
||
| # apt-get update -y | ||
| # env DEBIAN_FRONTEND=noninteractive apt-get install -y wget curl sudo | ||
|
|
||
| # Install and start ClickHouse and Postgres | ||
| ./clickhouse.sh "$@" | ||
| ./postgres.sh | ||
|
|
||
| # Run the queries | ||
| ./run.sh 2>&1 | tee log.txt | ||
|
|
||
| echo -n "Data size: " | ||
| clickhouse-client --query "SELECT total_bytes FROM system.tables WHERE name = 'hits' AND database = 'default'" | ||
|
|
||
| cat log.txt | grep -oP 'Time: \d+\.\d+ ms|psql: error' | sed -r -e 's/Time: ([0-9]+\.[0-9]+) ms/\1/; s/^.*psql: error.*$/null/' | | ||
| awk '{ if (i % 3 == 0) { printf "[" }; if ($1 == "null") { printf $1 } else { printf $1 / 1000 }; if (i % 3 != 2) { printf "," } else { print "]," }; ++i; }' | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| #!/bin/bash | ||
|
|
||
| # Install | ||
|
|
||
| if [ ! -x /usr/bin/clickhouse ] | ||
| then | ||
| cd /tmp || exit | ||
| curl https://clickhouse.com/ | sh | ||
| sudo ./clickhouse install --noninteractive | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think a ClickHouse installation isn't necessary (in fact, all the
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Do you want to make the same changes to clickhouse/benchmark.sh? I just copied that code.
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Hmm, okay, then such changes would have a too large blast radius. I'll run this script tomorrow or on Friday in our automation. This will generate the results file that can then be uploaded to https://benchmark.clickhouse.com/
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. So, this? --- a/pg_clickhouse/clickhouse.sh
+++ b/pg_clickhouse/clickhouse.sh
@@ -6,7 +6,6 @@ if [ ! -x /usr/bin/clickhouse ]
then
cd /tmp || exit
curl https://clickhouse.com/ | sh
- sudo ./clickhouse install --noninteractive
rm clickhouse
cd - || exit
fi
@@ -20,7 +19,7 @@ compression:
" | sudo tee /etc/clickhouse-server/config.d/compression.yaml
fi;
-sudo clickhouse start
+clickhouse start &
for _ in {1..300}
do
@@ -42,8 +41,7 @@ clickhouse-client < create"$SUFFIX".sql
# seq 1 | xargs -P100 -I{} bash -c 'wget --continue --progress=dot:giga https://datasets.clickhouse.com/hits_compatible/athena_partitioned/hits_{}.parquet'
seq 0 99 | xargs -P100 -I{} bash -c 'wget --continue --progress=dot:giga https://datasets.clickhouse.com/hits_compatible/athena_partitioned/hits_{}.parquet'
-sudo mv hits_*.parquet /var/lib/clickhouse/user_files/
-sudo chown clickhouse:clickhouse /var/lib/clickhouse/user_files/hits_*.parquet
+mv hits_*.parquet /var/lib/clickhouse/user_files/
echo -n "Load time: "
clickhouse-client --time --query "INSERT INTO hits SELECT * FROM file('hits_*.parquet')" --max-insert-threads $(( $(nproc) / 4 )) |
||
| rm clickhouse | ||
| cd - || exit | ||
| fi | ||
|
|
||
| # Optional: if you want to use higher compression: | ||
| if (( 0 )); then | ||
| echo " | ||
| compression: | ||
| case: | ||
| method: zstd | ||
| " | sudo tee /etc/clickhouse-server/config.d/compression.yaml | ||
| fi; | ||
|
|
||
| sudo clickhouse start | ||
|
|
||
| for _ in {1..300} | ||
| do | ||
| clickhouse-client --query "SELECT 1" && break | ||
| sleep 1 | ||
| done | ||
|
|
||
| # Determine which set of files to use depending on the type of run | ||
| if [ "$1" != "" ] && [ "$1" != "tuned" ] && [ "$1" != "tuned-memory" ]; then | ||
| echo "Error: command line argument must be one of {'', 'tuned', 'tuned-memory'}" | ||
| exit 1 | ||
| elif [ ! -z "$1" ]; then | ||
| SUFFIX="-$1" | ||
| fi | ||
|
|
||
| # Load the data | ||
|
|
||
| clickhouse-client < create"$SUFFIX".sql | ||
|
|
||
| # seq 1 | xargs -P100 -I{} bash -c 'wget --continue --progress=dot:giga https://datasets.clickhouse.com/hits_compatible/athena_partitioned/hits_{}.parquet' | ||
| seq 0 99 | xargs -P100 -I{} bash -c 'wget --continue --progress=dot:giga https://datasets.clickhouse.com/hits_compatible/athena_partitioned/hits_{}.parquet' | ||
| sudo mv hits_*.parquet /var/lib/clickhouse/user_files/ | ||
| sudo chown clickhouse:clickhouse /var/lib/clickhouse/user_files/hits_*.parquet | ||
|
|
||
| echo -n "Load time: " | ||
| clickhouse-client --time --query "INSERT INTO hits SELECT * FROM file('hits_*.parquet')" --max-insert-threads $(( $(nproc) / 4 )) | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,121 @@ | ||
| BEGIN; | ||
|
|
||
| CREATE EXTENSION IF NOT EXISTS pg_clickhouse; | ||
| CREATE SERVER ch_srv FOREIGN DATA WRAPPER clickhouse_fdw | ||
| OPTIONS(driver 'binary', host 'localhost', dbname 'default'); | ||
| CREATE USER MAPPING FOR CURRENT_USER SERVER ch_srv | ||
| OPTIONS (user 'default'); | ||
|
|
||
| CREATE FOREIGN TABLE hits ( | ||
| WatchID BIGINT NOT NULL, | ||
| JavaEnable SMALLINT NOT NULL, | ||
| Title TEXT NOT NULL, | ||
| GoodEvent SMALLINT NOT NULL, | ||
| EventTime TIMESTAMP NOT NULL, | ||
| EventDate Date NOT NULL, | ||
| CounterID INTEGER NOT NULL, | ||
| ClientIP INTEGER NOT NULL, | ||
| RegionID INTEGER NOT NULL, | ||
| UserID BIGINT NOT NULL, | ||
| CounterClass SMALLINT NOT NULL, | ||
| OS SMALLINT NOT NULL, | ||
| UserAgent SMALLINT NOT NULL, | ||
| URL TEXT NOT NULL, | ||
| Referer TEXT NOT NULL, | ||
| IsRefresh SMALLINT NOT NULL, | ||
| RefererCategoryID SMALLINT NOT NULL, | ||
| RefererRegionID INTEGER NOT NULL, | ||
| URLCategoryID SMALLINT NOT NULL, | ||
| URLRegionID INTEGER NOT NULL, | ||
| ResolutionWidth SMALLINT NOT NULL, | ||
| ResolutionHeight SMALLINT NOT NULL, | ||
| ResolutionDepth SMALLINT NOT NULL, | ||
| FlashMajor SMALLINT NOT NULL, | ||
| FlashMinor SMALLINT NOT NULL, | ||
| FlashMinor2 TEXT NOT NULL, | ||
| NetMajor SMALLINT NOT NULL, | ||
| NetMinor SMALLINT NOT NULL, | ||
| UserAgentMajor SMALLINT NOT NULL, | ||
| UserAgentMinor VARCHAR(255) NOT NULL, | ||
| CookieEnable SMALLINT NOT NULL, | ||
| JavascriptEnable SMALLINT NOT NULL, | ||
| IsMobile SMALLINT NOT NULL, | ||
| MobilePhone SMALLINT NOT NULL, | ||
| MobilePhoneModel TEXT NOT NULL, | ||
| Params TEXT NOT NULL, | ||
| IPNetworkID INTEGER NOT NULL, | ||
| TraficSourceID SMALLINT NOT NULL, | ||
| SearchEngineID SMALLINT NOT NULL, | ||
| SearchPhrase TEXT NOT NULL, | ||
| AdvEngineID SMALLINT NOT NULL, | ||
| IsArtifical SMALLINT NOT NULL, | ||
| WindowClientWidth SMALLINT NOT NULL, | ||
| WindowClientHeight SMALLINT NOT NULL, | ||
| ClientTimeZone SMALLINT NOT NULL, | ||
| ClientEventTime TIMESTAMP NOT NULL, | ||
| SilverlightVersion1 SMALLINT NOT NULL, | ||
| SilverlightVersion2 SMALLINT NOT NULL, | ||
| SilverlightVersion3 INTEGER NOT NULL, | ||
| SilverlightVersion4 SMALLINT NOT NULL, | ||
| PageCharset TEXT NOT NULL, | ||
| CodeVersion INTEGER NOT NULL, | ||
| IsLink SMALLINT NOT NULL, | ||
| IsDownload SMALLINT NOT NULL, | ||
| IsNotBounce SMALLINT NOT NULL, | ||
| FUniqID BIGINT NOT NULL, | ||
| OriginalURL TEXT NOT NULL, | ||
| HID INTEGER NOT NULL, | ||
| IsOldCounter SMALLINT NOT NULL, | ||
| IsEvent SMALLINT NOT NULL, | ||
| IsParameter SMALLINT NOT NULL, | ||
| DontCountHits SMALLINT NOT NULL, | ||
| WithHash SMALLINT NOT NULL, | ||
| HitColor CHAR NOT NULL, | ||
| LocalEventTime TIMESTAMP NOT NULL, | ||
| Age SMALLINT NOT NULL, | ||
| Sex SMALLINT NOT NULL, | ||
| Income SMALLINT NOT NULL, | ||
| Interests SMALLINT NOT NULL, | ||
| Robotness SMALLINT NOT NULL, | ||
| RemoteIP INTEGER NOT NULL, | ||
| WindowName INTEGER NOT NULL, | ||
| OpenerName INTEGER NOT NULL, | ||
| HistoryLength SMALLINT NOT NULL, | ||
| BrowserLanguage TEXT NOT NULL, | ||
| BrowserCountry TEXT NOT NULL, | ||
| SocialNetwork TEXT NOT NULL, | ||
| SocialAction TEXT NOT NULL, | ||
| HTTPError SMALLINT NOT NULL, | ||
| SendTiming INTEGER NOT NULL, | ||
| DNSTiming INTEGER NOT NULL, | ||
| ConnectTiming INTEGER NOT NULL, | ||
| ResponseStartTiming INTEGER NOT NULL, | ||
| ResponseEndTiming INTEGER NOT NULL, | ||
| FetchTiming INTEGER NOT NULL, | ||
| SocialSourceNetworkID SMALLINT NOT NULL, | ||
| SocialSourcePage TEXT NOT NULL, | ||
| ParamPrice BIGINT NOT NULL, | ||
| ParamOrderID TEXT NOT NULL, | ||
| ParamCurrency TEXT NOT NULL, | ||
| ParamCurrencyID SMALLINT NOT NULL, | ||
| OpenstatServiceName TEXT NOT NULL, | ||
| OpenstatCampaignID TEXT NOT NULL, | ||
| OpenstatAdID TEXT NOT NULL, | ||
| OpenstatSourceID TEXT NOT NULL, | ||
| UTMSource TEXT NOT NULL, | ||
| UTMMedium TEXT NOT NULL, | ||
| UTMCampaign TEXT NOT NULL, | ||
| UTMContent TEXT NOT NULL, | ||
| UTMTerm TEXT NOT NULL, | ||
| FromTag TEXT NOT NULL, | ||
| HasGCLID SMALLINT NOT NULL, | ||
| RefererHash BIGINT NOT NULL, | ||
| URLHash BIGINT NOT NULL, | ||
| CLID INTEGER NOT NULL | ||
| )SERVER ch_srv OPTIONS( | ||
| database 'default', | ||
| table_name 'hits', | ||
| engine 'MergeTree' | ||
| ); | ||
|
|
||
| COMMIT; |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,109 @@ | ||
| CREATE OR REPLACE TABLE hits | ||
| ( | ||
| WatchID BIGINT NOT NULL, | ||
| JavaEnable SMALLINT NOT NULL, | ||
| Title TEXT NOT NULL, | ||
| GoodEvent SMALLINT NOT NULL, | ||
| EventTime TIMESTAMP NOT NULL, | ||
| EventDate Date NOT NULL, | ||
| CounterID INTEGER NOT NULL, | ||
| ClientIP INTEGER NOT NULL, | ||
| RegionID INTEGER NOT NULL, | ||
| UserID BIGINT NOT NULL, | ||
| CounterClass SMALLINT NOT NULL, | ||
| OS SMALLINT NOT NULL, | ||
| UserAgent SMALLINT NOT NULL, | ||
| URL TEXT NOT NULL, | ||
| Referer TEXT NOT NULL, | ||
| IsRefresh SMALLINT NOT NULL, | ||
| RefererCategoryID SMALLINT NOT NULL, | ||
| RefererRegionID INTEGER NOT NULL, | ||
| URLCategoryID SMALLINT NOT NULL, | ||
| URLRegionID INTEGER NOT NULL, | ||
| ResolutionWidth SMALLINT NOT NULL, | ||
| ResolutionHeight SMALLINT NOT NULL, | ||
| ResolutionDepth SMALLINT NOT NULL, | ||
| FlashMajor SMALLINT NOT NULL, | ||
| FlashMinor SMALLINT NOT NULL, | ||
| FlashMinor2 TEXT NOT NULL, | ||
| NetMajor SMALLINT NOT NULL, | ||
| NetMinor SMALLINT NOT NULL, | ||
| UserAgentMajor SMALLINT NOT NULL, | ||
| UserAgentMinor VARCHAR(255) NOT NULL, | ||
| CookieEnable SMALLINT NOT NULL, | ||
| JavascriptEnable SMALLINT NOT NULL, | ||
| IsMobile SMALLINT NOT NULL, | ||
| MobilePhone SMALLINT NOT NULL, | ||
| MobilePhoneModel TEXT NOT NULL, | ||
| Params TEXT NOT NULL, | ||
| IPNetworkID INTEGER NOT NULL, | ||
| TraficSourceID SMALLINT NOT NULL, | ||
| SearchEngineID SMALLINT NOT NULL, | ||
| SearchPhrase TEXT NOT NULL, | ||
| AdvEngineID SMALLINT NOT NULL, | ||
| IsArtifical SMALLINT NOT NULL, | ||
| WindowClientWidth SMALLINT NOT NULL, | ||
| WindowClientHeight SMALLINT NOT NULL, | ||
| ClientTimeZone SMALLINT NOT NULL, | ||
| ClientEventTime TIMESTAMP NOT NULL, | ||
| SilverlightVersion1 SMALLINT NOT NULL, | ||
| SilverlightVersion2 SMALLINT NOT NULL, | ||
| SilverlightVersion3 INTEGER NOT NULL, | ||
| SilverlightVersion4 SMALLINT NOT NULL, | ||
| PageCharset TEXT NOT NULL, | ||
| CodeVersion INTEGER NOT NULL, | ||
| IsLink SMALLINT NOT NULL, | ||
| IsDownload SMALLINT NOT NULL, | ||
| IsNotBounce SMALLINT NOT NULL, | ||
| FUniqID BIGINT NOT NULL, | ||
| OriginalURL TEXT NOT NULL, | ||
| HID INTEGER NOT NULL, | ||
| IsOldCounter SMALLINT NOT NULL, | ||
| IsEvent SMALLINT NOT NULL, | ||
| IsParameter SMALLINT NOT NULL, | ||
| DontCountHits SMALLINT NOT NULL, | ||
| WithHash SMALLINT NOT NULL, | ||
| HitColor CHAR NOT NULL, | ||
| LocalEventTime TIMESTAMP NOT NULL, | ||
| Age SMALLINT NOT NULL, | ||
| Sex SMALLINT NOT NULL, | ||
| Income SMALLINT NOT NULL, | ||
| Interests SMALLINT NOT NULL, | ||
| Robotness SMALLINT NOT NULL, | ||
| RemoteIP INTEGER NOT NULL, | ||
| WindowName INTEGER NOT NULL, | ||
| OpenerName INTEGER NOT NULL, | ||
| HistoryLength SMALLINT NOT NULL, | ||
| BrowserLanguage TEXT NOT NULL, | ||
| BrowserCountry TEXT NOT NULL, | ||
| SocialNetwork TEXT NOT NULL, | ||
| SocialAction TEXT NOT NULL, | ||
| HTTPError SMALLINT NOT NULL, | ||
| SendTiming INTEGER NOT NULL, | ||
| DNSTiming INTEGER NOT NULL, | ||
| ConnectTiming INTEGER NOT NULL, | ||
| ResponseStartTiming INTEGER NOT NULL, | ||
| ResponseEndTiming INTEGER NOT NULL, | ||
| FetchTiming INTEGER NOT NULL, | ||
| SocialSourceNetworkID SMALLINT NOT NULL, | ||
| SocialSourcePage TEXT NOT NULL, | ||
| ParamPrice BIGINT NOT NULL, | ||
| ParamOrderID TEXT NOT NULL, | ||
| ParamCurrency TEXT NOT NULL, | ||
| ParamCurrencyID SMALLINT NOT NULL, | ||
| OpenstatServiceName TEXT NOT NULL, | ||
| OpenstatCampaignID TEXT NOT NULL, | ||
| OpenstatAdID TEXT NOT NULL, | ||
| OpenstatSourceID TEXT NOT NULL, | ||
| UTMSource TEXT NOT NULL, | ||
| UTMMedium TEXT NOT NULL, | ||
| UTMCampaign TEXT NOT NULL, | ||
| UTMContent TEXT NOT NULL, | ||
| UTMTerm TEXT NOT NULL, | ||
| FromTag TEXT NOT NULL, | ||
| HasGCLID SMALLINT NOT NULL, | ||
| RefererHash BIGINT NOT NULL, | ||
| URLHash BIGINT NOT NULL, | ||
| CLID INTEGER NOT NULL, | ||
| ) | ||
| ENGINE = Memory; |
Uh oh!
There was an error while loading. Please reload this page.