703 Commits

Author	SHA1	Message	Date
Duc Canh Le	93dd6b83e7	Do not allow creating replicated table with inconsistent merge params (#56833) ... * save all merge params to zookeeper Signed-off-by: Duc Canh Le <duccanh.le@ahrefs.com> * calculate hash for graphite merge params Signed-off-by: Duc Canh Le <duccanh.le@ahrefs.com> * add graphite params hash to zookeeper + fix tests Signed-off-by: Duc Canh Le <duccanh.le@ahrefs.com> * install new graphite for testing Signed-off-by: Duc Canh Le <duccanh.le@ahrefs.com> * fix backward incompatibility Signed-off-by: Duc Canh Le <duccanh.le@ahrefs.com> * minor fix test Signed-off-by: Duc Canh Le <duccanh.le@ahrefs.com> * Update src/Storages/MergeTree/ReplicatedMergeTreeTableMetadata.cpp Co-authored-by: Alexander Tokmakov <tavplubix@gmail.com> * remove peekString and add more comments - peekString doesn't always work even for ReadBufferFromString - more comment re. backward compatibility Signed-off-by: Duc Canh Le <duccanh.le@ahrefs.com> --------- Signed-off-by: Duc Canh Le <duccanh.le@ahrefs.com> Co-authored-by: Alexander Tokmakov <tavplubix@gmail.com>	2023-12-14 17:26:35 +01:00
Kseniia Sumarokova	79db3c66df	Merge branch 'master' into allow-to-change-some-cache-settings-without-restart	2023-12-13 23:33:59 +01:00
Igor Nikonov	72f1c415f1	Merge remote-tracking branch 'origin/master' into pr-custom-key-failover	2023-12-13 15:03:05 +00:00
Raúl Marín	dd405a655e	Merge remote-tracking branch 'blessed/master' into backup_1	2023-12-13 13:39:58 +01:00
Han Fei	a96593c8b1	Merge branch 'master' into feature/more_warnings	2023-12-12 15:25:01 +01:00
Raúl Marín	a55a0c068e	Merge remote-tracking branch 'blessed/master' into backup_1	2023-12-11 15:27:21 +01:00
kssenii	b3b7b73155	Fix config	2023-12-08 11:10:14 +01:00
kssenii	725571461d	Merge remote-tracking branch 'origin/master' into slru-for-filesystem-cache	2023-12-07 19:49:03 +01:00
kssenii	8be3c9d218	Merge remote-tracking branch 'origin/master' into allow-to-change-some-cache-settings-without-restart	2023-12-07 12:14:24 +01:00
kssenii	f44f7c8c28	Allow to change some cache settings without server restart	2023-12-06 19:29:18 +01:00
Igor Nikonov	71204c2a82	Merge remote-tracking branch 'origin/master' into pr-custom-key-failover	2023-12-05 12:00:45 +00:00
Alexey Milovidov	cbea3545aa	Revert "add function getClientHTTPHeader"	2023-12-05 13:34:34 +03:00
凌涛	9e05e79d66	Merge branch 'master' into feature/more_warnings	2023-12-05 11:50:05 +08:00
凌涛	6794bbe196	rebase master	2023-12-05 11:42:25 +08:00
Igor Nikonov	b4bf611d5d	Merge remote-tracking branch 'origin/master' into pr-custom-key-failover	2023-11-30 14:09:26 +00:00
凌涛	d9f4b4d2c0	support parts, tables, databases	2023-11-30 10:56:31 +08:00
kssenii	296afceed8	Merge remote-tracking branch 'origin/master' into fix-backup-restore-with-mv	2023-11-29 18:06:09 +01:00
kssenii	122146ca0f	Update config (see https://github.com/ClickHouse/ClickHouse/pull/57257\#discussion_r1406629948)	2023-11-29 13:44:49 +01:00
Kseniia Sumarokova	4d27f87be8	Merge pull request #48425 from ClickHouse/vdimir/enable-tmp-in-cache-ci ... Enable temporary_data_in_cache in s3 tests in CI	2023-11-29 11:59:32 +01:00
Antonio Andelic	93360e4e2c	Merge pull request #57299 from ClickHouse/keeper-changelog-snapshot-fix ... Keeper fix for changelog and snapshots	2023-11-29 08:31:48 +01:00
Igor Nikonov	a06a71834a	Merge remote-tracking branch 'origin/master' into pr-custom-key-failover	2023-11-28 18:07:04 +00:00
Igor Nikonov	25eee6cd01	Fix clang-tidy warnings	2023-11-28 18:06:13 +00:00
János Benjamin Antal	4c2451f837	Merge pull request #56741 from ClickHouse/well-known-protos	2023-11-28 15:21:15 +01:00
Antonio Andelic	a61f32867e	Merge pull request #56488 from lingtaolf/feature/getHTTPHeader ... add function getClientHTTPHeader	2023-11-28 11:41:56 +01:00
Antonio Andelic	889c53eca0	Correctly handle unknown changelog versions and snapshot deleting	2023-11-28 09:47:49 +00:00
vdimir	40c774f387	Enable temporary_data_in_cache in s3 tests in CI	2023-11-27 19:43:27 +00:00
János Benjamin Antal	adf21e37c4	Make tests use the installed protobuf files	2023-11-27 13:39:28 +00:00
Igor Nikonov	774347d231	Parallel replicas custom key: skip unavailable replicas	2023-11-26 21:38:49 +00:00
kssenii	69260e322e	Randomize cache policy in ci	2023-11-23 16:57:13 +01:00
凌涛	ed7f19cfba	fix tests	2023-11-23 19:36:40 +08:00
Raúl Marín	281060329f	Merge remote-tracking branch 'blessed/master' into backup_1	2023-11-22 10:35:18 +01:00
Kseniia Sumarokova	e4f66b8469	Merge pull request #55158 from kssenii/fs-cache-improvement ... fs cache improvement for big reads	2023-11-21 21:50:00 +01:00
凌涛	e86aa433c5	Merge branch 'master' into feature/getHTTPHeader	2023-11-21 19:48:47 +08:00
vdimir	15234474d7	Implement system table blob_storage_log	2023-11-21 09:18:25 +00:00
凌涛	c5f16725ec	add function getClientHTTPHeader	2023-11-21 11:12:01 +08:00
Raúl Marín	20eb5d3251	CI: Increase keeper retries and decrease retry backoff to a minimum	2023-11-20 11:04:08 +01:00
Kseniia Sumarokova	9523bd0ad8	Fix config	2023-11-17 12:17:01 +01:00
Kseniia Sumarokova	a2ed756eec	Merge branch 'master' into fs-cache-improvement	2023-11-16 17:49:26 +01:00
Antonio Andelic	052134b143	Better	2023-11-16 07:32:11 +00:00
Kseniia Sumarokova	905b75b853	Merge pull request #56541 from ClickHouse/cache-config-improvement ... Cache configuration improvement	2023-11-14 13:03:34 +01:00
SmitaRKulkarni	951d9ac144	Disable randomization of allow_experimental_block_number_column flag (#56474) ... Co-authored-by: Alexander Tokmakov <tavplubix@clickhouse.com>	2023-11-13 15:44:06 +01:00
Kseniia Sumarokova	e428e4ed7a	Merge branch 'master' into cache-config-improvement	2023-11-13 10:09:58 +01:00
Kseniia Sumarokova	b7915e6983	Merge pull request #55782 from aiven-sal/aiven-sal/namedcoll_pr ... NamedCollections: prevent fields overriding in functions' calls	2023-11-13 09:07:09 +01:00
Alexey Milovidov	6078ff20bb	Symbolize trace_log for exporting	2023-11-11 05:52:44 +01:00
kssenii	c28c1ac4a2	Allow getting cache configuration from named collection	2023-11-09 18:39:16 +01:00
Salvatore Mesoraca	7d206cbc3c	NamedCollections: prevent fields overriding in functions call ... Add syntax in SQL and XML to mark specific fields to allow override or not. Also add a new setting to control the default behaviour when overriding support is not specified.	2023-11-09 17:25:16 +01:00
Kseniia Sumarokova	e5efc42633	Merge branch 'master' into fs-cache-improvement	2023-11-01 10:47:36 +01:00
Kseniia Sumarokova	8a1ab02b96	Update s3_cache.xml	2023-10-31 12:59:16 +01:00
Smita Kulkarni	3fdf0daf1b	Merge branch 'master' into 49507_Support_compression_for_keeper_protocol	2023-10-31 10:43:28 +01:00
Raúl Marín	b042e2d986	Merge pull request #55713 from ClickHouse/Randomize_block_number_column_in_ci ... Randomize block_number column setting in ci	2023-10-30 12:30:51 +01:00
Smita Kulkarni	960927a323	Updated name to use_compression	2023-10-27 14:53:54 +02:00
Smita Kulkarni	d1d8f4b2e1	Merge branch 'master' into 49507_Support_compression_for_keeper_protocol	2023-10-26 16:56:03 +02:00
Smita Kulkarni	7f05b3d546	Added comment in merge_tree_settings.xml	2023-10-26 10:43:01 +02:00
Smita Kulkarni	7a3fdc149e	Fix typo	2023-10-23 17:00:23 +02:00
Smita Kulkarni	cd7c1d1f8c	Updated to enable allow_experimental_block_numner_column for stress tests only	2023-10-23 16:59:12 +02:00
robot-ch-test-poll	ab3f9bcacf	Merge pull request #55889 from ClickHouse/fix_55674 ... Fix some tests with Replicated database	2023-10-21 08:34:55 +02:00
Alexander Tokmakov	c7e147896e	(temporarily) use different paths for replicas	2023-10-20 20:05:19 +02:00
Smita Kulkarni	c98782bd2b	Merge branch 'master' into 49507_Support_compression_for_keeper_protocol	2023-10-20 14:47:17 +02:00
helifu	57d60dc4f2	Add a new column xid for zookeeper_connection (#50702) ... * Refactor the code * Add a new column xid for zookeeper_connection * Support hostnames in the configuration * Fix a typo * Fix a typo * Fix a typo * Fix a bug about connect_time * Update test case * Update test case * Fix a special build check error * Resolve conflicts caused by rebase. * Update failed test case * Refactor the code according to comment * Fix two compilation errors	2023-10-20 11:38:44 +02:00
kssenii	89272e0925	Fix upgrade check, randomize more settings	2023-10-19 11:23:56 +02:00
kssenii	c792d95271	Update config	2023-10-18 14:41:06 +02:00
kssenii	7aa57516c1	Update tests config	2023-10-18 11:31:10 +02:00
Smita Kulkarni	13ffebf559	Merge branch 'master' into 49507_Support_compression_for_keeper_protocol	2023-10-14 20:08:49 +02:00
Smita Kulkarni	8b54172983	Merge branch 'master' into 49507_Support_compression_for_keeper_protocol	2023-10-12 12:32:43 +02:00
JackyWoo	5da03e8ba5	Add load balancing test_hostname_levenshtein_distance	2023-09-27 10:46:39 +08:00
Antonio Andelic	e7c8363f6f	Merge pull request #48855 from ClickHouse/keeper-operation-create-if-not-exists ... Implement `createIfNotExists` in Keeper natively	2023-09-26 16:04:51 +02:00
Smita Kulkarni	c11aa4515b	Merge branch 'master' into 49507_Support_compression_for_keeper_protocol	2023-09-24 11:52:57 +02:00
Smita Kulkarni	ca07275143	Support compression for keeper protocol	2023-09-24 11:38:08 +02:00
Antonio Andelic	3dbb6dcf4e	Better	2023-09-22 13:47:28 +00:00
Max Kainov	2d36a02ff1	minor md fixes to test wf	2023-09-22 09:23:05 +00:00
Antonio Andelic	7ffe998f1d	Randomize settings	2023-09-18 11:13:32 +00:00
Antonio Andelic	479ae52f9c	Merge branch 'master' into keeper-batch-flushes	2023-09-11 11:36:23 +00:00
Alexey Milovidov	4df83b0961	Remove useless line	2023-09-08 22:36:09 +02:00
Antonio Andelic	824b90f754	Merge branch 'master' into keeper-batch-flushes	2023-09-06 13:29:35 +00:00
Vitaly Baranov	988fd9e208	Add test.	2023-09-05 00:51:43 +02:00
Antonio Andelic	365bc584ec	Merge branch 'master' into keeper-batch-flushes	2023-09-04 07:24:21 +00:00
Alexey Milovidov	7cb4d52d92	Deprecate metadata cache, part 2	2023-09-03 03:56:11 +02:00
Sergei Trifonov	cf5ea46713	Merge pull request #53338 from azat/throttling-fixes ... Fix IO throttling during copying whole directories	2023-09-01 18:29:15 +02:00
Antonio Andelic	dd824fe558	Merge branch 'master' into keeper-batch-flushes	2023-08-31 14:35:36 +00:00
Azat Khuzhin	ed401cba9b	Add a test for IO throttling for ALTER TABLE MOVE PARTITION TO VOLUME ... Signed-off-by: Azat Khuzhin <a.khuzhin@semrush.com>	2023-08-29 23:43:03 +02:00
Alexey Gerasimchuck	de1ed97876	disabled validate_tcp_client_information	2023-08-29 08:59:49 +00:00
Antonio Andelic	322b53dd62	Merge branch 'master' into keeper-batch-flushes	2023-08-24 09:08:47 +00:00
Antonio Andelic	59557ddd7c	Merge branch 'master' into keeper-batch-flushes	2023-08-23 08:11:43 +00:00
kssenii	951081c8fb	Merge remote-tracking branch 'upstream/master' into fix-upgrade-check	2023-08-21 19:28:19 +02:00
kssenii	307e5d6b9b	Fix	2023-08-20 10:37:20 +02:00
Igor Nikonov	a69ea02418	Merge remote-tracking branch 'origin/master' into fix-parallel-replicas-multiply-result	2023-08-19 21:43:25 +00:00
Kseniia Sumarokova	6270c6aaa8	Update s3_storage_policy_by_default.xml	2023-08-12 18:51:16 +04:00
kssenii	84471778f1	Fux	2023-08-09 11:10:38 +02:00
kssenii	2cfb4c0264	Merge remote-tracking branch 'upstream/master' into allowed-caches-dir-for-dynamic-disks	2023-08-09 11:09:34 +02:00
Antonio Andelic	ef3e0f7b83	Use async replication in tests	2023-08-09 06:25:47 +00:00
kssenii	2d197dfbf7	Fix	2023-08-08 12:03:01 +02:00
kssenii	0c174a7ec1	Allow to restrict fs caches paths	2023-08-07 18:00:26 +02:00
Igor Nikonov	a8b782ca5a	Parallel reading from replicas over disributed with several shards	2023-08-05 23:19:09 +00:00
kssenii	20b76010ef	Merge remote-tracking branch 'upstream/master' into kssenii-patch-6	2023-07-30 13:46:58 +02:00
Alexey Gerasimchuck	b3351bb547	partially fixed 01747_system_session_log_long test	2023-07-28 03:36:23 +00:00
alesapin	6416fb6eed	Merge branch 'master' into add_delay_for_replicated	2023-07-22 12:11:39 +02:00
Kseniia Sumarokova	97c1b9d2cf	Merge branch 'master' into kssenii-patch-6	2023-07-21 13:56:28 +02:00
Kseniia Sumarokova	f2935e22ff	Increase log level	2023-07-21 13:54:10 +02:00
Nikita Mikhaylov	4a3f5234af	Merge pull request #51038 from evillique/headers-blacklist ... Add HTTP header filtering	2023-07-19 15:49:12 +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
kssenii	09d8ca0a40	Update	2023-07-17 11:30:21 +02:00
kssenii	9d645488c6	Merge remote-tracking branch 'upstream/master' into fix-assertions-4	2023-07-17 11:29:37 +02:00
Vitaly Baranov	2f23b6a593	Merge branch 'master' into backups-native-copy	2023-07-15 08:40:17 +02:00
Azat Khuzhin	2db092f9d8	Cleanup remote_servers in dist config.xml ... At first, there was no such amount of clusters in dist config, they added when someone need to write some new cluster for tests. So let's move them to the clusters.xml that is deployed only for tests, and leave only default cluster. And cleanup also some configs that had been copied from dist config in the repo (about test_config_* integration tests, this should be OK, since there are more_clusters.xml as well, that covers additional cases). Signed-off-by: Azat Khuzhin <a.khuzhin@semrush.com>	2023-07-09 16:55:27 +02:00
Azat Khuzhin	00cf66ab7a	Add ability to disable native copy for BACKUP/RESTORE ... Native copy uses CopyObject for S3/GCS, but in GCS the CopyObject is buggy - it does not always works. Signed-off-by: Azat Khuzhin <a.khuzhin@semrush.com>	2023-07-09 08:19:10 +02:00
Nikolay Degterinsky	e98d136243	Merge branch 'master' into headers-blacklist	2023-07-07 04:44:06 +02:00
Alexander Sapin	da61a8c509	Fix	2023-07-06 17:16:00 +02:00
Alexander Sapin	9ae0dc730c	Review fixes + enable in ci	2023-07-06 17:15:26 +02:00
Kseniia Sumarokova	244b30d659	Merge branch 'master' into resubmit-51149	2023-07-05 12:12:21 +02:00
kssenii	e5fa845dd3	Fix	2023-07-05 12:11:08 +02:00
Kseniia Sumarokova	e42d78ebfe	Merge branch 'master' into fix-assertions-4	2023-07-05 12:02:49 +02:00
Alexey Milovidov	3371e038cf	Merge pull request #51498 from ClickHouse/vdimir/test_alter_moving_garbage_51342 ... Fix `test_alter_moving_garbage`: lock between getActiveContainingPart and swapActivePart in parts mover	2023-07-05 00:32:21 +03:00
kssenii	3646b36a08	Merge remote-tracking branch 'upstream/master' into fix-assertions-4	2023-07-03 15:02:06 +02:00
Kseniia Sumarokova	19508a01a5	Merge branch 'master' into resubmit-51149	2023-07-03 13:12:53 +02:00
Nikolay Degterinsky	8dfa773f44	Merge branch 'master' into headers-blacklist	2023-06-30 23:40:17 +02:00
Alexey Milovidov	068b2b6ab9	Merge branch 'master' into vdimir/test_alter_moving_garbage_51342	2023-06-29 23:12:25 +03:00
Antonio Andelic	6e1aec6e0b	Merge branch 'master' into keeper-add-api-version-config	2023-06-29 11:36:49 +02:00
Alexey Milovidov	a4d7e48bc9	Merge branch 'master' into resubmit-51149	2023-06-29 11:07:01 +03:00
Antonio Andelic	0320ab4a70	Try making Keeper in DatabaseReplicated tests more stable (#51473) ... * Try making Keeper in DatabaseReplicated less flaky * lower log level to debug * Revert back to information	2023-06-28 13:16:16 +03:00
vdimir	79b6792548	Enable allow_remove_stale_moving_parts for stateless tests	2023-06-27 17:15:11 +00:00
Antonio Andelic	efbe01b6bb	Merge branch 'master' into keeper-add-api-version-config	2023-06-27 10:11:04 +00:00
kssenii	b3ce64caa5	Fix tests	2023-06-22 12:55:05 +02:00
kssenii	0efaecab51	Revert "Merge pull request #51149 from ClickHouse/revert-48821-localfilefunction" ... This reverts commit a09e6bbb8e, reversing changes made to ce38d64c5a.	2023-06-21 00:29:46 +02:00
Alexander Tokmakov	f973bd7516	suppress check for covered parts in zk	2023-06-20 23:53:32 +02:00
Alexander Tokmakov	bca0d76cbf	Merge pull request #50107 from ClickHouse/rmt_better_background_tasks_scheduling ... Improve scheduling of background tasks in ReplicatedMergeTree	2023-06-20 16:25:19 +03:00
Alexander Tokmakov	caceb7c862	Revert "Added ability to implicitly use file/hdfs/s3 table functions in clickhouse-local"	2023-06-19 13:21:09 +03:00
Alexander Tokmakov	b4e455430c	Merge branch 'master' into rmt_better_background_tasks_scheduling	2023-06-17 22:19:21 +03:00
Alexey Milovidov	df9abccfaa	Merge branch 'master' into localfilefunction	2023-06-17 00:45:54 +03:00
Nikolay Degterinsky	9a25958be8	Add HTTP header filtering	2023-06-15 13:49:49 +00:00
Alexander Tokmakov	3a2fa65075	fix 'Illegal column timezone' in stress tests	2023-06-13 16:02:54 +02:00
Antonio Andelic	4ac090b122	Fix tests	2023-06-13 11:01:44 +00:00
Alexander Tokmakov	d2aa1779ed	Merge branch 'master' into rmt_better_background_tasks_scheduling	2023-06-07 14:58:50 +02:00
Alexander Tokmakov	4209ccfc08	fix	2023-06-02 17:42:04 +02:00
Alexander Tokmakov	d8f936987e	Merge branch 'master' into rmt_better_background_tasks_scheduling	2023-05-25 12:36:41 +02:00
何李夫	e4c8c4cecf	Add zookeeper name in endpoint id (#49780) ... * Add zookeeper name in endpoint id When we migrate a replicated table from one zookeeper cluster to another (the reason why we migration is that zookeeper's load is too high), we will create a new table with the same zpath, but it will fail and the old table will be in trouble. Here is some infomation: 1.old table: CREATE TABLE a1 (`id` UInt64) ENGINE = ReplicatedMergeTree('/clickhouse/tables/default/a1/{shard}', '{replica}') ORDER BY (id); 2.new table: CREATE TABLE a2 (`id` UInt64) ENGINE = ReplicatedMergeTree('aux1:/clickhouse/tables/default/a1/{shard}', '{replica}') ORDER BY (id); 3.error info: <Error> executeQuery: Code: 220. DB::Exception: Duplicate interserver IO endpoint: DataPartsExchange:/clickhouse/tables/default/a1/01/replicas/02. (DUPLICATE_INTERSERVER_IO_ENDPOINT) <Error> InterserverIOHTTPHandler: Code: 221. DB::Exception: No interserver IO endpoint named DataPartsExchange:/clickhouse/tables/default/a1/01/replicas/02. (NO_SUCH_INTERSERVER_IO_ENDPOINT) * Revert "Add zookeeper name in endpoint id" This reverts commit 9deb75b249619b7abdd38e3949ca8b3a76c9df8e. * Add zookeeper name in endpoint id When we migrate a replicated table from one zookeeper cluster to another (the reason why we migration is that zookeeper's load is too high), we will create a new table with the same zpath, but it will fail and the old table will be in trouble. * Fix incompatible with a new setting * add a test, fix other issues * Update 02442_auxiliary_zookeeper_endpoint_id.sql * Update 02735_system_zookeeper_connection.reference * Update 02735_system_zookeeper_connection.sql * Update run.sh * Remove the 'no-fasttest' tag * Update 02442_auxiliary_zookeeper_endpoint_id.sql --------- Co-authored-by: Alexander Tokmakov <tavplubix@clickhouse.com> Co-authored-by: Alexander Tokmakov <tavplubix@gmail.com>	2023-05-25 12:50:14 +03:00
Alexander Tokmakov	b8305503d8	more flexible cleanup thread scheduling	2023-05-22 19:07:18 +02:00
alekseygolub	70b9077bb2	Merge branch 'ClickHouse:master' into localfilefunction	2023-05-21 17:49:29 +03:00
Alexey Milovidov	4dbe5b8329	Support them in tests	2023-05-19 11:13:28 +02:00
Kseniia Sumarokova	8c0b634a64	Update storage_conf.xml	2023-05-07 14:38:27 +02:00
Kseniia Sumarokova	431b2e94a9	Update storage_conf.xml	2023-05-05 19:10:12 +02:00
kssenii	9032e23f87	Clean up storage_conf.xml, use dynamic disks for tests	2023-05-05 15:43:23 +02:00
alekseygolub	963d6be120	Added configurations for DatabaseS3	2023-05-04 16:44:08 +00:00
alesapin	412b161104	Merge pull request #48791 from kssenii/better-local-object-storage ... Make local object storage work consistently with s3 object storage, fix problem with append, make it configurable as independent storage	2023-05-04 11:47:43 +02:00
Kseniia Sumarokova	b00c859838	Merge branch 'master' into kssenii-patch-6	2023-05-01 12:24:39 +02:00
Alexey Milovidov	911d4e9977	Merge branch 'master' into fix_some_tests3	2023-04-28 17:23:46 +03:00
kssenii	298ed454ce	Merge remote-tracking branch 'upstream/master' into better-local-object-storage	2023-04-28 13:26:55 +02:00
Kseniia Sumarokova	45e2d296f9	Merge branch 'master' into better-local-object-storage	2023-04-27 14:54:04 +02:00
Alexey Milovidov	3fa19c5ee2	Merge branch 'master' into fix_some_tests3	2023-04-27 15:04:15 +03:00
kssenii	cbf0b98102	Merge remote-tracking branch 'upstream/master' into cache-better-locks	2023-04-25 15:15:22 +02:00