Commit Graph

2601 Commits

Author SHA1 Message Date
alesapin
bc9a3c0458 Merge branch 'master' into consistent_metadata4 2020-06-15 11:20:30 +03:00
alesapin
c20ce687cf
bump ci 2020-06-15 11:12:01 +03:00
Alexey Milovidov
94d55abfd1 Update tests 2020-06-15 07:40:03 +03:00
Alexey Milovidov
e2607f005c Fix error with ALTER CONSTRAINT formatting; added a test 2020-06-15 07:36:20 +03:00
Alexey Milovidov
e9eb722d4a Better formatting of CREATE queries 2020-06-15 07:27:33 +03:00
Alexey Milovidov
1c5c2f8c69 Fix formatting of CREATE DICTIONARY 2020-06-15 07:08:20 +03:00
Alexey Milovidov
fdc8f7ad14 Merge branch 'master' into avoid-trailing-whitespaces-in-some-cases 2020-06-15 06:52:14 +03:00
alexey-milovidov
fd6115cccf
Merge pull request #11648 from ClickHouse/simplify-code-functions-comparison-3
Allow comparison with String in index analysis; simplify code.
2020-06-15 05:47:03 +03:00
Alexey Milovidov
1ab599b0a0 Remove "current_password" but keep it for Arcadians 2020-06-15 05:17:08 +03:00
Alexey Milovidov
d2c66f9688 Added comments 2020-06-15 05:14:59 +03:00
Alexey Milovidov
bbe5f4c909 Revert "Remove "current_password" because it is harmful"
This reverts commit 66ccb2f6b1.
2020-06-15 05:13:41 +03:00
Alexey Milovidov
5866401f60 Less noise in cleanup thread 2020-06-15 05:12:06 +03:00
Alexey Milovidov
66ccb2f6b1 Remove "current_password" because it is harmful 2020-06-15 04:12:01 +03:00
Alexey Milovidov
689b6901f8 Fix typo 2020-06-15 04:04:42 +03:00
Alexey Milovidov
1c438a133e Leader election both backward and forward compatible 2020-06-15 03:59:12 +03:00
alexey-milovidov
550838adbb
Merge pull request #11647 from ClickHouse/simplify-code-functions-comparison-2
Allow comparison of numbers with constant string in IN and VALUES
2020-06-15 03:33:45 +03:00
Alexey Milovidov
b596831342 Merge branch 'master' into remove-leader-election-2 2020-06-15 03:16:41 +03:00
alexey-milovidov
814265b66e
Merge pull request #11665 from ClickHouse/clear-password-from-command-line
Clear password from command line
2020-06-15 02:17:21 +03:00
Vitaly Baranov
3ffcb8e790 Fix casting values of settings while reading profiles from users.xml. 2020-06-15 01:44:25 +03:00
Vitaly Baranov
ca2fb59321 Fix calculating full names of row policies. 2020-06-15 01:44:25 +03:00
Vitaly Baranov
ceaaf67d3f Fix parsing CREATE SETTINGS PROFILE with WRITABLE keyword. 2020-06-15 01:44:25 +03:00
Alexey Milovidov
6467302ad3 Fix gcc build 2020-06-15 01:29:22 +03:00
Alexey Milovidov
303d1ebdaf Fix error; more tests 2020-06-15 01:17:06 +03:00
Alexey Milovidov
c4f18d2896 Fix tests 2020-06-15 00:39:22 +03:00
Alexander Tokmakov
045f804879 Merge branch 'master' into multiword_data_type 2020-06-15 00:35:17 +03:00
Alexey Milovidov
07ba7ffea5 Clear password from command line #11624 2020-06-14 22:23:05 +03:00
Alexey Milovidov
3663e2a47e Fix syntax hilite in CREATE USER query 2020-06-14 22:11:32 +03:00
Alexey Milovidov
8dac30ae95 Split file for better build times 2020-06-14 21:42:10 +03:00
Alexey Milovidov
067cf4cc40 Fix gcc build 2020-06-14 21:31:42 +03:00
Alexey Milovidov
f6c52fe1c2 Allow comparison with String in index analysis; simplify code #11630 2020-06-14 21:31:42 +03:00
Alexey Milovidov
db0fc6c9a6 Fix tests 2020-06-14 21:24:25 +03:00
alexey-milovidov
561d4b5b01
Merge pull request #11655 from ClickHouse/position-in-system-columns
Added column "position" to system.columns and "column_position" to system.parts_columns
2020-06-14 21:01:41 +03:00
Alexey Milovidov
217d05443a Remove old non-automated test 2020-06-14 20:42:11 +03:00
Alexey Milovidov
394fb64a9c Better way of implementation 2020-06-14 20:42:11 +03:00
alexey-milovidov
d990b98b90
Merge pull request #11593 from ClickHouse/return-not-nullable-from-count-distinct
Return non-Nullable results from COUNT(DISTINCT)
2020-06-14 20:39:19 +03:00
Alexander Tokmakov
6a439a5eb5 fixes 2020-06-14 19:39:06 +03:00
Alexander Tokmakov
5f9739fbf9 Merge branch 'master' into fork-potya/null_data_mods 2020-06-14 18:11:55 +03:00
Winter Zhang
dc6f904f0a
Merge branch 'master' into feature/ISSUES-7572 2020-06-14 18:28:06 +08:00
alexey-milovidov
88cf3f7083
Merge pull request #11653 from ClickHouse/parse-date-time-best-effort-incompletely-parsed-value
Return NULL or zero when value is not parsed completely in parseDateTimeBestEffortOr* functions
2020-06-14 10:59:10 +03:00
alexey-milovidov
361cb880a3
Merge pull request #11657 from ClickHouse/dont-use-elf-if-foreign
Don't use debug info from ELF file if it doesn't correspond to the running binary.
2020-06-14 10:58:21 +03:00
alexey-milovidov
da3a075821
Merge pull request #11660 from bharatnc/bnc/fix-remove-unused-imports
remove unused imports from HTTPHandlerFactory
2020-06-14 09:43:52 +03:00
alexey-milovidov
56b8d81ef6
Merge pull request #11651 from ClickHouse/empty-parameters-url
Skip empty URL parameters
2020-06-14 09:00:52 +03:00
alexey-milovidov
87223b2cb7
Merge pull request #11652 from ClickHouse/allow-drop-and-rename-without-zookeeper
Allow to drop table if there is no metadata in ZooKeeper; allow to rename.
2020-06-14 09:00:38 +03:00
Alexey Milovidov
3958a032ac Added a test 2020-06-14 08:15:29 +03:00
Alexey Milovidov
add7b76b83 Merge branch 'master' into return-not-nullable-from-count-distinct 2020-06-14 07:57:00 +03:00
alexey-milovidov
b9b725a39f
Merge pull request #11649 from ClickHouse/case-insensitive-regexp
Allow case-insensitive regexps; added a test
2020-06-14 07:55:09 +03:00
Bharat Nallan
4953b5fc84 remove unused imports from HTTPHandlerFactory
This removes unused imports from `src/Server/HTTPHandlerFactory.cpp`:

