thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-12-17 03:42:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
125,360 Commits 9,315 Branches 1,783 Tags 2.1 GiB
d6c1c0e805
Commit Graph

3842 Commits

Author SHA1 Message Date
kothiga
f33c585bc5
Addressing feedback. 2023-08-18 13:50:31 -07:00
kothiga
b905703909
Correct to-from pairing for transformEndianness. 2023-08-18 11:25:08 -07:00
Austin Kothig
6b42975d33
Change BE-UUID to work the same as LE-UUID. Included high and low getters to provide cleaner code when accessing undertype. 2023-08-18 08:19:46 -07:00
pufit
2e69a1d3a2 Fix keeper default path check 2023-08-17 22:07:39 -04:00
robot-ch-test-poll
ce58b90ea1
Merge pull request #53455 from rschu1ze/respect-changed-cgroups-limit 
Respect cgroup memory limit when reloading configuration
 2023-08-18 00:03:35 +02:00
Alexander Tokmakov
89c365803f
Merge pull request #53424 from ClickHouse/exception_message_patterns6 
Less exceptions with runtime format string
 2023-08-17 17:58:04 +03:00
Robert Schulze
ec7daed52f
Merge pull request #50276 from ClibMouse/feature/mergetree-checksum-big-endian-support 
MergeTree & SipHash checksum big-endian support
 2023-08-17 13:27:18 +02:00
Robert Schulze
5253a7f650
Respect cgroup memory limit when reloading configuration 
Cgroups allows to change the amount of memory available to a process
while it runs. The previous logic calculated the amount of available
memory only once at server startup. As a result, memory thresholds set
via cgroups were not picked up when the settings changed. We now always
incorporate the current limits during re-configuraton.

Note 1: getMemoryAmount() opens/reads a file which is potentially
        expensive. Should be fine though since that happens only when
        the server configuration changes.

Note 2: An better approach would be to treat cgroup limit changes as
        another trigger for ClickHouse server re-configuration (which
        currently only happens when the config files change). Shied away
        from that for now because of the case that when the cgroup limit
        is lowered, there is no guarantee that ClickHouse can shrink the
        memory amount accordingly in time (afaik, it does so only lazily
        by denying new allocations). As a result, the OOM killer would
        kill the server. The same will happen with this PR but at a
        lower implementation complexity.
 2023-08-17 09:22:13 +00:00
Nikolay Degterinsky
a893f75884 Merge remote-tracking branch 'upstream/master' into better-stop-listen 2023-08-16 23:06:18 +00:00
Alexander Tokmakov
ba44d7260e fix 2023-08-16 00:20:28 +02:00
kssenii
164b4f0ae3 Merge remote-tracking branch 'upstream/master' into allowed-caches-dir-for-dynamic-disks 2023-08-15 20:30:01 +04:00
Robert Schulze
8343ebd4ec
Clarify comment 2023-08-15 14:44:13 +00:00
Alexander Tokmakov
83c10dad18 Merge branch 'master' into exception_message_patterns6 2023-08-15 15:20:09 +02:00
Robert Schulze
f317903073
Merge branch 'ClickHouse:master' into consistency-fixes-for-caches 2023-08-15 10:25:08 +02:00
Alexander Tokmakov
894ec8e0d0 less exceptions with runtime format string 2023-08-14 21:45:59 +02:00
ltrk2
2846ea49b4
Merge branch 'master' into feature/mergetree-checksum-big-endian-support 2023-08-14 13:02:30 -04:00
Robert Schulze
7ed5166c8a
Cosmetics: Make re-cfg of query cache similar to re-cfg of other caches 
This doesn't change semantics, it only changes in which places the
configuration is parsed. This makes the logic more consistent across
caches.
 2023-08-14 15:42:32 +00:00
Robert Schulze
ed90463888
Add comment 2023-08-14 15:42:32 +00:00
Robert Schulze
bb53d635df
More consistency: Run same mark cache size check in ch-local 
Server.cpp had a check that the configured mark cache size is not 0. Run
the same check in LocalServer.cpp.
 2023-08-14 15:42:32 +00:00
Robert Schulze
f126e54b0d
Respect max_cache_size for all caches 
So far, max_cache_size was only respected in Server.cpp, and in this
file only for the mark cache and the uncompressed cache. This commit
respects it also for the other cache types in Server.cpp, as well for
all caches in LocalServer.cpp.
 2023-08-14 15:42:32 +00:00
