Commit Graph

12630 Commits

Author SHA1 Message Date
proller
020efd9666 Merge remote-tracking branch 'upstream/master' into fix4 2017-11-02 15:31:03 +03:00
alexey-milovidov
4fe58ffffe
Merge pull request #1431 from sundy-li/patch-1
Fix code indent
2017-11-02 02:00:48 +03:00
KochetovNicolai
bfb4e8f3fe zookeeper chroot fix (#1430)
* added root and identity section to zookeeper configuration [#CLICKHOUSE-3031]

* added root and identity section to zookeeper configuration [#CLICKHOUSE-3031]

* moved root section in zookeeper configuration [#CLICKHOUSE-3031]

* fixed root section in zookeeper configuration [#CLICKHOUSE-3031]

* added tests [#CLICKHOUSE-3031]

* replaced tabs to spaces in config files [#CLICKHOUSE-3031]

* fix build [#CLICKHOUSE-3031]

* added chech that root starts with '/' in zookeeper config file [#CLICKHOUSE-3031]

* added comments [#CLICKHOUSE-3031]

* Check if zookeeper chroot exists before start. Remove tailing slash form chroot. [#CLICKHOUSE-3400]

* added starting '/' to zookeeper path in ReplicatedMergeTree
2017-11-02 01:59:27 +03:00
proller
6da4f5a661 add locks 2017-11-01 22:56:07 +03:00
proller
3b58e9cd67 Fix atomic usage 2017-11-01 20:15:05 +03:00
sundyli
d4f4e950e6
Fix code indent 2017-11-01 22:56:55 +08:00
proller
c5dcde0c78 fix atomic usage 2017-11-01 16:58:02 +03:00
proller
6e3ca916d9 Fix atomic usage 2017-11-01 16:35:34 +03:00
proller
a303030b6f Merge remote-tracking branch 'upstream/master' into fix4 2017-11-01 14:47:25 +03:00
proller
9fb4e86270 Tests: fix bash usage;
Use ${CLICKHOUSE_LOCAL} in tests
add --testname options to tests
2017-11-01 14:46:58 +03:00
proller
9bc029ba17 Merge remote-tracking branch 'upstream/master' into fix4 2017-11-01 14:43:48 +03:00
robot-metrika-test
748f3e796b Auto version update to [54310] 2017-11-01 08:03:17 +03:00
Alexey Milovidov
d3e3879de1 Fixed test [#CLICKHOUSE-2]. 2017-11-01 07:11:01 +03:00
Alexey Milovidov
3a6f42a8bd Merge branch 'master' of github.com:yandex/ClickHouse 2017-11-01 06:09:15 +03:00
Alexey Milovidov
175af4b2e9 Removed copy-paste [#CLICKHOUSE-2]. 2017-11-01 06:09:06 +03:00
robot-metrika-test
e41e71ad8b Auto version update to [54309] 2017-11-01 04:49:28 +03:00
Alexey Milovidov
6aff58c747 Added backward compatibility for tables created with wrong sampling key; fixed tiny error [#CLICKHOUSE-2]. 2017-11-01 04:45:10 +03:00
proller
dadb32d042 Fix freebsd build (#1428)
* Fix compile with boost 1.65.1+ and clang 3.8 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=222439 )

* Fix compile CallPointInPolygon on clang4 (Thanks to @vavrusa)

* Fix freebsd build

* Fix build with installed system cityhash
2017-10-31 22:45:58 +03:00
alexey-milovidov
3f9d858df4
Merge pull request #1427 from yandex/running-income
runningIncome
2017-10-31 22:45:24 +03:00
robot-metrika-test
84d0c5adde Auto version update to [54308] 2017-10-31 22:32:28 +03:00
proller
47eae26d75 Fix build 2017-10-31 22:19:36 +03:00
proller
2dff8c6207 Tests: fix bash usage 2017-10-31 21:13:32 +03:00
proller
6ee58e1321 use ${CLICKHOUSE_LOCAL} in tests 2017-10-31 21:07:26 +03:00
proller
6debbf819a Merge remote-tracking branch 'origin/fix4' into fix4 2017-10-31 18:36:04 +03:00
proller
9e73e08269 wip 2017-10-31 17:40:44 +03:00
proller
ade0080112 Merge remote-tracking branch 'upstream/master' into fix4 2017-10-31 17:35:36 +03:00
Nikolai Kochetov
c8d4a92cfb added runningIncome [#CLICKHOUSE-3395] 2017-10-31 17:27:02 +03:00
Vitaliy Lyudvichenko
77ae9cb93a
Update of EN changelog, version 1.1.54304 2017-10-31 14:27:07 +03:00
proller
812ac4a738 Merge remote-tracking branch 'upstream/master' into fix4 2017-10-31 13:57:22 +03:00
robot-metrika-test
67739ffa9b Auto version update to [54307] 2017-10-30 22:35:37 +03:00
proller
bd1d699441 Merge remote-tracking branch 'upstream/master' into fix4 2017-10-30 22:30:28 +03:00
Alexey Zatelepin
f2ebffb7f0 save TO table of a materialized view to the ATTACH query [#CLICKHOUSE-2] 2017-10-30 21:39:39 +03:00
alexey-milovidov
b0f1227e90
Merge pull request #1425 from proller/fix
Fix build without openssl
2017-10-30 21:23:11 +03:00
alexey-milovidov
7a6d31fa63
Update Connection.cpp 2017-10-30 21:22:56 +03:00
proller
723cbb310d Merge remote-tracking branch 'upstream/master' into fix4 2017-10-30 21:19:28 +03:00
proller
340c66f8e2 Fix build without openssl 2017-10-30 21:10:50 +03:00
alexey-milovidov
56ef2e9196
Merge pull request #1380 from yandex/catboost-models
Catboost models
2017-10-30 19:16:41 +03:00
proller
3ad6ea54ea Merge remote-tracking branch 'upstream/master' into fix4 2017-10-30 17:48:18 +03:00
proller
5d137e22eb More atomics 2017-10-30 17:38:16 +03:00
Alexey Milovidov
4675e1e747 Merge branch 'master' of github.com:yandex/ClickHouse 2017-10-30 17:01:16 +03:00
Alexey Milovidov
7a876fddb9 Attempt to fix build with gcc 6 [#CLICKHOUSE-2]. 2017-10-30 17:00:47 +03:00
proller
ce5d7d02bc Merge remote-tracking branch 'origin/fix4' into fix4 2017-10-30 16:45:41 +03:00
proller
cda6473668 Merge remote-tracking branch 'upstream/master' into fix4 2017-10-30 16:45:22 +03:00
Alexey Zatelepin
141b85189e always allow attaching tables with extended storage definition syntax [#CLICKHOUSE-3000] 2017-10-30 16:44:43 +03:00
proller
8b3d3cf56f Merge remote-tracking branch 'upstream/master' into fix4 2017-10-30 16:19:19 +03:00
Vitaliy Lyudvichenko
4b9163c3cc Fix bash warning in the test. [#CLICKHOUSE-3385]
Also use 'clickhouse compressor' util instead of clickhouse-compressor binary.
2017-10-30 16:10:22 +03:00
Vitaliy Lyudvichenko
4a55e5f94b Hotfix of CREATE MATERIALIZED VIEW a TO b. [#CLICKHOUSE-2] 2017-10-30 15:14:36 +03:00
proller
8e54a1df79 Merge remote-tracking branch 'origin/fix4' into fix4 2017-10-30 13:42:56 +03:00
proller
b7dd5cd0ba Merge remote-tracking branch 'upstream/master' into fix4 2017-10-30 13:42:34 +03:00
proller
956e1513c5 Merge remote-tracking branch 'upstream/master' into fix4 2017-10-30 13:22:20 +03:00