thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-12-12 01:12:12 +00:00
Code Issues Packages Projects Releases Wiki Activity
34,918 Commits 9,297 Branches 1,782 Tags 2.1 GiB
634d3bedd3
Commit Graph

1165 Commits

Author SHA1 Message Date
Alexey Milovidov
2a3e0eb1f1 Merge branch 'master' into merge-constraints 2019-08-26 04:30:31 +03:00
Alexey Milovidov
3fef8e92ad Merging CONSTRAINTS support 2019-08-25 00:20:20 +03:00
Alexey Milovidov
cdd6dca517 Remove Compiler 2019-08-24 00:10:26 +03:00
alexey-milovidov
44d3e1e837
Update Client.cpp 2019-08-23 23:35:36 +03:00
alexey-milovidov
13f59d3f6c
Update Client.cpp 2019-08-23 23:13:08 +03:00
dimarub2000
859d97e8fd Renaming 2019-08-23 18:47:27 +03:00
dimarub2000
a367f94923 Fix after review 2019-08-23 16:19:12 +03:00
Alexey Milovidov
4366791b63 Merge branch 'table-constraints' of https://github.com/NanoBjorn/ClickHouse into NanoBjorn-table-constraints 2019-08-23 07:49:10 +03:00
alexey-milovidov
70a61cc7be
Merge pull request #6609 from dimarub2000/clickhouse_obfuscator_symlink 
Clickhouse obfuscator symlink
 2019-08-22 22:53:45 +03:00
Dmitry Rubashkin
e9d813bff7 Minor fixes 2019-08-22 17:30:18 +03:00
Dmitry Rubashkin
095124dcba setOptionsDescription() function added 2019-08-22 17:03:37 +03:00
dimarub2000
b5e08fa929 Tried to fix 2019-08-21 14:12:58 +03:00
Dmitry Rubashkin
bd5dabb15c --help size fixed 2019-08-21 13:32:20 +03:00
alesapin
eb5e052855 merge and fixes 2019-08-21 13:09:29 +03:00
alesapin
70ca7f4156 Merge with master 2019-08-21 11:57:35 +03:00
dimarub2000
086dd815ac T_test.h added, some fixes 2019-08-21 11:53:41 +03:00
alexey-milovidov
308baa182e
Merge branch 'master' into table-constraints 2019-08-21 06:33:08 +03:00
Alexey Milovidov
8966520801 Added "assert_cast" function as a replacement for static_cast for columns 2019-08-21 05:28:04 +03:00
proller
4f1c9ee197 CLICKHOUSE-3885 copier: use partition_key in check query 2019-08-20 21:05:01 +03:00
Gleb Novikov
86fecc7501 Merge branch 'master' into table-constraints 2019-08-20 12:17:56 +03:00
alesapin
a85cdc91a6 Merge branch 'master' into ObjatieGroba-feature_multiple_disks 2019-08-19 11:34:02 +03:00
alesapin
e7542810bb Merge with master 2019-08-19 11:20:48 +03:00
Георгий Кондратьев
c70d585169 DEVTOOLS-5755 Remove odbc-bridge.cpp from clickhouse-lib 
odbc-bridge.cpp defines main() so it should not be included in clickhouse-lib.
 2019-08-19 05:13:39 +00:00
alexey-milovidov
29cc99ad58
Merge pull request #6194 from yurriy/mysql 
Compatibility with more MySQL clients.
 2019-08-18 16:28:13 +03:00
alexey-milovidov
a70bfa13d4
Merge pull request #6467 from nikitamikhaylov/system_metric_log 
system.metric_log table
 2019-08-16 02:28:53 +03:00
Yuriy
c5b6d1f9bf merged origin/master 2019-08-15 19:48:10 +03:00
Gleb Novikov
d41bb1fc19 Reverted server config.xml 2019-08-14 22:52:39 +03:00
Gleb Novikov
ab1c4139de Added ReplicatedMergeTree support and test for constraints, also added VIOLATED_CONSTRAINT error 2019-08-14 22:51:03 +03:00
Nikita Mikhaylov
e83482b512 metric_log.xml 2019-08-14 20:21:45 +03:00
alesapin
bccf62100f Revert check 2019-08-14 18:25:57 +03:00
Nikita Mikhaylov
15bbf080f3 changes after review 2019-08-14 15:54:41 +03:00
akuzm
6bcfe51edf
In performance test, do not read query log for queries we didn't run. (#6427) 2019-08-14 14:04:11 +03:00
alesapin
949890ee90 Merged 2019-08-14 12:46:30 +03:00
alesapin
5b85373c56 Fix stupid bug 2019-08-13 14:58:59 +03:00
alesapin
7b1039568c Revert old changed 2019-08-13 14:24:18 +03:00
alesapin
428c753ed7 Merge with master 2019-08-13 11:37:47 +03:00
Alexey Milovidov
5830526fa1 Slightly better information messages 2019-08-11 23:37:53 +03:00
alexey-milovidov
838c5e535f
Merge pull request #6433 from yandex/prevent-stack-overflow-in-parser 
Fixed possible stack overflow in parser
 2019-08-10 23:58:54 +03:00
Alexey Milovidov
0a9787c7f3 Fixed possible stack overflow in parser 2019-08-10 19:38:25 +03:00
kreuzerkrieg
112fc71276 adding -Wshadow for GCC 2019-08-09 23:58:16 +03:00
dimarub2000
9caa69ce88 Minor fixes 2019-08-09 18:18:21 +03:00
dimarub2000
2ce2bba496 Minor fixes 2019-08-09 18:08:10 +03:00
alesapin
2803fcc2ba Make atomic settings 2019-08-09 16:07:19 +03:00
dimarub2000
9d2c9c8c2a Minor style and logic fixes 2019-08-09 16:00:47 +03:00
dimarub2000
b2cbc1a747 Fixed some const's and added --confidence option. 2019-08-09 13:46:57 +03:00
Alexey Milovidov
86f321a7cd Whitespaces 2019-08-09 02:55:08 +03:00
alesapin
a03fcd9f12 Make settings values atomic to avoid race conditions 2019-08-08 22:29:56 +03:00
dimarub2000
b780072a9d raw data relative_analize 2019-08-08 21:49:29 +03:00
alesapin
e0d18c0fe8 Merge branch 'master' into merge_tree_settings_alter 2019-08-08 18:16:22 +03:00
Alexey Milovidov
d256fb9d57 Removed extra verbose logging from MySQL handler 2019-08-07 22:14:58 +03:00
alesapin
ea17d033ec Merge branch 'master' into merge_tree_settings_alter 2019-08-07 14:02:22 +03:00
alexey-milovidov
a455bd7355
Merge pull request #6348 from Vxider/master 
build fix
 2019-08-06 17:24:22 +03:00
