Commit Graph

18063 Commits

Author SHA1 Message Date
proller
cc215cbef9 Merge remote-tracking branch 'upstream/master' into fix13 2018-08-28 22:08:16 +03:00
Alexey Milovidov
c2e4a6a55d Removed CLICKHOUSE_PRIVATE_DIR because it is obsolete [#CLICKHOUSE-3] 2018-08-28 21:26:50 +03:00
Alexey Milovidov
d557de6b5e Merge branch 'master' of github.com:yandex/ClickHouse 2018-08-28 21:25:49 +03:00
Alexey Milovidov
f45afa37a8 Miscellaneous [#CLICKHOUSE-3] 2018-08-28 21:25:40 +03:00
proller
bb2460715b Merge remote-tracking branch 'upstream/master' into fix13 2018-08-28 20:54:34 +03:00
proller
c4f6bb1de0 Fix contrib/zlib build 2018-08-28 20:53:12 +03:00
proller
43b0fc7834 Fix contrib/zlib build 2018-08-28 20:52:21 +03:00
alexey-milovidov
755548cb64
Merge pull request #2984 from yandex/zookeeper-tips-update
Updated ZooKeeper admin tips [#CLICKHOUSE-3]
2018-08-28 20:08:39 +03:00
Alexey Milovidov
6e97791348 Updated ZooKeeper admin tips [#CLICKHOUSE-3] 2018-08-28 20:07:01 +03:00
alexey-milovidov
4d0c904a8b
Removed Travis badge, because we are out of memory and time limits in Travis. 2018-08-28 17:04:07 +03:00
chertus
86dd83d012 fix use of broken context in decimal arithm/comparison 2018-08-28 16:59:52 +03:00
Anton Popov
b78dc9d868
Merge pull request #2978 from fr05t1k/patch-1
10'th part have to be included
2018-08-28 15:45:00 +03:00
alexey-milovidov
f623520310
Merge pull request #2979 from amosbird/patch-12
ill formated #else breaks client history
2018-08-28 15:13:59 +03:00
Amos Bird
4ae8721a82
ill formated #else breaks client history 2018-08-28 20:05:27 +08:00
Stas Pavlovichev
23c41c17a9
10'th path have to be included
It seems like 10th path should be included in scanning.
2018-08-28 15:03:26 +03:00
proller
c219562b32 Better clickhouse-test-server 2018-08-28 14:57:35 +03:00
alexey-milovidov
9ff0edc203
Merge pull request #2971 from urykhy/zk-operation-timeout
Make ZK operation timeout configurable
2018-08-28 14:23:09 +03:00
Alexey Milovidov
9cdd576332 Merge branch 'VadimPE-CLICKHOUSE-3847' 2018-08-28 03:45:50 +03: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
Alexey Milovidov
f5cc5ef877 Merge branch 'CLICKHOUSE-3847' of https://github.com/VadimPE/ClickHouse into VadimPE-CLICKHOUSE-3847 2018-08-27 22:04:14 +03:00
alexey-milovidov
ea18b79b8e
Merge pull request #2972 from proller/fix3
Test fixes
2018-08-27 21:57:14 +03:00
proller
cc86cb503e clickhouse-test-server with temporary data dir 2018-08-27 21:32:50 +03:00
Yury Stankevich
f3024d2fba Make ZK operation timeout configurable 2018-08-27 20:26:19 +03:00
chertus
d6a85d9d63 Merge branch 'master' of github.com:yandex/ClickHouse 2018-08-27 20:17:26 +03:00
chertus
220909eb39 minor fix CLICKHOUSE-3765 2018-08-27 20:17:12 +03:00
alexey-milovidov
98148d914c
Merge pull request #2958 from blahgeek/skip-json-object
Skip object fields on json input
2018-08-27 20:07:32 +03:00
alexey-milovidov
95b2bcbc6b
Merge pull request #2970 from 4ertus2/decimal
Some more Decimal
2018-08-27 19:59:26 +03:00
alexey-milovidov
3328fb456a
Merge pull request #2966 from amosbird/nrvo
Get rid of useless std::move to get NRVO
2018-08-27 19:56:03 +03:00
alexey-milovidov
0b9044fbf5
Merge pull request #2968 from yandex/addition-to-2954
Suggested changes by Amos Bird #2954
2018-08-27 19:51:39 +03:00
chertus
9dbaa5f4a9 remove strange code CLICKHOUSE-3765 2018-08-27 19:46:42 +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
alesapin
4ecf3ce8ef
Merge pull request #2969 from alesapin/master
CLICKHOUSE-3894: Fix Kafka test
2018-08-27 19:24:39 +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
chertus
ee873c8e9f Merge branch 'master' into decimal 2018-08-27 19:18:48 +03:00
chertus
c86f2878ff add special ColumnDecimal instead of ColumnVector<DecimalNN> CLICKHOUSE-3765 2018-08-27 19:16:16 +03:00
alesapin
1f0f1ecad3 CLICKHOUSE-3894: Fix Kafka test 2018-08-27 19:15:39 +03:00