thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-10-07 17:10:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
27,148 Commits 8,979 Branches 1,768 Tags 2 GiB
c5a42a6948
Commit Graph

4578 Commits

Author SHA1 Message Date
Nikita Vasilev
258367c1dd ASTs 2019-02-06 10:51:35 +03:00
Nikita Vasilev
ef154a4bb2 r fix 2019-02-06 10:49:18 +03:00
Nikita Vasilev
9eaabcbf3f Merge remote-tracking branch 'upstream/master' into nikvas0/index_fix 2019-02-05 22:19:47 +03:00
Nikita Vasilev
9921fc6719 removed toString 2019-02-05 21:46:35 +03:00
Nikita Vasilev
3bea03529b fixed bug in unique_index 2019-02-05 21:34:10 +03:00
Alexey Zatelepin
8e437b191e try executing other mutations immediately after KILL MUTATION [#CLICKHOUSE-3912] 2019-02-05 21:09:16 +03:00
Alexey Zatelepin
d482f3e5d0 return CancellationCode from killMutation [#CLICKHOUSE-3912] 2019-02-05 21:09:15 +03:00
Alexey Zatelepin
e32f153328 KILL MUTATION for StorageReplicatedMergeTree [#CLICKHOUSE-3912] 2019-02-05 21:09:15 +03:00
Alexey Zatelepin
059c1b3589 write part_log.partition_id everywhere 2019-02-05 21:09:15 +03:00
Alexey Zatelepin
ca93fd483a kill ordinary MergeTree mutations [#CLICKHOUSE-3912] 2019-02-05 21:09:10 +03:00
Alexey Zatelepin
5832e474a4 is_mutation flag in system.merges [#CLICKHOUSE-3912] 2019-02-05 21:09:05 +03:00
Alexey Zatelepin
92a4342c31 system.merges element for mutations [#CLICKHOUSE-3912] 2019-02-05 21:09:00 +03:00
Alexey Zatelepin
51017959f2 fix typo in calculation of part_log.rows_read 2019-02-05 21:09:00 +03:00
Alexey Zatelepin
67be566325 KILL MUTATION skeleton [#CLICKHOUSE-3912] 2019-02-05 21:08:41 +03:00
Alexey Milovidov
607951895a Fixed table function numbers with zero argument #4276 2019-02-05 20:05:33 +03:00
Alexey Milovidov
9dd2e75b71 Fixed warnings in clang 8 #4143 2019-02-05 19:43:52 +03:00
Nikita Vasilev
89913b9188 fix 2019-02-05 18:22:47 +03:00
Nikita Vasilev
a1b0dede07 Data Skipping Indices (#4143) 
* made index parser

* added index parsing

* some fixes

* added index interface and factory

* fixed compilation

* ptrs

* added indexParts

* indextypes

* index condition

* IndexCondition

* added indexes in selectexecutor

* fix

* changed comment

* fix

* added granularity

* comments

* fix

* fix

* added writing indexes

* removed indexpart class

* fix

* added setSkipIndexes

* add rw for MergeTreeIndexes

* fixes

* upd error

* fix

* fix

* reading

* test index

* fixed nullptr error

* fixed

* fix

* unique names

* asts -> exprlist

* minmax index

* fix

* fixed select

* fixed merging

* fixed mutation

* working minmax

* removed test index

* fixed style

* added indexes to checkDataPart

* added tests for minmax index

* fixed constructor

* fix style

* fixed includes

* fixed setSkipIndexes

* added indexes meta to zookeeper

* added parsing

* removed throw

* alter cmds parse

* fix

* added alter

* fix

* alters fix

* fix alters

* fix "after"

* fixed alter

* alter fix + test

* fixes

* upd setSkipIndexes

* fixed alter bug with drop all indices

* fix metadata editing

* new test and repl fix

* rm test files

* fixed repl alter

* fix

* fix

* indices

* MTReadStream

* upd test for bug

* fix

* added useful parsers and ast classes

* fix

* fix comments

* replaced columns

* fix

* fixed parsing

* fixed printing

* fix err

* basic IndicesDescription

* go to IndicesDescr

* moved indices

* go to indicesDescr

* fix test minmax_index*

* fixed MT alter

* fixed bug with replMT indices storing in zk

* rename

* refactoring

* docs ru

* docs ru

* docs en

* refactor

* rename tests

* fix docs

* refactoring

* fix

* fix

* fix

* fixed style

* unique idx

* unique

* fix

* better minmax calculation

* upd

* added getBlock

* unique_condition

* added termForAST

* unique

* fixed not

* uniqueCondition::mayBeTrueOnGranule

* fix

* fixed bug with double column

* is always true

* fix

* key set

* spaces

* test

* tests

* fix

* unique

* fix

* fix

* fixed bug with duplicate column

* removed unused data

* fix

* fixes

* __bitSwapLastTwo

* fix
 2019-02-05 17:50:25 +03:00
Nikita Vasilev
263b390c52 removed unnecessary actions 2019-02-05 16:59:43 +03:00
Nikita Vasilev
87a80a4361 fixed create as 2019-02-05 16:52:45 +03:00
Alexey Zatelepin
1512e17ab8 info about failed parts for ReplicatedMergeTree [#CLICKHOUSE-3912] 2019-02-05 16:37:16 +03:00
Alexey Zatelepin
b8ee63fa3a save information about failed parts for ordinary MergeTree mutations [#CLICKHOUSE-3192] 2019-02-05 16:04:58 +03:00
Alexey Milovidov
29c3195742 Removed bad code; fixed error 2019-02-05 02:18:04 +03:00
Alexey Milovidov
b0efd6089c Removed preemptive load of external dictionaries in presence of Dictionary database 2019-02-04 22:45:22 +03:00
Nikita Vasilev
5a7ca354a5 unknown field 2019-02-04 16:42:13 +03:00
Nikita Vasilev
fa07d1cf86 replace andBit 2019-02-04 13:42:30 +03:00
Vasily Nemkov
2716df8ab2 IPv4 and IPv6 Domain implementation. 
Added:
 * IDataTypeDomain interface;
 * method DataTypeFactory::registerDataTypeDomain for registering domains;
 * DataTypeDomainWithSimpleSerialization domain base class with simple serialization/deserialization;
 * Concrete IPv4 and IPv6 domain implementations: DataTypeDomanIPv6 and DataTypeDomanIPv4;

Updated:
 * IDataType text serialization/deserialization methods;
 * IDataType implementation to use domain for text serialization/deserialization;
 * Refactored implementation of the IPv4/IPv6 functions to use formatIPv4/v6 and parseIPv4/v6 from Common/formatIPv6.h;

Tests:
 * Added test cases for IPv4 and IPv6 domains.
 * Updated IPv4/v6 functions tests to validate more cases;
 * Added performance tests for IPv4 and IPv6 related functions;
 2019-02-04 12:37:46 +03:00
Alexey Milovidov
0f577da5c2 Updated system.contributors 2019-02-01 18:49:17 +03:00
alexey-milovidov
012bd5267b
Merge pull request #4195 from yandex/convert-parts-from-old-format 
А tool to convert an old month-partition part to the custom-partitioned format
 2019-01-31 22:45:44 +03:00
Nikita Vasilev
094ae0f810 fix 2019-01-30 22:48:24 +03:00
Nikita Vasilev
476f33f9a3 __bitSwapLastTwo 2019-01-30 22:40:01 +03:00
Ivan Lezhankin
39e2563f93 Create new consumers on-demand 
and give them some time for graceful assignment.
 2019-01-30 20:58:49 +03:00
Nikita Vasilev
0492ed780f fixes 2019-01-30 18:04:24 +03:00
Alexey Zatelepin
063366307f fix build 2019-01-30 18:03:43 +03:00
Alexey Zatelepin
8957e73681 a tool to convert an old month-partition part to the custom-partitioned format [#CLICKHOUSE-4231] 2019-01-30 16:51:39 +03:00
Nikita Vasilev
bcd07a4074 fix 2019-01-30 16:34:28 +03:00
Nikita Vasilev
69daa33462 removed unused data 2019-01-30 13:58:10 +03:00
Nikita Vasilev
160c8c0807 fixed bug with duplicate column 2019-01-30 13:18:59 +03:00
Nikita Vasilev
c0d7a8b0fd Merge branch 'nikvas0/index' of github.com:nikvas0/ClickHouse into nikvas0/index 2019-01-30 10:17:19 +03:00
Nikita Vasilev
6d7ccc6982 fix 2019-01-29 23:06:31 +03:00
Nikita Vasilev
c12b03d350 Merge remote-tracking branch 'upstream/master' into nikvas0/index 2019-01-29 23:00:12 +03:00
Nikita Vasilev
371e1658f8 fix 2019-01-29 21:40:10 +03:00
Nikita Vasilev
c4dad05b87 fix 2019-01-29 21:00:40 +03:00
Nikita Vasilev
9311c01ef7 spaces 2019-01-29 20:28:13 +03:00
Nikita Vasilev
4ec0923fc9 key set 2019-01-29 20:26:45 +03:00
Nikita Vasilev
68ea3f0ae0 fix 2019-01-29 20:09:17 +03:00
Nikita Vasilev
67af98670e is always true 2019-01-29 19:53:44 +03:00
Nikita Vasilev
149b0d84f9 fixed bug with double column 2019-01-29 16:13:18 +03:00
proller
2ab3138eb6 Merge remote-tracking branch 'upstream/master' into fix10 2019-01-28 17:01:06 +03:00
proller
22549cc43b Merge remote-tracking branch 'upstream/master' into fix10 2019-01-28 15:44:25 +03:00
Alexey Milovidov
4e3d9a0f15 Merge branch 'master' of github.com:yandex/ClickHouse into global-thread-pool 2019-01-28 14:20:24 +03:00
Nikita Vasilev
7c036e9b43 fix 2019-01-28 13:35:19 +03:00
Nikita Vasilev
b4d1bf869b uniqueCondition::mayBeTrueOnGranule 2019-01-28 11:15:13 +03:00
Nikita Vasilev
a74ed80f99 fixed not 2019-01-28 10:24:32 +03:00
Nikita Vasilev
00ec4cc6ca unique 2019-01-28 10:05:24 +03:00
alexey-milovidov
032ed27c27
Merge pull request #4154 from 4ertus2/joins 
Add IdentifierSemantic and PredicateExpressionsOptimizer refactoring
 2019-01-28 01:47:57 +03:00
Nikita Vasilev
aa37d95036 added termForAST 2019-01-28 00:08:14 +03:00
Nikita Vasilev
902c9a9e5c unique_condition 2019-01-27 23:24:33 +03:00
Nikita Vasilev
c701cb7e00 added getBlock 2019-01-27 21:23:08 +03:00
Nikita Vasilev
537b23ef15 upd 2019-01-27 21:02:15 +03:00
Alexey Milovidov
ef51f126b4 Removed extraordinarily bad code in StorageFile #2150 2019-01-27 03:38:30 +03:00
Nikita Vasilev
0ea031d188 Merge branch 'nikvas0/index' into nikvas0/unique_index 2019-01-26 22:43:30 +03:00
Nikita Vasilev
b94915b7da better minmax calculation 2019-01-26 22:31:12 +03:00
Nikita Vasilev
387ed1b7c3 unique 2019-01-26 18:45:38 +03:00
Nikita Vasilev
6b6b0aa79a unique idx 2019-01-26 16:12:13 +03:00
Nikita Vasilev
b2915bc844 Merge remote-tracking branch 'upstream/master' into nikvas0/index 2019-01-26 09:27:32 +03:00
Nikita Vasilev
0ea0b171f4 fixed style 2019-01-26 09:26:49 +03:00
proller
9230fe9917 Merge remote-tracking branch 'upstream/master' into fix10 2019-01-25 23:10:38 +03:00
proller
5328251ff1
Fix build without protobuf, gtest, cppkafka (#4152) 2019-01-25 23:02:03 +03:00
proller
6964fb47ff BUILD_DETERMINISTIC 2019-01-25 22:29:01 +03:00
chertus
091efcda95 add IdentifierSemantic and PredicateExpressionsOptimizer refactoring 2019-01-25 18:42:24 +03:00
Alexey Milovidov
65f8e4d4a8 Merge branch 'master' into global-thread-pool 2019-01-25 16:33:50 +03:00
Ivan Lezhankin
681266abd0 Poll messages in batches of max_block_size size. 2019-01-25 15:48:59 +03:00
alexey-milovidov
18f1266dab
Merge pull request #4099 from yandex/mutations-fix-in 
Get rid of IAST::range
 2019-01-24 20:29:13 +03:00
Alexey Milovidov
0e59fe0b46 Renamed setting and variables #3973 2019-01-24 20:12:05 +03:00
Ivan Lezhankin
9636bdcd67 Fix build 2019-01-24 15:44:58 +03:00
Ivan Lezhankin
862d419f31 Fix losing the next message after a broken one. 2019-01-24 14:58:25 +03:00
Ivan Lezhankin
425d483cfb Add integration tests 2019-01-24 14:58:25 +03:00
Ivan Lezhankin
c8e605327d Split StorageKafka.cpp on smaller files per class 2019-01-24 14:58:24 +03:00
alexey-milovidov
f13d094a4e
Merge pull request #3973 from amosbird/join_overwrite 
Add join_overwrite settings for StorageJoin.
 2019-01-24 02:05:13 +03:00
Ivan Lezhankin
05ab15cc84 Merge IBlockInputStream and IProfilingBlockInputStream into one 2019-01-23 17:48:50 +03:00
Alexey Zatelepin
370c8c4e54 Merge branch 'master' into mutations-fix-in 
Conflicts:
	dbms/src/Parsers/IAST.h
 2019-01-23 14:47:53 +03:00
Alexey Zatelepin
f3b4292fc6 add data types to the prepared_sets key for literals #4058 2019-01-23 14:20:01 +03:00
Alexey Zatelepin
5154814bf9 try to get rid of IAST::range #4058 2019-01-23 14:19:22 +03:00
maiha
6c83beafdd dbms: Fixed misspells in comments 2019-01-23 04:56:53 +09:00
Nikita Vasilev
d8f3bf7882 refactoring 2019-01-22 22:43:52 +03:00
Nikita Vasilev
d47cd4825d Merge remote-tracking branch 'upstream/master' into nikvas0/index 2019-01-22 19:02:20 +03:00
Nikita Vasilev
9ee50da8b6 refactor 2019-01-22 18:58:11 +03:00
Alexey Milovidov
c70e8cc5f0 Miscellaneous #3726 2019-01-21 22:45:26 +03:00
alexey-milovidov
b41fa8e7af
Merge pull request #3726 from zhang2014/feature/use_cluster_pool 
Use cluster connections pool in DirectoryMonitor
 2019-01-21 22:33:19 +03:00
Alexey Milovidov
f7ecfc776b Miscellaneous #4111 2019-01-21 21:04:08 +03:00
Nikita Vasilev
51830221bd refactoring 2019-01-21 20:54:27 +03:00
Nikita Vasilev
f0a0dbbf5a fixed bug with replMT indices storing in zk 2019-01-21 17:47:47 +03:00
alesapin
88c413fbe2 Remove accidental change 2019-01-21 17:03:34 +03:00
alesapin
34fb1c89f1 Add ability to choose codecs for storage log and tiny log 2019-01-21 17:00:06 +03:00
Nikita Vasilev
c32d1983a0 go to indicesDescr 2019-01-21 12:47:35 +03:00
Nikita Vasilev
977b1e20d0 moved indices 2019-01-20 23:03:17 +03:00
Nikita Vasilev
3f5447f471 go to IndicesDescr 2019-01-20 21:43:49 +03:00
Nikita Vasilev
093b94ae38 basic IndicesDescription 2019-01-20 20:49:53 +03:00
Nikita Vasilev
d6545177fb fix err 2019-01-20 18:50:11 +03:00
Nikita Vasilev
9120bebe56 fixed printing 2019-01-20 18:02:19 +03:00
Nikita Vasilev
5e626be07f fix 2019-01-20 14:34:13 +03:00
Nikita Vasilev
13a4fb2756 replaced columns 2019-01-20 14:03:21 +03:00
Nikita Vasilev
4a19523698 Merge remote-tracking branch 'upstream/master' into nikvas0/index 2019-01-20 10:14:06 +03:00
alexey-milovidov
ee23f6997d
Merge pull request #4084 from yandex/storage_hdfs_improvements 
Storage hdfs write and refactoring
 2019-01-20 02:51:39 +03:00
alexey-milovidov
3c6263e89e
Merge pull request #4094 from abyss7/issue-2675 
Add setting to Kafka Engine to control number of parsing errors
 2019-01-18 21:46:52 +03:00
Ivan Lezhankin
5f74094edb Fix a setting description. 2019-01-18 16:15:36 +03:00
Ivan Lezhankin
89ffb577b1 Implement additional Kafka engine setting for allowed parsing errors 2019-01-18 15:48:38 +03:00
zhang2014
998591b30d fix build failure 2019-01-18 10:31:28 +08:00
alexey-milovidov
3d4bd7cbf8
Merge branch 'master' into feature/use_cluster_pool 2019-01-18 01:02:39 +03:00
Alexey Milovidov
a7c468da8e Merge remote-tracking branch 'origin/master' into global-thread-pool 2019-01-17 21:57:01 +03:00
Nikita Vasilev
0e6f5b4356 fix 2019-01-17 21:22:45 +03:00
alesapin
b6ad3cf148 Remove shadow variable warning 2019-01-17 19:15:51 +03:00
Alexey Milovidov
178302cc5d Miscellaneous #3960 2019-01-17 17:45:02 +03:00
Nikita Vasilev
8c2a23a129 MTReadStream 2019-01-17 17:23:12 +03:00
alesapin
07e11577d3 Add write logic and remove strange multifile read logic 2019-01-17 17:10:30 +03:00
alexey-milovidov
0ec1fdef04
Merge pull request #3960 from yandex/zk-columns-compact-storage 
Compact storage of the part header in ZooKeeper
 2019-01-17 17:05:01 +03:00
Nikita Vasilev
c4a725a496 indices 2019-01-17 15:11:36 +03:00
Nikita Vasilev
6a09340eed Merge remote-tracking branch 'upstream/master' into nikvas0/index 2019-01-17 12:34:51 +03:00
Nikita Vasilev
d514d3739a fixed repl alter 2019-01-17 12:16:39 +03:00
Nikita Vasilev
062819f0a2 new test and repl fix 2019-01-17 11:05:26 +03:00
Nikita Vasilev
f8fa36c6bd fix metadata editing 2019-01-16 22:47:21 +03:00
Nikita Vasilev
62dde8c327 fixed alter bug with drop all indices 2019-01-16 22:31:04 +03:00
chertus
8bb35ac987 minor changes 2019-01-16 21:38:19 +03:00
Nikita Vasilev
579832ff9b upd setSkipIndexes 2019-01-16 21:35:03 +03:00
Nikita Vasilev
08d23c16d1 fixes 2019-01-16 21:24:38 +03:00
Nikita Vasilev
b4ce03ea7e alter fix + test 2019-01-16 20:59:47 +03:00
Nikita Vasilev
2de2b6f32e fixed alter 2019-01-16 19:53:38 +03:00
Alexey Zatelepin
0f8e5f8522 Merge branch 'master' into zk-columns-compact-storage 
Conflicts:
	dbms/src/Storages/StorageReplicatedMergeTree.cpp
 2019-01-16 17:45:16 +03:00
Nikita Vasilev
65539bfea0 fix "after" 2019-01-16 16:05:27 +03:00
Nikita Vasilev
8c35ccdd1d fix alters 2019-01-16 15:29:26 +03:00
Nikita Vasilev
b110738f61 alters fix 2019-01-15 22:14:47 +03:00
Nikita Vasilev
2f07e31903 fix 2019-01-15 20:39:10 +03:00
Nikita Vasilev
026a30092e added alter 2019-01-15 17:49:22 +03:00
alesapin
694f746798 Merge branch 'master' into compression_codec_alter 2019-01-15 13:52:45 +03:00
alexey-milovidov
bcc54d1606
Merge pull request #4025 from abyss7/fix-kafka 
Update Kafka libraries
 2019-01-15 00:23:20 +03:00
alexey-milovidov
8a251753be
Merge pull request #4056 from 4ertus2/ast 
Helpers for ASTIdentifier (based on 'QueryNormalizer refactoring' changes)
 2019-01-15 00:22:54 +03:00
Alexey Milovidov
f6b9b06307 Attempt to implemnt global thread pool #4018 2019-01-14 22:22:09 +03:00
chertus
dbb88e8cb4 helpers for ASTIdentifier (hide semantic and casts) 2019-01-14 21:15:04 +03:00
proller
4b6af5788a Fix macos build 2019-01-14 19:55:11 +03:00
zhang2014
cdb138f13c merge 2019-01-14 18:14:34 +03:00
proller
af0b875f57 Fix macos build 2019-01-14 17:17:43 +03:00
proller
c0b72492c0 Fix macos build 2019-01-14 16:34:14 +03:00
Ivan Lezhankin
337c092c7e Use cppkafka instead of raw C interface 2019-01-14 14:15:57 +03:00
Ivan Lezhankin
9c35598373 Add cppkafka to contrib 2019-01-14 14:15:57 +03:00
Nikita Vasilev
e197697b22 fix 2019-01-13 22:31:48 +03:00
Nikita Vasilev
d0db87b412 alter cmds parse 2019-01-13 20:23:08 +03:00
Nikita Vasilev
e288022fea Merge remote-tracking branch 'upstream/master' into nikvas0/index 2019-01-13 17:33:24 +03:00
Alexey Milovidov
abcd5a2a49 Attempt to implemnt global thread pool #4018 2019-01-11 22:12:36 +03:00
proller
7cefef6983
Fix linking in all modes (unbundled, split, ...) (#4037) 2019-01-11 19:52:46 +03:00
Nikita Vasilev
89b831eaf7 added indexes meta to zookeeper 2019-01-10 20:48:04 +03:00
Nikita Vasilev
d310d1a5ec fixed setSkipIndexes 2019-01-10 19:51:49 +03:00
Nikita Vasilev
0c18e73871 Merge remote-tracking branch 'upstream/master' into nikvas0/index 2019-01-10 17:55:08 +03:00
Nikita Vasilev
701627ec60 fixed includes 2019-01-10 16:50:41 +03:00
Nikita Vasilev
634d5eb516 fix style 2019-01-10 16:30:06 +03:00
Nikita Vasilev
3f8c2ad814 fixed constructor 2019-01-10 15:57:12 +03:00
alexey-milovidov
9b46678920
Merge pull request #4014 from 4ertus2/joins 
minor SyntaxAnalyzer refactoring
 2019-01-09 23:10:40 +03:00
alexey-milovidov
a739edc239
Merge pull request #4013 from yandex/pvs-studio-fixes-2 
Fixed bugs found by PVS-Studio
 2019-01-09 22:55:11 +03:00
Nikita Vasilev
d9b7f30245 added indexes to checkDataPart 2019-01-09 22:20:50 +03:00
Nikita Vasilev
0ba6f1421a fixed style 2019-01-09 20:05:52 +03:00
alexey-milovidov
08f4e792b1
Merge pull request #4009 from yandex/test_for_remote_global_in_user 
Fix bug with wrong user in remote table function.
 2019-01-09 19:29:34 +03:00
chertus
729ca697d9 minor SyntaxAnalyzer refactoring 2019-01-09 19:16:59 +03:00
Alexey Milovidov
19f4652959 Fixed bugs found by PVS-Studio 2019-01-09 18:44:20 +03:00
Nikita Vasilev
10355ae555 Merge remote-tracking branch 'upstream/master' into nikvas0/index 2019-01-09 17:36:06 +03:00
Alexey Milovidov
87c4443f98 Removed outdated test 2019-01-09 17:34:25 +03:00
Nikita Vasilev
d8f8b6352b removed test index 2019-01-09 17:30:25 +03:00
Nikita Vasilev
1e8fa5d9ea working minmax 2019-01-09 17:15:23 +03:00
alesapin
b8efafd400 Fix bug with wrong user restrictions in remote table func 2019-01-09 15:21:04 +03:00
Nikita Vasilev
91fb17f27f fixed mutation 2019-01-09 12:55:28 +03:00
Nikita Vasilev
e580180efc fixed merging 2019-01-09 12:54:18 +03:00
Nikita Vasilev
6eeed48e86 fixed select 2019-01-08 23:17:45 +03:00
Nikita Vasilev
ad4df16899 fix 2019-01-08 22:41:36 +03:00
Nikita Vasilev
49148ac3e9 minmax index 2019-01-08 20:27:44 +03:00
alexey-milovidov
2884b870b3
Merge pull request #3993 from yandex/weverything-2 
Added more warnings from clang's -Weverything, that are available in clang 8
 2019-01-08 17:54:43 +03:00
Nikita Vasilev
d1e2ab85e3 asts -> exprlist 2019-01-08 14:04:25 +03:00
Alexey Milovidov
0630e67a21 Addition to Amos Bird changes #3920 2019-01-08 13:07:33 +03:00
Nikita Vasilev
48e136f029 unique names 2019-01-08 12:38:46 +03:00
Nikita Vasilev
541c641b24 fix 2019-01-08 00:06:08 +03:00
Nikita Vasilev
76c25c2024 fixed 2019-01-07 22:21:51 +03:00
Nikita Vasilev
69c6e77d53 fixed nullptr error 2019-01-07 21:53:51 +03:00
Nikita Vasilev
6871665231 test index 2019-01-07 19:49:34 +03:00
Nikita Vasilev
11d37efa74 reading 2019-01-07 15:51:14 +03:00
Alexey Milovidov
0dfa553fca Added more warnings from clang's -Weverything, that are available in clang 8 2019-01-07 13:40:58 +03:00
Amos Bird
8ea4d7987b Add join_overwrite settings for StorageJoin. 
This makes using StorageJoin as dictionary more flexible.
 2019-01-07 01:23:26 +08:00
Nikita Vasilev
17f6618fa3 fix 2019-01-06 18:22:04 +03:00
Nikita Vasilev
e95376e550 Merge branch 'master' into nikvas0/index 2019-01-06 16:21:00 +03:00
Nikita Vasilev
7e0e301067 fix 2019-01-06 15:12:42 +03:00
Nikita Vasilev
83368a4866 upd error 2019-01-06 15:10:22 +03:00
Alexey Milovidov
a058cc1983 Added some warnings from clang's -Weverything 2019-01-06 14:13:26 +03:00
Nikita Vasilev
c3f1784dbc fixes 2019-01-05 22:27:31 +03:00
Nikita Vasilev
61b9c7735b add rw for MergeTreeIndexes 2019-01-05 21:33:30 +03:00
Nikita Vasilev
82cc39d441 added setSkipIndexes 2019-01-05 15:35:13 +03:00
Nikita Vasilev
1c806288bf fix 2019-01-05 12:26:02 +03:00
Alexey Milovidov
06a8c3f02d Added some warnings from clang's -Weverything 2019-01-05 06:33:22 +03:00
Nikita Vasilev
f92750223f removed indexpart class 2019-01-04 18:54:34 +03:00
Nikita Vasilev
92a850ceb0 added writing indexes 2019-01-04 17:33:38 +03:00
Alexey Milovidov
afda68d25c Added some warnings from clang's -Weverything 2019-01-04 17:18:49 +03:00
Alexey Milovidov
cf1cacc366 Added some warnings from clang's -Weverything 2019-01-04 16:54:39 +03:00
Alexey Milovidov
1d4701b0bc Added some warnings from clang's -Weverything 2019-01-04 15:10:00 +03:00
Nikita Vasilev
35dbb94312 fix 2019-01-03 19:47:42 +03:00
Nikita Vasilev
b2da3a34df comments 2019-01-02 21:47:07 +03:00
Nikita Vasilev
f704a32515 added granularity 2019-01-02 19:04:44 +03:00
Nikita Vasilev
1b7c0aeef1 fix 2019-01-02 17:24:26 +03:00
Alexey Milovidov
e33e5150b7 Miscellaneous [#CLICKHOUSE-2] 2019-01-02 09:44:36 +03:00
Alexey Zatelepin
ca91223a94 make path argument explicit for safety [#CLICKHOUSE-4024] 2018-12-29 17:23:44 +03:00
Alexey Zatelepin
df079f28d2 remove duplicate logging 2018-12-29 17:11:17 +03:00
Alexey Zatelepin
5d4a56420d tool to transform part znode to minimalistic part header [#CLICKHOUSE-4024] 2018-12-29 17:11:16 +03:00
Alexey Zatelepin
9bd09b44ed introduce ReplicatedMergeTreePartHeader [#CLICKHOUSE-4024] 
Conflicts:
	dbms/src/Common/ErrorCodes.cpp
 2018-12-29 17:11:16 +03:00
Nikita Vasilev
ad2a453919 changed comment 2018-12-29 16:11:30 +03:00
Nikita Vasilev
33cf4c96e6 fix 2018-12-29 16:04:22 +03:00
Nikita Vasilev
f90cdca498 added indexes in selectexecutor 2018-12-29 16:02:57 +03:00
Nikita Vasilev
5079330bdc IndexCondition 2018-12-29 15:04:00 +03:00
Nikita Vasilev
68c3879d95 index condition 2018-12-29 14:12:41 +03:00
alesapin
b2727399b1
Merge pull request #3957 from yandex/nicelulu-click_update 
Fix user and password forwarding
 2018-12-28 22:50:16 +03:00
proller
300bbdfb43 Fix cyclic lib depend ppart 2: clean 2018-12-28 21:15:26 +03:00
Nikita Vasilev
06d8416107 indextypes 2018-12-28 20:53:41 +03:00
alesapin
43da59d0fc Improve test 2018-12-28 20:11:52 +03:00
alesapin
ab32a06c85 Fix code remove redundat files 2018-12-28 19:28:24 +03:00
alesapin
8bc00f4632 CLICKHOUSE-4229: Fix user forwarding for replicated queries which actually send queries to master node 2018-12-28 19:21:32 +03:00
alesapin
f42f511e89 Merge pr 2018-12-28 19:21:07 +03:00
Nikita Vasilev
9bf5b6b4aa added indexParts 2018-12-28 18:27:06 +03:00
alexey-milovidov
d16447c3f4
Merge pull request #3899 from yandex/custom_compression_codecs 
Custom compression codecs
 2018-12-28 08:29:09 +03:00
alesapin
3afa03d044 Merge branch 'master' into custom_compression_codecs 2018-12-27 11:23:00 +03:00
Alexey Milovidov
882531b9c0 Fixed UB #3926 2018-12-27 04:40:00 +03:00
Alexey Milovidov
589d07860f Fixed UB #3926 2018-12-27 04:12:18 +03:00
Alexey Milovidov
7509db544c Merge branch 'master' of github.com:yandex/ClickHouse into ubsan-fixes-3 2018-12-26 22:38:11 +03:00
Nikita Vasilev
c89df916ab ptrs 2018-12-26 20:34:44 +03:00
alesapin
9342700ce1 Move processing pool to ternary logic 2018-12-26 20:03:29 +03:00
Alexey Milovidov
c88fd6025a Merge branch 'master' of github.com:yandex/ClickHouse into ubsan-fixes-3 2018-12-26 18:09:54 +03:00
Nikita Vasilev
b62197b1ad fixed compilation 2018-12-26 15:49:05 +03:00
Nikita Vasilev
04a8ea85af added index interface and factory 2018-12-26 15:19:24 +03:00
alesapin
98b372415d Decrease sleep time 2018-12-26 14:23:15 +03:00
alesapin
444eb21d28 Fix exponential backoff for replication queue 2018-12-26 12:56:52 +03:00
Alexey Milovidov
985aa2c034 Fixed build #3926 2018-12-26 04:12:13 +03:00
Alexey Milovidov
bbbefe2c03 Less dependencies [#CLICKHOUSE-2] 2018-12-26 02:18:07 +03:00
Alexey Milovidov
a204ed264f Less dependencies [#CLICKHOUSE-2] 2018-12-26 02:15:28 +03:00
Alexey Milovidov
436b9b6eac Less dependencies [#CLICKHOUSE-2] 2018-12-26 02:14:39 +03:00
Alexey Milovidov
3be55436bf Less dependencies [#CLICKHOUSE-2] 2018-12-26 02:13:30 +03:00
Alexey Milovidov
4c0b95ac02 Less dependencies [#CLICKHOUSE-2] 2018-12-26 02:11:36 +03:00
Alexey Milovidov
4cb431264a Fixed UB #3926 2018-12-26 02:06:39 +03:00
Nikita Vasilev
36083e1036 some fixes 2018-12-25 22:37:39 +03:00
alesapin
1228645a79 Fix segfault and add tabs to ton of tests (desc table) 2018-12-25 14:33:54 +03:00
alesapin
4309775fc8 Add coments and fix compression for nested types 2018-12-25 13:04:38 +03:00
alesapin
f7e06cf9ac Remove random changes 2018-12-24 19:03:22 +03:00
alesapin
22b9969f05 Merge branch 'master' into custom_compression_codecs 2018-12-24 18:53:31 +03:00
alesapin
36fb2d16cd Add test with non default config 2018-12-24 18:50:02 +03:00
alexey-milovidov
14e425ddb4
Merge pull request #3919 from yandex/kafka-segfault-investigation 
StorageKafka: minor modifications.
 2018-12-24 18:48:54 +03:00
alesapin
29ad7f9fb1 Remove redundant changes and shift error codes 2018-12-24 16:19:24 +03:00
alesapin
1e771a4aec Fix error codes 2018-12-24 14:34:50 +03:00
Alexey Milovidov
2ee4c443d5 Merge branch 'master' of github.com:yandex/ClickHouse into kafka-segfault-investigation 2018-12-24 14:05:36 +03:00
Amos Bird
71fad54eb2 Fix UB. 2018-12-23 16:21:55 +08:00
alexey-milovidov
a03c28d0e6
Merge pull request #3909 from yandex/fix-use-after-free-in-array-enumerate 
Fix use after free in arrayEnumerateUniq and -Dense function.
 2018-12-23 06:11:43 +03:00
Alexey Milovidov
2c6e49c3f3 More checks [#CLICKHOUSE-2] 2018-12-21 19:24:47 +03:00
Alexey Milovidov
661a117b91 Added assertion [#CLICKHOUSE-2] 2018-12-21 19:03:40 +03:00
Alexey Milovidov
a8f09809f5 Simplified logic with "IColumn::convertToFullColumnIfConst" (suggested by Amos Bird) [#CLICKHOUSE-2] 2018-12-21 19:00:07 +03:00
Boris Granveaud
d776d1164a support for IF EXISTS/IF NOT EXISTS in ALTER TABLE ADD/DROP/CLEAR/MODIFY/COMMENT COLUMN 2018-12-21 15:53:00 +01:00
alesapin
6f7333840a Move header with compression info to another place 2018-12-21 16:25:39 +03:00
alesapin
7c11455bd3 Remove compression settings 2018-12-21 15:17:30 +03:00
alesapin
5b23210062 Merge branch 'master' into custom_compression_codecs 2018-12-21 11:57:21 +03:00
alexey-milovidov
b1602a5e62
Merge pull request #3887 from yandex/remove-alter-primary-key 
Remove ALTER MODIFY PRIMARY KEY command
 2018-12-20 22:21:08 +03:00
Alexey Zatelepin
b7afe46dfd remove ALTER MODIFY PRIMARY KEY command [#CLICKHOUSE-4214] 2018-12-20 21:57:20 +03:00
alexey-milovidov
d9e8cd46da
Merge pull request #3879 from yandex/setting-low_cardinality_allow_in_native_format 
Added low_cardinality_allow_in_native_format setting.
 2018-12-20 21:02:02 +03:00
Alexey Milovidov
b7b418a6f5 Renamed setting #3851 2018-12-20 20:48:11 +03:00
alesapin
aee6c0a606 Remove dump code 2018-12-20 20:37:02 +03:00
alexey-milovidov
3cefb27e56
Merge pull request #3851 from abyss7/issue-3592 
Refactor constant folding
 2018-12-20 19:26:02 +03:00
alesapin
0ae14be8d2 Fix codes 2018-12-20 13:44:20 +03:00
alesapin
512fe3c854 Refactoring (sanitizer failure) 2018-12-19 20:20:18 +03:00
Nikolai Kochetov
0f8f5836fb Fix build. 2018-12-19 19:55:01 +03:00
Ivan Lezhankin
b9440fe99d Another minor refactoring. 2018-12-19 15:38:13 +03:00
proller
b213ee5e5d
Fix macos build (#3863) 2018-12-18 20:41:03 +03:00
proller
c63ca042ba
Fix macos build (#3861) 2018-12-18 16:37:00 +03:00
alesapin
6fe01af829 Merge branch 'master' into custom_compression_codecs 2018-12-18 14:06:11 +03:00
Alexey Milovidov
d1237afdb7 Miscellaneous [#CLICKHOUSE-2] 2018-12-18 04:26:12 +03:00
proller
b1234b86c3 Macos fix 2018-12-17 20:59:10 +03:00
Ivan Lezhankin
1a539b3a6d Merge remote-tracking branch 'upstream/master' into issue-3592 2018-12-17 19:30:20 +03:00
Ivan Lezhankin
6df757c6f7 Refactor constant folding and make it reusable for primary_key_expr 2018-12-17 17:59:01 +03:00
proller
3a9bd8a773 Fix macos build 2018-12-17 17:10:23 +03:00
alesapin
36a6121f75 Merge branch 'master' into custom_compression_codecs 2018-12-17 12:56:21 +03:00
alexey-milovidov
7cc867de0a
Merge branch 'master' into background-processing-pool-backoff 2018-12-14 17:41:55 +03:00
proller
add14ee00b Fix unsuccessful run of StorageSystemContributors on release 2018-12-14 16:44:10 +03:00
alesapin
29e2bbaa94 Merge remote-tracking branch 'origin' into custom_compression_codecs 2018-12-14 11:24:23 +03:00
zhang2014
6d0c4eaf89 ISSUES-838 add lz4、none、zstd codec 2018-12-13 12:10:34 +08:00
Emmanuel Donin de Rosière
7d7acb92da Merge remote-tracking branch 'upstream/master' 2018-12-12 15:02:52 +01:00
alexey-milovidov
7af621f6f7
Merge pull request #3728 from amosbird/join 
Versatile StorageJoin
 2018-12-10 23:16:53 +03:00
KochetovNicolai
635b16ac4b
Update MergeTreeDataPart.cpp 
Skip size check for LowCardinality column file.
 2018-12-10 20:47:18 +03:00
Emmanuel Donin de Rosière
982cd749be Better management of DateTime partitionning #3786 
Adding min_time and max_date in system.parts table
 2018-12-10 11:20:19 +01:00
alexey-milovidov
0fdb3b9628
Merge branch 'master' into issue-3578 2018-12-07 23:53:34 +03:00
alesapin
21f8a86635 Merge branch 'chenxing-xc-master' 2018-12-07 17:13:11 +03:00
alesapin
80b49e4c0a Add integration test, put dependent libs to contrib, slightly refine 
code.
 2018-12-07 14:41:24 +03:00
alexey-milovidov
68b5f02b10
Merge pull request #3683 from nicelulu/update_23 
Compatible with LowCardinality type data write
 2018-12-07 07:17:07 +03:00
alexey-milovidov
4305509236
Update DistributedBlockOutputStream.cpp 2018-12-07 07:15:26 +03:00
alexey-milovidov
e7f4d5a12b
Update DistributedBlockOutputStream.cpp 2018-12-07 07:14:52 +03:00
Alexey Milovidov
f3c72daf50 Fixed name [#CLICKHOUSE-2] 2018-12-07 06:21:17 +03:00
chertus
60dc8fcac2 fixes for review CLICKHOUSE-3578 2018-12-06 20:20:17 +03:00
Ivan Lezhankin
57c5dbcd2b Code clean-up 2018-12-05 18:48:06 +03:00
Ivan Lezhankin
887e1089f1 Merge branch 'master' into kanterov_skip_unused_shards 2018-12-05 18:17:04 +03:00
Alexey Zatelepin
c9b97ae86c fix unexpected modification of original ORDER BY ast [#CLICKHOUSE-3859] 2018-12-05 17:02:34 +03:00
chertus
8500335ef5 cleanup unused code 2018-12-05 15:49:15 +03:00
chertus
1a7313eaa0 resolve class name conflict 2018-12-05 15:27:21 +03:00
chertus
3db00b7b98 Merge branch 'master' into issue-3578 2018-12-05 14:43:14 +03:00
chertus
a71d03737c send defaults via serialized ColumnsDescription CLICKHOUSE-3578 2018-12-04 23:03:04 +03:00
alesapin
a956efe0a8 Comment debug info 2018-12-04 19:33:35 +03:00
alesapin
7925abcd74 Deep debugging 2018-12-04 17:44:42 +03:00
chertus
933c055104 CLICKHOUSE-3578 review proress 2018-12-04 17:09:47 +03:00
alesapin
8c34386310 Some debug 2018-12-04 11:05:58 +03:00
chenxing.xc
b4ee9cf17b address comments 2018-12-04 11:48:38 +08:00
root
8c9e9649fb Add test and code comment. 2018-12-03 21:11:26 +08:00
root
fb06c5ab6b Merge remote-tracking branch 'master/master' into update_23 2018-12-03 19:20:35 +08:00
alesapin
03ce4c5bc5
Merge branch 'master' into master 2018-12-03 13:02:34 +03:00
alesapin
bf338b957f Merge master 2018-12-03 12:10:06 +03:00
alesapin
3efb00b0ef Some debug 2018-12-03 11:52:21 +03:00
zhang2014
994d1c0fe0 fix excessive copy 2018-12-03 13:26:27 +08:00
alexey-milovidov
48b30edcf5
Merge branch 'master' into alter-order-by 2018-12-02 21:06:38 +03:00
alexey-milovidov
af110b8202
Merge pull request #3693 from yandex/simplier_merge_read_logic 
Simplify merge stream read logic
 2018-12-02 20:59:43 +03:00
Amos Bird
65b654a1b6 Versatile StorageJoin 
This commit does the following:

1. StorageJoin with simple keys now supports reading
2. StorageJoin can be created with Join settings applied. Syntax is
similar to MergeTree and Kafka
3. Left Any StorageJoin with one simple key can be used as a
dictionary-like structure by function joinGet.

Examples are listed in the related test file.
 2018-12-02 16:49:39 +08:00
zhang2014
4798ab1924 Use cluster connections pool in DirectoryMonitor 2018-12-02 01:45:29 +08:00
Vitaly Baranov
7c03b35bc4 CLICKHOUSE-4127: Fix assertion in debug build. 
Do reading faster if the structure isn't altered.
 2018-12-01 15:42:56 +03:00
Alexey Milovidov
024a4ba73c Fixed build after merge #3689 2018-12-01 02:52:20 +03:00
alexey-milovidov
bf7b68cf95
Merge pull request #3689 from abyss7/CLICKHOUSE-3936 
CLICKHOUSE-3936
 2018-12-01 01:50:04 +03:00
alesapin
5524b77915 Compilable code! 2018-11-30 18:36:10 +03:00
Alexey Zatelepin
2d71338b78 examine structure of the destination table of Buffer storage under lock 2018-11-30 18:34:24 +03:00
proller
cd2af4b6d2 Update Contributors 2018-11-30 16:49:53 +03:00
alesapin
f83ed167ac Merge branch 'simplier_merge_read_logic', remote-tracking branch 'origin' into adaptive_index_granularity 2018-11-29 18:21:46 +03:00
alesapin
51f73651dd Inject columns after creating header 2018-11-29 18:16:08 +03:00
alesapin
8e8bc6b1e0 Trash commits 2018-11-29 16:50:34 +03:00
alesapin
497a09c41b Return to adaptive granularity 2018-11-29 16:12:20 +03:00
alesapin
fc379c1d5c Inject column names before types 2018-11-29 15:03:58 +03:00
alesapin
b2fd3e804a Add special logic for alter 2018-11-29 14:55:34 +03:00
alesapin
e2e88324d0 Rename MergeTree streams for select 2018-11-29 12:19:42 +03:00
alesapin
a0862efc17 Merge remote-tracking branch 'origin/master' into simplier_merge_read_logic 2018-11-29 10:58:45 +03:00
Alexey Milovidov
b4d218a890 Fixed race condition, part 1 (ad-hoc) [#CLICKHOUSE-2] 2018-11-28 21:40:02 +03:00
alesapin
d4059ba507 Inject default column 2018-11-28 20:21:27 +03:00
Alexey Zatelepin
f425803418 don't overwrite table metadata file in case of offline ALTER after ATTACH [#CLIKCHOUSE-3859] 2018-11-28 19:05:29 +03:00
Ivan
448846fc0d
Merge branch 'master' into CLICKHOUSE-3936 2018-11-28 18:59:57 +03:00
Ivan Lezhankin
8b5a05947c Remove redundant information from RWLock. 
And fix broken exception in some race conditions
 2018-11-28 18:50:52 +03:00
Alexey Zatelepin
57f25e978a update comments and docs [#CLICKHOUSE-3859] 2018-11-28 18:12:44 +03:00
alesapin
23aa6595cd Missed file 2018-11-28 18:05:53 +03:00
alesapin
b7cdd8fe7f Trying to simplify merge reading logic 2018-11-28 18:05:28 +03:00
alexey-milovidov
6f007f45a1
Merge pull request #3673 from yandex/fix-insert-distributed-sync 
Fix insert_distributed_sync
 2018-11-28 17:48:06 +03:00
Alexey Milovidov
52fea90a86 Removed useless code [#CLICKHOUSE-2] 2018-11-28 17:33:40 +03:00
Alexey Zatelepin
1b27fb046d Merge branch 'master' into alter-order-by 
Conflicts:
	dbms/programs/server/Server.cpp
 2018-11-28 16:47:07 +03:00
Alexey Zatelepin
9ae79c60e8 get rid of (ASTPtr *) in AlterCommands::apply [#CLICKHOUSE-3859] 2018-11-28 16:34:57 +03:00
Alexey Zatelepin
ceea7bde2e better names in ZooKeeperNodeCache [#CLICKHOUSE-3859] 2018-11-28 14:40:59 +03:00
proller
dd2371e071 CLICKHOUSE-4137 DictionaryFactory, DictionarySourceFactory (#3653) 
* Split ComplexKeyCacheDictionary to faster compile (part2)

* Dictionaries as lib WIP

* wip

* clean

* Fix build with old capnp

* fix

* wip

* fixes

* fix

* clean

* clean

* clean

* wip

* wip

* wip

* flat

* wip

* cache

* clean

* wip

* faster

* fix style

* fixes

* clean

* clean

* Split CacheDictionary.cpp for faster compile

* fix

* fix

* Less memory usage while compiling

* missing file

* format

* Update registerDictionaries.h

* clean
 2018-11-28 14:37:12 +03:00
root
6f699e9f94 b 2018-11-28 14:22:21 +08:00
root
5a120db014 Compatible with LowCardinality type data write 2018-11-28 14:19:45 +08:00
root
94164ef250 Compatible with LowCardinality type data write 2018-11-28 12:51:04 +08:00
root
c19199e23e Merge remote-tracking branch 'master/master' 2018-11-28 12:46:25 +08:00
Alexey Milovidov
b1bc7481d9 Whitespace #3603 2018-11-27 21:43:55 +03:00
alexey-milovidov
a12927a439
Merge pull request #3603 from vitlibar/CLICKHOUSE-4127 
CLICKHOUSE-4127: Fix ALTER of destination table for the BUFFER engine.
 2018-11-27 21:38:40 +03:00
Alexey Zatelepin
e085bc9816 adapt code of #3609 [#CLICKHOUSE-3859] 2018-11-27 20:07:10 +03:00
Ivan Lezhankin
470f96ce19 Minor refactoring 2018-11-27 19:45:45 +03:00
Alexey Milovidov
dba43be6c8 Fixed race condition in BackgroundProcessingPool [#CLICKHOUSE-2] 2018-11-27 17:59:10 +03:00
Vitaly Baranov
44ca56c731 CLICKHOUSE-4127: Convert destination table's data when reading from 
StorageBuffer.
 2018-11-27 03:43:58 +03:00
alexey-milovidov
7e9e5c383a
Merge pull request #3670 from abyss7/CLICKHOUSE-3766 
Rename method partition() → alterPartition()
 2018-11-26 20:09:37 +03:00
alexey-milovidov
a7d75c527b
Merge pull request #3652 from yandex/unquote-partition 
Don't quote single-field partition keys
 2018-11-26 19:57:01 +03:00
Alexey Zatelepin
01501fa8db correct column list for rewritten INSERT query into Distributed [#CLICKHOUSE-4161] 2018-11-26 17:57:25 +03:00
Ivan Lezhankin
73aa7f2027 Rename method partition() → alterPartition() 
Also fix build with internal shared libraries.
 2018-11-26 17:43:40 +03:00
Alexey Zatelepin
d3d9242462 Merge branch 'master' into alter-order-by 
Conflicts:
	dbms/src/Parsers/ASTAlterQuery.h
	dbms/src/Parsers/ParserAlterQuery.cpp
	dbms/src/Storages/AlterCommands.cpp
	dbms/src/Storages/AlterCommands.h
 2018-11-26 16:01:48 +03:00
Alexey Zatelepin
3a3dda5ec5 use standard Tuple serialization [#CLICKHOUSE-4054] 2018-11-26 15:41:17 +03:00
Alexey Milovidov
5a0feee45e Removed "conditional computations" feature, because it is not ready #2272 2018-11-26 04:39:04 +03:00
Alexey Milovidov
c77930fe30 Whitespaces [#CLICKHOUSE-2] 2018-11-26 03:56:50 +03:00
chenxing.xc
ff6e849c0f address review comments | 2018-11-25 12:22:01 +08:00
Alexey Milovidov
7d6fffff48 More style checks [#CLICKHOUSE-3] 2018-11-24 04:48:06 +03:00
Alexey Milovidov
cc06488ddc Whitespace #2601 2018-11-24 03:10:51 +03:00
alexey-milovidov
507990d5f2
Merge branch 'master' into master 2018-11-23 23:41:38 +03:00
Alexey Milovidov
dbbacf4f87 Added more style checks [#CLICKHOUSE-3] 2018-11-23 21:52:00 +03:00
alexey-milovidov
af013285e9
Merge branch 'master' into base64_functions 2018-11-23 21:33:56 +03:00
alexey-milovidov
0822f500f8
Merge pull request #3642 from yandex/odbc_bridge_die_with_server 
ODBC bridge die with server
 2018-11-23 16:44:53 +03:00
alexey-milovidov
c6bc4279ee
Merge pull request #3377 from s-mx/CLICKHOUSE-4032 
Added support for column COMMENTs in table definition.
 2018-11-23 16:43:58 +03:00
alexey-milovidov
429d65e4f7
Update StorageReplicatedMergeTree.h 2018-11-23 01:08:00 +03:00
alexey-milovidov
6d7aa73e44
Update StorageReplicatedMergeTree.cpp 2018-11-23 01:07:35 +03:00
alexey-milovidov
9580a87409
Update StorageReplicatedMergeTree.cpp 2018-11-23 01:06:02 +03:00
alexey-milovidov
6f1846f1cc
Update StorageReplicatedMergeTree.cpp 2018-11-23 01:05:36 +03:00
alexey-milovidov
65e6d447b8
Update StorageReplicatedMergeTree.cpp 2018-11-23 01:04:25 +03:00
alexey-milovidov
4cfb51b14e
Update StorageReplicatedMergeTree.cpp 2018-11-23 01:03:51 +03:00
Alexey Milovidov
c0e97a97cd Resolved inconsistencies in documentation #3539 2018-11-23 01:00:03 +03:00
Alexey Milovidov
d3bb69be74 More correct documentation + miscellaneous name change #3644 2018-11-23 00:27:52 +03:00
alexey-milovidov
49d2d8a1b8
Merge pull request #3644 from proller/fix4 
Add VERSION_INT (ClickHouse version in integer format like 18014009) …
 2018-11-23 00:22:19 +03:00
alexey-milovidov
2c2d75cceb
Don't allow exceptions without code (#3645) 
* Don't allow exceptions without code #3633

* Don't allow exceptions without code #3633
 2018-11-23 00:19:58 +03:00
alexey-milovidov
b680029030
Update ColumnsDescription.cpp 2018-11-22 22:36:56 +03:00
proller
f410c93fb1 Add VERSION_INT (ClickHouse version in integer format like 18014009) to system.metrics and system.build_options 2018-11-22 21:24:38 +03:00
alesapin
1e879850bb Kill odbc-bridge with clickhouse-server 2018-11-22 18:59:00 +03:00
Sabyanin Maxim
3a67b505c5 Merge branch 'master' of https://github.com/yandex/ClickHouse into CLICKHOUSE-4032 2018-11-22 16:54:10 +03:00
Sabyanin Maxim
060fce3899 make ReplicatedMergeTree work with comments. ignore empty comments when make column_comments hashmap 2018-11-22 16:51:43 +03:00
Alexey Milovidov
ab5d76fc42 Fixed error introduced in #3553 and prevent it happening 2018-11-21 23:56:37 +03:00
proller
1d40c2c871 Better link and deps (#3631) 
* try fix 1

* Better deps

* fix

* fix

* fix

* Update CMakeLists.txt

* Update CMakeLists.txt

* fix

* fix

* fix

* disable old

* Update find_odbc.cmake
 2018-11-21 22:20:27 +03:00
小路
0bf4aa46db
Merge branch 'master' into click_update 2018-11-21 22:40:05 +08:00
alexey-milovidov
5038f13b08
Merge pull request #3514 from abyss7/CLICKHOUSE-3766 
Implement 'ALTER … FREEZE' command
 2018-11-21 07:17:21 +03:00
alexey-milovidov
5cf9beabe3
Update StorageDistributed.cpp 2018-11-21 07:02:56 +03:00
alexey-milovidov
f67e54dbf3
Merge pull request #3594 from yandex/CLICKHOUSE-4112 
Add http connection pool between replicas
 2018-11-21 06:57:22 +03:00
alesapin
57ea89c5f3 Merge branch 'master' into CLICKHOUSE-4112 2018-11-20 20:23:08 +03:00
Ivan Lezhankin
1e070a7c51 Move FREEZE_ALL command source code inside |PartitionCommand| 2018-11-20 20:13:59 +03:00
Marek Vavruša
8fad726d95 Added null guards for all CurrentThread::attachToIfDetached() 
refs #3622
 2018-11-20 09:10:34 -08:00
Ivan Lezhankin
74fe350451 Refactor partition commands handling into separate interface method. 2018-11-20 17:59:34 +03:00
alesapin
00f1329c59 Merge branch 'master' of github.com:yandex/ClickHouse 2018-11-20 17:04:07 +03:00
alexey-milovidov
a008a41374
Merge pull request #3609 from s-mx/CLICKHOUSE-4090 
Add primary_key, order_key, partition_key and sample_key to system.tables.
 2018-11-20 16:39:54 +03:00
Sabyanin Maxim
7d175e4666 Merge branch 'CLICKHOUSE-4090' of github.com:s-mx/ClickHouse into CLICKHOUSE-4090 2018-11-20 15:22:54 +03:00
Sabyanin Maxim
e3fc18fcb8 add getters of expressions names in StorageReplicatedMergeTree 2018-11-20 15:19:12 +03:00
root
3df876d541 better 2018-11-20 19:02:45 +08:00
root
e7e94826a7 Merge branch 'update_22' of https://github.com/nicelulu/ClickHouse into update_22 2018-11-20 18:59:19 +08:00
root
811c7e9aef better 2018-11-20 18:55:40 +08:00
root
f69524cf49 better 2018-11-20 18:50:42 +08:00
小路
74579138b8
Merge branch 'click_update' into update_22 2018-11-20 16:51:55 +08:00
root
cc7ec374d5 better 2018-11-20 16:10:33 +08:00
Sabyanin Maxim
4ac727e7ad fix style 2018-11-19 20:21:34 +03:00
alexey-milovidov
72fb78a0f8
Update StorageBuffer.cpp 2018-11-19 18:20:34 +03:00
alexey-milovidov
9a3701cc50
Update StorageBuffer.cpp 2018-11-19 18:20:05 +03:00
alexey-milovidov
33eb64269f
Update StorageBuffer.cpp 2018-11-19 18:14:44 +03:00
alexey-milovidov
5a40a67500
Update StorageSystemColumns.cpp 2018-11-19 18:07:43 +03:00
alexey-milovidov
6ad4519c81
Update IStorage.h 2018-11-19 18:05:48 +03:00
Sabyanin Maxim
08fc057a15 make is_in_primary_key and etcetera work. add test. 2018-11-19 17:31:16 +03:00
chenxing.xc
76843c2dc0 hdfs read support 2018-11-19 16:17:09 +08:00
Vitaly Baranov
a029034d8c CLICKHOUSE-4127: Fix ALTER of destination table for the BUFFER engine. 2018-11-19 09:14:36 +03:00
nicelulu
f96111b423 Fixed the way to get username and password. 2018-11-17 22:03:32 +08:00
chertus
b4b58b292f remove hack for StorageDistributed & insert_sample_with_metadata 2018-11-16 22:19:47 +03:00
alesapin
2a4a8d180b Try to change stupid naming 2018-11-16 16:33:43 +03:00
alesapin
0266f058c9 Merge branch 'master' into CLICKHOUSE-4112 2018-11-16 16:21:27 +03:00
alesapin
d4ce674b93 Add http connection pool between replicas 2018-11-16 16:15:17 +03:00
proller
160ffb2283
Build fixes (clang 7.0.0+) (#3582) 2018-11-16 15:22:51 +03:00
Sabyanin Maxim
49dc9939d4 fix serializing of ColumnsDescription 2018-11-16 15:01:52 +03:00
Gleb Kanterov
1b8e5f9b47 Optimization to skip unused shards for Distributed engine 
Hide behind `distributed_optimize_skip_select_on_unused_shards` setting.
 2018-11-16 10:21:06 +00:00
chertus
65d34ca231 do not override current_database in context [CLICKHOUSE-3578] 2018-11-15 18:03:13 +03:00
alesapin
6123993ec0 Load granularity to memroy 2018-11-15 17:06:54 +03:00
Sabyanin Maxim
d9e6789f78 make MergeTree work with comments 2018-11-15 16:12:27 +03:00
Sabyanin Maxim
035049d1a8 make modify column comment work 2018-11-15 01:46:39 +03:00
chertus
ebf3d60186 column defaults without CapNProto [CLICKHOUSE-3578] 2018-11-14 21:20:16 +03:00
Alexey Zatelepin
b071547b2d add checks for ALTER MODIFY ORDER BY [#CLICKHOUSE-3859] 2018-11-14 20:12:32 +03:00
alesapin
6b33008758 More fixed 2018-11-14 14:26:44 +03:00
Alexandr Krasheninnikov
177a00f09a Merge https://github.com/yandex/ClickHouse into base64_functions 2018-11-14 12:32:42 +03:00
alesapin
7ba11c8afc Add marks info 2018-11-14 10:49:45 +03:00
alesapin
b2b29815dd Change fixed index granularity to adaptive 2018-11-14 10:49:20 +03:00
Sabyanin Maxim
3e4c981db2 small changes 2018-11-13 22:17:40 +03:00
Alexey Zatelepin
29b34365e6 Merge branch 'master' into alter-order-by 
Conflicts:
	dbms/src/Interpreters/ExpressionAnalyzer.cpp
	dbms/src/Storages/MergeTree/MergeTreeData.cpp
	dbms/src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp
 2018-11-13 16:27:19 +03:00
Alexey Zatelepin
2cc0aae82c rearrange AST members in MergeTreeData [#CLICKHOUSE-3859] 2018-11-13 16:15:17 +03:00
Alexey Zatelepin
7167bfd7b3 fix prewhere with FINAL for VersionedCollapsingMergeTree [#CLICKHOUSE-3859] 2018-11-13 16:15:12 +03:00
Alexey Zatelepin
8b85822192 store original key ASTs, and not extracted ASTExpressionLists [#CLICKHOUSE-3859] 2018-11-13 16:14:44 +03:00
Alexey Zatelepin
31a6a6b4fd calculate ReplicatedMergeTreeTableMetadata diff [#CLICKHOUSE-3859] 2018-11-13 16:13:55 +03:00
Alexey Zatelepin
74c48ed226 apply metadata changes on startup [#CLICKHOUSE-3859] 2018-11-13 16:13:50 +03:00
Alexey Zatelepin
106800b857 apply changes in ReplicatedMergeTreeAlterThread [#CLICKHOUSE-3859] 2018-11-13 16:13:40 +03:00
Alexey Zatelepin
4036ec83af write metadata znode in StorageReplicatedMergeTree::alter() [#CLICKHOUSE-3859] 2018-11-13 16:13:34 +03:00
Alexey Zatelepin
0c0c4fd28d add sorting_and_primary_keys_independent [#CLICKHOUSE-3859] 2018-11-13 16:13:19 +03:00
Alexey Zatelepin
07a22100cb ALTER ORDER BY for ordinary MergeTree [#CLICKHOUSE-3859] 2018-11-13 16:13:14 +03:00
Alexey Zatelepin
02337242b5 ALTER MODIFY ORDER BY syntax [#CLICKHOUSE-3859] 2018-11-13 16:13:10 +03:00
Alexey Zatelepin
c4bf38ef07 comments [#CLICKHOUSE-3859] 2018-11-13 16:13:06 +03:00
Alexey Zatelepin
f4c26e78d2 renames [#CLICKHOUSE-3859] 2018-11-13 16:13:01 +03:00
Alexey Zatelepin
0fa86162d9 separate sorting key and primary key, allow setting primary key separately [#CLICKHOUSE-3859] 2018-11-13 16:12:55 +03:00
Alexey Zatelepin
9a92c0a55c sort key is distinct from primary key [#CLICKHOUSE-3859] 2018-11-13 16:12:49 +03:00
Alexey Zatelepin
580146eedb add primary key syntax [#CLICKHOUSE-3859] 2018-11-13 16:12:14 +03:00
Sabyanin Maxim
6296f58186 fix typo 2018-11-13 15:22:32 +03:00
Sabyanin Maxim
befaea63d2 add is_mutable method to AlterCommand. change comment column test 2018-11-13 15:08:07 +03:00
alesapin
0a64ef5de8 Add severals ifs for format_version, but have to move this routine to single class 2018-11-12 20:44:43 +03:00
alesapin
6f5fef5344 CLICKHOUSE-3971: Write data with adaptive index granularity 2018-11-12 19:14:37 +03:00
Sabyanin Maxim
b869cfed9a fixed couple of mistakes. 2018-11-12 18:45:35 +03:00
chertus
9966f975a3 Merge branch 'master' into issue-3578 2018-11-12 17:58:00 +03:00
chertus
2fe3cdb3f5 restore lost commits [CLICKHOUSE-3578] 2018-11-12 17:52:30 +03:00
Ivan Lezhankin
4eb0f33ec2 Add some locks on freeze and support |freezeAll()| for replicated merge-tree. 2018-11-12 15:26:15 +03:00
Ivan Lezhankin
baf9566413 Fix style 2018-11-12 15:26:15 +03:00
Ivan Lezhankin
5d3da110a8 Refactor |freezePartition()| and |freezeAll()| 2018-11-12 15:26:15 +03:00
abyss7
0cdb808ded Fix comments 2018-11-12 15:26:15 +03:00
Ivan Lezhankin
935615a647 Reimplement FREEZE command. 2018-11-12 15:26:14 +03:00
Ivan Lezhankin
a837060454 Lock table structure before freezing. 2018-11-12 15:26:14 +03:00
Ivan Lezhankin
03e6a29eb2 Implement 'ALTER … FREEZE' command. 
Need some tests!
 2018-11-12 15:26:14 +03:00
Sabyanin Maxim
94594d8c06 add order_key section in system.tables 2018-11-11 18:44:21 +03:00
Sabyanin Maxim
9befbd94e4 is_in_order_key, is_in_partition_key, is_in_sample_key in system.columns works, is_in_primary_key not yet 2018-11-09 18:39:21 +03:00
Nikolai Kochetov
1e9aeba603 Split ExpressionAnalyzer and SyntaxAnalyzer. 2018-11-09 18:01:18 +03:00
Sabyanin Maxim
ac6aaa37b5 add is_primary_key, is_order_key, is_partition_key, is_sampling_key sections in system.columns 2018-11-09 15:02:08 +03:00
Sabyanin Maxim
51c7284583 add getSecondaryExpression 2018-11-09 12:41:52 +03:00
Sabyanin Maxim
c9d8dc6171 add primary_key, partition_key, sampling_key sections in system.tables. add getPartitionExpression method in IStorage. 2018-11-08 20:45:41 +03:00
Nikolai Kochetov
726ae0cb9a Split ExpressionAnalyzer and SyntaxAnalyzer. 2018-11-08 19:47:12 +03:00
Sabyanin Maxim
f8f2779f7b make ColumnComment just a hashmap 2018-11-08 15:03:42 +03:00
Sabyanin Maxim
dacd999d4f Merge branch 'master' into CLICKHOUSE-4032 2018-11-06 16:50:07 +03:00
Sabyanin Maxim
bdcdc15b1e fixed comment test. 
remove ColumnComment struct.
style fixes
 2018-11-06 16:26:43 +03:00
chertus
2f5fb25de6 Merge branch 'master' into joins 2018-11-02 13:39:19 +03:00
proller
c2a818b64d StorageSystemContributors clean (#3524) 
* StorageSystemContributors clean

* Fix
 2018-11-01 21:01:10 +03:00
alexey-milovidov
b1db9ec23c
Merge pull request #3436 from amosbird/master 
Flexible fields assignment
 2018-11-01 20:22:28 +03:00
alexey-milovidov
4dedead38f
Update StorageSystemDataTypeFamilies.cpp 2018-11-01 20:21:43 +03:00
alexey-milovidov
1a4a99377a
Update StorageSystemFunctions.cpp 2018-11-01 20:21:15 +03:00
alexey-milovidov
e10fd083ef
Update StorageSystemFunctions.cpp 2018-11-01 20:20:41 +03:00
alexey-milovidov
ac10a55b6f
Update StorageSystemDataTypeFamilies.cpp 2018-11-01 20:20:14 +03:00
proller
f86d1a7034 CONTRIB-254 Arcadia fixes (#3475) 
* Macos: set ENABLE_EMBEDDED_COMPILER=0 by default (because contrib/llvm temporary broken under macos)

* \n

* arcadia fix

* fix arcadia link

* wip

* wip

* wip

* fix

* wip

* wip

* fix

* try use users from server dir

* Revert "try use users from server dir"

This reverts commit 79b2c6fd9c.

* Fix logging

* fix

* Update ZooKeeperImpl.h
 2018-11-01 20:07:20 +03:00
chertus
d6defafad2 use AddDefaultDatabaseVisitor for views [CLICKHOUSE-3145] 2018-11-01 17:49:37 +03:00
proller
71403c3ff8 StorageSystemContributors.sh debug (#3491) 
* Sql fuzzy test

* wip

* wip

* wip

* wip

* wip

* Build fixes

* better

* bugs

* wip

* fix

* Fix test

* build fixes

* better

* wip

* fix test

* StorageSystemContributors.sh debug

* debug

* wip

* more

* Fix jemalloc include

* more
 2018-11-01 17:07:14 +03:00
proller
a7437b93a9 Commited StorageSystemContributors.generated.cpp (#3510) 
* CLICKHOUSE-4085 system.contributors

* fi

* Fix random

* Commited StorageSystemContributors.generated.cpp

* fix

* Update CMakeLists.txt
 2018-11-01 17:05:37 +03:00
Artem Zuikov
eb535c4b9b
Merge pull request #3500 from 4ertus2/joins 
refactoring: one place for db and table extraction from AST
 2018-11-01 14:59:56 +03:00
chertus
3931a4db5c Merge branch 'master' into joins 2018-10-31 18:11:23 +03:00
alesapin
791a1422de Enable merge with DIRECT_IO when summary size of participating parts more than 10GB 2018-10-31 12:24:58 +03:00
chertus
4ff0391ca6 DatabaseAndTableWithAlias - the only place for db & table expraction from AST 2018-10-30 19:31:21 +03:00
chertus
d2518fdb3f more refactoring: funcs to extract database_and_table from AST 2018-10-29 22:04:28 +03:00
Alex Zatelepin
83ac918bab
Merge pull request #3477 from hotid/master 
stop generating empty WHERE () section in mysql queries (#3431)
 2018-10-29 18:23:14 +03:00
Alex Zatelepin
fc99b7d389
style fixes 2018-10-29 17:17:58 +03:00
Sabyanin Maxim
73e9f5057d fix code style checker errors 2018-10-27 23:39:59 +03:00
Sabyanin Maxim
65bd40e290 Merge branch 'master' of github.com:yandex/ClickHouse into CLICKHOUSE-4032 2018-10-27 22:33:52 +03:00
proller
c35c979285 CLICKHOUSE-4085 system.contributors (#3452) 
* CLICKHOUSE-4085 system.contributors

* fi

* Fix random
 2018-10-26 20:43:50 +03:00
hotid
f22779ad15 stop generating empty WHERE () section in mysql queries 2018-10-26 20:14:43 +03:00
Amos Bird
3cf2177268 Flexible fields assignment 
Field f;

before:

f = Int64(-42);

after:

f = -42;
 2018-10-24 08:47:33 +08:00
alexey-milovidov
bb00bb8592
Merge pull request #3405 from yandex/CLICKHOUSE-2211 
CLICKHOUSE-2211: Fix aio reading (with correct buffer size), reduce M…
 2018-10-24 01:37:05 +03:00
alesapin
72e435893d Better comment 2018-10-23 14:19:01 +03:00
Alexey Milovidov
bac6b6f381 Fixed error #2863 2018-10-23 11:19:47 +03:00
Alexey Milovidov
b8cfa77ea0 Fixed build [#CLICKHOUSE-2] 2018-10-22 23:58:16 +03:00
alexey-milovidov
98c2ed582c
Merge pull request #2863 from VadimPE/ISSUES-2581 
ISSUES-2581 fix SELECT with sequential consistency
 2018-10-22 23:55:33 +03:00
alexey-milovidov
2deb510c59
Merge branch 'master' into master 2018-10-22 23:45:26 +03:00
alexey-milovidov
00d49602d3
Merge pull request #3404 from CurtizJ/CLICKHOUSE-3274 
Add lock for .inner. table while insert.  [CLICKHOUSE-3274]
 2018-10-22 23:32:12 +03:00
VadimPE
31794b7a46 fix codestyle 2018-10-22 14:58:56 +03:00
proller
2659e94573 Fix use after pop_back() 2018-10-19 20:27:38 +03:00
proller
67eb30d192 CLICKHOUSE-4074 Fix merge_tree_uniform_read_distribution=0 2018-10-19 19:31:51 +03:00
proller
abfe675097
Build fixes (#3419) 2018-10-18 22:28:05 +03:00
Marek Vavruša
37e03bd938 StorageKafka: check dependencies recursively, add max_block setting 
Changes:

* Check table dependencies recursively before starting streaming
* Use actual number of created consumers when streaming
* Add size limits hint to Kafka consumer stream
* Configurable `kafka_max_block_size` per table
 2018-10-18 09:20:34 -07:00
VadimPE
f2db463ab0 fix bug with merge part, wich us inserted with quorum 2018-10-18 17:14:07 +03:00
VadimPE
451114c9a3 rename partition -> part 2018-10-18 15:16:53 +03:00
VadimPE
4a93d3b836 fix addedparts 2018-10-18 14:51:40 +03:00
alesapin
87bb06fdd8 CLICKHOUSE-2211: Add exception for impossible case 2018-10-18 12:24:16 +03:00
alesapin
fe6406eac1 CLICKHOUSE-2211: Fix accident delition 2018-10-17 19:18:14 +03:00
alesapin
d78d569d42 CLICKHOUSE-2211: Fix aio reading (with correct buffer size), reduce MergeTreeReader creation and add useless test 2018-10-17 17:56:15 +03:00
CurtizJ
d81ed27004 add lock for .inner. table 2018-10-17 17:08:52 +03:00
Alexey Milovidov
99a64d3b92 Presumably better #2278 2018-10-17 06:13:00 +03:00
Alexey Milovidov
7c4d24ce39 Added comment [#CLICKHOUSE-3901] 2018-10-17 00:25:45 +03:00
Alexey Milovidov
98543b7c41 Fixed vertical merge of multidimensional Nested structures [#CLICKHOUSE-3901] 2018-10-17 00:22:41 +03:00
Sabyanin Maxim
e050bc0428 Merge branch 'master' into CLICKHOUSE-4032 2018-10-14 18:35:45 +03:00
Sabyanin Maxim
ab050c8466 add comment section in column declaration. 
add comment column type in alter method.
add comment section in system.columns.
 2018-10-14 18:30:06 +03:00
Kirill Shvakov
5600c35847 check drop type 2018-10-14 00:37:16 +03:00
Kirill Shvakov
0f509b9eb5 ReplicatedMergeTree: send drop request to the leader replica 2018-10-13 23:58:04 +03:00
Alexey Milovidov
f720a5bf95 Fixed typos in code #3373 2018-10-13 17:33:43 +03:00
Vadim
25b100c1f0
Update StorageReplicatedMergeTree.cpp 2018-10-10 19:23:50 +03:00
VadimPE
4db6eab5a3 ISSUES-2581 fix name 2018-10-10 19:20:15 +03:00
Alexey Zatelepin
d9a0432c6c don't quote single-field partition keys #3109 [#CLICKHOUSE-4054] 2018-10-10 18:57:04 +03:00
VadimPE
d4a56af660 ISSUES-2581 fix bug with new partition 2018-10-10 16:22:55 +03:00
alesapin
8591038748 Fix style and clang build 2018-10-10 11:38:54 +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
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
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
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
Nikolai Kochetov
b1fa3fab9d Fix prewhere whith final. #2827 2018-10-04 21:18:54 +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
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
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
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
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
Nikolai Kochetov
97add69825 Rename WithDictionary to LowCardinality. 2018-09-28 13:44:59 +03:00
Alexander Krasheninnikov
ceea4b9b33 New bridge interaction, quote identifier via api 2018-09-28 05:46:33 +03:00
Alexandr Krasheninnikov
4b431264db Implement quote getter from ODBC 2018-09-27 18:23:42 +03:00
CurtizJ
90240cb64b support database and table macros 2018-09-27 13:01:10 +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
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
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
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
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 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
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
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
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
a2d8ee1caa
Merge pull request #3183 from 4ertus2/refactoring 
refactoring: hide ASTIdentifier kind
 2018-09-20 20:38:06 +03:00
VadimPE
3547334ba5 fix 2018-09-20 17:39:02 +03:00
VadimPE
c377389f62 CLICKHOUSE-3947 add LIKE and IN () 2018-09-20 17:34:30 +03:00
Alexey Zatelepin
0ec0a24bc9 fix use of temp variable after it gets out of scope 2018-09-20 16:55:22 +03:00
chertus
6442b5b167 refactoring: hide ASTIdentifier kind 2018-09-20 16:13:33 +03:00
alesapin
b87a084f38 Strict order of evaluated and added columns 2018-09-20 14:16:15 +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
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
VadimPE
f05d93897b Del old class 2018-09-19 14:10:56 +03:00
VadimPE
17ffa8c310 fix class for added parts 2018-09-19 14:08:04 +03:00
VadimPE
96b117cb00 Revert "Update ReplicatedMergeTreeQuorumWriter.h" 
This reverts commit e3add7f0c7.
 2018-09-19 13:23:52 +03:00
Nikolai Kochetov
501940fa7e Fix reading from merge over distributed with prewhere. 2018-09-18 22:01:29 +03:00
alexey-milovidov
ded83c215c
Merge pull request #3150 from splichy/fix-storage-kafka-arg-schema 
Fix Storage Kafka: Schema positional argument number
 2018-09-17 21:49:48 +03:00
alexey-milovidov
13779bc75d
Merge pull request #3152 from zhang2014/fix/ISSUES-3149 
ISSUES-3149 fix incorrectly masks rows in views
 2018-09-17 18:57:47 +03:00
zhang2014
745696b888 ISSUES-3149 fix incorrectly masks rows in views 2018-09-17 23:30:15 +08:00
Vadim
e3add7f0c7
Update ReplicatedMergeTreeQuorumWriter.h 2018-09-17 16:05:20 +03:00
Vadim
3fabac31f6
Update ReplicatedMergeTreeQuorumWriter.h 2018-09-17 16:02:30 +03:00
Vadim
3b155638a0
Update ReplicatedMergeTreeQuorumWriter.h 2018-09-17 15:54:20 +03:00
Vadim
df9a01585a
Update ReplicatedMergeTreeQuorumWriter.h 2018-09-17 15:51:42 +03:00
Vadim
4dee095b9d
Update MergeTreeDataSelectExecutor.cpp 2018-09-17 15:43:14 +03:00
Vadim
204e1d437f
Merge branch 'master' into ISSUES-2581 2018-09-17 15:30:08 +03:00
VadimPE
5defbadb4a Add new class for write new parts 2018-09-17 15:28:29 +03:00
Vojtech Splichal
5aca7f3c6e Fix Storage Kafka: Schema positional argument number 
I hereby agree to the terms of the CLA available at: https://yandex.ru/legal/cla/?lang=en
 2018-09-17 13:01:10 +02:00
Alexey Milovidov
7f27f0e4ca Fixed build #3146 2018-09-17 06:44:29 +03:00
Alexey Milovidov
5e3b507bd6 Added functions "toISOWeek", "toISOYear", "toStartOfISOYear" [#CLICKHOUSE-3988] 2018-09-17 06:09:56 +03:00
alexey-milovidov
a26e6935da
Merge pull request #3123 from Enmk/Issue_2093_Support_arbitrary_type_for_ranges_in_range_hashed_dictionary 
Added support of int-based types: Int\UInt(8,16,32), Date, DateTime f…
 2018-09-14 22:10:13 +03:00
zhang2014
7a87da78d7 ISSUES-3110 fix merge and distributed engine query stage 2018-09-14 18:16:27 +08:00
alexey-milovidov
92b2cc6625
Merge pull request #3107 from zhang2014/fix/ISSUES-3105 
ISSUES-3105 fix some bugs in the predicate optimizer
 2018-09-13 22:19:11 +03:00
Vasily Nemkov
99560e06f8 Added support of int-based types: Int\UInt(8,16,32), Date, DateTime for range_hashed dictionary. 
Fixes #2093
Added type checks for .range_min and .range_max
Allowed nullable range values in dictionary source
Added test for range_hashed dictionaries
 2018-09-13 18:19:55 +03:00
VadimPE
560e131493 fix bug with old version 2018-09-13 15:53:32 +03:00
zhang2014
25f79593a2 ISSUES-3105 fix some bugs in the predicate optimizer 2018-09-13 20:08:27 +08:00
Alexey Milovidov
59f8313b83 utils/check-style/check-style 2018-09-13 06:34:58 +03:00
alexey-milovidov
0223225a05
Merge pull request #3035 from yandex/alter-update 
ALTER UPDATE
 2018-09-13 06:03:35 +03:00
Alexey Milovidov
2d43715058 Fixed build (clang version 7.0.0 (trunk 334145) cannot eat this code) #3103 2018-09-13 04:22:22 +03:00
alexey-milovidov
fd630179ec
Merge pull request #3103 from yandex/dont-fetch-unchanged-mutated-parts 
Don't fetch parts not changed by mutations
 2018-09-13 04:00:31 +03:00
alesapin
ca2334f992 Fix build 2018-09-12 22:57:14 +03:00
alesapin
17a8fb86dc CLICKHOUSE-3970: Rename variable 2018-09-12 21:19:47 +03:00
alesapin
c38e3e7890 CLICKHOUSE-3970: Add logging 2018-09-12 20:28:59 +03:00
alesapin
1664bec008 CLICKHOUSE-3970: Add setting for O_DIRECT for big merges 2018-09-12 20:19:52 +03:00
alexey-milovidov
481d8f11f1
Merge pull request #3097 from zhang2014/fix/ISSUES-3059 
ISSUES-3059 fix nullable type argument for aggregate function
 2018-09-12 07:41:10 +03:00
alexey-milovidov
0751290dca
Merge pull request #3099 from VadimPE/CLICKHOUSE-3839 
CLICKHOUSE-3839 add partition_id in system.merges
 2018-09-12 07:38:43 +03:00
Alexey Zatelepin
6da58aedd8 don't fetch mutated part if we have local part with the same checksums [#CLICKHOUSE-3937] 2018-09-11 19:41:01 +03:00
zhang2014
7af592d8e1 ISSUES-3059 fix nullable type argument for aggregate function 2018-09-11 19:33:14 +08:00
VadimPE
5da1561e69 CLICKHOUSE-3839 2018-09-11 14:16:40 +03:00
alexey-milovidov
4793e620be
Merge pull request #3093 from yandex/fix-columns-ordering 
Fix columns ordering in MergeTreeRangeReader
 2018-09-10 20:26:45 +03:00
Nikolai Kochetov
2ea009bddc Fix columns ordering. 2018-09-10 18:28:03 +03:00
alexey-milovidov
20d5ddd58c
Merge branch 'master' into alter-update 2018-09-10 17:17:10 +03:00
alexey-milovidov
3054e62e00
Merge pull request #3089 from VadimPE/CLICKHOUSE-3839 
CLICKHOUSE-3839 add virtual column "_partition_id"
 2018-09-10 17:16:21 +03:00
VadimPE
10ab9587a2 CLICKHOUSE-3839 add virtual column _partition_id 2018-09-10 12:53:13 +03:00
Alexey Milovidov
c9b612de48 Attempt to fix CLICKHOUSE-3888 bug 2018-09-10 06:59:48 +03:00
Alexey Milovidov
54ea7b0b20 Fixed error [#CLICKHOUSE-2] 2018-09-09 06:28:45 +03:00
alexey-milovidov
ef22af2e49
Merge pull request #2881 from zhang2014/feature/support_optimize_predicate_for_view 
ISSUES-863 support optimize predicate for view
 2018-09-08 00:43:13 +03:00
alexey-milovidov
0b6e85e51d
Merge pull request #3073 from yandex/fix_prewhere_with_sampling 
Fix prewhere with sampling
 2018-09-08 00:34:06 +03:00
Nikolai Kochetov
8311c23d83 Fix test. 2018-09-07 23:23:28 +03:00
Alexey Zatelepin
133c9c7c37 Merge branch 'master' into alter-update 
Conflicts:
	docs/en/query_language/alter.md
 2018-09-07 19:11:02 +03:00
Nikolai Kochetov
6e41be3476 Avoid removing columns used in sample expression in prewhere actions. [#CLICKHOUSE-3969] 2018-09-07 19:01:21 +03:00
Alexey Zatelepin
d77037fec7 fix use after move 2018-09-07 18:54:34 +03:00
Alexey Zatelepin
1064d1d26b update MATERIALIZED columns when their dependencies are updated [#CLICKHOUSE-13] 2018-09-07 18:54:18 +03:00
chertus
0b35cdae69 refactoring: add some sugar in type checks [CLICKHOUSE-0002] 2018-09-07 17:37:26 +03:00
Alexey Milovidov
98b835ea52 Fixed build [#CLICKHOUSE-2] 2018-09-06 21:44:12 +03:00
alexey-milovidov
580683310b
Merge pull request #2990 from alesapin/master 
CLICKHOUSE-3800: Add Cache for compiled expression.
 2018-09-06 21:12:08 +03:00
proller
6d8b1bea4b Try fix crash in StorageBuffer 2018-09-06 18:06:54 +03:00
Alexander Sapin
03174e131d Merge remote-tracking branch 'upstream/master' 2018-09-06 12:39:42 +03:00
Alexey Milovidov
5a096ee099 Attempt to fix an issue mentioned by Matt Keranen in #2958 2018-09-06 05:47:59 +03:00
alexey-milovidov
4032e4d22c
Merge pull request #3049 from yandex/fix-collapsing-vertical-merge 
Fix collapsing vertical merge regression
 2018-09-05 21:47:23 +03:00
Alexey Zatelepin
6275bfd8cd fix CollapsingMergeTree + vertical merge [#CLICKHOUSE-3963] 
don't skip writing to rows sources even if all rows have collapsed.
 2018-09-05 20:19:51 +03:00
Alexey Milovidov
12ff8814f8 Removed useless code [#CLICKHOUSE-2] 2018-09-05 19:11:10 +03:00
Alexey Zatelepin
acc1a84827 better name [#CLICKHOUSE-13] 2018-09-05 15:54:03 +03:00
Nikolai Kochetov
46d6c03569 Merge branch 'master' into fix-prewhere-with-aliases 2018-09-05 13:08:07 +03:00
Alexey Milovidov
035c07d01e Fixed error with locking in InterpreterDropQuery [#CLICKHOUSE-3959] 2018-09-04 23:56:09 +03:00
Nikolai Kochetov
3c6db8ebc1 Fix prewhere with aliased columns. [#CLICKHOUSE-3944] 2018-09-04 21:28:01 +03:00
Alexey Zatelepin
4f91833e67 Merge branch 'master' into alter-update 
Conflicts:
	dbms/src/Parsers/ASTIdentifier.cpp
 2018-09-04 17:39:08 +03:00
Alexey Zatelepin
816b91e2e3 additional checks for UPDATEs of key columns [#CLICKHOUSE-13] 2018-09-04 17:34:50 +03:00
Alexey Zatelepin
b6a5bbc4e9 move validation to MutationsInterpreter [#CLICKHOUSE-13] 2018-09-04 17:33:48 +03:00
Alexey Zatelepin
dc0c731c10 later mutation stages now work with IN (SELECT ...) [#CLICKHOUSE-13] 2018-09-04 14:39:10 +03:00
Alexey Zatelepin
d4d1020798 execute UPDATEs and DELETEs in stages [#CLICKHOUSE-13] 2018-09-03 22:34:49 +03:00
Alexey Milovidov
8fae37f5c7 Removed wrong code from StorageSystemColumns #2447 2018-09-03 21:04:29 +03:00
alesapin
83574eed7c Merge remote-tracking branch 'upstream/master' 2018-09-03 13:11:33 +03:00
alesapin
11d248ba10 Resolve conflict 2018-09-03 13:11:10 +03:00
VadimPE
6e78f576d7 ISSUES-2581 add comments, and fix 2018-09-03 11:25:35 +03:00
Alexey Milovidov
226a7f491e Whitespaces [#CLICKHOUSE-3944] 2018-09-03 08:06:19 +03:00
Alexey Milovidov
a903a5a755 Addition to prev. revision [#CLICKHOUSE-2] 2018-09-02 06:58:31 +03:00
Alexey Milovidov
fc27be314b Avoid temporary nullptr references [#CLICKHOUSE-2] 2018-09-02 06:00:04 +03:00
Alexey Milovidov
684d3f6162 Fixed bug #2830 2018-09-02 05:27:56 +03:00
Alexey Milovidov
f7107f12b4 Merge branch 'master' into extra-warnings 2018-09-02 03:13:36 +03:00
Alexey Milovidov
8eb746b216 Documentation for ProfileEvents (draft) #3010 2018-09-02 02:13:17 +03:00
Alexey Milovidov
751cf62262 Added documentation for CurrentMetrics #3010 2018-09-01 22:51:38 +03:00
alexey-milovidov
a05cdfbb45
Merge branch 'master' into extra-warnings 2018-08-31 03:03:44 +03:00
alesapin
6bfde2825e Fix conflict 2018-08-30 22:23:00 +03:00
alesapin
6e64067a70 CLICKHOUSE-3800: Move cache to context, change hashing algorithm, add drop instruction for compiled expressions cache 2018-08-30 19:31:20 +03:00
Alexey Zatelepin
e9493b3a5f use hard links to copy columns that didn't change [#CLICKHOUSE-13] 2018-08-30 16:56:43 +03:00
Alexey Zatelepin
dc2a4c21e9 execute ALTER UPDATE [#CLICKHOUSE-13] 2018-08-30 16:56:43 +03:00
Alexey Zatelepin
8e7c58dd75 parse ALTER UPDATE command [#CLICKHOUSE-13] 2018-08-30 16:56:43 +03:00
Alexey Milovidov
87dfd8e47e Removed useless field #2447 2018-08-29 17:55:28 +03:00
zhang2014
f921c9c169 ISSUES-863 support optimize predicate for view 2018-08-29 13:29:03 +08:00
Alexey Milovidov
3e216f055c Miscellaneous #2758 2018-08-28 03:44:42 +03:00
Alexey Milovidov
9a4b4fbccd Miscellaneous #2758 2018-08-28 03:23:52 +03:00
Alexey Milovidov
236c3872b8 Miscellaneous #2758 2018-08-28 03:23:38 +03:00
Alexey Milovidov
32286484cd Miscellaneous #2758 2018-08-28 03:22:32 +03:00
Alexey Milovidov
52379be265 Miscellaneous #2758 2018-08-28 03:21:02 +03:00
Alexey Milovidov
4f8d324fa7 Miscellaneous #2758 2018-08-28 03:18:32 +03:00
Alexey Milovidov
fa0ffcf8dc Miscellaneous #2758 2018-08-28 03:17:27 +03:00
Alexey Milovidov
2a4b4eefd6 Miscellaneous #2758 2018-08-28 03:10:05 +03:00
Alexey Milovidov
ea643eeff9 Miscellaneous #2758 2018-08-28 03:03:10 +03:00
Alexey Milovidov
7c777c48d7 Miscellaneous #2758 2018-08-28 03:01:03 +03:00
Alexey Milovidov
0a7e288d70 Miscellaneous #2758 2018-08-28 02:59:49 +03:00
Alexey Milovidov
bab6cd504d Miscellaneous #2758 2018-08-27 22:16:38 +03:00
Alexey Milovidov
24bd803c07 Whitespaces #2758 2018-08-27 22:06:32 +03:00
Vadim
a246b913e0
Merge branch 'master' into ISSUES-2581 2018-08-27 19:45:35 +03:00
Vadim
2d8bffafa3
Update MergeTreeSettings.h 2018-08-27 19:38:54 +03:00
Vadim
4d9d80b271
Update MergeTreeSettings.h 2018-08-27 19:38:36 +03:00
Alexey Milovidov
076e1fb2e1 Enabling -Wshadow [#CLICKHOUSE-2] 2018-08-27 19:31:45 +03:00
VadimPE
418375aa1d Merge branch 'CLICKHOUSE-3847' of https://github.com/VadimPE/ClickHouse into CLICKHOUSE-3847 2018-08-27 19:23:08 +03:00
VadimPE
70ebb6a47d CLICKHOUSE-3847 fix code-style 2018-08-27 19:22:39 +03:00
Vadim
64a27e592b
Update ReplicatedMergeTreeCleanupThread.cpp 2018-08-27 19:00:40 +03:00
VadimPE
4d198f2bfe CLICKHOUSE-3847 fix build 2018-08-27 18:54:07 +03:00
VadimPE
0281678c3e CLICKHOUSE-3847 fix code style 2018-08-27 18:44:51 +03:00
VadimPE
a8974f8786 CLICKHOUSE-3847 add Coordinator 2018-08-27 16:51:22 +03:00
Vadim
be2d821669
Merge branch 'master' into CLICKHOUSE-3847 2018-08-27 15:26:41 +03:00
Vadim
c4e90d89f0
Update ReplicatedMergeTreeCleanupThread.cpp 2018-08-27 15:16:52 +03:00