```bash
- #include <re2/re2.h>
- #include <common/find_symbols.h>
- #include <Poco/StringTokenizer.h>
```
2020-06-13 21:47:44 -07:00
Alexey Milovidov
44221139e9 Fix test 2020-06-14 07:35:50 +03:00
Alexey Milovidov
bba0140d8f Fix tests 2020-06-14 07:20:52 +03:00
Alexey Milovidov
fed6843e64 Fix style 2020-06-14 07:16:52 +03:00
Alexey Milovidov
e2f7a41a1a Fix error; clarify more results in test 2020-06-14 07:16:52 +03:00
Alexey Milovidov
4024840795 Add a test 2020-06-14 07:16:52 +03:00
Alexey Milovidov
ff3e5e1a2e Allow implicit conversion from String in IN, VALUES and comparison #11630 2020-06-14 07:16:52 +03:00
Alexey Milovidov
eec5abde07 Fix test 2020-06-14 07:16:23 +03:00
Alexey Milovidov
4a052f60c7 Don't use debug info from ELF file if it doesn't correspond to the running binary. 2020-06-14 06:10:35 +03:00
Alexey Milovidov
d6cf62e587 Added column "position" to system.columns and "column_position" to system.parts_columns 2020-06-14 04:56:22 +03:00
Alexey Milovidov
fae12d5e42 Return NULL or zero when value is not parsed completely in parseDateTimeBestEffortOr* functions 2020-06-14 04:45:03 +03:00
Alexey Milovidov
400e9fb64f Allow to drop table if there is no metadata in ZooKeeper; allow to rename 2020-06-14 04:23:53 +03:00
Alexey Milovidov
6c278fee61 Better exception message 2020-06-14 04:07:47 +03:00
Alexey Milovidov
970a8e3ecc Skip empty URL parameters #10749 2020-06-14 03:56:13 +03:00
Alexey Milovidov
30f1f88118 Allow case-insensitive regexps; added a test #11101 2020-06-14 03:43:42 +03:00
Volodymyr Kuznetsov
713f8f0b22
Added groupArrayArray and groupUniqArrayArray to SimpleAggregateFunction 2020-06-13 17:21:33 -07:00
Alexey Milovidov
41afea0165 Fix style 2020-06-14 02:10:25 +03:00
Alexey Milovidov
844140467e Simplify the code in comparison functions 2020-06-14 01:18:48 +03:00
Azat Khuzhin
0e378590fe Add load_balancing=round_robin 2020-06-14 01:09:21 +03:00
Azat Khuzhin
c139a05370 Forward declaration in StorageDistributed 2020-06-14 01:09:21 +03:00
Alexey Milovidov
2cd82a25f5 Remove trivial count query optimization if row-level security is set #11352 2020-06-13 23:59:20 +03:00
Alexey Milovidov
e1ae9500f9 Merge branch 'master' into remove-leader-election-2 2020-06-13 23:42:32 +03:00
Azat Khuzhin
5f82cc0021 Fix description for LoadBalancing::IN_ORDER 2020-06-13 23:17:30 +03:00
alexey-milovidov
f53da4d36b
Merge pull request #11608 from ClickHouse/fix-nullable-prewhere-type
Fix nullable prewhere type
2020-06-13 20:29:12 +03:00
Alexey Milovidov
9901e4d528 Remove debug output #11554 2020-06-13 20:20:54 +03:00
alexey-milovidov
3fe4bea56e
Merge pull request #11632 from ClickHouse/merging-extract-all-groups
Minor modifications after merging #11554
2020-06-13 20:20:38 +03:00
Anton Popov
10382e50d1
Merge pull request #11635 from dimarub2000/group_by_in_order_fix
Group by in order fix
2020-06-13 14:21:34 +03:00
alesapin
3427da1c43 Fix incorrect usage of rows TTL 2020-06-13 13:39:25 +03:00
alesapin
18b58e8483 Revert too strict lock 2020-06-13 12:12:45 +03:00
alesapin
d636cdf4b0 Remove outdated comment 2020-06-13 11:55:03 +03:00
alesapin
31b852c46d Remove redundant locks 2020-06-13 11:53:40 +03:00
alesapin
fcfb6d3bc2 Merge with master 2020-06-13 11:51:07 +03:00
alesapin
5d3de747cd Merge remote-tracking branch 'origin/master' into consistent_metadata4 2020-06-13 11:50:27 +03:00
Ildus Kurbangaliev
01d903c60d add minMap and maxMap functions 2020-06-13 08:49:00 +00:00
zhang2014
de96296e01 ISSUES-7572 fix build failure 2020-06-13 10:17:02 +08:00
Alexey Milovidov
6f0db5ef10 Fix error 2020-06-13 04:35:49 +03:00
Alexey Milovidov
21897f2abd Instrument 2020-06-13 04:35:49 +03:00
Alexey Milovidov
6ff671b092 Improvement 2020-06-13 04:35:49 +03:00
Alexey Milovidov
cfef7ba692 Whitespace 2020-06-13 04:35:49 +03:00
Alexey Milovidov
ab00e34305 Miscellaneous 2020-06-13 04:35:49 +03:00
Alexey Milovidov
85c0706901 Step 2: allow multiple leaders 2020-06-13 04:35:49 +03:00
Alexey Milovidov
b8b55a5b99 More LeaderElection to Storage/MergeTree 2020-06-13 04:35:49 +03:00
Alexey Milovidov
52ac009754 Update versions on merge and mutation 2020-06-13 04:34:05 +03:00
Alexey Milovidov
902774c89c Removed default value of constructor 2020-06-13 04:34:05 +03:00
Alexey Milovidov
833c8178ae Whitespaces 2020-06-13 04:34:05 +03:00
Alexey Milovidov
6869c122a8 Step 1 towards removing leader election: check and modify version of the "log" node 2020-06-13 04:34:05 +03:00
alexey-milovidov
54b77ff967
Merge pull request #11633 from ClickHouse/avoid-errors-using-zk-api
Avoid errors due to implicit int<->bool conversions when using ZK API
2020-06-13 04:32:32 +03:00
Alexey Milovidov
a690851586 Fix style 2020-06-13 00:20:59 +03:00
Alexey Milovidov
8985d64237 Fix "Arcadia" build 2020-06-13 00:20:00 +03:00
Azat Khuzhin
7f52b615e0 Fix bloom filters for String (data skipping indices)
bloom filter was broken for the first element, if all of the following
conditions satisfied:
- they are created on INSERT (in thie case bloom filter hashing uses
  offsets, in case of OPTIMIZE it does not, since it already has
  granulars).