Robert Schulze
54e54aed74
Cosmetics: Introduce constants for default cache sizes and policies 2023-08-14 15:42:32 +00:00
Mikhail f. Shiryaev
3655df0f40
Attempt to address reset ENV in init.d script 2023-08-14 16:32:52 +02:00
Victor Krasnov
247cd63ca1 Merge branch 'master' into ADQM-987 
# Conflicts:
#	src/Interpreters/Context.cpp
#	src/Interpreters/InterpreterSystemQuery.cpp
 2023-08-14 10:33:56 +03:00
kssenii
c3b8bc0267 Merge remote-tracking branch 'upstream/master' into allowed-caches-dir-for-dynamic-disks 2023-08-13 21:14:42 +04:00
Alexey Milovidov
38a391ef57 Fix tidy 2023-08-12 16:34:35 +02:00
Alexey Milovidov
435cbb44a5 Merge branch 'master' of github.com:ClickHouse/ClickHouse into benchmark-connect-in-parallel 2023-08-12 02:43:03 +02:00
Alexey Milovidov
97ec6a0e42
Merge pull request #35263 from sunny19930321/copier-check-drop-partition 
clickhouse-copier add check drop partition
 2023-08-12 03:37:42 +03:00
Alexey Milovidov
46c606b678
Merge pull request #53072 from ClickHouse/fix-comment 
Fix a comment
 2023-08-12 03:06:15 +03:00
Kseniia Sumarokova
ceb74ad3cb
Merge branch 'master' into allowed-caches-dir-for-dynamic-disks 2023-08-11 16:49:02 +02:00
Alexey Milovidov
a55f9eae84 Merge branch 'master' of github.com:ClickHouse/ClickHouse into allow-creating-system-tables-at-startup 2023-08-11 14:45:03 +02:00
Nikita Mikhaylov
dbe13e3016
Merge pull request #53110 from rmarduga/master 
Add hints for HTTP handlers
 2023-08-11 14:09:33 +02:00
ltrk2
1dc1b54c68
Merge branch 'master' into feature/mergetree-checksum-big-endian-support 2023-08-11 07:48:49 -04:00
robot-ch-test-poll
58cfede9f9
Merge pull request #53285 from ClickHouse/better-concurrency 
Change the default of `max_concurrent_queries` from 100 to 1000
 2023-08-11 13:01:48 +02:00
Alexey Milovidov
aae35f3b1c
Merge pull request #53184 from ClickHouse/better-ccache 
Better usage of ccache
 2023-08-11 04:43:45 +03:00
Alexey Milovidov
3b9d2c7080 Simplification 2023-08-11 03:06:07 +02:00
Alexey Milovidov
736ff1c127 Merge branch 'master' into allow-creating-system-tables-at-startup 2023-08-11 01:25:49 +02:00
Alexey Milovidov
45655928d1 clickhouse-benchmark: connect in parallel 2023-08-10 23:39:06 +02:00
Kseniia Sumarokova
99f7a83385
Merge branch 'master' into allowed-caches-dir-for-dynamic-disks 2023-08-10 22:26:33 +02:00
Alexey Milovidov
3aca240854 Change the default of max_concurrent_queries from 100 to 1000 2023-08-10 20:59:57 +02:00
Nikolay Degterinsky
bcc0fbbf91 Add EXCEPT clause to SYSTEM STOP LISTEN query 2023-08-10 16:10:33 +00:00
ltrk2
a2054c04dd
Merge branch 'master' into feature/mergetree-checksum-big-endian-support 2023-08-10 10:21:34 -04:00
Alexey Milovidov
c89c966d61
Merge branch 'master' into fix-comment 2023-08-10 17:03:31 +03:00
Alexey Milovidov
bb57caa83e
Merge pull request #53180 from ClickHouse/ditch-tons-of-garbage 
Ditch tons of garbage
 2023-08-10 16:59:51 +03:00
