Commit Graph

253 Commits

Author SHA1 Message Date
proller
c12d93a873 Allow build without rt library (#1963)
* Allow build without rt library

* fix
2018-02-26 03:19:42 +03:00
Alexey Zatelepin
87b72b8e39 rename musl_exp10 -> preciseExp10 for coding style compatibility 2018-02-16 17:51:14 +03:00
Alexey Zatelepin
8fdb68ef79 add musl_ prefix to exp10 functions to avoid confusion with symbols from the system libm 2018-02-16 17:01:50 +03:00
proller
82d74f5ab3 Allow redefine server config via command line: clickhouse-server -- --logger.level=information (#1811)
* Aloow redefine server config via command line: clickhouse-server -- --logger.level=information

* style

* fix

* BaseDaemon: Simpler createDirectory

* Allow --key value

* Update BaseDaemon.cpp

* Update BaseDaemon.cpp
2018-02-08 22:12:37 +03:00
proller
b026eb7797 Use submodule contrib/capnproto, remove include_directories (#1746)
* Add submodule contrib/capnproto

* Use contrib/capnproto, remove include_directories

* Fix include

* Clean

* Fix werror

* Update doc

* Fix

* Final fix

* Fxi
2018-01-11 21:39:52 +03:00
Alexey Milovidov
104b09604a Merging [#CLICKHOUSE-3114] 2017-12-28 00:45:05 +03:00
proller
da1233fe3f Fix missing includes 2017-12-26 22:02:00 +03:00
Alexey Milovidov
a6fef4f398 Miscellaneous [#CLICKHOUSE-2]. 2017-12-13 23:22:23 +03:00
Alexey Milovidov
ca38cf198c Whitespaces [#CLICKHOUSE-2]. 2017-12-13 22:55:45 +03:00
proller
741117a390
Fix freebsd build. Little cmake fixes. (#1634) 2017-12-13 22:07:12 +03:00
Alexey Milovidov
431da20d99 Better [#CLICKHOUSE-2]. 2017-12-01 23:21:35 +03:00
Alexey Milovidov
b19b476cc6 Accept part of pull request [#CLICKHOUSE-2]. 2017-11-15 00:13:23 +03:00
Alexey Vasiliev
7ec4530354 Added explicit copy constructor for mysqlxx::Null 2017-10-17 20:01:01 +03:00
Alexey Vasiliev
59309432f9 Updated copy/move operations for some types, https://nda.ya.ru/3TWvPE 2017-10-17 14:58:08 +03:00
Alexey Milovidov
10392d5452 Fixed build on Mac OS X [#CLICKHOUSE-2]. 2017-10-14 02:12:06 +03:00
proller
7d0e5e786e Compile fixes 2017-09-24 15:41:29 +03:00
Bulat Gaifullin
7405dd5742 Add ssl options for MySQL connection #1217 2017-09-10 08:04:56 +03:00
Alexey Milovidov
e9ae193870 Implemented some suggestions from clang-tidy (part 1) [#CLICKHOUSE-3301]. 2017-09-08 05:29:47 +03:00
Alexey Milovidov
8b313ab99e Fixed warnings found by cppcheck [#CLICKHOUSE-3300]. 2017-09-08 00:04:48 +03:00
proller
f68a0ea63b Fix mysql includes and remove libmariadb submodule (#1185)
* Use bundled libmariadbclient (CLICKHOUSE-3261)

* wip

* wip

* wip

* Update docs about git clone. move docs/en/development/build_*.sh -> utils/build/build_debian.sh

* Fix mysql includes

* Cmake: don't install mariadb targets

* Fix generated includes

* Disable mysql tests

* cmake: mariadb fixes

* Fix

* Update find_mysqlclient.cmake

* Fix zlib

* Remove bundled contrib/mariadb-connector-c

* fix

* Fix build

* Fix includes
2017-09-04 20:04:33 +03:00
proller
3269b1da57 libmariadb as submodule (CLICKHOUSE-3261) (#1181)
* Use bundled libmariadbclient (CLICKHOUSE-3261)

* wip

* wip

* wip

* Update docs about git clone. move docs/en/development/build_*.sh -> utils/build/build_debian.sh
2017-08-31 20:11:30 +03:00
proller
221110454e Prefer mariadbclient 2017-08-29 20:32:15 +03:00
blazerer
a11759c75b mysqlxx transaction exception safety
Fix terminate on exception and rollback query fail.
2017-08-16 18:30:05 +03:00
proller
d6833a0d55 Cmake: remove global include_directories (#1055)
* Fix .h compile

* Cmake: remove global include_directories

* boost include hide

* fix cctz

* add \n
2017-08-03 15:44:39 +03:00
Alexey Milovidov
18e5c3bdc7 Miscellaneous [#CLICKHOUSE-2]. 2017-07-28 18:28:57 +03:00
alexey-milovidov
3e03bf8e65 Update PoolWithFailover.cpp 2017-07-28 02:28:45 +03:00
Alexey Milovidov
aac6b8ed9f Fixed error in mysqlxx::PoolWithFailover (failover just doesn't work) [#CLICKHOUSE-3167]. 2017-07-28 00:07:41 +03:00
Alexey Milovidov
5bff1e0bfc Miscellaneous [#CLICKHOUSE-2]. 2017-07-27 23:52:14 +03:00
Alexey Milovidov
d08f06ee85 Miscellaneous [#CLICKHOUSE-2]. 2017-07-27 23:40:32 +03:00
Alexey Milovidov
c477c7e1cb Translated comments [#CLICKHOUSE-2]. 2017-07-27 23:22:53 +03:00
Alexey Milovidov
9bb647d5d5 Translated comment [#CLICKHOUSE-2]. 2017-07-27 22:58:25 +03:00
Nikolai Kochetov
116c889b42 translated comments for mysqlxx Connection adn Pool 2017-07-18 17:05:03 +03:00
Nikolai Kochetov
cfdbcb7fde added mysql socket connection 2017-07-18 17:05:03 +03:00
Alexey Milovidov
86eb4d2d06 Renamed Singleton to avoid conflicts with Arcadia* codebase [#DEVTOOLS-3343].
* - "Arcadia" is the name of Yandex's monorepo.
2017-07-10 07:34:14 +03:00
proller
4db8d09de9 Reorganize includes. part 1 (#921)
* Make libunwind optional. Allow use custom libcctz

* fix

* Fix

* fix

* Update BaseDaemon.cpp

* Update CMakeLists.txt

* Reorganize includes. part 1

* Update dbms_include.cmake

* Reorganize includes. part 2

* Reorganize includes. part 3

* dbms/src/Common/ThreadPool -> libs/libcommon

* Reorganize includes. part 4

* Fix print_include_directories

* Update thread_creation_latency.cpp

* Update StringRef.h
2017-06-23 23:22:35 +03:00
alexey-milovidov
35abae95c8 Allow to disable ICU (#711)
* Allow to disable ICU [#CLICKHOUSE-2].

* Addition to prev. revision [#CLICKHOUSE-2].

* Addition to prev. revision [#CLICKHOUSE-2].

* Addition to prev. revision [#CLICKHOUSE-2].
2017-04-19 04:06:29 +03:00
alexey-milovidov
c9c8c8ec50 Better option to disable mysqlclient (#710)
* Better support for disabling libmysqlclient [#CLICKHOUSE-2].

* Addition to prev. revision [#CLICKHOUSE-2].

* Addition to prev. revision [#CLICKHOUSE-2].
2017-04-19 03:25:57 +03:00
Alexey Milovidov
41e97787e3 Less dependencies [#CLICKHOUSE-2]. 2017-04-16 08:40:17 +03:00
proller
5db73c5d31 Allow build without libmysqlclient (#698)
* Allow build without libmysqlclient

* better condition

* cmake option ENABLE_MYSQL

* fix formatting

* Update find_mysqlclient.cmake

* Update find_mysqlclient.cmake

* Update Types.h

* Better throw's
2017-04-14 22:38:56 +03:00
proller
72ccc69212 Debian: simpler package (#662)
* Allow use external re2 with re2_st=re2

* fix

* remove dupe

* use re2_st in FunctionsStringSearch.h

* fix

* move files from tools/etc to debian

* dont generate control

* version

* ok.

* wip

* Cmake: dont touch CMAKE_INSTALL_PREFIX

* wip

* works!

* clean

* okay

* like old

* wip

* wip

* okay

* clickhouse-server-base-dbg

* clean

* clickhouse-server-dbg

* Debian: Remove daemons

* Update rules

* add source/format

* control clean

* add watch

* clean

* clean

* temp fix build

* clean

* docs

* fake make_control

* fix

* testme

* testme

* add metrika package

* fake metrika files
2017-04-10 20:43:30 +03:00
Alexey Milovidov
137ad95929 Changed tabs to spaces in code [#CLICKHOUSE-3]. 2017-04-01 11:35:09 +03:00
Alexey Milovidov
4f44445ff0 Removed all trailing whitespaces [#CLICKHOUSE-2]. find . -name '*.h' -or -name '*.cpp' -or -name '*.cmake' -or -name 'CMakeLists.txt' -or -name '*.html' -or -name '*.xml' | grep -v contrib | xargs sed -i -r -e 's/\s+$//' 2017-03-31 19:00:30 +03:00
Alexey Milovidov
1c6c751108 Better overloads [#CLICKHOUSE-2]. 2017-03-13 22:23:56 +03:00
alexey-milovidov
cee5ab01fb Merge branch 'master' into merge_with_metrika 2017-02-11 00:27:15 +04:00
proller
9bbe8fe5c4 Dynamic library mode (#471)
* Cmake: UNBUNDLED option

* Dynamic library mode
2017-02-08 22:53:00 +04:00
proller
f87ae6808f cmake: USE_INTERNAL_ZLIB_LIBRARY (#463)
* Correct fix of building with external poco with disabled sending progress

    Revert "Removed wrong code [#CLICKHOUSE-2]."

    This reverts commit 33f9917f53.

* fix

* fix

* cmake: USE_INTERNAL_ZLIB_LIBRARY
2017-02-08 01:28:13 +04:00
Pavel Kartavyy
224ba16dcb use project source and binary dirs instead of global dirs 2017-02-06 18:15:19 +03:00
proller
1d7c5f63df Cmake: fix includes with PATH_SUFFIXES (#389) 2017-01-25 01:07:08 +04:00
alexey-milovidov
5ee4c205c8 Revert "Cmake: fix includes with PATH_SUFFIXES" (#388) 2017-01-25 00:52:00 +04:00
proller
b068ffb100 Cmake: fix includes with PATH_SUFFIXES (#387) 2017-01-24 23:54:35 +04:00
proller
38040f5323 Сmake: more info in message about libreadline (#376)
* Cmake: more info in message about libreadline

* icu cmake

* cmake: glib message
2017-01-20 23:57:30 +04:00
proller
29475c94c0 Reorganize includes, less depends in .h files 2017-01-16 22:47:11 +03:00
Alexey Milovidov
68cf046e6c Addition to prev. revision [#CLICKHOUSE-2716]. 2017-01-14 00:29:44 +03:00
Alexey Milovidov
d8f0170bb7 Addition to prev. revision [#CLICKHOUSE-2716]. 2017-01-14 00:24:59 +03:00
Alexey Milovidov
01b7c75d58 Addition to prev. revision [#CLICKHOUSE-2716]. 2017-01-14 00:24:29 +03:00
Alexey Milovidov
d26f045819 Addition to prev. revision [#CLICKHOUSE-2716]. 2017-01-14 00:18:07 +03:00
Alexey Milovidov
a86a86aa68 Addition to prev. revision [#CLICKHOUSE-2716]. 2017-01-14 00:07:25 +03:00
Alexey Milovidov
fdc2464c78 Do not expose MySQL headers in headers of mysqlxx library [#CLICKHOUSE-2716]. 2017-01-13 23:37:37 +03:00
proller
ee3882f251 Allow link with external libs: poco, tcmalloc 2017-01-13 14:25:44 +03:00
proller
4bfa697656 Add more search paths to find_mysqlclient.cmake, rename find_libmysqlclient.cmake -> find_mysqlclient.cmake 2017-01-12 15:20:43 +03:00
Alexey Zatelepin
ceb4d4a3a5 fix build (do not remove my_compress.c.o from libmysqlclient.a) [#METR-23582] 2017-01-09 22:54:40 +03:00
Alexey Zatelepin
1c5db52d7d remove zlib code compiled into libmysqlclient.a (fix precise build) [#METR-23582] 2017-01-09 22:12:36 +03:00
Alexey Zatelepin
1b61f2a9d3 use zlib-ng from contrib everywhere [#METR-23582] 2017-01-08 22:24:38 +03:00
proller
4bc003c4c1 Porting to freebsd: initial, compile ok, most tests ok. 2016-12-24 01:03:10 +00:00
proller
d270053c3c Replace all !/bin/bash by !/usr/bin/env bash : allow running scripts with bash in non standard path. also on freebsd. 2016-12-21 23:04:27 +03:00
Alexey Milovidov
050fc12824 mysqlxx: updated for compatibility with CentOS [#METR-20000]. 2016-12-12 09:45:46 +03:00
Vladimir Chebotarev
a86e56cd1f cmake: Special treating of rt in some cases. [#METR-21516] 2016-12-07 00:01:19 +03:00
Vladimir Chebotarev
eb552f2943 cmake: Improved copy_headers.sh script, minor fixes. [#METR-21516] 2016-12-06 21:04:10 +03:00
Vladimir Chebotarev
ca5c1dc31b cmake: Improved build. [#METR-21516] 2016-12-06 19:51:34 +03:00
Vladimir Chebotarev
8e1a6aaf3e cmake: Boost, OpenSSL into find_package(). [#METR-23701] 2016-12-06 16:20:32 +03:00
Vladimir Chebotarev
bcc5500f91 cmake: More options. [#METR-23701] 2016-12-05 15:43:14 +03:00
Vladimir Chebotarev
d4ba394100 libmysqlxx: Secure way to patch mysqlclient library. [#METR-21516] 2016-11-09 23:08:29 +03:00
Vladimir Chebotarev
cdaece7dfa : More specific usage of static libraries. [#METR-21516] 2016-11-09 21:49:01 +03:00
Vladimir Chebotarev
e2ceb63c54 libcommon, libre2, tools: Fixed build under OS X Sierra. [#METR-21516] 2016-11-03 15:41:13 +03:00
Vladimir Smirnov
d36f52502e Make it compilable on OS X
It's still hackish and dirty, but server and client compies.

Server starts, but throwes meaningless exception on any query.

Client seems to be working fine.

Linux compilation might (but shouldn't) be broken (not tested).
2016-11-01 17:59:21 +01:00
Yuri Dyachenko
065b02494a add -Wold-style-cast 2016-08-26 22:55:11 +03:00
Alexey Milovidov
c518abe882 Get rid of Poco::SharedPtr [#METR-21503]. 2016-05-28 20:31:50 +03:00
Alexey Milovidov
4c7eb03b63 Using std::shared_ptr for data types [#METR-21503]. 2016-05-28 13:35:44 +03:00
Alexey Milovidov
a8ca56ecc0 Better [#METR-2944]. 2016-05-28 03:22:09 +03:00
Vladimir Chebotarev
da45ac3d30 libmysqlxx: Proper target_link_libraries [#METR-20000] 2016-05-23 17:05:17 +03:00
Alexey Milovidov
df1d66e51a Removed sensitive data. 2016-02-08 00:58:58 +03:00
Alexey Milovidov
3519c3cea2 dbms: separated mysqlxx::Date and mysqlxx::DateTime [#METR-17973]. 2016-02-03 04:17:58 +03:00
Roman Peshkurov
a7c25eb4be ███████████. improved join logic. [#MOBMET-2863] 2016-01-19 00:04:34 +03:00
Andrey Urusov
681c12d9fa Merge 2015-10-07 17:48:34 +03:00
Alexey Milovidov
9facd5bc56 Removed link-time dependency [#METR-17973]. 2015-10-05 10:04:42 +03:00
Andrey Urusov
bf16b1be56 libmysqlxx: Create connection fixed 2015-10-01 20:52:36 +03:00
Alexey Milovidov
1f6def094f dbms: fixed build [#METR-18202]. 2015-09-29 22:19:54 +03:00
Alexey Milovidov
18ed0b2829 dbms: external dictionaries: fixed errors [#METR-17508]. 2015-08-12 07:21:10 +03:00
Alexey Arno
992e7dc7a5 Merge 2015-07-08 02:11:30 +03:00
Alexey Arno
37f008afd0 dbms: Server: Added support for multiple time zones: part 1 (does not add any new functionality, does not change current functionality) [#METR-15618] 2015-06-26 18:11:31 +03:00
Sergey Magidovich
3d95d19283 ███████████-mobile: More accurate clicks handling. [#MOBMET-1212] 2015-03-25 13:08:04 +03:00
Sergey Magidovich
9856258325 Merge 2015-03-18 18:26:44 +03:00
Sergey Magidovich
0d53cccb78 ███████████-mobile: Refactoring; 3 out of 5 WriteDestinations work; [#MOBMET-1225] 2015-03-16 15:26:19 +03:00
Andrey Mironov
7c9b2a1789 dbms: temporarily allow <table> element in mysqlxx::PoolWithFailover config [#METR-13298] 2015-03-06 16:38:07 +03:00
Andrey Mironov
b3c32ace59 mysqlxx: copy constructor for pools [#METR-13298] 2015-02-05 21:51:19 +03:00
Alexey Milovidov
8f076b8ac4 Removed deprecated date and time functions [#METR-13554]. 2014-11-14 23:55:23 +03:00
Alexey Milovidov
3d359e2b82 Partially get rid of time2str.h [#METR-13554]. 2014-11-06 09:32:23 +03:00
Alexey Milovidov
2727fef911 dbms: removed few functions [#METR-13554]. 2014-11-06 04:31:50 +03:00
Pavel Kartavyy
8f687c6042 RecountRequest: fixed wrong formatting, when chunk is empty [#METR-13437] 2014-10-28 20:55:07 +03:00
Michael Kolupaev
5bbb6dc090 some grammar fixes. [#METR-2807] 2014-08-12 13:35:15 +04:00