thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-18 21:51:57 +00:00
Code Issues Packages Projects Releases Wiki Activity
18,298 Commits 9,131 Branches 1,778 Tags 2 GiB
0b2ec39f11
Commit Graph

9706 Commits

Author SHA1 Message Date
Alexey Milovidov
2ce783e016 Merge branch 'read' of https://github.com/amosbird/ClickHouse into amosbird-read 2018-08-26 02:55:22 +03:00
alexey-milovidov
35806a4d27
Merge pull request #2955 from amosbird/varint 
Fast path for varint read.
 2018-08-26 02:47:04 +03:00
alexey-milovidov
00404a911c
Update VarInt.h 2018-08-26 02:46:18 +03:00
Amos Bird
a589230249 Faster path for varint read. 
clickhouse-benchmark <<< 'select count() from s where not ignore(s);'

before this patch:

```

QPS: 0.732, RPS: 2346562049.608, MiB/s: 22378.560, result RPS: 0.732, result MiB/s: 0.000.
0.000%  1.310 sec.
10.000% 1.321 sec.
20.000% 1.327 sec.
30.000% 1.337 sec.
40.000% 1.343 sec.
50.000% 1.359 sec.
60.000% 1.366 sec.
70.000% 1.381 sec.
80.000% 1.400 sec.
90.000% 1.434 sec.
95.000% 1.448 sec.
99.000% 1.489 sec.
99.900% 1.499 sec.
99.990% 1.500 sec.

```

after this patch:

```
QPS: 0.787, RPS: 2524560389.064, MiB/s: 24076.084, result RPS: 0.787, result MiB/s: 0.000.
0.000%  1.228 sec.
10.000% 1.232 sec.
20.000% 1.235 sec.
30.000% 1.241 sec.
40.000% 1.246 sec.
50.000% 1.256 sec.
60.000% 1.265 sec.
70.000% 1.278 sec.
80.000% 1.296 sec.
90.000% 1.321 sec.
95.000% 1.354 sec.
99.000% 1.421 sec.
99.900% 1.453 sec.
99.990% 1.456 sec.
```

I also tried a SSE2 implementation and it's much slower (50%)
 2018-08-26 02:23:26 +08:00
alexey-milovidov
732afd27cf
Merge pull request #2953 from yandex/max-block-size-in-system-tables-columns 
Support for max_block_size in system.tables and system.columns tables
 2018-08-25 20:36:54 +03:00
Amos Bird
9623e59870 Simplify read helpers. 
Use similar APIs like https://en.cppreference.com/w/cpp/string/byte/strstr
 2018-08-26 01:27:28 +08:00
Alexey Milovidov
aa936b09f9 Added check for max_block_size = 0 #2447 2018-08-25 19:32:44 +03:00
Alexey Milovidov
068e50329e Support for max_block_size in system.tables and system.columns tables #2447 2018-08-25 19:07:48 +03:00
Amos Bird
5f03082af9 Make sure BufferBase is fully swapped. 2018-08-25 19:58:16 +08:00
alexey-milovidov
046137f9c5
Merge pull request #2946 from amosbird/locking 
Better locking for StorageBuffer
 2018-08-25 13:47:29 +03:00