Vxider
42287c0b72 format code 2019-08-06 22:04:51 +08:00
Vxider
4d780d99f4 build fix 2019-08-06 22:03:41 +08:00
dimarub2000
4f89f8f4dd random generator is now one for thread 2019-08-06 16:19:06 +03:00
alesapin
52b9658bcf Merge with master 2019-08-06 15:55:12 +03:00
dimarub2000
02878c233a True randomness 2019-08-06 15:54:33 +03:00
dimarub2000
a5009c6759 --cumulative option added, and time statistics fixed 2019-08-06 13:54:35 +03:00
dimarub2000
3ea83e35d7 Multiple hosts and ports 2019-08-05 21:38:08 +03:00
Vxider
03092d5704 build fix 2019-08-06 00:53:11 +08:00
Nikolai Kochetov
e361d336bb
Merge pull request #6239 from yandex/processors-and-output-formats 
Processors and output formats
 2019-08-05 19:45:17 +03:00
Vxider
d5fd3c0a8a build fix 2019-08-06 00:25:26 +08:00
Alexey Milovidov
a19d05d6df Fixed minor discrepancies 2019-08-05 19:05:37 +03:00
dimarub2000
cc3900817c Clickhouse-benchmark comparison mode 2019-08-05 16:00:27 +03:00
Nikolai Kochetov
b0b7ed791d Merge branch 'master' into processors-and-output-formats 2019-08-04 19:47:26 +03:00
Alexey Milovidov
8c05766888 Attempt to simplify text log 2019-08-04 18:51:04 +03:00
alexey-milovidov
a0599214ef
Merge pull request #6103 from nikitamikhaylov/system_text_log 
Allow to write ClickHouse text logs into system table.
 2019-08-04 17:51:34 +03:00
Nikolai Kochetov
599f3ddf6e Merged with master. 2019-08-04 15:35:21 +03:00
Alexey Milovidov
d8eae1f83a Disable query profiler if we build with test coverage 2019-08-03 23:47:57 +03:00
Alexey Milovidov
06b99e61aa Fixed "unbundled" build 2019-08-03 23:47:57 +03:00
Nikolai Kochetov
c336c514fb Remove TSKVRowInputStream. 2019-08-02 19:58:52 +03:00
Alexander Rodin
68487d512a Merge if branches with the same status code 2019-08-02 05:11:02 +00:00
Alexander Rodin
5c5b4f4de2 Revert "Replace ifs by cases" 
This reverts commit 0c70f78fcb.
 2019-08-02 05:07:10 +00:00
Alexander Rodin
0c70f78fcb Replace ifs by cases 2019-08-01 15:23:20 +00:00
Alexander Rodin
44b3dbb23b Return Bad Request for INCORRECT_DATA and TYPE_MISMATCH errors 2019-08-01 13:16:09 +00:00
Nikita Mikhaylov
508934fa85 remove redudant includes 2019-08-01 16:05:59 +03:00
Igr Mineev
0f1e8404dc Merge branch 'master' of github.com:yandex/ClickHouse into feature_multiple_disks 2019-08-01 13:42:59 +03:00
Nikita Mikhaylov
a9fea0314e better style 2019-08-01 13:31:29 +03:00
Igr Mineev
fc79ed86ef Ready for review 2019-08-01 13:29:14 +03:00
Alexey Milovidov
f3921ce3e0 Changed boost::filesystem to std::filesystem 2019-08-01 01:37:41 +03:00
Nikita Mikhaylov
ad4459c4a2 fixed flush_logs + added pretty function 2019-07-31 17:03:23 +03:00
alexey-milovidov
c4072b12a7
Merge pull request #6230 from yandex/override-idle-time-poll-interval 
Allow user to override poll_interval and idle_connection_timeout
 2019-07-31 05:57:46 +03:00
Alexey Milovidov
b6275010f2 Fixed error with server shutdown 2019-07-31 02:12:04 +03:00
Alexey Milovidov
aa6f7f2730 Slightly better 2019-07-31 01:27:14 +03:00
Alexey Milovidov
0055bd1a1b Allow user to override poll_interval and idle_connection_timeout 2019-07-31 01:22:45 +03:00
Alexey Milovidov
2452b2eba7 Fixed the issue with "listen_try" option 2019-07-31 01:08:57 +03:00
Alexey Milovidov
3ef3dcb4c8 Fixed the issue with "listen_try" option 2019-07-31 01:06:13 +03:00
Alexey Milovidov
e0c8bec28a Fixed the issue with "listen_try" option 2019-07-31 00:23:42 +03:00
Alexey Milovidov
b85cdd565c Fixed idiotic inconsistent code 2019-07-31 00:11:42 +03:00
Igr Mineev
7f7b47fc0a Add check of RW access to paths on start. Add multiple disks tests. 2019-07-30 19:15:57 +03:00
Nikita Mikhaylov
e06b3b17b3 some changes to log all text logs 2019-07-30 17:04:18 +03:00
alesapin
86831fe500 Add ability to create immutable settings 2019-07-29 14:03:50 +03:00
alesapin
ea6053eadc Do not report strange exception messages into JSON report from performance-test 2019-07-29 12:05:37 +03:00
Yuriy
b1d5f4ca20 disabled mysql_native_password when password is specified as a plain text as it allows to connect to ClickHouse knowing only SHA1 instead of a password 2019-07-28 17:17:33 +03:00
Yuriy
21ce5331d1 implemented mysql_native_password auth plugin for compatibility with mysqljs 2019-07-28 16:12:26 +03:00
Yuriy
997c94d093 includes order 2019-07-28 03:55:46 +03:00
Yuriy
96552a4d4e prevent rewriting packet in case of attempt to write more than initially calculated payload length 2019-07-28 03:41:41 +03:00
Yuriy
383fa25c51 resolved conflict 2019-07-28 02:00:15 +03:00
Alexey Milovidov
3eb29c1950 Clarified comment 2019-07-26 03:54:48 +03:00
Alexey Milovidov
2a9d606d4b Use text_log in development environments 2019-07-26 02:01:18 +03:00
Alexey Milovidov
e5df077c21 Added example in config 2019-07-26 02:00:18 +03:00
Alexey Milovidov
5a47b0b990 Sanity and configuration checks 2019-07-26 01:35:47 +03:00
Alexey Milovidov
1d499bcdc0 Allow to update PHDRCache 2019-07-25 22:54:16 +03:00
Alexey Milovidov
d95c6e1bc4 Attempt to solve signal safety of libunwind with solution from Fedor Korotkiy 2019-07-24 18:26:23 +03:00
alexey-milovidov
e4ad0da6e3
Merge pull request #4247 from laplab/query-poor-mans-profiler 
Poor man's profiler on query level [Work in progress]
 2019-07-23 03:02:58 +03:00
