Commit Graph

403 Commits

Author SHA1 Message Date
proller
c4f6bb1de0 Fix contrib/zlib build 2018-08-28 20:53:12 +03:00
proller
cc86cb503e clickhouse-test-server with temporary data dir 2018-08-27 21:32:50 +03:00
proller
3acce3bff9 Build fix (#2944)
* Build fix

* Better sample build scripts

* zlib apple fix

* fix

* fix

* better so version

* SPLIT_SHARED -> LINK_MODE

* clean
2018-08-27 17:39:20 +03:00
proller
12f0fc7db3 Merge remote-tracking branch 'upstream/master' into fix3 2018-08-23 15:22:57 +03:00
Amos Bird
b0512b6d32 Fix misused target_include_directories. 2018-08-23 15:17:51 +03:00
proller
6622b6947a wip 2018-08-22 02:57:59 +03:00
proller
1a2b3bc985 fix 2018-08-21 19:17:27 +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
proller
db6c3031e8 Fix apple build 2018-08-20 19:34:28 +03:00
Alexey Milovidov
b38cc88d9d Suppress warning in 3rd-party library #2807 2018-08-19 08:53:02 +03:00
Alexey Milovidov
1373b2e78d Suppress warning in 3rd-party library #2807 2018-08-19 06:42:43 +03:00
Alexey Milovidov
8d4c37f851 Fixed build [#CLICKHOUSE-2] 2018-08-13 12:40:45 +03:00
Alexey Milovidov
39bee180bd Miscellaneous [#CLICKHOUSE-2] 2018-08-13 09:25:22 +03:00
Alexey Milovidov
02b8fbef94 Miscellaneous [#CLICKHOUSE-2] 2018-08-13 09:23:51 +03:00
Alexey Milovidov
6bd059ec49 Updated zlib-ng submodule [#CLICKHOUSE-3891] 2018-08-13 07:43:59 +03:00
Alexey Milovidov
9ddee9fc21 Updated zlib-ng [#CLICKHOUSE-3891] 2018-08-12 04:22:16 +03:00
Alexey Milovidov
2a85432f7b Correct linkage order #1983 2018-08-10 07:43:21 +03:00
Alexey Milovidov
36db216abf Preparation for extra warnings [#CLICKHOUSE-2] 2018-08-10 07:02:56 +03:00
Alexey Milovidov
419bc587c0 Mark library headers as system (this is intended to enable more warnings in application code) [#CLICKHOUSE-2] 2018-08-10 05:24:10 +03:00
Alexey Milovidov
1ca5607f0a Mark Poco headers as system (this is intended to enable more warnings in application code) [#CLICKHOUSE-2] 2018-08-10 05:23:02 +03:00
Alexey Milovidov
a82aee19d2 Better CMakeLists for rdkafka library [#CLICKHOUSE-2] 2018-08-10 02:14:31 +03:00
Alexey Milovidov
497c8fb742 Better CMakeLists for rdkafka library [#CLICKHOUSE-2] 2018-08-10 02:02:52 +03:00
Alexey Milovidov
bbb3e240c0 Revert. Fixed link order #2807 2018-08-09 22:46:20 +03:00
Alexey Milovidov
7c08cae609 Fixed link order #2807 2018-08-09 22:11:46 +03:00
Alexey Milovidov
26aabc9f23 Changed default configuration of mariadb-connector-c to contain correct default path for unix domain socket [#CLICKHOUSE-3261] 2018-08-08 04:44:41 +03:00
alexey-milovidov
1d7e4a439c
Merge pull request #2791 from CurtizJ/CLICKHOUSE-3785
CLICKHOUSE-3785 add murmurHash3, update FunctionStringHash template.
2018-08-07 00:21:43 +03:00
Alexey Milovidov
c6e60a10d3 Ignore warning in 3rd party library [#CLICKHOUSE-3] 2018-08-06 23:08:14 +03:00
Anton Popov
efddb89d18
Merge branch 'master' into CLICKHOUSE-3785 2018-08-06 12:42:01 +03:00
ap11
2d41b958a3 add test 2018-08-06 12:35:13 +03:00
Alexey Milovidov
cf7c090fcb Removed dependency [#CLICKHOUSE-2] 2018-08-06 02:47:31 +03:00
Alexey Milovidov
0a8e99ead5 Removed dependency [#CLICKHOUSE-2] 2018-08-06 02:11:52 +03:00
Alexey Milovidov
b201268e18 Removed dependency [#CLICKHOUSE-2] 2018-08-06 01:45:16 +03:00
Alexey Milovidov
7e79e99b8b Removed dependency [#CLICKHOUSE-2] 2018-08-06 01:43:55 +03:00
Alexey Milovidov
5c063daa9e Updated submodule #1983 2018-08-05 13:58:10 +03:00
Alexey Milovidov
4a4e6b94c3 Fixed Travis #2807 2018-08-05 12:36:10 +03:00
Alexey Milovidov
4834bb01d0 Using libressl #1983 2018-08-05 12:00:07 +03:00
Alexey Milovidov
be1a9dbac9 Using libressl #1983 2018-08-05 11:40:31 +03:00
Alexey Milovidov
5d4dfa06e2 Updated submodule #1983 2018-08-05 11:39:26 +03:00
Alexey Milovidov
9a0e77e2f5 Fixed build #2789 2018-08-05 11:13:56 +03:00
Alexey Milovidov
54a9ff59cd Addition to prev. revision #2789 2018-08-03 22:29:07 +03:00
Alexey Milovidov
135bd5fa1c Addition to prev. revision #2789 2018-08-03 22:15:37 +03:00
Alexey Milovidov
ed59c0f20c Fixed build [#CLICKHOUSE-2] 2018-08-03 22:08:17 +03:00
Alexey Milovidov
0c233d668f Removed useless file; preparations #2791 2018-08-03 21:47:44 +03:00
proller
010350a088 Build fixes (#2794)
* More information in 'Cannot read all data' errors

* Build fixes

* Apple version fix

* Fix

* clean

* New libs fixes

* Freebsd fixes

* macos fix

* Fix macos build

* fix

* fix

* Update CMakeLists.txt

* freebsd fix

* fix

* Update CMakeLists.txt
2018-08-03 19:39:04 +03:00
ap11
d30a90dcac add murmurHash3, update FunctionStringHash template 2018-08-02 12:21:26 +03:00
alexey-milovidov
e6be3df322
Added unixodbc as a submodule. (#2789)
* Using unixodbc as submodule [#CLICKHOUSE-3]

* Using unixodbc as submodule [#CLICKHOUSE-3]

* Using unixodbc as submodule [#CLICKHOUSE-3]

* Using unixodbc as submodule [#CLICKHOUSE-3]

* Using unixodbc as submodule [#CLICKHOUSE-3]

* Using unixodbc as submodule [#CLICKHOUSE-3]

* Using unixodbc as submodule [#CLICKHOUSE-3]
2018-08-02 11:18:15 +03:00
alexey-milovidov
25cc323d1d
Using mariadb-connector-c from submodule. (#2785)
* Using internal mariadb-client library [#CLICKHOUSE-2]

* Using internal mariadb-client library [#CLICKHOUSE-2]

* Using internal mariadb-client library [#CLICKHOUSE-2]

* Using internal mariadb-client library [#CLICKHOUSE-2]

* Using internal mariadb-client library [#CLICKHOUSE-2]
2018-08-02 03:49:31 +03:00
alexey-milovidov
9cd5228df2
Using jemalloc instead of tcmalloc. (#2773)
* Added jemalloc as submodule [#CLICKHOUSE-2]

* Imported jemalloc-cmake [#CLICKHOUSE-2]

* Added README for jemalloc-cmake [#CLICKHOUSE-2]

* Trying to add jemalloc [#CLICKHOUSE-2]

* Trying to add jemalloc [#CLICKHOUSE-2]

* Trying to add jemalloc [#CLICKHOUSE-2]

* Add support for jemalloc: development [#CLICKHOUSE-2]

* Add support for jemalloc: development [#CLICKHOUSE-2]

* Add support for jemalloc: development [#CLICKHOUSE-2]

* Add support for jemalloc: development [#CLICKHOUSE-2]

* Add support for jemalloc: development [#CLICKHOUSE-2]

* Add support for jemalloc: development [#CLICKHOUSE-2]

* Add support for jemalloc: development [#CLICKHOUSE-2]

* Add support for jemalloc: development [#CLICKHOUSE-2]

* Add support for jemalloc: development [#CLICKHOUSE-2]

* Add support for jemalloc: development [#CLICKHOUSE-2]

* Add support for jemalloc: development [#CLICKHOUSE-2]

* Add support for jemalloc: development [#CLICKHOUSE-2]

* Add support for jemalloc: development [#CLICKHOUSE-2]

* Add support for jemalloc: development [#CLICKHOUSE-2]
2018-08-02 03:20:20 +03:00
alexey-milovidov
833e67d53d
Suppress some warnings in third party libraries (#2762)
* Suppress some warnings in 3rd party libraries [#CLICKHOUSE-3]

* Suppress some warnings in 3rd party libraries [#CLICKHOUSE-3]
2018-07-30 23:36:23 +03:00
Alexey Milovidov
31a0c9c79a Fixed spaces in CMakeLists.txt #2756 2018-07-30 21:11:31 +03:00