Commit Graph

15985 Commits

Author SHA1 Message Date
proller
2ae1c99441
Debian: Try fix compatible dependencies (#2209) 2018-04-11 07:22:41 -07:00
BayoNet
d5a284c765 Merge remote-tracking branch 'upstream/master' 2018-04-11 10:41:13 +03:00
robot-metrika-test
50c2252c31 Auto version update to [54376] 2018-04-10 21:29:22 +03:00
proller
4034fcecf3 Merge remote-tracking branch 'upstream/master' into fix15 2018-04-10 21:27:21 +03:00
proller
0c2ba39978
Debian: Try make compatible package depends (#2194)
* Fix split shared build

* Fix build without system odbc libs

* Move dbms/src/Common/iostream_debug_helpers.h -> libs/libcommon/include/common/iostream_debug_helpers.h

* Fix build with libiodbc

* Fix clickhouse-server.postinst

* Debian: Try make compatible package depends

* Try fix fail on travis tests fail

* Try fix package

* Fix ssl test

* fix

* fix

* wip

* try fix

* clean

* fix
2018-04-10 11:25:08 -07:00
Alexey Milovidov
2392f87dca ZooKeeper: Fixed error [#CLICKHOUSE-2] 2018-04-10 19:48:43 +03:00
proller
157067b127 CLICKHOUSE-3700: Fix empty password on replica query 2018-04-10 17:49:52 +03:00
Silviu Caragea
f1b8d4bc39 Merge remote-tracking branch 'github/master' into background-schedule-pool-fix 2018-04-10 16:27:17 +03:00
Silviu Caragea
c547c5a7b0 Merge remote-tracking branch 'origin/background-schedule-pool-fix'
# Conflicts:
#	dbms/src/Common/ZooKeeper/LeaderElection.h
#	dbms/src/Common/ZooKeeper/ZooKeeper.cpp
#	dbms/src/Storages/MergeTree/ReplicatedMergeTreeAlterThread.cpp
#	dbms/src/Storages/MergeTree/ReplicatedMergeTreeCleanupThread.cpp
#	dbms/src/Storages/MergeTree/ReplicatedMergeTreeCleanupThread.h
#	dbms/src/Storages/MergeTree/ReplicatedMergeTreePartCheckThread.cpp
#	dbms/src/Storages/MergeTree/ReplicatedMergeTreeRestartingThread.cpp
#	dbms/src/Storages/StorageReplicatedMergeTree.cpp
2018-04-10 16:20:14 +03:00
BayoNet
e98e1238ad Merge remote-tracking branch 'upstream/master' 2018-04-10 15:07:32 +03:00
decaseal
a85d697fae Merge branch 'add_table_function_file_dev' into add_table_function_file 2018-04-10 12:24:29 +03:00
decaseal
c641a6cd57 table function file - remove unnecessary includes [#add_table_function_file] 2018-04-10 11:59:53 +03:00
decaseal
40b41c3c6e storage file - change error code [#add_table_function_file] 2018-04-10 11:54:31 +03:00
decaseal
47f12c28f7 Merge branch 'add_table_function_file_dev' into add_table_function_file 2018-04-10 10:48:57 +03:00
decaseal
e8ae0343ed Merge remote-tracking branch 'yandex/master' into add_table_function_file_dev 2018-04-10 10:30:46 +03:00
decaseal
50f65890dc table function file - use only FileStorage [#add_table_function_file] 2018-04-10 10:28:57 +03:00
decaseal
a2db6db50c table function file - use only FileStorage [#add_table_function_file] 2018-04-10 10:26:33 +03:00
decaseal
279fa17ff6 storage file - fix check creation is allowed [#add_table_function_file] 2018-04-10 10:09:50 +03:00
Alexey Milovidov
d3cf85057b Removed useless code [#CLICKHOUSE-2] 2018-04-09 18:49:12 +03:00
proller
c26b3bdef1
Fix split shared build; fix build without system odbc libs (#2191)
* Fix split shared build

* Fix build without system odbc libs

* Move dbms/src/Common/iostream_debug_helpers.h -> libs/libcommon/include/common/iostream_debug_helpers.h

* Fix build with libiodbc
2018-04-09 06:52:39 -07:00
Alexey Milovidov
f02239a307 Fixed linkage of tests [#CLICKHOUSE-2] 2018-04-08 07:54:23 +03:00
Alexey Milovidov
79e319a7b6 ZooKeeper: fixed error [#CLICKHOUSE-2] 2018-04-08 07:45:59 +03:00
Alexey Milovidov
a2482f120d Fixed test [#CLICKHOUSE-2] 2018-04-08 07:38:27 +03:00
Alexey Milovidov
86317fe0f9 ZooKeeper: Fixed error [#CLICKHOUSE-2] 2018-04-08 07:25:13 +03:00
proller
1e7d616a58 Docker fixes (query compiler, compatible? package rename) 2018-04-07 14:01:00 +03:00
proller
07b81c875e CLICKHOUSE-3444: show error for old query on replace_running_query (#2127)
* Add tests

* Fix test

* Fix test build

* CLICKHOUSE-3444: show error for replace_running_query

* fix naming

* fix

* fix test

* Update IProfilingBlockInputStream.cpp
2018-04-07 06:49:49 +03:00
proller
ee087a1541 Fix query compile in docker, update docker image to ubuntu 17.10 artful (#2126)
* Squashed commit of the following:

commit bedcf840b563aad3edb03b43417338fab0e7cb48
Author: proller <proller@github.com>
Date:   Mon Apr 2 20:17:36 2018 +0300

    Revert "Prepare to new poco (PocoData renamed to PocoSQL)"

    This reverts commit ad5e11ad88ac4f1c3a5ad21153042e2498ca0d68.

commit b7f1c352f0eb132b133846c7214e70a79f26e611
Merge: ad5e11ad8 fb7e2cbd1
Author: proller <proller@github.com>
Date:   Mon Apr 2 20:12:10 2018 +0300

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

commit ad5e11ad88ac4f1c3a5ad21153042e2498ca0d68
Author: proller <proller@github.com>
Date:   Mon Apr 2 20:09:49 2018 +0300

    Prepare to new poco (PocoData renamed to PocoSQL)

commit fcb90ca39dd32a29e29eb68bf559f381e80f74b4
Merge: 9ded77d62 ad137994f
Author: proller <proller@github.com>
Date:   Mon Apr 2 13:17:01 2018 +0300

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

commit 9ded77d62aa668c6b7b55d209d5760bc5b517fbf
Merge: 14cea9052 412edac65
Author: proller <proller@github.com>
Date:   Fri Mar 30 21:06:20 2018 +0300

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

commit 14cea90524b8b977bff9b85647e00f0e1c26570b
Merge: 9b6d88e67 82932f904
Author: proller <proller@github.com>
Date:   Fri Mar 30 14:55:42 2018 +0300

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

commit 9b6d88e67b114a4c42b624690d691988be39f227
Merge: 0afe7b7d1 b99783028
Author: proller <proller@github.com>
Date:   Thu Mar 29 20:35:15 2018 +0300

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

commit 0afe7b7d1f4792403ba4fb33dfb250ece2edc41d
Author: proller <proller@github.com>
Date:   Wed Mar 28 16:03:55 2018 +0300

    add docker/test

commit c46f0b4084610a6d36b6823fb5ee48381866272e
Author: proller <proller@github.com>
Date:   Wed Mar 28 15:43:53 2018 +0300

    fix

commit 3435dee49f31fe8f6cd9b01da4a2d5820f03a4a4
Author: proller <proller@github.com>
Date:   Wed Mar 28 15:18:54 2018 +0300

    Fix query compile in docker, update docker image to ubuntu 17.10 artful

* Update Dockerfile
2018-04-07 06:47:54 +03:00
Alexey Milovidov
babfc6aaf7 Fixed error [#CLICKHOUSE-2] 2018-04-07 06:46:20 +03:00
Alexey Milovidov
18bbd0e61b Moved SessionPoolHelpers #2180 2018-04-07 06:07:32 +03:00
Alexey Milovidov
f40817f851 Moved SessionPoolHelpers #2180 2018-04-07 06:07:26 +03:00
Alexey Milovidov
3f264f07e9 Removed excessive library dependencies #2180 2018-04-07 05:29:12 +03:00
Alexey Milovidov
3fd2773151 Improved code after introduction of method "getHeader" in every stream [#CLICKHOUSE-2] 2018-04-07 04:46:50 +03:00
Alexey Milovidov
0a4b349f73 Merge branch 'master' of github.com:yandex/ClickHouse 2018-04-07 00:47:18 +03:00
Alexey Milovidov
4e5e0fa664 ReplicatedMergeTree: Better diagnostics [#CLICKHOUSE-2] 2018-04-07 00:46:57 +03:00
alexey-milovidov
84726e17e8
Merge pull request #2185 from yandex/fix-leader-election-race
Fix races in leader election.
2018-04-07 00:18:26 +03:00
robot-metrika-test
984d7044ac Auto version update to [54375] 2018-04-06 23:52:52 +03:00
proller
f1f1f09500
Debian: temporary keep packages with old names (#2186)
* cmake fixes

* Fix test server config

* Debian: temporary keep packages with old names

* fix

* fix

* Debian postinst: adjustable user
2018-04-06 13:49:42 -07:00
proller
55934058c6 revert reverted submodule contrib/poco 2018-04-06 23:22:33 +03:00
Alexey Milovidov
9b3169a331 Fixed build with clang 5 (although it is Ok on clang 6) [#CLICKHOUSE-2] 2018-04-06 23:03:35 +03:00
Alexey Milovidov
708dc5ef82 ZooKeeper: fixed error [#CLICKHOUSE-2] 2018-04-06 22:54:18 +03:00
Alexey Milovidov
0d8d99e7a4 Fixed typo [#CLICKHOUSE-2] 2018-04-06 22:48:54 +03:00
Alexey Milovidov
ee7fe63b69 Avoid herd effect in ReplicatedMergeTreeCleanupThread (continued) [#CLICKHOUSE-2] 2018-04-06 22:44:55 +03:00
Alexey Milovidov
e240712ec2 Merge branch 'master' of github.com:yandex/ClickHouse 2018-04-06 22:43:56 +03:00
Alexey Milovidov
fa776b93c2 Avoid herd effect in ReplicatedMergeTreeCleanupThread [#CLICKHOUSE-2] 2018-04-06 22:43:37 +03:00
proller
a37c5dd606 revert reverted submodule contrib/poco 2018-04-06 21:58:26 +03:00
Alexey Milovidov
af226d62f5 Fixed totally wrong code in SummingMergeTree in the case of complex maps [#CLICKHOUSE-2] 2018-04-06 21:09:20 +03:00
Alexey Milovidov
47637c7885 Actualized test #1846 2018-04-06 19:26:38 +03:00
Alexey Zatelepin
3a8ca70d1f fix races in leader election [#CLICKHOUSE-3533] 2018-04-06 19:10:23 +03:00
decaseal
2f11750c31 Merge branch 'add_table_function_file_dev' into add_table_function_file 2018-04-06 16:51:43 +03:00
decaseal
139b40f976 storage file - fix check creation is allowed [#add_table_function_file] 2018-04-06 16:43:29 +03:00