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
proller
7c5ffcfb4d
Merge remote-tracking branch 'upstream/master' into fix3
2018-08-22 00:03:20 +03:00
Alexey Milovidov
4b04f6cea8
Merge branch 'master' of github.com:yandex/ClickHouse
2018-08-21 21:44:36 +03:00
Alexey Milovidov
99d7b8a7ad
Allow to quit client while query is in progress by pressing Ctrl+C twice #2877
2018-08-21 21:42:46 +03:00
proller
3a00be1aab
fix
2018-08-21 21:35:47 +03:00
proller
300457da7a
fix
2018-08-21 21:35:47 +03:00
proller
55c293b654
Merge remote-tracking branch 'upstream/master' into fix3
2018-08-21 21:13:08 +03:00
champtar
51df4222db
Fix x86_64 detection on CentOS7 / Fedora ( #2912 )
...
* Fix x86_64 detection on CentOS7 / Fedora
CMAKE_LIBRARY_ARCHITECTURE is empty on CentOS7 / Fedora
CMAKE_SYSTEM_PROCESSOR is what we really want
only tested on CentOS7 / Fedora 28
Signed-off-by: Etienne Champetier <echampetier@anevia.com>
* Support freebsd
2018-08-21 20:15:18 +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
proller
87de8db717
fix
2018-08-21 19:35:54 +03:00
alexey-milovidov
408ca4649e
Merge pull request #2909 from wawaka/wawaka/fix_reading_user_from_config
...
ISSUES-2629 clickhouse-client: fix reading user from config
2018-08-21 19:22:48 +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
1a2b3bc985
fix
2018-08-21 19:17:27 +03:00
proller
169d9d3540
Merge remote-tracking branch 'upstream/master' into fix3
2018-08-21 19:14:45 +03:00
proller
e42bc45658
Merge remote-tracking branch 'origin/fix3' into fix3
2018-08-21 19:14:13 +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
alexey-milovidov
aebddd550d
Merge pull request #2911 from yandex/low-cardinality-fix-dictionary-deserialization
...
Low cardinality fix dictionary deserialization
2018-08-21 17:18:32 +03:00
Nikolai Kochetov
04a91a79a9
Added test for low cardinality deserialization. #2896
2018-08-21 17:05:57 +03:00
Nikolai Kochetov
b291a9694e
Force update dictionary when seek to new granule. #2896
2018-08-21 17:05:50 +03:00
Nikolai Kochetov
c27bade22b
Added test for pointInPolygon #2866
2018-08-21 14:33:31 +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
Vladimir Kozbin
cdb7116f37
ISSUES-2629 clickhouse-client: fix reading user from config
2018-08-21 17:04:27 +07:00
BayoNet
5bd8baf9ed
Merge branch 'updating-docs'
2018-08-21 10:55:54 +03:00
BayoNet
969225b372
Merge remote-tracking branch 'upstream/master' into updating-docs
2018-08-21 10:55:28 +03:00
BayoNet
d18e249728
Updated description of MergeTree.
2018-08-21 10:54:37 +03:00
Alexey Milovidov
2aa7eb463a
Fixed test #2888
2018-08-21 08:03:35 +03:00
alexey-milovidov
7cf314c986
Merge pull request #2905 from yandex/decimal-fixes
...
Decimal: fixed error + renames.
2018-08-21 07:32:11 +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
b98cfe0f66
Addition to prev. revision #2877
2018-08-21 02:30:24 +03:00
Alexey Milovidov
cf224f32c4
Addition to prev. revision #2877
2018-08-21 02:28:27 +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
Alexey Milovidov
8ca2eed716
Miscellaneous [#CLICKHOUSE-2].
2018-08-21 02:16:50 +03:00
VadimPE
a49cc41279
CLICKHOUSE-3847 add support old version of CH server
2018-08-21 02:08:45 +03:00