Alexey Milovidov
f35df23974
Merge branch 'master' into better-ccache 2023-08-10 16:52:32 +03:00
Victor Krasnov
9c34ef899e Add backup_log table 2023-08-10 15:46:04 +03:00
Ruslan Mardugalliamov
5cdeacf4cf Add hints for HTTP handlers 
Add hints to HTTP handlers to help users avoid
misspellings. For example, if a user mistakenly writes
`/dashboad` instead of `/dashboard`, they will now get a
hint that /dashboard is the correct handler.

This change will improve the user experience by making it
easier for users to find the correct handlers.

 #47662
 2023-08-10 06:23:20 -04:00
Alexey Milovidov
07b59ed3d0
Merge branch 'master' into copier-check-drop-partition 2023-08-10 03:59:09 +03:00
Alexey Milovidov
68976c03b6
Merge branch 'master' into fix-comment 2023-08-10 03:45:32 +03:00
ltrk2
139e9433a8
Merge branch 'master' into feature/mergetree-checksum-big-endian-support 2023-08-09 09:48:00 -04:00
kssenii
2cfb4c0264 Merge remote-tracking branch 'upstream/master' into allowed-caches-dir-for-dynamic-disks 2023-08-09 11:09:34 +02:00
Alexey Milovidov
fa9abc5038 Better usage of ccache 2023-08-09 05:02:50 +02:00
Alexey Milovidov
aa757490bd Ditch tons of garbage 2023-08-09 02:19:02 +02:00
Alexey Milovidov
06f557a62b Merge branch 'master' of github.com:ClickHouse/ClickHouse into allow-creating-system-tables-at-startup 2023-08-07 18:58:18 +02:00
Alexey Milovidov
e1206dbaab Add a comment from @tavplubix 2023-08-07 18:57:30 +02:00
pufit
30700996f0 Merge branch 'master' into pufit/keeper-client-improvements 
# Conflicts:
#	docs/en/operations/utilities/clickhouse-keeper-client.md
#	programs/keeper-client/Commands.cpp
#	programs/keeper-client/Commands.h
#	programs/keeper-client/KeeperClient.cpp
#	tests/integration/test_keeper_client/test.py
 2023-08-07 12:26:08 -04:00
pufit
8e6f7b4d0b Fix typo, fix tests, touch command. 2023-08-07 12:08:31 -04:00
kssenii
0c174a7ec1 Allow to restrict fs caches paths 2023-08-07 18:00:26 +02:00
pufit
dc347d3dcb
Merge pull request #53010 from ClickHouse/pufit/keeper-client-fix-defaults 
Fix default port for Keeper Client
 2023-08-07 10:48:52 -04:00
Alexey Milovidov
f1f983a92b Add clusters for running tests locally easily 2023-08-06 13:34:11 +02:00
Alexey Milovidov
167f90e7f6 Maybe better 2023-08-06 13:28:21 +02:00
Alexey Milovidov
292a5de816 Create them in tests 2023-08-06 01:51:23 +02:00
Alexey Milovidov
06d45cfa81 Allow creating system logs at startup 2023-08-06 01:29:31 +02:00
Vitaly Baranov
80254c4034
Merge pull request #52861 from vitlibar/clickhouse-keeper-same-default-paths 
Use the same default paths for clickhouse_keeper (symlink) as for clickhouse_keeper (executable)
 2023-08-05 13:49:02 +02:00
Alexey Milovidov
5722557391
Merge branch 'master' into fix-comment 2023-08-05 13:36:59 +03:00
Alexey Milovidov
fa49607073
Merge pull request #52159 from ClickHouse/add-test-for-throw 
Add a test that clickhouse-client or local do not throw/catch on startup
 2023-08-05 03:24:32 +03:00
Alexey Milovidov
264bff8c9f Fix a comment 2023-08-05 01:44:16 +02:00
Vitaly Baranov
f55fe91d8b Throw an exception if wrong default path is going to be used. 2023-08-04 16:13:27 +02:00
Vitaly Baranov
89c99e4a6d Revert extracting the root keeper path from the 'path' key in the configuration ('path' must be reserved for clickhouse-server). 2023-08-04 15:55:26 +02:00
pufit
d916601717
Merge branch 'master' into pufit/keeper-client-fix-defaults 2023-08-04 09:04:14 -04:00
pufit
30a7bda91a
Merge branch 'master' into clickhouse-keeper-client-completion-fix 2023-08-04 08:52:56 -04:00
Vitaly Baranov
552331fd54 Use the same default paths for clickhouse_keeper (symlink) as for clickhouse_keeper (executable), 
i.e. "/var/lib/clickhouse-keeper/.."
 2023-08-04 13:38:21 +02:00