alexey-milovidov
ea9b36e531
Merge pull request #6091 from yurriy/php-client-test 
MySQL Native Driver test
 2019-07-21 23:29:24 +03:00
Yuriy
28a0481f1a php mysql client test 2019-07-21 15:19:14 +03:00
Yuriy
34a4d6a57a better 2019-07-19 21:46:57 +03:00
Yuriy
39ea5486f5 removed reinterpret_cast 2019-07-19 21:29:39 +03:00
Yuriy
475179cec7 added size limit for packets which are read without memory tracker (all packets except for COM_QUERY) 2019-07-19 20:55:07 +03:00
chertus
e15f6e9752 Merge branch 'master' into ast 2019-07-19 18:01:09 +03:00
Mikhail Filimonov
9c2ae4513d SensitiveDataMasker 2019-07-19 10:22:42 +02:00
Yuriy
1913ae9cee fixed asan check 2019-07-18 08:00:35 +03:00
chertus
fbc0c87c18 enable input_format_defaults_for_omitted_fields & disable (not working) defaults for table functions 2019-07-17 21:30:17 +03:00
alexey-milovidov
ea28254711
Merge pull request #5964 from nikitamikhaylov/logs_bugfix 
"send_logs_level" bugfix
 2019-07-17 17:42:54 +03:00
Nikita Mikhaylov
04de34a74f changes after review 2019-07-16 19:27:42 +03:00
alesapin
f5b7523429
Merge pull request #5899 from yandex/aku/perftest-mem 
Report memory usage in performance tests.
 2019-07-16 18:09:44 +03:00
Yuriy
1d6e31be4d merged master 2019-07-16 10:33:25 +03:00
Yuriy
a514de943c replacing not implemented query 2019-07-16 10:11:59 +03:00
Yuriy
4df72f18ce writing packets in parts 2019-07-16 09:39:18 +03:00
Nikita Mikhailov
cc5f87e352 Merge branch 'master' of github.com:yandex/ClickHouse into logs_bugfix 2019-07-15 19:31:54 +03:00
Yuriy
0ed77453d3 reading packets in parts 2019-07-15 01:13:56 +03:00
Yuriy
a6bd5bccff tiny fix 2019-07-14 11:27:58 +03:00
alexey-milovidov
a93c76837e
Merge pull request #5953 from abyss7/fix-filter-table 
Implement getDatabaseName() and rename() for all storages
 2019-07-13 00:51:39 +03:00
Nikolai Kochetov
e9f3d4d6b8
Merge pull request #4914 from yandex/processors 
Processors
 2019-07-11 19:22:02 +03:00
Nikita Lapkov
9d540abc84 refactor 2019-07-10 20:47:39 +00:00
Ivan Lezhankin
998aa795fc Merge remote-tracking branch 'upstream/master' into fix-filter-table 2019-07-10 18:14:15 +03:00
NIKITA MIKHAILOV
e05f5388bc clean after cherry-pick 2019-07-10 16:27:16 +03:00
NIKITA MIKHAILOV
865606b83c bugfix client logs + some tests 2019-07-10 16:15:22 +03:00
NIKITA MIKHAILOV
21ad247df3 only for saving this changes 2019-07-10 16:05:22 +03:00
Nikita Mikhaylov
55e9e21cc5 better includes 2019-07-10 16:05:12 +03:00
Nikita Mikhaylov
6ff9dfce34 first try 2019-07-10 16:04:01 +03:00
Alexey Milovidov
7643b1c7f9 Attempt to fix "splitted" build 2019-07-10 14:46:37 +03:00
Ivan Lezhankin
befb3ce15b Merge branch 'master' into fix-filter-table 2019-07-10 13:27:26 +03:00
Alexey Milovidov
499d798b34 Remove "clickhouse_compression" library because it is not a library (cyclic dependency via IDataType) 2019-07-10 00:37:43 +03:00
Alexey Milovidov
729ecfa9ab Fixed build without SSL (disable MySQL protocol support) 2019-07-09 19:41:11 +03:00
Ivan Lezhankin
9f01fa7aaa Implement getDatabaseName() and rename() for all storages 2019-07-09 18:40:21 +03:00
Alexey Milovidov
ed5abe83c0 Fixed build without SSL (disable MySQL protocol support) 2019-07-09 17:59:52 +03:00
Alexander Kuzmenkov
8c379fb972 Flush query log instead of waiting for it. 2019-07-09 17:22:42 +03:00
Nikolai Kochetov
0df2a67c19 Increase queue size in LazyOutputFormat in order to prevent potential lock. 2019-07-09 15:46:50 +03:00
Alexander Kuzmenkov
f260296f89 Print logs to stderr. 2019-07-09 12:49:34 +03:00
Alexey Milovidov
02eada5b35 Fixed error in prev. revision 2019-07-08 22:41:11 +03:00
Alexey Milovidov
c1bb550c07 Addition to prev. revision 2019-07-08 19:58:32 +03:00
Alexander Kuzmenkov
78df28f0e9 Cleanup. 2019-07-08 18:35:32 +03:00
Alexander Kuzmenkov
b928d87d8a error: declaration shadows a field of 'DB::PerformanceTest' 2019-07-08 18:08:46 +03:00
Alexander Kuzmenkov
bdbb77a0a1 Read the query log after running all the queries. 
The log entries appear ~10s after a query has finished, so waiting
for them after each query takes too long.
 2019-07-08 16:23:30 +03:00
