Skip to content

[pull] master from yandex:master #120

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

Merged
pull merged 3 commits into from
Aug 31, 2019
Merged

[pull] master from yandex:master #120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bb0ca31
Allow to ATTACH live views
alexey-milovidov Aug 30, 2019
a31814e
Merge pull request #6754 from yandex/allow-attach-live-view
alexey-milovidov Aug 30, 2019
5fcdd6f
Added stress test variant that is as simple to run as ./stress
alexey-milovidov Aug 31, 2019
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 dbms/src/Storages/LiveView/StorageLiveView.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -593,7 +593,7 @@ void registerStorageLiveView(StorageFactory & factory)
{
factory.registerStorage("LiveView", [](const StorageFactory::Arguments & args)
{
if (!args.local_context.getSettingsRef().allow_experimental_live_view)
if (!args.attach && !args.local_context.getSettingsRef().allow_experimental_live_view)
throw Exception("Experimental LIVE VIEW feature is not enabled (the setting 'allow_experimental_live_view')", ErrorCodes::SUPPORT_IS_DISABLED);

return StorageLiveView::create(args.table_name, args.database_name, args.local_context, args.query, args.columns);
Expand Down
23 changes: 23 additions & 0 deletions dbms/tests/stress
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
#!/usr/bin/env bash

# https://stackoverflow.com/questions/360201/how-do-i-kill-background-processes-jobs-when-my-shell-script-exits
trap 'kill -9 $(jobs -p)' EXIT

function thread()
{
while true; do
./clickhouse-test --order random 2>&1 | awk '{ printf "'$1' " }'
done
}

# https://stackoverflow.com/questions/9954794/execute-a-shell-function-with-timeout
export -f thread;

NUM_THREADS=16
TIMEOUT=300

for i in $(seq 1 $NUM_THREADS); do
timeout $TIMEOUT bash -c "thread $i" 2> /dev/null &
done

wait