Azat Khuzhin
01e1c5345a
Add separate CLUSTER grant
...
In case you have different roles for the same user on multiple clusters,
ON CLUSTER query can help to overcome some limitations.
Consider the following example:
- cluster_with_data, dev_user (readonly=2)
- stage_cluster, dev_user (readonly=0)
So when you will execute the following query from stage_cluster, it will
be successfully executed, since ON CLUSTER queries has different system
profile:
DROP DATABASE default ON CLUSTER cluster_with_data
This is not 100% safe, but at least something.
Note, that right now only ON CLUSTER query it self is supported, but
separate clusters are not (i.e. GRANT CLUSTER some_cluster_name TO
default), since right now grants sticked to database+.
v2: on_cluster_queries_require_cluster_grant
v3: fix test and process flags as bit mask
Signed-off-by: Azat Khuzhin <a.khuzhin@semrush.com>
2022-05-16 13:57:45 +03:00
Robert Schulze
e3cfec5b09
Merge remote-tracking branch 'origin/master' into clangtidies
2022-05-16 10:12:50 +02:00
Alexey Milovidov
7ce409da52
Merge branch 'master' into allow-setuid-inside-clickhouse
2022-05-15 04:33:59 +03:00
Azat Khuzhin
40f3dbb448
Ignore harmful env variables in clickhouse binaries (reexec w/o them)
...
Some environments may really require LD_LIBRARY_PATH (and some other
variables), so rejecting running clickhouse binaries in such envs is a
backward incompatible change.
So instead of rejecting, let's ignore those env variables, i.e. reexec
binaries without them.
Also note, that there is no messages in stderr in case of some of
variables set anymore, since this message may break some scripts.
Refs: #36340
Follow-up for: #36342
2022-05-14 12:08:48 +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
Alexey Milovidov
7536e0cd25
Fix MSan
2022-05-11 03:16:10 +02:00
Alexey Milovidov
a8506f6604
Merge branch 'master' into allow-setuid-inside-clickhouse
2022-05-11 03:14:28 +02:00
kssenii
61f2737e17
Merge master
2022-05-10 19:31:22 +02:00
kssenii
0feda67ec4
Fix progress for insert select
2022-05-10 15:04:08 +02:00
Alexander Tokmakov
9346c9363a
Merge pull request #37052 from ClickHouse/fix_server_termination_stress_tests
...
Print stacks if we cannot terminate server in stress tests
2022-05-10 13:12:44 +03:00
Sergei Trifonov
9800d80a29
update sanity checks warning message text
2022-05-10 09:31:22 +02:00
Dmitry Novik
adcb792f0d
Merge pull request #35921 from ClickHouse/enable-memory-overcommit
...
Enable memory overcommit
2022-05-10 02:09:18 +02:00
Alexander Tokmakov
92d423c478
print stacks if wa cannot terminate server in stress tests
2022-05-09 19:43:51 +02:00
guykohen
34c494f403
Remove height restrictions from the query div in play web tool.
2022-05-09 13:32:26 -04:00
mergify[bot]
8ea87a3530
Merge branch 'master' into enable-memory-overcommit
2022-05-09 14:00:54 +00:00
Kruglov Pavel
23bd9390a6
Merge pull request #36997 from vitlibar/users-without-assigned-policies-can-view-rows
...
Users without assigned row policies can view rows
2022-05-09 12:04:50 +02: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
Alexey Milovidov
a121155f0a
Fix conflict
2022-05-07 12:38:30 +02:00
Alexey Milovidov
1bdc51a496
Merge branch 'remind_for_external_option' of github.com:bigo-sg/ClickHouse into bigo-sg-remind_for_external_option
2022-05-07 12:36:57 +02:00
Alexey Milovidov
b2945766d0
Merge pull request #36988 from ClickHouse/handle-nullable-numbers-in-play-ui
...
Correct styling of Nullable numbers in PlayUI
2022-05-07 13:06:25 +03:00
Alexey Milovidov
c95f22e64d
Merge branch 'master' into allow-setuid-inside-clickhouse
2022-05-07 00:21:47 +03:00
Alexey Milovidov
a88e9b74a2
Correct styling of Nullable numbers in PlayUI
2022-05-06 21:50:28 +02:00
Alexey Milovidov
8b26c5fe02
Merge pull request #36838 from ClickHouse/config-update
...
Disable `merge_tree_metadata_cache` by default
2022-05-06 01:59:01 +03:00
Alexey Milovidov
1ba42076e5
Merge pull request #36778 from ClickHouse/init-thread-pools-local-server
...
Init thread pools for clickhouse-local
2022-05-06 01:52:55 +03:00
mergify[bot]
1a92a34514
Merge branch 'master' into enable-memory-overcommit
2022-05-02 17:04:08 +00:00
Alexey Milovidov
0b9f8d81e4
Add cool processing of empty resultsets
2022-05-02 03:48:48 +02:00
Alexey Milovidov
2f0c421d99
Update play.html
2022-05-02 04:24:40 +03:00
Alexey Milovidov
8b366cbb02
Update play.html
2022-05-02 04:23:52 +03:00
Alexey Milovidov
be7a4b8b30
Make it work automatically; unify the code
2022-05-02 03:19:57 +02:00
Alexey Milovidov
474a805ea7
Merge branch 'play-vertical-format' of github.com:vdimir/ClickHouse into vdimir-play
2022-05-02 02:44:09 +02:00
Nikita Mikhaylov
f2d73635ef
Disable
2022-05-01 17:14:52 +00:00
Alexey Milovidov
69ae22070f
Merge pull request #36824 from ClickHouse/log-test-sanity-check
...
Add sanity check for log level. Fix style.
2022-05-01 14:03:22 +03:00
Nikita Taranov
92f8244932
Fix certs (finishing pr #36457 ) ( #36747 )
2022-05-01 12:59:19 +02:00
Robert Schulze
89aa9ae00f
Fixed clang-tidy check "bugprone-branch-clone"
...
The check is currently *not* part of .clang-tidy. It complains about:
(1) "switch has multiple consecutive identical branches"
(2) "repeated branch in conditional chain"
About (1): Lots of findings in switches were about redundant
"[[fallthrough]]" in places where the compiler would not warn anyways. I
have cleaned these up.
About (2): In if-else_if-else chains, fixing the warning would usually
mean concatenating multiple if-conditions. As this would reduce
readability in most cases, I did not fix these places.
Because of (2), I also refrained from adding "bugprone-branch-clone" to
.clang-tidy.
2022-04-30 19:40:28 +02: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
Alexey Milovidov
dc914c635c
Merge pull request #36497 from tonickkozlov/tonickkozlov/benchmark/allow-auth-env
...
Benchmark can read auth from environment variables
2022-04-30 08:55:15 +03:00
vdimir
ea4e9db3da
play.html: no header in transposed table
2022-04-29 20:05:03 +02:00
vdimir
277afd0c48
play.html: add button to transpose table
2022-04-29 20:01:24 +02: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
Anton Kozlov
5cc78febde
[benchmark] Allow auth environment variables
2022-04-29 11:30:59 +00:00
Maksim Kita
5b9bb36f80
Merge pull request #36753 from kitaisreal/added-user-defined-path-config-setting
...
Added user_defined_path config setting
2022-04-29 11:10:51 +02:00
Antonio Andelic
45a72d9aa9
Init thread pools for clickhouse-local
2022-04-29 07:41:10 +00:00
Amos Bird
4a5e4274f0
base should not depend on Common
2022-04-29 10:26:35 +08:00
Alexey Milovidov
f200af5530
Merge pull request #36733 from ClickHouse/maven-clickhouse
...
Change Maven URL example for JDBC bridge in ClickHouse config
2022-04-29 00:12:53 +03:00
Maksim Kita
04429d85db
Added user_defined_path config setting
2022-04-28 22:13:33 +02:00
Vladimir C
d692dec635
Merge pull request #36473 from xinhuitian/fix-benchmark-json-report
...
Try to fix clickhouse-benchmark json report results
2022-04-28 14:50:10 +02:00
alesapin
8f1a0f6625
Merge pull request #36258 from ClickHouse/keeper-recovery-mode
...
clickhouse-keeper support for force recovery
2022-04-28 11:20:59 +02:00
Alexey Milovidov
770ce07b1a
Change Maven URL example for JDBC bridge in ClickHouse config
2022-04-28 05:54:39 +02:00
mergify[bot]
a13012e271
Merge branch 'master' into sanity-checks-message-fix
2022-04-28 02:50:16 +00:00
Antonio Andelic
cf022542bd
Merge branch 'master' into keeper-recovery-mode
2022-04-26 06:50:02 +00:00
Alexey Milovidov
39467ec4aa
Update play.html
2022-04-26 08:47:56 +03:00
mergify[bot]
7c32649014
Merge branch 'master' into cleanup-play-ui
2022-04-26 05:47:32 +00:00
mergify[bot]
74aa65e36e
Merge branch 'master' into sanity-checks-message-fix
2022-04-26 05:45:11 +00:00
Alexey Milovidov
c8db250c88
Merge pull request #36586 from azat/bash-complete-log-level
...
bash-completion: add completion for send_logs_level
2022-04-26 05:55:41 +03:00
mergify[bot]
9c3605712b
Merge branch 'master' into sanity-checks-message-fix
2022-04-25 17:37:55 +00:00
mergify[bot]
5bcba95e72
Merge branch 'master' into bash-complete-log-level
2022-04-25 17:36:43 +00:00
mergify[bot]
cc8513fb79
Merge branch 'master' into cleanup-play-ui
2022-04-25 17:15:08 +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
mergify[bot]
989f7c76ab
Merge branch 'master' into cleanup-play-ui
2022-04-24 19:45:18 +00:00
Azat Khuzhin
fa657d1d7f
bash-completion: add completion for send_logs_level
...
Signed-off-by: Azat Khuzhin <a.khuzhin@semrush.com>
2022-04-24 22:36:27 +03:00
Alexey Milovidov
8af3159916
Merge pull request #36351 from azat/netlink-strict
...
Strict taskstats parser
2022-04-24 05:14:06 +03:00
Alexey Milovidov
a1eddd1be0
Cleanup CSS in Play UI
2022-04-23 20:42:10 +02:00
alesapin
f0f92341e0
Merge pull request #36492 from ClickHouse/fix-keeper-hostname-check
...
Fix hostname checks in clickhouse-keeper
2022-04-23 13:54:57 +02:00
alesapin
7380a71333
Merge pull request #31833 from ClickHouse/musl-check
...
Build clickhouse-keeper with Musl
2022-04-22 22:41:16 +02:00
mergify[bot]
eefc302779
Merge branch 'master' into fix-keeper-hostname-check
2022-04-22 14:07:53 +00: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
Tian Xinhui
164647cc05
Update programs/benchmark/Benchmark.cpp
...
Co-authored-by: Vladimir C <vdimir@clickhouse.com>
2022-04-22 18:31:07 +08:00
alesapin
f88f654798
Update programs/CMakeLists.txt
...
Co-authored-by: Mikhail f. Shiryaev <felixoid@clickhouse.com>
2022-04-22 11:30:35 +02:00
Antonio Andelic
4e389d8df1
Rename to hostname, add tests
2022-04-22 08:16:14 +00:00
Alexey Milovidov
143b67a790
Merge pull request #36397 from ClickHouse/changelog-22-4
...
Draft changelog for version 22.4
2022-04-22 04:37:03 +03:00
Alexey Milovidov
f31cad52ab
Preparation
2022-04-22 03:21:29 +02:00
Maksim Kita
57444fc7d3
Merge pull request #36444 from rschu1ze/clang-tidy-fixes
...
Clang tidy fixes
2022-04-21 16:11:27 +02:00
Antonio Andelic
6ac3784af7
Add config example
2022-04-21 13:49:36 +00:00
Antonio Andelic
03779fd463
Merge branch 'master' into keeper-recovery-mode
2022-04-21 12:34:18 +00:00
Mikhail f. Shiryaev
49a572e00c
Build only clickhouse-keeper with musl
2022-04-21 13:43:24 +02:00
xinhuitian
f261291fa6
fix benchmark json report info
2022-04-21 14:10:29 +08: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
Sergei Trifonov
2f38e7bc5c
Merge pull request #36400 from azat/dyn-linker-vars
...
Add more harmful variables for OSX
2022-04-21 00:02:51 +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
alesapin
ba81816dc1
Better cmake
2022-04-20 12:11:55 +02:00
mergify[bot]
0df5fda6ed
Merge branch 'master' into musl-check
2022-04-20 09:28:40 +00:00
Suzy Wang
59f0e83c4b
fix clang tidy warning, add nullptr check ( #35540 )
...
update passing reference instead of pointer in queryHasWithClause based on recommandation
Co-authored-by: larryluogit <larry.luo@ca.ibm.com>
2022-04-20 11:26:44 +02:00
Robert Schulze
b24ca8de52
Fix various clang-tidy warnings
...
When I tried to add cool new clang-tidy 14 warnings, I noticed that the
current clang-tidy settings already produce a ton of warnings. This
commit addresses many of these. Almost all of them were non-critical,
i.e. C vs. C++ style casts.
2022-04-20 10:29:05 +02:00
Antonio Andelic
bbb0be6a44
Merge pull request #36402 from rschu1ze/clang-tidy-contains
...
Activate clang-tidy warning "readability-container-contains"
2022-04-20 08:15:46 +02:00
alesapin
ffca5c3cdc
Merge branch 'master' into musl-check
2022-04-19 17:51:54 +02:00
alesapin
44e5c55d19
Fix build
2022-04-19 17:44:28 +02:00
Alexey Milovidov
fb9545e0b4
Remove trash
2022-04-19 17:44:27 +02:00
Alexey Milovidov
23968142c1
Update main.cpp
2022-04-19 17:44:27 +02:00
Alexey Milovidov
d6d0e82741
Update main.cpp
2022-04-19 17:44:26 +02:00
Alexey Milovidov
86ae0c9763
Warn and exit if harmful environment variables are set
2022-04-19 17:44:26 +02:00
Antonio Andelic
70f3d3a863
Merge branch 'master' into keeper-recovery-mode
2022-04-19 12:32:48 +00:00
Antonio Andelic
3e77340a81
Allow clickhouse-keeper to serve 4-letter commands before quorum ( #35992 )
...
* Use async start for clichkouse-keeper
* Return non active server for 4lw commands if quorum not achieved
2022-04-19 14:03:00 +02:00
Antonio Andelic
cd548aeb30
Refactor test for multiple cluster size
2022-04-19 08:08:36 +00:00
Antonio Andelic
6c3bf0a5d3
Format files
2022-04-19 08:08:36 +00:00
Antonio Andelic
0e1ba927bd
Add argument for force recovery
2022-04-19 08:08:35 +00:00
Robert Schulze
118e94523c
Activate clang-tidy warning "readability-container-contains"
...
This check suggests replacing <Container>.count() by
<Container>.contains() which is more speaking and in case of
multimaps/multisets also faster.
2022-04-18 23:53:11 +02:00
Azat Khuzhin
828d23c933
Add more harmful variables for OSX
...
Signed-off-by: Azat Khuzhin <a.khuzhin@semrush.com>
2022-04-18 23:40:09 +03:00
Alexey Milovidov
88f98443bd
Merge branch 'master' into allow-setuid-inside-clickhouse
2022-04-18 07:06:02 +03:00
Alexey Milovidov
48fd09c7db
Merge pull request #36310 from ClickHouse/cpuid-remove-trash
...
Remove trash from CPUID
2022-04-18 07:01:23 +03:00
Alexey Milovidov
543e5d7242
Merge branch 'master' into musl-check
2022-04-18 02:40:13 +02:00
Alexey Milovidov
0fc61ea445
Update main.cpp
2022-04-18 03:16:30 +03:00
Alexey Milovidov
27afc08d8f
Merge branch 'master' into cpuid-remove-trash
2022-04-17 16:30:30 +02:00
Alexey Milovidov
e43bdf7580
Update main.cpp
2022-04-17 17:21:20 +03:00
Alexey Milovidov
b7fe203fe1
Warn and exit if harmful environment variables are set
2022-04-17 01:56:58 +02:00
Alexey Milovidov
2b67d99193
Allow to drop privileges at startup
2022-04-17 00:26:53 +02:00
Alexey Milovidov
803edc3879
Allow to drop privileges at startup
2022-04-17 00:25:55 +02:00
Alexey Milovidov
b7e5a81215
Allow to drop privileges at startup
2022-04-17 00:24:47 +02:00
Alexey Milovidov
83de3bb1de
Allow to drop privileges at startup
2022-04-17 00:19:36 +02:00
Alexey Milovidov
e704e8d5d7
Allow to drop privileges at startup
2022-04-17 00:09:20 +02:00
Alexey Milovidov
66dedb0011
Merge pull request #36262 from zhanghuajieHIT/fix-crash-in-fit-import-with-invalid-parameter
...
fix crash when you use clickhouse-git-import with invalid parameter
2022-04-16 03:20:42 +03:00
Alexey Milovidov
58fc4e033a
Remove trash
2022-04-15 22:54:08 +02:00
Alexey Milovidov
efbb29539f
Fix Play UI for some resultsets
2022-04-15 03:13:40 +02:00
zhanghuajie
9947008d31
fix crash when you use clickhouse-git-import with invalid parameter
...
for example:
clickhouse-git-import -xxx
2022-04-14 23:16:02 +08:00
alesapin
2f496c7945
Merge branch 'master' into musl-check
2022-04-12 14:40:47 +02:00
mergify[bot]
078d8baf1d
Merge branch 'master' into enable-memory-overcommit
2022-04-11 17:09:02 +00:00
Alexander Tokmakov
141fbc6980
Merge branch 'master' into mvcc_prototype
2022-04-08 13:38:11 +02:00
Azat Khuzhin
33d99c8ffb
Introduce compatiblity mode for SETTINGS after FORMAT
...
Add allow_settings_after_format_in_insert setting, OFF by default.
Signed-off-by: Azat Khuzhin <a.khuzhin@semrush.com>
v2: s/parser_settings_after_format_compact/allow_settings_after_format_in_insert/ (suggested by vitlibar)
v3: replace ParserSettings with a flag (requested by vitlibar)
2022-04-07 16:36:34 +03:00
Alexander Tokmakov
7f54e7b422
Merge branch 'master' into mvcc_prototype
2022-04-07 15:14:06 +02:00
Alexander Tokmakov
8290ffa88d
Merge branch 'master' into mvcc_prototype
2022-04-07 13:50:42 +02:00
tavplubix
6e9c028bbb
Merge pull request #35956 from Algunenano/limit_dns_retries
...
DNS cache: Add option to drop elements after several consecutive failures
2022-04-07 13:20:36 +03:00
Nikolai Kochetov
3e1b3f14c0
Merge pull request #34355 from azat/processors-profiling
...
Profiling on Processors level
2022-04-07 12:13:14 +02:00
mergify[bot]
585cff1e95
Merge branch 'master' into limit_dns_retries
2022-04-06 18:23:17 +00:00
Anton Popov
13cb564d1e
Merge pull request #35716 from kssenii/fix-local-logs-level
...
Fix send_logs_level for clickhouse local
2022-04-06 18:52:47 +02:00
Kseniia Sumarokova
d3763c4a62
Update ClientBase.h
2022-04-06 12:13:34 +02:00
Alexey Milovidov
3c0c1a1176
Add a comment #35919
2022-04-05 18:35:23 +02:00
Alexey Milovidov
e452949334
Merge pull request #35919 from DevTeamBK/clang-tidy-issues
...
Clang tidy issues
2022-04-05 19:31:09 +03:00
mergify[bot]
bc882ded42
Merge branch 'master' into enable-memory-overcommit
2022-04-05 14:46:18 +00:00
kssenii
83488b2d13
Better
2022-04-05 14:48:26 +02:00
Alexander Tokmakov
1fe50ad201
Merge branch 'master' into mvcc_prototype
2022-04-05 14:38:02 +02: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
Maksim Kita
cb8332c007
Merge pull request #35758 from den-crane/patch-3
...
extended a description of clickhouse-client compression parameter
2022-04-05 11:16:52 +02:00
Dmitry Novik
b4fed414e3
Enable memory overcommit
2022-04-04 14:28:05 +00:00
Meena Renganathan
cf71b18472
Modified the code to fix the getenv() call issue idenitified in the clang-tidy
2022-04-04 07:23:31 -07:00
Alexander Tokmakov
a2167f12b8
Merge branch 'master' into mvcc_prototype
2022-04-04 14:24:23 +02:00
Azat Khuzhin
14538f6456
Add system.processors_profile_log
...
This is the system table that will contain Processors level profiling.
v2: one entry per Processor, not 3 (PortFull/NeedData/work())
v3: us over ms
v4: Enable processors_profile_log table by default
Signed-off-by: Azat Khuzhin <a.khuzhin@semrush.com>
2022-04-04 13:19:41 +03:00
Alexey Milovidov
808c802cae
Disable session_log
2022-04-03 05:07:37 +02:00
Alexey Milovidov
17107cb1dc
Update examples and remove obsolete embedded dictionaries from configs
2022-04-03 01:21:48 +02:00
Nir Peled
409eccec84
When showing the animation, set display to inline-block instead of inline, otherwise the animation won't start
2022-04-01 19:29:13 -04:00
Nir Peled
4810936eaa
Added an animation to the play ui hourglass when a query is running
2022-04-01 19:24:14 -04:00
mergify[bot]
3183b61c74
Merge branch 'master' into mvcc_prototype
2022-03-31 12:27:09 +00:00