Nikolai Kochetov
209793c981 Merged with master. 2019-07-08 16:00:54 +03:00
Nikolai Kochetov
472f32f718 Remove ThreadGroupThreadPoolCallbacks 2019-07-08 15:49:52 +03:00
Nikolai Kochetov
e5103d741c Fix lock in case of query was cancelled. 2019-07-08 15:48:16 +03:00
Alexey Milovidov
36269c4e2a Addition to prev. revision 2019-07-08 06:41:37 +03:00
Alexey Milovidov
f40b70884f Two more fixes for PVS-Studio 2019-07-08 05:14:32 +03:00
Alexey Milovidov
57d8dac95d Two more fixes for PVS-Studio 2019-07-08 05:06:15 +03:00
Alexey Milovidov
c35a832095 Two more fixes for PVS-Studio 2019-07-08 03:56:52 +03:00
Alexey Milovidov
553e6a273e Two more fixes for PVS-Studio 2019-07-08 03:51:43 +03:00
Nikita Lapkov
e935cb08a8 Merge remote-tracking branch 'upstream/master' into query-poor-mans-profiler 2019-07-07 01:06:10 +00:00
alexey-milovidov
a1cfdf2a60
Merge pull request #5855 from abyss7/no-undefined 
Use --no-undefined linker option for split build
 2019-07-07 01:47:11 +03:00
Alexey Milovidov
338c0d27ca Added "os_thread_priority" setting 2019-07-06 21:02:28 +03:00
Nikita Lapkov
aaea6cbfc9 Merge remote-tracking branch 'upstream/master' into query-poor-mans-profiler 2019-07-05 21:37:31 +00:00
Alexander Kuzmenkov
a43d3a6902 Report memory usage in performance tests. 2019-07-05 19:50:44 +03:00
Nikita Lapkov
b8585a5630 refactor and comments 2019-07-05 13:48:47 +00:00
alexey-milovidov
2469ec1af3
Merge pull request #5857 from CurtizJ/dns-cache 
Implement dns cache with asynchronous update.
 2019-07-05 15:56:26 +03:00
alexey-milovidov
a5bb0099dd
Merge pull request #5875 from yandex/more-robust-metrics-transmitter 
Less locking in MetricsTransmitter
 2019-07-05 14:05:08 +03:00
alexey-milovidov
c3c4f4aff0
Merge pull request #5880 from yandex/close-idle-connections 
Close idle TCP connections
 2019-07-05 14:04:28 +03:00
Nikolai Kochetov
bc1e9df6cc
Merge pull request #5871 from yandex/fix-clickhouse-copier-heap-use-after-free 
Fix heap-use-after-free in ClusterCopier
 2019-07-05 13:48:06 +03:00