Amos Bird
2602177525 Better locking for StorageBuffer 2018-08-25 13:52:06 +08:00
Alexey Milovidov
8cc3501c04 Attempt to generalize ZooKeeper interface [#CLICKHOUSE-2] 2018-08-25 05:00:36 +03:00
Alexey Milovidov
3475ef5304 Attempt to generalize ZooKeeper interface [#CLICKHOUSE-2] 2018-08-25 04:58:14 +03:00
Alexey Milovidov
4d343a441c Attempt to generalize ZooKeeper interface [#CLICKHOUSE-2] 2018-08-25 04:14:02 +03:00
Alexey Milovidov
01082d03d2 Adopted logic in ReplicatedMergeTreeBlockOutputStream #2949 2018-08-25 01:55:02 +03:00
Alexey Milovidov
cc56235ad9 Merge remote-tracking branch 'origin/master' into distinguish-between-definitely-lost-and-unknown-requests-in-zookeeper 2018-08-25 01:53:58 +03:00
Alexey Milovidov
2530561086 ZooKeeperImpl: allow to distinguish cases when request was definitely not been processed #2939 2018-08-25 01:50:20 +03:00
alexey-milovidov
7ba62c2e25
Merge pull request #2939 from yandex/fix-potential-data-loss-in-case-of-zk-errors 
Fixed potential data loss in case of ZK errors [#CLICKHOUSE-3916]
 2018-08-25 01:08:31 +03:00
chertus
53ec40eeee some decimal field improvements CLICKHOUSE-3765 2018-08-24 19:35:00 +03:00
chertus
2e65f4922f extract overflow funcs to arithmeticOverflow.h CLICKHOUSE-3906 2018-08-24 17:20:23 +03:00
chertus
d61614a3d9 fix enums getTypeId() CLICKHOUSE-3765 2018-08-24 15:55:31 +03:00
alexey-milovidov
3466277b0a
Merge pull request #2940 from yandex/better-exception-message-in-case-of-wrong-number-of-arguments-for-function-if 
Better exception message in case of wrong number of arguments for function "if" [#CLICKHOUSE-3932]
 2018-08-24 15:31:22 +03:00
chertus
54a3c028c5 Merge branch 'master' into decimal 2018-08-24 14:19:41 +03:00
alexey-milovidov
eab95e43d1
Merge pull request #2938 from yandex/speed-up-fuzz-tests-2 
Speed up fuzz tests, part 2 #2924
 2018-08-24 14:07:35 +03:00
Alexey Milovidov
eee6644a22 Better exception message in case of wrong number of arguments for function "if" [#CLICKHOUSE-3932] 2018-08-24 12:57:42 +03:00
Alexey Milovidov
eec8af52f3 Fixed potential data loss [#CLICKHOUSE-3916] 2018-08-24 11:57:24 +03:00
Alexey Milovidov
86ede3d38c Removed "_dl_addr" from profile when high amount of queries are instantly rejected with exception as in case when "Too many simultaneous queries" [#CLICKHOUSE-3923] 2018-08-24 11:32:33 +03:00
Amos Bird
26903d6e8f Add schema argument to ODBC table func. 
Useful for datbases like postgres and greenplum.
 2018-08-24 16:18:17 +08:00
zhang2014
cdc4c65adc ISSUES-2906 support join for table function 2018-08-24 15:40:09 +08:00
Alexey Milovidov
080b0f7f1f Speed up fuzz tests, part 2 #2924 2018-08-24 10:35:53 +03:00
Alexey Milovidov
a2fefa1617 Speed up fuzz tests, part 2 #2924 2018-08-24 10:30:53 +03:00
zhang2014
83ceeca199 ISSUES-2906 support join for table function 2018-08-24 14:45:24 +08:00
alexey-milovidov
5637b30556
Merge pull request #2929 from zhang2014/fix/support_asterisk_for_predcate_optimize 
ISSUES-863 fix predicate not work for asterisk
 2018-08-24 08:53:04 +03:00
Alexey Milovidov
91496574aa Fixed error #2913 2018-08-24 08:45:03 +03:00
Alexey Milovidov
761422da22 Miscellaneous #2913 2018-08-24 08:37:06 +03:00
zhang2014
21528697f8 ISSUES-863 turn off enable_optimize_predicate_expression 2018-08-24 13:30:49 +08:00
Alexey Milovidov
6043ea02de Style #2913 2018-08-24 08:25:00 +03:00
Alexey Milovidov
27d43fb7ff Fixed typo #2913 2018-08-24 08:21:53 +03:00
Alexey Milovidov
f4813a47f8 Whitespaces #2913 2018-08-24 08:20:18 +03:00
zhang2014
bf517d5523 ISSUES-863 fix failure tests 2018-08-24 12:11:32 +08:00
Alexey Milovidov
a55b9623c5 Fixed arrayDistinct function [#CLICKHOUSE-3928] 2018-08-24 05:54:02 +03:00
zhang2014
32cc611f5d ISSUES-863 fix predicate optimizer not work for asterisk 2018-08-24 10:05:43 +08:00
Alexey Milovidov
38d5d8eaad Reverted #2325 #2261 2018-08-24 03:53:09 +03:00
Alexey Milovidov
1437e5cbe3 Fix style [#CLICKHOUSE-2] 2018-08-24 03:07:25 +03:00
alexey-milovidov
e1e6e316d9
Merge pull request #2930 from yandex/fix-empty-parts-vertical-merge 
Fix vertical merge of empty parts
 2018-08-24 01:47:11 +03:00
alexey-milovidov
c538e78453
Merge pull request #2933 from zlobober/patch-1 
More verbose access denied error message
 2018-08-24 01:44:51 +03:00
chertus
1467ca5610 decimal field visitors CLICKHOUSE-3765 2018-08-23 22:11:31 +03:00
Max Akhmedov
d5ccd26348
More verbose access denied error message 2018-08-23 21:44:13 +03:00
proller
fe45a62c34 fix 2018-08-23 21:39:21 +03:00
Vadim
1c596db7c0
Update ReplicatedMergeTreeCleanupThread.cpp 2018-08-23 20:19:05 +03:00
proller
380a472a8d Merge remote-tracking branch 'upstream/master' into fix3 2018-08-23 20:16:14 +03:00
Vadim
0bc224ab46
Update StorageReplicatedMergeTree.cpp 2018-08-23 19:40:59 +03:00
Vadim
5a129f5383
Update ReplicatedMergeTreeCleanupThread.cpp 2018-08-23 19:37:28 +03:00
Vadim
380452c933
Update ReplicatedMergeTreeCleanupThread.cpp 2018-08-23 19:36:54 +03:00
Alexey Zatelepin
08f6305dba add missed logging message 2018-08-23 19:33:25 +03:00
Vadim
e7d6bc3dbc
Update ReplicatedMergeTreeCleanupThread.cpp 2018-08-23 19:02:19 +03:00
VadimPE
ce217af78a CLICKHOUSE-3847 fix 2018-08-23 18:58:29 +03:00
Vadim
9271ea7a5f
Update ReplicatedMergeTreeCleanupThread.cpp 2018-08-23 17:20:13 +03:00
Vadim
c1274f9776
Update StorageReplicatedMergeTree.cpp 2018-08-23 17:13:15 +03:00
Vadim
94699b8f6a
Update ReplicatedMergeTreeCleanupThread.cpp 2018-08-23 17:08:24 +03:00
Vadim
234242dd2d
Update ReplicatedMergeTreeCleanupThread.cpp 2018-08-23 17:04:53 +03:00
chertus
cbb80f52c2 own DecimalField for Decimal32/64/128, better field comparison CLICKHOUSE-3765 2018-08-23 17:03:37 +03:00
VadimPE
9beb841406 CLICKHOUSE-3847 fix throw and del log 2018-08-23 16:55:59 +03:00
proller
38347f120d fixes 2018-08-23 15:20:54 +03:00
Alexey Zatelepin
f592aa84d1 fix vertical merge for empty parts [#CLICKHOUSE-3913] 2018-08-23 15:04:30 +03:00
proller
426b8c6130 Merge remote-tracking branch 'upstream/master' into fix3 2018-08-23 14:27:05 +03:00
alexey-milovidov
9e652d8ccf
Merge pull request #2924 from yandex/speed-up-fuzz-tests 
Speed up fuzz tests
 2018-08-23 05:45:37 +03:00
Alexey Milovidov
451c6cd304 Removed a notice produced by gcc during build [#CLICKHOUSE-2] 2018-08-23 04:42:55 +03:00
Alexey Milovidov
b9778a3764 Speed up fuzz tests [#CLICKHOUSE-2] 2018-08-23 04:31:28 +03:00
Alexey Milovidov
246f1947c5 Improvement #2887 2018-08-23 04:06:21 +03:00
Alexey Milovidov
a2674d46fd Fixed wrong code #2887 2018-08-23 03:49:18 +03:00
Alexey Milovidov
61b8b60f53 Whitespaces [#CLICKHOUSE-3878] 2018-08-23 03:12:24 +03:00
alexey-milovidov
5c1925af58
Merge pull request #2920 from VadimPE/CLICKHOUSE-3819 
CLICKHOUSE-3819 add CASE without ELSE
 2018-08-22 22:52:24 +03:00
alexey-milovidov
aaf218dab8
Merge pull request #2919 from yandex/low-cardinality-fix-partial-granule-reading 
Low cardinality fix partial granule reading
 2018-08-22 22:48:42 +03:00
alexey-milovidov
0265cca018
Merge pull request #2921 from alesapin/master 
Finally create test with odbc drivers
 2018-08-22 22:19:07 +03:00
chertus
c61ccc4dfe toDecimal128() CLICKHOUSE-3905 2018-08-22 20:26:11 +03:00
proller
e40708a1a5 clean 2018-08-22 19:56:00 +03:00
proller
e7d7479ed0 fix 2018-08-22 19:53:11 +03:00
chertus
faafe1852b add some comments CLICKHOUSE-3906 2018-08-22 19:28:02 +03:00
chertus
fd6a8142b7 rename toDecimal functions CLICKHOUSE-3905 2018-08-22 19:16:39 +03:00
alesapin
ba0bf14175 CLICKHOUSE-3878: Fix message 2018-08-22 18:54:08 +03:00
alesapin
e2f18da1a9 CLICKHOUSE-3878: Add ODBC test 2018-08-22 18:42:27 +03:00
VadimPE
9e485dae1e CLICKHOUSE-3819 add CASE without ELSE 2018-08-22 18:17:40 +03:00
Vadim
1f7ec5d595
Update ErrorCodes.cpp 2018-08-22 17:27:13 +03:00
Vadim
22b7c436e5
Update StorageReplicatedMergeTree.cpp 2018-08-22 17:26:37 +03:00
Vadim
62b9b039cd
change exception 2018-08-22 17:25:30 +03:00
Vadim
623c6e0553
Update StorageReplicatedMergeTree.cpp 2018-08-22 17:19:48 +03:00
Vadim
b8dd1cbdf2
Update ReplicatedMergeTreeQueue.cpp 2018-08-22 17:18:05 +03:00
Vadim
58fa299b0a
Update ReplicatedMergeTreeCleanupThread.cpp 2018-08-22 17:14:30 +03:00
Vadim
9bce62719f
Update ReplicatedMergeTreeQueue.cpp 2018-08-22 17:10:00 +03:00
Vadim
984d6b5db8
Update ReplicatedMergeTreeCleanupThread.cpp 2018-08-22 17:06:34 +03:00
proller
f47d93c92f Merge remote-tracking branch 'upstream/master' into fix3 2018-08-22 17:06:19 +03:00
VadimPE
a6ef4632a6 CLICKHOUSE-3847 add ErrorCodes 2018-08-22 17:04:04 +03:00
VadimPE
d81d4dfc70 CLICKHOUSE-3847 change createReplica and change check in cloneReolica() 2018-08-22 17:01:54 +03:00
Alexey Zatelepin
66d49f0abc start and stop mutations_finalizing_task during replica restart [#CLICKHOUSE-3747] 2018-08-22 16:57:30 +03:00
Alexey Zatelepin
b6aa7542d0 add BackgroundSchedulePool::TaskInfo::activateAndSchedule() method 
Almost always it (and not activate()) is precisely what is needed.
 2018-08-22 16:43:27 +03:00
chertus
314dcc5e9e add two options to disable Decimal overflow checks CLICKHOUSE-3906 2018-08-22 16:22:56 +03:00
proller
d2729f33e6 apple fix 2018-08-22 16:12:20 +03:00
proller
496cb9c2b1 Merge remote-tracking branch 'upstream/master' into fix3 2018-08-22 16:02:23 +03:00
proller
ed5c5083c8 wip 2018-08-22 16:01:50 +03:00
Nikolai Kochetov
b165a53e30 Fix reading from partial granule for low cardinality type. #2896 2018-08-22 15:47:06 +03:00
Alexey Zatelepin
5c748bfdce fix bug when MATERIALIZED columns were not selected during mutation #2900 [#CLICKHOUSE-3911] 2018-08-22 15:45:24 +03:00
proller
b6dabaacb3 Merge remote-tracking branch 'upstream/master' into fix3 2018-08-22 15:22:58 +03:00
Alexey Milovidov
6497d3032e Dummy implementation for non-Linux platforms #2482 2018-08-22 09:00:08 +03:00
Alexey Milovidov
bc30d10b67 Dummy implementation for non-Linux platforms #2482 2018-08-22 08:59:27 +03:00
Alexey Milovidov
a1d745888d Dummy implementation for non-Linux platforms #2482 2018-08-22 08:56:06 +03:00
Alexey Milovidov
d355aa3932 Enlarged the size of system log queue 1000 times. It is reasonable, because multiple records are generated for each query for query_thread_log. The maximum size of system log queue will be few hundred MBs #2482 2018-08-22 07:36:53 +03:00
Alexey Milovidov
5435dc3dc2 Fixed error with thread statuses #2482 2018-08-22 07:32:21 +03:00
Alexey Milovidov
6834401118 Fixed error when BackgroundSchedulePool is initialized in context of a query #2482 2018-08-22 07:04:39 +03:00
Alexey Milovidov
deb3ce534c Fixed error when BackgroundSchedulePool is initialized in context of a query #2482 2018-08-22 07:04:02 +03:00
Alexey Milovidov
ca5b83ac39 Fixed error when BackgroundSchedulePool is initialized in context of a query #2482 2018-08-22 06:58:19 +03:00
Alexey Milovidov
fc9d335d41 Fixed error when empty part is generated after merge or mutation #2830 2018-08-22 06:33:46 +03:00
Alexey Milovidov
8c76b8e875 TaskStats: addition to prev. revision #2482 2018-08-22 06:12:55 +03:00
Alexey Milovidov
f5326ed29a TaskStats: addition to prev. revision #2482 2018-08-22 06:11:46 +03:00
alexey-milovidov
3d7d600638
Merge pull request #2917 from yandex/fix-restarting-thread-init 
Fix race in initialization of ReplicatedMergeTreeRestartingThread
 2018-08-22 06:10:34 +03:00
Alexey Milovidov
d4b038b270 TaskStats: rewrite code #2482 2018-08-22 05:54:24 +03:00
Alexey Milovidov
efca6e4e09 Code cleanups #2482 2018-08-22 03:41:30 +03:00
Alexey Milovidov
43f1f70c9b Code cleanups #2482 2018-08-22 03:24:55 +03:00
Alexey Milovidov
698761020f Code cleanups #2482 2018-08-22 03:05:06 +03:00
proller
3884e0793c Merge remote-tracking branch 'upstream/master' into fix3 2018-08-22 03:01:15 +03:00
Alexey Milovidov
44e4f9cd26 Removed useless code #2482 2018-08-22 03:01:15 +03:00
Alexey Milovidov
509b43328e Removed useless method #2482 2018-08-22 02:58:12 +03:00
Alexey Milovidov
b2b26f6e54 Removed useless method #2482 2018-08-22 02:56:55 +03:00
Alexey Milovidov
e0bf8c757b Checking for capabilities in more direct way #2482 2018-08-22 02:52:03 +03:00
proller
67cb2ea294 Merge remote-tracking branch 'upstream/master' into fix3 2018-08-22 00:37:09 +03:00
proller
6c21ced0f3 Merge remote-tracking branch 'upstream/master' into fix3 2018-08-22 00:09:10 +03:00
Alexey Milovidov
ea98d79e56 TaskStats: better code #2482 2018-08-22 00:07:37 +03:00
Alexey Milovidov
aea01a4e0d TaskStats: better code #2482 2018-08-22 00:07:06 +03:00
Alexey Milovidov
3fdff1abea TaskStats: better code #2482 2018-08-22 00:05:30 +03:00
chertus
eac6dd1c99 Merge branch 'master' into decimal 2018-08-21 21:55:36 +03:00
proller
300457da7a fix 2018-08-21 21:35:47 +03:00
chertus
1e97f9e549 toDecimalN() functions CLICKHOUSE-3905 2018-08-21 21:25:38 +03:00
proller
df618dd829 Merge remote-tracking branch 'upstream/master' into fix3 2018-08-21 19:52:35 +03:00
Alexey Milovidov
f68c322dca Added error codes #2482 2018-08-21 19:49:20 +03:00
Alexey Milovidov
a04177290b Miscellaneous #2482 2018-08-21 19:40:54 +03:00
alexey-milovidov
edd37cf617
Merge pull request #2910 from yandex/fix-point-in-poligon 
Fix point in poligon
 2018-08-21 19:17:30 +03:00
proller
169d9d3540 Merge remote-tracking branch 'upstream/master' into fix3 2018-08-21 19:14:45 +03:00
alexey-milovidov
581a1c85c2
Merge pull request #2915 from alesapin/master 
Add timeout to socket
 2018-08-21 19:14:04 +03:00
alexey-milovidov
46f00c37e4
Update TaskStatsInfoGetter.cpp 2018-08-21 19:13:07 +03:00
proller
fc2925b567 Squashed commit of the following: 
commit 2722e540abfee4a527d716474c4ca582eceeee08
Merge: b4f3af824 aebddd550
Author: proller <proller@github.com>
Date:   Tue Aug 21 18:34:18 2018 +0300

    Merge remote-tracking branch 'upstream/master' into fix3

commit b4f3af824b88a8b6826583bb483730827574e8ad
Author: proller <proller@github.com>
Date:   Tue Aug 21 17:00:20 2018 +0300

    fix

commit 3a18fa7ded2a7d6b7a0883a1b9c2d6b99360837d
Author: proller <proller@github.com>
Date:   Tue Aug 21 16:57:17 2018 +0300

    fix

commit 5d42220c2cf47e1a86bdc73dbfc24b68f8626891
Author: proller <proller@github.com>
Date:   Tue Aug 21 16:50:21 2018 +0300

    freebsd fixes

commit 7baf4fb5ba4575f79b0d12a9ffaaabd34e1006da
Author: proller <proller@github.com>
Date:   Tue Aug 21 16:17:19 2018 +0300

    fix

commit e1fe707fd765b841a8d0952d91a980128cbf91d0
Author: proller <proller@github.com>
Date:   Tue Aug 21 15:35:21 2018 +0300

    fix

commit 027887c71b3ffa98d9473d50d8c3b79cbf3304ac
Author: proller <proller@github.com>
Date:   Tue Aug 21 15:25:57 2018 +0300

    fix

commit 81af41bfcfff7c02fe4060196cf03c2d2aab416e
Author: proller <proller@github.com>
Date:   Tue Aug 21 15:20:41 2018 +0300

    fix

commit 93d572c85d9c7e331254999a614c3b22b5573b02
Author: proller <proller@github.com>
Date:   Tue Aug 21 14:58:07 2018 +0300

    SPLIT_SHARED

commit dd5b8990d8527d59b1e890943d80c2bf27c613ce
Author: proller <proller@github.com>
Date:   Tue Aug 21 14:52:39 2018 +0300

    fix

commit 4840ca12ab752a38c1ef482e8ec59c5859bb48d7
Author: proller <proller@github.com>
Date:   Tue Aug 21 14:46:31 2018 +0300

    fix

commit abde633beb86f2a0d025d6fcf079965dbd827b92
Author: proller <proller@github.com>
Date:   Tue Aug 21 14:25:32 2018 +0300

    fix

commit 0d94a5476a5ba8ba5e88638d58f2cfbf2b4b662d
Author: proller <proller@github.com>
Date:   Tue Aug 21 14:45:18 2018 +0300

    Travis: try fail on ninja fail

commit c2686f90b68255c2beb0a708804aef404e80a6d2
Merge: 2c3427bbd 2aa7eb463
Author: proller <proller@github.com>
Date:   Tue Aug 21 14:25:15 2018 +0300

    Merge remote-tracking branch 'upstream/master' into fix3

commit 2c3427bbdb861edbb188ed4621e8a05cafaedafb
Author: proller <proller@github.com>
Date:   Mon Aug 20 23:57:24 2018 +0300

    fix

commit 530170c6a81d31dcfa81230e48520383234df4bc
Merge: 9abec162c f6e4ec970
Author: proller <proller@github.com>
Date:   Mon Aug 20 23:57:03 2018 +0300

    Merge remote-tracking branch 'upstream/master' into fix3

commit 9abec162cb2e09bbc2f33cbe80fe76791f6e5a77
Author: proller <proller@github.com>
Date:   Mon Aug 20 23:49:58 2018 +0300

    Apple fixes

commit 36d05e8217440fbc8ae21571b06d4eb6d679d538
Author: proller <proller@github.com>
Date:   Mon Aug 20 23:25:05 2018 +0300

    apple fix

commit aeec3e845e4456e89fbb1b1af6f9f36820a46e33
Author: proller <proller@github.com>
Date:   Mon Aug 20 23:20:06 2018 +0300

    fixes

commit 427961d916a5954981e47d94733996deb2a616ce
Author: proller <proller@github.com>
Date:   Mon Aug 20 23:11:11 2018 +0300

    fix

commit a7dd55ff8f653624c0f3dbcbc54defd3b3ae97af
Author: proller <proller@github.com>
Date:   Mon Aug 20 22:41:53 2018 +0300

    fix

commit 6200e0d315c7a62bae63a8de0fc32f7937770ad2
Merge: 8a541d7e6 21cedbe46
Author: proller <proller@github.com>
Date:   Mon Aug 20 22:35:49 2018 +0300

    Merge remote-tracking branch 'upstream/master' into fix3

commit 8a541d7e64c89e2c16af6c909e0353361153aaa3
Author: proller <proller@github.com>
Date:   Mon Aug 20 22:34:32 2018 +0300

    Do not use poco types

commit fd560f43d048b7e3307c6c6b9c9d9918230014d8
Author: proller <proller@github.com>
Date:   Mon Aug 20 22:20:42 2018 +0300

    Try fix apple build

commit cfb2eba07ac06f19e822d3474341d800b1f98cf1
Merge: 8d2e31c90 5b81fdfc0
Author: proller <proller@github.com>
Date:   Mon Aug 20 22:03:24 2018 +0300

    Merge remote-tracking branch 'upstream/master' into fix3

commit 8d2e31c908be2e99d09e2a9dde2414ab82a5e93c
Author: proller <proller@github.com>
Date:   Mon Aug 20 21:56:06 2018 +0300

    travis: TEST_SERVER_STARTUP_WAIT=10
 2018-08-21 18:56:50 +03:00
alesapin
df012657e8 Change time to 50 mseconds 2018-08-21 18:40:19 +03:00
alesapin
726428a2c5 Add timeout to socket 2018-08-21 18:24:20 +03:00
Alexey Zatelepin
55d82dfc84 fix race in initialization of ReplicatedMergeTreeRestartingThread [#CLICKHOUSE-3899] 2018-08-21 18:22:55 +03:00
Nikolai Kochetov
b291a9694e Force update dictionary when seek to new granule. #2896 2018-08-21 17:05:50 +03:00
Nikolai Kochetov
3404d72da1 Fix pointInPolygon case with nonconvex polygon with two nontrivial halfplanes in cell. #2866 2018-08-21 14:33:15 +03:00
Vadim
297be5c303
Update ErrorCodes.cpp 2018-08-21 13:45:34 +03:00
Vadim
8f3350216f
Merge branch 'master' into CLICKHOUSE-3847 2018-08-21 13:27:18 +03:00
VadimPE
99a26f17f6 CLICKHOUSE-3847 fix settings 2018-08-21 13:23:48 +03:00
Alexey Milovidov
7d76c3fd4f Miscellaneous [#CLICKHOUSE-3765] 2018-08-21 07:31:35 +03:00
Alexey Milovidov
15c971a225 Decimal: fixed error [#CLICKHOUSE-3765] 2018-08-21 07:00:50 +03:00
Alexey Milovidov
9287a63180 Removed useless headers [#CLICKHOUSE-3249] 2018-08-21 06:40:47 +03:00
Alexey Milovidov
be80ac893e Whitespace [#CLICKHOUSE-3621] 2018-08-21 06:40:09 +03:00
Alexey Milovidov
3b39f6a4c3 Split ZooKeeperExceptions to three different metrics #2316 2018-08-21 04:27:22 +03:00
Alexey Milovidov
d278cbbed5 Addition to prev. revision #2877 2018-08-21 02:39:41 +03:00
Alexey Milovidov
bcbcbcdbb1 Merge branch 'master' of github.com:yandex/ClickHouse 2018-08-21 02:22:30 +03:00
Alexey Milovidov
7fc39611e5 Implemented #2877 in another way 2018-08-21 02:22:20 +03:00
VadimPE
a49cc41279 CLICKHOUSE-3847 add support old version of CH server 2018-08-21 02:08:45 +03:00
VadimPE
4064ec0bc2 CLICKHOUSE-3847 add value '1' and '2' in is_lost 2018-08-20 20:15:04 +03:00
proller
91363760ea Merge remote-tracking branch 'upstream/master' into fix3 2018-08-20 19:34:09 +03:00
Alexey Milovidov
b657c6b848 Added forwarding of mutation for Materialized views #2897 2018-08-20 19:28:30 +03:00
Alexey Milovidov
9f007ab3a0 Merge branch 'master' of github.com:yandex/ClickHouse 2018-08-20 19:12:07 +03:00
Alexey Milovidov
2138f50e48 Better exception message #2888 2018-08-20 19:10:58 +03:00
Alexey Zatelepin
765b908450 change the order in which the locks are taken to make TSan happy [#CLICKHOUSE-3892] 2018-08-20 19:07:07 +03:00
Alexey Milovidov
465ff07398 Merge branch 'master' of github.com:yandex/ClickHouse 2018-08-20 18:50:09 +03:00
Alexey Milovidov
2717185991 Modified names #2015 2018-08-20 18:49:39 +03:00
proller
159cdbbb3e Try fix build (link order) 2018-08-20 18:34:37 +03:00
chertus
cdff502828 types convertion via helpers CLICKHOUSE-3765 2018-08-20 18:17:55 +03:00
alexey-milovidov
934d480a7a
Merge pull request #2894 from yandex/fix-catboost-pool-path-normalization 
Fix catboost pool path normalization
 2018-08-20 17:16:09 +03:00
VadimPE
0c119d7667 CLICKHOUSE-3847 fix bugs 2018-08-20 16:31:24 +03:00
Nikolai Kochetov
b64bb8af14 Fix tests. 2018-08-20 15:57:31 +03:00
Nikolai Kochetov
391b4b5927 Merged with master. 2018-08-20 15:25:06 +03:00
Nikolai Kochetov
aaf719d671 Fix header for catboost pool [#CLICKHOUSE-3871] 2018-08-20 13:33:14 +03:00
Nikolai Kochetov
57b626a796 Added path canonization for catboost pool. [#CLICKHOUSE-3871] 2018-08-20 12:51:11 +03:00
alexey-milovidov
bce94dae9b
Merge pull request #2887 from housepower/retention 
Add AggregateFunctionRetention
 2018-08-20 09:38:43 +03:00
alexey-milovidov
89ee237ee4
Update AggregateFunctionRetention.h 2018-08-20 07:22:04 +03:00
Alexey Milovidov
f9a70a378c Addition to prev. revision #2482 2018-08-20 05:42:17 +03:00
Alexey Milovidov
e0f1637506 Moved file to appropriate place; split to cpp #2482 2018-08-20 05:34:00 +03:00
Alexey Milovidov
f1ba2f9a33 Try to fix "query in form data" feature while still tracking limits for external tables (try №2) #2482 2018-08-20 05:23:35 +03:00
Alexey Milovidov
6fb8b4e5cd Opinionated changes #2893 2018-08-19 23:18:31 +03:00
alesapin
f6c9587d0a CLICKHOUSE-3878: Move last interaction with ODBC from main code to bridge, split Handlers file on three different, slightly remove copy-paste code 2018-08-19 20:09:54 +03:00
Alexey Milovidov
06a7d0194d Fixed test #2482 2018-08-19 07:56:20 +03:00
Alexey Milovidov
6741582950 Better diagnostic in test #2482 2018-08-19 07:54:14 +03:00
Alexey Milovidov
99b19c3a66 Miscellaneous #2482 2018-08-19 07:45:39 +03:00
Alexey Milovidov
bf68280bf3 Miscellaneous #2482 2018-08-19 07:43:58 +03:00
Alexey Milovidov
c81eaf66da Corrected comment #2482 2018-08-19 07:31:51 +03:00
Alexey Milovidov
1802b00c0b Fixed bad arithmetic; miscellaneous #2482 2018-08-19 07:25:53 +03:00
sundy-li
63d74978d8 add AggregateFunctionRetention 2018-08-18 20:39:07 +08:00
Alexey Milovidov
2dae8f9396 Merge remote-tracking branch 'origin/master' into CLICKHOUSE-2910 2018-08-18 04:45:00 +03:00
Alexey Milovidov
1c4f5d3359 Miscellaneous #2482 2018-08-17 21:57:07 +03:00
proller
62b6b6d73e Rare segfault fix 2018-08-17 21:23:10 +03:00
Amos Bird
57970a8bef
Using correct config ref to initialize odbc bridge 2018-08-17 19:00:42 +08:00
Alexey Milovidov
aef490d173 Merge remote-tracking branch 'origin/master' into CLICKHOUSE-2910 
Conflicts:
	dbms/src/Common/ODBCBridgeHelper.h
 2018-08-17 00:47:15 +03:00
chertus
23c0e8efb5 Merge branch 'master' of github.com:yandex/ClickHouse 2018-08-16 14:05:20 +03:00
chertus
70d2c4ecf6 minor changes [CLICKHOUSE-3765] 2018-08-16 14:05:14 +03:00
chenxing.xc
63fb4a5515 incorrect result iff only bucket #0 block received 2018-08-16 10:50:09 +08:00
Alexey Milovidov
56af576fe5 Removed duplicate query_id logging #2482 2018-08-16 01:39:19 +03:00
alesapin
2583abfccf CLICKHOUSE-3878: Conflict fixes 2018-08-16 01:02:36 +03:00
alesapin
62c166db79 CLICKHOUSE-3878: Build fixes 2018-08-16 01:00:45 +03:00
alesapin
6fa4af882f CLICKHOUSE-3878: Build fixes 2018-08-16 01:00:28 +03:00
Alexey Milovidov
9a78ee3e44 Removed static std::string variable #2482 2018-08-16 00:57:40 +03:00
Alexey Milovidov
76af46ed5d Merge remote-tracking branch 'origin/master' into CLICKHOUSE-2910 
Conflicts:
	dbms/src/Interpreters/Settings.h
	dbms/tests/queries/0_stateless/00687_top_and_offset.sql
 2018-08-16 00:44:24 +03:00
chertus
0415c9e34a fix int128 to float comparison [CLICKHOUSE-3765] 2018-08-15 19:43:40 +03:00
chertus
c8e945d73d one another build fix 2018-08-15 18:29:57 +03:00
chertus
3805794e66 some more build fixes 2018-08-15 16:27:22 +03:00
alexey-milovidov
4524dcaf9a
Merge pull request #2871 from zhang2014/fix/build_failure 
ISSUES-2846 fix build failure with gcc 8.1
 2018-08-15 13:35:23 +03:00
zhang2014
1549baa4e9 ISSUES-863 fix test failure #2015 #2840 2018-08-15 13:43:44 +08:00
zhang2014
3b0f0ac01e ISSUES-2846 fix build failure with gcc 8.1 2018-08-15 11:51:03 +08:00
Alexey Milovidov
dfd9be86d8 Merge remote-tracking branch 'origin/master' into CLICKHOUSE-2910 2018-08-15 00:50:00 +03:00
Alexey Milovidov
5410f73ba7 Fixed warnings #2015 2018-08-15 00:49:51 +03:00
Alexey Milovidov
31867c0612 Merge remote-tracking branch 'origin/master' into CLICKHOUSE-2910 2018-08-15 00:48:51 +03:00
Alexey Milovidov
03af27a218 Fixed warnings #2015 2018-08-15 00:48:39 +03:00
Alexey Milovidov
9916a75f2e Merging #2482 2018-08-15 00:35:26 +03:00
alexey-milovidov
ce9c6a5ab3
Merge branch 'master' into feature/ISSUES-863 2018-08-15 00:34:23 +03:00
alexey-milovidov
8586e6bb2e
Merge pull request #2787 from zhang2014/fix/replace_asterisk 
ISSUES-2786 fix replace asterisk with join query
 2018-08-15 00:28:35 +03:00
Alexey Milovidov
93c9eab088 Merging #2482 2018-08-15 00:15:17 +03:00
chertus
7ca6a0737d some more build fixes 2018-08-15 00:12:23 +03:00
alexey-milovidov
e7b671ec98
Merge branch 'master' into feature/ISSUES-863 2018-08-15 00:10:21 +03:00
Alexey Milovidov
21579a3cc8 Removed static std::string variable #2482 2018-08-14 23:56:23 +03:00
Alexey Milovidov
acb99b49df Merge branch 'master' into CLICKHOUSE-2910 2018-08-14 23:29:42 +03:00
alexey-milovidov
c376b2d476
Merge pull request #2869 from yandex/low-cardinality-fixes 
LowCardinality fixes
 2018-08-14 22:36:19 +03:00
alexey-milovidov
beabb91903
Update IFunction.cpp 2018-08-14 22:35:52 +03:00
Alexey Milovidov
979154122f Changed strange name #2846 2018-08-14 22:34:25 +03:00
chertus
44c3166c6e Merge branch 'master' of github.com:yandex/ClickHouse 2018-08-14 22:17:28 +03:00
chertus
21fe103831 fix clang build 2018-08-14 22:16:56 +03:00
Nikolai Kochetov
26f464a4f9 Fix Const(LowCardinality) conversion. [#CLICKHOUSE-3621] 2018-08-14 20:19:48 +03:00
Nikolai Kochetov
f61fdf2076 Better const resolution for LowCardinality type. [#CLICKHOUSE-3621] 2018-08-14 20:19:40 +03:00
alexey-milovidov
c5b90717c2
Merge pull request #2828 from alesapin/master 
CLICKHOUSE-3878: ODBC-Bridge tool implementation
 2018-08-14 17:25:43 +03:00
chertus
15cdd7b2bd make clang happy 2018-08-14 17:19:58 +03:00
alesapin
942d9a5fee
Merge branch 'master' into master 2018-08-14 17:09:27 +03:00
chertus
8c54b480bc minor fix 2018-08-14 16:26:23 +03:00
chertus
74823c8c17 add allow_experimental_decimal to settings 2018-08-14 15:51:45 +03:00
chertus
241b05c80a merge master 2018-08-14 15:50:28 +03:00
alesapin
edc2dc45b6
Merge branch 'master' into master 2018-08-14 13:35:32 +03:00
alesapin
af19d4133d CLICKHOUSE-3878: Move connection string validation to common, remove redundant headers, fix compilation issues 2018-08-14 13:33:41 +03:00
alexey-milovidov
6b3375393d
Merge pull request #2840 from VadimPE/CLICKHOUSE-3211 
CLICKHOUSE-3211 add TOP m, and OFFSET k
 2018-08-14 12:55:12 +03:00
alexey-milovidov
f42bd36fa0
Merge pull request #2856 from zhang2014/feature/add_check_access_database_for_system_tables 
Add check access database for system tables
 2018-08-14 12:53:43 +03:00
zhang2014
e51264c3a5 Add check access database for system tables 2018-08-14 11:28:32 +08:00
alexey-milovidov
3e9f25b1b4
Merge pull request #2830 from yandex/data-type-with-dictionary 
LowCardinality data type.
 2018-08-13 23:49:21 +03:00
alesapin
83d5dba53b CLICKHOUSE-3878: Move ODBCDictionary to odbc-bridge 2018-08-13 21:10:26 +03:00
Nikolai Kochetov
4f31d136cb Fix build. 2018-08-13 20:52:57 +03:00
Nikolai Kochetov
5d5344f106 Added allow_experimental_low_cardinality_type setting. 2018-08-13 20:02:54 +03:00
alexey-milovidov
c19213c6e7
Merge pull request #2845 from yandex/fix-arrayDistinct 
fix arrayDistinct
 2018-08-13 19:46:53 +03:00
Vadim
8510bc3bbd
del white space 2018-08-13 18:31:45 +03:00
Vadim
e51e0f5eb9
Update ErrorCodes.cpp 2018-08-13 15:22:58 +03:00
Vadim
b9b6818325
Merge branch 'master' into CLICKHOUSE-3211 2018-08-13 13:48:44 +03:00
Vadim
61a26f7846
Update ErrorCodes.cpp 2018-08-13 13:46:06 +03:00
VadimPE
bb9d99b00c CLICKHOUSE-3211 add Exception 2018-08-13 13:45:27 +03:00
alesapin
6fe3f0b13c Merge remote-tracking branch 'upstream/master' 2018-08-13 12:36:27 +03:00
zhang2014
59b25812e7 Add check access database for system tables 2018-08-13 17:35:40 +08:00
alexey-milovidov
f538bd2113
Merge branch 'master' into decimal 2018-08-13 11:57:42 +03:00