- the record is not the first in the block
- the record is the first per index_granularity (do not confuse this
  with data skipping index GRANULARITY).
- type of the field for indexing is "String" (not FixedString)

Because in this case there was incorrect length and *data* for that string.
2020-06-12 22:46:40 +03:00
Alexey Milovidov
f608044690 Fix error 2020-06-12 21:19:16 +03:00
zhang2014
8d9b770da4 ISSUES-7572 fix defaults config level & add replicas_status and prometheus handler 2020-06-13 00:15:02 +08:00
Dmitry
e5897bbfb6 size_t -> ssize_t 2020-06-12 18:59:11 +03:00
alexey-milovidov
fc8da2abd3
Merge pull request #11613 from azat/system.zookeeper-path-prepend-slash
Prepend slash for path while querying system.zookeeper
2020-06-12 18:19:10 +03:00
Alexey Milovidov
72257061d5 Avoid errors due to implicit int<->bool conversions when using ZK API 2020-06-12 18:09:12 +03:00
Nikolai Kochetov
83155e139c Try fix tests. 2020-06-12 17:59:14 +03:00
alesapin
0edf5ff7a2 Fix race condition 2020-06-12 17:32:47 +03:00
Alexey Milovidov
787163d0b4 Minor modifications after merging #11554 2020-06-12 17:03:00 +03:00
alexey-milovidov
13ceaa4779
Merge pull request #11554 from Enmk/extractAllGroups-Horizontal-and-Vertical
extractAllGroupsHorizontal and extractAllGroupsVertical
2020-06-12 16:56:14 +03:00
zhang2014
2c439afc01 ISSUES-7572 fix build failure 2020-06-12 19:17:34 +08:00
zhang2014
80b765542f ISSUES-7572 support config default http handler 2020-06-12 18:04:42 +08:00
alesapin
465c4b65b7 Slightly better interfaces and comments 2020-06-12 12:37:52 +03:00
alesapin
4eb8a1cfef Fix gcc build 2020-06-12 00:03:25 +03:00
Azat Khuzhin
103eb17107 Force table creation on SYSTEM FLUSH LOGS (v2)
After this patch SYSTEM FLUSH LOGS will force system.*_log table
creatoins (only for enabled tables of course).

This will avoid such hacks like:

   set log_queries=1;
   select 1;
   system flush logs;

This is the second version of the patch, since first has a deadlock [1]
(reported by @alesapin). This version does not use separate lock and do
not issue CREATE TABLE from the query execution thread, instead it
activate flushing thread to do so, hence this should be the same as if
the table will be created during flush.

  [1]: https://gist.github.com/alesapin/d915d1deaa27d49aa31223daded02be2

Fixes: #11563
Cc: @alesapin
Cc: @nikitamikhaylov
2020-06-11 23:12:23 +03:00
Alexey Milovidov
540f8532cb Fix error 2020-06-11 22:59:15 +03:00
Azat Khuzhin
7884c8ef2c Use lock_guard over unique_lock in SystemLog 2020-06-11 21:55:41 +03:00
Azat Khuzhin
176ebb26e0 Prepend slash to path for system.zookeeper queries
path should starts with '/', otherwise ZBADARGUMENTS will be thrown in
ZooKeeper::sendThread and the session will fail.
2020-06-11 20:58:53 +03:00
Nikolai Kochetov
7b8c1657a5 Fix nullable prewhere column type. 2020-06-11 19:34:36 +03:00
alesapin
a39d010f94 Merge branch 'master' into consistent_metadata4 2020-06-11 18:47:41 +03:00
alexey-milovidov
89df9915bb
Merge pull request #11592 from ClickHouse/replicated-merge-tree-create-drop-race-garbage
Fix race conditions in CREATE/DROP of different replicas of ReplicatedMergeTree
2020-06-11 17:11:38 +03:00
alexey-milovidov
5f073c3ef4
Update StorageReplicatedMergeTree.cpp 2020-06-11 17:11:13 +03:00
Alexander Kuzmenkov
e354bbc78c
Merge pull request #11588 from ClickHouse/aku/async-log
Add system.asynchronous_metric_log
2020-06-11 16:10:35 +03:00
Nikolai Kochetov
ed0826efa7 Remove extra columns from sample in StorageBuffer. 2020-06-11 15:18:45 +03:00
alesapin
5a9a63e9a1
Revert "Force table creation on SYSTEM FLUSH LOGS" 2020-06-11 13:22:24 +03:00
tavplubix
1777bd0273
Merge pull request #11467 from hexiaoting/showcreate
Add "SHOW CLUSTER(s)" queries support
2020-06-11 12:01:28 +03:00
Vasily Nemkov
db555b088d Regenerated ya.make 2020-06-11 11:05:08 +03:00
Vasily Nemkov
50a184acac extractAllGroupsHorizontal and extractAllGroupsVertical
Split tests, fixed some error messages

