thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-19 22:22:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
19,816 Commits 9,144 Branches 1,778 Tags 2 GiB
cc005c3ac9
Commit Graph

14292 Commits

Author SHA1 Message Date
Vadim
517619d8c1
Update 00732_quorum_insert_zookeeper.sql 2018-10-10 20:49:42 +03:00
Nikolai Kochetov
8cc307ca47 Added test #2866 2018-10-10 20:41:26 +03:00
Vadim
6b2bfd2f4f
Update 00732_quorum_insert_zookeeper.sql 2018-10-10 20:35:34 +03:00
CurtizJ
16bea3d008 remove logs 2018-10-10 20:09:09 +03:00
CurtizJ
815380b8b2 fix unnecessarily preparations for join at initial server 2018-10-10 20:07:21 +03:00
Nikolai Kochetov
935030a94a Fixed precision issue. Repaced foat with auto. 2018-10-10 19:35:09 +03:00
Vadim
25b100c1f0
Update StorageReplicatedMergeTree.cpp 2018-10-10 19:23:50 +03:00
chertus
1b7354f809 disable AST logging 2018-10-10 19:23:27 +03:00
Vadim
93992879bc
Update 00732_quorum_insert_zookeeper.sql 2018-10-10 19:22:06 +03:00
Vadim
8c5be3aa67
Update 00732_quorum_insert_zookeeper.reference 2018-10-10 19:21:46 +03:00
VadimPE
4db6eab5a3 ISSUES-2581 fix name 2018-10-10 19:20:15 +03:00
VadimPE
cc2686cdf1 ISSUES-2581 add tests 2018-10-10 19:13:14 +03:00
alexey-milovidov
34bd8568b6
Merge pull request #3339 from liuyimin-bytedance/master 
Issue 3269 Fix incorrect OR evaluation when multiples ORs are optimized to IN
 2018-10-10 16:42:24 +03:00
alexey-milovidov
fe79529627
Update LogicalExpressionsOptimizer.cpp 2018-10-10 16:41:44 +03:00
liuyimin
019677c55b Add fake range for tuple ASTFunction generated by Optimizer so that prepared set indexation works correctly 2018-10-10 21:31:18 +08:00
alexey-milovidov
4e6fd3e3fe
Merge pull request #3337 from VadimPE/CLICKHOUSE-3021 
[CLICKHOUSE-3021] fix bug with unsupported value in CREATE TABLE
 2018-10-10 16:23:17 +03:00
alexey-milovidov
2aa255f8b0
Update InterpreterCreateQuery.cpp 2018-10-10 16:23:06 +03:00
VadimPE
d4a56af660 ISSUES-2581 fix bug with new partition 2018-10-10 16:22:55 +03:00
Vadim
56bfc25d9a
Update InterpreterCreateQuery.cpp 2018-10-10 16:15:17 +03:00
Vadim
834267054e
Update InterpreterCreateQuery.cpp 2018-10-10 16:14:29 +03:00
VadimPE
779a178347 CLICKHOUSE-3021 fix bug with unsupported value in CREATE TABLE 2018-10-10 15:50:29 +03:00
alesapin
8591038748 Fix style and clang build 2018-10-10 11:38:54 +03:00
Alexey Milovidov
0b3a8cb489 Merge branch 'joins' of https://github.com/4ertus2/ClickHouse into 4ertus2-joins 2018-10-10 04:06:06 +03:00
alexey-milovidov
1472e3ae66
Merge pull request #3210 from alex-krash/jdbc-bridge 
External database access unification (jdbc/odbc bridges)
 2018-10-10 02:26:56 +03:00
alexey-milovidov
54e933f9dc
Update DictionarySourceFactory.cpp 2018-10-10 02:21:19 +03:00
alexey-milovidov
fe2c4e4102
Update getIdentifierQuote.cpp 2018-10-10 02:19:38 +03:00
alexey-milovidov
e91f8f0dd9
Merge pull request #3273 from vavrusa/master 
PushingToViewsBlockOutputStream: add tests for parallel processing
 2018-10-10 02:16:59 +03:00
alexey-milovidov
1dba31a313
Merge pull request #3332 from yandex/fix-performance-regression-while-parsing-jsoneachrow 
Fix performance regression in parsing JSONEachRow format.
 2018-10-10 02:09:22 +03:00
alexey-milovidov
a867009747
Merge pull request #3324 from 4ertus2/decimal 
Decimal dictionaries support [CLICKHOUSE-4045]
 2018-10-10 00:49:37 +03:00
robot-clickhouse
a21e50ac23 Auto version update to [18.14.5] [54409] 2018-10-10 00:44:21 +03:00
alexey-milovidov
ab198e77d1
Merge pull request #3329 from 4ertus2/master 
get64 for Decimal32/64; remove allow_experimental_decimal_type [issue-3282]
 2018-10-10 00:40:29 +03:00
Alexey Milovidov
7b24ad570c Inline some functions #3223 2018-10-10 00:38:06 +03:00
Alexey Milovidov
681929cbda Attempt to fix performance regression while parsing JSONEachRow #3223 2018-10-10 00:32:15 +03:00
Alexey Milovidov
c014168c5f Attempt to fix performance regression while parsing JSONEachRow #3223 2018-10-10 00:21:52 +03:00
Alexey Milovidov
a432ff335e Attempt to fix performance regression while parsing JSONEachRow #3223 2018-10-10 00:09:48 +03:00
alexey-milovidov
b7766333ab
Merge pull request #3330 from CurtizJ/CLICKHOUSE-4005 
Interpret empty null_value in external dictionaries as type default value [ClLICKHOUSE-4005]
 2018-10-09 23:44:18 +03:00
alexey-milovidov
33b4a502d6
Update test.py 2018-10-09 23:43:52 +03:00
Alexey Milovidov
798c3d2e4d Merge remote-tracking branch 'origin/master' into fix-performance-regression-while-parsing-jsoneachrow 2018-10-09 23:42:21 +03:00
alexey-milovidov
caaa7ff98e
Merge pull request #3331 from yandex/fix-point-in-poligon 
Fix point in poligon
 2018-10-09 23:41:35 +03:00
