Commit Graph

13512 Commits

Author SHA1 Message Date
Alexey Milovidov
ee2823541e Merge branch 'proller-fix14' 2017-12-14 00:12:42 +03:00
Alexey Milovidov
1172e6559d Reverted Client.cpp [#CLICKHOUSE-2]. 2017-12-14 00:12:21 +03:00
Alexey Milovidov
cfedf4d5b1 Merge branch 'fix14' of https://github.com/proller/ClickHouse into proller-fix14 2017-12-14 00:10:37 +03:00
Alexey Milovidov
9cfd3da183 Merge branch 'master' of github.com:yandex/ClickHouse 2017-12-14 00:09:41 +03:00
Alexey Milovidov
0dd0d76b19 Added changes from proller [#CLICKHOUSE-2]. 2017-12-14 00:09:31 +03:00
alexey-milovidov
58cb0ab57d
Merge pull request #1602 from kshvakov/master
client #1600: add network-bandwidth option
2017-12-13 23:54:03 +03:00
alexey-milovidov
7908818ac1
Update Client.cpp 2017-12-13 23:53:53 +03:00
alexey-milovidov
f0a2fe4404
Merge pull request #1629 from ocadaruma/patch-1
Fix links
2017-12-13 23:48:26 +03:00
alexey-milovidov
7fe824e63f
Merge branch 'master' into patch-1 2017-12-13 23:47:54 +03:00
alexey-milovidov
dc96f2101f
Merge branch 'master' into patch-1 2017-12-13 23:47:27 +03:00
alexey-milovidov
094f44c9f8
Merge pull request #1635 from proller/fix15
Use static link in gcc + asan
2017-12-13 23:46:11 +03:00
alexey-milovidov
1612aab3c5
Merge pull request #1636 from bocharov/master
Fix mark cache settings initialization.
2017-12-13 23:45:45 +03:00
Alexey Milovidov
b3277408c4 Added fix from proller [#CLICKHOUSE-2]. 2017-12-13 23:43:51 +03:00
Alexey Milovidov
4d40879135 Proper fix for external dictionaries with complex keys [#CLICKHOUSE-2]. 2017-12-13 23:40:03 +03:00
Alex Bocharov
3a320733f3 Fix mark cache settings initialization.
Before this change setting mark_cache_min_lifetime wasn't applied from the user settings, but only from the default.
There reason was that corresponding Settings initialization was after creation of the MarkCache.
This fix moves Settings initialization above creation of the MarkCache.
2017-12-13 20:32:26 +00:00
Alexey Milovidov
a6fef4f398 Miscellaneous [#CLICKHOUSE-2]. 2017-12-13 23:22:23 +03:00
Alexey Milovidov
9cc424b4b5 Fixed error: loading "preprocessed" files if dictionary/model config was specified with glob [#CLICKHOUSE-3501]. 2017-12-13 23:21:03 +03:00
Alexey Milovidov
ca38cf198c Whitespaces [#CLICKHOUSE-2]. 2017-12-13 22:55:45 +03:00
Alexey Milovidov
f68cf599e6 Removed unused method [#CLICKHOUSE-2] 2017-12-13 22:55:16 +03:00
proller
41591147b5 Use static link in gcc + asan 2017-12-13 22:48:57 +03:00
Alexey Milovidov
0b8688e89b Better semantic of sharing columns: development [#CLICKHOUSE-2]. 2017-12-13 22:14:12 +03:00
proller
4f83806a9e Merge remote-tracking branch 'upstream/master' into fix14 2017-12-13 22:08:53 +03:00
proller
741117a390
Fix freebsd build. Little cmake fixes. (#1634) 2017-12-13 22:07:12 +03:00
Alexey Milovidov
4a51a7bb22 Fixed bad translation [#CLICKHOUSE-2]. 2017-12-13 21:42:13 +03:00
proller
5453a41208 fix 2017-12-13 19:41:29 +03:00
proller
fbd2001802 Merge remote-tracking branch 'upstream/master' into fix14 2017-12-13 19:40:40 +03:00
proller
b911b03eed Print error 2017-12-13 19:40:25 +03:00
Alex Zatelepin
89f741ee8f
Update CHANGELOG.md 2017-12-13 16:44:01 +03:00
proller
4076e14b6b Merge remote-tracking branch 'upstream/master' into fix14 2017-12-13 16:10:02 +03:00
lomberts
871557fa96 Fix data loading (3XX response code) (#1624) 2017-12-13 16:06:47 +03:00
robot-metrika-test
cbb02b580c Auto version update to [54326] 2017-12-13 12:55:19 +03:00
Okada Haruki
d2732fc79a
Fix links
`http:` is redirected to `https:` for now.
2017-12-13 17:22:32 +09:00
Alexey Milovidov
819287b697 Better semantic of sharing columns: development [#CLICKHOUSE-2]. 2017-12-13 04:27:53 +03:00
alexey-milovidov
62fb610e4e
Merge pull request #1447 from yandex/support-table-functions-for-desc-and-insert
Support table functions for desc and insert
2017-12-11 23:28:10 +03:00
proller
cbea7bdeb7 Add options to internal compiler: -nostdinc -nostdinc++ -Bprefix= --isysroot= 2017-12-11 23:27:17 +03:00
proller
21324b4d5a
Fix debian package build (#1620)
* Fix copy_headers (add gcc root to include directories for stddef.h , limits.h)
2017-12-11 21:48:05 +03:00
Nikolai Kochetov
cee84e1120 fix build [#CLICKHOUSE-3397] 2017-12-11 21:40:28 +03:00
Nikolai Kochetov
6c8e5594f9 fix build [#CLICKHOUSE-3397] 2017-12-11 21:38:43 +03:00
Alexey Milovidov
7d04e67262 Merge branch 'write-buffer-from-arena' 2017-12-11 21:25:03 +03:00
Alexey Milovidov
90848adc6b Fixed translation [#CLICKHOUSE-2]. 2017-12-11 21:19:35 +03:00
Nikolai Kochetov
f71b8bf58f merged with master 2017-12-11 21:13:24 +03:00
Nikolai Kochetov
68ccadfc6c removed owned_cluster_for_insertion from StorageDistributed [#CLICKHOUSE-3397] 2017-12-11 21:09:20 +03:00
Alexey Milovidov
22d90fcc41 Miscellaneous [#CLICKHOUSE-2]. 2017-12-11 21:07:08 +03:00
Alexey Milovidov
3b65d95525 Translated comments and by the way made code better [#CLICKHOUSE-2]. 2017-12-11 21:05:16 +03:00
Nikolai Kochetov
1ba891f3fc removed owned_cluster_for_insertion from StorageDistributed [#CLICKHOUSE-3397] 2017-12-11 20:29:24 +03:00
proller
426c0cc1da Fix debian package build 2017-12-11 20:27:22 +03:00
proller
a1b4605314 Merge remote-tracking branch 'upstream/master' into fix14 2017-12-11 19:05:17 +03:00
BayoNet
078b3ddaeb Headers markup is unified through the document. 2017-12-11 17:50:55 +03:00
proller
92ecbea75a Cmake: fix spaces 2017-12-11 15:38:34 +03:00
Alexey Milovidov
524d98c7fc More strict semantic on sharing columns (development) [#CLICKHOUSE-2]. 2017-12-11 05:59:56 +03:00