Fixed test and error reporting of extractGroups
2020-06-11 11:03:17 +03:00
alexey-milovidov
c7be0d6bc0
Merge pull request #11578 from ClickHouse/fix_10240
Fix query_id of http queries
2020-06-11 06:55:04 +03:00
alexey-milovidov
9c20afbc81
Merge pull request #11579 from ClickHouse/fix_11490
Fix segfault in SHOW CREATE TABLE
2020-06-11 06:54:47 +03:00
alexey-milovidov
9e688307cb
Merge pull request #11580 from ClickHouse/fix-bug-prewhere-in-subquery
Fix prewhere in subquery
2020-06-11 06:53:44 +03:00
Alexey Milovidov
e40ee1a173 Return non-Nullable results from COUNT(DISTINCT) 2020-06-11 06:45:12 +03:00
Alexey Milovidov
790bc4e8e0 Better code 2020-06-11 06:35:59 +03:00
Alexey Milovidov
b72a095e99 Fix race conditions in CREATE/DROP of different replicas of ReplicatedMergeTree 2020-06-11 06:24:52 +03:00
Nikita Mikhaylov
425c20eeb8
Merge pull request #11563 from azat/SYSTEM-FLUSH-LOGS-force-table-creation
Force table creation on SYSTEM FLUSH LOGS
2020-06-11 02:03:34 +04:00
Alexander Kuzmenkov
a6648516f4 Add files; flush more often 2020-06-11 00:16:58 +03:00
Vitaly Baranov
d6e16629ae
Merge pull request #11028 from Potya/master
Support numeric parameters in Number and String data types
2020-06-10 23:23:59 +03:00
alexey-milovidov
4f2ed7a5e3
Merge branch 'master' into arch-chooser 2020-06-10 22:31:19 +03:00
Alexander Kuzmenkov
e4be52f35f Add system.asynchronous_metric_log 2020-06-10 22:17:54 +03:00
alexey-milovidov
1d1e11d887
Merge pull request #11570 from Vxider/remove_unused_code
Remove unused local variables
2020-06-10 22:03:23 +03:00
alexey-milovidov
123a017057
Merge pull request #11528 from azat/use_compact_format_in_distributed_parts_names-fix
Fix shard_num/replica_num for <node> (breaks use_compact_format_in_distributed_parts_names)
2020-06-10 22:02:51 +03:00
tavplubix
9c86c12891
Update ParserShowTablesQuery.cpp 2020-06-10 21:11:30 +03:00
alesapin
dd3cf0fe0a Don't miss columns TTLs update 2020-06-10 21:02:45 +03:00
alesapin
c21fac11cc Merge branch 'master' into consistent_metadata4 2020-06-10 20:20:46 +03:00
Nikita Mikhaylov
bf262a3b04
more lock_guard 2020-06-10 18:44:28 +03:00
Nikita Mikhaylov
8c19817575
lock_guard 2020-06-10 18:30:50 +03:00
Nikolai Kochetov
d4c8adbaff Fix sanitizeBlock 2020-06-10 18:06:37 +03:00
Alexander Tokmakov
08073903ed fix query_id of http queries 2020-06-10 17:24:42 +03:00
Nikita Mikhaylov
9df693ced5
Merge pull request #11561 from Jokser/s3-http-client-memory-optimization
Avoid copying whole response stream into memory in S3 HTTP client.
2020-06-10 16:53:33 +04:00
Alexander Tokmakov
9166ddea41 fix segfault in show create table 2020-06-10 15:53:12 +03:00
alesapin
24db834046 Style 2020-06-10 14:27:16 +03:00
alesapin
8be957ecb5 Better checks around metadata 2020-06-10 14:16:31 +03:00
Vxider
7078355449 remove unused local variables 2020-06-10 18:06:24 +08:00
alesapin
ec933d9d03 Better naming 2020-06-10 12:09:51 +03:00
tavplubix
a93ae46ac1
Merge pull request #11079 from ClickHouse/merging_external_source_cassandra
Merging #4978
2020-06-10 10:39:18 +03:00
alesapin
75977bd939 Gcc fixed 2020-06-10 00:22:01 +03:00
alesapin
4f398b5dea Merge remote-tracking branch 'origin/master' into consistent_metadata4 2020-06-09 23:53:38 +03:00
alexey-milovidov
8e05558a5f
Merge pull request #11540 from ClickHouse/fix-direct-io
Fix direct IO with PREWHERE
2020-06-09 23:53:09 +03:00
Azat Khuzhin
8a78cffe5c Force table creation on SYSTEM FLUSH LOGS 2020-06-09 21:11:08 +03:00
alesapin
4c77ba664a Better assignment 2020-06-09 20:42:04 +03:00
alesapin
d2fcf5aea5 Fixes for gcc 2020-06-09 20:28:29 +03:00
alesapin
936cc9d573 Update key 2020-06-09 20:22:03 +03:00
alesapin
4c2e0561f5 Fix primary key update 2020-06-09 20:21:38 +03:00
Alexander Tokmakov
6bb68329f8 Merge branch 'master' into merging_external_source_cassandra 2020-06-09 19:51:14 +03:00
alesapin
6f673b0981 Fix comments bug 2020-06-09 19:33:28 +03:00
Nikolai Kochetov
595fc9eff6
Merge pull request #11440 from ClickHouse/add-remote-source
Add remote source
2020-06-09 19:27:28 +03:00
Nikolai Kochetov
5cc2f318c9
Merge pull request #11495 from vzakaznikov/live_view_support_for_prewhere
Adding support for PREWHERE in live view tables.
2020-06-09 19:09:17 +03:00
alesapin
f7a397242f Merge branch 'master' into consistent_metadata4 2020-06-09 18:59:59 +03:00
Pavel Kovalenko
f623ef635b Avoid copying whole response stream into memory in S3 HTTP client. 2020-06-09 18:26:51 +03:00
alesapin
a6feb81af1 Fix under msan 2020-06-09 18:11:11 +03:00
alesapin
981462db04 Remove dump flag from ReadBufferAIO 2020-06-09 18:01:34 +03:00
Alexander Kuzmenkov
dd41f6a574
Merge pull request #11527 from azat/dist-insert-local-fix
Fix async INSERT into Distributed for prefer_localhost_replica=0 and w/o internal_replication
2020-06-09 15:21:05 +03:00
Ivan
47ad338cb2
Refactor CMake build files (#11390)
* Get rid of lib_name.cmake
* Refactor Boost and HyperScan libraries
* Refactor lz4
* Fix build with xxHash
2020-06-09 13:54:49 +03:00
alexey-milovidov
44b20eee96
Revert "S3 HTTP client - Avoid copying response stream into memory" 2020-06-09 10:23:35 +03:00
Ilya Yatsishin
822c19ddad
Merge pull request #11537 from ClickHouse/usability-exception-message-parse-columns-declaration-list
Better exception message when cannot parse columns declaration list
2020-06-09 09:55:40 +03:00
hexiaoting
75075a7b2b Add DISTINCT keyword when show clusters 2020-06-09 10:39:37 +08:00
alesapin
223f45685f Review fixes 2020-06-09 05:03:22 +03:00
Pavel Kovalenko
c3d0b35195 Fix includes in S3Common.cpp 2020-06-09 05:03:22 +03:00
Pavel Kovalenko
74ea867b1d Fix includes in S3Common.cpp 2020-06-09 05:03:22 +03:00
Pavel Kovalenko
8b8beb26d3 S3 Poco HTTP Client (do not copy response stream body into memory). 2020-06-09 05:03:22 +03:00
Alexey Milovidov
decac918a2 Fix error 2020-06-09 05:03:22 +03:00
alesapin
de59629b38 Fix benign race condition during shutdown 2020-06-09 04:48:30 +03:00
Alexey Milovidov
63f2d92eff Better exception message when cannot parse columns declaration list #10403 2020-06-09 01:49:19 +03:00
Alexey Milovidov
ef7b054443 Speed up merging in AggregatingMergeTree 2020-06-09 00:53:32 +03:00
Azat Khuzhin
c35f5e9271 Fix shard_num/replica_num for <node> (breaks use_compact_format_in_distributed_parts_names)
In system.clusters it was 1/1 while in address into it was 0/0
2020-06-08 22:30:13 +03:00
Azat Khuzhin
d2383f0f5d Fix async INSERT into Distributed for prefer_localhost_replica=0 and w/o internal_replication 2020-06-08 21:58:56 +03:00
alesapin
0d375e4522 Fix constraints 2020-06-08 21:49:54 +03:00
alesapin
a5a9048109 At least fixed gcc-9 build 2020-06-08 21:23:26 +03:00
alesapin
7b63a88120 Remove redundant error code 2020-06-08 18:19:41 +03:00
alesapin
d625162fce Better comment 2020-06-08 17:23:32 +03:00
alesapin
37a1d128c9 Better 2020-06-08 17:22:11 +03:00
alesapin
a30b72a128 Less debug 2020-06-08 17:21:12 +03:00
alesapin
2354939994 Remove log debug 2020-06-08 17:19:20 +03:00
alesapin
638cd50ce4 Fix several bugs 2020-06-08 17:18:38 +03:00
MovElb
ef5d03a273 fix build 2020-06-08 16:49:10 +03:00
alesapin
2226f79f16 Fix some bugs 2020-06-08 15:57:25 +03:00
Alexey Milovidov
138f3253ba Fix gcc build 2020-06-08 15:33:00 +03:00
alesapin
ac67d0485c Merge branch 'master' into consistent_metadata4 2020-06-08 15:06:51 +03:00
MovElb
fc981a2869 fix for review 2020-06-08 15:05:49 +03:00
Vitaliy Zakaznikov
5fe67c4292 * Removing supportsPrewhere() from StorageLiveView.h as it is not valid.
* Updating test to check using PREWHERE in query against live view table.
* Updating test to check using PREWHERE in the stored query against the table that does
  not support PREWHWERE.
2020-06-08 13:12:40 +02:00
Nikolai Kochetov
4c179e454a Add QueryPlan. 2020-06-08 12:14:58 +03:00
Alexey Milovidov
58e513f59e Corrected implementation for the case without key 2020-06-08 07:23:56 +03:00
Alexey Milovidov
4216f2fe37 Merge branch 'master' into fix-aggregation-state-exception-safety-memory-leak 2020-06-08 06:31:20 +03:00
hexiaoting
71e43934b7 Fix rest errors found by style check 2020-06-08 10:29:53 +08:00
hexiaoting
75768413ad fix errors found by Style Check 2020-06-08 10:23:57 +08:00
alexey-milovidov
ce4f528b73
Merge branch 'master' into kuskarov-add_syntax_highlighting 2020-06-08 02:14:09 +03:00
alexey-milovidov
16f0e3a467
Merge pull request #11493 from ClickHouse/kuskarov-fix_history_bugs
Merging #11453 (save history in clickhouse-client after every query)
2020-06-08 02:13:20 +03:00
Alexey Milovidov
834f8426e0 Fix memory leak 2020-06-08 01:46:58 +03:00
Vitaliy Zakaznikov
75c97ca82a Adding support for PREWHERE in live view tables. 2020-06-08 00:19:23 +02:00
Alexey Milovidov
f2cfb7d132 Whitespaces 2020-06-08 00:05:36 +03:00
potya
80496628e3 Add better code 2020-06-07 23:02:57 +03:00
Alexey Milovidov
df19db1509 Added a test for history in clickhouse-client 2020-06-07 20:29:34 +03:00
tavplubix
686c0539db
Merge pull request #11487 from ClickHouse/improve_dns_cache
Use DNSResolver to check if user is allowed to connect from an address
2020-06-07 19:55:03 +03:00
tavplubix
103f0d3ead
Update DNSResolver.cpp 2020-06-07 18:17:23 +03:00
alexey-milovidov
f804321cba
Update DNSResolver.cpp 2020-06-07 03:18:54 +03:00
alexey-milovidov
3d2254bc99
Merge pull request #11471 from Enmk/Codec_test_fixes
Fixed using nullptr source and dest buffers in codecs, fixed test
2020-06-07 02:46:09 +03:00
alexey-milovidov
e3c528e661
Merge pull request #11174 from excitoon-favorites/s3tests
Added tests for improved S3 URL parsing
2020-06-07 02:44:40 +03:00
Ivan
d2178cbacd
Merge pull request #11388 from filimonov/kafka_better_settings
Better settings for Kafka
2020-06-07 01:26:21 +03:00
Alexander Tokmakov
f620d97f9f fix 2020-06-07 00:48:38 +03:00
alexey-milovidov
5ff63d9ad5
Merge pull request #11486 from ClickHouse/speed-up-build
Speed up build by removing old example programs
2020-06-07 00:22:03 +03:00
Alexander Tokmakov
0cf8015f4a use DNSResolver to check if user is allowed to connect 2020-06-07 00:02:29 +03:00
Ivan
657ce426d3
Fix build
Checked locally - no PR
2020-06-06 22:27:48 +03:00
BayoNet
e9b7919e12
DOCS-271: Updated the MergeTree() ORDER BY description (#11433)
* CLICKHOUSEDOCS-271: Updated the MergeTree() ORDER BY description.

* CLICKHOUSEDOCS-271: Fixes grammar.

* CLICKHOUSEDOCS-271: Updated by comments.

Co-authored-by: Sergei Shtykov <bayonet@yandex-team.ru>
2020-06-06 20:44:48 +03:00
Ivan
058821fa02
Merge branch 'master' into kafka_better_settings 2020-06-06 19:50:38 +03:00
Alexey Milovidov
4313a52970 Merge branch 'master' into kuskarov-add_syntax_highlighting 2020-06-06 19:35:47 +03:00
Alexey Milovidov
c37627dabf Merge branch 'master' into Enmk-Codec_test_fixes 2020-06-06 19:21:28 +03:00
Alexey Milovidov
d3d02a67f4 Speed up build by removing old example programs 2020-06-06 19:19:16 +03:00
alexey-milovidov
3e84b17cf8
Merge pull request #11394 from azat/system.distribution_queue
Add system.distribution_queue table
2020-06-06 18:59:59 +03:00
Alexander Kuzmenkov
5851d61bb2
Merge pull request #11485 from ClickHouse/aku/fix-master
Remove some LOGICAL_ERROR to fix the tests
2020-06-06 18:59:31 +03:00
alexey-milovidov
82e849e6a1
Update StorageDistributed.cpp 2020-06-06 18:57:52 +03:00
Alexander Kuzmenkov
57cdbaad81 Remove some LOGICAL_ERROR to fix the tests 2020-06-06 16:05:50 +03:00
Anton Popov
5c42408add
Merge pull request #9113 from dimarub2000/group_by_in_order_optimization
[WIP] Optimization of GROUP BY with respect to table sorting key.
2020-06-06 14:25:59 +03:00
Vasily Nemkov
8996f47124 Revived Alexey Milovidov's fixes 2020-06-06 12:52:56 +03:00
alexey-milovidov
42534959e3
Merge pull request #11421 from livace/fix_point_in_polygon_with_nan
Fix pointInPolygon with nan
2020-06-06 12:37:19 +03:00
alexey-milovidov
050ef9eb54
Merge pull request #11455 from azat/INSERT-SELECT-FINAL-pipeline-stuck
Fix Pipeline stuck for INSERT SELECT FINAL
2020-06-06 12:36:07 +03:00
alexey-milovidov
e8a7fab81c
Merge pull request #11480 from 4ertus2/some
Refactoring: remove TableWithColumnNames
2020-06-06 12:33:16 +03:00
alexey-milovidov
937dd79880
Merge pull request #11477 from ClickHouse/aku/generate-random
generateRandom: check that all arguments are literals
2020-06-06 12:08:24 +03:00
Alexey Milovidov
a73b360c80 Update comment 2020-06-06 11:45:54 +03:00
Alexey Milovidov
cbf71d66e6 Fix undefined behaviour of DoubleDelta 2020-06-06 11:43:51 +03:00
Alexander Kuzmenkov
fafa953ee4 fixup 2020-06-06 04:23:21 +03:00
Artem Zuikov
1ee09a9f89 disable ColumnMatch::ColumnName logic 2020-06-06 02:14:18 +03:00
alexey-milovidov
5f99d887cc
Merge pull request #11443 from 4ertus2/strange
Rename setting
2020-06-06 01:45:21 +03:00
alexey-milovidov
f984cb750e
Update gtest_compressionCodec.cpp 2020-06-06 01:06:45 +03:00
Artem Zuikov
fdba90dd12 Merge branch 'master' into some 2020-06-06 00:50:42 +03:00
Artem Zuikov
0f37304521 hotfix: save tmp container 2020-06-06 00:28:44 +03:00
Artem Zuikov
c58f9bd43d refactoring: remove TableWithColumnNames 2020-06-06 00:17:00 +03:00
Alexander Kuzmenkov
3fd40098c4 fix same error in values() as well 2020-06-05 23:45:15 +03:00
Alexander Kuzmenkov
cd9b75db53 Merge remote-tracking branch 'origin/master' into HEAD 2020-06-05 23:43:24 +03:00
Alexander Kuzmenkov
d17a435fb6
Merge pull request #11226 from ClickHouse/aku/merge-perf-events
Merge Perf events metrics #9545
2020-06-05 23:10:54 +03:00
Vitaly Baranov
92ae3e11fa
Merge pull request #11356 from PerformanceVision/netloc_function
Create a netloc function for extracting network location
2020-06-05 22:13:38 +03:00
Vasily Nemkov
05ae8c405b Fixed using nullptr source and dest buffers in codecs, fixed test 2020-06-05 22:08:52 +03:00
Alexander Kuzmenkov
fc69811c7f generateRandom: check that all arguments are literals 2020-06-05 21:45:48 +03:00
alesapin
abaf47f0cd Make metadata single structure 2020-06-05 20:29:40 +03:00
Nikolai Kochetov
108575c8ad Added IQueryPlanStep. 2020-06-05 18:38:03 +03:00
Alexander Kuzmenkov
5523444d91 cleanup 2020-06-05 15:53:47 +03:00
alesapin
2b23d1aa33 Fix reference 2020-06-05 15:13:24 +03:00
alesapin
5bc7f67e61 Better metadata for select query and renames 2020-06-05 14:54:54 +03:00
Artem Zuikov
ecca78d855
fix trivial count with join (#11454) 2020-06-05 13:28:52 +03:00
Artem Zuikov
9717f3cfe5 make clang tidy happy 2020-06-05 13:27:54 +03:00
Alexander Kuzmenkov
7db8edf402
Merge pull request #11446 from ClickHouse/aku/better-error-messages
Improve error messages
2020-06-05 13:11:02 +03:00
Alexander Kuzmenkov
eaaf005a03
Merge pull request #11410 from ClickHouse/aku/logical-error-synonyms
Remove assorted synonyms of LOGICAL_ERROR
2020-06-05 13:10:40 +03:00
Nikolai Kochetov
f2350d3aec
Merge pull request #11415 from azat/SYSTEM-FLUSH-DISTRIBUTED-ON-CLUSTER
ON CLUSTER support for SYSTEM {FLUSH DISTRIBUTED,STOP/START DISTRIBUTED SENDS}
2020-06-05 12:59:38 +03:00
Nikolai Kochetov
5fea34d0e1 Use Resize instead of Concat in InterpreterInsertQuery. 2020-06-05 12:30:16 +03:00
hexiaoting
d2052dd1d4 show clusters 2020-06-05 17:13:13 +08:00
alexey-milovidov
0d30d1005f
Merge pull request #11448 from ClickHouse/fix-codecs-compression-size
Try fix return compressed size for codecs.
2020-06-05 04:43:58 +03:00
Alexey Milovidov
c9a883f2c4 Remove unneeded files 2020-06-05 02:07:13 +03:00
Alexey Milovidov
02e77e3406 Adjust some colors: minimum safe variant 2020-06-05 02:05:37 +03:00
Alexey Milovidov
275075b6f7 Revert all changes but save commit history from @kuskarov 2020-06-05 01:44:29 +03:00
Alexey Milovidov
fcd7fd8e7c Updates for #11422 2020-06-05 01:31:19 +03:00
Azat Khuzhin
1887e343ec Fix Pipeline stuck for INSERT SELECT FINAL
INSERT SELECT FINAL where SELECT (max_threads>1) has multiple streams
but INSERT has only one (max_insert_threads==0) will add ConcatProcessor
that will stuck the pipeline in this case.
2020-06-05 01:14:30 +03:00
Artem Zuikov
ab86ca2fb6 rename v2 2020-06-05 01:10:52 +03:00
Artem Zuikov
b66ad25841
IColumn::getDataType() (#11438) 2020-06-05 01:02:59 +03:00
Artem Zuikov
6d211bec19 fix trivial count with join 2020-06-05 01:01:40 +03:00
Alexey Milovidov
348d2098a4 Merge branch 'add_syntax_highlighting' of https://github.com/kuskarov/ClickHouse into kuskarov-add_syntax_highlighting 2020-06-04 23:57:20 +03:00
alexey-milovidov
1fd94de4b4
Update CompressionCodecGorilla.cpp 2020-06-04 23:51:07 +03:00
alexey-milovidov
f24a1f5210
Update CompressionCodecDoubleDelta.cpp 2020-06-04 23:50:31 +03:00
Nikolai Kochetov
d87b474665 Remove debug output. 2020-06-04 23:42:59 +03:00
Nikolai Kochetov
31ad5d7e5d Remove debug output. 2020-06-04 23:42:03 +03:00
Alexey Milovidov
f7398a9c09 Fix clang-tidy 2020-06-04 23:39:26 +03:00
Nikolai Kochetov
133037c410 Try fix return compressed size for codecs. 2020-06-04 20:56:53 +03:00
Alexey Milovidov
18999e4e7c Temporarily disable gtest_compressionCodec 2020-06-04 20:56:15 +03:00
Alexander Kuzmenkov
435f53e05a Improve error messages
Also support fmt for exception messages, the same way we use it in
logging macros.
2020-06-04 20:50:29 +03:00
Azat Khuzhin
ff85125326 Fix readability-qualified-auto 2020-06-04 20:23:46 +03:00
Azat Khuzhin
0f368c804d Fix SYSTEM START/STOP DISTRIBUTED SENDS w/o table name 2020-06-04 20:22:29 +03:00
Albert Kidrachev
60b86f524f add perf-test and fix 2020-06-04 20:10:52 +03:00
Alexander Kuzmenkov
377da4656d cleanup 2020-06-04 18:51:34 +03:00
Artem Zuikov
24ee7346a9 rename setting 2020-06-04 17:31:57 +03:00
Alexander Kuzmenkov
029005be7c clang-tidy 2020-06-04 17:26:16 +03:00
Alexander Tokmakov
1c982d00e3 try fix sync 2020-06-04 16:59:12 +03:00
alesapin
22235c1951 Tiny fixes for storage s3 2020-06-04 16:48:20 +03:00
Nikolai Kochetov
18516ba09f Fix DelayedSource. 2020-06-04 16:46:27 +03:00
alesapin
b163052d1b
Merge pull request #11134 from GrigoryPervakov/custom-auth
Add default credentials and custom headers for s3 storage.
2020-06-04 16:46:01 +03:00
Nikolai Kochetov
563fe4ea35 Fix DelayedSource. 2020-06-04 16:45:23 +03:00
alesapin
bba558d68e Merge branch 'custom-auth' of https://github.com/GrigoryPervakov/ClickHouse into merging_s3_auth 2020-06-04 16:19:04 +03:00
Nikolai Kochetov
b419d73880 Fix build. 2020-06-04 16:16:58 +03:00
alesapin
603917999b
Merge pull request #11431 from ClickHouse/fix_codecs_arguments_crash
Fix segfault with wrong codecs arguments
2020-06-04 16:15:42 +03:00
Vladimir Chebotarev
d62e85f875 Improved logging of globs in S3. 2020-06-04 16:12:08 +03:00
Vladimir Chebotarev
423db7e39a Added tests for improved S3 URL parsing. 2020-06-04 16:12:04 +03:00
Nikolai Kochetov
dcf9b9ef39 Fix build. 2020-06-04 16:08:09 +03:00
Alexander Tokmakov
4dae169216 fix gcc warnings 2020-06-04 16:03:06 +03:00
Nikita Mikhaylov
4e4218e10d
Merge pull request #11385 from ClickHouse/akz/bg-processing-pool-update1
Extended BackgroundProcessingPool::startTask() to control task execution concurrency
2020-06-04 16:19:29 +04:00
Nikolai Kochetov
f54f948162 Added DelayedSource. 2020-06-04 15:17:35 +03:00
Mikhail Filimonov
26d93fdfba Fix the test, adjust default for queued.min.messages 2020-06-04 14:14:24 +02:00
Alexander Kuzmenkov
30d7d41ebc
Merge pull request #11381 from ClickHouse/aku/fuzz-related
Fuzzing-related changes.
2020-06-04 15:06:11 +03:00
Alexander Kuzmenkov
0943ef3e4b Do not set global context twice in unit tests. 2020-06-04 15:04:05 +03:00
Alexander Kuzmenkov
dacbe8e445
Update src/Interpreters/DatabaseCatalog.cpp 2020-06-04 14:06:07 +03:00
Alexander Kuzmenkov
13762854c6
Update src/Interpreters/DatabaseCatalog.cpp 2020-06-04 14:05:34 +03:00
Anton Popov
4a3d3c6e54
Merge pull request #11419 from CurtizJ/polymorphic-parts-2
Return lost comments and default values
2020-06-04 13:32:38 +03:00
Artem Zuikov
6cdeb060fb
Fix JOIN over LC and Nullable in key (#11414) 2020-06-04 13:07:22 +03:00
alesapin
7fac00ae15 Fix segfault with wrong codecs arguments 2020-06-04 11:55:56 +03:00
exprmntr
dcec02c983
Update ya.make.in 2020-06-04 11:38:25 +03:00
exprmntr
fccf282829
Update ya.make 2020-06-04 11:36:38 +03:00
alesapin
0a453f5c83
Merge pull request #11420 from ClickHouse/fix-msan-failure
Fix MSan failure in MergeTree background task
2020-06-04 10:59:44 +03:00
Albert Kidrachev
be95da34b3 fix 2020-06-04 09:39:08 +03:00
Tagir Kuskarov
61bfe0b738 Style fix 2020-06-04 07:09:26 +04:00
Tagir Kuskarov
088394a61f Style fix 2020-06-04 06:54:53 +04:00
Tagir Kuskarov
af9e1c7d86 Merge from master 2020-06-04 05:56:30 +04:00
Tagir Kuskarov
bccf2ef39f UTF8 length used 2020-06-04 05:42:32 +04:00
Tagir Kuskarov
fed90652c9 Move files 2020-06-04 05:04:57 +04:00
Alexey Ilyukhov
1daf1146e1 Fix pointInPolygon with nan 2020-06-04 03:59:07 +03:00
Azat Khuzhin
86c5465bf8 Rewrite StorageSystemDistributionQueue interfaces 2020-06-04 03:04:32 +03:00
Azat Khuzhin
aa13bd9530 Fix possible SIGSEGV in StorageSystemDistributionQueue
Refs: #11348
2020-06-04 03:04:28 +03:00
Azat Khuzhin
f0050adc51 Make system.distribution_queue metrics non racy 2020-06-04 02:36:16 +03:00
Azat Khuzhin
09c3ca9c6c Add last_exception into system.distribution_queue 2020-06-04 02:36:16 +03:00
Azat Khuzhin
389f78ceee Add system.distribution_queue
system.distribution_queue contains the following columns:
- database
- table
- data_path
- is_blocked
- error_count
- data_files
- data_compressed_bytes
2020-06-04 02:36:16 +03:00
Azat Khuzhin
60d10f1bac Fix typo in StorageDistributed 2020-06-04 02:36:16 +03:00
Albert Kidrachev
ae7bad368b run optimization for limit >= 1500 and hint for comparing ColumnString 2020-06-04 01:50:58 +03:00
alexey-milovidov
acf7773942
Merge pull request #11403 from Enmk/geohashesInBox-fix
Fixed geohashesInBox argument range
2020-06-04 01:44:37 +03:00
Alexey Milovidov
484d269c22 Fix typo 2020-06-04 01:15:13 +03:00
Alexey Milovidov
a0fd9b021a Fix MSan failure in MergeTree 2020-06-04 01:11:06 +03:00
Alexander Tokmakov
64c013610a fix 2020-06-04 01:03:49 +03:00
Anton Popov
5348e5a746
Fix build 2020-06-04 00:58:51 +03:00
Anton Popov
1980d58ba6 add lost comments and default values 2020-06-04 00:30:45 +03:00
Alexander Tokmakov
e67837bc4a cleenup 2020-06-04 00:11:17 +03:00
Nikolai Kochetov
83b6467308 Added RemoteSource. 2020-06-03 22:50:11 +03:00
Azat Khuzhin
71d0e60dcb ON CLUSTER support for SYSTEM {FLUSH DISTRIBUTED,STOP/START DISTRIBUTED SEND}
It is pretty logical to have ON CLUSTER for managing Distributed tables.
2020-06-03 21:51:52 +03:00
Mikhail Filimonov
eef914cbdf Remove debug print 2020-06-03 20:34:22 +02:00
Mikhail Filimonov
ea6545a175 Return output_format_pretty_max_value_width after rebase 2020-06-03 20:28:28 +02:00
Mikhail Filimonov
94261b9786 Fix issues detected by clang tidy, fix issue with flush timeout 2020-06-03 19:02:24 +02:00
Mikhail Filimonov
95f4c46aa4 Better control of context copies, some cosmetic changes, client.software.name and client.software.version now initialized 2020-06-03 19:01:45 +02:00
Mikhail Filimonov
4956ade67d Support for all format settings in Kafka, expose some setting on table level, better defaults. 2020-06-03 19:01:41 +02:00
Alexander Kuzmenkov
1c33918f07 style 2020-06-03 17:17:41 +03:00
Alexander Kuzmenkov
60920c3077 let's be optimistic, it will build eventually 2020-06-03 16:44:36 +03:00
Alexander Kuzmenkov
1ab3201454 Merge remote-tracking branch 'origin/master' into HEAD 2020-06-03 16:36:22 +03:00
Alexander Kuzmenkov
91b1d381bb fixup 2020-06-03 16:34:36 +03:00
Alexander Kuzmenkov
07e4bb7050 Remove assorted synonyms of LOGICAL_ERROR.
We don't need any special handling for them on the client, and, on the
contrary, have to handle them as logical errors in tests.
2020-06-03 16:18:42 +03:00
Alexander Tokmakov
e3aa20708a Merge branch 'master' into merging_external_source_cassandra 2020-06-03 14:55:02 +03:00
Alexander Tokmakov
73926b2cf9 support loading from multiple partitions with complex key 2020-06-03 14:54:26 +03:00
Alexander Kuzmenkov
3bf9cec63b Merge remote-tracking branch 'origin/master' into HEAD 2020-06-03 14:49:49 +03:00
Nikolai Kochetov
29dd7fa0df
Merge pull request #11386 from ClickHouse/refactor-RemoteBlockInputStream
Refactor RemoteBlockInputStream.
2020-06-03 14:42:51 +03:00
Alexander Kuzmenkov
eca69d1a56 please build already 2020-06-03 14:25:56 +03:00
Artem Zuikov
1b91dd8ea0
better error for USING key (#11404) 2020-06-03 13:50:15 +03:00
Vasily Nemkov
97a1cc1b52 Fixed geohashesInBox argument range 2020-06-03 13:38:44 +03:00
Ruslan
7757c9ec57
Remove arithmetic operations from aggregation functions (#10047) 2020-06-03 13:28:30 +03:00
Alexander Kuzmenkov
c7d9094a7a
Merge pull request #11259 from ClickHouse/consistent_metadata3
More consistent metadata for secondary indices
2020-06-03 12:23:21 +03:00