alexey-milovidov
bc921c564a
Update 00500_point_in_polygon_bug_2.sql 2018-10-09 23:40:05 +03:00
alexey-milovidov
e25e19a071
Update 00500_point_in_polygon_bug_2.sql 2018-10-09 23:39:32 +03:00
robot-clickhouse
e10f7360d4 Auto version update to [18.14.4] [54409] 2018-10-09 22:49:13 +03:00
Alexey Milovidov
4a31c1c18a Attempt to fix performance regression while parsing JSONEachRow #3223 2018-10-09 22:46:35 +03:00
Nikolai Kochetov
c506f04842 Added test. #3309 2018-10-09 22:40:21 +03:00
Nikolai Kochetov
1f348a09ca Fix calcLinestringRotation angle. #3309 2018-10-09 22:38:37 +03:00
CurtizJ
de1e9caefb add test 2018-10-09 22:00:09 +03:00
Alexey Milovidov
6ca67ce277 Updated test result #3257 2018-10-09 22:00:00 +03:00
Alexey Milovidov
94d8a78abf Fixed test (now letter ё is really decomposed) #3257 2018-10-09 21:55:39 +03:00
Alexey Milovidov
89f3fd07f5 Fixed issue in test #3257 2018-10-09 21:53:35 +03:00
Alexey Milovidov
ccbe39b4d3 Merge branch 'master' of github.com:yandex/ClickHouse 2018-10-09 21:43:33 +03:00
Alexey Milovidov
eda0784feb clickhouse-test: removed obsolete comment #3223 2018-10-09 21:43:23 +03:00
robot-clickhouse
bc162437fb Auto version update to [18.14.3] [54409] 2018-10-09 21:29:01 +03:00
Alexey Milovidov
458b0f256a Added test by Champtar #3223 2018-10-09 21:20:46 +03:00
Alexey Milovidov
9a50300e42 Minor modifications #3223 2018-10-09 21:14:30 +03:00
Alexey Milovidov
e4b4b5a4fc Better diagnostic for JSONEachRow format #3223 2018-10-09 21:06:52 +03:00
alexey-milovidov
052fc2b674
Merge pull request #3223 from veloman-yunkan/jsoneachrow_bugfix 
Fix for issue #3297
 2018-10-09 21:05:51 +03:00
CurtizJ
5f2f1f589f interpret empty null_value as default value 2018-10-09 20:43:25 +03:00
alesapin
32c6d0c699
Merge pull request #3182 from VadimPE/CLICKHOUSE-3947 
CLICKHOUSE-3947 add LIKE and IN () for ODBC and MySQL
 2018-10-09 20:12:32 +03:00