Azat Khuzhin
94fcae58b9 clickhouse-keeper-client: fix version parsing for set command 
Previously:

    / :) set /test foo 1
    DB::Exception: Bad get: has UInt64, requested Int64

Signed-off-by: Azat Khuzhin <a.khuzhin@semrush.com>
 2023-08-04 09:50:45 +02:00
Azat Khuzhin
eda396eb7c Fix completion for clickhouse-keeper-client 
Previously some symbols had been counted as word breakers, and this
breaks the completion since after such symbol the completion will start
from scratch.

One of the most annoying was the "-" sign.

But actually all those word breakers that is used for SQL completion is
not required for keeper client, so let's leave only necessary.

Signed-off-by: Azat Khuzhin <a.khuzhin@semrush.com>
 2023-08-04 09:24:32 +02:00
Alexey Milovidov
eb546dd6b3
Merge branch 'master' into add-test-for-throw 2023-08-03 23:02:21 +03:00
pufit
14a8ced906 Fix default port 2023-08-03 12:29:31 -04:00
Alexander Tokmakov
968c79cf3f
Merge pull request #52956 from ClickHouse/fixes_for_databases 
Fix some issues with databases
 2023-08-03 19:13:41 +03:00
ltrk2
a29b36612b
Merge branch 'master' into feature/mergetree-checksum-big-endian-support 2023-08-03 09:41:25 -04:00
Alexey Milovidov
3e6ea96d8a
Merge branch 'master' into copier-check-drop-partition 2023-08-03 15:20:10 +03:00
Alexey Milovidov
3a9f9e1297
Revert "Implementing new commands for keeper-client" 2023-08-03 15:05:52 +03:00
Alexander Tokmakov
67d8f1c1c5 fix data race 2023-08-02 18:42:38 +02:00
ltrk2
27a2d4d1c7
Merge branch 'master' into feature/mergetree-checksum-big-endian-support 2023-08-02 11:36:43 -04:00
Alexey Milovidov
e223ca495c
Merge branch 'master' into copier-check-drop-partition 2023-08-01 23:26:53 +03:00
Yarik Briukhovetskyi
104a4aaee5
Merge pull request #51117 from ClickHouse/pufit/keeper-client-improvements 
Implementing new commands for keeper-client
 2023-08-01 17:47:33 +02:00
Alexey Milovidov
67e355558e
Merge branch 'master' into copier-check-drop-partition 2023-08-01 16:02:42 +03:00
Alexey Milovidov
a7b4a29ed9
Merge branch 'master' into fixes-start-stop-listen 2023-07-31 08:34:17 +03:00
alesapin
aba291ca68
Revert "Revert "Add an ability to specify allocations size for sampling memory profiler"" 2023-07-30 14:01:34 +02:00
Alexey Milovidov
abf058c87d Merge branch 'master' into no-export-dynamic 2023-07-30 01:49:12 +02:00
Alexey Milovidov
5d2fb786f6
Merge branch 'master' into fixes-start-stop-listen 2023-07-29 00:39:58 +03:00
ltrk2
6c9a1b14ef
Merge branch 'master' into feature/mergetree-checksum-big-endian-support 2023-07-28 16:18:46 -04:00
pufit
1e77c7c73f Deterministic delete_stable_backups 2023-07-28 10:48:22 -04:00
pufit
4e8f7f06af
Merge branch 'master' into pufit/keeper-client-improvements 2023-07-28 10:32:27 -04:00
pufit
6211845ef0
Merge pull request #51303 from ClickHouse/deprecate-metadata-cache 
Deprecate the `metadata_cache` feature
 2023-07-28 10:31:02 -04:00
Alexander Tokmakov
39200606ec
Merge pull request #52174 from arenadata/ADQM-988 
Added possibility to save logs on crash and options to configure logs buffer
 2023-07-28 16:55:00 +03:00