Alexey Milovidov
433467c3df Added log message for idle connections 2019-07-05 02:03:20 +03:00
Alexey Milovidov
5229fa4538 Addition to prev. revision 2019-07-05 01:57:26 +03:00
Alexey Milovidov
6efca57979 Close idle connections #5879 2019-07-05 01:23:45 +03:00
Nikita Lapkov
0f579860f7 Merge remote-tracking branch 'upstream/master' into query-poor-mans-profiler 2019-07-04 22:13:51 +00:00
Alexey Milovidov
4875ee12d9 Less locking in MetricsTransmitter 2019-07-04 22:08:37 +03:00
akuzm
74d17789d0
Destroy the text log queue after the I/O blocks. (#5854) 
These blocks contain threads that use the queue, so they must be
destroyed first. This was reported by ThreadSanitizer.
 2019-07-04 19:21:24 +03:00
Nikolai Kochetov
72afe9b842 Fix heap-use-after-free in ClusterCopier caused by watch which try to use already removed copier object. 2019-07-04 17:48:40 +03:00
Ivan Lezhankin
3b995bdb02 Add missing dependecies on sight to enable --no-undefined option 2019-07-04 17:05:55 +03:00
CurtizJ
80e96995ae Merge branch 'master' of https://github.com/yandex/ClickHouse into dns-cache 2019-07-03 21:27:43 +03:00
CurtizJ
35ad1a3b6b implement dns cache with asynchronous update 2019-07-03 19:26:22 +03:00
Yuriy
450b20ca89 max_memory_usage support in MySQL wire protocol 2019-07-01 08:58:31 +03:00
Alexey Milovidov
498a2072b5 Fixed bug in query formatting with TEMPORARY tables 2019-06-29 19:58:32 +03:00
Alexey Milovidov
a643f2f75e Merge branch 'master' into sanych73-prepared_statements 2019-06-29 15:51:56 +03:00
proller
8b1651ae1f
arcadia fixes (#5795) 2019-06-29 15:04:47 +03:00
alexey-milovidov
7ce4cd7861
Merge pull request #5745 from nvartolomei/nv/clickhouse-copier-cross-replication 
clickhouse-copier: Allow empty database name
 2019-06-27 21:09:00 +03:00
proller
aeb7eb42d1 clickhouse-copier: Fix use-after free on shutdown (#5752) 
* release script: convert .deb to .rpm and .tgz

* clickhouse-copier: Fix use-after free on shutdown

* Revert "Disable cluster copier tests"

This reverts commit 71872fc3c3.
 2019-06-27 15:29:49 +03:00
Nikita Lapkov
7cff36fbfc Merge remote-tracking branch 'upstream/master' into query-poor-mans-profiler 2019-06-26 11:46:04 +00:00
Nicolae Vartolomei
59d66bb1d5 clickhouse-copier: Allow empty database name 
This is needed to make clickhouse-copier work with cross-replication
setups (also known as [circular replication][1]).

When database name is not specified we rely on `<default_database>`
element from replica stanza.

Example:

```xml
<source_cluster>
    <shard>
        <replica>
            <host>localhost</host>
            <port>9000</port>
            <default_database>r0</default_database>
        </replica>
        <replica>
            <host>localhost</host>
            <port>666</port>
            <default_database>r1</default_database>
        </replica>
    </shard>
    <shard>
        <replica>
            <host>localhost</host>
            <port>666</port>
            <default_database>r0</default_database>
        </replica>
        <replica>
            <host>localhost</host>
            <port>9000</port>
            <default_database>r1</default_database>
        </replica>
    </shard>
</source_cluster>
```

[1]: https://www.altinity.com/blog/2018/5/10/circular-replication-cluster-topology-in-clickhouse
 2019-06-25 22:09:11 +00:00
Nikolai Kochetov
f9b29bfdd2 Merged with master. 2019-06-25 20:00:54 +03:00
Nikolai Kochetov
3bee30a215 Update PipelineExecutor. 2019-06-25 19:41:11 +03:00
Nikolai Kochetov
a43f789338 Fix performance introspection. 2019-06-25 19:41:06 +03:00
proller
1ac09fa721
Split Common/config.h by libs (dbms) (#5715) 2019-06-24 14:17:15 +03:00
stavrolia
84871d9fa8 Remove <name> and <metrics> from performance tests fixed-5634 2019-06-18 19:55:13 +03:00
alesapin
e45d727e9d
Merge pull request #4558 from podshumok/distributred-timeout 
Distributed and remote timeouts
 2019-06-17 13:58:17 +03:00
Alexey Milovidov
88c35d541d Merge branch 'master' into sanych73-prepared_statements 2019-06-16 23:53:31 +03:00
Alexey Milovidov
224e6c7d72 Merge branch 'master' into sanych73-prepared_statements 2019-06-16 21:18:23 +03:00
Alexey Milovidov
413b780b65 Various fixes for PVS-Studio 2019-06-16 21:13:39 +03:00
Yuriy
2e29ea7b2e support of sessions and default_database in MySQL wire protocol 2019-06-16 18:12:37 +03:00
Alexey Milovidov
eb4f0920b1 Merge branch 'master' into sanych73-prepared_statements 2019-06-16 12:27:19 +03:00
Alexey Milovidov
ba18308080 Merge branch 'master' into levysh-testkeeper 2019-06-16 02:45:34 +03:00
Alexey Milovidov
7514674447 Merge remote-tracking branch 'origin/master' into sanych73-prepared_statements 2019-06-16 02:40:17 +03:00
Alexey Milovidov
f38855fe61 Merge branch 'master' into sanych73-prepared_statements 2019-06-16 02:39:55 +03:00
Alexey Milovidov
777af5544b Removed tons of trash 
Removed tons of trash

Removed tons of trash

Removed tons of trash

Removed tons of trash

Removed tons of trash

Removed tons of trash

Removed tons of trash

Removed tons of trash

Removed tons of trash

Removed tons of trash
 2019-06-16 02:35:27 +03:00
alexey-milovidov
39c6fbc324
Merge pull request #5567 from vitlibar/really-lazy-dictionary-load 
Non-blocking loading of external dictionaries
 2019-06-15 22:15:53 +03:00
Alexey Milovidov
0f9599bf22 Removed bad code; added support for --param_name value 2019-06-15 21:56:32 +03:00
Alexey Milovidov
61bf0e9b12 Style 2019-06-15 21:25:27 +03:00
Alexey Milovidov
b079631f61 Fixed tests 2019-06-15 21:22:48 +03:00
Alexey Milovidov
fad6013270 Fixing query parameters 2019-06-15 20:52:53 +03:00
Alexey Milovidov
b2100c7bcf Removed strange quoting style like `this'. See https://english.stackexchange.com/questions/17695/any-reference-on-the-usage-of-a-backtick-and-single-quotation-mark-like-this 
Added backQuote and backQuoteIfNeed when required to correctly quote identifiers with proper escaping.
 2019-06-15 15:06:22 +03:00
Vitaly Baranov
b4384ce2a9 Dictionaries can be loaded in parallel. 
A bad dictionary cannot block all the loading anymore.
Implemented really lazy loading of external dictionaries.
Provided more detailed information about the loading of each dictionary
to make diagnostics easier.
 2019-06-14 22:18:47 +03:00
Alexey Milovidov
da04db2a93 Fixes for #5331 2019-06-14 21:56:28 +03:00
Alexey Milovidov
f535a2f55f Fixes for #5331 2019-06-14 21:32:22 +03:00
Alexey Milovidov
c5c2bd4a3f Merge branch 'prepared_statements' of https://github.com/sanych73/ClickHouse into sanych73-prepared_statements 2019-06-14 19:28:25 +03:00
proller
7e7b5b3810 Allow run query with remote() in clickhouse-local; Aloow redefine config from command line for clickhouse-local 2019-06-14 18:35:45 +03:00
proller
09f3d68f6e Use logging in clickhouse-local. Use config options in command line in clickhouse-client (#5540) 
* Try fix macos server run

* Doc macos build
 # Please enter the commit message for your changes. Lines starting

* CLICKHOUSE-3957 start wip

* tests wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* fix

* fix

* Making logger for clickhouse-local

* fixes

* wip

* wip

* wip

* wip

* clean

*      cf

* wip

* fix

* Update CMakeLists.txt

* Update argsToConfig.h

* Update argsToConfig.cpp

* Update ExtendedLogChannel.h

* Update OwnPatternFormatter.cpp
 2019-06-14 17:00:37 +03:00
Alexander Tretiakov
905856f02d merge 2019-06-05 17:02:13 +03:00
Orivej Desh
5ec179377a DEVTOOLS-5170 Delete Y_IGNORE markers (#5533) 
They have been superseded by a new include resolution configuration that lives
outside clickhouse source tree.
 2019-06-05 14:52:39 +03:00
Alexander Tretiakov
f3ef4666e7 fix 2019-06-04 23:15:44 +03:00
Alexander Tretiakov
2f1a03dac0 merge 2019-06-04 21:08:08 +03:00
Anton Yuzhaninov
091b591681 Fix build without Brotli (#5513) (#5521) 2019-06-03 23:27:53 +03:00
proller
8b101d0556 CLICKHOUSE-4493 Ask client password on tty (#5092) 
* CLICKHOUSE-4493 Ask client password on tty

* wip

* clang-format

* O_NOCTTY

* remove O_NOCTTY

* fix

* static

* readpassphrase

* freebsd fix

* fix

* Better

* fix style

* Update ConnectionParameters.cpp

* fixes

* fix

* fix
 2019-06-03 03:57:33 +03:00
Konstantin Podshumok
d17deb6003 timeouts in performance tests 2019-06-02 12:43:57 +03:00
Konstantin Podshumok
88a3c2998c set timeouts in benchmark 2019-06-02 12:43:20 +03:00
Konstantin Podshumok
d688203029 set timeouts in copier 2019-06-02 12:43:20 +03:00
Konstantin Podshumok
ab1913186e fix timeouts in Suggest.h 2019-06-02 12:43:20 +03:00
Konstantin Podshumok
5cf4a4fd80 client: update timeouts usage 2019-06-02 12:43:20 +03:00
palasonicq
7826effcd7 Minor changes 2019-05-31 00:33:06 +03:00
palasonicq
ea86a758a1 Added some improvements after code review 2019-05-30 23:12:44 +03:00
Nikita Lapkov
8f36af7760 Merge remote-tracking branch 'upstream/master' into query-poor-mans-profiler 2019-05-30 10:33:33 +00:00
Alexey Milovidov
05737678e2 Remove debug logging from MySQL protocol 2019-05-30 11:25:16 +03:00
alexey-milovidov
cd99406b63
Merge pull request #5455 from yandex/fixing-external-data-settings 
Fix settings in ExternalData HTTP request
 2019-05-29 03:23:56 +03:00
alexey-milovidov
8b050b0061
Update HTTPHandler.cpp 2019-05-29 03:23:47 +03:00
Danila Kutenin
98d28706f4 Fix settings in ExternalData HTTP request 2019-05-29 00:31:19 +03:00
palasonicq
ed0d09e250 Remove redundant semicolon 2019-05-28 23:16:24 +03:00
palasonicq
0823e397ea Added missed modifications 2019-05-28 21:30:10 +03:00
Vitaly Baranov
908f7a80d6 Add precondition to run performance test with simdjson only on CPU 
with AVX2 instructions.
 2019-05-28 17:47:35 +03:00
Vitaly Baranov
a35d1e0b3d Allow using MariaDB as a client without exception. 2019-05-28 03:15:05 +03:00
Vitaly Baranov
c07bd87716 Print "ClickHouse" when writing server's info at the start of the client session. 2019-05-28 03:09:19 +03:00
Vitaly Baranov
7af34954f9 Clearer message if the client doesn't have plugin sha256_password. 2019-05-28 03:08:12 +03:00
proller
324317ff6f clickhouse-client: allow to run with unaccessable history file (read only, no disk space, file is directory, ...) 2019-05-27 21:56:50 +03:00
alexey-milovidov
ead911efc2
Merge pull request #5419 from yurriy/mysql 
Improvements of MySQL Wire Protocol
 2019-05-27 04:59:23 +03:00
Yuriy
96c2bb383f using logging level from config.xml 2019-05-26 22:30:23 +03:00
Sergi Vladykin
2be4721771 Merge branch 'master' of https://github.com/yandex/ClickHouse into bitmap1 2019-05-26 12:27:54 +03:00
Yuriy
96e3574a06 Improvements of MySQL Wire Protocol 2019-05-26 09:52:29 +03:00
Alexander Tretiakov
461fb1eaa8 fix test 2019-05-26 01:51:21 +03:00
Alexander Tretiakov
212731b3e2 merge 2019-05-26 01:45:15 +03:00
alexey-milovidov
461c4919d3
Merge pull request #5116 from PerformanceVision/send_header 
Send a X-ClickHouse summary on the header for HTTP client with number of rows inserted
 2019-05-25 20:20:35 +03:00
Nikita Lapkov
06d370dee2 Merge remote-tracking branch 'upstream/master' into query-poor-mans-profiler 2019-05-25 16:23:08 +00:00
Alexey Milovidov
b94f2be154 Merge branch 'mysql' of https://github.com/yurriy/ClickHouse into yurriy-mysql 2019-05-25 17:14:57 +03:00
Alexander Tretiakov
946fa5b47e fix style and add tests 2019-05-25 16:43:52 +03:00
alexey-milovidov
4825ec4928
Merge pull request #5216 from proller/fix15 
CLICKHOUSE-4509 Fix error codes in DataPartsExchange
 2019-05-25 16:13:26 +03:00
Nikita Lapkov
30c31bc85a Merge remote-tracking branch 'upstream/master' into query-poor-mans-profiler 2019-05-24 13:28:42 +00:00
alesapin
37313d64ee
Merge pull request #5367 from yandex/apply-substitutions-for-create-prepare-drop-query 
[WIP] Add ability to make substitutions in create, fill and drop query in performance tests.
 2019-05-24 11:59:01 +03:00
proller
3bb18d1dc2 Merge remote-tracking branch 'upstream/master' into fix15 2019-05-23 21:38:38 +03:00
Alexander Tretiakov
9099f1810b merge 2019-05-22 17:41:35 +03:00
stavrolia
dcd5a80843 Remove not used methods 2019-05-22 17:00:32 +03:00
stavrolia
c398db29d4 Fix style 2019-05-22 14:36:31 +03:00
proller
d6a90b6079
Build fixes (#5368) 2019-05-22 13:16:16 +03:00
Nikita Lapkov
382beefdb8 Merge remote-tracking branch 'upstream/master' into query-poor-mans-profiler 2019-05-21 22:52:57 +00:00
stavrolia
281a01f5f7 Add ability to make substitutions in create, fill and drop query. 2019-05-21 15:57:19 +03:00
proller
50b74deeb4 CLICKHOUSE-4509 Fix error codes in DataPartsExchange 2019-05-20 20:04:36 +03:00
Guillaume Tassery
6fada68fe5 forget client.cpp 2019-05-20 20:24:53 +07:00
Guillaume Tassery
77b7158cd8 Progress rename for total_rows and write_[rows|bytes] 2019-05-20 18:37:41 +07:00
Alexander Tretiakov
f6812bbb1a fix style 2019-05-19 02:57:26 +03:00
Alexander Tretiakov
c661f5c0a1 new 2019-05-19 00:07:23 +03:00
alexey-milovidov
dc5232d40d
Update Server.cpp 2019-05-18 13:17:26 +03:00
Yuriy
4a14eac00b fixed memory leak and changed logging levels 2019-05-17 16:00:09 +03:00
Yuriy
0cd3094240 fixed stack buffer overflow 2019-05-16 20:15:43 +03:00
Yuriy
a51c293ec6 merged 'origin/master' into mysql 2019-05-16 14:19:05 +03:00
stavrolia
ff4d989918 Fixed help instruction of usage 2019-05-16 13:52:41 +03:00
Yuriy
4ee84810b0 including information about query execution in response 2019-05-16 08:36:08 +03:00
Yuriy
459ec05828 fixed style 2019-05-16 06:45:17 +03:00
Yuriy
ff4937859e added MySQL wire protocol presentational format 2019-05-16 06:34:04 +03:00
proller
0da7463a6b
CLICKHOUSE-4519 Support dictionaries in clickhouse-copier (#5270) 2019-05-15 12:16:09 +03:00
proller
8814e0cda5
server: informative listen error messages (#5268) 2019-05-14 22:55:10 +03:00
Nikolai Kochetov
808d0f3b08 Merged with master. 2019-05-14 13:31:19 +03:00
proller
cc3de4115f
Build fixes (#5261) 2019-05-14 12:58:33 +03:00
Nikolai Kochetov
4453327344 Delete pipeline when query is finished. 2019-05-13 20:02:54 +03:00
alesapin
5aec6dd011 Fix banch of flapping perf tests. Improve average speed calculation 2019-05-13 17:09:11 +03:00
Nikolai Kochetov
73948ab747 Fix data race in PipelineExecutor. 2019-05-13 14:23:55 +03:00
Nikita Lapkov
6dbe205b55 Merge remote-tracking branch 'upstream/master' into query-poor-mans-profiler 2019-05-12 16:16:30 +00:00
svladykin
22389d4eca Support for bitmapHasAny and bitmapHasAll functions. 2019-05-12 17:47:31 +03:00
Alexey Milovidov
3a01720f5c Obfuscator: derive seed for individual columns by their name, not position 2019-05-03 01:09:38 +03:00
Alexey Milovidov
1be21e3cb6 Removed bad and useless code in ColumnsDescription 2019-05-02 00:43:05 +03:00
Nikolai Kochetov
e7d36c8b66 Fix rase in TCPHandler. 2019-04-30 19:12:58 +03:00
Nikolai Kochetov
1c0cf652ef Attach to current thread in threadpool. 2019-04-29 18:01:53 +03:00
Nikolai Kochetov
aacc0572e5 Attach to current thread in threadpool. 2019-04-29 16:57:29 +03:00
Yuriy
8a3e75d92f fixed style 2019-04-29 09:37:39 +03:00
Yuriy
d21cf9d85f ssl support 2019-04-29 09:05:30 +03:00
Vitaly Baranov
738a49f534 Use iterators instead of macros APPLY_FOR_SETTINGS and others. 2019-04-27 01:09:16 +03:00
Vitaly Baranov
8277e9d8f1 Refactoring of Settings based on new template class SettingsCollection. 
Add new class SettingsConstraints.
 2019-04-26 19:11:05 +03:00
proller
97c532c0f0
Build fixes (#5114) 
Need to push builder docker image
 2019-04-26 02:21:59 +03:00
proller
c6d0e095e0
Prepare cmake for new contrib/poco (#5062) 2019-04-25 00:33:04 +03:00
Alexey Milovidov
352d1a8dcf Fixed inconsistent indentation 2019-04-24 22:38:11 +03:00
Alexey Milovidov
33252941f9 Added a comment 2019-04-24 21:40:45 +03:00
Alexey Milovidov
2428ba70f5 Added option "always_load_suggestion_data" to clickhouse-client #5066 2019-04-24 19:47:04 +03:00
Alexey Milovidov
3741449017 Added option "always_load_suggestion_data" to clickhouse-client #5066 2019-04-24 19:45:21 +03:00
proller
ba4687e110
Cmake: dont use LINK_MODE (but use BUILD_SHARED_LIBS) (#5091) 2019-04-24 12:06:28 +03:00
Yuriy
a4bf3621e3 merged with master 2019-04-23 21:58:29 +03:00
proller
fe71142827 Fix segfault in performance-test when no options specified 2019-04-23 17:02:26 +03:00
proller
29c3433322
Freebsd build fixes (#5083) 2019-04-23 15:51:27 +03:00
Alexey Milovidov
58d7d1e451 Resolved some of PVS-Studio warnings 2019-04-22 19:07:09 +03:00
Yuriy
e4766a4ef9 caching_sha2_password authentication plugin 2019-04-22 13:57:50 +03:00
Nikolai Kochetov
a07b592a95 Undo add thread_group to ThreadPool 2019-04-18 21:40:55 +03:00
alesapin
214bf77b17
Merge pull request #5012 from nvartolomei/nv/lb-first-or-random 
Add FIRST_OR_RANDOM Load Balancing policy
 2019-04-18 18:54:04 +03:00
Nikolai Kochetov
8718b7bb40 Added thread_group argument to ThreadPool. 2019-04-18 17:55:43 +03:00
proller
525726a5e2
Remove pocoext (#5036) 2019-04-17 20:36:58 +03:00
Nicolae Vartolomei
c2ec23c953
Add FIRST_OR_RANDOM Load Balancing policy 
For cross-replication topology setups load_balancing=in_order works best
as nodes handle equal amount of load and usually they hit only 1/n of
data (n = number of replicas), which makes page cache usage more
efficient.

The problem is when one node of the shard goes down. If one replica goes
down, the next one in config will handle twice the usual load while
remaining ones will handle usual traffic.

Closes #4820.
 2019-04-15 23:31:40 +01:00
filimonov
909521447f
add clickhouse-benchmark accepted stages names 2019-04-15 12:22:05 +02:00
Mikhail Fandyushin
68106d92ea bringing query id header to consistency 2019-04-10 23:13:41 +03:00
Mikhail Fandyushin
7fc9b8c6fb Merge branch 'master' into brotli 2019-04-08 21:07:58 +03:00
Nikolai Kochetov
54b15385bd Calculate rows_before_limit_at_least. 2019-04-08 17:55:20 +03:00
Yuriy
2789a83c03 fixed compilation with clang 2019-04-08 10:03:04 +03:00
Nikita Lapkov
fbdf2c3525 Merge remote-tracking branch 'upstream/master' into query-poor-mans-profiler 2019-04-06 06:58:40 +00:00
proller
eaffca28dd Copier: auto upload task configuration from --task-file option (#4876) 
* Copier: auto upload task configuration from --task-file option

* task-upload-force

* doc

* Update ClusterCopier.cpp

* Requested changes
 2019-04-05 19:10:52 +03:00
Nikolai Kochetov
7626b1b267 Multiple fixes. 2019-04-05 13:52:07 +03:00
proller
bebb4cd140 Merge remote-tracking branch 'upstream/master' into fix15 2019-04-04 14:50:14 +03:00
proller
236f2a4354
clickhouse-copier - fix another segfault (#4900) 2019-04-04 12:22:54 +03:00
proller
5b1bde2e80 CLICKHOUSE-4387 Add (official build) to version of yandex builds 2019-04-03 17:06:59 +03:00
Nikolai Kochetov
5e39ec610c Merged with master 2019-04-03 14:21:38 +03:00
Nikolai Kochetov
94ff7f694a QueryPipeline [in progress]. 2019-04-03 13:14:36 +03:00
Yuriy
3ea33600a0 fixed style check 2019-04-03 01:56:49 +03:00
Yuriy
0f3ec94ebd added mysql protocol test 2019-04-03 01:45:06 +03:00
alesapin
1d031e9695 Fix readme 2019-04-01 19:36:46 +03:00
alesapin
5585eebe01 Fix level parsing 2019-04-01 19:34:27 +03:00
alesapin
966bee4d93 Parse compression codecs from AST 2019-04-01 19:28:20 +03:00
proller
edaec2353c
CLICKHOUSE-4421 Fix segfault in copier (#4835) 
* Fix segfault in copier

* add test

* better runner
 2019-04-01 17:58:04 +03:00
Yuriy
e91fd22b82 fixed style check 2019-04-01 12:59:49 +03:00
Yuriy
107f33e888 added password check and changed packets serialization 2019-04-01 12:27:39 +03:00
Vitaly Baranov
37b904b8f5
Merge pull request #4808 from vitlibar/kafka-with-protobuf-format 
Kafka with protobuf format
 2019-03-30 19:00:57 +03:00
Ivan
957d23267b
Minimal implementation of row-level security CLICKHOUSE-4315 (#4792) 
For detailed description see the related PR
 2019-03-29 23:31:06 +03:00
Vitaly Baranov
08f85804d0 Send query settings before data from client to server. 
Apply query settings only for the containing query (client).
 2019-03-29 17:39:00 +03:00
Alexey Milovidov
f4b819c692 Added TRUNCATE to the list of suggested keywords in clickhouse-client 2019-03-28 20:52:50 +03:00
proller
7bcf8ec344 Fix install in shared mode 2019-03-27 20:37:38 +03:00
Alexey Milovidov
9bc4632f20 Avoid progress bar flicker 2019-03-26 17:36:56 +03:00
Nikita Lapkov
4a4ff8d5bf Merge remote-tracking branch 'upstream/master' into query-poor-mans-profiler 2019-03-23 18:45:22 +00:00
alexey-milovidov
b1279c1323
Merge pull request #4743 from azat-archive/clickhouse-client-tty 
clickhouse-client: fix --help without tty
 2019-03-23 05:54:05 +03:00
Azat Khuzhin
6d8706e692
clickhouse-client: fix --help without tty 
stdin_is_not_tty is detected too late when the --help message is
printed, so fix this and do not call ioctl if stdin is not tty.

Before this patch:
  $ clickhouse-client --help < /dev/null

debug build:
  $ dbms/programs/clickhouse-client --help < /dev/null
  Main options:
    --help
  clickhouse-client: ../contrib/boost/libs/program_options/src/options_description.cpp:542:
  void boost::program_options::{anonymous}::format_description(std::ostream&, const string&, unsigned int, unsigned int): Assertion `line_length > first_column_width' failed.
  Aborted (core dumped)

release build:
  $ dbms/programs/clickhouse-client --help < /dev/null
  .... print lots of empty lines and so forth ...

v2: add a test and bsdutils into image for tests
v3: adjust minimal cols to the length of one of the longest arguments,
since with line_length=3 boost will bail anyway (under script(1)
ioctl(TIOCGWINSZ) returnes ws_col=0)
 2019-03-23 02:01:32 +03:00
proller
e9af289b4d
Fix link in split mode (#4773) 2019-03-22 22:09:13 +03:00
proller
fce9db12b9 Move Interpreters/Settings* -> Core/Settings* 2019-03-22 15:08:30 +03:00
Mikhail Fandyushin
e986d0eae6 HTTP Accept-Encoding: br; Final fixes 2019-03-21 00:04:35 +03:00
Mikhail Fandyushin
73a9644da2 HTTP Accept-Encoding: br; Expended ZlibCompressionMethod to generic CompressionMethod; Added brotli to CompressionMethod enum 2019-03-21 00:04:35 +03:00
proller
f697df2079
Tests: fix call .sh from .sh (#4732) 2019-03-20 23:04:49 +03:00
Alexey Milovidov
2f7ce49a9c Merge branch 'master' of github.com:yandex/ClickHouse 2019-03-20 00:35:26 +03:00
Alexey Milovidov
6732e4366c Commented out readonly user 2019-03-20 00:34:44 +03:00
proller
78e0b1af5e
Fix compression level detection when network_compression_method in lowercase (#4706) 2019-03-18 17:59:07 +03:00
Yuriy
bfd53e3ccc draft 2019-03-17 10:11:22 +03:00
Alexey Zatelepin
304c67da99 Merge branch 'master' into fix-add-materialized-column-after 
Conflicts:
	dbms/src/Interpreters/InterpreterCreateQuery.cpp
	dbms/src/Interpreters/InterpreterDescribeQuery.cpp
	dbms/src/Interpreters/interpretSubquery.cpp
	dbms/src/Storages/ColumnsDescription.cpp
 2019-03-17 00:46:53 +03:00
Ivan
8ac3e89628
Merge pull request #4649 from abyss7/iast-as 
Implement and use method IAST::as<Derived>()
 2019-03-15 23:22:46 +03:00
Alexey Zatelepin
a2debdb724 fix use-after-free [#CLICKHOUSE-3101] 2019-03-15 21:52:45 +03:00
Ivan Lezhankin
61954d855d More reverts 2019-03-15 20:09:14 +03:00
Alexey Zatelepin
b5a0a3fa23 store all kinds of columns in the same list in ColumnsDescription [#CLICKHOUSE-3101] 2019-03-15 19:37:52 +03:00
Ivan Lezhankin
4f6a494af8 Revert references where they were before refactoring. 2019-03-15 19:14:13 +03:00
Ivan Lezhankin
61c24e0844 Overload template method |as<>()| with reference type. 
Move promotion logic to a separate class
 2019-03-15 16:12:11 +03:00
proller
d243c665d1 libclickhouse.so : dont use debug postfix 2019-03-15 14:38:17 +03:00
Ivan Lezhankin
f64118030a Merge remote-tracking branch 'upstream/master' into iast-as 2019-03-13 17:23:02 +03:00