Alexey Milovidov
98ae9be734
Revert "Added tests for ClickHouse apps help and fixed help issues"
2023-04-21 01:54:34 +03:00
Andrey Zvonov
984e8fde41
Merge branch 'master' into zvonand-implicit-tz
2023-04-20 23:13:17 +02:00
Ilya Yatsishin
ebb1b990f2
Merge pull request #45819 from qoega/clickhouse-help
2023-04-18 21:46:36 +02:00
Dmitry Novik
cf5d9a175a
Revert "Merge pull request #48760 from ClickHouse/revert-46089-background-memory-tracker"
...
This reverts commit a61ed33223
, reversing
changes made to 5f01b8a2b5
.
2023-04-14 16:34:19 +02:00
zvonand
089306820f
Merge branch 'master' of github.com:ClickHouse/ClickHouse into zvonand-implicit-tz
2023-04-14 13:21:49 +02:00
Robert Schulze
7a21d5888c
Remove -Wshadow suppression which leaked into global namespace
2023-04-13 08:46:40 +00:00
zvonand
2a9f28b73b
resolve
2023-04-12 12:54:39 +02:00
zvonand
a9499eed79
moved getting server TZ DateLUT to separate place, upd tests and fix
2023-04-12 12:47:05 +02:00
Yatsishin Ilya
b5b65d2149
Merge remote-tracking branch 'origin' into clickhouse-help
2023-04-11 11:24:48 +00:00
Alexey Milovidov
09ea79aaf7
Add support for {server_uuid} macro
2023-04-09 03:04:26 +02:00
Antonio Andelic
f5e97fbb66
Merge branch 'master' into alternative-keeper-configs
2023-04-03 15:06:52 +00:00
filimonov
fbb22348ea
Refactor reading the pool setting & from server config. ( #48055 )
...
After #36425 there was a lot of confusions/problems with configuring pools - when the message was confusing, and settings need to be ajusted in several places.
See some examples in #44251 , #43351 , #47900 , #46515 .
The commit includes the following changes:
1) Introduced a unified mechanism for reading pool sizes from the configuration file(s). Previously, pool sizes were read from the Context.cpp with fallbacks to profiles, whereas main_config_reloader in Server.cpp read them directly without fallbacks.
2) Corrected the data type for background_merges_mutations_concurrency_ratio. It should be float instead of int.
3) Refactored the default values for settings. Previously, they were defined in multiple places throughout the codebase, but they are now defined in one place (or two, to be exact: Settings.h and ServerSettings.h).
4) Improved documentation, including the correct message in system.settings.
Additionally make the code more conform with #46550 .
2023-03-30 16:44:11 +02:00
Antonio Andelic
d6cbc5d05b
Fix tests
2023-03-23 15:01:51 +00:00
Antonio Andelic
a4d1cd514d
Refactor
2023-03-23 08:58:56 +00:00
Yatsishin Ilya
5786aba5eb
Merge remote-tracking branch 'origin/master' into clickhouse-help
2023-03-22 14:08:22 +00:00
Antonio Andelic
65b99ec6a7
Merge branch 'master' into alternative-keeper-configs
2023-03-22 12:22:57 +00:00
Robert Schulze
75ca2dd0e2
Merge remote-tracking branch 'origin/master' into rs/qc-cachebase
2023-03-15 10:55:53 +00:00
Yatsishin Ilya
45c5275bfb
Merge remote-tracking branch 'origin/master' into clickhouse-help
2023-03-14 17:27:25 +00:00
Robert Schulze
657aa65446
Cleanup: Untangle CacheBase's constructors
...
This prepares for the custom TTLCachePolicy which users should not be
able to configure explicitly.
2023-03-13 15:11:12 +00:00
Alexander Tokmakov
7b1b238d0b
Revert "Merge pull request #25674 from amosbird/distributedreturnconnection"
...
This reverts commit 5ffd99dfd4
, reversing
changes made to 2796aa333f
.
2023-03-11 19:09:47 +01:00
Yatsishin Ilya
6cde37093a
Merge remote-tracking branch 'origin/master' into clickhouse-help
2023-03-08 13:34:18 +00:00
Nikita Mikhaylov
5c4da5aa4a
Use separate thread pool for IO operations for backups ( #47174 )
2023-03-03 20:05:42 +01:00
Yatsishin Ilya
d4304d2028
Merge remote-tracking branch 'origin/master' into clickhouse-help
2023-03-02 16:16:18 +00:00
pufit
29296cb004
Merge pull request #46550 from ClickHouse/46231-systerm-server-settings
...
Implement `system.server_settings`
2023-02-28 11:23:15 -05:00
bkuschel
77607ba0d4
Fix setenv string call
2023-02-27 08:01:15 -05:00
Alexey Milovidov
83c41755ed
Remove unused header
2023-02-25 03:21:14 +01:00
pufit
1157bf2d9f
Removed unnecessary ifs
2023-02-22 15:15:09 -05:00
Yatsishin Ilya
80857638c1
Merge remote-tracking branch 'origin/master' into clickhouse-help
2023-02-22 13:58:17 +00:00
Kseniia Sumarokova
24d0490ef3
Merge branch 'master' into delay-loading-of-named-collections
2023-02-21 00:24:18 +01:00
kssenii
9d16205c8a
Load named collections on first access
2023-02-20 16:33:45 +01:00
pufit
ff4e23aca8
Update programs/server/Server.cpp
...
Co-authored-by: Sergei Trifonov <sergei@clickhouse.com>
2023-02-19 16:48:55 -05:00
pufit
4496db66b2
Implement system.server_settings
2023-02-17 23:46:09 -05:00
Alexander Tokmakov
3457b68dcc
fix
2023-02-17 17:57:49 +01:00
Alexander Tokmakov
9feb448a5e
fix a race condition
2023-02-16 14:41:18 +01:00
serxa
c58b165b0f
add config option to select scheduling policy
2023-02-11 16:18:42 +00:00
Yatsishin Ilya
1baa15d603
Merge remote-tracking branch 'origin/master' into clickhouse-help
2023-02-07 15:46:59 +00:00
Robert Schulze
9b841d67e8
Merge remote-tracking branch 'origin/master' into qc-max_cache_size
2023-02-05 16:47:02 +00:00
Boris Kuschel
1d4cf4fe69
Add encryption support with openssl
2023-02-04 14:59:34 -05:00
Yatsishin Ilya
f4cfd8a2d9
Merge remote-tracking branch 'origin' into clickhouse-help
2023-02-03 20:08:23 +00:00
Anton Popov
cdbe145bc1
Merge pull request #45796 from CurtizJ/fix-leak-in-azure-sdk
...
Fix test `test_azure_blob_storage_zero_copy_replication ` (memory leak in azure sdk)
2023-02-03 14:16:19 +01:00
Robert Schulze
b1889b0284
Make the naming a little less confusing
2023-02-02 19:18:39 +00:00
Robert Schulze
216636f984
Make query cache global settings re-configurable
2023-02-01 10:35:19 +00:00
Yatsishin Ilya
98edb9f06b
Update help for clickhouse tools and add test
2023-01-31 12:19:37 +00:00
Robert Schulze
325c6bdf3d
Renaming: "Query Result Cache" --> "Query Cache"
...
Reasons:
- The cache will at some point store intermediate results as opposed to
only query results. We should change the terminology now without
having to worry about backward compat.
- Equivalent caches in MySQL (1) and Starrocks (2) are called "query
cache".
- The new name is ca. 13.8% more catchy.
(1) https://dev.mysql.com/doc/refman/5.6/en/query-cache.html
(2) https://docs.starrocks.io/en-us/2.5/using_starrocks/query_cache
2023-01-31 09:54:34 +00:00
Anton Popov
839cd614fb
fix memory leak in azure sdk
2023-01-31 01:01:10 +00:00
Alexander Tokmakov
6ecae8388e
Merge branch 'master' into exception_message_patterns4
2023-01-24 14:42:36 +01:00
Alexey Milovidov
cb1e8afda6
Merge pull request #45524 from kssenii/fix-cache-policies-getter
...
Add proper default to cache policy getter
2023-01-24 12:46:33 +03:00
Alexander Tokmakov
3f6594f4c6
forbid old ctor of Exception
2023-01-23 22:18:05 +01:00
Alexander Tokmakov
70d1adfe4b
Better formatting for exception messages ( #45449 )
...
* save format string for NetException
* format exceptions
* format exceptions 2
* format exceptions 3
* format exceptions 4
* format exceptions 5
* format exceptions 6
* fix
* format exceptions 7
* format exceptions 8
* Update MergeTreeIndexGin.cpp
* Update AggregateFunctionMap.cpp
* Update AggregateFunctionMap.cpp
* fix
2023-01-24 00:13:58 +03:00
kssenii
3a4d5ba07d
Fix cache policy getter
2023-01-23 22:07:06 +01:00
Robert Schulze
4f90824347
Merge remote-tracking branch 'origin/master' into query-result-cache
2023-01-17 22:49:53 +00:00
Smita Kulkarni
09241150a0
Updated recording of startup time till after starting last listener and added stopping the StopWatch - Record server startup time in ProfileEvents
2023-01-16 08:32:25 +01:00
Smita Kulkarni
a0fe26f506
Addressed review comments and updated name to ServerStartupMilliseconds - Record server startup time in ProfileEvents
2023-01-13 14:38:54 +01:00
Smita Kulkarni
cf5cb0da97
Record server startup time in ProfileEvents
...
Implementation:
* Added ProfileEvents::ServerStartupTime.
* Recorded time from start of main till listening to sockets.
Testing:
* Added a test 02532_profileevents_server_startup_time.sql
2023-01-13 13:47:54 +01:00
Robert Schulze
475bb31f33
Make server configuratio hierarchical
2023-01-12 21:24:40 +00:00
Robert Schulze
923fa2c15a
Fix review comments, pt. II
2023-01-10 10:21:08 +00:00
Robert Schulze
45dbcf88e5
Merge remote-tracking branch 'origin/master' into query-result-cache
2023-01-06 20:42:48 +00:00
Kseniia Sumarokova
573d3283b0
Merge pull request #44327 from kssenii/use-new-named-collections-code-2
...
Replace old named collections code with new (from #43147 ) part 2
2023-01-06 13:06:26 +01:00
kssenii
67509aa2d5
Merge remote-tracking branch 'upstream/master' into use-new-named-collections-code-2
2023-01-03 16:41:30 +01:00
Robert Schulze
e9e04166d9
Merge remote-tracking branch 'origin/master' into query-result-cache
2023-01-02 08:20:27 +00:00
Alexey Milovidov
b859cc2ddc
Fix build
2023-01-02 03:27:21 +01:00
Alexey Milovidov
6e946cc757
Less OOM in stress test
2023-01-01 23:22:26 +01:00
李扬
56b6378c12
Update programs/server/Server.cpp
...
Co-authored-by: Antonio Andelic <antonio2368@users.noreply.github.com>
2022-12-28 15:08:50 +08:00
taiyang-li
437c31eca3
merge master and fix conflicts
2022-12-28 15:02:37 +08:00
Alexey Milovidov
1c8fa6eb26
Merge pull request #44595 from ClickHouse/wrong-place-of-log-message
...
The position of the log message about the server environment was wrong
2022-12-27 16:00:37 +03:00
Alexey Milovidov
b218d549bf
Fix bad log message
2022-12-26 13:56:09 +01:00
Alexey Milovidov
d08e7e5f2d
The position of the log message about the server environment was wrong
2022-12-26 13:30:13 +01:00
kssenii
8308177361
Merge remote-tracking branch 'upstream/master' into use-new-named-collections-code-2
2022-12-23 12:14:46 +01:00
vdimir
511e8d698d
Rename config param tmp_cache -> temporary_data_in_cache
2022-12-22 10:22:56 +00:00
vdimir
d30d25dbbe
Temporary files evict fs cache
2022-12-22 10:22:49 +00:00
kssenii
6bd4f8c029
Merge remote-tracking branch 'upstream/master' into use-new-named-collections-code-2
2022-12-20 21:17:28 +01:00
Sergei Trifonov
6f7bba159f
Merge pull request #41840 from ClickHouse/io-scheduler
...
IO scheduling subsystem
2022-12-19 15:15:19 +01:00
Robert Schulze
b93c56323c
Merge remote-tracking branch 'origin/master' into query-result-cache
2022-12-19 09:18:36 +00:00
Alexey Milovidov
30fd9b8317
Merge pull request #43597 from ClickHouse/sd_notify_followup_fixes
...
Followup fixes for systemd notification (#43400 )
2022-12-17 04:35:05 +03:00
kssenii
30547d2dcd
Replace old named collections code for url
2022-12-17 00:24:05 +01:00
Boris Kuschel
b1e401eb93
Merge branch 'ClickHouse:master' into openssl_support
2022-12-16 16:40:08 -05:00
Boris Kuschel
1b7c5758d2
Fix openssl Bug
2022-12-16 12:31:17 -08:00
Sergei Trifonov
f61a98b5dc
Merge branch 'master' into io-scheduler
2022-12-16 15:55:08 +01:00
Robert Schulze
4db33f16e3
Make DoS attack on cache less likely
2022-12-15 21:42:51 +00:00
Robert Schulze
537c64aad2
Merge remote-tracking branch 'origin/master' into query-result-cache
...
Conflicts:
- tests/queries/0_stateless/02117_show_create_table_system.reference
2022-12-15 12:17:58 +00:00
kssenii
9aa6d31bce
Merge remote-tracking branch 'upstream/master' into use-new-named-collections-code
2022-12-13 22:25:10 +01:00
kssenii
fae817863c
Apply new code of named collections to s3
2022-12-13 22:19:09 +01:00
Robert Schulze
b78652e138
Query result cache
2022-12-12 10:37:10 +00:00
Boris Kuschel
b7698dc609
Fix style issues
2022-12-07 13:22:46 -05:00
Boris Kuschel
f03f95044e
OpenSSL code changes
2022-12-07 13:22:46 -05:00
Alexander Gololobov
3608763a30
Wait for parent process to send MAINPID=... notification to the service manager
2022-12-06 16:14:46 +01:00
Alexander Gololobov
688e6fe714
Send MAINPID= notification from the parent (watchdog) process to make systemd handle READY=1 notifiaction from the child
2022-12-05 23:03:40 +01:00
Alexander Gololobov
58fcf0fdb0
Merge branch 'master' into sd_notify_followup_fixes
2022-12-05 15:03:44 +01:00
kssenii
dca3444283
Merge remote-tracking branch 'upstream/master' into named-collections-sql-commands
2022-12-04 15:56:02 +01:00
Vladimir C
7d6950d397
Revert "Temporary files evict fs cache"
2022-12-02 14:50:56 +01:00
Vladimir C
117d01f2ac
Merge pull request #43457 from ClickHouse/vdimir/tmp-data-in-fs-cache
2022-12-01 13:41:40 +01:00
vdimir
98fe3c6c02
Temporary files evict fs cache
2022-12-01 11:49:17 +00:00
Antonio Andelic
1f93183dc7
Merge pull request #43087 from ClickHouse/keeper-prometheus
...
Add support for embedded Prometheus endpoint in Keeper
2022-12-01 12:46:47 +01:00
Vladimir C
53dc70a2d0
Merge pull request #38191 from BigRedEye/grace_hash_join
...
Closes https://github.com/ClickHouse/ClickHouse/issues/11596
2022-11-30 17:01:00 +01:00
Antonio Andelic
678958603b
Merge branch 'master' into keeper-prometheus
2022-11-28 09:48:57 +01:00
Anton Popov
c811f34a41
Simplify AsynchronousInsertQueue
and fix race ( #43233 )
2022-11-25 15:02:22 +01:00
Igor Nikonov
20e67b7140
Merge remote-tracking branch 'origin/master' into HEAD
2022-11-24 13:10:37 +00:00
Antonio Andelic
a6f38cb1cc
Merge branch 'master' into keeper-prometheus
2022-11-24 12:12:08 +01:00
Sergei Trifonov
8186a06c28
Merge branch 'master' into io-scheduler
2022-11-24 12:02:52 +01:00
Alexander Gololobov
7b4e0e5bd8
Properly handle EINTR; some more comments
2022-11-23 23:37:02 +01:00
kssenii
6044a9257c
Merge remote-tracking branch 'upstream/master' into named-collections-sql-commands
2022-11-23 12:00:55 +01:00
Alexander Gololobov
c636c323ea
Merge pull request #43400 from socketpair/sd_notify
...
Fix #8685 - added systemd sd_notify implementation
2022-11-22 18:07:50 +01:00
Alexander Gololobov
32d66659e5
Merge pull request #43364 from azat/server-stacktrace-on-fail
...
Provide full stacktrace in case of uncaught exception during server startup
2022-11-22 15:07:57 +01:00
kssenii
a279bac767
Merge remote-tracking branch 'upstream/master' into named-collections-sql-commands
2022-11-21 21:49:34 +01:00
Dmitry Novik
b17dc24a94
Do not reuse jemalloc memory in test
2022-11-21 16:10:47 +00:00
Alexander Gololobov
63196a1e9e
Close the socket; some cleanups
2022-11-21 16:05:47 +01:00
Antonio Andelic
e78761b66c
Merge branch 'master' into keeper-prometheus
2022-11-21 09:10:10 +01:00
Коренберг ☢️ Марк
6dbeee69d6
Fix ##8685 - added systemd sd_notify implementation
2022-11-20 19:34:12 +02:00
Azat Khuzhin
44f23c2568
Make disks checks only for clickhouse-server
...
This will fix clickhouse-disks
Signed-off-by: Azat Khuzhin <a.khuzhin@semrush.com>
2022-11-20 16:28:35 +01:00
Azat Khuzhin
eb3d21831d
Provide full stacktrace in case of uncaught exception during server start
...
Without it, it is hard to understand where the problem is.
Signed-off-by: Azat Khuzhin <a.khuzhin@semrush.com>
2022-11-18 13:24:57 +01:00
kssenii
5d9b34b59d
More tests
2022-11-17 15:34:35 +01:00
kssenii
f0ce28349d
Better
2022-11-16 17:58:21 +01:00
Alexey Milovidov
b4165f95a9
Merge branch 'master' into build/poco-leftovers
2022-11-16 06:09:58 +01:00
Antonio Andelic
96838f5be7
Merge branch 'master' into keeper-prometheus
2022-11-15 12:00:02 +00:00
李扬
fc7fcafe40
Merge branch 'master' into alternative_keeper
2022-11-15 10:34:07 +08:00
taiyang-li
64d7087084
merge master and fix conflict
2022-11-15 10:33:10 +08:00
Alexey Milovidov
2c7377be92
Merge pull request #43129 from Algunenano/skip_hash_in_sanitizer
...
Skip hash logging on sanitizer builds
2022-11-15 02:16:27 +01:00
Raúl Marín
65f00cc246
Skip binary hash calculation if there isn't a checksum reference
2022-11-14 12:17:21 +01:00
Antonio Andelic
1635d120a0
Merge pull request #43201 from ClickHouse/fix-tsan-race-config-reload
...
Stop `ConfigReloader` first to avoid data race
2022-11-14 11:58:43 +01:00
Antonio Andelic
38ee1a81a3
Stop config reloader before anything else
2022-11-13 19:17:41 +00:00
kssenii
63de577172
Better, add tests
2022-11-10 22:47:30 +01:00
Azat Khuzhin
953457de28
Remove POCO_CLICKHOUSE_PATCH
...
Signed-off-by: Azat Khuzhin <a.khuzhin@semrush.com>
2022-11-10 22:41:26 +01:00
kssenii
bed7ac9442
Support arbitrary structure collections
2022-11-10 17:05:24 +01:00
Antonio Andelic
1ed3930809
Add more metrics for Keeper
2022-11-09 15:51:41 +01:00
Antonio Andelic
c92ae5a385
Add suport for AsyncMetrics in standalone Keeper
2022-11-09 13:46:03 +01:00
Antonio Andelic
e82a5d43b5
Extract HTTPContext for HTTPServer
2022-11-09 09:02:04 +01:00
vdimir
506bf2d225
Merge branch 'master' into grace_hash_join
2022-10-26 12:25:50 +00:00
Azat Khuzhin
4e76629aaf
Fixes for -Wshorten-64-to-32
...
- lots of static_cast
- add safe_cast
- types adjustments
- config
- IStorage::read/watch
- ...
- some TODO's (to convert types in future)
P.S. That was quite a journey...
v2: fixes after rebase
v3: fix conflicts after #42308 merged
Signed-off-by: Azat Khuzhin <a.khuzhin@semrush.com>
2022-10-21 13:25:19 +02:00
Yakov Olkhovskiy
3ce1fa09d6
Merge pull request #41198 from ClickHouse/composable-protocol
...
Composable protocol
2022-10-17 11:23:12 -04:00
vdimir
adb63a5583
Merge branch 'master' into grace_hash_join
2022-10-17 12:32:56 +00:00
Vitaly Baranov
91c438eebe
Merge pull request #42263 from vitlibar/refactor-udf
...
Refactor the implementation of user-defined functions
2022-10-15 12:33:10 +02:00
Vitaly Baranov
2e59d671fc
Split UserDefinedSQLObjectsLoader to interface and implementation.
2022-10-13 10:32:32 +02:00
vdimir
0178307c27
Followup for TemporaryDataOnDisk
2022-10-12 15:25:23 +02:00
Yakov Olkhovskiy
2229087896
Merge branch 'master' into composable-protocol
2022-10-07 02:23:26 -04:00
Yakov Olkhovskiy
fc1de0a56a
move some functionality to Server::buildProtocolStackFromConfig
2022-10-07 01:10:33 +00:00
vdimir
5a7c493559
Merge branch 'master' into pr/BigRedEye/38191
2022-10-06 14:43:35 +00:00
Robert Schulze
da5a2e2db0
Merge remote-tracking branch 'origin/master' into generated-file-cleanup
...
Physical merge conflicts:
- src/Common/ZooKeeper/ZooKeeperImpl.cpp
- src/Core/config_core.h.in
- src/Functions/FunctionsAES.h
- src/Functions/config_functions.h.in
- src/configure_config.cmake
Logical merge conflicts:
- Functions/tryDecrypt.cpp
2022-10-06 08:43:25 +00:00
Alexey Milovidov
25d13b89e9
Merge pull request #41142 from MeenaRenganathan22/OpenSSL_InHouse
...
Changes to support the OpenSSL In-house build.
2022-10-05 23:02:04 +03:00
vdimir
ff55c369bc
Merge branch 'tmp-data-followup'
2022-10-05 18:10:05 +00:00
vdimir
ccd29e172f
Followup for TemporaryDataOnDisk
2022-10-05 16:42:27 +00:00
Anton Popov
f61e98f0e8
Merge pull request #40668 from ClickHouse/async-insert-max-data-size-fix
...
Use settings from query context for async INSERTs
2022-10-05 15:15:19 +02:00
Robert Schulze
db5ef7b3cb
Merge branch 'master' into generated-file-cleanup
2022-10-02 23:13:18 +02:00
root
7e4edfeb5a
Merge branch 'master' of https://github.com/MeenaRenganathan22/ClickHouse into OpenSSL_InHouse
2022-09-30 15:50:46 -07:00
root
4318ec125e
Merge branch 'master' of https://github.com/MeenaRenganathan22/ClickHouse into OpenSSL_InHouse
2022-09-30 15:50:22 -07:00
vdimir
7ebc297f4c
Merge branch 'master' into pr/BigRedEye/38191
2022-09-30 09:40:47 +00:00
vdimir
0093752271
Upd log message
2022-09-29 09:51:43 +00:00
vdimir
15c7a3be34
Temp data on disk: build
2022-09-29 09:51:41 +00:00
vdimir
c0898ce289
Use abstraction for temporary data on disk in Sort and Aggregation
2022-09-29 09:51:41 +00:00
Yakov Olkhovskiy
5e40f2ebca
review suggestions
2022-09-29 00:13:40 +00:00
Robert Schulze
fd86829824
Consolidate config_core.h into config.h
...
Less duplication, less confusion ...
2022-09-28 13:31:57 +00:00
Robert Schulze
6d70b4a1f6
Generate config_version.h into ${CONFIG_INCLUDE_PATH}
...
This makes the target location consistent with other auto-generated
files like config_formats.h, config_core.h, and config_functions.h and
simplifies the build of clickhouse_common.
2022-09-28 12:48:26 +00:00
serxa
b057d07977
IO scheduling subsystem
2022-09-27 13:26:41 +00:00
vdimir
e6a2959b63
Do not print tons of unknown files on server statup
2022-09-26 13:45:55 +00:00
Nikita Mikhaylov
502338560c
Added a test
2022-09-26 10:24:39 +00:00
Nikita Mikhaylov
636cedf488
Better
2022-09-26 10:24:39 +00:00
Nikita Mikhaylov
9b35d54e8f
First try
2022-09-26 10:24:39 +00:00
Nikita Mikhaylov
364aa1b41e
Fix race between ~BackgroundSchedulePool and ~DNSCacheUpdater ( #41654 )
2022-09-22 13:02:45 +02:00
Alexey Milovidov
45bd3cfc30
Merge branch 'master' into fix-three-fourth-of-trash
2022-09-20 21:27:41 +02:00
Nikolai Kochetov
46c955a469
Merge pull request #41387 from ClickHouse/run-dns-cache-updater-earlier
...
Enable DNS cache updater earlier.
2022-09-20 12:04:05 +02:00
Yakov Olkhovskiy
2f2080f5a4
Merge branch 'master' into composable-protocol
2022-09-19 08:15:07 -04:00
Alexey Milovidov
bb6f1bfce2
Fix 9/10 of trash
2022-09-19 08:53:20 +02:00
Vitaly Baranov
5365b105cc
Add SYSTEM RELOAD USERS command.
2022-09-18 12:44:00 +02:00
Nikolai Kochetov
8422fd5791
Merge branch 'master' into run-dns-cache-updater-earlier
2022-09-16 20:48:51 +02:00
Robert Schulze
b32b02d844
Merge pull request #40897 from ClickHouse/catboost-bridge-resurrected
...
Move CatBoost evaluation into clickhouse-library-bridge
2022-09-16 13:12:09 +02:00
Nikolai Kochetov
ee361c6d46
Enable DNS cache updater earlier.
2022-09-15 17:31:28 +00:00
Yakov Olkhovskiy
b939379da6
bug fix, merge fix, style fix
2022-09-14 16:29:26 +00:00
Yakov Olkhovskiy
5e3fde60f9
Merge branch 'master' into composable-protocol
2022-09-14 11:35:23 -04:00
Yakov Olkhovskiy
d550604e28
respect listen_host config param, fix updateServers and getListenTry
2022-09-13 23:12:53 +00:00
Sergei Trifonov
795c1c1438
fix warning text
2022-09-13 12:44:42 +02:00
Sergei Trifonov
85e43566b6
Merge branch 'master' into kvm-clock
2022-09-13 00:17:09 +02:00
Meena Renganathan
51d6611b96
Committing the ClickHouse core changes and other libraries to support OpenSSL. BoringSSL is still set as default
2022-09-12 09:05:38 -07:00
Azat Khuzhin
b698a4ff65
Apply changes to http handlers on fly without server restart
...
This has been implemented by simply restarting http servers in case of
http_handlers directive in configuration xml had been changed.
But, for this I have to change the handlers interface to accept
configuration separatelly, since the configuration that contains in the
server is the configuration with which server had been started.
Signed-off-by: Azat Khuzhin <a.khuzhin@semrush.com>
Co-authored-by: Antonio Andelic
2022-09-12 17:34:51 +02:00
Sergei Trifonov
2c78ff9697
Merge branch 'master' into kvm-clock
2022-09-12 14:59:18 +02:00
Sergei Trifonov
22ea533179
Do not warn about kvm-clock
2022-09-12 14:56:01 +02:00
Yakov Olkhovskiy
0d6d9e7e44
Merge branch 'master' into composable-protocol
2022-09-11 18:59:57 -04:00
Yakov Olkhovskiy
7c855c9da2
style fix
2022-09-11 22:44:27 +00:00
Yakov Olkhovskiy
ffa7d3b121
cleanup
2022-09-11 21:51:25 +00:00
Yakov Olkhovskiy
7985f4ba16
cleanup, respect USE_SSL
2022-09-11 21:35:38 +00:00
Yakov Olkhovskiy
0c62b5acfc
split into diferent files
2022-09-11 19:00:40 +00:00
Yakov Olkhovskiy
745e759146
bugs fixed, cleanup, working state
2022-09-11 14:32:37 +00:00
Yakov Olkhovskiy
c3ac0c434b
some refactoring
2022-09-11 04:40:58 +00:00
Yakov Olkhovskiy
d001baec87
pass section config key to a factory
2022-09-11 00:40:40 +00:00
Yakov Olkhovskiy
772bf050da
add PROXYv1 handler, add stack exchange data block, tuneup protocols config
2022-09-10 20:21:37 +00:00
Robert Schulze
c16707ff00
chore: delete obsolete modelEvaluate() function + SYSTEM.MODELS view
...
- The deleted function modelEvaluate() was superseded by
catboostEvaluate().
- Also delete the external model repository, as modelEvaluate() was it's
last user. Additionally remove the system view SYSTEM.MODELS for
inspecting the repository.
- SYSTEM RELOAD MODELS is also obsolete. HOWEVER, it was retained and
made a no-op instead of deleted.
Why?
The reason is that RBAC in distributed setups works by storing
privileges (granted and revoked) as plain SQL statements in Keeper.
Nodes read these statements at startup and parse them. If a privilege
for SYSTEM RELOAD MODELS exists but parser doesn't recognize it
nodes would fail to come up.
Considered but rejected alternatives:
- Ignore SYSTEM RELOAD MODELS during parsing RBAC privileges and
return an error for regular SYSTEM RELOAD MODELS SQL. Special-case
of no-op behavior, too brittle.
- Remove SYSTEM RELOAD MODELS manually from Keeper via command-line
manipulation of Keeper nodes or via SQL by dropping the privileges.
Needs user intervention during upgrade.
2022-09-08 09:10:11 +00:00
Yakov Olkhovskiy
8a7fe2888a
protocols configuration processing
2022-09-08 06:12:33 +00:00
Luck-Chang
1ac8e739c9
fix some typos and clang-tidy warnings
2022-09-05 09:50:24 +08:00
Yakov Olkhovskiy
5727517713
add variadic constructor
2022-09-02 16:22:57 +00:00
Yakov Olkhovskiy
b6e3680d60
test with TLS
2022-09-02 04:47:04 +00:00
Sema Checherinda
e436b4f4cc
Metric for the number of detached parts
2022-08-30 02:12:57 +02:00
Robert Schulze
e8b3f56733
Limit suppression to a specific warning
2022-08-21 18:24:17 +00:00
Alexey Milovidov
3649aac593
Fix style
2022-08-20 17:59:51 +02:00
Alexey Milovidov
74e1f4dc61
Fix clang-tidy
2022-08-20 17:09:20 +02:00
Sergei Trifonov
7bbbe0a4db
fix darwin build
2022-08-18 19:31:25 +02:00
Sergei Trifonov
b064021cec
fix build
2022-08-18 16:57:31 +02:00
Sergei Trifonov
42a711015f
split concurrent_threads_soft_limit setting into two: concurrent_threads_soft_limit_{num,ratio_to_cores}
2022-08-18 14:51:08 +02:00
Nikita Mikhaylov
a7c3f23dfb
Merge branch 'master' into auto_convert_ordinary_to_atomic
2022-08-17 00:38:25 +02:00
Alexey Milovidov
f0c8998471
Add warning message
2022-08-14 01:49:00 +02:00
Alexey Milovidov
42c358aa3c
Add warning message
2022-08-14 01:47:36 +02:00
alexX512
2be72560f4
Add loading of mark cache policy
2022-08-07 19:59:39 +00:00
alexX512
1133e42367
Add CacheBase clas instead of LRUCache and SLRUCache fo simpler configuration oache policiesf
2022-08-07 19:16:40 +00:00
Alexander Tokmakov
f2c4cad255
add flag that enables automatic canversion from Ordinary to Atomic
2022-08-05 21:41:25 +02:00
Ilya Yatsishin
c882bdc88e
Merge pull request #35968 from ClickHouse/interserver_listen_port
2022-08-01 13:57:17 +02:00
Alexey Milovidov
f80a4c184e
Merge branch 'master' into interserver_listen_port
2022-07-31 01:22:32 +03:00
Alexey Milovidov
552b517e59
Allow to hide addresses in stack traces
2022-07-29 00:13:02 +02:00
Roman Vasin
f35349eb08
Rename total_max_threads to concurrent_threads_soft_limit
2022-07-28 07:46:20 +00:00
Roman Vasin
37845389c8
Merge branch 'concurrency-control' of github.com:ClickHouse/ClickHouse into ADQM-445
2022-07-27 13:31:22 +00:00
Alexander Tokmakov
dbf2763788
automatically convert system database to Atomic
2022-06-23 21:38:43 +02:00
Roman Vasin
3de3ae1b64
Set ConcurrencyControl::Unlimited when total_max_threads 0 or undefined
2022-06-21 16:39:53 +03:00
Maksim Kita
6b748f2193
AArch64 enable trace collection
2022-06-17 17:53:51 +02:00
Robert Schulze
b936abe813
+ comments about keeping stuff in sync
2022-06-16 00:07:59 +02:00
Robert Schulze
bc46cef63c
Minor follow-up
...
- change ELF section name to ".clickhouse.hash" (lowercase seems
standard)
- more expressive/concise integrity check messages at startup
2022-06-14 08:52:13 +00:00
Alexey Milovidov
b5f48a7d3f
Merge branch 'master' of github.com:ClickHouse/ClickHouse into llvm-14
2022-06-01 22:09:58 +02:00
Alexey Milovidov
bac09770f1
Fix clang-tidy-14
2022-06-01 22:07:26 +02:00
Dmitry Novik
7fbe91ca81
Merge pull request #37460 from ClickHouse/memory-overcommit-improvement
...
Memory Overcommit: update defaults, exception message and add ProfileEvent
2022-06-01 17:06:33 +02:00
Roman Vasin
b7cde2c5ad
Remove total_max_threads logic from QueryPipelineBuilder; Add setMaxConcurrency(total_max_threads) in Server.cpp
2022-05-31 19:43:15 +03:00
Alexey Milovidov
4bb04f913f
Fix clang-tidy-14
2022-05-31 17:20:07 +02:00
mergify[bot]
ba49c6bb46
Merge branch 'master' into memory-overcommit-improvement
2022-05-31 13:17:06 +00:00
Roman Vasin
441bd3e81f
Merge remote-tracking branch 'origin/concurrency-control' into ADQM-445
2022-05-31 15:07:02 +03:00
Sergei Trifonov
026e073b0b
minor improvement
2022-05-31 13:50:09 +02:00
Sergei Trifonov
7e95bf31b2
more verbose sanity checks
2022-05-31 09:26:26 +02:00
Dmitry Novik
60b9d81773
Remove global_memory_usage_overcommit_max_wait_microseconds
2022-05-27 16:30:29 +00:00
Azat Khuzhin
dc9ca3d70c
Fix LOGICAL_ERROR in getMaxSourcePartsSizeForMerge during merges ( #37413 )
2022-05-26 14:14:58 +02:00
Vitaly Baranov
497c70d786
Merge pull request #37269 from vitlibar/rework-access-control-notifications
...
Rework AccessControl's notifications.
2022-05-24 17:47:45 +02:00
Dmitry Novik
e9187ec4b7
Overcommit: update defaults, exception message and add ProfileEvent
2022-05-23 14:35:09 +00:00
Vitaly Baranov
58f4a86ec7
Rework notifications used in access management.
2022-05-21 10:15:39 +02:00
Roman Vasin
83958d2549
Add more intergration tests. Add documenation text. Change thread_factor to 3. Add logging. Set default value = -1 to see the results CI tests.
2022-05-20 15:52:50 +03:00
Robert Schulze
c0d5705891
Merge pull request #37326 from ClickHouse/fix-marks-cache-size-cfg
...
Provide default value for mark_cache_size
2022-05-19 20:20:25 +02:00
Robert Schulze
8ca58cd5a5
Provide default value for mark_cache_size
...
I played around with my local config.xml file. The minimal working example is this:
<?xml version="1.0"?>
<clickhouse>
<mark_cache_size>5368709120</mark_cache_size>
<listen_host>localhost</listen_host>
<tcp_port>9000</tcp_port>
<users_config>users.xml</users_config>
<logger><console>true</console></logger>
</clickhouse>
Not specifying mark_cache_size made the server not start up:
2022.05.18 12:15:06.549078 [ 8728320 ] {} <Error> Application: Not found: mark_cache_size
Looking at ClickHouse's ca. 100 server configuration options +
sub-options, it seems that mark_cache_size is NOT special enough to
require explicit configuration but instead that the behavior was
unintended because no default value was provided.
2022-05-18 15:28:19 +02:00
Roman Vasin
e966016c1a
Corrected all issues found by Style Check (actions). Renamed setGlobalMaxThreads into setTotalMaxThreads.
2022-05-17 19:35:40 +03:00
Roman Vasin
7cc63f3eed
Removed logging code
2022-05-17 10:02:54 +03:00
Roman Vasin
159ea14739
Code cleanup. Corrected Loggers path. Refactoring Context code.
2022-05-16 19:48:17 +03:00
Azat Khuzhin
c8420c0dbe
Remove duplication for server connections check
...
Signed-off-by: Azat Khuzhin <a.khuzhin@semrush.com>
2022-05-16 16:22:58 +03:00
Azat Khuzhin
e503f1f22c
Keep reloaded servers and currently active in one list
...
Signed-off-by: Azat Khuzhin <a.khuzhin@semrush.com>
2022-05-16 16:22:58 +03:00
Azat Khuzhin
f15a5461be
Fix server reload on port change (do not wait for current connections)
...
If you will execute 'SYSTEM RELOAD CONFIG' via, i.e., TCP protocol, then
reload on port change will endlessly wait for connection from which this
query had been issued, and you will see the following message in the
logs:
2022.04.28 03:34:57.552513 [ 37101 ] {b41d855c-4dbf-470a-a144-c6ae5a1abda8} <Debug> executeQuery: (from 127.0.0.1:11774) system reload config
...
2022.04.28 03:34:57.710640 [ 37101 ] {b41d855c-4dbf-470a-a144-c6ae5a1abda8} <Information> Application: Stopped listening for http://127.0.0.1:18123
2022.04.28 03:34:57.798774 [ 37101 ] {b41d855c-4dbf-470a-a144-c6ae5a1abda8} <Information> Application: Stopped listening for native protocol (tcp): 127.0.0.1:19000
...
2022.04.28 03:34:57.901375 [ 37101 ] {b41d855c-4dbf-470a-a144-c6ae5a1abda8} <Debug> Application: Server finished: http://127.0.0.1:18123
2022.04.28 03:34:57.901455 [ 37101 ] {b41d855c-4dbf-470a-a144-c6ae5a1abda8} <Trace> Application: Waiting server to finish: native protocol (tcp): 127.0.0.1:19000
2022.04.28 03:34:58.001717 [ 37101 ] {b41d855c-4dbf-470a-a144-c6ae5a1abda8} <Trace> Application: Waiting server to finish: native protocol (tcp): 127.0.0.1:19000
2022.04.28 03:34:58.101881 [ 37101 ] {b41d855c-4dbf-470a-a144-c6ae5a1abda8} <Trace> Application: Waiting server to finish: native protocol (tcp): 127.0.0.1:19000
...
2022.04.28 03:35:01.707951 [ 37101 ] {b41d855c-4dbf-470a-a144-c6ae5a1abda8} <Trace> Application: Waiting server to finish: native protocol (tcp): 127.0.0.1:19000
But waiting for the current connection will never ends.
So instead of waiting directly from the query context (SYSTEM RELOAD
CONFIG) do this in background (actually not even in background, but
check on server reload and on exit).
v0: just don't wait for the servers
v2: fix use-after-free by removing dependency from server in handlers
v3: wait servers in background to avoid use-after-free of the context
Signed-off-by: Azat Khuzhin <a.khuzhin@semrush.com>
2022-05-16 16:22:58 +03:00
Robert Schulze
e3cfec5b09
Merge remote-tracking branch 'origin/master' into clangtidies
2022-05-16 10:12:50 +02:00
Roman Vasin
5dcd374c85
Merge branch 'master' of github.com:ClickHouse/ClickHouse into ADQM-445
2022-05-16 11:09:05 +03:00
Roman Vasin
b06d84b3e5
renamed global_max_threads parameter to total_max_threads
2022-05-13 16:56:03 +03:00
Roman Vasin
87f25c6864
Added thread_factor = 2 constant for initial value calculation of global_max_threads
2022-05-13 15:02:45 +03:00
Roman Vasin
d94e9c4263
For value -1 of global_max_threads replaced physical cores count by logical cores count
2022-05-13 10:56:34 +03:00
Azat Khuzhin
5086d8de29
Reload listen_reuse_port/listen_backlog from config
...
Signed-off-by: Azat Khuzhin <a.khuzhin@semrush.com>
2022-05-12 17:05:39 +03:00
Roman Vasin
925a94a656
Implemented -1 value handling for global_max_threads parameter
2022-05-12 16:56:24 +03:00
Sergei Trifonov
9800d80a29
update sanity checks warning message text
2022-05-10 09:31:22 +02:00
mergify[bot]
8ea87a3530
Merge branch 'master' into enable-memory-overcommit
2022-05-09 14:00:54 +00:00
Robert Schulze
1b81bb49b4
Enable clang-tidy modernize-deprecated-headers & hicpp-deprecated-headers
...
Official docs:
Some headers from C library were deprecated in C++ and are no longer
welcome in C++ codebases. Some have no effect in C++. For more details
refer to the C++ 14 Standard [depr.c.headers] section. This check
replaces C standard library headers with their C++ alternatives and
removes redundant ones.
2022-05-09 08:23:33 +02:00
Vitaly Baranov
69bec2f377
Users without assigned row policies can view rows now.
2022-05-07 14:50:24 +02:00
mergify[bot]
1a92a34514
Merge branch 'master' into enable-memory-overcommit
2022-05-02 17:04:08 +00:00
Alexey Milovidov
47988db1a5
Add sanity check for log level. Fix style.
2022-04-30 13:19:25 +02:00
Alexey Milovidov
e0b2365945
Merge pull request #36472 from ClickHouse/sanity-checks-message-fix
...
more specific warning text about low disk space
2022-04-30 09:44:21 +03:00
Alexey Milovidov
1ddb04b992
Merge pull request #36715 from amosbird/refactorbase
...
Reorganize source files so that base won't depend on Common
2022-04-30 09:40:58 +03:00
Nikolai Kochetov
5807ca47b0
Merge pull request #36425 from ClickHouse/pool-size-hot-reload
...
Allow to increase number of threads and tasks for background executors
2022-04-29 17:24:12 +02:00
Amos Bird
4a5e4274f0
base should not depend on Common
2022-04-29 10:26:35 +08:00
Maksim Kita
04429d85db
Added user_defined_path config setting
2022-04-28 22:13:33 +02:00
mergify[bot]
74aa65e36e
Merge branch 'master' into sanity-checks-message-fix
2022-04-26 05:45:11 +00:00
mergify[bot]
9c3605712b
Merge branch 'master' into sanity-checks-message-fix
2022-04-25 17:37:55 +00:00
Azat Khuzhin
6df54611a9
Log which taskstats provider is in use
...
Signed-off-by: Azat Khuzhin <a.khuzhin@semrush.com>
v2: add missing __builtin_unreachable() for gcc built [1]
[1]: https://s3.amazonaws.com/clickhouse-builds/36351/99e72a960325cc1fb3cd3d6a1b56cf2b1cc2d733/binary_gcc/build_log.log
(cherry picked from commit 2be022cb56
)
2022-04-25 07:56:54 +03:00
Alexey Milovidov
74bb6349c2
Revert "Strict taskstats parser"
2022-04-25 01:15:08 +03:00
Alexey Milovidov
8af3159916
Merge pull request #36351 from azat/netlink-strict
...
Strict taskstats parser
2022-04-24 05:14:06 +03:00
Roman Vasin
0c467872d9
Moved global_max_threads parameter from users.xml file to config.xml file
2022-04-22 17:17:29 +03:00
Nikita Mikhaylov
aaa7112405
Even better
2022-04-22 13:56:16 +00:00
Nikita Mikhaylov
e475849761
Style and Docs update
2022-04-22 13:56:16 +00:00
Nikita Mikhaylov
f95a63a7f0
Beautify
2022-04-22 13:56:16 +00:00
Nikita Mikhaylov
36bdee0499
Deleted settings
2022-04-22 13:56:16 +00:00
Nikita Mikhaylov
31ccb9c1c3
Done
2022-04-22 13:56:16 +00:00
Alexey Milovidov
f31cad52ab
Preparation
2022-04-22 03:21:29 +02:00
Sergei Trifonov
cda9160c2f
fix build
2022-04-21 07:48:56 +02:00
Sergei Trifonov
69403840e2
add paths
2022-04-21 07:45:08 +02:00
Sergei Trifonov
a2365c5c83
more specific warning text about low disk space
2022-04-21 07:32:34 +02:00
Azat Khuzhin
2be022cb56
Log which taskstats provider is in use
...
Signed-off-by: Azat Khuzhin <a.khuzhin@semrush.com>
v2: add missing __builtin_unreachable() for gcc built [1]
[1]: https://s3.amazonaws.com/clickhouse-builds/36351/99e72a960325cc1fb3cd3d6a1b56cf2b1cc2d733/binary_gcc/build_log.log
2022-04-20 21:39:26 +03:00
mergify[bot]
c026dbf51c
Merge branch 'master' into interserver_listen_port
2022-04-19 11:44:01 +00:00
Alexey Milovidov
58fc4e033a
Remove trash
2022-04-15 22:54:08 +02:00
mergify[bot]
078d8baf1d
Merge branch 'master' into enable-memory-overcommit
2022-04-11 17:09:02 +00:00
Alexander Tokmakov
7f54e7b422
Merge branch 'master' into mvcc_prototype
2022-04-07 15:14:06 +02:00
Nikita Mikhaylov
d7071e8596
Style
2022-04-05 17:04:53 +02:00
mergify[bot]
bc882ded42
Merge branch 'master' into enable-memory-overcommit
2022-04-05 14:46:18 +00:00
Raúl Marín
8a05cf3927
DNS cache: Add option to drop elements after several consecutive failures
2022-04-05 13:00:27 +02:00
Dmitry Novik
b4fed414e3
Enable memory overcommit
2022-04-04 14:28:05 +00:00
mergify[bot]
3183b61c74
Merge branch 'master' into mvcc_prototype
2022-03-31 12:27:09 +00:00
alesapin
ae3bcbb99b
Fix logs space check
2022-03-31 00:22:36 +02:00
alesapin
c6c0c91b39
Followup
2022-03-29 18:20:20 +02:00
Alexander Tokmakov
287d858fda
Merge branch 'master' into mvcc_prototype
2022-03-29 16:24:12 +02:00
alesapin
4db85e2809
Fix build
2022-03-29 14:20:46 +02:00
alesapin
ed2c461fe1
Merge branch 'master' into startup-sanity-checks
2022-03-29 14:09:20 +02:00
taiyang-li
38702be40c
Merge remote-tracking branch 'ck/master' into rocksdb_metacache
2022-03-28 21:03:22 +08:00
alesapin
d3fbd9b2ad
Fix style
2022-03-24 11:25:28 +01:00
alesapin
93d1b1d198
Merge branch 'master' into startup-sanity-checks
2022-03-24 11:17:06 +01:00
Alexander Tokmakov
bcec53aadc
Merge branch 'master' into mvcc_prototype
2022-03-23 11:28:43 +01:00
Antonio Andelic
9829f2d051
Merge branch 'master' into parallel-downloading-url-engine
2022-03-23 07:41:14 +00:00
taiyang-li
8dbf1c60e7
merge master and fix conflict
2022-03-23 11:36:50 +08:00
alesapin
70d410dc4d
Fix keeper client timeout bug
2022-03-22 11:41:50 +01:00
Antonio Andelic
103a3fa140
Merge branch 'master' into parallel-downloading-url-engine
2022-03-17 10:11:58 +00:00
Alexander Tokmakov
4b3e13a4fe
Merge branch 'master' into mvcc_prototype
2022-03-16 21:06:19 +01:00
Vitaly Baranov
39614e6e15
Merge pull request #35276 from vitlibar/fix-code-style-and-minor-corrections-after-allow-no-password
...
Fix code style and other minor corrections after implementing allow_no_password.
2022-03-16 18:55:05 +01:00
Antonio Andelic
0979155f2f
Address PR comments
2022-03-16 15:45:17 +00:00
alexander goryanets
ee29e93fc0
use interserver_listen_host param for configure interserver listen_host
2022-03-16 12:22:05 +00:00
Antonio Andelic
2291b7c1e1
Merge branch 'master' into parallel-downloading-url-engine
2022-03-16 09:59:52 +00:00
Nikolai Kochetov
a380aa6b8a
Merge pull request #35294 from ClickHouse/reload-remote_url_allow_hosts
...
Reload remote_url_allow_hosts after config update.
2022-03-15 22:07:16 +01:00
Nikolai Kochetov
97aa6c82ce
Reload remote_url_allow_hosts after config update.
2022-03-15 13:00:31 +00:00
Antonio Andelic
067b79b00b
Merge branch 'master' into parallel-downloading-url-engine
2022-03-15 07:55:41 +00:00
Alexander Tokmakov
9702b5177d
Merge branch 'master' into mvcc_prototype
2022-03-14 21:45:38 +01:00
Alexander Tokmakov
278d779a01
log cleanup, more comments
2022-03-14 21:43:34 +01:00