Nikolay Degterinsky
0e30b9651a
Merge branch 'master' into fixes-start-stop-listen 2023-07-28 11:35:31 +02:00
Alexey Gerasimchuck
63b05da1f2 System logs improvements 2023-07-28 07:23:34 +00:00
Alexey Milovidov
a465dba311
Merge pull request #52628 from ClickHouse/load-suggestion-only-with-clickhouse-dialect 
Load suggestion only with `clickhouse` dialect
 2023-07-28 10:21:53 +03:00
robot-clickhouse-ci-1
ac2de3c79f
Merge pull request #52643 from ClickHouse/fix-local-udf-settings 
UDF: allow positional options for clickhouse-local and populate global udf settings
 2023-07-28 09:21:04 +02:00
pufit
0e15f098d1 Yet another fix test 2023-07-28 02:22:44 -04:00
Nikolay Degterinsky
b5160c8072 Fix bugs and better test for SYSTEM STOP LISTEN 2023-07-27 14:16:19 +00:00
Yakov Olkhovskiy
d35c87c1bd allow positional options for clickhouse-local and populate global udf settings 2023-07-27 05:06:16 +00:00
Alexey Milovidov
a43bcbef44 Merge branch 'database-filesystem-remove-catch' into add-test-for-throw 2023-07-27 06:34:40 +02:00
Kruglov Pavel
fab77783f1
Merge pull request #49367 from ClickHouse/enc 
Partially reimplement Parquet encoder to make it faster and parallelizable
 2023-07-27 00:48:54 +02:00