chertus
ee40c0cec9 undo changes from another pull request 2018-10-09 20:02:30 +03:00
chertus
c7bf0e77ea add get64() for Decimal32 and Decimal64; remove allow_experimental_decimal_type setting [issue-3282] 2018-10-09 19:50:42 +03:00
Alexandr Krasheninnikov
27f288641e Fix config reference, header inclusion and failed tests 2018-10-09 18:03:41 +03:00
chertus
b360fc895a comment for TranslateQualifiedNamesVisitor [CLICKHOUSE-4001] 2018-10-09 17:41:19 +03:00
chertus
ec8d3b388d move DumpASTNode to own file, style fixes [CLICKHOUSE-4001] 2018-10-09 17:32:11 +03:00
Alexey Milovidov
227ff8c606 Fixed comment [#CLICKHOUSE-2] 2018-10-09 17:30:05 +03:00
VadimPE
bcf8d5517e CLICKHOUSE-3947 fix const 2018-10-09 17:21:19 +03:00
VadimPE
da712d0036 CLICKHOUSE-3947 fix copy-paste and const 2018-10-09 17:13:08 +03:00
chertus
20b733aaf0 Merge branch 'master' into joins 2018-10-09 13:47:01 +03:00
alesapin
9946154908 CLICKHOUSE-3943: Rename FLUSH SYSTEM TABLES query to FLUSH LOGS, better tests 2018-10-09 13:05:27 +03:00
chertus
f21c4c898e Decimal dictionaries support [CLICKHOUSE-4045] 2018-10-08 22:45:17 +03:00
alesapin
9576c0e86d Add flush system tables 2018-10-08 21:09:14 +03:00
alesapin
ee78e27fa8 Move test to sh 2018-10-08 19:58:44 +03:00
alesapin
8333f63e12 Add log_queries setting 2018-10-08 19:35:59 +03:00
alesapin
c7065b6bd8 CLICKHOUSE-3943: Add test for FileOpen metric 2018-10-08 18:55:55 +03:00
VadimPE
79b6b8476a CLICKHOUSE-3947 add tests 2018-10-08 18:05:23 +03:00
Alexey Milovidov
64c7e357e8 Fixed error #3230 2018-10-08 08:30:03 +03:00
Alexey Milovidov
80faec76e8 Merge remote-tracking branch 'origin/master' into fix-memory-tracker 2018-10-08 00:09:18 +03:00
Alexey Milovidov
84b3ba3464 Improved test #3230 2018-10-07 23:47:03 +03:00
alexey-milovidov
469243b33b
Merge pull request #3306 from yandex/length-aliases 
Added compatibility aliases for "length" and "lengthUTF8"
 2018-10-07 23:26:57 +03:00
alexey-milovidov
36c3feea80
Merge pull request #3270 from yandex/left-join-right-keys-fix 
Left join right keys fix
 2018-10-07 23:26:40 +03:00
Alexey Milovidov
964a6e5771 Make function "concat" case insensitive for compatibility [#CLICKHOUSE-20] 2018-10-05 22:58:01 +03:00
Alexey Milovidov
9e1c51aca4 Added compatibility aliases for "length" and "lengthUTF8" [#CLICKHOUSE-20] 2018-10-05 22:52:42 +03:00
Alexey Milovidov
45af805ccb Translated comments in test #3230 2018-10-05 22:45:01 +03:00
Alexey Milovidov
a66beb5ec1 Fixed error #3230 2018-10-05 22:29:49 +03:00
Alexey Milovidov
aed501e687 Translated comments in test #3230 2018-10-05 21:51:42 +03:00
Alexey Milovidov
5503822983 Merge branch 'master' into fix-memory-tracker 2018-10-05 18:15:50 +03:00
CurtizJ
5a01eb3d5e add test 2018-10-05 17:35:35 +03:00
Nikolai Kochetov
064facd8de Updated test. 2018-10-05 10:43:58 +03:00
Marek Vavruša
5d5c99ebee Formats/CapnProtoRowInputStream: fix column mismatch in list of structures 
The fields are lexicographically sorted to make traversal easier,
but their order must be preserved when collecting fields from structures.

For example, a list with a structure like `{b @0 :Text, a @1 :Text}` would
read `a` first despite being second, which would cause a mismatch.
 2018-10-04 15:59:27 -07:00
alexey-milovidov
47dd173007
Merge pull request #3281 from 4ertus2/summap 
sumMap for number-based types
 2018-10-05 00:12:57 +03:00
alexey-milovidov
ba62a24926
Merge pull request #3283 from yandex/FileOpenFixes_CLICKHOUSE-3943_ 
File open fixes clickhouse 3943
 2018-10-05 00:00:47 +03:00
alexey-milovidov
b9d1eb4154
Merge pull request #3298 from yandex/fix-prewhere-with-altered-columns 
Fix prewhere with altered columns
 2018-10-04 23:57:11 +03:00
alexey-milovidov
cf6f5b314c
Update 00726_materialized_view_concurrent.sql 2018-10-04 22:40:10 +03:00
Nikolai Kochetov
2f2c939446 Added tests. 2018-10-04 21:19:25 +03:00
Nikolai Kochetov
b1fa3fab9d Fix prewhere whith final. #2827 2018-10-04 21:18:54 +03:00
CurtizJ
8c2060b48a wip on finish sorting 2018-10-04 17:55:02 +03:00
Alexandr Krasheninnikov
d94b574644 Removing destructor 2018-10-04 16:19:08 +03:00
CurtizJ
dd9516a810 wip on finish sorting 2018-10-04 13:24:51 +03:00
alesapin
5a218a7363 CLICKHOUSE-3943: Change naming 2018-10-04 11:52:56 +03:00
Nikolai Kochetov
a6d0094835 Fix readnig missing column with prewhere. #2827 2018-10-04 10:51:06 +03:00
alesapin
252f9d0080 CLICKHOUSE-3943: Style 2018-10-03 20:12:38 +03:00
alesapin
441069fc5c [WIP] CLICKHOUSE-3943: Store last_readed_mark in MergeTreeThreadBlockInputStream and don't recreate reader if it stopped in appropriate position 2018-10-03 20:10:23 +03:00
chertus
9c4c72cde5 fix test 2018-10-03 17:33:47 +03:00
chertus
5b987f02d7 sumMap for number-based types [issue-3277] 2018-10-03 17:22:28 +03:00
Alexandr Krasheninnikov
82200bc16a Added error codes, bridge startup, fixed destructor in XDBC stuff 2018-10-03 15:10:57 +03:00
VadimPE
40350c47e1 CLICKHOUSE-3947 del unused result_string 2018-10-03 15:10:35 +03:00
VadimPE
8df97e32af CLICKHOUSE-3947 fix bug with query.clone() 2018-10-03 15:03:39 +03:00
Alexandr Krasheninnikov
c7fee9374c fix formatting errors according code review 2018-10-03 13:44:43 +03:00
VadimPE
4152c34fbb CLICKHOUSE-4021 fix build 2018-10-03 13:08:02 +03:00
Marek Vavruša
575fa7f25a PushingToViewsBlockOutputStream: add tests for parallel processing 
This adds tests for a971a0bc07
 2018-10-02 19:06:04 -07:00
Nikolai Kochetov
c4c14de02f Join aliases and duplicating columns fixes. 
Join aliases and duplicating columns fixes. [#CLICKHOUSE-3994] #3145
 2018-10-02 21:17:39 +03:00
Nikolai Kochetov
c470cf1e26 Fix joined keys from right column with left join. [#CLICKHOUSE-3994] 2018-10-02 21:16:47 +03:00
alesapin
7d79192ad7
Merge pull request #3267 from yandex/CLICKHOUSE-4025 
Fix join of unjoinable thread
 2018-10-02 18:39:53 +03:00
alesapin
c9880ad9c0 Fix join of unjoinable thread 2018-10-02 16:38:28 +03:00
robot-clickhouse
e1817e4814 Auto version update to [18.14.2] [54409] 2018-10-02 16:25:47 +03:00
alexey-milovidov
147a2a13c2
Merge pull request #3257 from amosbird/master 
Correct wcwidth computation for pretty outputs.
 2018-10-02 16:23:41 +03:00
Amos Bird
7df73088ab Correct wcwidth computation for pretty outputs. 2018-10-02 10:06:18 +08:00
Alexey Milovidov
78aaf537b1 Merge branch 'master' of github.com:yandex/ClickHouse 2018-10-02 00:50:18 +03:00
Alexey Milovidov
698be017e9 Changes after merge #3208 2018-10-02 00:49:56 +03:00
alexey-milovidov
94b0432faa
Merge pull request #3262 from proller/fix17 
Arcadia sync
 2018-10-01 22:00:01 +03:00
alexey-milovidov
7c6b08c21c
Merge pull request #3251 from CurtizJ/table-db-macros 
Support {database} and {table} macros in ReplicatedMergeTree [CLICKHOUSE-3897]
 2018-10-01 21:45:52 +03:00
alexey-milovidov
6432cff455
Update Macros.h 2018-10-01 21:45:39 +03:00
alesapin
6017be28f6 CLICKHOUSE-4007: Fix PerfTest substitution function 2018-10-01 19:30:12 +03:00
proller
ca03cd6606 Sync with arcadia 2018-10-01 18:43:48 +03:00
Vadim
0849e1e218
Update transformQueryForExternalDatabase.cpp 2018-10-01 17:06:36 +03:00
VadimPE
d0981b733d CLICKHOUSE-3947 add recursive search for constant expressions 2018-10-01 16:27:39 +03:00
CurtizJ
ed77e40dfe fix implicit macros 2018-10-01 12:01:50 +03:00
alexey-milovidov
a4736275c6
Merge pull request #3208 from vavrusa/master 
PushingToViewsBlockOutputStream: process blocks concurrently
 2018-10-01 04:42:55 +03:00
alexey-milovidov
c4939a1bec
Update PushingToViewsBlockOutputStream.cpp 2018-10-01 04:39:00 +03:00
alexey-milovidov
33578cb1b1
Merge pull request #3216 from vavrusa/capnproto-tuple-nested 
Formats/CapnProtoRowInputStream: support Nested and Tuple, fix alignm…
 2018-10-01 04:34:06 +03:00
alexey-milovidov
ff53aa4947
Update CapnProtoRowInputStream.cpp 2018-10-01 04:33:36 +03:00
alexey-milovidov
fac040c39a
Update CapnProtoRowInputStream.cpp 2018-10-01 04:31:48 +03:00
alexey-milovidov
fd04b2b89a
Merge pull request #3215 from vavrusa/fix-kafka-lockups 
Storages/Kafka: fixed deadlocks, moved to background pool
 2018-10-01 04:30:03 +03:00
alexey-milovidov
bb0f76dd25
Update StorageKafka.cpp 2018-10-01 04:29:17 +03:00
alexey-milovidov
b9e6b02719
Update StorageKafka.cpp 2018-10-01 04:26:52 +03:00
zhang2014
6778220ffd ISSUES-3232 remake interpreter_subquery when rewrite subqueries 2018-09-30 17:27:59 +08:00
Alexey Milovidov
e4ec8ffc49 Fixed test; tests that require server to listen something other than 127.0.0.1, must be tagged as "shard" in their names [#CLICKHOUSE-2] 2018-09-29 22:50:12 +03:00
Alexey Milovidov
85ca2006b0 Fixed bug in client (double whitespace) [#CLICKHOUSE-4038] 2018-09-29 22:33:23 +03:00
CurtizJ
d4de76346c fix test 2018-09-29 16:12:53 +03:00
Alexey Milovidov
613061cee5 Fixed incompatibility when versions prior to 18.12.17 are used on remote servers and newer is used on initiating server, and GROUP BY both fixed and non-fixed keys, and when two-level group by method is activated [#CLICKHOUSE-4035] 2018-09-28 23:17:38 +03:00
CurtizJ
b7b7314ecb remove redundant code 2018-09-28 22:13:16 +03:00
CurtizJ
e0d3aed0c4 remove redundant code 2018-09-28 22:10:16 +03:00
CurtizJ
99b4536b2a add test 2018-09-28 22:07:29 +03:00
chertus
69b9c25801 Merge branch 'master' into joins 2018-09-28 20:09:05 +03:00
chertus
4c8112138c Merge branch 'master' into joins 2018-09-28 20:02:25 +03:00
alexey-milovidov
a149233d99
Merge pull request #3246 from yandex/low-cardinality-fixes 
Low cardinality fixes
 2018-09-28 19:50:53 +03:00
alexey-milovidov
c409c186b3
Merge pull request #3249 from CurtizJ/fix-thread-group 
Add test for #3247
 2018-09-28 19:48:13 +03:00
CurtizJ
a4fac09073 update test 2018-09-28 19:43:41 +03:00
chertus
be3b845baf add test for remote quantiles 2018-09-28 19:33:12 +03:00
CurtizJ
c2bec8b2c8 update test 2018-09-28 19:11:56 +03:00
CurtizJ
d0b2e58d61 add test 2018-09-28 19:05:58 +03:00
alexey-milovidov
c6ab6fa1a8
Merge pull request #3247 from CurtizJ/fix-thread-group 
Fix distributed "CREATE TABLE AS SELECT" query.
 2018-09-28 18:54:49 +03:00
Anton Popov
49438ed1a1
Update DDLWorker.cpp 2018-09-28 18:35:30 +03:00
CurtizJ
ed3c744055 fixes 2018-09-28 18:30:03 +03:00
chertus
292a885533 fix typo in quantiles func registration 2018-09-28 18:08:37 +03:00
chertus
59df909f87 more ast debug info 2018-09-28 18:01:13 +03:00
proller
ec11bef633
Build fixes (#3181) 2018-09-28 17:53:20 +03:00
CurtizJ
009c973312 remove redundant comment 2018-09-28 16:47:34 +03:00
CurtizJ
f9fb73ce2e fix distributed "create table as select" query 2018-09-28 16:44:39 +03:00
chertus
593b3ae338 one more minor fix 2018-09-28 15:13:01 +03:00
robot-clickhouse
6f96dfc7da Auto version update to [18.14.1] [54409] 2018-09-28 14:58:24 +03:00
alexey-milovidov
b84a499a93
Merge pull request #3231 from zhang2014/fix/ISSUES-3225 
ISSUES-3225 fix alias conflict when predicate optimization
 2018-09-28 14:46:54 +03:00
chertus
b4ea89e1f3 minor fix 2018-09-28 14:46:52 +03:00
chertus
669ab71502 rename files according to class name 2018-09-28 13:52:08 +03:00
Nikolai Kochetov
97add69825 Rename WithDictionary to LowCardinality. 2018-09-28 13:44:59 +03:00
Alexey Milovidov
138e70197e Fixed comments and docs #3241 2018-09-28 06:42:08 +03:00
Alexey Milovidov
169dbfe200 Fixed discrepancy between default values of "log_queries" and "log_query_threads" settings [#CLICKHOUSE-4030] 2018-09-28 06:40:39 +03:00
Alexander Krasheninnikov
ceea4b9b33 New bridge interaction, quote identifier via api 2018-09-28 05:46:33 +03:00
chertus
57d2c9db60 AST debug stuff: DumpASTNode, TranslateQualifiedNamesVisitor, hide AST explain command [CLICKHOUSE-4001] 2018-09-27 22:25:18 +03:00
Alexandr Krasheninnikov
4b431264db Implement quote getter from ODBC 2018-09-27 18:23:42 +03:00
Nikolai Kochetov
5a211b1ab7 More comments. 2018-09-27 18:16:47 +03:00
Nikolai Kochetov
65c8a00e51 Fix low cardinality functions result cache if function can't be executed on default arguments. 2018-09-27 17:45:35 +03:00
CurtizJ
90240cb64b support database and table macros 2018-09-27 13:01:10 +03:00
chertus
041cef5968 explain ast [CLICKHOUSE-4001] 2018-09-27 12:47:21 +03:00
zhang2014
b35ab511cb ISSUES-3225 fix alias conflict when predicate optimization 2018-09-27 14:29:38 +08:00
Marek Vavruša
a971a0bc07 PushingToViewsBlockOutputStream: process blocks concurrently 
The current model is to process blocks for attached views in sequence.
This is not ideal when the processing time for each view varies, or is
blocking (for example with replicated tables), as processing of next-in-line
view is blocked by wait in it's predecessor.

This commit changes the behavior to process 2 or more attached views concurrently.
 2018-09-26 15:22:06 -07:00
alexey-milovidov
03d85227d1
Merge pull request #3229 from yandex/fix-datetime-conversion-when-inserting-in-values-format 
Fix conversion between Date and DateTime when inserting in VALUES format and "input_format_values_interpret_expressions" is true
 2018-09-27 00:20:04 +03:00
Alexey Milovidov
30da8de1b6 Send log message about peak memory usage to client #3230 2018-09-27 00:19:49 +03:00
Alexey Milovidov
99927a3518 Returned logging peak memory usage in query scope #3230 2018-09-27 00:10:43 +03:00
Alexey Milovidov
0928acdf8a Removed dead code #3230 2018-09-27 00:02:54 +03:00
Alexey Milovidov
b1b53a4019 Added test #3143 2018-09-26 23:49:44 +03:00
Alexey Milovidov
dd88c092b7 Attempt to fix inconsistent values in total memory tracker #3143 2018-09-26 23:45:40 +03:00
Alexey Milovidov
836c20b2d3 \Merge branch 'master' of github.com:yandex/ClickHouse 2018-09-26 22:48:59 +03:00
Alexey Milovidov
721837efe9 Adapted test #3205 2018-09-26 22:48:47 +03:00
alexey-milovidov
28bd1e8eff
Merge pull request #3224 from 4ertus2/decimal 
Supertypes for decimal and integers [issue-3218]
 2018-09-26 22:47:10 +03:00
Alexey Milovidov
e90484db77 Fix conversion between Date and DateTime when inserting in VALUES format and "input_format_values_interpret_expressions" is true #3226 2018-09-26 22:43:10 +03:00
chertus
4442437396 minor fix 2018-09-26 18:34:53 +03:00
alexey-milovidov
b6e53d22e1
Merge pull request #3200 from yandex/low-cardinality-function-result-cache 
Added cache for low cardinality function result.
 2018-09-26 18:12:48 +03:00
alexey-milovidov
2471332dfc
Update IFunction.h 2018-09-26 18:02:56 +03:00
chertus
a564b05ec7 supertypes for decimal and ints [issue-3218] 2018-09-26 17:59:23 +03:00
alexey-milovidov
6374094f0c
Merge pull request #3202 from zhang2014/fix/ISSUES-3145 
ISSUES-3145 support qualified asterisk
 2018-09-26 17:41:01 +03:00
chertus
3ff2cfb4af fix div by zero in decimal var/stddev 2018-09-26 15:38:36 +03:00
chertus
b48402e871 intDiv, intDivOrZero for decimal [issue-3221] 2018-09-26 15:12:45 +03:00
alexey-milovidov
60000481e4
Merge pull request #3219 from topvisor/add_biz_to_insignificant_second_level_domains 
Update firstSignificantSubdomain function
 2018-09-26 14:54:43 +03:00
Veloman Yunkan
3e96f32833 Fixed the bug introduced by PR#3144 
The pre-existing optimization in the function
JSONEachRowRowInputStream::readColumnName() (that was extracted
during the refactoring step of PR#3144) imposed a restriction
on its usage - reading from the input stream might invalidate the return
value of that function, and this is what happenned in readJSONObject()
after the call to skipColonDelimiter().

One way of fixing the problem while preserving the original optimization
intact would be to defer the call to skipColonDelimiter() until the
variable name_ref was fully consumed, however that would result in worse
code (skipColonDelimiter() would need to be called in three different
places where it doesn't really belong).

Therefore I preferred to slightly weaken the optimization by always
copying the key name into the current_column_name data member.
 2018-09-26 11:27:04 +00:00
chertus
69dd660919 fix crash on decimal division by zero [issue-3221] 2018-09-26 14:25:50 +03:00
decaseal
963988ddf2
Update firstSignificantSubdomain function 
Add "biz" domain to list of "insignificant" second-level domains
 2018-09-26 12:39:04 +03:00
Marek Vavruša
cbbcb6d9df Formats/CapnProtoRowInputStream: support Nested and Tuple, fix alignment issues 
This updated contrib/capnproto to a newer version that fixes problems with
unaligned access to message frames.

It also adds support for parsing Struct types as Tuple (named or unnamed),
and Nested array types.

The `struct X { a @0 :UInt64; b @1 :Text }` in Cap'nProto is equivalent to
`x Tuple(a UInt64, b String)` in ClickHouse.

Arrays of Struct types such as `y List(X)` are equivalent to `y Nested(a UInt64, b String)`.
 2018-09-25 22:51:35 -07:00
Marek Vavruša
ea32434888 Storages/Kafka: fixed deadlocks, moved to background pool 
This fixes two deadlocks in Kafka engine found previously:
* When exception is thrown before starting reading, consumer
  was never returned to the storage. Now it is claimed only
  when actually starting reading.
* Fixed lockup on deinitialization when consumer only unsubscribed,
  but didn't close, and the endine then timeouted when waiting for
  consumer destruction.

This also moves the stream thread to background worker pool.
The reason for that is that it will compete with other tasks for
time, so it will form a backpressure on insertion when the system
is busy.
 2018-09-25 22:51:07 -07:00
Alexey Milovidov
33e4865240 Adjusted test #3205 2018-09-26 05:33:29 +03:00
Alexey Milovidov
57822ad592 Improvement #3205 2018-09-26 04:30:07 +03:00
Alexey Milovidov
042536177d Merge branch 'master' into order-by-remerge 2018-09-26 04:24:35 +03:00
Alexey Milovidov
b11a84b895 Merge branch 'master' of github.com:yandex/ClickHouse into every_function_in_own_file_5 2018-09-26 03:36:20 +03:00
Alexey Milovidov
0e7caa05fa Every function in its own file, part 5 [#CLICKHOUSE-2] 2018-09-26 03:32:38 +03:00
Alexey Milovidov
27b7654abc Every function in its own file, part 5 [#CLICKHOUSE-2] 2018-09-26 03:31:40 +03:00
chertus
96ceca6c05 fix decimal to int, int to decimal convertion [issue-3177] 2018-09-25 19:03:50 +03:00
Alexandr Krasheninnikov
647d1041f1 Implement jdbc/idbc bridge connectors 2018-09-25 17:29:44 +03:00
Nikolai Kochetov
d526859011 Added cache for low cardinality function result. [#CLICKHOUSE-3904] 2018-09-25 16:48:52 +03:00
zhang2014
b887ec8e98 ISSUES-3145 support qualified asterisk 2018-09-25 10:42:51 +08:00
Alexander Krasheninnikov
fe8affa1cf Initial 2018-09-25 03:21:20 +03:00
alexey-milovidov
002331be1b
Merge pull request #3204 from CurtizJ/CLICKHOUSE-3527 
Better code in #3101.
 2018-09-25 00:28:11 +03:00
Alexey Milovidov
5cc8e802d5 Added test #3205 2018-09-25 00:02:40 +03:00
Alexey Milovidov
9fbde09725 Memory tracker: added watermark logging #3205 2018-09-24 23:57:10 +03:00
Alexey Milovidov
81e2fe14e5 Better messages #3205 2018-09-24 23:30:02 +03:00
Alexey Milovidov
8e7c6598e8 Added remerge step to process ORDER BY with LIMIT when memory usage is high #3179 2018-09-24 23:07:30 +03:00
Alexey Milovidov
17b8e20922 Failover for hosts with missing DNS records while connecting to ZooKeeper #3201 2018-09-24 22:09:12 +03:00
CurtizJ
d0ed96aa04 better code 2018-09-24 22:08:11 +03:00
Alexey Milovidov
73f68b5ee4 Miscellaneous [#CLICKHOUSE-2] 2018-09-24 21:44:09 +03:00
Alexey Milovidov
5f6328646a utils/check-style/check-style -n #3101 2018-09-24 21:02:25 +03:00
alexey-milovidov
b6c7d71a03
Merge pull request #3101 from CurtizJ/CLICKHOUSE-3527 
CLICKHOUSE-3527 Fix race while parallel ddl queries
 2018-09-24 20:59:57 +03:00
robot-clickhouse
ca465cd20b Auto version update to [18.14.0] [54409] 2018-09-24 20:52:21 +03:00
zhang2014
f3dcc2ef41 ISSUES-3145 support qualified asterisk 2018-09-24 23:28:18 +08:00
chertus
f09970ff70 add test for inner join [CLICKHOUSE-4001] 2018-09-24 16:55:26 +03:00
VadimPE
28102bc3b5 ISSUES-2581 get pointer to max_blocls 2018-09-24 12:53:28 +03:00
alexey-milovidov
4185351c8d
Merge pull request #3197 from yandex/fix_odbc_table_function 
Fix odbc table function
 2018-09-23 18:48:02 +03:00
alesapin
7c47644f7b Reuse base class function 2018-09-23 12:16:16 +03:00
Alexey Milovidov
bb654ff307 Fixed trash #3195 2018-09-22 21:12:14 +03:00
Alexey Milovidov
b972742f9a Fixed bad code; updated docs #3195 2018-09-22 21:07:27 +03:00
alexey-milovidov
76cb9ff873
Update Context.cpp 2018-09-22 18:22:54 +03:00
alesapin
2aee8a5814 Fix odbc table function 2018-09-22 17:58:03 +03:00
alexey-milovidov
65f7c390f0
Merge pull request #3159 from zhang2014/fix/ISSUES-3134 
ISSUES-3134 fix merge and distributed engine query stage
 2018-09-22 00:09:06 +03:00
alexey-milovidov
433e8cce26
Merge pull request #3194 from yandex/fix-replica-cyclic-fetch 
Fix cyclical failed fetches when merges don't produce identical result
 2018-09-21 23:05:40 +03:00
alexey-milovidov
babc145f5f
Merge pull request #3188 from yandex/fix_segfault_3151 
Add isState for array function combinator
 2018-09-21 22:30:15 +03:00
Alexey Zatelepin
9ee53caee0 add test [#CLICKHOUSE-2837] 2018-09-21 19:45:57 +03:00
Alexey Zatelepin
c2c12f22f7 try to immediately delete the part after checksums mismatch [#CLICKHOUSE-2837] 2018-09-21 19:07:21 +03:00
Vadim
8c413e3f1f
Update ReplicatedMergeTreeQuorumAddedParts.h 2018-09-21 18:20:31 +03:00
VadimPE
17aa0356e5 del include 2018-09-21 18:15:35 +03:00
VadimPE
33545a41b6 fix style. And del getMaxBlock...() 2018-09-21 18:07:43 +03:00
alesapin
2e1f4737f0 Add test 2018-09-21 17:49:27 +03:00
VadimPE
8b8697bc5d Merge remote-tracking branch 'origin/master' into ISSUES-2581 2018-09-21 17:11:57 +03:00
Alexey Zatelepin
230a9fff2d Write the columns list of the resulting part in the same order as all_columns [#CLICKHOUSE-13] 2018-09-21 15:40:34 +03:00
VadimPE
60653fc042 CLICKHOUSE-3947 fix style 2018-09-21 14:33:58 +03:00
proller
0047987333 CLICKHOUSE-3885: add partition_key alias (#3166) 
* Allow run integration tests from ctest: cmake .. -DENABLE_TEST_INTEGRATION=1 && ninja && ctest -V -R integration

* CLICKHOUSE-3885: add partition_key alias

* fix

* Update ClusterCopier.cpp

* Better test

* fixing..
 2018-09-21 13:46:58 +03:00
alexey-milovidov
b1eb66c03e
Merge branch 'master' into low-cardinality-fixes 2018-09-21 13:43:37 +03:00
alexey-milovidov
17d50ecef0
Merge pull request #3186 from CurtizJ/CLICKHOUSE-3979 
Fix bug in Cube #3172
 2018-09-21 13:38:46 +03:00
alexey-milovidov
4a54a1c310
Merge pull request #3138 from yandex/low-cardinality-group-by 
Low cardinality group by
 2018-09-21 13:38:20 +03:00
Nikolai Kochetov
3e742a6b55 Review fixes. 2018-09-21 12:49:43 +03:00
alesapin
4d29141957 Add isState for array function combinator 2018-09-21 12:37:09 +03:00
Nikolai Kochetov
94bb37f261 Fix low cardinality permutation. 2018-09-21 11:52:07 +03:00
CurtizJ
b355ac8e71 fix bug 2018-09-21 10:23:31 +03:00
zhang2014
e0e805b1f6 ISSUES-3134 fix merge and distributed engine query stage 2018-09-21 11:19:25 +08:00
zhang2014
8a8189c7e9 ISSUES-3134 fix merge and distributed engine query stage 2018-09-21 09:08:44 +08:00
zhang2014
80d83bb50f ISSUES-3134 fix merge and distributed engine query stage 2018-09-21 09:08:44 +08:00
zhang2014
882125dd6d ISSUES-3134 fix merge and distributed engine query stage 2018-09-21 09:08:44 +08:00
Alexey Milovidov
8bfdcc6464 Fix style [#CLICKHOUSE-2] 2018-09-20 23:57:06 +03:00
Alexey Milovidov
7d291142ec Less dependencies [#CLICKHOUSE-2] 2018-09-20 23:51:21 +03:00
Alexey Milovidov
16dacff488 Fixed build [#CLICKHOUSE-2] 2018-09-20 23:50:58 +03:00
Alexey Milovidov
47934d1cce Merge branch 'master' of github.com:yandex/ClickHouse 2018-09-20 23:21:37 +03:00
Alexey Milovidov
d95300eb7f Less dependencies [#CLICKHOUSE-2] 2018-09-20 23:21:29 +03:00
alexey-milovidov
5d3027d4d0
Merge pull request #3171 from yandex/fix_segfault_on_incomplete_block 
Reorder Squashing and adding default output stream in insert
 2018-09-20 21:11:45 +03:00
alexey-milovidov
be77567e4f
Update AddingDefaultBlockOutputStream.cpp 2018-09-20 21:09:01 +03:00
alexey-milovidov
e74615f29e
Update AddingDefaultBlockOutputStream.cpp 2018-09-20 21:07:10 +03:00
alexey-milovidov
4a095d8433
Merge pull request #3172 from CurtizJ/CLICKHOUSE-3979 
Add modificator CUBE [CLICKHOUSE-3979]
 2018-09-20 21:04:56 +03:00
CurtizJ
a6841f5882 Merge remote-tracking branch 'origin/CLICKHOUSE-3979' into CLICKHOUSE-3979 2018-09-20 21:01:46 +03:00
alexey-milovidov
0d2c6dff24
Update Aggregator.h 2018-09-20 20:59:47 +03:00
CurtizJ
b89feb1572 replace bool by enum 2018-09-20 20:51:42 +03:00
alexey-milovidov
06b5c53335
Update TwoLevelHashTable.h 2018-09-20 20:44:10 +03:00
alexey-milovidov
a52de29fbf
Update ColumnWithDictionary.h 2018-09-20 20:41:54 +03:00
alexey-milovidov
a2d8ee1caa
Merge pull request #3183 from 4ertus2/refactoring 
refactoring: hide ASTIdentifier kind
 2018-09-20 20:38:06 +03:00
Nikolai Kochetov
ce8329d802 Fix test with names tuples. 2018-09-20 20:36:16 +03:00
alexey-milovidov
f558d5b2df
Update 00720_with_cube.sql 2018-09-20 20:35:54 +03:00
alexey-milovidov
7a9500a3f1
Update InterpreterSelectQuery.cpp 2018-09-20 20:33:47 +03:00
Anton Popov
dd1b130048
Update CubeBlockInputStream.cpp 2018-09-20 20:32:57 +03:00
alexey-milovidov
cdcb301937
Merge pull request #3176 from yandex/format-date-time-further-attempts 
Performance improvement of formatDateTime.
 2018-09-20 20:29:22 +03:00
CurtizJ
5f2db689dc fix tests 2018-09-20 19:32:07 +03:00
CurtizJ
8644853558 optimize 2018-09-20 18:46:37 +03:00
alesapin
94287f3199 Finally fixed 2018-09-20 18:35:52 +03:00
Alexey Milovidov
3eb183f21e Fixed build; better #3176 2018-09-20 17:46:31 +03:00
VadimPE
3547334ba5 fix 2018-09-20 17:39:02 +03:00
VadimPE
e93f56bb50 fix 2018-09-20 17:37:55 +03:00
VadimPE
c377389f62 CLICKHOUSE-3947 add LIKE and IN () 2018-09-20 17:34:30 +03:00
Nikolai Kochetov
673acbdf94 Added more comments. 2018-09-20 17:19:12 +03:00
Alexey Zatelepin
0ec0a24bc9 fix use of temp variable after it gets out of scope 2018-09-20 16:55:22 +03:00
Nikolai Kochetov
d8a9525cf9 Added test with low acrdinality and array functions. #3004 2018-09-20 16:53:29 +03:00
alesapin
c13ffed085 Remove redundant changes 2018-09-20 16:26:32 +03:00
Nikolai Kochetov
d66527ec15 Fix functions with Array(LowCardinality) arguments. #3004 2018-09-20 16:16:30 +03:00
chertus
6442b5b167 refactoring: hide ASTIdentifier kind 2018-09-20 16:13:33 +03:00
alesapin
0f12e028a5 Fix insert for native format 2018-09-20 15:59:33 +03:00
alesapin
dfa3e7e1cd Missed changes 2018-09-20 14:40:04 +03:00
alesapin
b87a084f38 Strict order of evaluated and added columns 2018-09-20 14:16:15 +03:00
Nikolai Kochetov
19d00cde7e Added test for low cardinality with in function. #3004 2018-09-20 13:57:52 +03:00
Nikolai Kochetov
d2fbc3df58 Fix in function for low cardinality argument. #3004 2018-09-20 13:55:10 +03:00
CurtizJ
f9ff586415 optimize 2018-09-20 13:44:13 +03:00
Nikolai Kochetov
5e4c5dd1c9 Fix functions on low cardinality with cons tesult. 2018-09-20 11:32:33 +03:00
Alexey Milovidov
2878f39e1e Added performance tests #3176 2018-09-19 23:48:25 +03:00
Alexey Milovidov
200860724e More tests #3176 2018-09-19 23:36:32 +03:00
Alexey Milovidov
2236435ed8 Added comment #2770 2018-09-19 23:23:33 +03:00
Alexey Milovidov
68a4ad0034 Added comment #2770 2018-09-19 23:22:58 +03:00
Alexey Milovidov
b396818632 Added comment #2770 2018-09-19 23:20:39 +03:00
Alexey Milovidov
44de6a0317 Improved performance 1.5..1.8 times #2770 2018-09-19 23:07:46 +03:00
alesapin
cf195ed832 Fix test 2018-09-19 20:52:09 +03:00
alesapin
2b3e29f607 Take header from first block in Squashing stream 2018-09-19 20:39:04 +03:00
VadimPE
89d408224b fix bug with part_name 2018-09-19 18:07:20 +03:00
VadimPE
2396b44519 fix 2018-09-19 17:44:30 +03:00
Nikolai Kochetov
bb570fa1a8 Fix low cardinality serialization test reference. 2018-09-19 17:43:12 +03:00
Nikolai Kochetov
2df05cf620 Fix native deserealization for nullable low cardinality. 2018-09-19 17:43:07 +03:00
Nikolai Kochetov
b93ea8e7cc Fixed default value index for LowCardinality(Nullable). 2018-09-19 17:42:59 +03:00
VadimPE
66b4a606d5 fix bug with add new partition in quorum 2018-09-19 17:34:41 +03:00
Alexey Zatelepin
b7cb8d1ae1 write correct columns list when UPDATEd part doesn't contain all columns [#CLICKHOUSE-13] 2018-09-19 16:04:52 +03:00
alesapin
e1c8045055 Fix error with header 2018-09-19 15:56:56 +03:00
alesapin
bb4be0515b Add test for segfault 2018-09-19 15:18:10 +03:00
chertus
f39d78b0bc AVG() exception instead of division by zero 2018-09-19 15:11:21 +03:00
CurtizJ
fe0bdbe42c fix test 2018-09-19 15:07:55 +03:00
CurtizJ
31bf960bfe add new syntax 2018-09-19 14:18:38 +03:00
Nikolai Kochetov
79e3ae2f75 Fix cast Null to LowCardinality(Nullable). #3066 2018-09-19 14:11:52 +03:00
VadimPE
f05d93897b Del old class 2018-09-19 14:10:56 +03:00
alesapin
520446df53 Reorder Squashing and adding default output stream in insert 2018-09-19 14:09:12 +03:00
VadimPE
17ffa8c310 fix class for added parts 2018-09-19 14:08:04 +03:00
alesapin
c2f3453fda Reorder Squashing and adding default output stream in insert 2018-09-19 14:06:42 +03:00
Nikolai Kochetov
926dfa82f3 Added test for low cardinality alter add column. #3066 2018-09-19 14:05:21 +03:00
Alexey Zatelepin
badefe14bc allow ON CLUSTER for ALTER UPDATE #3158 2018-09-19 14:01:09 +03:00
Nikolai Kochetov
1c611e2ad5 Fix low cardinality column deserialization from empty stream. #3114 2018-09-19 13:27:46 +03:00
VadimPE
96b117cb00 Revert "Update ReplicatedMergeTreeQuorumWriter.h" 
This reverts commit e3add7f0c7.
 2018-09-19 13:23:52 +03:00
CurtizJ
8f7daa75d1 update comments 2018-09-19 12:34:07 +03:00
alexey-milovidov
5ac1c763b1
Merge pull request #3165 from yandex/fix-prewhere-from-storage-merge-over-distributed 
Fix reading from merge over distributed with prewhere.
 2018-09-19 00:10:34 +03:00
Alexey Milovidov
2b74fd8a01 Style #2770 2018-09-18 22:44:15 +03:00
Alexey Milovidov
ead7baa805 Little better #2770 2018-09-18 22:41:42 +03:00
Alexey Milovidov
7b1da2cd73 Improved performance two times #2770 2018-09-18 22:29:29 +03:00
Nikolai Kochetov
501940fa7e Fix reading from merge over distributed with prewhere. 2018-09-18 22:01:29 +03:00
Alexey Milovidov
9ff5f28de4 Little better #2770 2018-09-18 21:58:05 +03:00
Alexey Milovidov
765b85e021 utils/check-style/check-style -n 2018-09-18 21:52:31 +03:00
Alexey Milovidov
dc7963a957 Merge branch 'alex-krash-function_format_date' 2018-09-18 21:51:14 +03:00
CurtizJ
e4c1ca91c1 update tests 2018-09-18 21:41:54 +03:00
Alexey Milovidov
41bde049ab Merge remote-tracking branch 'origin/master' into alex-krash-function_format_date 2018-09-18 21:39:02 +03:00
alexey-milovidov
282e9aea45
Merge pull request #3161 from 4ertus2/refactoring 
Some refactoring - DataTypeWithSimpleSerialization helper class
 2018-09-18 21:37:30 +03:00
Anton Popov
f550b21a8f
Merge branch 'master' into CLICKHOUSE-3527 2018-09-18 21:35:54 +03:00
CurtizJ
3177f3f6a9 update ddl guard 2018-09-18 21:33:15 +03:00
Alexey Milovidov
b8cbedee27 Merging #2770 2018-09-18 21:31:43 +03:00
Alexey Milovidov
ac73431451 Formatting; fixed error; fixed memory leak; miscellaneous #2770 2018-09-18 19:42:25 +03:00
chertus
0300256a07 add comment 2018-09-18 19:29:44 +03:00
Alexey Milovidov
dde8ca03cf Merge branch 'function_format_date' of https://github.com/alex-krash/ClickHouse into alex-krash-function_format_date 2018-09-18 19:19:29 +03:00
Alexey Milovidov
a918461216 Merge branch 'master' of github.com:yandex/ClickHouse 2018-09-18 19:17:36 +03:00
alexey-milovidov
67d559f3ef
Merge pull request #3163 from Bloxy-info/fix-negative-cumsum 
fix arrayCumSumNonNegative that it does not accumulative negative values
 2018-09-18 19:15:15 +03:00
alexey-milovidov
00dbf64176
Update arrayCumSumNonNegative.cpp 2018-09-18 19:14:01 +03:00
Alexey Milovidov
65f074715b Miscellaneous #3123 2018-09-18 19:12:23 +03:00
chertus
ba2f1a17b2 refactoring: class DataTypeWithSimpleSerialization [CLICKHOUSE-2] 2018-09-18 16:31:51 +03:00
chertus
fee5f24326 test for decimal + column defaults [CLICKHOUSE-3765] 2018-09-18 15:08:54 +03:00
daoready
889d5139ef fix arrayCumSumNonNegative that it does not accumulative negative values 2018-09-18 14:55:14 +03:00
Alexander Krasheninnikov
64533ff4df Add support for Date, filled documentation 2018-09-18 03:32:24 +03:00
Alexey Milovidov
599ec4c577 Merge branch 'veloman-yunkan-jsoneachrow_import_nested' 2018-09-17 23:36:01 +03:00
Alexey Milovidov
46ef387ce3 Style #3144 2018-09-17 23:35:21 +03:00