Nikolay Degterinsky
d89e2e6a27
Add SYSTEM STOP LISTEN query (#51016) 
Co-authored-by: Nikita Mikhaylov <nikitamikhaylov@clickhouse.com>
Co-authored-by: Nikita Mikhaylov <mikhaylovnikitka@gmail.com>
 2023-07-26 19:58:41 +02:00
János Benjamin Antal
3a6aaa29c9 Do not load suggestions in case not ClickHouse dialects 2023-07-26 15:26:21 +00:00
pufit
ea672ba618 Add docs, add tests, fix small issues. 2023-07-26 11:15:27 -04:00
pufit
3a838f09d1 Update programs/keeper-client/Commands.h 
Co-authored-by: Yarik Briukhovetskyi <114298166+yariks5s@users.noreply.github.com>
 2023-07-26 11:15:27 -04:00
pufit
bb2a749b94 Update programs/keeper-client/Commands.cpp 
Co-authored-by: Yarik Briukhovetskyi <114298166+yariks5s@users.noreply.github.com>
 2023-07-26 11:15:27 -04:00
pufit
68b78f52ec Add DeleteStableBackups, FindBigFamily 2023-07-26 11:15:27 -04:00
pufit
10a8a8dd74 Implementing new commands for keeper-client 2023-07-26 11:15:27 -04:00
Robert Schulze
d4737ca033
Merge pull request #50986 from arenadata/ADQM-822 
Implement support of encrypted elements in configuration file
 2023-07-26 12:27:04 +02:00
Alexander Tokmakov
6bbed6262e
Merge branch 'master' into add_delay_for_replicated 2023-07-26 12:48:48 +03:00
Anton Popov
4531b105ac
Merge branch 'master' into flush-async-insert-queue 2023-07-25 15:48:01 +02:00
Michael Kolupaev
dfdf5de972 Fixes 2023-07-25 10:16:28 +00:00
Alexey Milovidov
9036fe8749 Merge branch 'master' into no-export-dynamic 2023-07-24 17:42:59 +02:00
Alexander Tokmakov
faca49a905 Merge branch 'master' into add_delay_for_replicated 2023-07-24 16:07:38 +02:00
Anton Popov
347f442f84 Merge remote-tracking branch 'upstream/master' into HEAD 2023-07-24 10:55:31 +00:00
Roman Vasin
0af869ff0f
Merge branch 'master' into ADQM-822 2023-07-24 12:23:11 +03:00
Alexey Milovidov
75efee9675 Fix errors 2023-07-24 05:34:00 +02:00
Alexey Milovidov
a17652a422 Merge branch 'master' into incbin 2023-07-24 05:33:52 +02:00
Alexey Milovidov
10aa12d3b3 Merge branch 'master' into no-export-dynamic 2023-07-24 02:20:33 +02:00
robot-ch-test-poll4
fb045b0d86
Merge pull request #52498 from ClickHouse/dont_shutdown_interserver_before_tables 
Don't shutdown interserver before tables
 2023-07-24 01:45:25 +02:00
Alexey Milovidov
c60553ae70 Merge branch 'incbin' into no-export-dynamic 2023-07-24 00:12:53 +02:00
Alexey Milovidov
1e467867e6 Attempt to fix LTO 2023-07-24 00:03:40 +02:00
alesapin
753a8d0a43 Merge branch 'dont_shutdown_interserver_before_tables' into add_delay_for_replicated 2023-07-23 22:41:15 +02:00
alesapin
e02948580b Don't shutdown interserver before tables 2023-07-23 22:38:59 +02:00
Alexey Milovidov
63659c55a1 Merge branch 'incbin' into no-export-dynamic 2023-07-23 21:34:12 +02:00
Alexey Milovidov
0f66d161d6 Merge branch 'master' of github.com:ClickHouse/ClickHouse into no-export-dynamic 2023-07-23 21:33:51 +02:00
Alexey Milovidov
43bd6d1b83
Revert "Add an ability to specify allocations size for sampling memory profiler" 2023-07-23 19:00:49 +03:00
Alexey Milovidov
43cf31a98e
Merge branch 'master' into no-export-dynamic 2023-07-23 07:26:33 +03:00
Alexey Milovidov
00d6f2ee08 Use incbin for resources, part 1 2023-07-23 06:11:03 +02:00
alesapin
d1fa105d60
Merge branch 'master' into add_delay_for_replicated 2023-07-23 00:12:29 +02:00
alesapin
835c36cbf3
Merge pull request #52419 from ClickHouse/implement_borders_for_sampling_memory_profiler 
Add an ability to specify allocations size for sampling memory profiler
 2023-07-22 18:13:26 +02:00
alesapin
6416fb6eed
Merge branch 'master' into add_delay_for_replicated 2023-07-22 12:11:39 +02:00
robot-ch-test-poll2
69b897d726
Merge pull request #52113 from arenadata/ADQM-996 
Collect logs for the system.text_log table even before it is initialized, to record the server startup
 2023-07-22 00:01:45 +02:00
Alexander Sapin
4695ec6802 Add an ability to specify allocations size for sampling memory profiler 2023-07-21 14:56:29 +02:00
ltrk2
90a2c460c6
Merge branch 'master' into feature/mergetree-checksum-big-endian-support 2023-07-21 08:07:18 -04:00
Antonio Andelic
10c2d5dade
Merge branch 'master' into feature/keeper-dyn-reconf 2023-07-21 13:24:18 +02:00
Dmitry Kardymon
5124f74fcc Merge remote-tracking branch 'origin/master' into ADQM-996 2023-07-21 05:54:36 +00:00
Nikita Mikhaylov
668062dc29
Merge branch 'master' into no-keep-context-lock-while-calculating-access 2023-07-20 14:42:13 +02:00
alesapin
cbcd48979c Fix race one more time 2023-07-20 13:04:43 +02:00
ltrk2
967be3e13c Correct a line commented out by mistake 2023-07-19 10:01:58 -07:00
ltrk2
51e2c58a53 Implement endianness-independent SipHash and MergeTree checksum serialization 2023-07-19 10:01:55 -07:00
alesapin
8be1454b28 Fix race 2023-07-18 16:06:03 +02:00
Nikita Mikhaylov
ee0bbc0e54
Merge branch 'master' into headers-blacklist 2023-07-17 19:08:52 +02:00
Nikita Mikhaylov
11cc8b4adf
Merge branch 'master' into add_delay_for_replicated 2023-07-17 19:04:29 +02:00
Vitaly Baranov
815a3857de Remove non-const function Context::getClientInfo(). 2023-07-17 15:02:07 +02:00
Nikita Mikhaylov
d5b97e4cc1
Merge branch 'master' into deprecate-metadata-cache 2023-07-17 15:00:27 +02:00
Antonio Andelic
61dc020b4d
Merge branch 'master' into feature/keeper-dyn-reconf 2023-07-17 12:50:17 +02:00
Alexey Milovidov
e4384e104b Add a test that clickhouse-client or local do not throw/catch on startup 2023-07-17 00:06:58 +02:00
Dmitry Kardymon
fe6918a9d5 Merge remote-tracking branch 'origin/master' into ADQM-996 2023-07-14 06:56:06 +00:00